From 3a2f17b91d8fd581f694e64ffe674da8682a148d Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 19 Nov 2020 19:41:49 -0500 Subject: [PATCH 01/38] a few more --- asm/nonmatchings/code_181810/ActorSpeak.s | 38 ++-- asm/nonmatchings/code_181810/EndActorSpeech.s | 24 +-- .../code_197F40/SetActorIdleJumpGravity.s | 2 +- .../code_197F40/SetActorIdleSpeed.s | 2 +- asm/nonmatchings/code_197F40/SetGoalPos.s | 82 -------- .../code_197F40/SetGoalToFirstTarget.s | 34 ---- asm/nonmatchings/code_197F40/SetIdleGoal.s | 82 -------- .../code_197F40/SetPartGoalToTarget.s | 43 ---- include/common_structs.h | 12 +- include/enums.h | 56 +++--- src/code_181810.c | 6 +- src/code_197F40.c | 185 +++++++++++++++--- src/code_1A5830.c | 92 ++++----- src/code_1AC760.c | 4 +- 14 files changed, 275 insertions(+), 387 deletions(-) delete mode 100644 asm/nonmatchings/code_197F40/SetGoalPos.s delete mode 100644 asm/nonmatchings/code_197F40/SetGoalToFirstTarget.s delete mode 100644 asm/nonmatchings/code_197F40/SetIdleGoal.s delete mode 100644 asm/nonmatchings/code_197F40/SetPartGoalToTarget.s diff --git a/asm/nonmatchings/code_181810/ActorSpeak.s b/asm/nonmatchings/code_181810/ActorSpeak.s index 663721bebb..4aef8a79f6 100644 --- a/asm/nonmatchings/code_181810/ActorSpeak.s +++ b/asm/nonmatchings/code_181810/ActorSpeak.s @@ -39,7 +39,7 @@ glabel ActorSpeak /* 181898 80252FB8 AC22FA70 */ sw $v0, %lo(gSpeakingActorIdleAnim)($at) /* 18189C 80252FBC 2402FF81 */ addiu $v0, $zero, -0x7f /* 1818A0 80252FC0 16420002 */ bne $s2, $v0, .L80252FCC -/* 1818A4 80252FC4 00000000 */ nop +/* 1818A4 80252FC4 00000000 */ nop /* 1818A8 80252FC8 8E720148 */ lw $s2, 0x148($s3) .L80252FCC: /* 1818AC 80252FCC 0C09A75B */ jal get_actor @@ -57,7 +57,7 @@ glabel ActorSpeak /* 1818DC 80252FFC 3C01802A */ lui $at, %hi(gSpeakingActorPart) /* 1818E0 80253000 AC32FA78 */ sw $s2, %lo(gSpeakingActorPart)($at) /* 1818E4 80253004 44831000 */ mtc1 $v1, $f2 -/* 1818E8 80253008 00000000 */ nop +/* 1818E8 80253008 00000000 */ nop /* 1818EC 8025300C 468010A0 */ cvt.s.w $f2, $f2 /* 1818F0 80253010 30428000 */ andi $v0, $v0, 0x8000 /* 1818F4 80253014 1440000D */ bnez $v0, .L8025304C @@ -65,12 +65,12 @@ glabel ActorSpeak /* 1818FC 8025301C 86220152 */ lh $v0, 0x152($s1) /* 181900 80253020 C6200148 */ lwc1 $f0, 0x148($s1) /* 181904 80253024 44821000 */ mtc1 $v0, $f2 -/* 181908 80253028 00000000 */ nop +/* 181908 80253028 00000000 */ nop /* 18190C 8025302C 468010A0 */ cvt.s.w $f2, $f2 /* 181910 80253030 92220191 */ lbu $v0, 0x191($s1) /* 181914 80253034 46020000 */ add.s $f0, $f0, $f2 /* 181918 80253038 44821000 */ mtc1 $v0, $f2 -/* 18191C 8025303C 00000000 */ nop +/* 18191C 8025303C 00000000 */ nop /* 181920 80253040 468010A0 */ cvt.s.w $f2, $f2 /* 181924 80253044 08094C1F */ j .L8025307C /* 181928 80253048 46001000 */ add.s $f0, $f2, $f0 @@ -78,13 +78,13 @@ glabel ActorSpeak /* 18192C 8025304C 86220152 */ lh $v0, 0x152($s1) /* 181930 80253050 C6220148 */ lwc1 $f2, 0x148($s1) /* 181934 80253054 44820000 */ mtc1 $v0, $f0 -/* 181938 80253058 00000000 */ nop +/* 181938 80253058 00000000 */ nop /* 18193C 8025305C 46800020 */ cvt.s.w $f0, $f0 /* 181940 80253060 92220191 */ lbu $v0, 0x191($s1) /* 181944 80253064 46001080 */ add.s $f2, $f2, $f0 /* 181948 80253068 00021042 */ srl $v0, $v0, 1 /* 18194C 8025306C 44820000 */ mtc1 $v0, $f0 -/* 181950 80253070 00000000 */ nop +/* 181950 80253070 00000000 */ nop /* 181954 80253074 46800020 */ cvt.s.w $f0, $f0 /* 181958 80253078 46001000 */ add.s $f0, $f2, $f0 .L8025307C: @@ -96,7 +96,7 @@ glabel ActorSpeak /* 181970 80253090 27A20020 */ addiu $v0, $sp, 0x20 /* 181974 80253094 AFA20010 */ sw $v0, 0x10($sp) /* 181978 80253098 44830000 */ mtc1 $v1, $f0 -/* 18197C 8025309C 00000000 */ nop +/* 18197C 8025309C 00000000 */ nop /* 181980 802530A0 46800020 */ cvt.s.w $f0, $f0 /* 181984 802530A4 46001080 */ add.s $f2, $f2, $f0 /* 181988 802530A8 27A20024 */ addiu $v0, $sp, 0x24 @@ -116,7 +116,7 @@ glabel ActorSpeak /* 1819C0 802530E0 3C01802A */ lui $at, %hi(gSpeakingActorPrintCtx) /* 1819C4 802530E4 AC24FA60 */ sw $a0, %lo(gSpeakingActorPrintCtx)($at) /* 1819C8 802530E8 0C0496AE */ jal clamp_printer_coords -/* 1819CC 802530EC 00000000 */ nop +/* 1819CC 802530EC 00000000 */ nop /* 1819D0 802530F0 3C03800A */ lui $v1, %hi(D_8009A650) /* 1819D4 802530F4 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) /* 1819D8 802530F8 AE600070 */ sw $zero, 0x70($s3) @@ -131,7 +131,7 @@ glabel ActorSpeak /* 1819FC 8025311C 0240282D */ daddu $a1, $s2, $zero .L80253120: /* 181A00 80253120 0C03A6D5 */ jal increment_status_menu_disabled -/* 181A04 80253124 00000000 */ nop +/* 181A04 80253124 00000000 */ nop .L80253128: /* 181A08 80253128 8E620070 */ lw $v0, 0x70($s3) /* 181A0C 8025312C 14400060 */ bnez $v0, .L802532B0 @@ -143,7 +143,7 @@ glabel ActorSpeak /* 181A24 80253144 86220150 */ lh $v0, 0x150($s1) /* 181A28 80253148 C6200144 */ lwc1 $f0, 0x144($s1) /* 181A2C 8025314C 44821000 */ mtc1 $v0, $f2 -/* 181A30 80253150 00000000 */ nop +/* 181A30 80253150 00000000 */ nop /* 181A34 80253154 468010A0 */ cvt.s.w $f2, $f2 /* 181A38 80253158 8E220000 */ lw $v0, ($s1) /* 181A3C 8025315C 30428000 */ andi $v0, $v0, 0x8000 @@ -152,12 +152,12 @@ glabel ActorSpeak /* 181A48 80253168 86220152 */ lh $v0, 0x152($s1) /* 181A4C 8025316C C6200148 */ lwc1 $f0, 0x148($s1) /* 181A50 80253170 44821000 */ mtc1 $v0, $f2 -/* 181A54 80253174 00000000 */ nop +/* 181A54 80253174 00000000 */ nop /* 181A58 80253178 468010A0 */ cvt.s.w $f2, $f2 /* 181A5C 8025317C 92220191 */ lbu $v0, 0x191($s1) /* 181A60 80253180 46020000 */ add.s $f0, $f0, $f2 /* 181A64 80253184 44821000 */ mtc1 $v0, $f2 -/* 181A68 80253188 00000000 */ nop +/* 181A68 80253188 00000000 */ nop /* 181A6C 8025318C 468010A0 */ cvt.s.w $f2, $f2 /* 181A70 80253190 08094C72 */ j .L802531C8 /* 181A74 80253194 46001000 */ add.s $f0, $f2, $f0 @@ -165,13 +165,13 @@ glabel ActorSpeak /* 181A78 80253198 86220152 */ lh $v0, 0x152($s1) /* 181A7C 8025319C C6220148 */ lwc1 $f2, 0x148($s1) /* 181A80 802531A0 44820000 */ mtc1 $v0, $f0 -/* 181A84 802531A4 00000000 */ nop +/* 181A84 802531A4 00000000 */ nop /* 181A88 802531A8 46800020 */ cvt.s.w $f0, $f0 /* 181A8C 802531AC 92220191 */ lbu $v0, 0x191($s1) /* 181A90 802531B0 46001080 */ add.s $f2, $f2, $f0 /* 181A94 802531B4 00021042 */ srl $v0, $v0, 1 /* 181A98 802531B8 44820000 */ mtc1 $v0, $f0 -/* 181A9C 802531BC 00000000 */ nop +/* 181A9C 802531BC 00000000 */ nop /* 181AA0 802531C0 46800020 */ cvt.s.w $f0, $f0 /* 181AA4 802531C4 46001000 */ add.s $f0, $f2, $f0 .L802531C8: @@ -183,7 +183,7 @@ glabel ActorSpeak /* 181ABC 802531DC 27A20020 */ addiu $v0, $sp, 0x20 /* 181AC0 802531E0 AFA20010 */ sw $v0, 0x10($sp) /* 181AC4 802531E4 44830000 */ mtc1 $v1, $f0 -/* 181AC8 802531E8 00000000 */ nop +/* 181AC8 802531E8 00000000 */ nop /* 181ACC 802531EC 46800020 */ cvt.s.w $f0, $f0 /* 181AD0 802531F0 46001080 */ add.s $f2, $f2, $f0 /* 181AD4 802531F4 27A20024 */ addiu $v0, $sp, 0x24 @@ -204,16 +204,16 @@ glabel ActorSpeak /* 181B10 80253230 10400005 */ beqz $v0, .L80253248 /* 181B14 80253234 30620080 */ andi $v0, $v1, 0x80 /* 181B18 80253238 0C03A6CC */ jal decrement_status_menu_disabled -/* 181B1C 8025323C 00000000 */ nop +/* 181B1C 8025323C 00000000 */ nop /* 181B20 80253240 08094CAC */ j .L802532B0 /* 181B24 80253244 24020001 */ addiu $v0, $zero, 1 .L80253248: /* 181B28 80253248 10400005 */ beqz $v0, .L80253260 -/* 181B2C 8025324C 00000000 */ nop +/* 181B2C 8025324C 00000000 */ nop /* 181B30 80253250 3C06802A */ lui $a2, %hi(gSpeakingActorTalkAnim) /* 181B34 80253254 8CC6FA6C */ lw $a2, %lo(gSpeakingActorTalkAnim)($a2) /* 181B38 80253258 08094C9A */ j .L80253268 -/* 181B3C 8025325C 00000000 */ nop +/* 181B3C 8025325C 00000000 */ nop .L80253260: /* 181B40 80253260 3C06802A */ lui $a2, %hi(gSpeakingActorIdleAnim) /* 181B44 80253264 8CC6FA70 */ lw $a2, %lo(gSpeakingActorIdleAnim)($a2) @@ -229,7 +229,7 @@ glabel ActorSpeak /* 181B64 80253284 1462000A */ bne $v1, $v0, .L802532B0 /* 181B68 80253288 0000102D */ daddu $v0, $zero, $zero /* 181B6C 8025328C 0C03A6CC */ jal decrement_status_menu_disabled -/* 181B70 80253290 00000000 */ nop +/* 181B70 80253290 00000000 */ nop /* 181B74 80253294 24020001 */ addiu $v0, $zero, 1 /* 181B78 80253298 3C03800A */ lui $v1, %hi(D_8009A650) /* 181B7C 8025329C 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) diff --git a/asm/nonmatchings/code_181810/EndActorSpeech.s b/asm/nonmatchings/code_181810/EndActorSpeech.s index 722d351baf..59ad1f59ea 100644 --- a/asm/nonmatchings/code_181810/EndActorSpeech.s +++ b/asm/nonmatchings/code_181810/EndActorSpeech.s @@ -33,7 +33,7 @@ glabel EndActorSpeech /* 181C20 80253340 AC22FA70 */ sw $v0, %lo(gSpeakingActorIdleAnim)($at) /* 181C24 80253344 2402FF81 */ addiu $v0, $zero, -0x7f /* 181C28 80253348 16220002 */ bne $s1, $v0, .L80253354 -/* 181C2C 8025334C 00000000 */ nop +/* 181C2C 8025334C 00000000 */ nop /* 181C30 80253350 8E510148 */ lw $s1, 0x148($s2) .L80253354: /* 181C34 80253354 0C09A75B */ jal get_actor @@ -49,7 +49,7 @@ glabel EndActorSpeech /* 181C5C 8025337C 3C01802A */ lui $at, %hi(gSpeakingActorPart) /* 181C60 80253380 AC22FA78 */ sw $v0, %lo(gSpeakingActorPart)($at) /* 181C64 80253384 0C04971C */ jal close_message -/* 181C68 80253388 00000000 */ nop +/* 181C68 80253388 00000000 */ nop /* 181C6C 8025338C 0C03A6D5 */ jal increment_status_menu_disabled /* 181C70 80253390 AE400070 */ sw $zero, 0x70($s2) .L80253394: @@ -63,7 +63,7 @@ glabel EndActorSpeech /* 181C90 802533B0 86220150 */ lh $v0, 0x150($s1) /* 181C94 802533B4 C6200144 */ lwc1 $f0, 0x144($s1) /* 181C98 802533B8 44821000 */ mtc1 $v0, $f2 -/* 181C9C 802533BC 00000000 */ nop +/* 181C9C 802533BC 00000000 */ nop /* 181CA0 802533C0 468010A0 */ cvt.s.w $f2, $f2 /* 181CA4 802533C4 8E220000 */ lw $v0, ($s1) /* 181CA8 802533C8 30428000 */ andi $v0, $v0, 0x8000 @@ -72,12 +72,12 @@ glabel EndActorSpeech /* 181CB4 802533D4 86220152 */ lh $v0, 0x152($s1) /* 181CB8 802533D8 C6200148 */ lwc1 $f0, 0x148($s1) /* 181CBC 802533DC 44821000 */ mtc1 $v0, $f2 -/* 181CC0 802533E0 00000000 */ nop +/* 181CC0 802533E0 00000000 */ nop /* 181CC4 802533E4 468010A0 */ cvt.s.w $f2, $f2 /* 181CC8 802533E8 92220191 */ lbu $v0, 0x191($s1) /* 181CCC 802533EC 46020000 */ add.s $f0, $f0, $f2 /* 181CD0 802533F0 44821000 */ mtc1 $v0, $f2 -/* 181CD4 802533F4 00000000 */ nop +/* 181CD4 802533F4 00000000 */ nop /* 181CD8 802533F8 468010A0 */ cvt.s.w $f2, $f2 /* 181CDC 802533FC 08094D0D */ j .L80253434 /* 181CE0 80253400 46001000 */ add.s $f0, $f2, $f0 @@ -85,13 +85,13 @@ glabel EndActorSpeech /* 181CE4 80253404 86220152 */ lh $v0, 0x152($s1) /* 181CE8 80253408 C6220148 */ lwc1 $f2, 0x148($s1) /* 181CEC 8025340C 44820000 */ mtc1 $v0, $f0 -/* 181CF0 80253410 00000000 */ nop +/* 181CF0 80253410 00000000 */ nop /* 181CF4 80253414 46800020 */ cvt.s.w $f0, $f0 /* 181CF8 80253418 92220191 */ lbu $v0, 0x191($s1) /* 181CFC 8025341C 46001080 */ add.s $f2, $f2, $f0 /* 181D00 80253420 00021042 */ srl $v0, $v0, 1 /* 181D04 80253424 44820000 */ mtc1 $v0, $f0 -/* 181D08 80253428 00000000 */ nop +/* 181D08 80253428 00000000 */ nop /* 181D0C 8025342C 46800020 */ cvt.s.w $f0, $f0 /* 181D10 80253430 46001000 */ add.s $f0, $f2, $f0 .L80253434: @@ -103,7 +103,7 @@ glabel EndActorSpeech /* 181D28 80253448 27A20020 */ addiu $v0, $sp, 0x20 /* 181D2C 8025344C AFA20010 */ sw $v0, 0x10($sp) /* 181D30 80253450 44830000 */ mtc1 $v1, $f0 -/* 181D34 80253454 00000000 */ nop +/* 181D34 80253454 00000000 */ nop /* 181D38 80253458 46800020 */ cvt.s.w $f0, $f0 /* 181D3C 8025345C 46001080 */ add.s $f2, $f2, $f0 /* 181D40 80253460 27A20024 */ addiu $v0, $sp, 0x24 @@ -124,16 +124,16 @@ glabel EndActorSpeech /* 181D7C 8025349C 10400005 */ beqz $v0, .L802534B4 /* 181D80 802534A0 30620080 */ andi $v0, $v1, 0x80 /* 181D84 802534A4 0C03A6CC */ jal decrement_status_menu_disabled -/* 181D88 802534A8 00000000 */ nop +/* 181D88 802534A8 00000000 */ nop /* 181D8C 802534AC 08094D47 */ j .L8025351C /* 181D90 802534B0 24020001 */ addiu $v0, $zero, 1 .L802534B4: /* 181D94 802534B4 10400005 */ beqz $v0, .L802534CC -/* 181D98 802534B8 00000000 */ nop +/* 181D98 802534B8 00000000 */ nop /* 181D9C 802534BC 3C06802A */ lui $a2, %hi(gSpeakingActorTalkAnim) /* 181DA0 802534C0 8CC6FA6C */ lw $a2, %lo(gSpeakingActorTalkAnim)($a2) /* 181DA4 802534C4 08094D35 */ j .L802534D4 -/* 181DA8 802534C8 00000000 */ nop +/* 181DA8 802534C8 00000000 */ nop .L802534CC: /* 181DAC 802534CC 3C06802A */ lui $a2, %hi(gSpeakingActorIdleAnim) /* 181DB0 802534D0 8CC6FA70 */ lw $a2, %lo(gSpeakingActorIdleAnim)($a2) @@ -149,7 +149,7 @@ glabel EndActorSpeech /* 181DD0 802534F0 1462000A */ bne $v1, $v0, .L8025351C /* 181DD4 802534F4 0000102D */ daddu $v0, $zero, $zero /* 181DD8 802534F8 0C03A6CC */ jal decrement_status_menu_disabled -/* 181DDC 802534FC 00000000 */ nop +/* 181DDC 802534FC 00000000 */ nop /* 181DE0 80253500 24020001 */ addiu $v0, $zero, 1 /* 181DE4 80253504 3C03800A */ lui $v1, %hi(D_8009A650) /* 181DE8 80253508 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) diff --git a/asm/nonmatchings/code_197F40/SetActorIdleJumpGravity.s b/asm/nonmatchings/code_197F40/SetActorIdleJumpGravity.s index 663aed6d84..b5cd7e9ab7 100644 --- a/asm/nonmatchings/code_197F40/SetActorIdleJumpGravity.s +++ b/asm/nonmatchings/code_197F40/SetActorIdleJumpGravity.s @@ -16,7 +16,7 @@ glabel SetActorIdleJumpGravity /* 199EE4 8026B604 0040802D */ daddu $s0, $v0, $zero /* 199EE8 8026B608 2402FF81 */ addiu $v0, $zero, -0x7f /* 199EEC 8026B60C 16020002 */ bne $s0, $v0, .L8026B618 -/* 199EF0 8026B610 00000000 */ nop +/* 199EF0 8026B610 00000000 */ nop /* 199EF4 8026B614 8E500148 */ lw $s0, 0x148($s2) .L8026B618: /* 199EF8 8026B618 8E250000 */ lw $a1, ($s1) diff --git a/asm/nonmatchings/code_197F40/SetActorIdleSpeed.s b/asm/nonmatchings/code_197F40/SetActorIdleSpeed.s index 92610077cf..4dc9b81b40 100644 --- a/asm/nonmatchings/code_197F40/SetActorIdleSpeed.s +++ b/asm/nonmatchings/code_197F40/SetActorIdleSpeed.s @@ -16,7 +16,7 @@ glabel SetActorIdleSpeed /* 199FDC 8026B6FC 0040802D */ daddu $s0, $v0, $zero /* 199FE0 8026B700 2402FF81 */ addiu $v0, $zero, -0x7f /* 199FE4 8026B704 16020002 */ bne $s0, $v0, .L8026B710 -/* 199FE8 8026B708 00000000 */ nop +/* 199FE8 8026B708 00000000 */ nop /* 199FEC 8026B70C 8E500148 */ lw $s0, 0x148($s2) .L8026B710: /* 199FF0 8026B710 8E250000 */ lw $a1, ($s1) diff --git a/asm/nonmatchings/code_197F40/SetGoalPos.s b/asm/nonmatchings/code_197F40/SetGoalPos.s deleted file mode 100644 index a4ecdd6896..0000000000 --- a/asm/nonmatchings/code_197F40/SetGoalPos.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel SetGoalPos -/* 198DF0 8026A510 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 198DF4 8026A514 AFB20018 */ sw $s2, 0x18($sp) -/* 198DF8 8026A518 0080902D */ daddu $s2, $a0, $zero -/* 198DFC 8026A51C AFBF001C */ sw $ra, 0x1c($sp) -/* 198E00 8026A520 AFB10014 */ sw $s1, 0x14($sp) -/* 198E04 8026A524 AFB00010 */ sw $s0, 0x10($sp) -/* 198E08 8026A528 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 198E0C 8026A52C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 198E10 8026A530 8E50000C */ lw $s0, 0xc($s2) -/* 198E14 8026A534 8E050000 */ lw $a1, ($s0) -/* 198E18 8026A538 0C0B1EAF */ jal get_variable -/* 198E1C 8026A53C 26100004 */ addiu $s0, $s0, 4 -/* 198E20 8026A540 0040202D */ daddu $a0, $v0, $zero -/* 198E24 8026A544 2402FF81 */ addiu $v0, $zero, -0x7f -/* 198E28 8026A548 14820002 */ bne $a0, $v0, .L8026A554 -/* 198E2C 8026A54C 00000000 */ nop -/* 198E30 8026A550 8E440148 */ lw $a0, 0x148($s2) -.L8026A554: -/* 198E34 8026A554 0C09A75B */ jal get_actor -/* 198E38 8026A558 00000000 */ nop -/* 198E3C 8026A55C 3C03FF43 */ lui $v1, 0xff43 -/* 198E40 8026A560 34639EB2 */ ori $v1, $v1, 0x9eb2 -/* 198E44 8026A564 8E050000 */ lw $a1, ($s0) -/* 198E48 8026A568 14A30004 */ bne $a1, $v1, .L8026A57C -/* 198E4C 8026A56C 2451000C */ addiu $s1, $v0, 0xc -/* 198E50 8026A570 C4560018 */ lwc1 $f22, 0x18($v0) -/* 198E54 8026A574 0809A965 */ j .L8026A594 -/* 198E58 8026A578 26100004 */ addiu $s0, $s0, 4 -.L8026A57C: -/* 198E5C 8026A57C 0C0B1EAF */ jal get_variable -/* 198E60 8026A580 0240202D */ daddu $a0, $s2, $zero -/* 198E64 8026A584 4482B000 */ mtc1 $v0, $f22 -/* 198E68 8026A588 00000000 */ nop -/* 198E6C 8026A58C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 198E70 8026A590 26100004 */ addiu $s0, $s0, 4 -.L8026A594: -/* 198E74 8026A594 3C02FF43 */ lui $v0, 0xff43 -/* 198E78 8026A598 8E050000 */ lw $a1, ($s0) -/* 198E7C 8026A59C 34429EB2 */ ori $v0, $v0, 0x9eb2 -/* 198E80 8026A5A0 14A20004 */ bne $a1, $v0, .L8026A5B4 -/* 198E84 8026A5A4 3C02FF43 */ lui $v0, 0xff43 -/* 198E88 8026A5A8 C6340010 */ lwc1 $f20, 0x10($s1) -/* 198E8C 8026A5AC 0809A973 */ j .L8026A5CC -/* 198E90 8026A5B0 00000000 */ nop -.L8026A5B4: -/* 198E94 8026A5B4 0C0B1EAF */ jal get_variable -/* 198E98 8026A5B8 0240202D */ daddu $a0, $s2, $zero -/* 198E9C 8026A5BC 4482A000 */ mtc1 $v0, $f20 -/* 198EA0 8026A5C0 00000000 */ nop -/* 198EA4 8026A5C4 4680A520 */ cvt.s.w $f20, $f20 -/* 198EA8 8026A5C8 3C02FF43 */ lui $v0, 0xff43 -.L8026A5CC: -/* 198EAC 8026A5CC 8E050004 */ lw $a1, 4($s0) -/* 198EB0 8026A5D0 34429EB2 */ ori $v0, $v0, 0x9eb2 -/* 198EB4 8026A5D4 14A20004 */ bne $a1, $v0, .L8026A5E8 -/* 198EB8 8026A5D8 00000000 */ nop -/* 198EBC 8026A5DC C6200014 */ lwc1 $f0, 0x14($s1) -/* 198EC0 8026A5E0 0809A980 */ j .L8026A600 -/* 198EC4 8026A5E4 E636000C */ swc1 $f22, 0xc($s1) -.L8026A5E8: -/* 198EC8 8026A5E8 0C0B1EAF */ jal get_variable -/* 198ECC 8026A5EC 0240202D */ daddu $a0, $s2, $zero -/* 198ED0 8026A5F0 44820000 */ mtc1 $v0, $f0 -/* 198ED4 8026A5F4 00000000 */ nop -/* 198ED8 8026A5F8 46800020 */ cvt.s.w $f0, $f0 -/* 198EDC 8026A5FC E636000C */ swc1 $f22, 0xc($s1) -.L8026A600: -/* 198EE0 8026A600 E6340010 */ swc1 $f20, 0x10($s1) -/* 198EE4 8026A604 E6200014 */ swc1 $f0, 0x14($s1) -/* 198EE8 8026A608 8FBF001C */ lw $ra, 0x1c($sp) -/* 198EEC 8026A60C 8FB20018 */ lw $s2, 0x18($sp) -/* 198EF0 8026A610 8FB10014 */ lw $s1, 0x14($sp) -/* 198EF4 8026A614 8FB00010 */ lw $s0, 0x10($sp) -/* 198EF8 8026A618 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 198EFC 8026A61C D7B40020 */ ldc1 $f20, 0x20($sp) -/* 198F00 8026A620 24020002 */ addiu $v0, $zero, 2 -/* 198F04 8026A624 03E00008 */ jr $ra -/* 198F08 8026A628 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_197F40/SetGoalToFirstTarget.s b/asm/nonmatchings/code_197F40/SetGoalToFirstTarget.s deleted file mode 100644 index 21d695f2bd..0000000000 --- a/asm/nonmatchings/code_197F40/SetGoalToFirstTarget.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel SetGoalToFirstTarget -/* 198D7C 8026A49C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 198D80 8026A4A0 AFB00010 */ sw $s0, 0x10($sp) -/* 198D84 8026A4A4 0080802D */ daddu $s0, $a0, $zero -/* 198D88 8026A4A8 AFBF0014 */ sw $ra, 0x14($sp) -/* 198D8C 8026A4AC 8E02000C */ lw $v0, 0xc($s0) -/* 198D90 8026A4B0 0C0B1EAF */ jal get_variable -/* 198D94 8026A4B4 8C450000 */ lw $a1, ($v0) -/* 198D98 8026A4B8 0040202D */ daddu $a0, $v0, $zero -/* 198D9C 8026A4BC 2402FF81 */ addiu $v0, $zero, -0x7f -/* 198DA0 8026A4C0 14820002 */ bne $a0, $v0, .L8026A4CC -/* 198DA4 8026A4C4 00000000 */ nop -/* 198DA8 8026A4C8 8E040148 */ lw $a0, 0x148($s0) -.L8026A4CC: -/* 198DAC 8026A4CC 0C09A75B */ jal get_actor -/* 198DB0 8026A4D0 00000000 */ nop -/* 198DB4 8026A4D4 8044040D */ lb $a0, 0x40d($v0) -/* 198DB8 8026A4D8 00041880 */ sll $v1, $a0, 2 -/* 198DBC 8026A4DC 00641821 */ addu $v1, $v1, $a0 -/* 198DC0 8026A4E0 00031880 */ sll $v1, $v1, 2 -/* 198DC4 8026A4E4 2463022C */ addiu $v1, $v1, 0x22c -/* 198DC8 8026A4E8 00431821 */ addu $v1, $v0, $v1 -/* 198DCC 8026A4EC 84650000 */ lh $a1, ($v1) -/* 198DD0 8026A4F0 84660002 */ lh $a2, 2($v1) -/* 198DD4 8026A4F4 0C09A5D5 */ jal set_goal_pos_to_part -/* 198DD8 8026A4F8 2444000C */ addiu $a0, $v0, 0xc -/* 198DDC 8026A4FC 8FBF0014 */ lw $ra, 0x14($sp) -/* 198DE0 8026A500 8FB00010 */ lw $s0, 0x10($sp) -/* 198DE4 8026A504 24020002 */ addiu $v0, $zero, 2 -/* 198DE8 8026A508 03E00008 */ jr $ra -/* 198DEC 8026A50C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_197F40/SetIdleGoal.s b/asm/nonmatchings/code_197F40/SetIdleGoal.s deleted file mode 100644 index d6056cda76..0000000000 --- a/asm/nonmatchings/code_197F40/SetIdleGoal.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel SetIdleGoal -/* 198F0C 8026A62C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 198F10 8026A630 AFB20018 */ sw $s2, 0x18($sp) -/* 198F14 8026A634 0080902D */ daddu $s2, $a0, $zero -/* 198F18 8026A638 AFBF001C */ sw $ra, 0x1c($sp) -/* 198F1C 8026A63C AFB10014 */ sw $s1, 0x14($sp) -/* 198F20 8026A640 AFB00010 */ sw $s0, 0x10($sp) -/* 198F24 8026A644 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 198F28 8026A648 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 198F2C 8026A64C 8E50000C */ lw $s0, 0xc($s2) -/* 198F30 8026A650 8E050000 */ lw $a1, ($s0) -/* 198F34 8026A654 0C0B1EAF */ jal get_variable -/* 198F38 8026A658 26100004 */ addiu $s0, $s0, 4 -/* 198F3C 8026A65C 0040202D */ daddu $a0, $v0, $zero -/* 198F40 8026A660 2402FF81 */ addiu $v0, $zero, -0x7f -/* 198F44 8026A664 14820002 */ bne $a0, $v0, .L8026A670 -/* 198F48 8026A668 00000000 */ nop -/* 198F4C 8026A66C 8E440148 */ lw $a0, 0x148($s2) -.L8026A670: -/* 198F50 8026A670 0C09A75B */ jal get_actor -/* 198F54 8026A674 00000000 */ nop -/* 198F58 8026A678 3C03FF43 */ lui $v1, 0xff43 -/* 198F5C 8026A67C 34639EB2 */ ori $v1, $v1, 0x9eb2 -/* 198F60 8026A680 8E050000 */ lw $a1, ($s0) -/* 198F64 8026A684 14A30004 */ bne $a1, $v1, .L8026A698 -/* 198F68 8026A688 245100C8 */ addiu $s1, $v0, 0xc8 -/* 198F6C 8026A68C C45600D4 */ lwc1 $f22, 0xd4($v0) -/* 198F70 8026A690 0809A9AC */ j .L8026A6B0 -/* 198F74 8026A694 26100004 */ addiu $s0, $s0, 4 -.L8026A698: -/* 198F78 8026A698 0C0B1EAF */ jal get_variable -/* 198F7C 8026A69C 0240202D */ daddu $a0, $s2, $zero -/* 198F80 8026A6A0 4482B000 */ mtc1 $v0, $f22 -/* 198F84 8026A6A4 00000000 */ nop -/* 198F88 8026A6A8 4680B5A0 */ cvt.s.w $f22, $f22 -/* 198F8C 8026A6AC 26100004 */ addiu $s0, $s0, 4 -.L8026A6B0: -/* 198F90 8026A6B0 3C02FF43 */ lui $v0, 0xff43 -/* 198F94 8026A6B4 8E050000 */ lw $a1, ($s0) -/* 198F98 8026A6B8 34429EB2 */ ori $v0, $v0, 0x9eb2 -/* 198F9C 8026A6BC 14A20004 */ bne $a1, $v0, .L8026A6D0 -/* 198FA0 8026A6C0 3C02FF43 */ lui $v0, 0xff43 -/* 198FA4 8026A6C4 C6340010 */ lwc1 $f20, 0x10($s1) -/* 198FA8 8026A6C8 0809A9BA */ j .L8026A6E8 -/* 198FAC 8026A6CC 00000000 */ nop -.L8026A6D0: -/* 198FB0 8026A6D0 0C0B1EAF */ jal get_variable -/* 198FB4 8026A6D4 0240202D */ daddu $a0, $s2, $zero -/* 198FB8 8026A6D8 4482A000 */ mtc1 $v0, $f20 -/* 198FBC 8026A6DC 00000000 */ nop -/* 198FC0 8026A6E0 4680A520 */ cvt.s.w $f20, $f20 -/* 198FC4 8026A6E4 3C02FF43 */ lui $v0, 0xff43 -.L8026A6E8: -/* 198FC8 8026A6E8 8E050004 */ lw $a1, 4($s0) -/* 198FCC 8026A6EC 34429EB2 */ ori $v0, $v0, 0x9eb2 -/* 198FD0 8026A6F0 14A20004 */ bne $a1, $v0, .L8026A704 -/* 198FD4 8026A6F4 00000000 */ nop -/* 198FD8 8026A6F8 C6200014 */ lwc1 $f0, 0x14($s1) -/* 198FDC 8026A6FC 0809A9C7 */ j .L8026A71C -/* 198FE0 8026A700 E636000C */ swc1 $f22, 0xc($s1) -.L8026A704: -/* 198FE4 8026A704 0C0B1EAF */ jal get_variable -/* 198FE8 8026A708 0240202D */ daddu $a0, $s2, $zero -/* 198FEC 8026A70C 44820000 */ mtc1 $v0, $f0 -/* 198FF0 8026A710 00000000 */ nop -/* 198FF4 8026A714 46800020 */ cvt.s.w $f0, $f0 -/* 198FF8 8026A718 E636000C */ swc1 $f22, 0xc($s1) -.L8026A71C: -/* 198FFC 8026A71C E6340010 */ swc1 $f20, 0x10($s1) -/* 199000 8026A720 E6200014 */ swc1 $f0, 0x14($s1) -/* 199004 8026A724 8FBF001C */ lw $ra, 0x1c($sp) -/* 199008 8026A728 8FB20018 */ lw $s2, 0x18($sp) -/* 19900C 8026A72C 8FB10014 */ lw $s1, 0x14($sp) -/* 199010 8026A730 8FB00010 */ lw $s0, 0x10($sp) -/* 199014 8026A734 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 199018 8026A738 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 19901C 8026A73C 24020002 */ addiu $v0, $zero, 2 -/* 199020 8026A740 03E00008 */ jr $ra -/* 199024 8026A744 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_197F40/SetPartGoalToTarget.s b/asm/nonmatchings/code_197F40/SetPartGoalToTarget.s deleted file mode 100644 index cebc8f3fa5..0000000000 --- a/asm/nonmatchings/code_197F40/SetPartGoalToTarget.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel SetPartGoalToTarget -/* 198CE4 8026A404 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 198CE8 8026A408 AFB20018 */ sw $s2, 0x18($sp) -/* 198CEC 8026A40C 0080902D */ daddu $s2, $a0, $zero -/* 198CF0 8026A410 AFBF0020 */ sw $ra, 0x20($sp) -/* 198CF4 8026A414 AFB3001C */ sw $s3, 0x1c($sp) -/* 198CF8 8026A418 AFB10014 */ sw $s1, 0x14($sp) -/* 198CFC 8026A41C AFB00010 */ sw $s0, 0x10($sp) -/* 198D00 8026A420 8E50000C */ lw $s0, 0xc($s2) -/* 198D04 8026A424 8E050000 */ lw $a1, ($s0) -/* 198D08 8026A428 0C0B1EAF */ jal get_variable -/* 198D0C 8026A42C 26100004 */ addiu $s0, $s0, 4 -/* 198D10 8026A430 0040882D */ daddu $s1, $v0, $zero -/* 198D14 8026A434 8E050000 */ lw $a1, ($s0) -/* 198D18 8026A438 0C0B1EAF */ jal get_variable -/* 198D1C 8026A43C 0240202D */ daddu $a0, $s2, $zero -/* 198D20 8026A440 0040982D */ daddu $s3, $v0, $zero -/* 198D24 8026A444 2402FF81 */ addiu $v0, $zero, -0x7f -/* 198D28 8026A448 16220002 */ bne $s1, $v0, .L8026A454 -/* 198D2C 8026A44C 00000000 */ nop -/* 198D30 8026A450 8E510148 */ lw $s1, 0x148($s2) -.L8026A454: -/* 198D34 8026A454 0C09A75B */ jal get_actor -/* 198D38 8026A458 0220202D */ daddu $a0, $s1, $zero -/* 198D3C 8026A45C 0040802D */ daddu $s0, $v0, $zero -/* 198D40 8026A460 0200202D */ daddu $a0, $s0, $zero -/* 198D44 8026A464 0C099117 */ jal get_actor_part -/* 198D48 8026A468 0260282D */ daddu $a1, $s3, $zero -/* 198D4C 8026A46C 8C440010 */ lw $a0, 0x10($v0) -/* 198D50 8026A470 86050428 */ lh $a1, 0x428($s0) -/* 198D54 8026A474 0C09A676 */ jal set_part_goal_to_actor_part -/* 198D58 8026A478 82060426 */ lb $a2, 0x426($s0) -/* 198D5C 8026A47C 8FBF0020 */ lw $ra, 0x20($sp) -/* 198D60 8026A480 8FB3001C */ lw $s3, 0x1c($sp) -/* 198D64 8026A484 8FB20018 */ lw $s2, 0x18($sp) -/* 198D68 8026A488 8FB10014 */ lw $s1, 0x14($sp) -/* 198D6C 8026A48C 8FB00010 */ lw $s0, 0x10($sp) -/* 198D70 8026A490 24020002 */ addiu $v0, $zero, 2 -/* 198D74 8026A494 03E00008 */ jr $ra -/* 198D78 8026A498 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/include/common_structs.h b/include/common_structs.h index 344e60e75d..d1ac4a3bb8 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1204,6 +1204,12 @@ typedef struct ActorMovePos { /* 0x18 */ Vec3f end; } ActorMovePos; // size = 0x20; +typedef struct ActorFlyPos { + /* 0x00 */ Vec3f current; + /* 0x0C */ Vec3f goal; + /* 0x18 */ Vec3f temp; /* used for start in fly functions, end in flyrun functions */ +} ActorFlyPos; // size = 0x20; + typedef struct Actor { /* 0x000 */ s32 flags; /* 0x004 */ char unk_04[4]; @@ -1226,9 +1232,7 @@ typedef struct Actor { /* 0x077 */ u8 jumpPartIndex; /* 0x078 */ char unk_78[16]; /* 0x088 */ s32 varTable[16]; - /* 0x0C8 */ Vec3f flyCurrentPos; - /* 0x0D4 */ Vec3f flyGoalPos; - /* 0x0E0 */ Vec3f flyTempPos; /* used for start in fly functions, end in flyrun functions */ + /* 0x0C8 */ ActorFlyPos flyPos; /* 0x0EC */ char unk_EC[24]; /* 0x104 */ f32 flyJumpAccel; /* 0x108 */ f32 flySpeed; @@ -1312,7 +1316,7 @@ typedef struct Actor { /* 0x225 */ char unk_225[7]; /* 0x22C */ struct SelectableTarget targetData[24]; /* 0x40C */ s8 targetListLength; - /* 0x40D */ u8 targetIndexList[24]; /* into targetData */ + /* 0x40D */ s8 targetIndexList[24]; /* into targetData */ /* 0x425 */ u8 selectedTargetIndex; /* into target index list */ /* 0x426 */ s8 targetPartIndex; /* 0x427 */ char unk_427; diff --git a/include/enums.h b/include/enums.h index 4669f119bf..070b02f311 100644 --- a/include/enums.h +++ b/include/enums.h @@ -1031,34 +1031,34 @@ typedef UNK_TYPE Phase; #define Phase_MERLEE_EXP_BONUS 0x00000016 #define Phase_PLAYER_HAPPY 0x0000001E -typedef UNK_TYPE ActorId; -#define ActorId_SELF 0xFFFFFF81 -#define ActorId_PLAYER 0x00000000 -#define ActorId_PARTNER 0x00000100 -#define ActorId_ENEMY0 0x00000200 -#define ActorId_ENEMY1 0x00000201 -#define ActorId_ENEMY2 0x00000202 -#define ActorId_ENEMY3 0x00000203 -#define ActorId_ENEMY4 0x00000204 -#define ActorId_ENEMY5 0x00000205 -#define ActorId_ENEMY6 0x00000206 -#define ActorId_ENEMY7 0x00000207 -#define ActorId_ENEMY8 0x00000208 -#define ActorId_ENEMY9 0x00000209 -#define ActorId_ENEMY10 0x0000020A -#define ActorId_ENEMY11 0x0000020B -#define ActorId_ENEMY12 0x0000020C -#define ActorId_ENEMY13 0x0000020D -#define ActorId_ENEMY14 0x0000020E -#define ActorId_ENEMY15 0x0000020F -#define ActorId_ENEMY16 0x00000210 -#define ActorId_ENEMY17 0x00000211 -#define ActorId_ENEMY18 0x00000212 -#define ActorId_ENEMY19 0x00000213 -#define ActorId_ENEMY20 0x00000214 -#define ActorId_ENEMY21 0x00000215 -#define ActorId_ENEMY22 0x00000216 -#define ActorId_ENEMY23 0x00000217 +typedef UNK_TYPE ActorID; +#define ActorID_SELF 0xFFFFFF81 +#define ActorID_PLAYER 0x00000000 +#define ActorID_PARTNER 0x00000100 +#define ActorID_ENEMY0 0x00000200 +#define ActorID_ENEMY1 0x00000201 +#define ActorID_ENEMY2 0x00000202 +#define ActorID_ENEMY3 0x00000203 +#define ActorID_ENEMY4 0x00000204 +#define ActorID_ENEMY5 0x00000205 +#define ActorID_ENEMY6 0x00000206 +#define ActorID_ENEMY7 0x00000207 +#define ActorID_ENEMY8 0x00000208 +#define ActorID_ENEMY9 0x00000209 +#define ActorID_ENEMY10 0x0000020A +#define ActorID_ENEMY11 0x0000020B +#define ActorID_ENEMY12 0x0000020C +#define ActorID_ENEMY13 0x0000020D +#define ActorID_ENEMY14 0x0000020E +#define ActorID_ENEMY15 0x0000020F +#define ActorID_ENEMY16 0x00000210 +#define ActorID_ENEMY17 0x00000211 +#define ActorID_ENEMY18 0x00000212 +#define ActorID_ENEMY19 0x00000213 +#define ActorID_ENEMY20 0x00000214 +#define ActorID_ENEMY21 0x00000215 +#define ActorID_ENEMY22 0x00000216 +#define ActorID_ENEMY23 0x00000217 typedef UNK_TYPE Element; #define Element_NORMAL 0x00000001 diff --git a/src/code_181810.c b/src/code_181810.c index f84e9b98cf..d9139af077 100644 --- a/src/code_181810.c +++ b/src/code_181810.c @@ -33,7 +33,7 @@ ApiStatus ActorSpeak(ScriptInstance* script, s32 isInitialCall) { gSpeakingActorIdleAnim = get_variable(script, *args++); stringID2 = stringID; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -140,11 +140,11 @@ INCLUDE_ASM(s32, "code_181810", func_802537C0); ApiStatus PlaySoundAtActor(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); Bytecode soundID = *args++; Actor* actor; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } diff --git a/src/code_197F40.c b/src/code_197F40.c index 6c10f62b35..565fe8e82f 100644 --- a/src/code_197F40.c +++ b/src/code_197F40.c @@ -36,11 +36,11 @@ s32 get_nearest_home_index(f32 x, f32 y, f32 z) { return yVal | (xVal << 2); } -INCLUDE_ASM(void, "code_197F40", set_goal_pos_to_part, f32* goalPos, ActorId target, s32 partIndex); +INCLUDE_ASM(void, "code_197F40", set_goal_pos_to_part, f32* goalPos, ActorID target, s32 partIndex); INCLUDE_ASM(s32, "code_197F40", set_part_goal_to_actor_part); -void set_actor_current_position(ActorId actorID, f32 x, f32 y, f32 z) { +void set_actor_current_position(ActorID actorID, f32 x, f32 y, f32 z) { Actor* actor = get_actor(actorID); actor->currentPos.x = x; @@ -50,7 +50,7 @@ void set_actor_current_position(ActorId actorID, f32 x, f32 y, f32 z) { INCLUDE_ASM(s32, "code_197F40", set_part_absolute_position); -void set_actor_home_position(ActorId actorID, f32 x, f32 y, f32 z) { +void set_actor_home_position(ActorID actorID, f32 x, f32 y, f32 z) { Actor* actor = get_actor(actorID); actor->homePos.x = x; @@ -77,10 +77,10 @@ INCLUDE_ASM(s32, "code_197F40", func_80269E80); INCLUDE_ASM(s32, "code_197F40", func_80269EAC); ApiStatus SetGoalToHome(ScriptInstance* script, s32 isInitialCall) { - ActorId actorID = get_variable(script, *script->ptrReadPos); + ActorID actorID = get_variable(script, *script->ptrReadPos); Actor* actor; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -93,17 +93,17 @@ ApiStatus SetGoalToHome(ScriptInstance* script, s32 isInitialCall) { } ApiStatus SetIdleGoalToHome(ScriptInstance* script, s32 isInitialCall) { - ActorId actorID = get_variable(script, *script->ptrReadPos); + ActorID actorID = get_variable(script, *script->ptrReadPos); Actor* actor; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } actor = get_actor(actorID); - actor->flyGoalPos.x = actor->homePos.x; - actor->flyGoalPos.y = actor->homePos.y; - actor->flyGoalPos.z = actor->homePos.z; + actor->flyPos.goal.x = actor->homePos.x; + actor->flyPos.goal.y = actor->homePos.y; + actor->flyPos.goal.z = actor->homePos.z; return ApiStatus_DONE2; } @@ -112,11 +112,11 @@ INCLUDE_ASM(s32, "code_197F40", SetGoalToIndex); ApiStatus GetIndexFromPos(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); s32 a1 = *args++; Actor* actor; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -128,11 +128,11 @@ ApiStatus GetIndexFromPos(ScriptInstance* script, s32 isInitialCall) { ApiStatus GetIndexFromHome(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); s32 a1 = *args++; Actor* actor; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -144,12 +144,12 @@ ApiStatus GetIndexFromHome(ScriptInstance* script, s32 isInitialCall) { ApiStatus CountPlayerTargets(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); s32 targetSelectionFlags = *args++; s32 outVar = *args++; Actor* actor; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -162,11 +162,11 @@ ApiStatus CountPlayerTargets(ScriptInstance* script, s32 isInitialCall) { ApiStatus ForceHomePos(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); f32 x, y, z; Actor* actor; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -187,11 +187,11 @@ ApiStatus ForceHomePos(ScriptInstance* script, s32 isInitialCall) { ApiStatus SetHomePos(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); f32 x, y, z; Actor* actor; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -209,10 +209,10 @@ ApiStatus SetHomePos(ScriptInstance* script, s32 isInitialCall) { ApiStatus SetGoalToTarget(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); Actor* actor; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } actor = get_actor(actorID); @@ -222,15 +222,140 @@ ApiStatus SetGoalToTarget(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_197F40", SetPartGoalToTarget); +ApiStatus SetPartGoalToTarget(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + ActorID actorID = get_variable(script, *args++); + s32 partIndex = get_variable(script, *args++); + Actor* actor; -INCLUDE_ASM(s32, "code_197F40", SetGoalToFirstTarget); + if (actorID == ActorID_SELF) { + actorID = script->owner1.actorID; + } + actor = get_actor(actorID); -INCLUDE_ASM(s32, "code_197F40", SetGoalPos); + set_part_goal_to_actor_part(get_actor_part(actor, partIndex)->movement, actor->targetActorID, actor->targetPartIndex); -INCLUDE_ASM(s32, "code_197F40", SetIdleGoal); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "code_197F40", AddGoalPos); +ApiStatus SetGoalToFirstTarget(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + ActorID actorID = get_variable(script, *args++); + Actor* actor; + SelectableTarget* target; + + if (actorID == ActorID_SELF) { + actorID = script->owner1.actorID; + } + actor = get_actor(actorID); + + target = &actor->targetData[actor->targetIndexList[0]]; + set_goal_pos_to_part(&actor->movePos, target->actorID, target->partID); + + return ApiStatus_DONE2; +} + +ApiStatus SetGoalPos(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + ActorID actorID = get_variable(script, *args++); + Actor* actor; + ActorMovePos* movePos; + f32 x, y, z; + + if (actorID == ActorID_SELF) { + actorID = script->owner1.actorID; + } + actor = get_actor(actorID); + movePos = &actor->movePos; + + if (*args == -12345678) { + x = actor->movePos.goal.x; + } else { + x = get_variable(script, *args); + } + + *args++; + if (*args == -12345678) { + y = movePos->goal.y; + } else { + y = get_variable(script, *args); + } + + *args++; + if (*args == -12345678) { + z = movePos->goal.z; + } else { + z = get_variable(script, *args); + } + + movePos->goal.x = x; + movePos->goal.y = y; + movePos->goal.z = z; + + return ApiStatus_DONE2; +} + +ApiStatus SetIdleGoal(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + ActorID actorID = get_variable(script, *args++); + Actor* actor; + ActorFlyPos* flyPos; + f32 x, y, z; + + if (actorID == ActorID_SELF) { + actorID = script->owner1.actorID; + } + actor = get_actor(actorID); + flyPos = &actor->flyPos; + + if (*args == -12345678) { + x = actor->flyPos.goal.x; + } else { + x = get_variable(script, *args); + } + + *args++; + if (*args == -12345678) { + y = flyPos->goal.y; + } else { + y = get_variable(script, *args); + } + + *args++; + if (*args == -12345678) { + z = flyPos->goal.z; + } else { + z = get_variable(script, *args); + } + + flyPos->goal.x = x; + flyPos->goal.y = y; + flyPos->goal.z = z; + return ApiStatus_DONE2; +} + +ApiStatus AddGoalPos(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + ActorID actorID = get_variable(script, *args++); + Actor* actor; + SelectableTarget* target; + f32 x, y, z; + + if (actorID == ActorID_SELF) { + actorID = script->owner1.actorID; + } + + x = get_float_variable(script, *args++); + y = get_float_variable(script, *args++); + z = get_float_variable(script, *args++); + + actor = get_actor(actorID); + actor->movePos.goal.x += x; + actor->movePos.goal.y += y; + actor->movePos.goal.z += z; + + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "code_197F40", GetGoalPos); @@ -405,14 +530,14 @@ ApiStatus ActorExists(ScriptInstance* script, s32 isInitialCall) { Bytecode isExist; Actor* partner = gBattleStatus.partnerActor; Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } isExist = get_actor(actorID) != NULL; - if ((actorID == ActorId_PARTNER) && (partner == NULL)) { + if ((actorID == ActorID_PARTNER) && (partner == NULL)) { isExist = FALSE; } diff --git a/src/code_1A5830.c b/src/code_1A5830.c index 11280144be..76e9a13165 100644 --- a/src/code_1A5830.c +++ b/src/code_1A5830.c @@ -60,10 +60,10 @@ INCLUDE_ASM(s32, "code_1A5830", dispatch_damage_event_actor_1); ApiStatus BindTakeTurn(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); s32 var1; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -74,9 +74,9 @@ ApiStatus BindTakeTurn(ScriptInstance* script, s32 isInitialCall) { ApiStatus PauseTakeTurn(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -87,9 +87,9 @@ ApiStatus PauseTakeTurn(ScriptInstance* script, s32 isInitialCall) { ApiStatus ResumeTakeTurn(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -104,10 +104,10 @@ INCLUDE_ASM(s32, "code_1A5830", EnableIdleScript); ApiStatus BindHandleEvent(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); s32 var1; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -118,10 +118,10 @@ ApiStatus BindHandleEvent(ScriptInstance* script, s32 isInitialCall) { ApiStatus BindNextTurn(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); s32 var1; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -164,10 +164,10 @@ INCLUDE_ASM(s32, "code_1A5830", FlyPartTo); ApiStatus GetLastEvent(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); s32 outVar; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -178,11 +178,11 @@ ApiStatus GetLastEvent(ScriptInstance* script, s32 isInitialCall) { ApiStatus SetTargetActor(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); s32 targetActorID; Actor* actor; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -199,10 +199,10 @@ INCLUDE_ASM(s32, "code_1A5830", GetActorHP); ApiStatus GetEnemyMaxHP(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); s32 outVar; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -217,11 +217,11 @@ INCLUDE_ASM(s32, "code_1A5830", DropStarPoints); ApiStatus SetDefenseTable(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); s32 var1; s32 var2; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -233,10 +233,10 @@ ApiStatus SetDefenseTable(ScriptInstance* script, s32 isInitialCall) { ApiStatus SetStatusTable(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); s32 var1; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -247,11 +247,11 @@ ApiStatus SetStatusTable(ScriptInstance* script, s32 isInitialCall) { ApiStatus SetIdleAnimations(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); s32 var1; s32 var2; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -271,12 +271,12 @@ INCLUDE_ASM(s32, "code_1A5830", EnemyTestTarget); ApiStatus DispatchDamageEvent(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); Actor* actor; s32 damageAmount; s32 scriptExists; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -293,9 +293,9 @@ ApiStatus DispatchDamageEvent(ScriptInstance* script, s32 isInitialCall) { ApiStatus DispatchEvent(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -304,9 +304,9 @@ ApiStatus DispatchEvent(ScriptInstance* script, s32 isInitialCall) { } ApiStatus func_8027D2D8(ScriptInstance* script, s32 isInitialCall) { - ActorId actorID = get_variable(script, *script->ptrReadPos); + ActorID actorID = get_variable(script, *script->ptrReadPos); - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -315,9 +315,9 @@ ApiStatus func_8027D2D8(ScriptInstance* script, s32 isInitialCall) { } ApiStatus func_8027D32C(ScriptInstance* script, s32 isInitialCall) { - ActorId actorID = get_variable(script, *script->ptrReadPos); + ActorID actorID = get_variable(script, *script->ptrReadPos); - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -329,11 +329,11 @@ INCLUDE_ASM(s32, "code_1A5830", SetTargetOffset); ApiStatus func_8027D434(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); s32 partIndex; ActorPart* part; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -347,11 +347,11 @@ INCLUDE_ASM(s32, "code_1A5830", func_8027D4C8); ApiStatus EnableActorBlur(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); s32 enable = get_variable(script, *args++); Actor* actor; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -368,9 +368,9 @@ ApiStatus EnableActorBlur(ScriptInstance* script, s32 isInitialCall) { } ApiStatus func_8027D628(ScriptInstance* script, s32 isInitialCall) { - ActorId actorID = get_variable(script, *script->ptrReadPos); + ActorID actorID = get_variable(script, *script->ptrReadPos); - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -382,10 +382,10 @@ INCLUDE_ASM(s32, "code_1A5830", AfflictActor); ApiStatus func_8027D75C(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); s32 outVar = *args++; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -407,12 +407,12 @@ INCLUDE_ASM(s32, "code_1A5830", SetActorSize); ApiStatus GetActorSize(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); s32 outY = *args++; s32 outX = *args++; Actor* actor; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -426,10 +426,10 @@ INCLUDE_ASM(s32, "code_1A5830", SetPartSize); ApiStatus GetOriginalActorType(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); s32 outVar = *args++; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -439,10 +439,10 @@ ApiStatus GetOriginalActorType(ScriptInstance* script, s32 isInitialCall) { ApiStatus GetCurrentActorType(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); s32 outVar = *args++; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } @@ -452,10 +452,10 @@ ApiStatus GetCurrentActorType(ScriptInstance* script, s32 isInitialCall) { ApiStatus GetLastDamage(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); s32 outVar; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.actorID; } outVar = *args++; diff --git a/src/code_1AC760.c b/src/code_1AC760.c index 6697da5fff..4a27ff9f56 100644 --- a/src/code_1AC760.c +++ b/src/code_1AC760.c @@ -20,10 +20,10 @@ INCLUDE_ASM(s32, "code_1AC760", func_8027FC90); ApiStatus GetActorLevel(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 actorID = get_variable(script, *args++); + ActorID actorID = get_variable(script, *args++); Bytecode* outVar; - if (actorID == ActorId_SELF) { + if (actorID == ActorID_SELF) { actorID = script->owner1.enemyID; } From 0f530e12aaae3b894e866964713cc375f723ca60 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 19 Nov 2020 19:58:41 -0500 Subject: [PATCH 02/38] 5 mo --- asm/nonmatchings/code_197F40/AddGoalPos.s | 59 --------- asm/nonmatchings/code_197F40/GetActorPos.s | 56 --------- asm/nonmatchings/code_197F40/GetGoalPos.s | 56 --------- asm/nonmatchings/code_197F40/GetIdleGoal.s | 56 --------- asm/nonmatchings/code_197F40/GetPartTarget.s | 65 ---------- include/common_structs.h | 2 +- src/code_16c8e0.c | 2 +- src/code_17FEB0.c | 8 +- src/code_190B20.c | 4 +- src/code_1967B0.c | 2 +- src/code_197F40.c | 123 +++++++++++++++++-- 11 files changed, 124 insertions(+), 309 deletions(-) delete mode 100644 asm/nonmatchings/code_197F40/AddGoalPos.s delete mode 100644 asm/nonmatchings/code_197F40/GetActorPos.s delete mode 100644 asm/nonmatchings/code_197F40/GetGoalPos.s delete mode 100644 asm/nonmatchings/code_197F40/GetIdleGoal.s delete mode 100644 asm/nonmatchings/code_197F40/GetPartTarget.s diff --git a/asm/nonmatchings/code_197F40/AddGoalPos.s b/asm/nonmatchings/code_197F40/AddGoalPos.s deleted file mode 100644 index 61857deb49..0000000000 --- a/asm/nonmatchings/code_197F40/AddGoalPos.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel AddGoalPos -/* 199028 8026A748 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 19902C 8026A74C AFB20018 */ sw $s2, 0x18($sp) -/* 199030 8026A750 0080902D */ daddu $s2, $a0, $zero -/* 199034 8026A754 AFBF001C */ sw $ra, 0x1c($sp) -/* 199038 8026A758 AFB10014 */ sw $s1, 0x14($sp) -/* 19903C 8026A75C AFB00010 */ sw $s0, 0x10($sp) -/* 199040 8026A760 F7B80030 */ sdc1 $f24, 0x30($sp) -/* 199044 8026A764 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 199048 8026A768 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 19904C 8026A76C 8E50000C */ lw $s0, 0xc($s2) -/* 199050 8026A770 8E050000 */ lw $a1, ($s0) -/* 199054 8026A774 0C0B1EAF */ jal get_variable -/* 199058 8026A778 26100004 */ addiu $s0, $s0, 4 -/* 19905C 8026A77C 0040882D */ daddu $s1, $v0, $zero -/* 199060 8026A780 2402FF81 */ addiu $v0, $zero, -0x7f -/* 199064 8026A784 16220002 */ bne $s1, $v0, .L8026A790 -/* 199068 8026A788 00000000 */ nop -/* 19906C 8026A78C 8E510148 */ lw $s1, 0x148($s2) -.L8026A790: -/* 199070 8026A790 8E050000 */ lw $a1, ($s0) -/* 199074 8026A794 26100004 */ addiu $s0, $s0, 4 -/* 199078 8026A798 0C0B210B */ jal get_float_variable -/* 19907C 8026A79C 0240202D */ daddu $a0, $s2, $zero -/* 199080 8026A7A0 8E050000 */ lw $a1, ($s0) -/* 199084 8026A7A4 26100004 */ addiu $s0, $s0, 4 -/* 199088 8026A7A8 0240202D */ daddu $a0, $s2, $zero -/* 19908C 8026A7AC 0C0B210B */ jal get_float_variable -/* 199090 8026A7B0 46000606 */ mov.s $f24, $f0 -/* 199094 8026A7B4 0240202D */ daddu $a0, $s2, $zero -/* 199098 8026A7B8 8E050000 */ lw $a1, ($s0) -/* 19909C 8026A7BC 0C0B210B */ jal get_float_variable -/* 1990A0 8026A7C0 46000506 */ mov.s $f20, $f0 -/* 1990A4 8026A7C4 0220202D */ daddu $a0, $s1, $zero -/* 1990A8 8026A7C8 0C09A75B */ jal get_actor -/* 1990AC 8026A7CC 46000586 */ mov.s $f22, $f0 -/* 1990B0 8026A7D0 0040182D */ daddu $v1, $v0, $zero -/* 1990B4 8026A7D4 C4640018 */ lwc1 $f4, 0x18($v1) -/* 1990B8 8026A7D8 46182100 */ add.s $f4, $f4, $f24 -/* 1990BC 8026A7DC C462001C */ lwc1 $f2, 0x1c($v1) -/* 1990C0 8026A7E0 46141080 */ add.s $f2, $f2, $f20 -/* 1990C4 8026A7E4 C4600020 */ lwc1 $f0, 0x20($v1) -/* 1990C8 8026A7E8 46160000 */ add.s $f0, $f0, $f22 -/* 1990CC 8026A7EC E4640018 */ swc1 $f4, 0x18($v1) -/* 1990D0 8026A7F0 E462001C */ swc1 $f2, 0x1c($v1) -/* 1990D4 8026A7F4 E4600020 */ swc1 $f0, 0x20($v1) -/* 1990D8 8026A7F8 8FBF001C */ lw $ra, 0x1c($sp) -/* 1990DC 8026A7FC 8FB20018 */ lw $s2, 0x18($sp) -/* 1990E0 8026A800 8FB10014 */ lw $s1, 0x14($sp) -/* 1990E4 8026A804 8FB00010 */ lw $s0, 0x10($sp) -/* 1990E8 8026A808 D7B80030 */ ldc1 $f24, 0x30($sp) -/* 1990EC 8026A80C D7B60028 */ ldc1 $f22, 0x28($sp) -/* 1990F0 8026A810 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 1990F4 8026A814 24020002 */ addiu $v0, $zero, 2 -/* 1990F8 8026A818 03E00008 */ jr $ra -/* 1990FC 8026A81C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_197F40/GetActorPos.s b/asm/nonmatchings/code_197F40/GetActorPos.s deleted file mode 100644 index b1f4888842..0000000000 --- a/asm/nonmatchings/code_197F40/GetActorPos.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel GetActorPos -/* 199388 8026AAA8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 19938C 8026AAAC AFB40020 */ sw $s4, 0x20($sp) -/* 199390 8026AAB0 0080A02D */ daddu $s4, $a0, $zero -/* 199394 8026AAB4 AFBF0024 */ sw $ra, 0x24($sp) -/* 199398 8026AAB8 AFB3001C */ sw $s3, 0x1c($sp) -/* 19939C 8026AABC AFB20018 */ sw $s2, 0x18($sp) -/* 1993A0 8026AAC0 AFB10014 */ sw $s1, 0x14($sp) -/* 1993A4 8026AAC4 AFB00010 */ sw $s0, 0x10($sp) -/* 1993A8 8026AAC8 8E92000C */ lw $s2, 0xc($s4) -/* 1993AC 8026AACC 8E450000 */ lw $a1, ($s2) -/* 1993B0 8026AAD0 0C0B1EAF */ jal get_variable -/* 1993B4 8026AAD4 26520004 */ addiu $s2, $s2, 4 -/* 1993B8 8026AAD8 0040202D */ daddu $a0, $v0, $zero -/* 1993BC 8026AADC 2402FF81 */ addiu $v0, $zero, -0x7f -/* 1993C0 8026AAE0 14820002 */ bne $a0, $v0, .L8026AAEC -/* 1993C4 8026AAE4 00000000 */ nop -/* 1993C8 8026AAE8 8E840148 */ lw $a0, 0x148($s4) -.L8026AAEC: -/* 1993CC 8026AAEC 0C09A75B */ jal get_actor -/* 1993D0 8026AAF0 00000000 */ nop -/* 1993D4 8026AAF4 8E450000 */ lw $a1, ($s2) -/* 1993D8 8026AAF8 26520004 */ addiu $s2, $s2, 4 -/* 1993DC 8026AAFC C4400144 */ lwc1 $f0, 0x144($v0) -/* 1993E0 8026AB00 C442014C */ lwc1 $f2, 0x14c($v0) -/* 1993E4 8026AB04 8E500000 */ lw $s0, ($s2) -/* 1993E8 8026AB08 4600010D */ trunc.w.s $f4, $f0 -/* 1993EC 8026AB0C 44062000 */ mfc1 $a2, $f4 -/* 1993F0 8026AB10 C4400148 */ lwc1 $f0, 0x148($v0) -/* 1993F4 8026AB14 8E520004 */ lw $s2, 4($s2) -/* 1993F8 8026AB18 4600010D */ trunc.w.s $f4, $f0 -/* 1993FC 8026AB1C 44112000 */ mfc1 $s1, $f4 -/* 199400 8026AB20 4600110D */ trunc.w.s $f4, $f2 -/* 199404 8026AB24 44132000 */ mfc1 $s3, $f4 -/* 199408 8026AB28 0C0B2026 */ jal set_variable -/* 19940C 8026AB2C 0280202D */ daddu $a0, $s4, $zero -/* 199410 8026AB30 0280202D */ daddu $a0, $s4, $zero -/* 199414 8026AB34 0200282D */ daddu $a1, $s0, $zero -/* 199418 8026AB38 0C0B2026 */ jal set_variable -/* 19941C 8026AB3C 0220302D */ daddu $a2, $s1, $zero -/* 199420 8026AB40 0280202D */ daddu $a0, $s4, $zero -/* 199424 8026AB44 0240282D */ daddu $a1, $s2, $zero -/* 199428 8026AB48 0C0B2026 */ jal set_variable -/* 19942C 8026AB4C 0260302D */ daddu $a2, $s3, $zero -/* 199430 8026AB50 8FBF0024 */ lw $ra, 0x24($sp) -/* 199434 8026AB54 8FB40020 */ lw $s4, 0x20($sp) -/* 199438 8026AB58 8FB3001C */ lw $s3, 0x1c($sp) -/* 19943C 8026AB5C 8FB20018 */ lw $s2, 0x18($sp) -/* 199440 8026AB60 8FB10014 */ lw $s1, 0x14($sp) -/* 199444 8026AB64 8FB00010 */ lw $s0, 0x10($sp) -/* 199448 8026AB68 24020002 */ addiu $v0, $zero, 2 -/* 19944C 8026AB6C 03E00008 */ jr $ra -/* 199450 8026AB70 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_197F40/GetGoalPos.s b/asm/nonmatchings/code_197F40/GetGoalPos.s deleted file mode 100644 index 3ef916f7ab..0000000000 --- a/asm/nonmatchings/code_197F40/GetGoalPos.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel GetGoalPos -/* 199100 8026A820 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 199104 8026A824 AFB40020 */ sw $s4, 0x20($sp) -/* 199108 8026A828 0080A02D */ daddu $s4, $a0, $zero -/* 19910C 8026A82C AFBF0024 */ sw $ra, 0x24($sp) -/* 199110 8026A830 AFB3001C */ sw $s3, 0x1c($sp) -/* 199114 8026A834 AFB20018 */ sw $s2, 0x18($sp) -/* 199118 8026A838 AFB10014 */ sw $s1, 0x14($sp) -/* 19911C 8026A83C AFB00010 */ sw $s0, 0x10($sp) -/* 199120 8026A840 8E92000C */ lw $s2, 0xc($s4) -/* 199124 8026A844 8E450000 */ lw $a1, ($s2) -/* 199128 8026A848 0C0B1EAF */ jal get_variable -/* 19912C 8026A84C 26520004 */ addiu $s2, $s2, 4 -/* 199130 8026A850 0040202D */ daddu $a0, $v0, $zero -/* 199134 8026A854 2402FF81 */ addiu $v0, $zero, -0x7f -/* 199138 8026A858 14820002 */ bne $a0, $v0, .L8026A864 -/* 19913C 8026A85C 00000000 */ nop -/* 199140 8026A860 8E840148 */ lw $a0, 0x148($s4) -.L8026A864: -/* 199144 8026A864 0C09A75B */ jal get_actor -/* 199148 8026A868 00000000 */ nop -/* 19914C 8026A86C 8E450000 */ lw $a1, ($s2) -/* 199150 8026A870 26520004 */ addiu $s2, $s2, 4 -/* 199154 8026A874 C4400018 */ lwc1 $f0, 0x18($v0) -/* 199158 8026A878 C4420020 */ lwc1 $f2, 0x20($v0) -/* 19915C 8026A87C 8E500000 */ lw $s0, ($s2) -/* 199160 8026A880 4600010D */ trunc.w.s $f4, $f0 -/* 199164 8026A884 44062000 */ mfc1 $a2, $f4 -/* 199168 8026A888 C440001C */ lwc1 $f0, 0x1c($v0) -/* 19916C 8026A88C 8E520004 */ lw $s2, 4($s2) -/* 199170 8026A890 4600010D */ trunc.w.s $f4, $f0 -/* 199174 8026A894 44112000 */ mfc1 $s1, $f4 -/* 199178 8026A898 4600110D */ trunc.w.s $f4, $f2 -/* 19917C 8026A89C 44132000 */ mfc1 $s3, $f4 -/* 199180 8026A8A0 0C0B2026 */ jal set_variable -/* 199184 8026A8A4 0280202D */ daddu $a0, $s4, $zero -/* 199188 8026A8A8 0280202D */ daddu $a0, $s4, $zero -/* 19918C 8026A8AC 0200282D */ daddu $a1, $s0, $zero -/* 199190 8026A8B0 0C0B2026 */ jal set_variable -/* 199194 8026A8B4 0220302D */ daddu $a2, $s1, $zero -/* 199198 8026A8B8 0280202D */ daddu $a0, $s4, $zero -/* 19919C 8026A8BC 0240282D */ daddu $a1, $s2, $zero -/* 1991A0 8026A8C0 0C0B2026 */ jal set_variable -/* 1991A4 8026A8C4 0260302D */ daddu $a2, $s3, $zero -/* 1991A8 8026A8C8 8FBF0024 */ lw $ra, 0x24($sp) -/* 1991AC 8026A8CC 8FB40020 */ lw $s4, 0x20($sp) -/* 1991B0 8026A8D0 8FB3001C */ lw $s3, 0x1c($sp) -/* 1991B4 8026A8D4 8FB20018 */ lw $s2, 0x18($sp) -/* 1991B8 8026A8D8 8FB10014 */ lw $s1, 0x14($sp) -/* 1991BC 8026A8DC 8FB00010 */ lw $s0, 0x10($sp) -/* 1991C0 8026A8E0 24020002 */ addiu $v0, $zero, 2 -/* 1991C4 8026A8E4 03E00008 */ jr $ra -/* 1991C8 8026A8E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_197F40/GetIdleGoal.s b/asm/nonmatchings/code_197F40/GetIdleGoal.s deleted file mode 100644 index 4c922af113..0000000000 --- a/asm/nonmatchings/code_197F40/GetIdleGoal.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel GetIdleGoal -/* 1991CC 8026A8EC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 1991D0 8026A8F0 AFB40020 */ sw $s4, 0x20($sp) -/* 1991D4 8026A8F4 0080A02D */ daddu $s4, $a0, $zero -/* 1991D8 8026A8F8 AFBF0024 */ sw $ra, 0x24($sp) -/* 1991DC 8026A8FC AFB3001C */ sw $s3, 0x1c($sp) -/* 1991E0 8026A900 AFB20018 */ sw $s2, 0x18($sp) -/* 1991E4 8026A904 AFB10014 */ sw $s1, 0x14($sp) -/* 1991E8 8026A908 AFB00010 */ sw $s0, 0x10($sp) -/* 1991EC 8026A90C 8E92000C */ lw $s2, 0xc($s4) -/* 1991F0 8026A910 8E450000 */ lw $a1, ($s2) -/* 1991F4 8026A914 0C0B1EAF */ jal get_variable -/* 1991F8 8026A918 26520004 */ addiu $s2, $s2, 4 -/* 1991FC 8026A91C 0040202D */ daddu $a0, $v0, $zero -/* 199200 8026A920 2402FF81 */ addiu $v0, $zero, -0x7f -/* 199204 8026A924 14820002 */ bne $a0, $v0, .L8026A930 -/* 199208 8026A928 00000000 */ nop -/* 19920C 8026A92C 8E840148 */ lw $a0, 0x148($s4) -.L8026A930: -/* 199210 8026A930 0C09A75B */ jal get_actor -/* 199214 8026A934 00000000 */ nop -/* 199218 8026A938 8E450000 */ lw $a1, ($s2) -/* 19921C 8026A93C 26520004 */ addiu $s2, $s2, 4 -/* 199220 8026A940 C44000D4 */ lwc1 $f0, 0xd4($v0) -/* 199224 8026A944 C44200DC */ lwc1 $f2, 0xdc($v0) -/* 199228 8026A948 8E500000 */ lw $s0, ($s2) -/* 19922C 8026A94C 4600010D */ trunc.w.s $f4, $f0 -/* 199230 8026A950 44062000 */ mfc1 $a2, $f4 -/* 199234 8026A954 C44000D8 */ lwc1 $f0, 0xd8($v0) -/* 199238 8026A958 8E520004 */ lw $s2, 4($s2) -/* 19923C 8026A95C 4600010D */ trunc.w.s $f4, $f0 -/* 199240 8026A960 44112000 */ mfc1 $s1, $f4 -/* 199244 8026A964 4600110D */ trunc.w.s $f4, $f2 -/* 199248 8026A968 44132000 */ mfc1 $s3, $f4 -/* 19924C 8026A96C 0C0B2026 */ jal set_variable -/* 199250 8026A970 0280202D */ daddu $a0, $s4, $zero -/* 199254 8026A974 0280202D */ daddu $a0, $s4, $zero -/* 199258 8026A978 0200282D */ daddu $a1, $s0, $zero -/* 19925C 8026A97C 0C0B2026 */ jal set_variable -/* 199260 8026A980 0220302D */ daddu $a2, $s1, $zero -/* 199264 8026A984 0280202D */ daddu $a0, $s4, $zero -/* 199268 8026A988 0240282D */ daddu $a1, $s2, $zero -/* 19926C 8026A98C 0C0B2026 */ jal set_variable -/* 199270 8026A990 0260302D */ daddu $a2, $s3, $zero -/* 199274 8026A994 8FBF0024 */ lw $ra, 0x24($sp) -/* 199278 8026A998 8FB40020 */ lw $s4, 0x20($sp) -/* 19927C 8026A99C 8FB3001C */ lw $s3, 0x1c($sp) -/* 199280 8026A9A0 8FB20018 */ lw $s2, 0x18($sp) -/* 199284 8026A9A4 8FB10014 */ lw $s1, 0x14($sp) -/* 199288 8026A9A8 8FB00010 */ lw $s0, 0x10($sp) -/* 19928C 8026A9AC 24020002 */ addiu $v0, $zero, 2 -/* 199290 8026A9B0 03E00008 */ jr $ra -/* 199294 8026A9B4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_197F40/GetPartTarget.s b/asm/nonmatchings/code_197F40/GetPartTarget.s deleted file mode 100644 index 2754275986..0000000000 --- a/asm/nonmatchings/code_197F40/GetPartTarget.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel GetPartTarget -/* 199298 8026A9B8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 19929C 8026A9BC AFB40020 */ sw $s4, 0x20($sp) -/* 1992A0 8026A9C0 0080A02D */ daddu $s4, $a0, $zero -/* 1992A4 8026A9C4 AFBF0024 */ sw $ra, 0x24($sp) -/* 1992A8 8026A9C8 AFB3001C */ sw $s3, 0x1c($sp) -/* 1992AC 8026A9CC AFB20018 */ sw $s2, 0x18($sp) -/* 1992B0 8026A9D0 AFB10014 */ sw $s1, 0x14($sp) -/* 1992B4 8026A9D4 AFB00010 */ sw $s0, 0x10($sp) -/* 1992B8 8026A9D8 8E92000C */ lw $s2, 0xc($s4) -/* 1992BC 8026A9DC 8E450000 */ lw $a1, ($s2) -/* 1992C0 8026A9E0 0C0B1EAF */ jal get_variable -/* 1992C4 8026A9E4 26520004 */ addiu $s2, $s2, 4 -/* 1992C8 8026A9E8 0040802D */ daddu $s0, $v0, $zero -/* 1992CC 8026A9EC 8E450000 */ lw $a1, ($s2) -/* 1992D0 8026A9F0 26520004 */ addiu $s2, $s2, 4 -/* 1992D4 8026A9F4 0C0B1EAF */ jal get_variable -/* 1992D8 8026A9F8 0280202D */ daddu $a0, $s4, $zero -/* 1992DC 8026A9FC 0040882D */ daddu $s1, $v0, $zero -/* 1992E0 8026AA00 2402FF81 */ addiu $v0, $zero, -0x7f -/* 1992E4 8026AA04 16020002 */ bne $s0, $v0, .L8026AA10 -/* 1992E8 8026AA08 00000000 */ nop -/* 1992EC 8026AA0C 8E900148 */ lw $s0, 0x148($s4) -.L8026AA10: -/* 1992F0 8026AA10 0C09A75B */ jal get_actor -/* 1992F4 8026AA14 0200202D */ daddu $a0, $s0, $zero -/* 1992F8 8026AA18 0040202D */ daddu $a0, $v0, $zero -/* 1992FC 8026AA1C 0C099117 */ jal get_actor_part -/* 199300 8026AA20 0220282D */ daddu $a1, $s1, $zero -/* 199304 8026AA24 8E450000 */ lw $a1, ($s2) -/* 199308 8026AA28 26520004 */ addiu $s2, $s2, 4 -/* 19930C 8026AA2C 8C420010 */ lw $v0, 0x10($v0) -/* 199310 8026AA30 8E500000 */ lw $s0, ($s2) -/* 199314 8026AA34 C440000C */ lwc1 $f0, 0xc($v0) -/* 199318 8026AA38 8E520004 */ lw $s2, 4($s2) -/* 19931C 8026AA3C 4600010D */ trunc.w.s $f4, $f0 -/* 199320 8026AA40 44062000 */ mfc1 $a2, $f4 -/* 199324 8026AA44 C4400010 */ lwc1 $f0, 0x10($v0) -/* 199328 8026AA48 C4420014 */ lwc1 $f2, 0x14($v0) -/* 19932C 8026AA4C 4600010D */ trunc.w.s $f4, $f0 -/* 199330 8026AA50 44112000 */ mfc1 $s1, $f4 -/* 199334 8026AA54 4600110D */ trunc.w.s $f4, $f2 -/* 199338 8026AA58 44132000 */ mfc1 $s3, $f4 -/* 19933C 8026AA5C 0C0B2026 */ jal set_variable -/* 199340 8026AA60 0280202D */ daddu $a0, $s4, $zero -/* 199344 8026AA64 0280202D */ daddu $a0, $s4, $zero -/* 199348 8026AA68 0200282D */ daddu $a1, $s0, $zero -/* 19934C 8026AA6C 0C0B2026 */ jal set_variable -/* 199350 8026AA70 0220302D */ daddu $a2, $s1, $zero -/* 199354 8026AA74 0280202D */ daddu $a0, $s4, $zero -/* 199358 8026AA78 0240282D */ daddu $a1, $s2, $zero -/* 19935C 8026AA7C 0C0B2026 */ jal set_variable -/* 199360 8026AA80 0260302D */ daddu $a2, $s3, $zero -/* 199364 8026AA84 8FBF0024 */ lw $ra, 0x24($sp) -/* 199368 8026AA88 8FB40020 */ lw $s4, 0x20($sp) -/* 19936C 8026AA8C 8FB3001C */ lw $s3, 0x1c($sp) -/* 199370 8026AA90 8FB20018 */ lw $s2, 0x18($sp) -/* 199374 8026AA94 8FB10014 */ lw $s1, 0x14($sp) -/* 199378 8026AA98 8FB00010 */ lw $s0, 0x10($sp) -/* 19937C 8026AA9C 24020002 */ addiu $v0, $zero, 2 -/* 199380 8026AAA0 03E00008 */ jr $ra -/* 199384 8026AAA4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/include/common_structs.h b/include/common_structs.h index d1ac4a3bb8..bb867232eb 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1008,7 +1008,7 @@ typedef struct SelectableTarget { typedef struct ActorPartMovement { /* 0x00 */ char unk_00[12]; - /* 0x0C */ f32 goalPos[3]; + /* 0x0C */ Vec3f goalPos; /* 0x18 */ char unk_18[12]; /* 0x24 */ f32 jumpScale; /* 0x28 */ f32 moveSpeed; diff --git a/src/code_16c8e0.c b/src/code_16c8e0.c index a8bf237eb2..bb5433d310 100644 --- a/src/code_16c8e0.c +++ b/src/code_16c8e0.c @@ -1,7 +1,7 @@ #include "common.h" void get_dpad_input_radial(f32* angle, f32* magnitude) { - BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* battleStatus = BATTLE_STATUS; u16 currentButtonsDown; f32 stickX; f32 stickY; diff --git a/src/code_17FEB0.c b/src/code_17FEB0.c index 0430c715f6..a1b12c93c9 100644 --- a/src/code_17FEB0.c +++ b/src/code_17FEB0.c @@ -40,7 +40,7 @@ HitResult calc_item_check_hit(void) { INCLUDE_ASM(s32, "code_17FEB0", calc_item_damage_enemy); ApiStatus ItemDamageEnemy(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* battleStatus = BATTLE_STATUS; Bytecode* args = script->ptrReadPos; s32 itemDamageOut = *args++; s32 a5; @@ -107,7 +107,7 @@ ApiStatus ItemDamageEnemy(ScriptInstance* script, s32 isInitialCall) { } ApiStatus ItemAfflictEnemy(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* battleStatus = BATTLE_STATUS; Bytecode* args = script->ptrReadPos; s32 itemDamageOut = *args++; s32 a5; @@ -175,7 +175,7 @@ ApiStatus ItemAfflictEnemy(ScriptInstance* script, s32 isInitialCall) { } ApiStatus func_80252B3C(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* battleStatus = BATTLE_STATUS; Bytecode* args = script->ptrReadPos; s32 itemDamageOut = *args++; s32 a5; @@ -242,7 +242,7 @@ ApiStatus func_80252B3C(ScriptInstance* script, s32 isInitialCall) { } ApiStatus ItemCheckHit(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* battleStatus = BATTLE_STATUS; Bytecode* args = script->ptrReadPos; s32 itemDamageOut = *args++; s32 a5; diff --git a/src/code_190B20.c b/src/code_190B20.c index 73d2a494d4..615bc0ee2a 100644 --- a/src/code_190B20.c +++ b/src/code_190B20.c @@ -358,7 +358,7 @@ void func_80071A50(s32, f32 x, f32 y, f32 z, f32 scale /* maybe */, s32); void func_80071C30(s32, f32 x, f32 y, f32 z, f32 scale /* maybe */, s32); void remove_player_buffs(PlayerBuff buffs) { - BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* battleStatus = BATTLE_STATUS; Actor* player = battleStatus->playerActor; Actor* partner = battleStatus->partnerActor; ActorPart* playerPartsTable = player->partsTable; @@ -415,7 +415,7 @@ void remove_player_buffs(PlayerBuff buffs) { } if ((partner != NULL) && (buffs & 0x10000)) { - BattleStatus* bs = &gBattleStatus; + BattleStatus* bs = BATTLE_STATUS; partner->isGlowing = FALSE; bs->flags1 &= ~0x40000000; diff --git a/src/code_1967B0.c b/src/code_1967B0.c index 28207b3d72..173626fbbd 100644 --- a/src/code_1967B0.c +++ b/src/code_1967B0.c @@ -5,7 +5,7 @@ INCLUDE_ASM(s32, "code_1967B0", LoadItemScript); INCLUDE_ASM(s32, "code_1967B0", LoadFreeItemScript); ApiStatus LoadMoveScript(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* battleStatus = BATTLE_STATUS; s32* moveScript = gMoveScriptTable[battleStatus->selectedMoveID]; dma_copy(moveScript[0], moveScript[1], moveScript[2]); diff --git a/src/code_197F40.c b/src/code_197F40.c index 565fe8e82f..49b3d3bd83 100644 --- a/src/code_197F40.c +++ b/src/code_197F40.c @@ -1,7 +1,7 @@ #include "common.h" s32 count_targets(Actor* actor, s32 targetHomeIndex, s32 targetSelectionFlags) { - BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* battleStatus = BATTLE_STATUS; battleStatus->targetHomeIndex = targetHomeIndex; battleStatus->currentTargetListFlags = targetSelectionFlags; @@ -338,7 +338,6 @@ ApiStatus AddGoalPos(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; ActorID actorID = get_variable(script, *args++); Actor* actor; - SelectableTarget* target; f32 x, y, z; if (actorID == ActorID_SELF) { @@ -357,13 +356,121 @@ ApiStatus AddGoalPos(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_197F40", GetGoalPos); +ApiStatus GetGoalPos(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + ActorID actorID = get_variable(script, *args++); + Actor* actor; + s32 outX, outY, outZ; + s32 x, y, z; -INCLUDE_ASM(s32, "code_197F40", GetIdleGoal); + if (actorID == ActorID_SELF) { + actorID = script->owner1.actorID; + } -INCLUDE_ASM(s32, "code_197F40", GetPartTarget); + actor = get_actor(actorID); -INCLUDE_ASM(s32, "code_197F40", GetActorPos); + outX = *args++; + outY = *args++; + outZ = *args++; + + x = actor->movePos.goal.x; + y = actor->movePos.goal.y; + z = actor->movePos.goal.z; + + set_variable(script, outX, x); + set_variable(script, outY, y); + set_variable(script, outZ, z); + + return ApiStatus_DONE2; +} + +// should this be renamed to GetFlyGoal ? +ApiStatus GetIdleGoal(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + ActorID actorID = get_variable(script, *args++); + Actor* actor; + s32 outX, outY, outZ; + s32 x, y, z; + + if (actorID == ActorID_SELF) { + actorID = script->owner1.actorID; + } + + actor = get_actor(actorID); + + outX = *args++; + outY = *args++; + outZ = *args++; + + x = actor->flyPos.goal.x; + y = actor->flyPos.goal.y; + z = actor->flyPos.goal.z; + + set_variable(script, outX, x); + set_variable(script, outY, y); + set_variable(script, outZ, z); + + return ApiStatus_DONE2; +} + +ApiStatus GetPartTarget(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + ActorID actorID = get_variable(script, *args++); + s32 partIndex = get_variable(script, *args++); + Actor* actor; + ActorPart* actorPart; + s32 outX, outY, outZ; + s32 x, y, z; + + if (actorID == ActorID_SELF) { + actorID = script->owner1.actorID; + } + + actor = get_actor(actorID); + actorPart = get_actor_part(actor, partIndex); + + outX = *args++; + outY = *args++; + outZ = *args++; + + x = actorPart->movement->goalPos.x; + y = actorPart->movement->goalPos.y; + z = actorPart->movement->goalPos.z; + + set_variable(script, outX, x); + set_variable(script, outY, y); + set_variable(script, outZ, z); + + return ApiStatus_DONE2; +} + +ApiStatus GetActorPos(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + ActorID actorID = get_variable(script, *args++); + Actor* actor; + s32 outX, outY, outZ; + s32 x, y, z; + + if (actorID == ActorID_SELF) { + actorID = script->owner1.actorID; + } + + actor = get_actor(actorID); + + outX = *args++; + outY = *args++; + outZ = *args++; + + x = actor->currentPos.x; + y = actor->currentPos.y; + z = actor->currentPos.z; + + set_variable(script, outX, x); + set_variable(script, outY, y); + set_variable(script, outZ, z); + + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "code_197F40", GetPartOffset); @@ -563,7 +670,7 @@ ApiStatus SetBattleInputMask(ScriptInstance* script, s32 isInitialCall) { ApiStatus SetBattleInputButtons(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* battleStatus = BATTLE_STATUS; s32 currentButtonsDown = *args++; s32 currentButtonsPressed = *args++; s32 currentButtonsHeld = *args; @@ -762,7 +869,7 @@ INCLUDE_ASM(s32, "code_197F40", calc_player_damage_enemy); INCLUDE_ASM(s32, "code_197F40", dispatch_damage_event_player); void dispatch_damage_event_player_0(s32 damageAmount, Event event) { - BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* battleStatus = BATTLE_STATUS; battleStatus->currentAttackElement = Element_END; battleStatus->unk_19A = 0; From 4b8af37c35a01be289336bfd529e9f10d183803c Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 19 Nov 2020 23:08:05 -0500 Subject: [PATCH 03/38] UnkNpcAIFunc1 --- .../code_20ec0_len_5040/func_80049B44.s | 52 --------------- .../arn_03/BDED90/func_80240400_BDF190.s | 52 --------------- .../arn_03/BDED90/func_80240B94_BDF924.s | 2 +- .../arn_03/BDED90/func_8024113C_BDFECC.s | 2 +- .../arn_04/BE37B0/func_80240400_BE3BB0.s | 52 --------------- .../arn_04/BE37B0/func_80240B94_BE4344.s | 2 +- .../arn_05/BE7BE0/func_80240400_BE7FE0.s | 52 --------------- .../arn_05/BE7BE0/func_80240B94_BE8774.s | 2 +- .../arn_05/BE7BE0/func_8024113C_BE8D1C.s | 2 +- .../arn_07/BED740/func_80241128_BEDF18.s | 52 --------------- .../arn_07/BED740/func_80241C5C_BEEA4C.s | 2 +- .../dgb_01/BFD9A0/func_802408F8_BFE178.s | 52 --------------- .../dgb_01/BFD9A0/func_8024142C_BFECAC.s | 2 +- .../dgb_01/BFD9A0/func_802422B0_BFFB30.s | 2 +- .../dgb_03/C31730/func_80240F20_C32400.s | 52 --------------- .../dgb_03/C31730/func_802416B4_C32B94.s | 2 +- .../dgb_03/C31730/func_802419B0_C32E90.s | 2 +- .../dgb_04/C36530/func_802407D8_C36D08.s | 52 --------------- .../dgb_04/C36530/func_8024130C_C3783C.s | 2 +- .../dgb_04/C36530/func_80242154_C38684.s | 2 +- .../dgb_08/C3FDB0/func_80240400_C401B0.s | 52 --------------- .../dgb_08/C3FDB0/func_80240B94_C40944.s | 2 +- .../dgb_09/C46BE0/func_80241BFC_C487DC.s | 52 --------------- .../dgb_09/C46BE0/func_80242730_C49310.s | 2 +- .../dgb_09/C46BE0/func_80243578_C4A158.s | 2 +- .../dgb_15/C4F510/func_80240CD0_C501E0.s | 52 --------------- .../dgb_15/C4F510/func_80241464_C50974.s | 2 +- .../dgb_18/C55F40/func_80240400_C56340.s | 52 --------------- .../dgb_18/C55F40/func_80240B94_C56AD4.s | 2 +- .../dro_01/95B7E0/func_802409E0_95BBE0.s | 52 --------------- .../dro_01/95B7E0/func_80241174_95C374.s | 2 +- .../flo_00/C9DF60/func_80240440_C9E360.s | 52 --------------- .../flo_00/C9DF60/func_80240BD4_C9EAF4.s | 2 +- .../flo_09/CB5320/func_80240AF8_CB5AF8.s | 52 --------------- .../flo_09/CB5320/func_8024162C_CB662C.s | 2 +- .../flo_13/CC3850/func_8024099C_CC41AC.s | 52 --------------- .../flo_13/CC3850/func_802414D0_CC4CE0.s | 2 +- .../flo_13/CC3850/func_80241DB8_CC55C8.s | 2 +- .../flo_14/CCBE20/func_802412E8_CCC5F8.s | 52 --------------- .../flo_14/CCBE20/func_80241E1C_CCD12C.s | 2 +- .../flo_16/CD2C80/func_80241628_CD3458.s | 52 --------------- .../flo_16/CD2C80/func_8024215C_CD3F8C.s | 2 +- .../flo_16/CD2C80/func_80242754_CD4584.s | 2 +- .../flo_17/CD7350/func_80240848_CD7B28.s | 52 --------------- .../flo_17/CD7350/func_8024137C_CD865C.s | 2 +- .../flo_17/CD7350/func_80241C64_CD8F44.s | 2 +- .../flo_25/CF2C10/func_80240818_CF33E8.s | 52 --------------- .../flo_25/CF2C10/func_8024134C_CF3F1C.s | 2 +- .../flo_25/CF2C10/func_80241944_CF4514.s | 2 +- .../hos_02/A17210/func_802417C8_A179E8.s | 52 --------------- .../hos_02/A17210/func_802422FC_A1851C.s | 2 +- .../hos_02/A17210/func_802428F4_A18B14.s | 2 +- .../hos_03/A1BDB0/func_80241488_A1C588.s | 52 --------------- .../hos_03/A1BDB0/func_80241FBC_A1D0BC.s | 2 +- .../isk_05/97DAD0/func_80240568_97E038.s | 52 --------------- .../isk_05/97DAD0/func_80240BF0_97E6C0.s | 2 +- .../isk_05/97DAD0/func_80240F3C_97EA0C.s | 2 +- .../isk_13/98F7E0/func_80240568_98FD48.s | 52 --------------- .../isk_13/98F7E0/func_80240BF0_9903D0.s | 2 +- .../isk_13/98F7E0/func_80240F3C_99071C.s | 2 +- .../isk_14/992730/func_80240568_992C98.s | 52 --------------- .../isk_14/992730/func_80240BF0_993320.s | 2 +- .../isk_14/992730/func_80240F3C_99366C.s | 2 +- .../jan_01/B28030/func_802408A8_B288D8.s | 52 --------------- .../jan_01/B28030/func_80240F30_B28F60.s | 2 +- .../jan_02/B2C8A0/func_80240830_B2CCA0.s | 52 --------------- .../jan_02/B2C8A0/func_80240FC4_B2D434.s | 2 +- .../jan_03/B34BD0/func_80240A20_B355F0.s | 52 --------------- .../jan_03/B34BD0/func_802411B4_B35D84.s | 2 +- .../jan_05/B4B260/func_80240E0C_B4B87C.s | 52 --------------- .../jan_05/B4B260/func_80241494_B4BF04.s | 2 +- .../jan_06/B52F70/func_80240CA8_B534D8.s | 52 --------------- .../jan_06/B52F70/func_80241330_B53B60.s | 2 +- .../jan_10/B6C6A0/func_80240878_B6CC08.s | 52 --------------- .../jan_10/B6C6A0/func_80240F00_B6D290.s | 2 +- .../jan_14/B7A510/func_80240A28_B7AA78.s | 52 --------------- .../jan_14/B7A510/func_802410B0_B7B100.s | 2 +- .../jan_22/B84180/func_80240400_B84580.s | 52 --------------- .../jan_22/B84180/func_80240B94_B84D14.s | 2 +- .../kkj_00/ABB340/func_802404B0_ABB740.s | 52 --------------- .../kkj_00/ABB340/func_80240C44_ABBED4.s | 2 +- .../kkj_01/AC5170/func_80240400_AC5570.s | 52 --------------- .../kkj_01/AC5170/func_80240B94_AC5D04.s | 2 +- .../kmr_05/8CE070/func_802407D8_8CE848.s | 52 --------------- .../kmr_05/8CE070/func_8024130C_8CF37C.s | 2 +- .../kmr_06/8D1510/func_802407D8_8D1CE8.s | 52 --------------- .../kmr_06/8D1510/func_8024130C_8D281C.s | 2 +- .../kmr_09/8D5E00/func_802407D8_8D65D8.s | 52 --------------- .../kmr_09/8D5E00/func_8024130C_8D710C.s | 2 +- .../kpa_91/A86A50/func_80240400_A86E50.s | 52 --------------- .../kpa_91/A86A50/func_80240B94_A875E4.s | 2 +- .../kpa_91/A86A50/func_80241224_A87C74.s | 2 +- .../kpa_95/A8CB60/func_802404E0_A8CF60.s | 52 --------------- .../kpa_95/A8CB60/func_80240C74_A8D6F4.s | 2 +- .../kpa_95/A8CB60/func_80241304_A8DD84.s | 2 +- .../kzn_02/C5AC20/func_80240CB8_C5B3F8.s | 52 --------------- .../kzn_02/C5AC20/func_802417EC_C5BF2C.s | 2 +- .../kzn_02/C5AC20/func_80241DE4_C5C524.s | 2 +- .../kzn_07/C6EA50/func_80240FF8_C6F328.s | 52 --------------- .../kzn_07/C6EA50/func_80241B2C_C6FE5C.s | 2 +- .../kzn_07/C6EA50/func_80242124_C70454.s | 2 +- .../kzn_08/C71ED0/func_80241228_C726A8.s | 52 --------------- .../kzn_08/C71ED0/func_80241D5C_C731DC.s | 2 +- .../kzn_08/C71ED0/func_80242354_C737D4.s | 2 +- .../kzn_11/C80600/func_80240C38_C80DD8.s | 52 --------------- .../kzn_11/C80600/func_8024176C_C8190C.s | 2 +- .../kzn_11/C80600/func_80241D64_C81F04.s | 2 +- .../mac_00/7ED280/func_80242970_7ED680.s | 52 --------------- .../mac_00/7ED280/func_80243104_7EDE14.s | 2 +- .../mac_01/8017D0/func_80241480_801D00.s | 52 --------------- .../mac_01/8017D0/func_80241C14_802494.s | 2 +- .../mac_01/805DD0/func_80245950_8061D0.s | 52 --------------- .../mac_01/805DD0/func_802460E4_806964.s | 2 +- .../mac_02/823BF0/func_80240D30_823FF0.s | 52 --------------- .../mac_02/823BF0/func_802414C4_824784.s | 2 +- .../mac_05/852170/func_80240890_852A00.s | 52 --------------- .../mac_05/852170/func_80241024_853194.s | 2 +- .../mgm_00/E0E7A0/func_802406E0_E0EE80.s | 52 --------------- .../mgm_00/E0E7A0/func_80240E74_E0F614.s | 2 +- .../mim_02/B97C70/func_802405D8_B981D8.s | 52 --------------- .../mim_02/B97C70/func_80240C60_B98860.s | 2 +- .../mim_04/B9DB60/func_80240768_B9E0C8.s | 52 --------------- .../mim_04/B9DB60/func_80240DF0_B9E750.s | 2 +- .../mim_06/BA4CF0/func_8024247C_BA6BFC.s | 52 --------------- .../mim_06/BA4CF0/func_80242B04_BA7284.s | 2 +- .../mim_07/BAA3B0/func_802407D8_BAA918.s | 52 --------------- .../mim_07/BAA3B0/func_80240E60_BAAFA0.s | 2 +- .../mim_08/BAD940/func_80240878_BAE1B8.s | 52 --------------- .../mim_08/BAD940/func_802413AC_BAECEC.s | 2 +- .../mim_09/BB2E00/func_80240608_BB3408.s | 52 --------------- .../mim_09/BB2E00/func_80240C90_BB3A90.s | 2 +- .../nok_02/9D7AA0/func_80240E80_9D7EA0.s | 52 --------------- .../nok_02/9D7AA0/func_80241614_9D8634.s | 2 +- .../nok_03/9EB7F0/func_80240568_9EBD58.s | 52 --------------- .../nok_03/9EB7F0/func_80240BF0_9EC3E0.s | 2 +- .../nok_11/9F4A40/func_80240FAC_9F59EC.s | 52 --------------- .../nok_11/9F4A40/func_80241AE0_9F6520.s | 2 +- .../nok_12/9FAD60/func_80241144_9FB934.s | 52 --------------- .../nok_12/9FAD60/func_802418D8_9FC0C8.s | 2 +- .../nok_12/9FAD60/func_80241BD4_9FC3C4.s | 2 +- .../nok_13/A00600/func_80240568_A00B68.s | 52 --------------- .../nok_13/A00600/func_80240BF0_A011F0.s | 2 +- .../nok_14/A02A00/func_8024116C_A039AC.s | 52 --------------- .../nok_14/A02A00/func_80241CA0_A044E0.s | 2 +- .../nok_14/A02A00/func_802421CC_A04A0C.s | 2 +- .../nok_15/A06F00/func_8024128C_A0818C.s | 52 --------------- .../nok_15/A06F00/func_80241DC0_A08CC0.s | 2 +- .../nok_15/A06F00/func_802422EC_A091EC.s | 2 +- .../omo_04/DAD400/func_80240B78_DADF78.s | 52 --------------- .../omo_04/DAD400/func_802416AC_DAEAAC.s | 2 +- .../omo_05/DB22C0/func_8024122C_DB34EC.s | 52 --------------- .../omo_05/DB22C0/func_80241D60_DB4020.s | 2 +- .../omo_07/DBD2B0/func_8024096C_DBDC1C.s | 52 --------------- .../omo_07/DBD2B0/func_80241100_DBE3B0.s | 2 +- .../omo_07/DBD2B0/func_80241634_DBE8E4.s | 2 +- .../omo_09/DCD6B0/func_8024134C_DCE01C.s | 52 --------------- .../omo_09/DCD6B0/func_80241AE0_DCE7B0.s | 2 +- .../omo_09/DCD6B0/func_80242014_DCECE4.s | 2 +- .../omo_17/DEF400/func_8024178C_DF062C.s | 52 --------------- .../omo_17/DEF400/func_802422C0_DF1160.s | 2 +- .../pra_35/D8D270/func_80241320_D8E570.s | 52 --------------- .../pra_35/D8D270/func_80241AB4_D8ED04.s | 2 +- .../pra_35/D8D270/func_802423CC_D8F61C.s | 2 +- .../sam_06/D203E0/func_80240D28_D20BB8.s | 52 --------------- .../sam_06/D203E0/func_8024185C_D216EC.s | 2 +- .../tik_07/87AC00/func_80241BC8_87B7A8.s | 52 --------------- .../tik_07/87AC00/func_802426FC_87C2DC.s | 2 +- .../trd_02/9A10C0/func_80240CB4_9A1C94.s | 52 --------------- .../trd_02/9A10C0/func_80241448_9A2428.s | 2 +- .../trd_02/9A10C0/func_80241744_9A2724.s | 2 +- .../trd_04/9A88A0/func_80241084_9A9474.s | 52 --------------- .../trd_04/9A88A0/func_80241818_9A9C08.s | 2 +- .../trd_04/9A88A0/func_80241B14_9A9F04.s | 2 +- .../trd_07/9B6C90/func_802412BC_9B7C3C.s | 52 --------------- .../trd_07/9B6C90/func_80241DF0_9B8770.s | 2 +- .../trd_07/9B6C90/func_8024231C_9B8C9C.s | 2 +- include/map.h | 1 + src/code_20ec0_len_5040.c | 11 +++- src/world/area_arn/arn_03/BDED90.c | 2 +- src/world/area_arn/arn_04/BE37B0.c | 3 +- src/world/area_arn/arn_05/BE7BE0.c | 2 +- src/world/area_arn/arn_07/BED740.c | 2 +- src/world/area_dgb/dgb_01/BFD9A0.c | 3 +- src/world/area_dgb/dgb_03/C31730.c | 2 +- src/world/area_dgb/dgb_04/C36530.c | 2 +- src/world/area_dgb/dgb_08/C3FDB0.c | 3 +- src/world/area_dgb/dgb_09/C46BE0.c | 2 +- src/world/area_dgb/dgb_15/C4F510.c | 2 +- src/world/area_dgb/dgb_18/C55F40.c | 2 +- src/world/area_dro/dro_01/95B7E0.c | 2 +- src/world/area_flo/flo_00/C9DF60.c | 2 +- src/world/area_flo/flo_09/CB5320.c | 2 +- src/world/area_flo/flo_13/CC3850.c | 2 +- src/world/area_flo/flo_14/CCBE20.c | 2 +- src/world/area_flo/flo_16/CD2C80.c | 2 +- src/world/area_flo/flo_17/CD7350.c | 2 +- src/world/area_flo/flo_25/CF2C10.c | 2 +- src/world/area_hos/hos_02/A17210.c | 2 +- src/world/area_hos/hos_03/A1BDB0.c | 2 +- src/world/area_isk/isk_05/97DAD0.c | 2 +- src/world/area_isk/isk_13/98F7E0.c | 2 +- src/world/area_isk/isk_14/992730.c | 2 +- src/world/area_jan/jan_01/B28030.c | 2 +- src/world/area_jan/jan_02/B2C8A0.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_jan/jan_05/B4B260.c | 2 +- src/world/area_jan/jan_06/B52F70.c | 2 +- src/world/area_jan/jan_10/B6C6A0.c | 2 +- src/world/area_jan/jan_14/B7A510.c | 2 +- src/world/area_jan/jan_22/B84180.c | 2 +- src/world/area_kkj/kkj_00/ABB340.c | 2 +- src/world/area_kkj/kkj_01/AC5170.c | 2 +- src/world/area_kmr/kmr_05/8CE070.c | 2 +- src/world/area_kmr/kmr_06/8D1510.c | 2 +- src/world/area_kmr/kmr_09/8D5E00.c | 2 +- src/world/area_kpa/kpa_91/A86A50.c | 2 +- src/world/area_kpa/kpa_95/A8CB60.c | 2 +- src/world/area_kzn/kzn_02/C5AC20.c | 2 +- src/world/area_kzn/kzn_07/C6EA50.c | 2 +- src/world/area_kzn/kzn_08/C71ED0.c | 2 +- src/world/area_kzn/kzn_11/C80600.c | 2 +- src/world/area_mac/mac_00/7ED280.c | 2 +- src/world/area_mac/mac_01/8017D0.c | 2 +- src/world/area_mac/mac_01/805DD0.c | 2 +- src/world/area_mac/mac_02/823BF0.c | 2 +- src/world/area_mac/mac_05/852170.c | 2 +- src/world/area_mgm/mgm_00/E0E7A0.c | 2 +- src/world/area_mim/mim_02/B97C70.c | 2 +- src/world/area_mim/mim_04/B9DB60.c | 2 +- src/world/area_mim/mim_06/BA4CF0.c | 2 +- src/world/area_mim/mim_07/BAA3B0.c | 2 +- src/world/area_mim/mim_08/BAD940.c | 2 +- src/world/area_mim/mim_09/BB2E00.c | 2 +- src/world/area_nok/nok_02/9D7AA0.c | 2 +- src/world/area_nok/nok_03/9EB7F0.c | 2 +- src/world/area_nok/nok_11/9F4A40.c | 2 +- src/world/area_nok/nok_12/9FAD60.c | 2 +- src/world/area_nok/nok_13/A00600.c | 2 +- src/world/area_nok/nok_14/A02A00.c | 2 +- src/world/area_nok/nok_15/A06F00.c | 2 +- src/world/area_omo/omo_04/DAD400.c | 2 +- src/world/area_omo/omo_05/DB22C0.c | 2 +- src/world/area_omo/omo_07/DBD2B0.c | 3 +- src/world/area_omo/omo_09/DCD6B0.c | 2 +- src/world/area_omo/omo_17/DEF400.c | 2 +- src/world/area_pra/pra_35/D8D270.c | 2 +- src/world/area_sam/sam_06/D203E0.c | 2 +- src/world/area_tik/tik_07/87AC00.c | 2 +- src/world/area_trd/trd_02/9A10C0.c | 2 +- src/world/area_trd/trd_04/9A88A0.c | 3 +- src/world/area_trd/trd_07/9B6C90.c | 2 +- src/world/common/UnkNpcAIFunc1.inc.c | 12 ++++ tools/assist.py | 63 ++++++++++++++++--- tools/substitute.py | 12 +--- tools/substitute_asm.py | 41 ++++++++++++ 255 files changed, 302 insertions(+), 4041 deletions(-) delete mode 100644 asm/nonmatchings/code_20ec0_len_5040/func_80049B44.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240400_BDF190.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240400_BE3BB0.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240400_BE7FE0.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241128_BEDF18.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802408F8_BFE178.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240F20_C32400.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802407D8_C36D08.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240400_C401B0.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241BFC_C487DC.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240CD0_C501E0.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240400_C56340.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802409E0_95BBE0.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240440_C9E360.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240AF8_CB5AF8.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024099C_CC41AC.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802412E8_CCC5F8.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241628_CD3458.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240848_CD7B28.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240818_CF33E8.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_02/A17210/func_802417C8_A179E8.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241488_A1C588.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240568_97E038.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240568_98FD48.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_14/992730/func_80240568_992C98.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_01/B28030/func_802408A8_B288D8.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240830_B2CCA0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240A20_B355F0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240E0C_B4B87C.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240CA8_B534D8.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240878_B6CC08.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240A28_B7AA78.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240400_B84580.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802404B0_ABB740.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240400_AC5570.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802407D8_8CE848.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802407D8_8D1CE8.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802407D8_8D65D8.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240400_A86E50.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802404E0_A8CF60.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240CB8_C5B3F8.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240FF8_C6F328.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241228_C726A8.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240C38_C80DD8.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242970_7ED680.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241480_801D00.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245950_8061D0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240D30_823FF0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80240890_852A00.s delete mode 100644 asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802406E0_E0EE80.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802405D8_B981D8.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240768_B9E0C8.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024247C_BA6BFC.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_802407D8_BAA918.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240878_BAE1B8.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240608_BB3408.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240E80_9D7EA0.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240568_9EBD58.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240FAC_9F59EC.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241144_9FB934.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240568_A00B68.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024116C_A039AC.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024128C_A0818C.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240B78_DADF78.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_8024122C_DB34EC.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024096C_DBDC1C.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024134C_DCE01C.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024178C_DF062C.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241320_D8E570.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240D28_D20BB8.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241BC8_87B7A8.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240CB4_9A1C94.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241084_9A9474.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802412BC_9B7C3C.s create mode 100644 src/world/common/UnkNpcAIFunc1.inc.c create mode 100755 tools/substitute_asm.py diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80049B44.s b/asm/nonmatchings/code_20ec0_len_5040/func_80049B44.s deleted file mode 100644 index 3378a4edeb..0000000000 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80049B44.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80049B44 -/* 24F44 80049B44 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 24F48 80049B48 AFB3001C */ sw $s3, 0x1c($sp) -/* 24F4C 80049B4C 0080982D */ daddu $s3, $a0, $zero -/* 24F50 80049B50 AFBF0020 */ sw $ra, 0x20($sp) -/* 24F54 80049B54 AFB20018 */ sw $s2, 0x18($sp) -/* 24F58 80049B58 AFB10014 */ sw $s1, 0x14($sp) -/* 24F5C 80049B5C AFB00010 */ sw $s0, 0x10($sp) -/* 24F60 80049B60 8E720148 */ lw $s2, 0x148($s3) -/* 24F64 80049B64 86440008 */ lh $a0, 8($s2) -/* 24F68 80049B68 0C00EABB */ jal get_npc_unsafe -/* 24F6C 80049B6C 00A0882D */ daddu $s1, $a1, $zero -/* 24F70 80049B70 8E240008 */ lw $a0, 8($s1) -/* 24F74 80049B74 0040802D */ daddu $s0, $v0, $zero -/* 24F78 80049B78 00041FC2 */ srl $v1, $a0, 0x1f -/* 24F7C 80049B7C 00832021 */ addu $a0, $a0, $v1 -/* 24F80 80049B80 00042043 */ sra $a0, $a0, 1 -/* 24F84 80049B84 0C00A67F */ jal rand_int -/* 24F88 80049B88 24840001 */ addiu $a0, $a0, 1 -/* 24F8C 80049B8C 8E230008 */ lw $v1, 8($s1) -/* 24F90 80049B90 240400B4 */ addiu $a0, $zero, 0xb4 -/* 24F94 80049B94 00032FC2 */ srl $a1, $v1, 0x1f -/* 24F98 80049B98 00651821 */ addu $v1, $v1, $a1 -/* 24F9C 80049B9C 00031843 */ sra $v1, $v1, 1 -/* 24FA0 80049BA0 00621821 */ addu $v1, $v1, $v0 -/* 24FA4 80049BA4 0C00A67F */ jal rand_int -/* 24FA8 80049BA8 A603008E */ sh $v1, 0x8e($s0) -/* 24FAC 80049BAC C60C000C */ lwc1 $f12, 0xc($s0) -/* 24FB0 80049BB0 44820000 */ mtc1 $v0, $f0 -/* 24FB4 80049BB4 00000000 */ nop -/* 24FB8 80049BB8 46800020 */ cvt.s.w $f0, $f0 -/* 24FBC 80049BBC 46006300 */ add.s $f12, $f12, $f0 -/* 24FC0 80049BC0 3C0142B4 */ lui $at, 0x42b4 -/* 24FC4 80049BC4 44810000 */ mtc1 $at, $f0 -/* 24FC8 80049BC8 0C00A6C9 */ jal clamp_angle -/* 24FCC 80049BCC 46006301 */ sub.s $f12, $f12, $f0 -/* 24FD0 80049BD0 E600000C */ swc1 $f0, 0xc($s0) -/* 24FD4 80049BD4 8E4200CC */ lw $v0, 0xcc($s2) -/* 24FD8 80049BD8 8C420000 */ lw $v0, ($v0) -/* 24FDC 80049BDC AE020028 */ sw $v0, 0x28($s0) -/* 24FE0 80049BE0 24020003 */ addiu $v0, $zero, 3 -/* 24FE4 80049BE4 AE620070 */ sw $v0, 0x70($s3) -/* 24FE8 80049BE8 8FBF0020 */ lw $ra, 0x20($sp) -/* 24FEC 80049BEC 8FB3001C */ lw $s3, 0x1c($sp) -/* 24FF0 80049BF0 8FB20018 */ lw $s2, 0x18($sp) -/* 24FF4 80049BF4 8FB10014 */ lw $s1, 0x14($sp) -/* 24FF8 80049BF8 8FB00010 */ lw $s0, 0x10($sp) -/* 24FFC 80049BFC 03E00008 */ jr $ra -/* 25000 80049C00 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240400_BDF190.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240400_BDF190.s deleted file mode 100644 index 6f1e670abb..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240400_BDF190.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_BDF190 -/* BDF190 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BDF194 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* BDF198 80240408 0080982D */ daddu $s3, $a0, $zero -/* BDF19C 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* BDF1A0 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* BDF1A4 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* BDF1A8 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* BDF1AC 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* BDF1B0 80240420 86440008 */ lh $a0, 8($s2) -/* BDF1B4 80240424 0C00EABB */ jal get_npc_unsafe -/* BDF1B8 80240428 00A0882D */ daddu $s1, $a1, $zero -/* BDF1BC 8024042C 8E240008 */ lw $a0, 8($s1) -/* BDF1C0 80240430 0040802D */ daddu $s0, $v0, $zero -/* BDF1C4 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* BDF1C8 80240438 00832021 */ addu $a0, $a0, $v1 -/* BDF1CC 8024043C 00042043 */ sra $a0, $a0, 1 -/* BDF1D0 80240440 0C00A67F */ jal rand_int -/* BDF1D4 80240444 24840001 */ addiu $a0, $a0, 1 -/* BDF1D8 80240448 8E230008 */ lw $v1, 8($s1) -/* BDF1DC 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* BDF1E0 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* BDF1E4 80240454 00651821 */ addu $v1, $v1, $a1 -/* BDF1E8 80240458 00031843 */ sra $v1, $v1, 1 -/* BDF1EC 8024045C 00621821 */ addu $v1, $v1, $v0 -/* BDF1F0 80240460 0C00A67F */ jal rand_int -/* BDF1F4 80240464 A603008E */ sh $v1, 0x8e($s0) -/* BDF1F8 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* BDF1FC 8024046C 44820000 */ mtc1 $v0, $f0 -/* BDF200 80240470 00000000 */ nop -/* BDF204 80240474 46800020 */ cvt.s.w $f0, $f0 -/* BDF208 80240478 46006300 */ add.s $f12, $f12, $f0 -/* BDF20C 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* BDF210 80240480 44810000 */ mtc1 $at, $f0 -/* BDF214 80240484 0C00A6C9 */ jal clamp_angle -/* BDF218 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* BDF21C 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* BDF220 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* BDF224 80240494 8C420000 */ lw $v0, ($v0) -/* BDF228 80240498 AE020028 */ sw $v0, 0x28($s0) -/* BDF22C 8024049C 24020003 */ addiu $v0, $zero, 3 -/* BDF230 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* BDF234 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* BDF238 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* BDF23C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* BDF240 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* BDF244 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* BDF248 802404B8 03E00008 */ jr $ra -/* BDF24C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s index 31689e2bda..3d1cec7372 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s @@ -141,7 +141,7 @@ glabel func_80240B94_BDF924 /* BDFB2C 80240D9C 00000000 */ nop /* BDFB30 80240DA0 0280202D */ daddu $a0, $s4, $zero /* BDFB34 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* BDFB38 80240DA8 0C090100 */ jal func_80240400_BDF190 +/* BDFB38 80240DA8 0C090100 */ jal UnkNpcAIFunc1 /* BDFB3C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* BDFB40 80240DB0 0280202D */ daddu $a0, $s4, $zero /* BDFB44 80240DB4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s index 8958916a22..6c0502cec8 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s @@ -71,7 +71,7 @@ glabel func_8024113C_BDFECC /* BDFFD0 80241240 00000000 */ nop /* BDFFD4 80241244 0280202D */ daddu $a0, $s4, $zero /* BDFFD8 80241248 0200282D */ daddu $a1, $s0, $zero -/* BDFFDC 8024124C 0C090100 */ jal func_80240400_BDF190 +/* BDFFDC 8024124C 0C090100 */ jal UnkNpcAIFunc1 /* BDFFE0 80241250 0240302D */ daddu $a2, $s2, $zero /* BDFFE4 80241254 0280202D */ daddu $a0, $s4, $zero /* BDFFE8 80241258 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240400_BE3BB0.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240400_BE3BB0.s deleted file mode 100644 index 868f370745..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240400_BE3BB0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_BE3BB0 -/* BE3BB0 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BE3BB4 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* BE3BB8 80240408 0080982D */ daddu $s3, $a0, $zero -/* BE3BBC 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* BE3BC0 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* BE3BC4 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* BE3BC8 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* BE3BCC 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* BE3BD0 80240420 86440008 */ lh $a0, 8($s2) -/* BE3BD4 80240424 0C00EABB */ jal get_npc_unsafe -/* BE3BD8 80240428 00A0882D */ daddu $s1, $a1, $zero -/* BE3BDC 8024042C 8E240008 */ lw $a0, 8($s1) -/* BE3BE0 80240430 0040802D */ daddu $s0, $v0, $zero -/* BE3BE4 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* BE3BE8 80240438 00832021 */ addu $a0, $a0, $v1 -/* BE3BEC 8024043C 00042043 */ sra $a0, $a0, 1 -/* BE3BF0 80240440 0C00A67F */ jal rand_int -/* BE3BF4 80240444 24840001 */ addiu $a0, $a0, 1 -/* BE3BF8 80240448 8E230008 */ lw $v1, 8($s1) -/* BE3BFC 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* BE3C00 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* BE3C04 80240454 00651821 */ addu $v1, $v1, $a1 -/* BE3C08 80240458 00031843 */ sra $v1, $v1, 1 -/* BE3C0C 8024045C 00621821 */ addu $v1, $v1, $v0 -/* BE3C10 80240460 0C00A67F */ jal rand_int -/* BE3C14 80240464 A603008E */ sh $v1, 0x8e($s0) -/* BE3C18 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* BE3C1C 8024046C 44820000 */ mtc1 $v0, $f0 -/* BE3C20 80240470 00000000 */ nop -/* BE3C24 80240474 46800020 */ cvt.s.w $f0, $f0 -/* BE3C28 80240478 46006300 */ add.s $f12, $f12, $f0 -/* BE3C2C 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* BE3C30 80240480 44810000 */ mtc1 $at, $f0 -/* BE3C34 80240484 0C00A6C9 */ jal clamp_angle -/* BE3C38 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* BE3C3C 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* BE3C40 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* BE3C44 80240494 8C420000 */ lw $v0, ($v0) -/* BE3C48 80240498 AE020028 */ sw $v0, 0x28($s0) -/* BE3C4C 8024049C 24020003 */ addiu $v0, $zero, 3 -/* BE3C50 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* BE3C54 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* BE3C58 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* BE3C5C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* BE3C60 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* BE3C64 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* BE3C68 802404B8 03E00008 */ jr $ra -/* BE3C6C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s index 92ffdfeb18..1d43ab817f 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s @@ -141,7 +141,7 @@ glabel func_80240B94_BE4344 /* BE454C 80240D9C 00000000 */ nop /* BE4550 80240DA0 0280202D */ daddu $a0, $s4, $zero /* BE4554 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* BE4558 80240DA8 0C090100 */ jal func_80240400_BE3BB0 +/* BE4558 80240DA8 0C090100 */ jal UnkNpcAIFunc1 /* BE455C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* BE4560 80240DB0 0280202D */ daddu $a0, $s4, $zero /* BE4564 80240DB4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240400_BE7FE0.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240400_BE7FE0.s deleted file mode 100644 index cf7795bcc7..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240400_BE7FE0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_BE7FE0 -/* BE7FE0 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BE7FE4 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* BE7FE8 80240408 0080982D */ daddu $s3, $a0, $zero -/* BE7FEC 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* BE7FF0 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* BE7FF4 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* BE7FF8 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* BE7FFC 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* BE8000 80240420 86440008 */ lh $a0, 8($s2) -/* BE8004 80240424 0C00EABB */ jal get_npc_unsafe -/* BE8008 80240428 00A0882D */ daddu $s1, $a1, $zero -/* BE800C 8024042C 8E240008 */ lw $a0, 8($s1) -/* BE8010 80240430 0040802D */ daddu $s0, $v0, $zero -/* BE8014 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* BE8018 80240438 00832021 */ addu $a0, $a0, $v1 -/* BE801C 8024043C 00042043 */ sra $a0, $a0, 1 -/* BE8020 80240440 0C00A67F */ jal rand_int -/* BE8024 80240444 24840001 */ addiu $a0, $a0, 1 -/* BE8028 80240448 8E230008 */ lw $v1, 8($s1) -/* BE802C 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* BE8030 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* BE8034 80240454 00651821 */ addu $v1, $v1, $a1 -/* BE8038 80240458 00031843 */ sra $v1, $v1, 1 -/* BE803C 8024045C 00621821 */ addu $v1, $v1, $v0 -/* BE8040 80240460 0C00A67F */ jal rand_int -/* BE8044 80240464 A603008E */ sh $v1, 0x8e($s0) -/* BE8048 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* BE804C 8024046C 44820000 */ mtc1 $v0, $f0 -/* BE8050 80240470 00000000 */ nop -/* BE8054 80240474 46800020 */ cvt.s.w $f0, $f0 -/* BE8058 80240478 46006300 */ add.s $f12, $f12, $f0 -/* BE805C 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* BE8060 80240480 44810000 */ mtc1 $at, $f0 -/* BE8064 80240484 0C00A6C9 */ jal clamp_angle -/* BE8068 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* BE806C 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* BE8070 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* BE8074 80240494 8C420000 */ lw $v0, ($v0) -/* BE8078 80240498 AE020028 */ sw $v0, 0x28($s0) -/* BE807C 8024049C 24020003 */ addiu $v0, $zero, 3 -/* BE8080 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* BE8084 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* BE8088 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* BE808C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* BE8090 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* BE8094 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* BE8098 802404B8 03E00008 */ jr $ra -/* BE809C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s index 0848b56829..ba80ae5ba8 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s @@ -141,7 +141,7 @@ glabel func_80240B94_BE8774 /* BE897C 80240D9C 00000000 */ nop /* BE8980 80240DA0 0280202D */ daddu $a0, $s4, $zero /* BE8984 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* BE8988 80240DA8 0C090100 */ jal func_80240400_BE7FE0 +/* BE8988 80240DA8 0C090100 */ jal UnkNpcAIFunc1 /* BE898C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* BE8990 80240DB0 0280202D */ daddu $a0, $s4, $zero /* BE8994 80240DB4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s index 3bea1ed3aa..bb5e24aa51 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s @@ -71,7 +71,7 @@ glabel func_8024113C_BE8D1C /* BE8E20 80241240 00000000 */ nop /* BE8E24 80241244 0280202D */ daddu $a0, $s4, $zero /* BE8E28 80241248 0200282D */ daddu $a1, $s0, $zero -/* BE8E2C 8024124C 0C090100 */ jal func_80240400_BE7FE0 +/* BE8E2C 8024124C 0C090100 */ jal UnkNpcAIFunc1 /* BE8E30 80241250 0240302D */ daddu $a2, $s2, $zero /* BE8E34 80241254 0280202D */ daddu $a0, $s4, $zero /* BE8E38 80241258 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241128_BEDF18.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241128_BEDF18.s deleted file mode 100644 index 7c80cc7dd9..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241128_BEDF18.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241128_BEDF18 -/* BEDF18 80241128 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BEDF1C 8024112C AFB3001C */ sw $s3, 0x1c($sp) -/* BEDF20 80241130 0080982D */ daddu $s3, $a0, $zero -/* BEDF24 80241134 AFBF0020 */ sw $ra, 0x20($sp) -/* BEDF28 80241138 AFB20018 */ sw $s2, 0x18($sp) -/* BEDF2C 8024113C AFB10014 */ sw $s1, 0x14($sp) -/* BEDF30 80241140 AFB00010 */ sw $s0, 0x10($sp) -/* BEDF34 80241144 8E720148 */ lw $s2, 0x148($s3) -/* BEDF38 80241148 86440008 */ lh $a0, 8($s2) -/* BEDF3C 8024114C 0C00EABB */ jal get_npc_unsafe -/* BEDF40 80241150 00A0882D */ daddu $s1, $a1, $zero -/* BEDF44 80241154 8E240008 */ lw $a0, 8($s1) -/* BEDF48 80241158 0040802D */ daddu $s0, $v0, $zero -/* BEDF4C 8024115C 00041FC2 */ srl $v1, $a0, 0x1f -/* BEDF50 80241160 00832021 */ addu $a0, $a0, $v1 -/* BEDF54 80241164 00042043 */ sra $a0, $a0, 1 -/* BEDF58 80241168 0C00A67F */ jal rand_int -/* BEDF5C 8024116C 24840001 */ addiu $a0, $a0, 1 -/* BEDF60 80241170 8E230008 */ lw $v1, 8($s1) -/* BEDF64 80241174 240400B4 */ addiu $a0, $zero, 0xb4 -/* BEDF68 80241178 00032FC2 */ srl $a1, $v1, 0x1f -/* BEDF6C 8024117C 00651821 */ addu $v1, $v1, $a1 -/* BEDF70 80241180 00031843 */ sra $v1, $v1, 1 -/* BEDF74 80241184 00621821 */ addu $v1, $v1, $v0 -/* BEDF78 80241188 0C00A67F */ jal rand_int -/* BEDF7C 8024118C A603008E */ sh $v1, 0x8e($s0) -/* BEDF80 80241190 C60C000C */ lwc1 $f12, 0xc($s0) -/* BEDF84 80241194 44820000 */ mtc1 $v0, $f0 -/* BEDF88 80241198 00000000 */ nop -/* BEDF8C 8024119C 46800020 */ cvt.s.w $f0, $f0 -/* BEDF90 802411A0 46006300 */ add.s $f12, $f12, $f0 -/* BEDF94 802411A4 3C0142B4 */ lui $at, 0x42b4 -/* BEDF98 802411A8 44810000 */ mtc1 $at, $f0 -/* BEDF9C 802411AC 0C00A6C9 */ jal clamp_angle -/* BEDFA0 802411B0 46006301 */ sub.s $f12, $f12, $f0 -/* BEDFA4 802411B4 E600000C */ swc1 $f0, 0xc($s0) -/* BEDFA8 802411B8 8E4200CC */ lw $v0, 0xcc($s2) -/* BEDFAC 802411BC 8C420000 */ lw $v0, ($v0) -/* BEDFB0 802411C0 AE020028 */ sw $v0, 0x28($s0) -/* BEDFB4 802411C4 24020003 */ addiu $v0, $zero, 3 -/* BEDFB8 802411C8 AE620070 */ sw $v0, 0x70($s3) -/* BEDFBC 802411CC 8FBF0020 */ lw $ra, 0x20($sp) -/* BEDFC0 802411D0 8FB3001C */ lw $s3, 0x1c($sp) -/* BEDFC4 802411D4 8FB20018 */ lw $s2, 0x18($sp) -/* BEDFC8 802411D8 8FB10014 */ lw $s1, 0x14($sp) -/* BEDFCC 802411DC 8FB00010 */ lw $s0, 0x10($sp) -/* BEDFD0 802411E0 03E00008 */ jr $ra -/* BEDFD4 802411E4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s index 18dfa59d3f..39f944220f 100644 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s +++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s @@ -83,7 +83,7 @@ glabel func_80241C5C_BEEA4C /* BEEB7C 80241D8C 0000102D */ daddu $v0, $zero, $zero /* BEEB80 80241D90 0280202D */ daddu $a0, $s4, $zero /* BEEB84 80241D94 0200282D */ daddu $a1, $s0, $zero -/* BEEB88 80241D98 0C09044A */ jal func_80241128_BEDF18 +/* BEEB88 80241D98 0C09044A */ jal UnkNpcAIFunc1 /* BEEB8C 80241D9C 0260302D */ daddu $a2, $s3, $zero /* BEEB90 80241DA0 0280202D */ daddu $a0, $s4, $zero /* BEEB94 80241DA4 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802408F8_BFE178.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802408F8_BFE178.s deleted file mode 100644 index f09da8f65c..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802408F8_BFE178.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408F8_BFE178 -/* BFE178 802408F8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BFE17C 802408FC AFB3001C */ sw $s3, 0x1c($sp) -/* BFE180 80240900 0080982D */ daddu $s3, $a0, $zero -/* BFE184 80240904 AFBF0020 */ sw $ra, 0x20($sp) -/* BFE188 80240908 AFB20018 */ sw $s2, 0x18($sp) -/* BFE18C 8024090C AFB10014 */ sw $s1, 0x14($sp) -/* BFE190 80240910 AFB00010 */ sw $s0, 0x10($sp) -/* BFE194 80240914 8E720148 */ lw $s2, 0x148($s3) -/* BFE198 80240918 86440008 */ lh $a0, 8($s2) -/* BFE19C 8024091C 0C00EABB */ jal get_npc_unsafe -/* BFE1A0 80240920 00A0882D */ daddu $s1, $a1, $zero -/* BFE1A4 80240924 8E240008 */ lw $a0, 8($s1) -/* BFE1A8 80240928 0040802D */ daddu $s0, $v0, $zero -/* BFE1AC 8024092C 00041FC2 */ srl $v1, $a0, 0x1f -/* BFE1B0 80240930 00832021 */ addu $a0, $a0, $v1 -/* BFE1B4 80240934 00042043 */ sra $a0, $a0, 1 -/* BFE1B8 80240938 0C00A67F */ jal rand_int -/* BFE1BC 8024093C 24840001 */ addiu $a0, $a0, 1 -/* BFE1C0 80240940 8E230008 */ lw $v1, 8($s1) -/* BFE1C4 80240944 240400B4 */ addiu $a0, $zero, 0xb4 -/* BFE1C8 80240948 00032FC2 */ srl $a1, $v1, 0x1f -/* BFE1CC 8024094C 00651821 */ addu $v1, $v1, $a1 -/* BFE1D0 80240950 00031843 */ sra $v1, $v1, 1 -/* BFE1D4 80240954 00621821 */ addu $v1, $v1, $v0 -/* BFE1D8 80240958 0C00A67F */ jal rand_int -/* BFE1DC 8024095C A603008E */ sh $v1, 0x8e($s0) -/* BFE1E0 80240960 C60C000C */ lwc1 $f12, 0xc($s0) -/* BFE1E4 80240964 44820000 */ mtc1 $v0, $f0 -/* BFE1E8 80240968 00000000 */ nop -/* BFE1EC 8024096C 46800020 */ cvt.s.w $f0, $f0 -/* BFE1F0 80240970 46006300 */ add.s $f12, $f12, $f0 -/* BFE1F4 80240974 3C0142B4 */ lui $at, 0x42b4 -/* BFE1F8 80240978 44810000 */ mtc1 $at, $f0 -/* BFE1FC 8024097C 0C00A6C9 */ jal clamp_angle -/* BFE200 80240980 46006301 */ sub.s $f12, $f12, $f0 -/* BFE204 80240984 E600000C */ swc1 $f0, 0xc($s0) -/* BFE208 80240988 8E4200CC */ lw $v0, 0xcc($s2) -/* BFE20C 8024098C 8C420000 */ lw $v0, ($v0) -/* BFE210 80240990 AE020028 */ sw $v0, 0x28($s0) -/* BFE214 80240994 24020003 */ addiu $v0, $zero, 3 -/* BFE218 80240998 AE620070 */ sw $v0, 0x70($s3) -/* BFE21C 8024099C 8FBF0020 */ lw $ra, 0x20($sp) -/* BFE220 802409A0 8FB3001C */ lw $s3, 0x1c($sp) -/* BFE224 802409A4 8FB20018 */ lw $s2, 0x18($sp) -/* BFE228 802409A8 8FB10014 */ lw $s1, 0x14($sp) -/* BFE22C 802409AC 8FB00010 */ lw $s0, 0x10($sp) -/* BFE230 802409B0 03E00008 */ jr $ra -/* BFE234 802409B4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s index e1acd9ab29..e99604a777 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s @@ -83,7 +83,7 @@ glabel func_8024142C_BFECAC /* BFEDDC 8024155C 0000102D */ daddu $v0, $zero, $zero /* BFEDE0 80241560 0280202D */ daddu $a0, $s4, $zero /* BFEDE4 80241564 0200282D */ daddu $a1, $s0, $zero -/* BFEDE8 80241568 0C09023E */ jal func_802408F8_BFE178 +/* BFEDE8 80241568 0C09023E */ jal UnkNpcAIFunc1 /* BFEDEC 8024156C 0260302D */ daddu $a2, $s3, $zero /* BFEDF0 80241570 0280202D */ daddu $a0, $s4, $zero /* BFEDF4 80241574 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s index aaded4aeed..beaa9dfad7 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s @@ -79,7 +79,7 @@ glabel func_802422B0_BFFB30 /* BFFC54 802423D4 00000000 */ nop /* BFFC58 802423D8 0280202D */ daddu $a0, $s4, $zero /* BFFC5C 802423DC 0220282D */ daddu $a1, $s1, $zero -/* BFFC60 802423E0 0C09023E */ jal func_802408F8_BFE178 +/* BFFC60 802423E0 0C09023E */ jal UnkNpcAIFunc1 /* BFFC64 802423E4 0260302D */ daddu $a2, $s3, $zero /* BFFC68 802423E8 0280202D */ daddu $a0, $s4, $zero /* BFFC6C 802423EC 0220282D */ daddu $a1, $s1, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240F20_C32400.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240F20_C32400.s deleted file mode 100644 index 5578a269b5..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240F20_C32400.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_C32400 -/* C32400 80240F20 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C32404 80240F24 AFB3001C */ sw $s3, 0x1c($sp) -/* C32408 80240F28 0080982D */ daddu $s3, $a0, $zero -/* C3240C 80240F2C AFBF0020 */ sw $ra, 0x20($sp) -/* C32410 80240F30 AFB20018 */ sw $s2, 0x18($sp) -/* C32414 80240F34 AFB10014 */ sw $s1, 0x14($sp) -/* C32418 80240F38 AFB00010 */ sw $s0, 0x10($sp) -/* C3241C 80240F3C 8E720148 */ lw $s2, 0x148($s3) -/* C32420 80240F40 86440008 */ lh $a0, 8($s2) -/* C32424 80240F44 0C00EABB */ jal get_npc_unsafe -/* C32428 80240F48 00A0882D */ daddu $s1, $a1, $zero -/* C3242C 80240F4C 8E240008 */ lw $a0, 8($s1) -/* C32430 80240F50 0040802D */ daddu $s0, $v0, $zero -/* C32434 80240F54 00041FC2 */ srl $v1, $a0, 0x1f -/* C32438 80240F58 00832021 */ addu $a0, $a0, $v1 -/* C3243C 80240F5C 00042043 */ sra $a0, $a0, 1 -/* C32440 80240F60 0C00A67F */ jal rand_int -/* C32444 80240F64 24840001 */ addiu $a0, $a0, 1 -/* C32448 80240F68 8E230008 */ lw $v1, 8($s1) -/* C3244C 80240F6C 240400B4 */ addiu $a0, $zero, 0xb4 -/* C32450 80240F70 00032FC2 */ srl $a1, $v1, 0x1f -/* C32454 80240F74 00651821 */ addu $v1, $v1, $a1 -/* C32458 80240F78 00031843 */ sra $v1, $v1, 1 -/* C3245C 80240F7C 00621821 */ addu $v1, $v1, $v0 -/* C32460 80240F80 0C00A67F */ jal rand_int -/* C32464 80240F84 A603008E */ sh $v1, 0x8e($s0) -/* C32468 80240F88 C60C000C */ lwc1 $f12, 0xc($s0) -/* C3246C 80240F8C 44820000 */ mtc1 $v0, $f0 -/* C32470 80240F90 00000000 */ nop -/* C32474 80240F94 46800020 */ cvt.s.w $f0, $f0 -/* C32478 80240F98 46006300 */ add.s $f12, $f12, $f0 -/* C3247C 80240F9C 3C0142B4 */ lui $at, 0x42b4 -/* C32480 80240FA0 44810000 */ mtc1 $at, $f0 -/* C32484 80240FA4 0C00A6C9 */ jal clamp_angle -/* C32488 80240FA8 46006301 */ sub.s $f12, $f12, $f0 -/* C3248C 80240FAC E600000C */ swc1 $f0, 0xc($s0) -/* C32490 80240FB0 8E4200CC */ lw $v0, 0xcc($s2) -/* C32494 80240FB4 8C420000 */ lw $v0, ($v0) -/* C32498 80240FB8 AE020028 */ sw $v0, 0x28($s0) -/* C3249C 80240FBC 24020003 */ addiu $v0, $zero, 3 -/* C324A0 80240FC0 AE620070 */ sw $v0, 0x70($s3) -/* C324A4 80240FC4 8FBF0020 */ lw $ra, 0x20($sp) -/* C324A8 80240FC8 8FB3001C */ lw $s3, 0x1c($sp) -/* C324AC 80240FCC 8FB20018 */ lw $s2, 0x18($sp) -/* C324B0 80240FD0 8FB10014 */ lw $s1, 0x14($sp) -/* C324B4 80240FD4 8FB00010 */ lw $s0, 0x10($sp) -/* C324B8 80240FD8 03E00008 */ jr $ra -/* C324BC 80240FDC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s index 491b435c0c..c7d7f3a59a 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s @@ -141,7 +141,7 @@ glabel func_802416B4_C32B94 /* C32D9C 802418BC 00000000 */ nop /* C32DA0 802418C0 0280202D */ daddu $a0, $s4, $zero /* C32DA4 802418C4 0260282D */ daddu $a1, $s3, $zero -/* C32DA8 802418C8 0C0903C8 */ jal func_80240F20_C32400 +/* C32DA8 802418C8 0C0903C8 */ jal UnkNpcAIFunc1 /* C32DAC 802418CC 02A0302D */ daddu $a2, $s5, $zero /* C32DB0 802418D0 0280202D */ daddu $a0, $s4, $zero /* C32DB4 802418D4 0260282D */ daddu $a1, $s3, $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 25d19d8de1..4ff2f4253b 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s @@ -117,7 +117,7 @@ glabel func_802419B0_C32E90 /* C33038 80241B58 00000000 */ nop /* C3303C 80241B5C 0240202D */ daddu $a0, $s2, $zero /* C33040 80241B60 0260282D */ daddu $a1, $s3, $zero -/* C33044 80241B64 0C0903C8 */ jal func_80240F20_C32400 +/* C33044 80241B64 0C0903C8 */ jal UnkNpcAIFunc1 /* C33048 80241B68 0280302D */ daddu $a2, $s4, $zero /* C3304C 80241B6C 0240202D */ daddu $a0, $s2, $zero /* C33050 80241B70 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802407D8_C36D08.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802407D8_C36D08.s deleted file mode 100644 index 61886d78b9..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802407D8_C36D08.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D8_C36D08 -/* C36D08 802407D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C36D0C 802407DC AFB3001C */ sw $s3, 0x1c($sp) -/* C36D10 802407E0 0080982D */ daddu $s3, $a0, $zero -/* C36D14 802407E4 AFBF0020 */ sw $ra, 0x20($sp) -/* C36D18 802407E8 AFB20018 */ sw $s2, 0x18($sp) -/* C36D1C 802407EC AFB10014 */ sw $s1, 0x14($sp) -/* C36D20 802407F0 AFB00010 */ sw $s0, 0x10($sp) -/* C36D24 802407F4 8E720148 */ lw $s2, 0x148($s3) -/* C36D28 802407F8 86440008 */ lh $a0, 8($s2) -/* C36D2C 802407FC 0C00EABB */ jal get_npc_unsafe -/* C36D30 80240800 00A0882D */ daddu $s1, $a1, $zero -/* C36D34 80240804 8E240008 */ lw $a0, 8($s1) -/* C36D38 80240808 0040802D */ daddu $s0, $v0, $zero -/* C36D3C 8024080C 00041FC2 */ srl $v1, $a0, 0x1f -/* C36D40 80240810 00832021 */ addu $a0, $a0, $v1 -/* C36D44 80240814 00042043 */ sra $a0, $a0, 1 -/* C36D48 80240818 0C00A67F */ jal rand_int -/* C36D4C 8024081C 24840001 */ addiu $a0, $a0, 1 -/* C36D50 80240820 8E230008 */ lw $v1, 8($s1) -/* C36D54 80240824 240400B4 */ addiu $a0, $zero, 0xb4 -/* C36D58 80240828 00032FC2 */ srl $a1, $v1, 0x1f -/* C36D5C 8024082C 00651821 */ addu $v1, $v1, $a1 -/* C36D60 80240830 00031843 */ sra $v1, $v1, 1 -/* C36D64 80240834 00621821 */ addu $v1, $v1, $v0 -/* C36D68 80240838 0C00A67F */ jal rand_int -/* C36D6C 8024083C A603008E */ sh $v1, 0x8e($s0) -/* C36D70 80240840 C60C000C */ lwc1 $f12, 0xc($s0) -/* C36D74 80240844 44820000 */ mtc1 $v0, $f0 -/* C36D78 80240848 00000000 */ nop -/* C36D7C 8024084C 46800020 */ cvt.s.w $f0, $f0 -/* C36D80 80240850 46006300 */ add.s $f12, $f12, $f0 -/* C36D84 80240854 3C0142B4 */ lui $at, 0x42b4 -/* C36D88 80240858 44810000 */ mtc1 $at, $f0 -/* C36D8C 8024085C 0C00A6C9 */ jal clamp_angle -/* C36D90 80240860 46006301 */ sub.s $f12, $f12, $f0 -/* C36D94 80240864 E600000C */ swc1 $f0, 0xc($s0) -/* C36D98 80240868 8E4200CC */ lw $v0, 0xcc($s2) -/* C36D9C 8024086C 8C420000 */ lw $v0, ($v0) -/* C36DA0 80240870 AE020028 */ sw $v0, 0x28($s0) -/* C36DA4 80240874 24020003 */ addiu $v0, $zero, 3 -/* C36DA8 80240878 AE620070 */ sw $v0, 0x70($s3) -/* C36DAC 8024087C 8FBF0020 */ lw $ra, 0x20($sp) -/* C36DB0 80240880 8FB3001C */ lw $s3, 0x1c($sp) -/* C36DB4 80240884 8FB20018 */ lw $s2, 0x18($sp) -/* C36DB8 80240888 8FB10014 */ lw $s1, 0x14($sp) -/* C36DBC 8024088C 8FB00010 */ lw $s0, 0x10($sp) -/* C36DC0 80240890 03E00008 */ jr $ra -/* C36DC4 80240894 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s index 99dc044e13..33afb564f2 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s @@ -83,7 +83,7 @@ glabel func_8024130C_C3783C /* C3796C 8024143C 0000102D */ daddu $v0, $zero, $zero /* C37970 80241440 0280202D */ daddu $a0, $s4, $zero /* C37974 80241444 0200282D */ daddu $a1, $s0, $zero -/* C37978 80241448 0C0901F6 */ jal func_802407D8_C36D08 +/* C37978 80241448 0C0901F6 */ jal UnkNpcAIFunc1 /* C3797C 8024144C 0260302D */ daddu $a2, $s3, $zero /* C37980 80241450 0280202D */ daddu $a0, $s4, $zero /* C37984 80241454 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s index 56f9bb2407..00c5eb4d1d 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s @@ -79,7 +79,7 @@ glabel func_80242154_C38684 /* C387A8 80242278 00000000 */ nop /* C387AC 8024227C 0280202D */ daddu $a0, $s4, $zero /* C387B0 80242280 0220282D */ daddu $a1, $s1, $zero -/* C387B4 80242284 0C0901F6 */ jal func_802407D8_C36D08 +/* C387B4 80242284 0C0901F6 */ jal UnkNpcAIFunc1 /* C387B8 80242288 0260302D */ daddu $a2, $s3, $zero /* C387BC 8024228C 0280202D */ daddu $a0, $s4, $zero /* C387C0 80242290 0220282D */ daddu $a1, $s1, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240400_C401B0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240400_C401B0.s deleted file mode 100644 index 740c062e44..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240400_C401B0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_C401B0 -/* C401B0 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C401B4 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* C401B8 80240408 0080982D */ daddu $s3, $a0, $zero -/* C401BC 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* C401C0 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* C401C4 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* C401C8 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* C401CC 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* C401D0 80240420 86440008 */ lh $a0, 8($s2) -/* C401D4 80240424 0C00EABB */ jal get_npc_unsafe -/* C401D8 80240428 00A0882D */ daddu $s1, $a1, $zero -/* C401DC 8024042C 8E240008 */ lw $a0, 8($s1) -/* C401E0 80240430 0040802D */ daddu $s0, $v0, $zero -/* C401E4 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* C401E8 80240438 00832021 */ addu $a0, $a0, $v1 -/* C401EC 8024043C 00042043 */ sra $a0, $a0, 1 -/* C401F0 80240440 0C00A67F */ jal rand_int -/* C401F4 80240444 24840001 */ addiu $a0, $a0, 1 -/* C401F8 80240448 8E230008 */ lw $v1, 8($s1) -/* C401FC 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* C40200 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* C40204 80240454 00651821 */ addu $v1, $v1, $a1 -/* C40208 80240458 00031843 */ sra $v1, $v1, 1 -/* C4020C 8024045C 00621821 */ addu $v1, $v1, $v0 -/* C40210 80240460 0C00A67F */ jal rand_int -/* C40214 80240464 A603008E */ sh $v1, 0x8e($s0) -/* C40218 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* C4021C 8024046C 44820000 */ mtc1 $v0, $f0 -/* C40220 80240470 00000000 */ nop -/* C40224 80240474 46800020 */ cvt.s.w $f0, $f0 -/* C40228 80240478 46006300 */ add.s $f12, $f12, $f0 -/* C4022C 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* C40230 80240480 44810000 */ mtc1 $at, $f0 -/* C40234 80240484 0C00A6C9 */ jal clamp_angle -/* C40238 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* C4023C 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* C40240 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* C40244 80240494 8C420000 */ lw $v0, ($v0) -/* C40248 80240498 AE020028 */ sw $v0, 0x28($s0) -/* C4024C 8024049C 24020003 */ addiu $v0, $zero, 3 -/* C40250 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* C40254 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* C40258 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* C4025C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* C40260 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* C40264 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* C40268 802404B8 03E00008 */ jr $ra -/* C4026C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s index be9b6b7099..6b48c223b1 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s @@ -141,7 +141,7 @@ glabel func_80240B94_C40944 /* C40B4C 80240D9C 00000000 */ nop /* C40B50 80240DA0 0280202D */ daddu $a0, $s4, $zero /* C40B54 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* C40B58 80240DA8 0C090100 */ jal func_80240400_C401B0 +/* C40B58 80240DA8 0C090100 */ jal UnkNpcAIFunc1 /* C40B5C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* C40B60 80240DB0 0280202D */ daddu $a0, $s4, $zero /* C40B64 80240DB4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241BFC_C487DC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241BFC_C487DC.s deleted file mode 100644 index 1bd30c1d62..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241BFC_C487DC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BFC_C487DC -/* C487DC 80241BFC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C487E0 80241C00 AFB3001C */ sw $s3, 0x1c($sp) -/* C487E4 80241C04 0080982D */ daddu $s3, $a0, $zero -/* C487E8 80241C08 AFBF0020 */ sw $ra, 0x20($sp) -/* C487EC 80241C0C AFB20018 */ sw $s2, 0x18($sp) -/* C487F0 80241C10 AFB10014 */ sw $s1, 0x14($sp) -/* C487F4 80241C14 AFB00010 */ sw $s0, 0x10($sp) -/* C487F8 80241C18 8E720148 */ lw $s2, 0x148($s3) -/* C487FC 80241C1C 86440008 */ lh $a0, 8($s2) -/* C48800 80241C20 0C00EABB */ jal get_npc_unsafe -/* C48804 80241C24 00A0882D */ daddu $s1, $a1, $zero -/* C48808 80241C28 8E240008 */ lw $a0, 8($s1) -/* C4880C 80241C2C 0040802D */ daddu $s0, $v0, $zero -/* C48810 80241C30 00041FC2 */ srl $v1, $a0, 0x1f -/* C48814 80241C34 00832021 */ addu $a0, $a0, $v1 -/* C48818 80241C38 00042043 */ sra $a0, $a0, 1 -/* C4881C 80241C3C 0C00A67F */ jal rand_int -/* C48820 80241C40 24840001 */ addiu $a0, $a0, 1 -/* C48824 80241C44 8E230008 */ lw $v1, 8($s1) -/* C48828 80241C48 240400B4 */ addiu $a0, $zero, 0xb4 -/* C4882C 80241C4C 00032FC2 */ srl $a1, $v1, 0x1f -/* C48830 80241C50 00651821 */ addu $v1, $v1, $a1 -/* C48834 80241C54 00031843 */ sra $v1, $v1, 1 -/* C48838 80241C58 00621821 */ addu $v1, $v1, $v0 -/* C4883C 80241C5C 0C00A67F */ jal rand_int -/* C48840 80241C60 A603008E */ sh $v1, 0x8e($s0) -/* C48844 80241C64 C60C000C */ lwc1 $f12, 0xc($s0) -/* C48848 80241C68 44820000 */ mtc1 $v0, $f0 -/* C4884C 80241C6C 00000000 */ nop -/* C48850 80241C70 46800020 */ cvt.s.w $f0, $f0 -/* C48854 80241C74 46006300 */ add.s $f12, $f12, $f0 -/* C48858 80241C78 3C0142B4 */ lui $at, 0x42b4 -/* C4885C 80241C7C 44810000 */ mtc1 $at, $f0 -/* C48860 80241C80 0C00A6C9 */ jal clamp_angle -/* C48864 80241C84 46006301 */ sub.s $f12, $f12, $f0 -/* C48868 80241C88 E600000C */ swc1 $f0, 0xc($s0) -/* C4886C 80241C8C 8E4200CC */ lw $v0, 0xcc($s2) -/* C48870 80241C90 8C420000 */ lw $v0, ($v0) -/* C48874 80241C94 AE020028 */ sw $v0, 0x28($s0) -/* C48878 80241C98 24020003 */ addiu $v0, $zero, 3 -/* C4887C 80241C9C AE620070 */ sw $v0, 0x70($s3) -/* C48880 80241CA0 8FBF0020 */ lw $ra, 0x20($sp) -/* C48884 80241CA4 8FB3001C */ lw $s3, 0x1c($sp) -/* C48888 80241CA8 8FB20018 */ lw $s2, 0x18($sp) -/* C4888C 80241CAC 8FB10014 */ lw $s1, 0x14($sp) -/* C48890 80241CB0 8FB00010 */ lw $s0, 0x10($sp) -/* C48894 80241CB4 03E00008 */ jr $ra -/* C48898 80241CB8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s index e2f554ea49..3fcca2692b 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s @@ -83,7 +83,7 @@ glabel func_80242730_C49310 /* C49440 80242860 0000102D */ daddu $v0, $zero, $zero /* C49444 80242864 0280202D */ daddu $a0, $s4, $zero /* C49448 80242868 0200282D */ daddu $a1, $s0, $zero -/* C4944C 8024286C 0C0906FF */ jal func_80241BFC_C487DC +/* C4944C 8024286C 0C0906FF */ jal UnkNpcAIFunc1 /* C49450 80242870 0260302D */ daddu $a2, $s3, $zero /* C49454 80242874 0280202D */ daddu $a0, $s4, $zero /* C49458 80242878 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s index ac44871b1e..92a943956a 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s @@ -79,7 +79,7 @@ glabel func_80243578_C4A158 /* C4A27C 8024369C 00000000 */ nop /* C4A280 802436A0 0280202D */ daddu $a0, $s4, $zero /* C4A284 802436A4 0220282D */ daddu $a1, $s1, $zero -/* C4A288 802436A8 0C0906FF */ jal func_80241BFC_C487DC +/* C4A288 802436A8 0C0906FF */ jal UnkNpcAIFunc1 /* C4A28C 802436AC 0260302D */ daddu $a2, $s3, $zero /* C4A290 802436B0 0280202D */ daddu $a0, $s4, $zero /* C4A294 802436B4 0220282D */ daddu $a1, $s1, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240CD0_C501E0.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240CD0_C501E0.s deleted file mode 100644 index b7bdeae605..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240CD0_C501E0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CD0_C501E0 -/* C501E0 80240CD0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C501E4 80240CD4 AFB3001C */ sw $s3, 0x1c($sp) -/* C501E8 80240CD8 0080982D */ daddu $s3, $a0, $zero -/* C501EC 80240CDC AFBF0020 */ sw $ra, 0x20($sp) -/* C501F0 80240CE0 AFB20018 */ sw $s2, 0x18($sp) -/* C501F4 80240CE4 AFB10014 */ sw $s1, 0x14($sp) -/* C501F8 80240CE8 AFB00010 */ sw $s0, 0x10($sp) -/* C501FC 80240CEC 8E720148 */ lw $s2, 0x148($s3) -/* C50200 80240CF0 86440008 */ lh $a0, 8($s2) -/* C50204 80240CF4 0C00EABB */ jal get_npc_unsafe -/* C50208 80240CF8 00A0882D */ daddu $s1, $a1, $zero -/* C5020C 80240CFC 8E240008 */ lw $a0, 8($s1) -/* C50210 80240D00 0040802D */ daddu $s0, $v0, $zero -/* C50214 80240D04 00041FC2 */ srl $v1, $a0, 0x1f -/* C50218 80240D08 00832021 */ addu $a0, $a0, $v1 -/* C5021C 80240D0C 00042043 */ sra $a0, $a0, 1 -/* C50220 80240D10 0C00A67F */ jal rand_int -/* C50224 80240D14 24840001 */ addiu $a0, $a0, 1 -/* C50228 80240D18 8E230008 */ lw $v1, 8($s1) -/* C5022C 80240D1C 240400B4 */ addiu $a0, $zero, 0xb4 -/* C50230 80240D20 00032FC2 */ srl $a1, $v1, 0x1f -/* C50234 80240D24 00651821 */ addu $v1, $v1, $a1 -/* C50238 80240D28 00031843 */ sra $v1, $v1, 1 -/* C5023C 80240D2C 00621821 */ addu $v1, $v1, $v0 -/* C50240 80240D30 0C00A67F */ jal rand_int -/* C50244 80240D34 A603008E */ sh $v1, 0x8e($s0) -/* C50248 80240D38 C60C000C */ lwc1 $f12, 0xc($s0) -/* C5024C 80240D3C 44820000 */ mtc1 $v0, $f0 -/* C50250 80240D40 00000000 */ nop -/* C50254 80240D44 46800020 */ cvt.s.w $f0, $f0 -/* C50258 80240D48 46006300 */ add.s $f12, $f12, $f0 -/* C5025C 80240D4C 3C0142B4 */ lui $at, 0x42b4 -/* C50260 80240D50 44810000 */ mtc1 $at, $f0 -/* C50264 80240D54 0C00A6C9 */ jal clamp_angle -/* C50268 80240D58 46006301 */ sub.s $f12, $f12, $f0 -/* C5026C 80240D5C E600000C */ swc1 $f0, 0xc($s0) -/* C50270 80240D60 8E4200CC */ lw $v0, 0xcc($s2) -/* C50274 80240D64 8C420000 */ lw $v0, ($v0) -/* C50278 80240D68 AE020028 */ sw $v0, 0x28($s0) -/* C5027C 80240D6C 24020003 */ addiu $v0, $zero, 3 -/* C50280 80240D70 AE620070 */ sw $v0, 0x70($s3) -/* C50284 80240D74 8FBF0020 */ lw $ra, 0x20($sp) -/* C50288 80240D78 8FB3001C */ lw $s3, 0x1c($sp) -/* C5028C 80240D7C 8FB20018 */ lw $s2, 0x18($sp) -/* C50290 80240D80 8FB10014 */ lw $s1, 0x14($sp) -/* C50294 80240D84 8FB00010 */ lw $s0, 0x10($sp) -/* C50298 80240D88 03E00008 */ jr $ra -/* C5029C 80240D8C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s index c7b6f690be..eef2309a87 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s @@ -141,7 +141,7 @@ glabel func_80241464_C50974 /* C50B7C 8024166C 00000000 */ nop /* C50B80 80241670 0280202D */ daddu $a0, $s4, $zero /* C50B84 80241674 0260282D */ daddu $a1, $s3, $zero -/* C50B88 80241678 0C090334 */ jal func_80240CD0_C501E0 +/* C50B88 80241678 0C090334 */ jal UnkNpcAIFunc1 /* C50B8C 8024167C 02A0302D */ daddu $a2, $s5, $zero /* C50B90 80241680 0280202D */ daddu $a0, $s4, $zero /* C50B94 80241684 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240400_C56340.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240400_C56340.s deleted file mode 100644 index f9a06a63b5..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240400_C56340.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_C56340 -/* C56340 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C56344 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* C56348 80240408 0080982D */ daddu $s3, $a0, $zero -/* C5634C 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* C56350 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* C56354 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* C56358 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* C5635C 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* C56360 80240420 86440008 */ lh $a0, 8($s2) -/* C56364 80240424 0C00EABB */ jal get_npc_unsafe -/* C56368 80240428 00A0882D */ daddu $s1, $a1, $zero -/* C5636C 8024042C 8E240008 */ lw $a0, 8($s1) -/* C56370 80240430 0040802D */ daddu $s0, $v0, $zero -/* C56374 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* C56378 80240438 00832021 */ addu $a0, $a0, $v1 -/* C5637C 8024043C 00042043 */ sra $a0, $a0, 1 -/* C56380 80240440 0C00A67F */ jal rand_int -/* C56384 80240444 24840001 */ addiu $a0, $a0, 1 -/* C56388 80240448 8E230008 */ lw $v1, 8($s1) -/* C5638C 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* C56390 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* C56394 80240454 00651821 */ addu $v1, $v1, $a1 -/* C56398 80240458 00031843 */ sra $v1, $v1, 1 -/* C5639C 8024045C 00621821 */ addu $v1, $v1, $v0 -/* C563A0 80240460 0C00A67F */ jal rand_int -/* C563A4 80240464 A603008E */ sh $v1, 0x8e($s0) -/* C563A8 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* C563AC 8024046C 44820000 */ mtc1 $v0, $f0 -/* C563B0 80240470 00000000 */ nop -/* C563B4 80240474 46800020 */ cvt.s.w $f0, $f0 -/* C563B8 80240478 46006300 */ add.s $f12, $f12, $f0 -/* C563BC 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* C563C0 80240480 44810000 */ mtc1 $at, $f0 -/* C563C4 80240484 0C00A6C9 */ jal clamp_angle -/* C563C8 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* C563CC 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* C563D0 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* C563D4 80240494 8C420000 */ lw $v0, ($v0) -/* C563D8 80240498 AE020028 */ sw $v0, 0x28($s0) -/* C563DC 8024049C 24020003 */ addiu $v0, $zero, 3 -/* C563E0 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* C563E4 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* C563E8 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* C563EC 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* C563F0 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* C563F4 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* C563F8 802404B8 03E00008 */ jr $ra -/* C563FC 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s index 87234dd084..a6292543e4 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s @@ -141,7 +141,7 @@ glabel func_80240B94_C56AD4 /* C56CDC 80240D9C 00000000 */ nop /* C56CE0 80240DA0 0280202D */ daddu $a0, $s4, $zero /* C56CE4 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* C56CE8 80240DA8 0C090100 */ jal func_80240400_C56340 +/* C56CE8 80240DA8 0C090100 */ jal UnkNpcAIFunc1 /* C56CEC 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* C56CF0 80240DB0 0280202D */ daddu $a0, $s4, $zero /* C56CF4 80240DB4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802409E0_95BBE0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802409E0_95BBE0.s deleted file mode 100644 index af4c82231f..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802409E0_95BBE0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409E0_95BBE0 -/* 95BBE0 802409E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 95BBE4 802409E4 AFB3001C */ sw $s3, 0x1c($sp) -/* 95BBE8 802409E8 0080982D */ daddu $s3, $a0, $zero -/* 95BBEC 802409EC AFBF0020 */ sw $ra, 0x20($sp) -/* 95BBF0 802409F0 AFB20018 */ sw $s2, 0x18($sp) -/* 95BBF4 802409F4 AFB10014 */ sw $s1, 0x14($sp) -/* 95BBF8 802409F8 AFB00010 */ sw $s0, 0x10($sp) -/* 95BBFC 802409FC 8E720148 */ lw $s2, 0x148($s3) -/* 95BC00 80240A00 86440008 */ lh $a0, 8($s2) -/* 95BC04 80240A04 0C00EABB */ jal get_npc_unsafe -/* 95BC08 80240A08 00A0882D */ daddu $s1, $a1, $zero -/* 95BC0C 80240A0C 8E240008 */ lw $a0, 8($s1) -/* 95BC10 80240A10 0040802D */ daddu $s0, $v0, $zero -/* 95BC14 80240A14 00041FC2 */ srl $v1, $a0, 0x1f -/* 95BC18 80240A18 00832021 */ addu $a0, $a0, $v1 -/* 95BC1C 80240A1C 00042043 */ sra $a0, $a0, 1 -/* 95BC20 80240A20 0C00A67F */ jal rand_int -/* 95BC24 80240A24 24840001 */ addiu $a0, $a0, 1 -/* 95BC28 80240A28 8E230008 */ lw $v1, 8($s1) -/* 95BC2C 80240A2C 240400B4 */ addiu $a0, $zero, 0xb4 -/* 95BC30 80240A30 00032FC2 */ srl $a1, $v1, 0x1f -/* 95BC34 80240A34 00651821 */ addu $v1, $v1, $a1 -/* 95BC38 80240A38 00031843 */ sra $v1, $v1, 1 -/* 95BC3C 80240A3C 00621821 */ addu $v1, $v1, $v0 -/* 95BC40 80240A40 0C00A67F */ jal rand_int -/* 95BC44 80240A44 A603008E */ sh $v1, 0x8e($s0) -/* 95BC48 80240A48 C60C000C */ lwc1 $f12, 0xc($s0) -/* 95BC4C 80240A4C 44820000 */ mtc1 $v0, $f0 -/* 95BC50 80240A50 00000000 */ nop -/* 95BC54 80240A54 46800020 */ cvt.s.w $f0, $f0 -/* 95BC58 80240A58 46006300 */ add.s $f12, $f12, $f0 -/* 95BC5C 80240A5C 3C0142B4 */ lui $at, 0x42b4 -/* 95BC60 80240A60 44810000 */ mtc1 $at, $f0 -/* 95BC64 80240A64 0C00A6C9 */ jal clamp_angle -/* 95BC68 80240A68 46006301 */ sub.s $f12, $f12, $f0 -/* 95BC6C 80240A6C E600000C */ swc1 $f0, 0xc($s0) -/* 95BC70 80240A70 8E4200CC */ lw $v0, 0xcc($s2) -/* 95BC74 80240A74 8C420000 */ lw $v0, ($v0) -/* 95BC78 80240A78 AE020028 */ sw $v0, 0x28($s0) -/* 95BC7C 80240A7C 24020003 */ addiu $v0, $zero, 3 -/* 95BC80 80240A80 AE620070 */ sw $v0, 0x70($s3) -/* 95BC84 80240A84 8FBF0020 */ lw $ra, 0x20($sp) -/* 95BC88 80240A88 8FB3001C */ lw $s3, 0x1c($sp) -/* 95BC8C 80240A8C 8FB20018 */ lw $s2, 0x18($sp) -/* 95BC90 80240A90 8FB10014 */ lw $s1, 0x14($sp) -/* 95BC94 80240A94 8FB00010 */ lw $s0, 0x10($sp) -/* 95BC98 80240A98 03E00008 */ jr $ra -/* 95BC9C 80240A9C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s index 9d0e0cccec..cc838a9ea9 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s @@ -141,7 +141,7 @@ glabel func_80241174_95C374 /* 95C57C 8024137C 00000000 */ nop /* 95C580 80241380 0280202D */ daddu $a0, $s4, $zero /* 95C584 80241384 0260282D */ daddu $a1, $s3, $zero -/* 95C588 80241388 0C090278 */ jal func_802409E0_95BBE0 +/* 95C588 80241388 0C090278 */ jal UnkNpcAIFunc1 /* 95C58C 8024138C 02A0302D */ daddu $a2, $s5, $zero /* 95C590 80241390 0280202D */ daddu $a0, $s4, $zero /* 95C594 80241394 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240440_C9E360.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240440_C9E360.s deleted file mode 100644 index f6cb56f8ac..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240440_C9E360.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240440_C9E360 -/* C9E360 80240440 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C9E364 80240444 AFB3001C */ sw $s3, 0x1c($sp) -/* C9E368 80240448 0080982D */ daddu $s3, $a0, $zero -/* C9E36C 8024044C AFBF0020 */ sw $ra, 0x20($sp) -/* C9E370 80240450 AFB20018 */ sw $s2, 0x18($sp) -/* C9E374 80240454 AFB10014 */ sw $s1, 0x14($sp) -/* C9E378 80240458 AFB00010 */ sw $s0, 0x10($sp) -/* C9E37C 8024045C 8E720148 */ lw $s2, 0x148($s3) -/* C9E380 80240460 86440008 */ lh $a0, 8($s2) -/* C9E384 80240464 0C00EABB */ jal get_npc_unsafe -/* C9E388 80240468 00A0882D */ daddu $s1, $a1, $zero -/* C9E38C 8024046C 8E240008 */ lw $a0, 8($s1) -/* C9E390 80240470 0040802D */ daddu $s0, $v0, $zero -/* C9E394 80240474 00041FC2 */ srl $v1, $a0, 0x1f -/* C9E398 80240478 00832021 */ addu $a0, $a0, $v1 -/* C9E39C 8024047C 00042043 */ sra $a0, $a0, 1 -/* C9E3A0 80240480 0C00A67F */ jal rand_int -/* C9E3A4 80240484 24840001 */ addiu $a0, $a0, 1 -/* C9E3A8 80240488 8E230008 */ lw $v1, 8($s1) -/* C9E3AC 8024048C 240400B4 */ addiu $a0, $zero, 0xb4 -/* C9E3B0 80240490 00032FC2 */ srl $a1, $v1, 0x1f -/* C9E3B4 80240494 00651821 */ addu $v1, $v1, $a1 -/* C9E3B8 80240498 00031843 */ sra $v1, $v1, 1 -/* C9E3BC 8024049C 00621821 */ addu $v1, $v1, $v0 -/* C9E3C0 802404A0 0C00A67F */ jal rand_int -/* C9E3C4 802404A4 A603008E */ sh $v1, 0x8e($s0) -/* C9E3C8 802404A8 C60C000C */ lwc1 $f12, 0xc($s0) -/* C9E3CC 802404AC 44820000 */ mtc1 $v0, $f0 -/* C9E3D0 802404B0 00000000 */ nop -/* C9E3D4 802404B4 46800020 */ cvt.s.w $f0, $f0 -/* C9E3D8 802404B8 46006300 */ add.s $f12, $f12, $f0 -/* C9E3DC 802404BC 3C0142B4 */ lui $at, 0x42b4 -/* C9E3E0 802404C0 44810000 */ mtc1 $at, $f0 -/* C9E3E4 802404C4 0C00A6C9 */ jal clamp_angle -/* C9E3E8 802404C8 46006301 */ sub.s $f12, $f12, $f0 -/* C9E3EC 802404CC E600000C */ swc1 $f0, 0xc($s0) -/* C9E3F0 802404D0 8E4200CC */ lw $v0, 0xcc($s2) -/* C9E3F4 802404D4 8C420000 */ lw $v0, ($v0) -/* C9E3F8 802404D8 AE020028 */ sw $v0, 0x28($s0) -/* C9E3FC 802404DC 24020003 */ addiu $v0, $zero, 3 -/* C9E400 802404E0 AE620070 */ sw $v0, 0x70($s3) -/* C9E404 802404E4 8FBF0020 */ lw $ra, 0x20($sp) -/* C9E408 802404E8 8FB3001C */ lw $s3, 0x1c($sp) -/* C9E40C 802404EC 8FB20018 */ lw $s2, 0x18($sp) -/* C9E410 802404F0 8FB10014 */ lw $s1, 0x14($sp) -/* C9E414 802404F4 8FB00010 */ lw $s0, 0x10($sp) -/* C9E418 802404F8 03E00008 */ jr $ra -/* C9E41C 802404FC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s index 9faf6b0d2d..382df070a1 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s @@ -141,7 +141,7 @@ glabel func_80240BD4_C9EAF4 /* C9ECFC 80240DDC 00000000 */ nop /* C9ED00 80240DE0 0280202D */ daddu $a0, $s4, $zero /* C9ED04 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* C9ED08 80240DE8 0C090110 */ jal func_80240440_C9E360 +/* C9ED08 80240DE8 0C090110 */ jal UnkNpcAIFunc1 /* C9ED0C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* C9ED10 80240DF0 0280202D */ daddu $a0, $s4, $zero /* C9ED14 80240DF4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240AF8_CB5AF8.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240AF8_CB5AF8.s deleted file mode 100644 index 12fe1a077f..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240AF8_CB5AF8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AF8_CB5AF8 -/* CB5AF8 80240AF8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CB5AFC 80240AFC AFB3001C */ sw $s3, 0x1c($sp) -/* CB5B00 80240B00 0080982D */ daddu $s3, $a0, $zero -/* CB5B04 80240B04 AFBF0020 */ sw $ra, 0x20($sp) -/* CB5B08 80240B08 AFB20018 */ sw $s2, 0x18($sp) -/* CB5B0C 80240B0C AFB10014 */ sw $s1, 0x14($sp) -/* CB5B10 80240B10 AFB00010 */ sw $s0, 0x10($sp) -/* CB5B14 80240B14 8E720148 */ lw $s2, 0x148($s3) -/* CB5B18 80240B18 86440008 */ lh $a0, 8($s2) -/* CB5B1C 80240B1C 0C00EABB */ jal get_npc_unsafe -/* CB5B20 80240B20 00A0882D */ daddu $s1, $a1, $zero -/* CB5B24 80240B24 8E240008 */ lw $a0, 8($s1) -/* CB5B28 80240B28 0040802D */ daddu $s0, $v0, $zero -/* CB5B2C 80240B2C 00041FC2 */ srl $v1, $a0, 0x1f -/* CB5B30 80240B30 00832021 */ addu $a0, $a0, $v1 -/* CB5B34 80240B34 00042043 */ sra $a0, $a0, 1 -/* CB5B38 80240B38 0C00A67F */ jal rand_int -/* CB5B3C 80240B3C 24840001 */ addiu $a0, $a0, 1 -/* CB5B40 80240B40 8E230008 */ lw $v1, 8($s1) -/* CB5B44 80240B44 240400B4 */ addiu $a0, $zero, 0xb4 -/* CB5B48 80240B48 00032FC2 */ srl $a1, $v1, 0x1f -/* CB5B4C 80240B4C 00651821 */ addu $v1, $v1, $a1 -/* CB5B50 80240B50 00031843 */ sra $v1, $v1, 1 -/* CB5B54 80240B54 00621821 */ addu $v1, $v1, $v0 -/* CB5B58 80240B58 0C00A67F */ jal rand_int -/* CB5B5C 80240B5C A603008E */ sh $v1, 0x8e($s0) -/* CB5B60 80240B60 C60C000C */ lwc1 $f12, 0xc($s0) -/* CB5B64 80240B64 44820000 */ mtc1 $v0, $f0 -/* CB5B68 80240B68 00000000 */ nop -/* CB5B6C 80240B6C 46800020 */ cvt.s.w $f0, $f0 -/* CB5B70 80240B70 46006300 */ add.s $f12, $f12, $f0 -/* CB5B74 80240B74 3C0142B4 */ lui $at, 0x42b4 -/* CB5B78 80240B78 44810000 */ mtc1 $at, $f0 -/* CB5B7C 80240B7C 0C00A6C9 */ jal clamp_angle -/* CB5B80 80240B80 46006301 */ sub.s $f12, $f12, $f0 -/* CB5B84 80240B84 E600000C */ swc1 $f0, 0xc($s0) -/* CB5B88 80240B88 8E4200CC */ lw $v0, 0xcc($s2) -/* CB5B8C 80240B8C 8C420000 */ lw $v0, ($v0) -/* CB5B90 80240B90 AE020028 */ sw $v0, 0x28($s0) -/* CB5B94 80240B94 24020003 */ addiu $v0, $zero, 3 -/* CB5B98 80240B98 AE620070 */ sw $v0, 0x70($s3) -/* CB5B9C 80240B9C 8FBF0020 */ lw $ra, 0x20($sp) -/* CB5BA0 80240BA0 8FB3001C */ lw $s3, 0x1c($sp) -/* CB5BA4 80240BA4 8FB20018 */ lw $s2, 0x18($sp) -/* CB5BA8 80240BA8 8FB10014 */ lw $s1, 0x14($sp) -/* CB5BAC 80240BAC 8FB00010 */ lw $s0, 0x10($sp) -/* CB5BB0 80240BB0 03E00008 */ jr $ra -/* CB5BB4 80240BB4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s index 4ca8eeb9e2..1cd6689ef8 100644 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s @@ -83,7 +83,7 @@ glabel func_8024162C_CB662C /* CB675C 8024175C 0000102D */ daddu $v0, $zero, $zero /* CB6760 80241760 0280202D */ daddu $a0, $s4, $zero /* CB6764 80241764 0200282D */ daddu $a1, $s0, $zero -/* CB6768 80241768 0C0902BE */ jal func_80240AF8_CB5AF8 +/* CB6768 80241768 0C0902BE */ jal UnkNpcAIFunc1 /* CB676C 8024176C 0260302D */ daddu $a2, $s3, $zero /* CB6770 80241770 0280202D */ daddu $a0, $s4, $zero /* CB6774 80241774 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024099C_CC41AC.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024099C_CC41AC.s deleted file mode 100644 index c47bfff171..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024099C_CC41AC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024099C_CC41AC -/* CC41AC 8024099C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CC41B0 802409A0 AFB3001C */ sw $s3, 0x1c($sp) -/* CC41B4 802409A4 0080982D */ daddu $s3, $a0, $zero -/* CC41B8 802409A8 AFBF0020 */ sw $ra, 0x20($sp) -/* CC41BC 802409AC AFB20018 */ sw $s2, 0x18($sp) -/* CC41C0 802409B0 AFB10014 */ sw $s1, 0x14($sp) -/* CC41C4 802409B4 AFB00010 */ sw $s0, 0x10($sp) -/* CC41C8 802409B8 8E720148 */ lw $s2, 0x148($s3) -/* CC41CC 802409BC 86440008 */ lh $a0, 8($s2) -/* CC41D0 802409C0 0C00EABB */ jal get_npc_unsafe -/* CC41D4 802409C4 00A0882D */ daddu $s1, $a1, $zero -/* CC41D8 802409C8 8E240008 */ lw $a0, 8($s1) -/* CC41DC 802409CC 0040802D */ daddu $s0, $v0, $zero -/* CC41E0 802409D0 00041FC2 */ srl $v1, $a0, 0x1f -/* CC41E4 802409D4 00832021 */ addu $a0, $a0, $v1 -/* CC41E8 802409D8 00042043 */ sra $a0, $a0, 1 -/* CC41EC 802409DC 0C00A67F */ jal rand_int -/* CC41F0 802409E0 24840001 */ addiu $a0, $a0, 1 -/* CC41F4 802409E4 8E230008 */ lw $v1, 8($s1) -/* CC41F8 802409E8 240400B4 */ addiu $a0, $zero, 0xb4 -/* CC41FC 802409EC 00032FC2 */ srl $a1, $v1, 0x1f -/* CC4200 802409F0 00651821 */ addu $v1, $v1, $a1 -/* CC4204 802409F4 00031843 */ sra $v1, $v1, 1 -/* CC4208 802409F8 00621821 */ addu $v1, $v1, $v0 -/* CC420C 802409FC 0C00A67F */ jal rand_int -/* CC4210 80240A00 A603008E */ sh $v1, 0x8e($s0) -/* CC4214 80240A04 C60C000C */ lwc1 $f12, 0xc($s0) -/* CC4218 80240A08 44820000 */ mtc1 $v0, $f0 -/* CC421C 80240A0C 00000000 */ nop -/* CC4220 80240A10 46800020 */ cvt.s.w $f0, $f0 -/* CC4224 80240A14 46006300 */ add.s $f12, $f12, $f0 -/* CC4228 80240A18 3C0142B4 */ lui $at, 0x42b4 -/* CC422C 80240A1C 44810000 */ mtc1 $at, $f0 -/* CC4230 80240A20 0C00A6C9 */ jal clamp_angle -/* CC4234 80240A24 46006301 */ sub.s $f12, $f12, $f0 -/* CC4238 80240A28 E600000C */ swc1 $f0, 0xc($s0) -/* CC423C 80240A2C 8E4200CC */ lw $v0, 0xcc($s2) -/* CC4240 80240A30 8C420000 */ lw $v0, ($v0) -/* CC4244 80240A34 AE020028 */ sw $v0, 0x28($s0) -/* CC4248 80240A38 24020003 */ addiu $v0, $zero, 3 -/* CC424C 80240A3C AE620070 */ sw $v0, 0x70($s3) -/* CC4250 80240A40 8FBF0020 */ lw $ra, 0x20($sp) -/* CC4254 80240A44 8FB3001C */ lw $s3, 0x1c($sp) -/* CC4258 80240A48 8FB20018 */ lw $s2, 0x18($sp) -/* CC425C 80240A4C 8FB10014 */ lw $s1, 0x14($sp) -/* CC4260 80240A50 8FB00010 */ lw $s0, 0x10($sp) -/* CC4264 80240A54 03E00008 */ jr $ra -/* CC4268 80240A58 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s index 943bf90760..0279dfb3dd 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s @@ -83,7 +83,7 @@ glabel func_802414D0_CC4CE0 /* CC4E10 80241600 0000102D */ daddu $v0, $zero, $zero /* CC4E14 80241604 0280202D */ daddu $a0, $s4, $zero /* CC4E18 80241608 0200282D */ daddu $a1, $s0, $zero -/* CC4E1C 8024160C 0C090267 */ jal func_8024099C_CC41AC +/* CC4E1C 8024160C 0C090267 */ jal UnkNpcAIFunc1 /* CC4E20 80241610 0260302D */ daddu $a2, $s3, $zero /* CC4E24 80241614 0280202D */ daddu $a0, $s4, $zero /* CC4E28 80241618 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s index 5f9d6b7b3b..6640612636 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s @@ -97,7 +97,7 @@ glabel func_80241DB8_CC55C8 .L80241F14: /* CC5724 80241F14 0280202D */ daddu $a0, $s4, $zero /* CC5728 80241F18 02C0282D */ daddu $a1, $s6, $zero -/* CC572C 80241F1C 0C090267 */ jal func_8024099C_CC41AC +/* CC572C 80241F1C 0C090267 */ jal UnkNpcAIFunc1 /* CC5730 80241F20 02A0302D */ daddu $a2, $s5, $zero /* CC5734 80241F24 0280202D */ daddu $a0, $s4, $zero .L80241F28: diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802412E8_CCC5F8.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802412E8_CCC5F8.s deleted file mode 100644 index 68df1f2950..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802412E8_CCC5F8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412E8_CCC5F8 -/* CCC5F8 802412E8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CCC5FC 802412EC AFB3001C */ sw $s3, 0x1c($sp) -/* CCC600 802412F0 0080982D */ daddu $s3, $a0, $zero -/* CCC604 802412F4 AFBF0020 */ sw $ra, 0x20($sp) -/* CCC608 802412F8 AFB20018 */ sw $s2, 0x18($sp) -/* CCC60C 802412FC AFB10014 */ sw $s1, 0x14($sp) -/* CCC610 80241300 AFB00010 */ sw $s0, 0x10($sp) -/* CCC614 80241304 8E720148 */ lw $s2, 0x148($s3) -/* CCC618 80241308 86440008 */ lh $a0, 8($s2) -/* CCC61C 8024130C 0C00EABB */ jal get_npc_unsafe -/* CCC620 80241310 00A0882D */ daddu $s1, $a1, $zero -/* CCC624 80241314 8E240008 */ lw $a0, 8($s1) -/* CCC628 80241318 0040802D */ daddu $s0, $v0, $zero -/* CCC62C 8024131C 00041FC2 */ srl $v1, $a0, 0x1f -/* CCC630 80241320 00832021 */ addu $a0, $a0, $v1 -/* CCC634 80241324 00042043 */ sra $a0, $a0, 1 -/* CCC638 80241328 0C00A67F */ jal rand_int -/* CCC63C 8024132C 24840001 */ addiu $a0, $a0, 1 -/* CCC640 80241330 8E230008 */ lw $v1, 8($s1) -/* CCC644 80241334 240400B4 */ addiu $a0, $zero, 0xb4 -/* CCC648 80241338 00032FC2 */ srl $a1, $v1, 0x1f -/* CCC64C 8024133C 00651821 */ addu $v1, $v1, $a1 -/* CCC650 80241340 00031843 */ sra $v1, $v1, 1 -/* CCC654 80241344 00621821 */ addu $v1, $v1, $v0 -/* CCC658 80241348 0C00A67F */ jal rand_int -/* CCC65C 8024134C A603008E */ sh $v1, 0x8e($s0) -/* CCC660 80241350 C60C000C */ lwc1 $f12, 0xc($s0) -/* CCC664 80241354 44820000 */ mtc1 $v0, $f0 -/* CCC668 80241358 00000000 */ nop -/* CCC66C 8024135C 46800020 */ cvt.s.w $f0, $f0 -/* CCC670 80241360 46006300 */ add.s $f12, $f12, $f0 -/* CCC674 80241364 3C0142B4 */ lui $at, 0x42b4 -/* CCC678 80241368 44810000 */ mtc1 $at, $f0 -/* CCC67C 8024136C 0C00A6C9 */ jal clamp_angle -/* CCC680 80241370 46006301 */ sub.s $f12, $f12, $f0 -/* CCC684 80241374 E600000C */ swc1 $f0, 0xc($s0) -/* CCC688 80241378 8E4200CC */ lw $v0, 0xcc($s2) -/* CCC68C 8024137C 8C420000 */ lw $v0, ($v0) -/* CCC690 80241380 AE020028 */ sw $v0, 0x28($s0) -/* CCC694 80241384 24020003 */ addiu $v0, $zero, 3 -/* CCC698 80241388 AE620070 */ sw $v0, 0x70($s3) -/* CCC69C 8024138C 8FBF0020 */ lw $ra, 0x20($sp) -/* CCC6A0 80241390 8FB3001C */ lw $s3, 0x1c($sp) -/* CCC6A4 80241394 8FB20018 */ lw $s2, 0x18($sp) -/* CCC6A8 80241398 8FB10014 */ lw $s1, 0x14($sp) -/* CCC6AC 8024139C 8FB00010 */ lw $s0, 0x10($sp) -/* CCC6B0 802413A0 03E00008 */ jr $ra -/* CCC6B4 802413A4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s index 1148e46641..98cba12bb3 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s @@ -83,7 +83,7 @@ glabel func_80241E1C_CCD12C /* CCD25C 80241F4C 0000102D */ daddu $v0, $zero, $zero /* CCD260 80241F50 0280202D */ daddu $a0, $s4, $zero /* CCD264 80241F54 0200282D */ daddu $a1, $s0, $zero -/* CCD268 80241F58 0C0904BA */ jal func_802412E8_CCC5F8 +/* CCD268 80241F58 0C0904BA */ jal UnkNpcAIFunc1 /* CCD26C 80241F5C 0260302D */ daddu $a2, $s3, $zero /* CCD270 80241F60 0280202D */ daddu $a0, $s4, $zero /* CCD274 80241F64 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241628_CD3458.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241628_CD3458.s deleted file mode 100644 index 1c832134a3..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241628_CD3458.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241628_CD3458 -/* CD3458 80241628 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CD345C 8024162C AFB3001C */ sw $s3, 0x1c($sp) -/* CD3460 80241630 0080982D */ daddu $s3, $a0, $zero -/* CD3464 80241634 AFBF0020 */ sw $ra, 0x20($sp) -/* CD3468 80241638 AFB20018 */ sw $s2, 0x18($sp) -/* CD346C 8024163C AFB10014 */ sw $s1, 0x14($sp) -/* CD3470 80241640 AFB00010 */ sw $s0, 0x10($sp) -/* CD3474 80241644 8E720148 */ lw $s2, 0x148($s3) -/* CD3478 80241648 86440008 */ lh $a0, 8($s2) -/* CD347C 8024164C 0C00EABB */ jal get_npc_unsafe -/* CD3480 80241650 00A0882D */ daddu $s1, $a1, $zero -/* CD3484 80241654 8E240008 */ lw $a0, 8($s1) -/* CD3488 80241658 0040802D */ daddu $s0, $v0, $zero -/* CD348C 8024165C 00041FC2 */ srl $v1, $a0, 0x1f -/* CD3490 80241660 00832021 */ addu $a0, $a0, $v1 -/* CD3494 80241664 00042043 */ sra $a0, $a0, 1 -/* CD3498 80241668 0C00A67F */ jal rand_int -/* CD349C 8024166C 24840001 */ addiu $a0, $a0, 1 -/* CD34A0 80241670 8E230008 */ lw $v1, 8($s1) -/* CD34A4 80241674 240400B4 */ addiu $a0, $zero, 0xb4 -/* CD34A8 80241678 00032FC2 */ srl $a1, $v1, 0x1f -/* CD34AC 8024167C 00651821 */ addu $v1, $v1, $a1 -/* CD34B0 80241680 00031843 */ sra $v1, $v1, 1 -/* CD34B4 80241684 00621821 */ addu $v1, $v1, $v0 -/* CD34B8 80241688 0C00A67F */ jal rand_int -/* CD34BC 8024168C A603008E */ sh $v1, 0x8e($s0) -/* CD34C0 80241690 C60C000C */ lwc1 $f12, 0xc($s0) -/* CD34C4 80241694 44820000 */ mtc1 $v0, $f0 -/* CD34C8 80241698 00000000 */ nop -/* CD34CC 8024169C 46800020 */ cvt.s.w $f0, $f0 -/* CD34D0 802416A0 46006300 */ add.s $f12, $f12, $f0 -/* CD34D4 802416A4 3C0142B4 */ lui $at, 0x42b4 -/* CD34D8 802416A8 44810000 */ mtc1 $at, $f0 -/* CD34DC 802416AC 0C00A6C9 */ jal clamp_angle -/* CD34E0 802416B0 46006301 */ sub.s $f12, $f12, $f0 -/* CD34E4 802416B4 E600000C */ swc1 $f0, 0xc($s0) -/* CD34E8 802416B8 8E4200CC */ lw $v0, 0xcc($s2) -/* CD34EC 802416BC 8C420000 */ lw $v0, ($v0) -/* CD34F0 802416C0 AE020028 */ sw $v0, 0x28($s0) -/* CD34F4 802416C4 24020003 */ addiu $v0, $zero, 3 -/* CD34F8 802416C8 AE620070 */ sw $v0, 0x70($s3) -/* CD34FC 802416CC 8FBF0020 */ lw $ra, 0x20($sp) -/* CD3500 802416D0 8FB3001C */ lw $s3, 0x1c($sp) -/* CD3504 802416D4 8FB20018 */ lw $s2, 0x18($sp) -/* CD3508 802416D8 8FB10014 */ lw $s1, 0x14($sp) -/* CD350C 802416DC 8FB00010 */ lw $s0, 0x10($sp) -/* CD3510 802416E0 03E00008 */ jr $ra -/* CD3514 802416E4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s index 806cbe4ae6..0270f003b5 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s @@ -83,7 +83,7 @@ glabel func_8024215C_CD3F8C /* CD40BC 8024228C 0000102D */ daddu $v0, $zero, $zero /* CD40C0 80242290 0280202D */ daddu $a0, $s4, $zero /* CD40C4 80242294 0200282D */ daddu $a1, $s0, $zero -/* CD40C8 80242298 0C09058A */ jal func_80241628_CD3458 +/* CD40C8 80242298 0C09058A */ jal UnkNpcAIFunc1 /* CD40CC 8024229C 0260302D */ daddu $a2, $s3, $zero /* CD40D0 802422A0 0280202D */ daddu $a0, $s4, $zero /* CD40D4 802422A4 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s index 7fe1bf8ffe..ecd9ac5a82 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s @@ -84,7 +84,7 @@ glabel func_80242754_CD4584 /* CD46B8 80242888 0000102D */ daddu $v0, $zero, $zero /* CD46BC 8024288C 0280202D */ daddu $a0, $s4, $zero /* CD46C0 80242890 0200282D */ daddu $a1, $s0, $zero -/* CD46C4 80242894 0C09058A */ jal func_80241628_CD3458 +/* CD46C4 80242894 0C09058A */ jal UnkNpcAIFunc1 /* CD46C8 80242898 0260302D */ daddu $a2, $s3, $zero /* CD46CC 8024289C 0280202D */ daddu $a0, $s4, $zero /* CD46D0 802428A0 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240848_CD7B28.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240848_CD7B28.s deleted file mode 100644 index 383052f0ee..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240848_CD7B28.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240848_CD7B28 -/* CD7B28 80240848 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CD7B2C 8024084C AFB3001C */ sw $s3, 0x1c($sp) -/* CD7B30 80240850 0080982D */ daddu $s3, $a0, $zero -/* CD7B34 80240854 AFBF0020 */ sw $ra, 0x20($sp) -/* CD7B38 80240858 AFB20018 */ sw $s2, 0x18($sp) -/* CD7B3C 8024085C AFB10014 */ sw $s1, 0x14($sp) -/* CD7B40 80240860 AFB00010 */ sw $s0, 0x10($sp) -/* CD7B44 80240864 8E720148 */ lw $s2, 0x148($s3) -/* CD7B48 80240868 86440008 */ lh $a0, 8($s2) -/* CD7B4C 8024086C 0C00EABB */ jal get_npc_unsafe -/* CD7B50 80240870 00A0882D */ daddu $s1, $a1, $zero -/* CD7B54 80240874 8E240008 */ lw $a0, 8($s1) -/* CD7B58 80240878 0040802D */ daddu $s0, $v0, $zero -/* CD7B5C 8024087C 00041FC2 */ srl $v1, $a0, 0x1f -/* CD7B60 80240880 00832021 */ addu $a0, $a0, $v1 -/* CD7B64 80240884 00042043 */ sra $a0, $a0, 1 -/* CD7B68 80240888 0C00A67F */ jal rand_int -/* CD7B6C 8024088C 24840001 */ addiu $a0, $a0, 1 -/* CD7B70 80240890 8E230008 */ lw $v1, 8($s1) -/* CD7B74 80240894 240400B4 */ addiu $a0, $zero, 0xb4 -/* CD7B78 80240898 00032FC2 */ srl $a1, $v1, 0x1f -/* CD7B7C 8024089C 00651821 */ addu $v1, $v1, $a1 -/* CD7B80 802408A0 00031843 */ sra $v1, $v1, 1 -/* CD7B84 802408A4 00621821 */ addu $v1, $v1, $v0 -/* CD7B88 802408A8 0C00A67F */ jal rand_int -/* CD7B8C 802408AC A603008E */ sh $v1, 0x8e($s0) -/* CD7B90 802408B0 C60C000C */ lwc1 $f12, 0xc($s0) -/* CD7B94 802408B4 44820000 */ mtc1 $v0, $f0 -/* CD7B98 802408B8 00000000 */ nop -/* CD7B9C 802408BC 46800020 */ cvt.s.w $f0, $f0 -/* CD7BA0 802408C0 46006300 */ add.s $f12, $f12, $f0 -/* CD7BA4 802408C4 3C0142B4 */ lui $at, 0x42b4 -/* CD7BA8 802408C8 44810000 */ mtc1 $at, $f0 -/* CD7BAC 802408CC 0C00A6C9 */ jal clamp_angle -/* CD7BB0 802408D0 46006301 */ sub.s $f12, $f12, $f0 -/* CD7BB4 802408D4 E600000C */ swc1 $f0, 0xc($s0) -/* CD7BB8 802408D8 8E4200CC */ lw $v0, 0xcc($s2) -/* CD7BBC 802408DC 8C420000 */ lw $v0, ($v0) -/* CD7BC0 802408E0 AE020028 */ sw $v0, 0x28($s0) -/* CD7BC4 802408E4 24020003 */ addiu $v0, $zero, 3 -/* CD7BC8 802408E8 AE620070 */ sw $v0, 0x70($s3) -/* CD7BCC 802408EC 8FBF0020 */ lw $ra, 0x20($sp) -/* CD7BD0 802408F0 8FB3001C */ lw $s3, 0x1c($sp) -/* CD7BD4 802408F4 8FB20018 */ lw $s2, 0x18($sp) -/* CD7BD8 802408F8 8FB10014 */ lw $s1, 0x14($sp) -/* CD7BDC 802408FC 8FB00010 */ lw $s0, 0x10($sp) -/* CD7BE0 80240900 03E00008 */ jr $ra -/* CD7BE4 80240904 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s index 7fb6c9cc63..e959138681 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s @@ -83,7 +83,7 @@ glabel func_8024137C_CD865C /* CD878C 802414AC 0000102D */ daddu $v0, $zero, $zero /* CD8790 802414B0 0280202D */ daddu $a0, $s4, $zero /* CD8794 802414B4 0200282D */ daddu $a1, $s0, $zero -/* CD8798 802414B8 0C090212 */ jal func_80240848_CD7B28 +/* CD8798 802414B8 0C090212 */ jal UnkNpcAIFunc1 /* CD879C 802414BC 0260302D */ daddu $a2, $s3, $zero /* CD87A0 802414C0 0280202D */ daddu $a0, $s4, $zero /* CD87A4 802414C4 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s index 4c2e22ec04..a136362ea6 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s @@ -97,7 +97,7 @@ glabel func_80241C64_CD8F44 .L80241DC0: /* CD90A0 80241DC0 0280202D */ daddu $a0, $s4, $zero /* CD90A4 80241DC4 02C0282D */ daddu $a1, $s6, $zero -/* CD90A8 80241DC8 0C090212 */ jal func_80240848_CD7B28 +/* CD90A8 80241DC8 0C090212 */ jal UnkNpcAIFunc1 /* CD90AC 80241DCC 02A0302D */ daddu $a2, $s5, $zero /* CD90B0 80241DD0 0280202D */ daddu $a0, $s4, $zero .L80241DD4: diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240818_CF33E8.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240818_CF33E8.s deleted file mode 100644 index 9453cb25bb..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240818_CF33E8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240818_CF33E8 -/* CF33E8 80240818 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CF33EC 8024081C AFB3001C */ sw $s3, 0x1c($sp) -/* CF33F0 80240820 0080982D */ daddu $s3, $a0, $zero -/* CF33F4 80240824 AFBF0020 */ sw $ra, 0x20($sp) -/* CF33F8 80240828 AFB20018 */ sw $s2, 0x18($sp) -/* CF33FC 8024082C AFB10014 */ sw $s1, 0x14($sp) -/* CF3400 80240830 AFB00010 */ sw $s0, 0x10($sp) -/* CF3404 80240834 8E720148 */ lw $s2, 0x148($s3) -/* CF3408 80240838 86440008 */ lh $a0, 8($s2) -/* CF340C 8024083C 0C00EABB */ jal get_npc_unsafe -/* CF3410 80240840 00A0882D */ daddu $s1, $a1, $zero -/* CF3414 80240844 8E240008 */ lw $a0, 8($s1) -/* CF3418 80240848 0040802D */ daddu $s0, $v0, $zero -/* CF341C 8024084C 00041FC2 */ srl $v1, $a0, 0x1f -/* CF3420 80240850 00832021 */ addu $a0, $a0, $v1 -/* CF3424 80240854 00042043 */ sra $a0, $a0, 1 -/* CF3428 80240858 0C00A67F */ jal rand_int -/* CF342C 8024085C 24840001 */ addiu $a0, $a0, 1 -/* CF3430 80240860 8E230008 */ lw $v1, 8($s1) -/* CF3434 80240864 240400B4 */ addiu $a0, $zero, 0xb4 -/* CF3438 80240868 00032FC2 */ srl $a1, $v1, 0x1f -/* CF343C 8024086C 00651821 */ addu $v1, $v1, $a1 -/* CF3440 80240870 00031843 */ sra $v1, $v1, 1 -/* CF3444 80240874 00621821 */ addu $v1, $v1, $v0 -/* CF3448 80240878 0C00A67F */ jal rand_int -/* CF344C 8024087C A603008E */ sh $v1, 0x8e($s0) -/* CF3450 80240880 C60C000C */ lwc1 $f12, 0xc($s0) -/* CF3454 80240884 44820000 */ mtc1 $v0, $f0 -/* CF3458 80240888 00000000 */ nop -/* CF345C 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* CF3460 80240890 46006300 */ add.s $f12, $f12, $f0 -/* CF3464 80240894 3C0142B4 */ lui $at, 0x42b4 -/* CF3468 80240898 44810000 */ mtc1 $at, $f0 -/* CF346C 8024089C 0C00A6C9 */ jal clamp_angle -/* CF3470 802408A0 46006301 */ sub.s $f12, $f12, $f0 -/* CF3474 802408A4 E600000C */ swc1 $f0, 0xc($s0) -/* CF3478 802408A8 8E4200CC */ lw $v0, 0xcc($s2) -/* CF347C 802408AC 8C420000 */ lw $v0, ($v0) -/* CF3480 802408B0 AE020028 */ sw $v0, 0x28($s0) -/* CF3484 802408B4 24020003 */ addiu $v0, $zero, 3 -/* CF3488 802408B8 AE620070 */ sw $v0, 0x70($s3) -/* CF348C 802408BC 8FBF0020 */ lw $ra, 0x20($sp) -/* CF3490 802408C0 8FB3001C */ lw $s3, 0x1c($sp) -/* CF3494 802408C4 8FB20018 */ lw $s2, 0x18($sp) -/* CF3498 802408C8 8FB10014 */ lw $s1, 0x14($sp) -/* CF349C 802408CC 8FB00010 */ lw $s0, 0x10($sp) -/* CF34A0 802408D0 03E00008 */ jr $ra -/* CF34A4 802408D4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s index 6085462406..d2189b66b3 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s @@ -83,7 +83,7 @@ glabel func_8024134C_CF3F1C /* CF404C 8024147C 0000102D */ daddu $v0, $zero, $zero /* CF4050 80241480 0280202D */ daddu $a0, $s4, $zero /* CF4054 80241484 0200282D */ daddu $a1, $s0, $zero -/* CF4058 80241488 0C090206 */ jal func_80240818_CF33E8 +/* CF4058 80241488 0C090206 */ jal UnkNpcAIFunc1 /* CF405C 8024148C 0260302D */ daddu $a2, $s3, $zero /* CF4060 80241490 0280202D */ daddu $a0, $s4, $zero /* CF4064 80241494 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s index ee924bfe2a..1d8f02e269 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s @@ -84,7 +84,7 @@ glabel func_80241944_CF4514 /* CF4648 80241A78 0000102D */ daddu $v0, $zero, $zero /* CF464C 80241A7C 0280202D */ daddu $a0, $s4, $zero /* CF4650 80241A80 0200282D */ daddu $a1, $s0, $zero -/* CF4654 80241A84 0C090206 */ jal func_80240818_CF33E8 +/* CF4654 80241A84 0C090206 */ jal UnkNpcAIFunc1 /* CF4658 80241A88 0260302D */ daddu $a2, $s3, $zero /* CF465C 80241A8C 0280202D */ daddu $a0, $s4, $zero /* CF4660 80241A90 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802417C8_A179E8.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802417C8_A179E8.s deleted file mode 100644 index f50c6be9a7..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802417C8_A179E8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417C8_A179E8 -/* A179E8 802417C8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A179EC 802417CC AFB3001C */ sw $s3, 0x1c($sp) -/* A179F0 802417D0 0080982D */ daddu $s3, $a0, $zero -/* A179F4 802417D4 AFBF0020 */ sw $ra, 0x20($sp) -/* A179F8 802417D8 AFB20018 */ sw $s2, 0x18($sp) -/* A179FC 802417DC AFB10014 */ sw $s1, 0x14($sp) -/* A17A00 802417E0 AFB00010 */ sw $s0, 0x10($sp) -/* A17A04 802417E4 8E720148 */ lw $s2, 0x148($s3) -/* A17A08 802417E8 86440008 */ lh $a0, 8($s2) -/* A17A0C 802417EC 0C00EABB */ jal get_npc_unsafe -/* A17A10 802417F0 00A0882D */ daddu $s1, $a1, $zero -/* A17A14 802417F4 8E240008 */ lw $a0, 8($s1) -/* A17A18 802417F8 0040802D */ daddu $s0, $v0, $zero -/* A17A1C 802417FC 00041FC2 */ srl $v1, $a0, 0x1f -/* A17A20 80241800 00832021 */ addu $a0, $a0, $v1 -/* A17A24 80241804 00042043 */ sra $a0, $a0, 1 -/* A17A28 80241808 0C00A67F */ jal rand_int -/* A17A2C 8024180C 24840001 */ addiu $a0, $a0, 1 -/* A17A30 80241810 8E230008 */ lw $v1, 8($s1) -/* A17A34 80241814 240400B4 */ addiu $a0, $zero, 0xb4 -/* A17A38 80241818 00032FC2 */ srl $a1, $v1, 0x1f -/* A17A3C 8024181C 00651821 */ addu $v1, $v1, $a1 -/* A17A40 80241820 00031843 */ sra $v1, $v1, 1 -/* A17A44 80241824 00621821 */ addu $v1, $v1, $v0 -/* A17A48 80241828 0C00A67F */ jal rand_int -/* A17A4C 8024182C A603008E */ sh $v1, 0x8e($s0) -/* A17A50 80241830 C60C000C */ lwc1 $f12, 0xc($s0) -/* A17A54 80241834 44820000 */ mtc1 $v0, $f0 -/* A17A58 80241838 00000000 */ nop -/* A17A5C 8024183C 46800020 */ cvt.s.w $f0, $f0 -/* A17A60 80241840 46006300 */ add.s $f12, $f12, $f0 -/* A17A64 80241844 3C0142B4 */ lui $at, 0x42b4 -/* A17A68 80241848 44810000 */ mtc1 $at, $f0 -/* A17A6C 8024184C 0C00A6C9 */ jal clamp_angle -/* A17A70 80241850 46006301 */ sub.s $f12, $f12, $f0 -/* A17A74 80241854 E600000C */ swc1 $f0, 0xc($s0) -/* A17A78 80241858 8E4200CC */ lw $v0, 0xcc($s2) -/* A17A7C 8024185C 8C420000 */ lw $v0, ($v0) -/* A17A80 80241860 AE020028 */ sw $v0, 0x28($s0) -/* A17A84 80241864 24020003 */ addiu $v0, $zero, 3 -/* A17A88 80241868 AE620070 */ sw $v0, 0x70($s3) -/* A17A8C 8024186C 8FBF0020 */ lw $ra, 0x20($sp) -/* A17A90 80241870 8FB3001C */ lw $s3, 0x1c($sp) -/* A17A94 80241874 8FB20018 */ lw $s2, 0x18($sp) -/* A17A98 80241878 8FB10014 */ lw $s1, 0x14($sp) -/* A17A9C 8024187C 8FB00010 */ lw $s0, 0x10($sp) -/* A17AA0 80241880 03E00008 */ jr $ra -/* A17AA4 80241884 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s index 0cdb1ef49b..cbae051cc5 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s @@ -83,7 +83,7 @@ glabel func_802422FC_A1851C /* A1864C 8024242C 0000102D */ daddu $v0, $zero, $zero /* A18650 80242430 0280202D */ daddu $a0, $s4, $zero /* A18654 80242434 0200282D */ daddu $a1, $s0, $zero -/* A18658 80242438 0C0905F2 */ jal func_802417C8_A179E8 +/* A18658 80242438 0C0905F2 */ jal UnkNpcAIFunc1 /* A1865C 8024243C 0260302D */ daddu $a2, $s3, $zero /* A18660 80242440 0280202D */ daddu $a0, $s4, $zero /* A18664 80242444 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s index 1b2999fc87..36f8571ae7 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s @@ -84,7 +84,7 @@ glabel func_802428F4_A18B14 /* A18C48 80242A28 0000102D */ daddu $v0, $zero, $zero /* A18C4C 80242A2C 0280202D */ daddu $a0, $s4, $zero /* A18C50 80242A30 0200282D */ daddu $a1, $s0, $zero -/* A18C54 80242A34 0C0905F2 */ jal func_802417C8_A179E8 +/* A18C54 80242A34 0C0905F2 */ jal UnkNpcAIFunc1 /* A18C58 80242A38 0260302D */ daddu $a2, $s3, $zero /* A18C5C 80242A3C 0280202D */ daddu $a0, $s4, $zero /* A18C60 80242A40 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241488_A1C588.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241488_A1C588.s deleted file mode 100644 index d5cc1f7a71..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241488_A1C588.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241488_A1C588 -/* A1C588 80241488 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A1C58C 8024148C AFB3001C */ sw $s3, 0x1c($sp) -/* A1C590 80241490 0080982D */ daddu $s3, $a0, $zero -/* A1C594 80241494 AFBF0020 */ sw $ra, 0x20($sp) -/* A1C598 80241498 AFB20018 */ sw $s2, 0x18($sp) -/* A1C59C 8024149C AFB10014 */ sw $s1, 0x14($sp) -/* A1C5A0 802414A0 AFB00010 */ sw $s0, 0x10($sp) -/* A1C5A4 802414A4 8E720148 */ lw $s2, 0x148($s3) -/* A1C5A8 802414A8 86440008 */ lh $a0, 8($s2) -/* A1C5AC 802414AC 0C00EABB */ jal get_npc_unsafe -/* A1C5B0 802414B0 00A0882D */ daddu $s1, $a1, $zero -/* A1C5B4 802414B4 8E240008 */ lw $a0, 8($s1) -/* A1C5B8 802414B8 0040802D */ daddu $s0, $v0, $zero -/* A1C5BC 802414BC 00041FC2 */ srl $v1, $a0, 0x1f -/* A1C5C0 802414C0 00832021 */ addu $a0, $a0, $v1 -/* A1C5C4 802414C4 00042043 */ sra $a0, $a0, 1 -/* A1C5C8 802414C8 0C00A67F */ jal rand_int -/* A1C5CC 802414CC 24840001 */ addiu $a0, $a0, 1 -/* A1C5D0 802414D0 8E230008 */ lw $v1, 8($s1) -/* A1C5D4 802414D4 240400B4 */ addiu $a0, $zero, 0xb4 -/* A1C5D8 802414D8 00032FC2 */ srl $a1, $v1, 0x1f -/* A1C5DC 802414DC 00651821 */ addu $v1, $v1, $a1 -/* A1C5E0 802414E0 00031843 */ sra $v1, $v1, 1 -/* A1C5E4 802414E4 00621821 */ addu $v1, $v1, $v0 -/* A1C5E8 802414E8 0C00A67F */ jal rand_int -/* A1C5EC 802414EC A603008E */ sh $v1, 0x8e($s0) -/* A1C5F0 802414F0 C60C000C */ lwc1 $f12, 0xc($s0) -/* A1C5F4 802414F4 44820000 */ mtc1 $v0, $f0 -/* A1C5F8 802414F8 00000000 */ nop -/* A1C5FC 802414FC 46800020 */ cvt.s.w $f0, $f0 -/* A1C600 80241500 46006300 */ add.s $f12, $f12, $f0 -/* A1C604 80241504 3C0142B4 */ lui $at, 0x42b4 -/* A1C608 80241508 44810000 */ mtc1 $at, $f0 -/* A1C60C 8024150C 0C00A6C9 */ jal clamp_angle -/* A1C610 80241510 46006301 */ sub.s $f12, $f12, $f0 -/* A1C614 80241514 E600000C */ swc1 $f0, 0xc($s0) -/* A1C618 80241518 8E4200CC */ lw $v0, 0xcc($s2) -/* A1C61C 8024151C 8C420000 */ lw $v0, ($v0) -/* A1C620 80241520 AE020028 */ sw $v0, 0x28($s0) -/* A1C624 80241524 24020003 */ addiu $v0, $zero, 3 -/* A1C628 80241528 AE620070 */ sw $v0, 0x70($s3) -/* A1C62C 8024152C 8FBF0020 */ lw $ra, 0x20($sp) -/* A1C630 80241530 8FB3001C */ lw $s3, 0x1c($sp) -/* A1C634 80241534 8FB20018 */ lw $s2, 0x18($sp) -/* A1C638 80241538 8FB10014 */ lw $s1, 0x14($sp) -/* A1C63C 8024153C 8FB00010 */ lw $s0, 0x10($sp) -/* A1C640 80241540 03E00008 */ jr $ra -/* A1C644 80241544 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s index 31366f50df..26c553208f 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s @@ -83,7 +83,7 @@ glabel func_80241FBC_A1D0BC /* A1D1EC 802420EC 0000102D */ daddu $v0, $zero, $zero /* A1D1F0 802420F0 0280202D */ daddu $a0, $s4, $zero /* A1D1F4 802420F4 0200282D */ daddu $a1, $s0, $zero -/* A1D1F8 802420F8 0C090522 */ jal func_80241488_A1C588 +/* A1D1F8 802420F8 0C090522 */ jal UnkNpcAIFunc1 /* A1D1FC 802420FC 0260302D */ daddu $a2, $s3, $zero /* A1D200 80242100 0280202D */ daddu $a0, $s4, $zero /* A1D204 80242104 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240568_97E038.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240568_97E038.s deleted file mode 100644 index 8c75c05b17..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240568_97E038.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568_97E038 -/* 97E038 80240568 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 97E03C 8024056C AFB3001C */ sw $s3, 0x1c($sp) -/* 97E040 80240570 0080982D */ daddu $s3, $a0, $zero -/* 97E044 80240574 AFBF0020 */ sw $ra, 0x20($sp) -/* 97E048 80240578 AFB20018 */ sw $s2, 0x18($sp) -/* 97E04C 8024057C AFB10014 */ sw $s1, 0x14($sp) -/* 97E050 80240580 AFB00010 */ sw $s0, 0x10($sp) -/* 97E054 80240584 8E720148 */ lw $s2, 0x148($s3) -/* 97E058 80240588 86440008 */ lh $a0, 8($s2) -/* 97E05C 8024058C 0C00EABB */ jal get_npc_unsafe -/* 97E060 80240590 00A0882D */ daddu $s1, $a1, $zero -/* 97E064 80240594 8E240008 */ lw $a0, 8($s1) -/* 97E068 80240598 0040802D */ daddu $s0, $v0, $zero -/* 97E06C 8024059C 00041FC2 */ srl $v1, $a0, 0x1f -/* 97E070 802405A0 00832021 */ addu $a0, $a0, $v1 -/* 97E074 802405A4 00042043 */ sra $a0, $a0, 1 -/* 97E078 802405A8 0C00A67F */ jal rand_int -/* 97E07C 802405AC 24840001 */ addiu $a0, $a0, 1 -/* 97E080 802405B0 8E230008 */ lw $v1, 8($s1) -/* 97E084 802405B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* 97E088 802405B8 00032FC2 */ srl $a1, $v1, 0x1f -/* 97E08C 802405BC 00651821 */ addu $v1, $v1, $a1 -/* 97E090 802405C0 00031843 */ sra $v1, $v1, 1 -/* 97E094 802405C4 00621821 */ addu $v1, $v1, $v0 -/* 97E098 802405C8 0C00A67F */ jal rand_int -/* 97E09C 802405CC A603008E */ sh $v1, 0x8e($s0) -/* 97E0A0 802405D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* 97E0A4 802405D4 44820000 */ mtc1 $v0, $f0 -/* 97E0A8 802405D8 00000000 */ nop -/* 97E0AC 802405DC 46800020 */ cvt.s.w $f0, $f0 -/* 97E0B0 802405E0 46006300 */ add.s $f12, $f12, $f0 -/* 97E0B4 802405E4 3C0142B4 */ lui $at, 0x42b4 -/* 97E0B8 802405E8 44810000 */ mtc1 $at, $f0 -/* 97E0BC 802405EC 0C00A6C9 */ jal clamp_angle -/* 97E0C0 802405F0 46006301 */ sub.s $f12, $f12, $f0 -/* 97E0C4 802405F4 E600000C */ swc1 $f0, 0xc($s0) -/* 97E0C8 802405F8 8E4200CC */ lw $v0, 0xcc($s2) -/* 97E0CC 802405FC 8C420000 */ lw $v0, ($v0) -/* 97E0D0 80240600 AE020028 */ sw $v0, 0x28($s0) -/* 97E0D4 80240604 24020003 */ addiu $v0, $zero, 3 -/* 97E0D8 80240608 AE620070 */ sw $v0, 0x70($s3) -/* 97E0DC 8024060C 8FBF0020 */ lw $ra, 0x20($sp) -/* 97E0E0 80240610 8FB3001C */ lw $s3, 0x1c($sp) -/* 97E0E4 80240614 8FB20018 */ lw $s2, 0x18($sp) -/* 97E0E8 80240618 8FB10014 */ lw $s1, 0x14($sp) -/* 97E0EC 8024061C 8FB00010 */ lw $s0, 0x10($sp) -/* 97E0F0 80240620 03E00008 */ jr $ra -/* 97E0F4 80240624 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s index 3de351f987..2b01610267 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s @@ -105,7 +105,7 @@ glabel func_80240BF0_97E6C0 /* 97E848 80240D78 0000102D */ daddu $v0, $zero, $zero /* 97E84C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 97E850 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 97E854 80240D84 0C09015A */ jal func_80240568_97E038 +/* 97E854 80240D84 0C09015A */ jal UnkNpcAIFunc1 /* 97E858 80240D88 0200302D */ daddu $a2, $s0, $zero /* 97E85C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 97E860 80240D90 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s index 98ed6be130..52deef631c 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s @@ -86,7 +86,7 @@ glabel func_80240F3C_97EA0C /* 97EB4C 8024107C 00000000 */ nop /* 97EB50 80241080 0280202D */ daddu $a0, $s4, $zero /* 97EB54 80241084 0200282D */ daddu $a1, $s0, $zero -/* 97EB58 80241088 0C09015A */ jal func_80240568_97E038 +/* 97EB58 80241088 0C09015A */ jal UnkNpcAIFunc1 /* 97EB5C 8024108C 0260302D */ daddu $a2, $s3, $zero /* 97EB60 80241090 0280202D */ daddu $a0, $s4, $zero /* 97EB64 80241094 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240568_98FD48.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240568_98FD48.s deleted file mode 100644 index a38159cd92..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240568_98FD48.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568_98FD48 -/* 98FD48 80240568 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 98FD4C 8024056C AFB3001C */ sw $s3, 0x1c($sp) -/* 98FD50 80240570 0080982D */ daddu $s3, $a0, $zero -/* 98FD54 80240574 AFBF0020 */ sw $ra, 0x20($sp) -/* 98FD58 80240578 AFB20018 */ sw $s2, 0x18($sp) -/* 98FD5C 8024057C AFB10014 */ sw $s1, 0x14($sp) -/* 98FD60 80240580 AFB00010 */ sw $s0, 0x10($sp) -/* 98FD64 80240584 8E720148 */ lw $s2, 0x148($s3) -/* 98FD68 80240588 86440008 */ lh $a0, 8($s2) -/* 98FD6C 8024058C 0C00EABB */ jal get_npc_unsafe -/* 98FD70 80240590 00A0882D */ daddu $s1, $a1, $zero -/* 98FD74 80240594 8E240008 */ lw $a0, 8($s1) -/* 98FD78 80240598 0040802D */ daddu $s0, $v0, $zero -/* 98FD7C 8024059C 00041FC2 */ srl $v1, $a0, 0x1f -/* 98FD80 802405A0 00832021 */ addu $a0, $a0, $v1 -/* 98FD84 802405A4 00042043 */ sra $a0, $a0, 1 -/* 98FD88 802405A8 0C00A67F */ jal rand_int -/* 98FD8C 802405AC 24840001 */ addiu $a0, $a0, 1 -/* 98FD90 802405B0 8E230008 */ lw $v1, 8($s1) -/* 98FD94 802405B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* 98FD98 802405B8 00032FC2 */ srl $a1, $v1, 0x1f -/* 98FD9C 802405BC 00651821 */ addu $v1, $v1, $a1 -/* 98FDA0 802405C0 00031843 */ sra $v1, $v1, 1 -/* 98FDA4 802405C4 00621821 */ addu $v1, $v1, $v0 -/* 98FDA8 802405C8 0C00A67F */ jal rand_int -/* 98FDAC 802405CC A603008E */ sh $v1, 0x8e($s0) -/* 98FDB0 802405D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* 98FDB4 802405D4 44820000 */ mtc1 $v0, $f0 -/* 98FDB8 802405D8 00000000 */ nop -/* 98FDBC 802405DC 46800020 */ cvt.s.w $f0, $f0 -/* 98FDC0 802405E0 46006300 */ add.s $f12, $f12, $f0 -/* 98FDC4 802405E4 3C0142B4 */ lui $at, 0x42b4 -/* 98FDC8 802405E8 44810000 */ mtc1 $at, $f0 -/* 98FDCC 802405EC 0C00A6C9 */ jal clamp_angle -/* 98FDD0 802405F0 46006301 */ sub.s $f12, $f12, $f0 -/* 98FDD4 802405F4 E600000C */ swc1 $f0, 0xc($s0) -/* 98FDD8 802405F8 8E4200CC */ lw $v0, 0xcc($s2) -/* 98FDDC 802405FC 8C420000 */ lw $v0, ($v0) -/* 98FDE0 80240600 AE020028 */ sw $v0, 0x28($s0) -/* 98FDE4 80240604 24020003 */ addiu $v0, $zero, 3 -/* 98FDE8 80240608 AE620070 */ sw $v0, 0x70($s3) -/* 98FDEC 8024060C 8FBF0020 */ lw $ra, 0x20($sp) -/* 98FDF0 80240610 8FB3001C */ lw $s3, 0x1c($sp) -/* 98FDF4 80240614 8FB20018 */ lw $s2, 0x18($sp) -/* 98FDF8 80240618 8FB10014 */ lw $s1, 0x14($sp) -/* 98FDFC 8024061C 8FB00010 */ lw $s0, 0x10($sp) -/* 98FE00 80240620 03E00008 */ jr $ra -/* 98FE04 80240624 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s index 73c52ce572..2334ece135 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s @@ -105,7 +105,7 @@ glabel func_80240BF0_9903D0 /* 990558 80240D78 0000102D */ daddu $v0, $zero, $zero /* 99055C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 990560 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 990564 80240D84 0C09015A */ jal func_80240568_98FD48 +/* 990564 80240D84 0C09015A */ jal UnkNpcAIFunc1 /* 990568 80240D88 0200302D */ daddu $a2, $s0, $zero /* 99056C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 990570 80240D90 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s index 87429e7be5..9455ee17b7 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s @@ -86,7 +86,7 @@ glabel func_80240F3C_99071C /* 99085C 8024107C 00000000 */ nop /* 990860 80241080 0280202D */ daddu $a0, $s4, $zero /* 990864 80241084 0200282D */ daddu $a1, $s0, $zero -/* 990868 80241088 0C09015A */ jal func_80240568_98FD48 +/* 990868 80241088 0C09015A */ jal UnkNpcAIFunc1 /* 99086C 8024108C 0260302D */ daddu $a2, $s3, $zero /* 990870 80241090 0280202D */ daddu $a0, $s4, $zero /* 990874 80241094 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240568_992C98.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240568_992C98.s deleted file mode 100644 index 1c6989bd2f..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240568_992C98.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568_992C98 -/* 992C98 80240568 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 992C9C 8024056C AFB3001C */ sw $s3, 0x1c($sp) -/* 992CA0 80240570 0080982D */ daddu $s3, $a0, $zero -/* 992CA4 80240574 AFBF0020 */ sw $ra, 0x20($sp) -/* 992CA8 80240578 AFB20018 */ sw $s2, 0x18($sp) -/* 992CAC 8024057C AFB10014 */ sw $s1, 0x14($sp) -/* 992CB0 80240580 AFB00010 */ sw $s0, 0x10($sp) -/* 992CB4 80240584 8E720148 */ lw $s2, 0x148($s3) -/* 992CB8 80240588 86440008 */ lh $a0, 8($s2) -/* 992CBC 8024058C 0C00EABB */ jal get_npc_unsafe -/* 992CC0 80240590 00A0882D */ daddu $s1, $a1, $zero -/* 992CC4 80240594 8E240008 */ lw $a0, 8($s1) -/* 992CC8 80240598 0040802D */ daddu $s0, $v0, $zero -/* 992CCC 8024059C 00041FC2 */ srl $v1, $a0, 0x1f -/* 992CD0 802405A0 00832021 */ addu $a0, $a0, $v1 -/* 992CD4 802405A4 00042043 */ sra $a0, $a0, 1 -/* 992CD8 802405A8 0C00A67F */ jal rand_int -/* 992CDC 802405AC 24840001 */ addiu $a0, $a0, 1 -/* 992CE0 802405B0 8E230008 */ lw $v1, 8($s1) -/* 992CE4 802405B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* 992CE8 802405B8 00032FC2 */ srl $a1, $v1, 0x1f -/* 992CEC 802405BC 00651821 */ addu $v1, $v1, $a1 -/* 992CF0 802405C0 00031843 */ sra $v1, $v1, 1 -/* 992CF4 802405C4 00621821 */ addu $v1, $v1, $v0 -/* 992CF8 802405C8 0C00A67F */ jal rand_int -/* 992CFC 802405CC A603008E */ sh $v1, 0x8e($s0) -/* 992D00 802405D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* 992D04 802405D4 44820000 */ mtc1 $v0, $f0 -/* 992D08 802405D8 00000000 */ nop -/* 992D0C 802405DC 46800020 */ cvt.s.w $f0, $f0 -/* 992D10 802405E0 46006300 */ add.s $f12, $f12, $f0 -/* 992D14 802405E4 3C0142B4 */ lui $at, 0x42b4 -/* 992D18 802405E8 44810000 */ mtc1 $at, $f0 -/* 992D1C 802405EC 0C00A6C9 */ jal clamp_angle -/* 992D20 802405F0 46006301 */ sub.s $f12, $f12, $f0 -/* 992D24 802405F4 E600000C */ swc1 $f0, 0xc($s0) -/* 992D28 802405F8 8E4200CC */ lw $v0, 0xcc($s2) -/* 992D2C 802405FC 8C420000 */ lw $v0, ($v0) -/* 992D30 80240600 AE020028 */ sw $v0, 0x28($s0) -/* 992D34 80240604 24020003 */ addiu $v0, $zero, 3 -/* 992D38 80240608 AE620070 */ sw $v0, 0x70($s3) -/* 992D3C 8024060C 8FBF0020 */ lw $ra, 0x20($sp) -/* 992D40 80240610 8FB3001C */ lw $s3, 0x1c($sp) -/* 992D44 80240614 8FB20018 */ lw $s2, 0x18($sp) -/* 992D48 80240618 8FB10014 */ lw $s1, 0x14($sp) -/* 992D4C 8024061C 8FB00010 */ lw $s0, 0x10($sp) -/* 992D50 80240620 03E00008 */ jr $ra -/* 992D54 80240624 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s index fdb205c4ad..f82c71d64a 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s @@ -105,7 +105,7 @@ glabel func_80240BF0_993320 /* 9934A8 80240D78 0000102D */ daddu $v0, $zero, $zero /* 9934AC 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 9934B0 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 9934B4 80240D84 0C09015A */ jal func_80240568_992C98 +/* 9934B4 80240D84 0C09015A */ jal UnkNpcAIFunc1 /* 9934B8 80240D88 0200302D */ daddu $a2, $s0, $zero /* 9934BC 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 9934C0 80240D90 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s index 15ad834cfe..d1ed197fe9 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s @@ -86,7 +86,7 @@ glabel func_80240F3C_99366C /* 9937AC 8024107C 00000000 */ nop /* 9937B0 80241080 0280202D */ daddu $a0, $s4, $zero /* 9937B4 80241084 0200282D */ daddu $a1, $s0, $zero -/* 9937B8 80241088 0C09015A */ jal func_80240568_992C98 +/* 9937B8 80241088 0C09015A */ jal UnkNpcAIFunc1 /* 9937BC 8024108C 0260302D */ daddu $a2, $s3, $zero /* 9937C0 80241090 0280202D */ daddu $a0, $s4, $zero /* 9937C4 80241094 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_802408A8_B288D8.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_802408A8_B288D8.s deleted file mode 100644 index 1bd60ee474..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_802408A8_B288D8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A8_B288D8 -/* B288D8 802408A8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B288DC 802408AC AFB3001C */ sw $s3, 0x1c($sp) -/* B288E0 802408B0 0080982D */ daddu $s3, $a0, $zero -/* B288E4 802408B4 AFBF0020 */ sw $ra, 0x20($sp) -/* B288E8 802408B8 AFB20018 */ sw $s2, 0x18($sp) -/* B288EC 802408BC AFB10014 */ sw $s1, 0x14($sp) -/* B288F0 802408C0 AFB00010 */ sw $s0, 0x10($sp) -/* B288F4 802408C4 8E720148 */ lw $s2, 0x148($s3) -/* B288F8 802408C8 86440008 */ lh $a0, 8($s2) -/* B288FC 802408CC 0C00EABB */ jal get_npc_unsafe -/* B28900 802408D0 00A0882D */ daddu $s1, $a1, $zero -/* B28904 802408D4 8E240008 */ lw $a0, 8($s1) -/* B28908 802408D8 0040802D */ daddu $s0, $v0, $zero -/* B2890C 802408DC 00041FC2 */ srl $v1, $a0, 0x1f -/* B28910 802408E0 00832021 */ addu $a0, $a0, $v1 -/* B28914 802408E4 00042043 */ sra $a0, $a0, 1 -/* B28918 802408E8 0C00A67F */ jal rand_int -/* B2891C 802408EC 24840001 */ addiu $a0, $a0, 1 -/* B28920 802408F0 8E230008 */ lw $v1, 8($s1) -/* B28924 802408F4 240400B4 */ addiu $a0, $zero, 0xb4 -/* B28928 802408F8 00032FC2 */ srl $a1, $v1, 0x1f -/* B2892C 802408FC 00651821 */ addu $v1, $v1, $a1 -/* B28930 80240900 00031843 */ sra $v1, $v1, 1 -/* B28934 80240904 00621821 */ addu $v1, $v1, $v0 -/* B28938 80240908 0C00A67F */ jal rand_int -/* B2893C 8024090C A603008E */ sh $v1, 0x8e($s0) -/* B28940 80240910 C60C000C */ lwc1 $f12, 0xc($s0) -/* B28944 80240914 44820000 */ mtc1 $v0, $f0 -/* B28948 80240918 00000000 */ nop -/* B2894C 8024091C 46800020 */ cvt.s.w $f0, $f0 -/* B28950 80240920 46006300 */ add.s $f12, $f12, $f0 -/* B28954 80240924 3C0142B4 */ lui $at, 0x42b4 -/* B28958 80240928 44810000 */ mtc1 $at, $f0 -/* B2895C 8024092C 0C00A6C9 */ jal clamp_angle -/* B28960 80240930 46006301 */ sub.s $f12, $f12, $f0 -/* B28964 80240934 E600000C */ swc1 $f0, 0xc($s0) -/* B28968 80240938 8E4200CC */ lw $v0, 0xcc($s2) -/* B2896C 8024093C 8C420000 */ lw $v0, ($v0) -/* B28970 80240940 AE020028 */ sw $v0, 0x28($s0) -/* B28974 80240944 24020003 */ addiu $v0, $zero, 3 -/* B28978 80240948 AE620070 */ sw $v0, 0x70($s3) -/* B2897C 8024094C 8FBF0020 */ lw $ra, 0x20($sp) -/* B28980 80240950 8FB3001C */ lw $s3, 0x1c($sp) -/* B28984 80240954 8FB20018 */ lw $s2, 0x18($sp) -/* B28988 80240958 8FB10014 */ lw $s1, 0x14($sp) -/* B2898C 8024095C 8FB00010 */ lw $s0, 0x10($sp) -/* B28990 80240960 03E00008 */ jr $ra -/* B28994 80240964 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s index e0d78b39c2..e7c2a551c2 100644 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s +++ b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s @@ -105,7 +105,7 @@ glabel func_80240F30_B28F60 /* B290E8 802410B8 0000102D */ daddu $v0, $zero, $zero /* B290EC 802410BC 0260202D */ daddu $a0, $s3, $zero /* B290F0 802410C0 0280282D */ daddu $a1, $s4, $zero -/* B290F4 802410C4 0C09022A */ jal func_802408A8_B288D8 +/* B290F4 802410C4 0C09022A */ jal UnkNpcAIFunc1 /* B290F8 802410C8 0200302D */ daddu $a2, $s0, $zero /* B290FC 802410CC 8E630070 */ lw $v1, 0x70($s3) /* B29100 802410D0 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240830_B2CCA0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240830_B2CCA0.s deleted file mode 100644 index 140e1a0d97..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240830_B2CCA0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240830_B2CCA0 -/* B2CCA0 80240830 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B2CCA4 80240834 AFB3001C */ sw $s3, 0x1c($sp) -/* B2CCA8 80240838 0080982D */ daddu $s3, $a0, $zero -/* B2CCAC 8024083C AFBF0020 */ sw $ra, 0x20($sp) -/* B2CCB0 80240840 AFB20018 */ sw $s2, 0x18($sp) -/* B2CCB4 80240844 AFB10014 */ sw $s1, 0x14($sp) -/* B2CCB8 80240848 AFB00010 */ sw $s0, 0x10($sp) -/* B2CCBC 8024084C 8E720148 */ lw $s2, 0x148($s3) -/* B2CCC0 80240850 86440008 */ lh $a0, 8($s2) -/* B2CCC4 80240854 0C00EABB */ jal get_npc_unsafe -/* B2CCC8 80240858 00A0882D */ daddu $s1, $a1, $zero -/* B2CCCC 8024085C 8E240008 */ lw $a0, 8($s1) -/* B2CCD0 80240860 0040802D */ daddu $s0, $v0, $zero -/* B2CCD4 80240864 00041FC2 */ srl $v1, $a0, 0x1f -/* B2CCD8 80240868 00832021 */ addu $a0, $a0, $v1 -/* B2CCDC 8024086C 00042043 */ sra $a0, $a0, 1 -/* B2CCE0 80240870 0C00A67F */ jal rand_int -/* B2CCE4 80240874 24840001 */ addiu $a0, $a0, 1 -/* B2CCE8 80240878 8E230008 */ lw $v1, 8($s1) -/* B2CCEC 8024087C 240400B4 */ addiu $a0, $zero, 0xb4 -/* B2CCF0 80240880 00032FC2 */ srl $a1, $v1, 0x1f -/* B2CCF4 80240884 00651821 */ addu $v1, $v1, $a1 -/* B2CCF8 80240888 00031843 */ sra $v1, $v1, 1 -/* B2CCFC 8024088C 00621821 */ addu $v1, $v1, $v0 -/* B2CD00 80240890 0C00A67F */ jal rand_int -/* B2CD04 80240894 A603008E */ sh $v1, 0x8e($s0) -/* B2CD08 80240898 C60C000C */ lwc1 $f12, 0xc($s0) -/* B2CD0C 8024089C 44820000 */ mtc1 $v0, $f0 -/* B2CD10 802408A0 00000000 */ nop -/* B2CD14 802408A4 46800020 */ cvt.s.w $f0, $f0 -/* B2CD18 802408A8 46006300 */ add.s $f12, $f12, $f0 -/* B2CD1C 802408AC 3C0142B4 */ lui $at, 0x42b4 -/* B2CD20 802408B0 44810000 */ mtc1 $at, $f0 -/* B2CD24 802408B4 0C00A6C9 */ jal clamp_angle -/* B2CD28 802408B8 46006301 */ sub.s $f12, $f12, $f0 -/* B2CD2C 802408BC E600000C */ swc1 $f0, 0xc($s0) -/* B2CD30 802408C0 8E4200CC */ lw $v0, 0xcc($s2) -/* B2CD34 802408C4 8C420000 */ lw $v0, ($v0) -/* B2CD38 802408C8 AE020028 */ sw $v0, 0x28($s0) -/* B2CD3C 802408CC 24020003 */ addiu $v0, $zero, 3 -/* B2CD40 802408D0 AE620070 */ sw $v0, 0x70($s3) -/* B2CD44 802408D4 8FBF0020 */ lw $ra, 0x20($sp) -/* B2CD48 802408D8 8FB3001C */ lw $s3, 0x1c($sp) -/* B2CD4C 802408DC 8FB20018 */ lw $s2, 0x18($sp) -/* B2CD50 802408E0 8FB10014 */ lw $s1, 0x14($sp) -/* B2CD54 802408E4 8FB00010 */ lw $s0, 0x10($sp) -/* B2CD58 802408E8 03E00008 */ jr $ra -/* B2CD5C 802408EC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s index 457f621e28..deeb08884f 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s @@ -141,7 +141,7 @@ glabel func_80240FC4_B2D434 /* B2D63C 802411CC 00000000 */ nop /* B2D640 802411D0 0280202D */ daddu $a0, $s4, $zero /* B2D644 802411D4 0260282D */ daddu $a1, $s3, $zero -/* B2D648 802411D8 0C09020C */ jal func_80240830_B2CCA0 +/* B2D648 802411D8 0C09020C */ jal UnkNpcAIFunc1 /* B2D64C 802411DC 02A0302D */ daddu $a2, $s5, $zero /* B2D650 802411E0 0280202D */ daddu $a0, $s4, $zero /* B2D654 802411E4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240A20_B355F0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240A20_B355F0.s deleted file mode 100644 index ab2ad791e0..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240A20_B355F0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A20_B355F0 -/* B355F0 80240A20 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B355F4 80240A24 AFB3001C */ sw $s3, 0x1c($sp) -/* B355F8 80240A28 0080982D */ daddu $s3, $a0, $zero -/* B355FC 80240A2C AFBF0020 */ sw $ra, 0x20($sp) -/* B35600 80240A30 AFB20018 */ sw $s2, 0x18($sp) -/* B35604 80240A34 AFB10014 */ sw $s1, 0x14($sp) -/* B35608 80240A38 AFB00010 */ sw $s0, 0x10($sp) -/* B3560C 80240A3C 8E720148 */ lw $s2, 0x148($s3) -/* B35610 80240A40 86440008 */ lh $a0, 8($s2) -/* B35614 80240A44 0C00EABB */ jal get_npc_unsafe -/* B35618 80240A48 00A0882D */ daddu $s1, $a1, $zero -/* B3561C 80240A4C 8E240008 */ lw $a0, 8($s1) -/* B35620 80240A50 0040802D */ daddu $s0, $v0, $zero -/* B35624 80240A54 00041FC2 */ srl $v1, $a0, 0x1f -/* B35628 80240A58 00832021 */ addu $a0, $a0, $v1 -/* B3562C 80240A5C 00042043 */ sra $a0, $a0, 1 -/* B35630 80240A60 0C00A67F */ jal rand_int -/* B35634 80240A64 24840001 */ addiu $a0, $a0, 1 -/* B35638 80240A68 8E230008 */ lw $v1, 8($s1) -/* B3563C 80240A6C 240400B4 */ addiu $a0, $zero, 0xb4 -/* B35640 80240A70 00032FC2 */ srl $a1, $v1, 0x1f -/* B35644 80240A74 00651821 */ addu $v1, $v1, $a1 -/* B35648 80240A78 00031843 */ sra $v1, $v1, 1 -/* B3564C 80240A7C 00621821 */ addu $v1, $v1, $v0 -/* B35650 80240A80 0C00A67F */ jal rand_int -/* B35654 80240A84 A603008E */ sh $v1, 0x8e($s0) -/* B35658 80240A88 C60C000C */ lwc1 $f12, 0xc($s0) -/* B3565C 80240A8C 44820000 */ mtc1 $v0, $f0 -/* B35660 80240A90 00000000 */ nop -/* B35664 80240A94 46800020 */ cvt.s.w $f0, $f0 -/* B35668 80240A98 46006300 */ add.s $f12, $f12, $f0 -/* B3566C 80240A9C 3C0142B4 */ lui $at, 0x42b4 -/* B35670 80240AA0 44810000 */ mtc1 $at, $f0 -/* B35674 80240AA4 0C00A6C9 */ jal clamp_angle -/* B35678 80240AA8 46006301 */ sub.s $f12, $f12, $f0 -/* B3567C 80240AAC E600000C */ swc1 $f0, 0xc($s0) -/* B35680 80240AB0 8E4200CC */ lw $v0, 0xcc($s2) -/* B35684 80240AB4 8C420000 */ lw $v0, ($v0) -/* B35688 80240AB8 AE020028 */ sw $v0, 0x28($s0) -/* B3568C 80240ABC 24020003 */ addiu $v0, $zero, 3 -/* B35690 80240AC0 AE620070 */ sw $v0, 0x70($s3) -/* B35694 80240AC4 8FBF0020 */ lw $ra, 0x20($sp) -/* B35698 80240AC8 8FB3001C */ lw $s3, 0x1c($sp) -/* B3569C 80240ACC 8FB20018 */ lw $s2, 0x18($sp) -/* B356A0 80240AD0 8FB10014 */ lw $s1, 0x14($sp) -/* B356A4 80240AD4 8FB00010 */ lw $s0, 0x10($sp) -/* B356A8 80240AD8 03E00008 */ jr $ra -/* B356AC 80240ADC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s index 53561bc3a1..7d5eb2265e 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s @@ -141,7 +141,7 @@ glabel func_802411B4_B35D84 /* B35F8C 802413BC 00000000 */ nop /* B35F90 802413C0 0280202D */ daddu $a0, $s4, $zero /* B35F94 802413C4 0260282D */ daddu $a1, $s3, $zero -/* B35F98 802413C8 0C090288 */ jal func_80240A20_B355F0 +/* B35F98 802413C8 0C090288 */ jal UnkNpcAIFunc1 /* B35F9C 802413CC 02A0302D */ daddu $a2, $s5, $zero /* B35FA0 802413D0 0280202D */ daddu $a0, $s4, $zero /* B35FA4 802413D4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240E0C_B4B87C.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240E0C_B4B87C.s deleted file mode 100644 index c9e6a57acf..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240E0C_B4B87C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E0C_B4B87C -/* B4B87C 80240E0C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B4B880 80240E10 AFB3001C */ sw $s3, 0x1c($sp) -/* B4B884 80240E14 0080982D */ daddu $s3, $a0, $zero -/* B4B888 80240E18 AFBF0020 */ sw $ra, 0x20($sp) -/* B4B88C 80240E1C AFB20018 */ sw $s2, 0x18($sp) -/* B4B890 80240E20 AFB10014 */ sw $s1, 0x14($sp) -/* B4B894 80240E24 AFB00010 */ sw $s0, 0x10($sp) -/* B4B898 80240E28 8E720148 */ lw $s2, 0x148($s3) -/* B4B89C 80240E2C 86440008 */ lh $a0, 8($s2) -/* B4B8A0 80240E30 0C00EABB */ jal get_npc_unsafe -/* B4B8A4 80240E34 00A0882D */ daddu $s1, $a1, $zero -/* B4B8A8 80240E38 8E240008 */ lw $a0, 8($s1) -/* B4B8AC 80240E3C 0040802D */ daddu $s0, $v0, $zero -/* B4B8B0 80240E40 00041FC2 */ srl $v1, $a0, 0x1f -/* B4B8B4 80240E44 00832021 */ addu $a0, $a0, $v1 -/* B4B8B8 80240E48 00042043 */ sra $a0, $a0, 1 -/* B4B8BC 80240E4C 0C00A67F */ jal rand_int -/* B4B8C0 80240E50 24840001 */ addiu $a0, $a0, 1 -/* B4B8C4 80240E54 8E230008 */ lw $v1, 8($s1) -/* B4B8C8 80240E58 240400B4 */ addiu $a0, $zero, 0xb4 -/* B4B8CC 80240E5C 00032FC2 */ srl $a1, $v1, 0x1f -/* B4B8D0 80240E60 00651821 */ addu $v1, $v1, $a1 -/* B4B8D4 80240E64 00031843 */ sra $v1, $v1, 1 -/* B4B8D8 80240E68 00621821 */ addu $v1, $v1, $v0 -/* B4B8DC 80240E6C 0C00A67F */ jal rand_int -/* B4B8E0 80240E70 A603008E */ sh $v1, 0x8e($s0) -/* B4B8E4 80240E74 C60C000C */ lwc1 $f12, 0xc($s0) -/* B4B8E8 80240E78 44820000 */ mtc1 $v0, $f0 -/* B4B8EC 80240E7C 00000000 */ nop -/* B4B8F0 80240E80 46800020 */ cvt.s.w $f0, $f0 -/* B4B8F4 80240E84 46006300 */ add.s $f12, $f12, $f0 -/* B4B8F8 80240E88 3C0142B4 */ lui $at, 0x42b4 -/* B4B8FC 80240E8C 44810000 */ mtc1 $at, $f0 -/* B4B900 80240E90 0C00A6C9 */ jal clamp_angle -/* B4B904 80240E94 46006301 */ sub.s $f12, $f12, $f0 -/* B4B908 80240E98 E600000C */ swc1 $f0, 0xc($s0) -/* B4B90C 80240E9C 8E4200CC */ lw $v0, 0xcc($s2) -/* B4B910 80240EA0 8C420000 */ lw $v0, ($v0) -/* B4B914 80240EA4 AE020028 */ sw $v0, 0x28($s0) -/* B4B918 80240EA8 24020003 */ addiu $v0, $zero, 3 -/* B4B91C 80240EAC AE620070 */ sw $v0, 0x70($s3) -/* B4B920 80240EB0 8FBF0020 */ lw $ra, 0x20($sp) -/* B4B924 80240EB4 8FB3001C */ lw $s3, 0x1c($sp) -/* B4B928 80240EB8 8FB20018 */ lw $s2, 0x18($sp) -/* B4B92C 80240EBC 8FB10014 */ lw $s1, 0x14($sp) -/* B4B930 80240EC0 8FB00010 */ lw $s0, 0x10($sp) -/* B4B934 80240EC4 03E00008 */ jr $ra -/* B4B938 80240EC8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s index a5fd4040e2..2cc29d90d8 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s @@ -105,7 +105,7 @@ glabel func_80241494_B4BF04 /* B4C08C 8024161C 0000102D */ daddu $v0, $zero, $zero /* B4C090 80241620 0260202D */ daddu $a0, $s3, $zero /* B4C094 80241624 0280282D */ daddu $a1, $s4, $zero -/* B4C098 80241628 0C090383 */ jal func_80240E0C_B4B87C +/* B4C098 80241628 0C090383 */ jal UnkNpcAIFunc1 /* B4C09C 8024162C 0200302D */ daddu $a2, $s0, $zero /* B4C0A0 80241630 8E630070 */ lw $v1, 0x70($s3) /* B4C0A4 80241634 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240CA8_B534D8.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240CA8_B534D8.s deleted file mode 100644 index 4403cad1cb..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240CA8_B534D8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CA8_B534D8 -/* B534D8 80240CA8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B534DC 80240CAC AFB3001C */ sw $s3, 0x1c($sp) -/* B534E0 80240CB0 0080982D */ daddu $s3, $a0, $zero -/* B534E4 80240CB4 AFBF0020 */ sw $ra, 0x20($sp) -/* B534E8 80240CB8 AFB20018 */ sw $s2, 0x18($sp) -/* B534EC 80240CBC AFB10014 */ sw $s1, 0x14($sp) -/* B534F0 80240CC0 AFB00010 */ sw $s0, 0x10($sp) -/* B534F4 80240CC4 8E720148 */ lw $s2, 0x148($s3) -/* B534F8 80240CC8 86440008 */ lh $a0, 8($s2) -/* B534FC 80240CCC 0C00EABB */ jal get_npc_unsafe -/* B53500 80240CD0 00A0882D */ daddu $s1, $a1, $zero -/* B53504 80240CD4 8E240008 */ lw $a0, 8($s1) -/* B53508 80240CD8 0040802D */ daddu $s0, $v0, $zero -/* B5350C 80240CDC 00041FC2 */ srl $v1, $a0, 0x1f -/* B53510 80240CE0 00832021 */ addu $a0, $a0, $v1 -/* B53514 80240CE4 00042043 */ sra $a0, $a0, 1 -/* B53518 80240CE8 0C00A67F */ jal rand_int -/* B5351C 80240CEC 24840001 */ addiu $a0, $a0, 1 -/* B53520 80240CF0 8E230008 */ lw $v1, 8($s1) -/* B53524 80240CF4 240400B4 */ addiu $a0, $zero, 0xb4 -/* B53528 80240CF8 00032FC2 */ srl $a1, $v1, 0x1f -/* B5352C 80240CFC 00651821 */ addu $v1, $v1, $a1 -/* B53530 80240D00 00031843 */ sra $v1, $v1, 1 -/* B53534 80240D04 00621821 */ addu $v1, $v1, $v0 -/* B53538 80240D08 0C00A67F */ jal rand_int -/* B5353C 80240D0C A603008E */ sh $v1, 0x8e($s0) -/* B53540 80240D10 C60C000C */ lwc1 $f12, 0xc($s0) -/* B53544 80240D14 44820000 */ mtc1 $v0, $f0 -/* B53548 80240D18 00000000 */ nop -/* B5354C 80240D1C 46800020 */ cvt.s.w $f0, $f0 -/* B53550 80240D20 46006300 */ add.s $f12, $f12, $f0 -/* B53554 80240D24 3C0142B4 */ lui $at, 0x42b4 -/* B53558 80240D28 44810000 */ mtc1 $at, $f0 -/* B5355C 80240D2C 0C00A6C9 */ jal clamp_angle -/* B53560 80240D30 46006301 */ sub.s $f12, $f12, $f0 -/* B53564 80240D34 E600000C */ swc1 $f0, 0xc($s0) -/* B53568 80240D38 8E4200CC */ lw $v0, 0xcc($s2) -/* B5356C 80240D3C 8C420000 */ lw $v0, ($v0) -/* B53570 80240D40 AE020028 */ sw $v0, 0x28($s0) -/* B53574 80240D44 24020003 */ addiu $v0, $zero, 3 -/* B53578 80240D48 AE620070 */ sw $v0, 0x70($s3) -/* B5357C 80240D4C 8FBF0020 */ lw $ra, 0x20($sp) -/* B53580 80240D50 8FB3001C */ lw $s3, 0x1c($sp) -/* B53584 80240D54 8FB20018 */ lw $s2, 0x18($sp) -/* B53588 80240D58 8FB10014 */ lw $s1, 0x14($sp) -/* B5358C 80240D5C 8FB00010 */ lw $s0, 0x10($sp) -/* B53590 80240D60 03E00008 */ jr $ra -/* B53594 80240D64 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s index cdeeae10d7..cb7df1248a 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s @@ -105,7 +105,7 @@ glabel func_80241330_B53B60 /* B53CE8 802414B8 0000102D */ daddu $v0, $zero, $zero /* B53CEC 802414BC 0260202D */ daddu $a0, $s3, $zero /* B53CF0 802414C0 0280282D */ daddu $a1, $s4, $zero -/* B53CF4 802414C4 0C09032A */ jal func_80240CA8_B534D8 +/* B53CF4 802414C4 0C09032A */ jal UnkNpcAIFunc1 /* B53CF8 802414C8 0200302D */ daddu $a2, $s0, $zero /* B53CFC 802414CC 8E630070 */ lw $v1, 0x70($s3) /* B53D00 802414D0 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240878_B6CC08.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240878_B6CC08.s deleted file mode 100644 index d5b113d141..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240878_B6CC08.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240878_B6CC08 -/* B6CC08 80240878 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B6CC0C 8024087C AFB3001C */ sw $s3, 0x1c($sp) -/* B6CC10 80240880 0080982D */ daddu $s3, $a0, $zero -/* B6CC14 80240884 AFBF0020 */ sw $ra, 0x20($sp) -/* B6CC18 80240888 AFB20018 */ sw $s2, 0x18($sp) -/* B6CC1C 8024088C AFB10014 */ sw $s1, 0x14($sp) -/* B6CC20 80240890 AFB00010 */ sw $s0, 0x10($sp) -/* B6CC24 80240894 8E720148 */ lw $s2, 0x148($s3) -/* B6CC28 80240898 86440008 */ lh $a0, 8($s2) -/* B6CC2C 8024089C 0C00EABB */ jal get_npc_unsafe -/* B6CC30 802408A0 00A0882D */ daddu $s1, $a1, $zero -/* B6CC34 802408A4 8E240008 */ lw $a0, 8($s1) -/* B6CC38 802408A8 0040802D */ daddu $s0, $v0, $zero -/* B6CC3C 802408AC 00041FC2 */ srl $v1, $a0, 0x1f -/* B6CC40 802408B0 00832021 */ addu $a0, $a0, $v1 -/* B6CC44 802408B4 00042043 */ sra $a0, $a0, 1 -/* B6CC48 802408B8 0C00A67F */ jal rand_int -/* B6CC4C 802408BC 24840001 */ addiu $a0, $a0, 1 -/* B6CC50 802408C0 8E230008 */ lw $v1, 8($s1) -/* B6CC54 802408C4 240400B4 */ addiu $a0, $zero, 0xb4 -/* B6CC58 802408C8 00032FC2 */ srl $a1, $v1, 0x1f -/* B6CC5C 802408CC 00651821 */ addu $v1, $v1, $a1 -/* B6CC60 802408D0 00031843 */ sra $v1, $v1, 1 -/* B6CC64 802408D4 00621821 */ addu $v1, $v1, $v0 -/* B6CC68 802408D8 0C00A67F */ jal rand_int -/* B6CC6C 802408DC A603008E */ sh $v1, 0x8e($s0) -/* B6CC70 802408E0 C60C000C */ lwc1 $f12, 0xc($s0) -/* B6CC74 802408E4 44820000 */ mtc1 $v0, $f0 -/* B6CC78 802408E8 00000000 */ nop -/* B6CC7C 802408EC 46800020 */ cvt.s.w $f0, $f0 -/* B6CC80 802408F0 46006300 */ add.s $f12, $f12, $f0 -/* B6CC84 802408F4 3C0142B4 */ lui $at, 0x42b4 -/* B6CC88 802408F8 44810000 */ mtc1 $at, $f0 -/* B6CC8C 802408FC 0C00A6C9 */ jal clamp_angle -/* B6CC90 80240900 46006301 */ sub.s $f12, $f12, $f0 -/* B6CC94 80240904 E600000C */ swc1 $f0, 0xc($s0) -/* B6CC98 80240908 8E4200CC */ lw $v0, 0xcc($s2) -/* B6CC9C 8024090C 8C420000 */ lw $v0, ($v0) -/* B6CCA0 80240910 AE020028 */ sw $v0, 0x28($s0) -/* B6CCA4 80240914 24020003 */ addiu $v0, $zero, 3 -/* B6CCA8 80240918 AE620070 */ sw $v0, 0x70($s3) -/* B6CCAC 8024091C 8FBF0020 */ lw $ra, 0x20($sp) -/* B6CCB0 80240920 8FB3001C */ lw $s3, 0x1c($sp) -/* B6CCB4 80240924 8FB20018 */ lw $s2, 0x18($sp) -/* B6CCB8 80240928 8FB10014 */ lw $s1, 0x14($sp) -/* B6CCBC 8024092C 8FB00010 */ lw $s0, 0x10($sp) -/* B6CCC0 80240930 03E00008 */ jr $ra -/* B6CCC4 80240934 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s index 736160206b..d10352c659 100644 --- a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s +++ b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s @@ -105,7 +105,7 @@ glabel func_80240F00_B6D290 /* B6D418 80241088 0000102D */ daddu $v0, $zero, $zero /* B6D41C 8024108C 0260202D */ daddu $a0, $s3, $zero /* B6D420 80241090 0280282D */ daddu $a1, $s4, $zero -/* B6D424 80241094 0C09021E */ jal func_80240878_B6CC08 +/* B6D424 80241094 0C09021E */ jal UnkNpcAIFunc1 /* B6D428 80241098 0200302D */ daddu $a2, $s0, $zero /* B6D42C 8024109C 8E630070 */ lw $v1, 0x70($s3) /* B6D430 802410A0 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240A28_B7AA78.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240A28_B7AA78.s deleted file mode 100644 index b2f37f953e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240A28_B7AA78.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A28_B7AA78 -/* B7AA78 80240A28 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B7AA7C 80240A2C AFB3001C */ sw $s3, 0x1c($sp) -/* B7AA80 80240A30 0080982D */ daddu $s3, $a0, $zero -/* B7AA84 80240A34 AFBF0020 */ sw $ra, 0x20($sp) -/* B7AA88 80240A38 AFB20018 */ sw $s2, 0x18($sp) -/* B7AA8C 80240A3C AFB10014 */ sw $s1, 0x14($sp) -/* B7AA90 80240A40 AFB00010 */ sw $s0, 0x10($sp) -/* B7AA94 80240A44 8E720148 */ lw $s2, 0x148($s3) -/* B7AA98 80240A48 86440008 */ lh $a0, 8($s2) -/* B7AA9C 80240A4C 0C00EABB */ jal get_npc_unsafe -/* B7AAA0 80240A50 00A0882D */ daddu $s1, $a1, $zero -/* B7AAA4 80240A54 8E240008 */ lw $a0, 8($s1) -/* B7AAA8 80240A58 0040802D */ daddu $s0, $v0, $zero -/* B7AAAC 80240A5C 00041FC2 */ srl $v1, $a0, 0x1f -/* B7AAB0 80240A60 00832021 */ addu $a0, $a0, $v1 -/* B7AAB4 80240A64 00042043 */ sra $a0, $a0, 1 -/* B7AAB8 80240A68 0C00A67F */ jal rand_int -/* B7AABC 80240A6C 24840001 */ addiu $a0, $a0, 1 -/* B7AAC0 80240A70 8E230008 */ lw $v1, 8($s1) -/* B7AAC4 80240A74 240400B4 */ addiu $a0, $zero, 0xb4 -/* B7AAC8 80240A78 00032FC2 */ srl $a1, $v1, 0x1f -/* B7AACC 80240A7C 00651821 */ addu $v1, $v1, $a1 -/* B7AAD0 80240A80 00031843 */ sra $v1, $v1, 1 -/* B7AAD4 80240A84 00621821 */ addu $v1, $v1, $v0 -/* B7AAD8 80240A88 0C00A67F */ jal rand_int -/* B7AADC 80240A8C A603008E */ sh $v1, 0x8e($s0) -/* B7AAE0 80240A90 C60C000C */ lwc1 $f12, 0xc($s0) -/* B7AAE4 80240A94 44820000 */ mtc1 $v0, $f0 -/* B7AAE8 80240A98 00000000 */ nop -/* B7AAEC 80240A9C 46800020 */ cvt.s.w $f0, $f0 -/* B7AAF0 80240AA0 46006300 */ add.s $f12, $f12, $f0 -/* B7AAF4 80240AA4 3C0142B4 */ lui $at, 0x42b4 -/* B7AAF8 80240AA8 44810000 */ mtc1 $at, $f0 -/* B7AAFC 80240AAC 0C00A6C9 */ jal clamp_angle -/* B7AB00 80240AB0 46006301 */ sub.s $f12, $f12, $f0 -/* B7AB04 80240AB4 E600000C */ swc1 $f0, 0xc($s0) -/* B7AB08 80240AB8 8E4200CC */ lw $v0, 0xcc($s2) -/* B7AB0C 80240ABC 8C420000 */ lw $v0, ($v0) -/* B7AB10 80240AC0 AE020028 */ sw $v0, 0x28($s0) -/* B7AB14 80240AC4 24020003 */ addiu $v0, $zero, 3 -/* B7AB18 80240AC8 AE620070 */ sw $v0, 0x70($s3) -/* B7AB1C 80240ACC 8FBF0020 */ lw $ra, 0x20($sp) -/* B7AB20 80240AD0 8FB3001C */ lw $s3, 0x1c($sp) -/* B7AB24 80240AD4 8FB20018 */ lw $s2, 0x18($sp) -/* B7AB28 80240AD8 8FB10014 */ lw $s1, 0x14($sp) -/* B7AB2C 80240ADC 8FB00010 */ lw $s0, 0x10($sp) -/* B7AB30 80240AE0 03E00008 */ jr $ra -/* B7AB34 80240AE4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s index 6a0f253321..925ad652d4 100644 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s @@ -105,7 +105,7 @@ glabel func_802410B0_B7B100 /* B7B288 80241238 0000102D */ daddu $v0, $zero, $zero /* B7B28C 8024123C 0260202D */ daddu $a0, $s3, $zero /* B7B290 80241240 0280282D */ daddu $a1, $s4, $zero -/* B7B294 80241244 0C09028A */ jal func_80240A28_B7AA78 +/* B7B294 80241244 0C09028A */ jal UnkNpcAIFunc1 /* B7B298 80241248 0200302D */ daddu $a2, $s0, $zero /* B7B29C 8024124C 8E630070 */ lw $v1, 0x70($s3) /* B7B2A0 80241250 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240400_B84580.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240400_B84580.s deleted file mode 100644 index bf199fac51..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240400_B84580.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_B84580 -/* B84580 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B84584 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* B84588 80240408 0080982D */ daddu $s3, $a0, $zero -/* B8458C 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* B84590 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* B84594 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* B84598 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* B8459C 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* B845A0 80240420 86440008 */ lh $a0, 8($s2) -/* B845A4 80240424 0C00EABB */ jal get_npc_unsafe -/* B845A8 80240428 00A0882D */ daddu $s1, $a1, $zero -/* B845AC 8024042C 8E240008 */ lw $a0, 8($s1) -/* B845B0 80240430 0040802D */ daddu $s0, $v0, $zero -/* B845B4 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* B845B8 80240438 00832021 */ addu $a0, $a0, $v1 -/* B845BC 8024043C 00042043 */ sra $a0, $a0, 1 -/* B845C0 80240440 0C00A67F */ jal rand_int -/* B845C4 80240444 24840001 */ addiu $a0, $a0, 1 -/* B845C8 80240448 8E230008 */ lw $v1, 8($s1) -/* B845CC 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* B845D0 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* B845D4 80240454 00651821 */ addu $v1, $v1, $a1 -/* B845D8 80240458 00031843 */ sra $v1, $v1, 1 -/* B845DC 8024045C 00621821 */ addu $v1, $v1, $v0 -/* B845E0 80240460 0C00A67F */ jal rand_int -/* B845E4 80240464 A603008E */ sh $v1, 0x8e($s0) -/* B845E8 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* B845EC 8024046C 44820000 */ mtc1 $v0, $f0 -/* B845F0 80240470 00000000 */ nop -/* B845F4 80240474 46800020 */ cvt.s.w $f0, $f0 -/* B845F8 80240478 46006300 */ add.s $f12, $f12, $f0 -/* B845FC 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* B84600 80240480 44810000 */ mtc1 $at, $f0 -/* B84604 80240484 0C00A6C9 */ jal clamp_angle -/* B84608 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* B8460C 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* B84610 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* B84614 80240494 8C420000 */ lw $v0, ($v0) -/* B84618 80240498 AE020028 */ sw $v0, 0x28($s0) -/* B8461C 8024049C 24020003 */ addiu $v0, $zero, 3 -/* B84620 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* B84624 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* B84628 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* B8462C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* B84630 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* B84634 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* B84638 802404B8 03E00008 */ jr $ra -/* B8463C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s index e43c0183e3..54c39d55d9 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s @@ -141,7 +141,7 @@ glabel func_80240B94_B84D14 /* B84F1C 80240D9C 00000000 */ nop /* B84F20 80240DA0 0280202D */ daddu $a0, $s4, $zero /* B84F24 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* B84F28 80240DA8 0C090100 */ jal func_80240400_B84580 +/* B84F28 80240DA8 0C090100 */ jal UnkNpcAIFunc1 /* B84F2C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* B84F30 80240DB0 0280202D */ daddu $a0, $s4, $zero /* B84F34 80240DB4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802404B0_ABB740.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802404B0_ABB740.s deleted file mode 100644 index 6e44cc3c5a..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802404B0_ABB740.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404B0_ABB740 -/* ABB740 802404B0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* ABB744 802404B4 AFB3001C */ sw $s3, 0x1c($sp) -/* ABB748 802404B8 0080982D */ daddu $s3, $a0, $zero -/* ABB74C 802404BC AFBF0020 */ sw $ra, 0x20($sp) -/* ABB750 802404C0 AFB20018 */ sw $s2, 0x18($sp) -/* ABB754 802404C4 AFB10014 */ sw $s1, 0x14($sp) -/* ABB758 802404C8 AFB00010 */ sw $s0, 0x10($sp) -/* ABB75C 802404CC 8E720148 */ lw $s2, 0x148($s3) -/* ABB760 802404D0 86440008 */ lh $a0, 8($s2) -/* ABB764 802404D4 0C00EABB */ jal get_npc_unsafe -/* ABB768 802404D8 00A0882D */ daddu $s1, $a1, $zero -/* ABB76C 802404DC 8E240008 */ lw $a0, 8($s1) -/* ABB770 802404E0 0040802D */ daddu $s0, $v0, $zero -/* ABB774 802404E4 00041FC2 */ srl $v1, $a0, 0x1f -/* ABB778 802404E8 00832021 */ addu $a0, $a0, $v1 -/* ABB77C 802404EC 00042043 */ sra $a0, $a0, 1 -/* ABB780 802404F0 0C00A67F */ jal rand_int -/* ABB784 802404F4 24840001 */ addiu $a0, $a0, 1 -/* ABB788 802404F8 8E230008 */ lw $v1, 8($s1) -/* ABB78C 802404FC 240400B4 */ addiu $a0, $zero, 0xb4 -/* ABB790 80240500 00032FC2 */ srl $a1, $v1, 0x1f -/* ABB794 80240504 00651821 */ addu $v1, $v1, $a1 -/* ABB798 80240508 00031843 */ sra $v1, $v1, 1 -/* ABB79C 8024050C 00621821 */ addu $v1, $v1, $v0 -/* ABB7A0 80240510 0C00A67F */ jal rand_int -/* ABB7A4 80240514 A603008E */ sh $v1, 0x8e($s0) -/* ABB7A8 80240518 C60C000C */ lwc1 $f12, 0xc($s0) -/* ABB7AC 8024051C 44820000 */ mtc1 $v0, $f0 -/* ABB7B0 80240520 00000000 */ nop -/* ABB7B4 80240524 46800020 */ cvt.s.w $f0, $f0 -/* ABB7B8 80240528 46006300 */ add.s $f12, $f12, $f0 -/* ABB7BC 8024052C 3C0142B4 */ lui $at, 0x42b4 -/* ABB7C0 80240530 44810000 */ mtc1 $at, $f0 -/* ABB7C4 80240534 0C00A6C9 */ jal clamp_angle -/* ABB7C8 80240538 46006301 */ sub.s $f12, $f12, $f0 -/* ABB7CC 8024053C E600000C */ swc1 $f0, 0xc($s0) -/* ABB7D0 80240540 8E4200CC */ lw $v0, 0xcc($s2) -/* ABB7D4 80240544 8C420000 */ lw $v0, ($v0) -/* ABB7D8 80240548 AE020028 */ sw $v0, 0x28($s0) -/* ABB7DC 8024054C 24020003 */ addiu $v0, $zero, 3 -/* ABB7E0 80240550 AE620070 */ sw $v0, 0x70($s3) -/* ABB7E4 80240554 8FBF0020 */ lw $ra, 0x20($sp) -/* ABB7E8 80240558 8FB3001C */ lw $s3, 0x1c($sp) -/* ABB7EC 8024055C 8FB20018 */ lw $s2, 0x18($sp) -/* ABB7F0 80240560 8FB10014 */ lw $s1, 0x14($sp) -/* ABB7F4 80240564 8FB00010 */ lw $s0, 0x10($sp) -/* ABB7F8 80240568 03E00008 */ jr $ra -/* ABB7FC 8024056C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s index c6d4f1dcfa..eed4dbacb6 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s @@ -141,7 +141,7 @@ glabel func_80240C44_ABBED4 /* ABC0DC 80240E4C 00000000 */ nop /* ABC0E0 80240E50 0280202D */ daddu $a0, $s4, $zero /* ABC0E4 80240E54 0260282D */ daddu $a1, $s3, $zero -/* ABC0E8 80240E58 0C09012C */ jal func_802404B0_ABB740 +/* ABC0E8 80240E58 0C09012C */ jal UnkNpcAIFunc1 /* ABC0EC 80240E5C 02A0302D */ daddu $a2, $s5, $zero /* ABC0F0 80240E60 0280202D */ daddu $a0, $s4, $zero /* ABC0F4 80240E64 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240400_AC5570.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240400_AC5570.s deleted file mode 100644 index a844cf06c8..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240400_AC5570.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_AC5570 -/* AC5570 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AC5574 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* AC5578 80240408 0080982D */ daddu $s3, $a0, $zero -/* AC557C 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* AC5580 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* AC5584 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* AC5588 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* AC558C 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* AC5590 80240420 86440008 */ lh $a0, 8($s2) -/* AC5594 80240424 0C00EABB */ jal get_npc_unsafe -/* AC5598 80240428 00A0882D */ daddu $s1, $a1, $zero -/* AC559C 8024042C 8E240008 */ lw $a0, 8($s1) -/* AC55A0 80240430 0040802D */ daddu $s0, $v0, $zero -/* AC55A4 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* AC55A8 80240438 00832021 */ addu $a0, $a0, $v1 -/* AC55AC 8024043C 00042043 */ sra $a0, $a0, 1 -/* AC55B0 80240440 0C00A67F */ jal rand_int -/* AC55B4 80240444 24840001 */ addiu $a0, $a0, 1 -/* AC55B8 80240448 8E230008 */ lw $v1, 8($s1) -/* AC55BC 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* AC55C0 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* AC55C4 80240454 00651821 */ addu $v1, $v1, $a1 -/* AC55C8 80240458 00031843 */ sra $v1, $v1, 1 -/* AC55CC 8024045C 00621821 */ addu $v1, $v1, $v0 -/* AC55D0 80240460 0C00A67F */ jal rand_int -/* AC55D4 80240464 A603008E */ sh $v1, 0x8e($s0) -/* AC55D8 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* AC55DC 8024046C 44820000 */ mtc1 $v0, $f0 -/* AC55E0 80240470 00000000 */ nop -/* AC55E4 80240474 46800020 */ cvt.s.w $f0, $f0 -/* AC55E8 80240478 46006300 */ add.s $f12, $f12, $f0 -/* AC55EC 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* AC55F0 80240480 44810000 */ mtc1 $at, $f0 -/* AC55F4 80240484 0C00A6C9 */ jal clamp_angle -/* AC55F8 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* AC55FC 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* AC5600 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* AC5604 80240494 8C420000 */ lw $v0, ($v0) -/* AC5608 80240498 AE020028 */ sw $v0, 0x28($s0) -/* AC560C 8024049C 24020003 */ addiu $v0, $zero, 3 -/* AC5610 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* AC5614 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* AC5618 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* AC561C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* AC5620 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* AC5624 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* AC5628 802404B8 03E00008 */ jr $ra -/* AC562C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s index a1579ae11e..da8f68d326 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s +++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s @@ -141,7 +141,7 @@ glabel func_80240B94_AC5D04 /* AC5F0C 80240D9C 00000000 */ nop /* AC5F10 80240DA0 0280202D */ daddu $a0, $s4, $zero /* AC5F14 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* AC5F18 80240DA8 0C090100 */ jal func_80240400_AC5570 +/* AC5F18 80240DA8 0C090100 */ jal UnkNpcAIFunc1 /* AC5F1C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* AC5F20 80240DB0 0280202D */ daddu $a0, $s4, $zero /* AC5F24 80240DB4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802407D8_8CE848.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802407D8_8CE848.s deleted file mode 100644 index ad2e909059..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802407D8_8CE848.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D8_8CE848 -/* 8CE848 802407D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8CE84C 802407DC AFB3001C */ sw $s3, 0x1c($sp) -/* 8CE850 802407E0 0080982D */ daddu $s3, $a0, $zero -/* 8CE854 802407E4 AFBF0020 */ sw $ra, 0x20($sp) -/* 8CE858 802407E8 AFB20018 */ sw $s2, 0x18($sp) -/* 8CE85C 802407EC AFB10014 */ sw $s1, 0x14($sp) -/* 8CE860 802407F0 AFB00010 */ sw $s0, 0x10($sp) -/* 8CE864 802407F4 8E720148 */ lw $s2, 0x148($s3) -/* 8CE868 802407F8 86440008 */ lh $a0, 8($s2) -/* 8CE86C 802407FC 0C00EABB */ jal get_npc_unsafe -/* 8CE870 80240800 00A0882D */ daddu $s1, $a1, $zero -/* 8CE874 80240804 8E240008 */ lw $a0, 8($s1) -/* 8CE878 80240808 0040802D */ daddu $s0, $v0, $zero -/* 8CE87C 8024080C 00041FC2 */ srl $v1, $a0, 0x1f -/* 8CE880 80240810 00832021 */ addu $a0, $a0, $v1 -/* 8CE884 80240814 00042043 */ sra $a0, $a0, 1 -/* 8CE888 80240818 0C00A67F */ jal rand_int -/* 8CE88C 8024081C 24840001 */ addiu $a0, $a0, 1 -/* 8CE890 80240820 8E230008 */ lw $v1, 8($s1) -/* 8CE894 80240824 240400B4 */ addiu $a0, $zero, 0xb4 -/* 8CE898 80240828 00032FC2 */ srl $a1, $v1, 0x1f -/* 8CE89C 8024082C 00651821 */ addu $v1, $v1, $a1 -/* 8CE8A0 80240830 00031843 */ sra $v1, $v1, 1 -/* 8CE8A4 80240834 00621821 */ addu $v1, $v1, $v0 -/* 8CE8A8 80240838 0C00A67F */ jal rand_int -/* 8CE8AC 8024083C A603008E */ sh $v1, 0x8e($s0) -/* 8CE8B0 80240840 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8CE8B4 80240844 44820000 */ mtc1 $v0, $f0 -/* 8CE8B8 80240848 00000000 */ nop -/* 8CE8BC 8024084C 46800020 */ cvt.s.w $f0, $f0 -/* 8CE8C0 80240850 46006300 */ add.s $f12, $f12, $f0 -/* 8CE8C4 80240854 3C0142B4 */ lui $at, 0x42b4 -/* 8CE8C8 80240858 44810000 */ mtc1 $at, $f0 -/* 8CE8CC 8024085C 0C00A6C9 */ jal clamp_angle -/* 8CE8D0 80240860 46006301 */ sub.s $f12, $f12, $f0 -/* 8CE8D4 80240864 E600000C */ swc1 $f0, 0xc($s0) -/* 8CE8D8 80240868 8E4200CC */ lw $v0, 0xcc($s2) -/* 8CE8DC 8024086C 8C420000 */ lw $v0, ($v0) -/* 8CE8E0 80240870 AE020028 */ sw $v0, 0x28($s0) -/* 8CE8E4 80240874 24020003 */ addiu $v0, $zero, 3 -/* 8CE8E8 80240878 AE620070 */ sw $v0, 0x70($s3) -/* 8CE8EC 8024087C 8FBF0020 */ lw $ra, 0x20($sp) -/* 8CE8F0 80240880 8FB3001C */ lw $s3, 0x1c($sp) -/* 8CE8F4 80240884 8FB20018 */ lw $s2, 0x18($sp) -/* 8CE8F8 80240888 8FB10014 */ lw $s1, 0x14($sp) -/* 8CE8FC 8024088C 8FB00010 */ lw $s0, 0x10($sp) -/* 8CE900 80240890 03E00008 */ jr $ra -/* 8CE904 80240894 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s index c00da65e95..87d5ca00c4 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s @@ -83,7 +83,7 @@ glabel func_8024130C_8CF37C /* 8CF4AC 8024143C 0000102D */ daddu $v0, $zero, $zero /* 8CF4B0 80241440 0280202D */ daddu $a0, $s4, $zero /* 8CF4B4 80241444 0200282D */ daddu $a1, $s0, $zero -/* 8CF4B8 80241448 0C0901F6 */ jal func_802407D8_8CE848 +/* 8CF4B8 80241448 0C0901F6 */ jal UnkNpcAIFunc1 /* 8CF4BC 8024144C 0260302D */ daddu $a2, $s3, $zero /* 8CF4C0 80241450 0280202D */ daddu $a0, $s4, $zero /* 8CF4C4 80241454 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802407D8_8D1CE8.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802407D8_8D1CE8.s deleted file mode 100644 index c65ba9dc36..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802407D8_8D1CE8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D8_8D1CE8 -/* 8D1CE8 802407D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8D1CEC 802407DC AFB3001C */ sw $s3, 0x1c($sp) -/* 8D1CF0 802407E0 0080982D */ daddu $s3, $a0, $zero -/* 8D1CF4 802407E4 AFBF0020 */ sw $ra, 0x20($sp) -/* 8D1CF8 802407E8 AFB20018 */ sw $s2, 0x18($sp) -/* 8D1CFC 802407EC AFB10014 */ sw $s1, 0x14($sp) -/* 8D1D00 802407F0 AFB00010 */ sw $s0, 0x10($sp) -/* 8D1D04 802407F4 8E720148 */ lw $s2, 0x148($s3) -/* 8D1D08 802407F8 86440008 */ lh $a0, 8($s2) -/* 8D1D0C 802407FC 0C00EABB */ jal get_npc_unsafe -/* 8D1D10 80240800 00A0882D */ daddu $s1, $a1, $zero -/* 8D1D14 80240804 8E240008 */ lw $a0, 8($s1) -/* 8D1D18 80240808 0040802D */ daddu $s0, $v0, $zero -/* 8D1D1C 8024080C 00041FC2 */ srl $v1, $a0, 0x1f -/* 8D1D20 80240810 00832021 */ addu $a0, $a0, $v1 -/* 8D1D24 80240814 00042043 */ sra $a0, $a0, 1 -/* 8D1D28 80240818 0C00A67F */ jal rand_int -/* 8D1D2C 8024081C 24840001 */ addiu $a0, $a0, 1 -/* 8D1D30 80240820 8E230008 */ lw $v1, 8($s1) -/* 8D1D34 80240824 240400B4 */ addiu $a0, $zero, 0xb4 -/* 8D1D38 80240828 00032FC2 */ srl $a1, $v1, 0x1f -/* 8D1D3C 8024082C 00651821 */ addu $v1, $v1, $a1 -/* 8D1D40 80240830 00031843 */ sra $v1, $v1, 1 -/* 8D1D44 80240834 00621821 */ addu $v1, $v1, $v0 -/* 8D1D48 80240838 0C00A67F */ jal rand_int -/* 8D1D4C 8024083C A603008E */ sh $v1, 0x8e($s0) -/* 8D1D50 80240840 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8D1D54 80240844 44820000 */ mtc1 $v0, $f0 -/* 8D1D58 80240848 00000000 */ nop -/* 8D1D5C 8024084C 46800020 */ cvt.s.w $f0, $f0 -/* 8D1D60 80240850 46006300 */ add.s $f12, $f12, $f0 -/* 8D1D64 80240854 3C0142B4 */ lui $at, 0x42b4 -/* 8D1D68 80240858 44810000 */ mtc1 $at, $f0 -/* 8D1D6C 8024085C 0C00A6C9 */ jal clamp_angle -/* 8D1D70 80240860 46006301 */ sub.s $f12, $f12, $f0 -/* 8D1D74 80240864 E600000C */ swc1 $f0, 0xc($s0) -/* 8D1D78 80240868 8E4200CC */ lw $v0, 0xcc($s2) -/* 8D1D7C 8024086C 8C420000 */ lw $v0, ($v0) -/* 8D1D80 80240870 AE020028 */ sw $v0, 0x28($s0) -/* 8D1D84 80240874 24020003 */ addiu $v0, $zero, 3 -/* 8D1D88 80240878 AE620070 */ sw $v0, 0x70($s3) -/* 8D1D8C 8024087C 8FBF0020 */ lw $ra, 0x20($sp) -/* 8D1D90 80240880 8FB3001C */ lw $s3, 0x1c($sp) -/* 8D1D94 80240884 8FB20018 */ lw $s2, 0x18($sp) -/* 8D1D98 80240888 8FB10014 */ lw $s1, 0x14($sp) -/* 8D1D9C 8024088C 8FB00010 */ lw $s0, 0x10($sp) -/* 8D1DA0 80240890 03E00008 */ jr $ra -/* 8D1DA4 80240894 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s index ab694b7555..4c7139ecdb 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s @@ -83,7 +83,7 @@ glabel func_8024130C_8D281C /* 8D294C 8024143C 0000102D */ daddu $v0, $zero, $zero /* 8D2950 80241440 0280202D */ daddu $a0, $s4, $zero /* 8D2954 80241444 0200282D */ daddu $a1, $s0, $zero -/* 8D2958 80241448 0C0901F6 */ jal func_802407D8_8D1CE8 +/* 8D2958 80241448 0C0901F6 */ jal UnkNpcAIFunc1 /* 8D295C 8024144C 0260302D */ daddu $a2, $s3, $zero /* 8D2960 80241450 0280202D */ daddu $a0, $s4, $zero /* 8D2964 80241454 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802407D8_8D65D8.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802407D8_8D65D8.s deleted file mode 100644 index 1caf4f429d..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802407D8_8D65D8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D8_8D65D8 -/* 8D65D8 802407D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8D65DC 802407DC AFB3001C */ sw $s3, 0x1c($sp) -/* 8D65E0 802407E0 0080982D */ daddu $s3, $a0, $zero -/* 8D65E4 802407E4 AFBF0020 */ sw $ra, 0x20($sp) -/* 8D65E8 802407E8 AFB20018 */ sw $s2, 0x18($sp) -/* 8D65EC 802407EC AFB10014 */ sw $s1, 0x14($sp) -/* 8D65F0 802407F0 AFB00010 */ sw $s0, 0x10($sp) -/* 8D65F4 802407F4 8E720148 */ lw $s2, 0x148($s3) -/* 8D65F8 802407F8 86440008 */ lh $a0, 8($s2) -/* 8D65FC 802407FC 0C00EABB */ jal get_npc_unsafe -/* 8D6600 80240800 00A0882D */ daddu $s1, $a1, $zero -/* 8D6604 80240804 8E240008 */ lw $a0, 8($s1) -/* 8D6608 80240808 0040802D */ daddu $s0, $v0, $zero -/* 8D660C 8024080C 00041FC2 */ srl $v1, $a0, 0x1f -/* 8D6610 80240810 00832021 */ addu $a0, $a0, $v1 -/* 8D6614 80240814 00042043 */ sra $a0, $a0, 1 -/* 8D6618 80240818 0C00A67F */ jal rand_int -/* 8D661C 8024081C 24840001 */ addiu $a0, $a0, 1 -/* 8D6620 80240820 8E230008 */ lw $v1, 8($s1) -/* 8D6624 80240824 240400B4 */ addiu $a0, $zero, 0xb4 -/* 8D6628 80240828 00032FC2 */ srl $a1, $v1, 0x1f -/* 8D662C 8024082C 00651821 */ addu $v1, $v1, $a1 -/* 8D6630 80240830 00031843 */ sra $v1, $v1, 1 -/* 8D6634 80240834 00621821 */ addu $v1, $v1, $v0 -/* 8D6638 80240838 0C00A67F */ jal rand_int -/* 8D663C 8024083C A603008E */ sh $v1, 0x8e($s0) -/* 8D6640 80240840 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8D6644 80240844 44820000 */ mtc1 $v0, $f0 -/* 8D6648 80240848 00000000 */ nop -/* 8D664C 8024084C 46800020 */ cvt.s.w $f0, $f0 -/* 8D6650 80240850 46006300 */ add.s $f12, $f12, $f0 -/* 8D6654 80240854 3C0142B4 */ lui $at, 0x42b4 -/* 8D6658 80240858 44810000 */ mtc1 $at, $f0 -/* 8D665C 8024085C 0C00A6C9 */ jal clamp_angle -/* 8D6660 80240860 46006301 */ sub.s $f12, $f12, $f0 -/* 8D6664 80240864 E600000C */ swc1 $f0, 0xc($s0) -/* 8D6668 80240868 8E4200CC */ lw $v0, 0xcc($s2) -/* 8D666C 8024086C 8C420000 */ lw $v0, ($v0) -/* 8D6670 80240870 AE020028 */ sw $v0, 0x28($s0) -/* 8D6674 80240874 24020003 */ addiu $v0, $zero, 3 -/* 8D6678 80240878 AE620070 */ sw $v0, 0x70($s3) -/* 8D667C 8024087C 8FBF0020 */ lw $ra, 0x20($sp) -/* 8D6680 80240880 8FB3001C */ lw $s3, 0x1c($sp) -/* 8D6684 80240884 8FB20018 */ lw $s2, 0x18($sp) -/* 8D6688 80240888 8FB10014 */ lw $s1, 0x14($sp) -/* 8D668C 8024088C 8FB00010 */ lw $s0, 0x10($sp) -/* 8D6690 80240890 03E00008 */ jr $ra -/* 8D6694 80240894 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s index 870ac969d5..28621b1f99 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s @@ -83,7 +83,7 @@ glabel func_8024130C_8D710C /* 8D723C 8024143C 0000102D */ daddu $v0, $zero, $zero /* 8D7240 80241440 0280202D */ daddu $a0, $s4, $zero /* 8D7244 80241444 0200282D */ daddu $a1, $s0, $zero -/* 8D7248 80241448 0C0901F6 */ jal func_802407D8_8D65D8 +/* 8D7248 80241448 0C0901F6 */ jal UnkNpcAIFunc1 /* 8D724C 8024144C 0260302D */ daddu $a2, $s3, $zero /* 8D7250 80241450 0280202D */ daddu $a0, $s4, $zero /* 8D7254 80241454 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240400_A86E50.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240400_A86E50.s deleted file mode 100644 index ff1bdad222..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240400_A86E50.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_A86E50 -/* A86E50 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A86E54 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* A86E58 80240408 0080982D */ daddu $s3, $a0, $zero -/* A86E5C 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* A86E60 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* A86E64 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* A86E68 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* A86E6C 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* A86E70 80240420 86440008 */ lh $a0, 8($s2) -/* A86E74 80240424 0C00EABB */ jal get_npc_unsafe -/* A86E78 80240428 00A0882D */ daddu $s1, $a1, $zero -/* A86E7C 8024042C 8E240008 */ lw $a0, 8($s1) -/* A86E80 80240430 0040802D */ daddu $s0, $v0, $zero -/* A86E84 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* A86E88 80240438 00832021 */ addu $a0, $a0, $v1 -/* A86E8C 8024043C 00042043 */ sra $a0, $a0, 1 -/* A86E90 80240440 0C00A67F */ jal rand_int -/* A86E94 80240444 24840001 */ addiu $a0, $a0, 1 -/* A86E98 80240448 8E230008 */ lw $v1, 8($s1) -/* A86E9C 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* A86EA0 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* A86EA4 80240454 00651821 */ addu $v1, $v1, $a1 -/* A86EA8 80240458 00031843 */ sra $v1, $v1, 1 -/* A86EAC 8024045C 00621821 */ addu $v1, $v1, $v0 -/* A86EB0 80240460 0C00A67F */ jal rand_int -/* A86EB4 80240464 A603008E */ sh $v1, 0x8e($s0) -/* A86EB8 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* A86EBC 8024046C 44820000 */ mtc1 $v0, $f0 -/* A86EC0 80240470 00000000 */ nop -/* A86EC4 80240474 46800020 */ cvt.s.w $f0, $f0 -/* A86EC8 80240478 46006300 */ add.s $f12, $f12, $f0 -/* A86ECC 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* A86ED0 80240480 44810000 */ mtc1 $at, $f0 -/* A86ED4 80240484 0C00A6C9 */ jal clamp_angle -/* A86ED8 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* A86EDC 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* A86EE0 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* A86EE4 80240494 8C420000 */ lw $v0, ($v0) -/* A86EE8 80240498 AE020028 */ sw $v0, 0x28($s0) -/* A86EEC 8024049C 24020003 */ addiu $v0, $zero, 3 -/* A86EF0 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* A86EF4 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* A86EF8 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* A86EFC 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* A86F00 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* A86F04 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* A86F08 802404B8 03E00008 */ jr $ra -/* A86F0C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s index 8de63aa72e..82e79baa4a 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s @@ -141,7 +141,7 @@ glabel func_80240B94_A875E4 /* A877EC 80240D9C 00000000 */ nop /* A877F0 80240DA0 0280202D */ daddu $a0, $s4, $zero /* A877F4 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* A877F8 80240DA8 0C090100 */ jal func_80240400_A86E50 +/* A877F8 80240DA8 0C090100 */ jal UnkNpcAIFunc1 /* A877FC 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* A87800 80240DB0 0280202D */ daddu $a0, $s4, $zero /* A87804 80240DB4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s index 1eb6ac3dfd..b5090ccd23 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s @@ -153,7 +153,7 @@ glabel func_80241224_A87C74 /* A87EAC 8024145C 00000000 */ nop /* A87EB0 80241460 0260202D */ daddu $a0, $s3, $zero /* A87EB4 80241464 0280282D */ daddu $a1, $s4, $zero -/* A87EB8 80241468 0C090100 */ jal func_80240400_A86E50 +/* A87EB8 80241468 0C090100 */ jal UnkNpcAIFunc1 /* A87EBC 8024146C 02A0302D */ daddu $a2, $s5, $zero /* A87EC0 80241470 0260202D */ daddu $a0, $s3, $zero /* A87EC4 80241474 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802404E0_A8CF60.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802404E0_A8CF60.s deleted file mode 100644 index 1f01d6ade5..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802404E0_A8CF60.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404E0_A8CF60 -/* A8CF60 802404E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A8CF64 802404E4 AFB3001C */ sw $s3, 0x1c($sp) -/* A8CF68 802404E8 0080982D */ daddu $s3, $a0, $zero -/* A8CF6C 802404EC AFBF0020 */ sw $ra, 0x20($sp) -/* A8CF70 802404F0 AFB20018 */ sw $s2, 0x18($sp) -/* A8CF74 802404F4 AFB10014 */ sw $s1, 0x14($sp) -/* A8CF78 802404F8 AFB00010 */ sw $s0, 0x10($sp) -/* A8CF7C 802404FC 8E720148 */ lw $s2, 0x148($s3) -/* A8CF80 80240500 86440008 */ lh $a0, 8($s2) -/* A8CF84 80240504 0C00EABB */ jal get_npc_unsafe -/* A8CF88 80240508 00A0882D */ daddu $s1, $a1, $zero -/* A8CF8C 8024050C 8E240008 */ lw $a0, 8($s1) -/* A8CF90 80240510 0040802D */ daddu $s0, $v0, $zero -/* A8CF94 80240514 00041FC2 */ srl $v1, $a0, 0x1f -/* A8CF98 80240518 00832021 */ addu $a0, $a0, $v1 -/* A8CF9C 8024051C 00042043 */ sra $a0, $a0, 1 -/* A8CFA0 80240520 0C00A67F */ jal rand_int -/* A8CFA4 80240524 24840001 */ addiu $a0, $a0, 1 -/* A8CFA8 80240528 8E230008 */ lw $v1, 8($s1) -/* A8CFAC 8024052C 240400B4 */ addiu $a0, $zero, 0xb4 -/* A8CFB0 80240530 00032FC2 */ srl $a1, $v1, 0x1f -/* A8CFB4 80240534 00651821 */ addu $v1, $v1, $a1 -/* A8CFB8 80240538 00031843 */ sra $v1, $v1, 1 -/* A8CFBC 8024053C 00621821 */ addu $v1, $v1, $v0 -/* A8CFC0 80240540 0C00A67F */ jal rand_int -/* A8CFC4 80240544 A603008E */ sh $v1, 0x8e($s0) -/* A8CFC8 80240548 C60C000C */ lwc1 $f12, 0xc($s0) -/* A8CFCC 8024054C 44820000 */ mtc1 $v0, $f0 -/* A8CFD0 80240550 00000000 */ nop -/* A8CFD4 80240554 46800020 */ cvt.s.w $f0, $f0 -/* A8CFD8 80240558 46006300 */ add.s $f12, $f12, $f0 -/* A8CFDC 8024055C 3C0142B4 */ lui $at, 0x42b4 -/* A8CFE0 80240560 44810000 */ mtc1 $at, $f0 -/* A8CFE4 80240564 0C00A6C9 */ jal clamp_angle -/* A8CFE8 80240568 46006301 */ sub.s $f12, $f12, $f0 -/* A8CFEC 8024056C E600000C */ swc1 $f0, 0xc($s0) -/* A8CFF0 80240570 8E4200CC */ lw $v0, 0xcc($s2) -/* A8CFF4 80240574 8C420000 */ lw $v0, ($v0) -/* A8CFF8 80240578 AE020028 */ sw $v0, 0x28($s0) -/* A8CFFC 8024057C 24020003 */ addiu $v0, $zero, 3 -/* A8D000 80240580 AE620070 */ sw $v0, 0x70($s3) -/* A8D004 80240584 8FBF0020 */ lw $ra, 0x20($sp) -/* A8D008 80240588 8FB3001C */ lw $s3, 0x1c($sp) -/* A8D00C 8024058C 8FB20018 */ lw $s2, 0x18($sp) -/* A8D010 80240590 8FB10014 */ lw $s1, 0x14($sp) -/* A8D014 80240594 8FB00010 */ lw $s0, 0x10($sp) -/* A8D018 80240598 03E00008 */ jr $ra -/* A8D01C 8024059C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s index 5be08d3b0c..e0e2e5dcb1 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s @@ -141,7 +141,7 @@ glabel func_80240C74_A8D6F4 /* A8D8FC 80240E7C 00000000 */ nop /* A8D900 80240E80 0280202D */ daddu $a0, $s4, $zero /* A8D904 80240E84 0260282D */ daddu $a1, $s3, $zero -/* A8D908 80240E88 0C090138 */ jal func_802404E0_A8CF60 +/* A8D908 80240E88 0C090138 */ jal UnkNpcAIFunc1 /* A8D90C 80240E8C 02A0302D */ daddu $a2, $s5, $zero /* A8D910 80240E90 0280202D */ daddu $a0, $s4, $zero /* A8D914 80240E94 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s index c206c8336a..48cec3e51f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s @@ -153,7 +153,7 @@ glabel func_80241304_A8DD84 /* A8DFBC 8024153C 00000000 */ nop /* A8DFC0 80241540 0260202D */ daddu $a0, $s3, $zero /* A8DFC4 80241544 0280282D */ daddu $a1, $s4, $zero -/* A8DFC8 80241548 0C090138 */ jal func_802404E0_A8CF60 +/* A8DFC8 80241548 0C090138 */ jal UnkNpcAIFunc1 /* A8DFCC 8024154C 02A0302D */ daddu $a2, $s5, $zero /* A8DFD0 80241550 0260202D */ daddu $a0, $s3, $zero /* A8DFD4 80241554 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240CB8_C5B3F8.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240CB8_C5B3F8.s deleted file mode 100644 index bd3e848a31..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240CB8_C5B3F8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CB8_C5B3F8 -/* C5B3F8 80240CB8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C5B3FC 80240CBC AFB3001C */ sw $s3, 0x1c($sp) -/* C5B400 80240CC0 0080982D */ daddu $s3, $a0, $zero -/* C5B404 80240CC4 AFBF0020 */ sw $ra, 0x20($sp) -/* C5B408 80240CC8 AFB20018 */ sw $s2, 0x18($sp) -/* C5B40C 80240CCC AFB10014 */ sw $s1, 0x14($sp) -/* C5B410 80240CD0 AFB00010 */ sw $s0, 0x10($sp) -/* C5B414 80240CD4 8E720148 */ lw $s2, 0x148($s3) -/* C5B418 80240CD8 86440008 */ lh $a0, 8($s2) -/* C5B41C 80240CDC 0C00EABB */ jal get_npc_unsafe -/* C5B420 80240CE0 00A0882D */ daddu $s1, $a1, $zero -/* C5B424 80240CE4 8E240008 */ lw $a0, 8($s1) -/* C5B428 80240CE8 0040802D */ daddu $s0, $v0, $zero -/* C5B42C 80240CEC 00041FC2 */ srl $v1, $a0, 0x1f -/* C5B430 80240CF0 00832021 */ addu $a0, $a0, $v1 -/* C5B434 80240CF4 00042043 */ sra $a0, $a0, 1 -/* C5B438 80240CF8 0C00A67F */ jal rand_int -/* C5B43C 80240CFC 24840001 */ addiu $a0, $a0, 1 -/* C5B440 80240D00 8E230008 */ lw $v1, 8($s1) -/* C5B444 80240D04 240400B4 */ addiu $a0, $zero, 0xb4 -/* C5B448 80240D08 00032FC2 */ srl $a1, $v1, 0x1f -/* C5B44C 80240D0C 00651821 */ addu $v1, $v1, $a1 -/* C5B450 80240D10 00031843 */ sra $v1, $v1, 1 -/* C5B454 80240D14 00621821 */ addu $v1, $v1, $v0 -/* C5B458 80240D18 0C00A67F */ jal rand_int -/* C5B45C 80240D1C A603008E */ sh $v1, 0x8e($s0) -/* C5B460 80240D20 C60C000C */ lwc1 $f12, 0xc($s0) -/* C5B464 80240D24 44820000 */ mtc1 $v0, $f0 -/* C5B468 80240D28 00000000 */ nop -/* C5B46C 80240D2C 46800020 */ cvt.s.w $f0, $f0 -/* C5B470 80240D30 46006300 */ add.s $f12, $f12, $f0 -/* C5B474 80240D34 3C0142B4 */ lui $at, 0x42b4 -/* C5B478 80240D38 44810000 */ mtc1 $at, $f0 -/* C5B47C 80240D3C 0C00A6C9 */ jal clamp_angle -/* C5B480 80240D40 46006301 */ sub.s $f12, $f12, $f0 -/* C5B484 80240D44 E600000C */ swc1 $f0, 0xc($s0) -/* C5B488 80240D48 8E4200CC */ lw $v0, 0xcc($s2) -/* C5B48C 80240D4C 8C420000 */ lw $v0, ($v0) -/* C5B490 80240D50 AE020028 */ sw $v0, 0x28($s0) -/* C5B494 80240D54 24020003 */ addiu $v0, $zero, 3 -/* C5B498 80240D58 AE620070 */ sw $v0, 0x70($s3) -/* C5B49C 80240D5C 8FBF0020 */ lw $ra, 0x20($sp) -/* C5B4A0 80240D60 8FB3001C */ lw $s3, 0x1c($sp) -/* C5B4A4 80240D64 8FB20018 */ lw $s2, 0x18($sp) -/* C5B4A8 80240D68 8FB10014 */ lw $s1, 0x14($sp) -/* C5B4AC 80240D6C 8FB00010 */ lw $s0, 0x10($sp) -/* C5B4B0 80240D70 03E00008 */ jr $ra -/* C5B4B4 80240D74 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s index e28be0f87b..428a0a7d0e 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s @@ -83,7 +83,7 @@ glabel func_802417EC_C5BF2C /* C5C05C 8024191C 0000102D */ daddu $v0, $zero, $zero /* C5C060 80241920 0280202D */ daddu $a0, $s4, $zero /* C5C064 80241924 0200282D */ daddu $a1, $s0, $zero -/* C5C068 80241928 0C09032E */ jal func_80240CB8_C5B3F8 +/* C5C068 80241928 0C09032E */ jal UnkNpcAIFunc1 /* C5C06C 8024192C 0260302D */ daddu $a2, $s3, $zero /* C5C070 80241930 0280202D */ daddu $a0, $s4, $zero /* C5C074 80241934 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s index 33350c391e..1807b929dd 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s @@ -84,7 +84,7 @@ glabel func_80241DE4_C5C524 /* C5C658 80241F18 0000102D */ daddu $v0, $zero, $zero /* C5C65C 80241F1C 0280202D */ daddu $a0, $s4, $zero /* C5C660 80241F20 0200282D */ daddu $a1, $s0, $zero -/* C5C664 80241F24 0C09032E */ jal func_80240CB8_C5B3F8 +/* C5C664 80241F24 0C09032E */ jal UnkNpcAIFunc1 /* C5C668 80241F28 0260302D */ daddu $a2, $s3, $zero /* C5C66C 80241F2C 0280202D */ daddu $a0, $s4, $zero /* C5C670 80241F30 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240FF8_C6F328.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240FF8_C6F328.s deleted file mode 100644 index 1c8a07db55..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240FF8_C6F328.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FF8_C6F328 -/* C6F328 80240FF8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C6F32C 80240FFC AFB3001C */ sw $s3, 0x1c($sp) -/* C6F330 80241000 0080982D */ daddu $s3, $a0, $zero -/* C6F334 80241004 AFBF0020 */ sw $ra, 0x20($sp) -/* C6F338 80241008 AFB20018 */ sw $s2, 0x18($sp) -/* C6F33C 8024100C AFB10014 */ sw $s1, 0x14($sp) -/* C6F340 80241010 AFB00010 */ sw $s0, 0x10($sp) -/* C6F344 80241014 8E720148 */ lw $s2, 0x148($s3) -/* C6F348 80241018 86440008 */ lh $a0, 8($s2) -/* C6F34C 8024101C 0C00EABB */ jal get_npc_unsafe -/* C6F350 80241020 00A0882D */ daddu $s1, $a1, $zero -/* C6F354 80241024 8E240008 */ lw $a0, 8($s1) -/* C6F358 80241028 0040802D */ daddu $s0, $v0, $zero -/* C6F35C 8024102C 00041FC2 */ srl $v1, $a0, 0x1f -/* C6F360 80241030 00832021 */ addu $a0, $a0, $v1 -/* C6F364 80241034 00042043 */ sra $a0, $a0, 1 -/* C6F368 80241038 0C00A67F */ jal rand_int -/* C6F36C 8024103C 24840001 */ addiu $a0, $a0, 1 -/* C6F370 80241040 8E230008 */ lw $v1, 8($s1) -/* C6F374 80241044 240400B4 */ addiu $a0, $zero, 0xb4 -/* C6F378 80241048 00032FC2 */ srl $a1, $v1, 0x1f -/* C6F37C 8024104C 00651821 */ addu $v1, $v1, $a1 -/* C6F380 80241050 00031843 */ sra $v1, $v1, 1 -/* C6F384 80241054 00621821 */ addu $v1, $v1, $v0 -/* C6F388 80241058 0C00A67F */ jal rand_int -/* C6F38C 8024105C A603008E */ sh $v1, 0x8e($s0) -/* C6F390 80241060 C60C000C */ lwc1 $f12, 0xc($s0) -/* C6F394 80241064 44820000 */ mtc1 $v0, $f0 -/* C6F398 80241068 00000000 */ nop -/* C6F39C 8024106C 46800020 */ cvt.s.w $f0, $f0 -/* C6F3A0 80241070 46006300 */ add.s $f12, $f12, $f0 -/* C6F3A4 80241074 3C0142B4 */ lui $at, 0x42b4 -/* C6F3A8 80241078 44810000 */ mtc1 $at, $f0 -/* C6F3AC 8024107C 0C00A6C9 */ jal clamp_angle -/* C6F3B0 80241080 46006301 */ sub.s $f12, $f12, $f0 -/* C6F3B4 80241084 E600000C */ swc1 $f0, 0xc($s0) -/* C6F3B8 80241088 8E4200CC */ lw $v0, 0xcc($s2) -/* C6F3BC 8024108C 8C420000 */ lw $v0, ($v0) -/* C6F3C0 80241090 AE020028 */ sw $v0, 0x28($s0) -/* C6F3C4 80241094 24020003 */ addiu $v0, $zero, 3 -/* C6F3C8 80241098 AE620070 */ sw $v0, 0x70($s3) -/* C6F3CC 8024109C 8FBF0020 */ lw $ra, 0x20($sp) -/* C6F3D0 802410A0 8FB3001C */ lw $s3, 0x1c($sp) -/* C6F3D4 802410A4 8FB20018 */ lw $s2, 0x18($sp) -/* C6F3D8 802410A8 8FB10014 */ lw $s1, 0x14($sp) -/* C6F3DC 802410AC 8FB00010 */ lw $s0, 0x10($sp) -/* C6F3E0 802410B0 03E00008 */ jr $ra -/* C6F3E4 802410B4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s index 2e3999a29d..5ba60e5b5d 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s @@ -83,7 +83,7 @@ glabel func_80241B2C_C6FE5C /* C6FF8C 80241C5C 0000102D */ daddu $v0, $zero, $zero /* C6FF90 80241C60 0280202D */ daddu $a0, $s4, $zero /* C6FF94 80241C64 0200282D */ daddu $a1, $s0, $zero -/* C6FF98 80241C68 0C0903FE */ jal func_80240FF8_C6F328 +/* C6FF98 80241C68 0C0903FE */ jal UnkNpcAIFunc1 /* C6FF9C 80241C6C 0260302D */ daddu $a2, $s3, $zero /* C6FFA0 80241C70 0280202D */ daddu $a0, $s4, $zero /* C6FFA4 80241C74 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s index 3a735c8b1d..e3592a5733 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s @@ -84,7 +84,7 @@ glabel func_80242124_C70454 /* C70588 80242258 0000102D */ daddu $v0, $zero, $zero /* C7058C 8024225C 0280202D */ daddu $a0, $s4, $zero /* C70590 80242260 0200282D */ daddu $a1, $s0, $zero -/* C70594 80242264 0C0903FE */ jal func_80240FF8_C6F328 +/* C70594 80242264 0C0903FE */ jal UnkNpcAIFunc1 /* C70598 80242268 0260302D */ daddu $a2, $s3, $zero /* C7059C 8024226C 0280202D */ daddu $a0, $s4, $zero /* C705A0 80242270 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241228_C726A8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241228_C726A8.s deleted file mode 100644 index 3710c00487..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241228_C726A8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241228_C726A8 -/* C726A8 80241228 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C726AC 8024122C AFB3001C */ sw $s3, 0x1c($sp) -/* C726B0 80241230 0080982D */ daddu $s3, $a0, $zero -/* C726B4 80241234 AFBF0020 */ sw $ra, 0x20($sp) -/* C726B8 80241238 AFB20018 */ sw $s2, 0x18($sp) -/* C726BC 8024123C AFB10014 */ sw $s1, 0x14($sp) -/* C726C0 80241240 AFB00010 */ sw $s0, 0x10($sp) -/* C726C4 80241244 8E720148 */ lw $s2, 0x148($s3) -/* C726C8 80241248 86440008 */ lh $a0, 8($s2) -/* C726CC 8024124C 0C00EABB */ jal get_npc_unsafe -/* C726D0 80241250 00A0882D */ daddu $s1, $a1, $zero -/* C726D4 80241254 8E240008 */ lw $a0, 8($s1) -/* C726D8 80241258 0040802D */ daddu $s0, $v0, $zero -/* C726DC 8024125C 00041FC2 */ srl $v1, $a0, 0x1f -/* C726E0 80241260 00832021 */ addu $a0, $a0, $v1 -/* C726E4 80241264 00042043 */ sra $a0, $a0, 1 -/* C726E8 80241268 0C00A67F */ jal rand_int -/* C726EC 8024126C 24840001 */ addiu $a0, $a0, 1 -/* C726F0 80241270 8E230008 */ lw $v1, 8($s1) -/* C726F4 80241274 240400B4 */ addiu $a0, $zero, 0xb4 -/* C726F8 80241278 00032FC2 */ srl $a1, $v1, 0x1f -/* C726FC 8024127C 00651821 */ addu $v1, $v1, $a1 -/* C72700 80241280 00031843 */ sra $v1, $v1, 1 -/* C72704 80241284 00621821 */ addu $v1, $v1, $v0 -/* C72708 80241288 0C00A67F */ jal rand_int -/* C7270C 8024128C A603008E */ sh $v1, 0x8e($s0) -/* C72710 80241290 C60C000C */ lwc1 $f12, 0xc($s0) -/* C72714 80241294 44820000 */ mtc1 $v0, $f0 -/* C72718 80241298 00000000 */ nop -/* C7271C 8024129C 46800020 */ cvt.s.w $f0, $f0 -/* C72720 802412A0 46006300 */ add.s $f12, $f12, $f0 -/* C72724 802412A4 3C0142B4 */ lui $at, 0x42b4 -/* C72728 802412A8 44810000 */ mtc1 $at, $f0 -/* C7272C 802412AC 0C00A6C9 */ jal clamp_angle -/* C72730 802412B0 46006301 */ sub.s $f12, $f12, $f0 -/* C72734 802412B4 E600000C */ swc1 $f0, 0xc($s0) -/* C72738 802412B8 8E4200CC */ lw $v0, 0xcc($s2) -/* C7273C 802412BC 8C420000 */ lw $v0, ($v0) -/* C72740 802412C0 AE020028 */ sw $v0, 0x28($s0) -/* C72744 802412C4 24020003 */ addiu $v0, $zero, 3 -/* C72748 802412C8 AE620070 */ sw $v0, 0x70($s3) -/* C7274C 802412CC 8FBF0020 */ lw $ra, 0x20($sp) -/* C72750 802412D0 8FB3001C */ lw $s3, 0x1c($sp) -/* C72754 802412D4 8FB20018 */ lw $s2, 0x18($sp) -/* C72758 802412D8 8FB10014 */ lw $s1, 0x14($sp) -/* C7275C 802412DC 8FB00010 */ lw $s0, 0x10($sp) -/* C72760 802412E0 03E00008 */ jr $ra -/* C72764 802412E4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s index 175493694f..5e4bac9545 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s @@ -83,7 +83,7 @@ glabel func_80241D5C_C731DC /* C7330C 80241E8C 0000102D */ daddu $v0, $zero, $zero /* C73310 80241E90 0280202D */ daddu $a0, $s4, $zero /* C73314 80241E94 0200282D */ daddu $a1, $s0, $zero -/* C73318 80241E98 0C09048A */ jal func_80241228_C726A8 +/* C73318 80241E98 0C09048A */ jal UnkNpcAIFunc1 /* C7331C 80241E9C 0260302D */ daddu $a2, $s3, $zero /* C73320 80241EA0 0280202D */ daddu $a0, $s4, $zero /* C73324 80241EA4 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s index a9280deae5..e7eef8159c 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s @@ -84,7 +84,7 @@ glabel func_80242354_C737D4 /* C73908 80242488 0000102D */ daddu $v0, $zero, $zero /* C7390C 8024248C 0280202D */ daddu $a0, $s4, $zero /* C73910 80242490 0200282D */ daddu $a1, $s0, $zero -/* C73914 80242494 0C09048A */ jal func_80241228_C726A8 +/* C73914 80242494 0C09048A */ jal UnkNpcAIFunc1 /* C73918 80242498 0260302D */ daddu $a2, $s3, $zero /* C7391C 8024249C 0280202D */ daddu $a0, $s4, $zero /* C73920 802424A0 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240C38_C80DD8.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240C38_C80DD8.s deleted file mode 100644 index 24bbc93d57..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240C38_C80DD8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C38_C80DD8 -/* C80DD8 80240C38 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C80DDC 80240C3C AFB3001C */ sw $s3, 0x1c($sp) -/* C80DE0 80240C40 0080982D */ daddu $s3, $a0, $zero -/* C80DE4 80240C44 AFBF0020 */ sw $ra, 0x20($sp) -/* C80DE8 80240C48 AFB20018 */ sw $s2, 0x18($sp) -/* C80DEC 80240C4C AFB10014 */ sw $s1, 0x14($sp) -/* C80DF0 80240C50 AFB00010 */ sw $s0, 0x10($sp) -/* C80DF4 80240C54 8E720148 */ lw $s2, 0x148($s3) -/* C80DF8 80240C58 86440008 */ lh $a0, 8($s2) -/* C80DFC 80240C5C 0C00EABB */ jal get_npc_unsafe -/* C80E00 80240C60 00A0882D */ daddu $s1, $a1, $zero -/* C80E04 80240C64 8E240008 */ lw $a0, 8($s1) -/* C80E08 80240C68 0040802D */ daddu $s0, $v0, $zero -/* C80E0C 80240C6C 00041FC2 */ srl $v1, $a0, 0x1f -/* C80E10 80240C70 00832021 */ addu $a0, $a0, $v1 -/* C80E14 80240C74 00042043 */ sra $a0, $a0, 1 -/* C80E18 80240C78 0C00A67F */ jal rand_int -/* C80E1C 80240C7C 24840001 */ addiu $a0, $a0, 1 -/* C80E20 80240C80 8E230008 */ lw $v1, 8($s1) -/* C80E24 80240C84 240400B4 */ addiu $a0, $zero, 0xb4 -/* C80E28 80240C88 00032FC2 */ srl $a1, $v1, 0x1f -/* C80E2C 80240C8C 00651821 */ addu $v1, $v1, $a1 -/* C80E30 80240C90 00031843 */ sra $v1, $v1, 1 -/* C80E34 80240C94 00621821 */ addu $v1, $v1, $v0 -/* C80E38 80240C98 0C00A67F */ jal rand_int -/* C80E3C 80240C9C A603008E */ sh $v1, 0x8e($s0) -/* C80E40 80240CA0 C60C000C */ lwc1 $f12, 0xc($s0) -/* C80E44 80240CA4 44820000 */ mtc1 $v0, $f0 -/* C80E48 80240CA8 00000000 */ nop -/* C80E4C 80240CAC 46800020 */ cvt.s.w $f0, $f0 -/* C80E50 80240CB0 46006300 */ add.s $f12, $f12, $f0 -/* C80E54 80240CB4 3C0142B4 */ lui $at, 0x42b4 -/* C80E58 80240CB8 44810000 */ mtc1 $at, $f0 -/* C80E5C 80240CBC 0C00A6C9 */ jal clamp_angle -/* C80E60 80240CC0 46006301 */ sub.s $f12, $f12, $f0 -/* C80E64 80240CC4 E600000C */ swc1 $f0, 0xc($s0) -/* C80E68 80240CC8 8E4200CC */ lw $v0, 0xcc($s2) -/* C80E6C 80240CCC 8C420000 */ lw $v0, ($v0) -/* C80E70 80240CD0 AE020028 */ sw $v0, 0x28($s0) -/* C80E74 80240CD4 24020003 */ addiu $v0, $zero, 3 -/* C80E78 80240CD8 AE620070 */ sw $v0, 0x70($s3) -/* C80E7C 80240CDC 8FBF0020 */ lw $ra, 0x20($sp) -/* C80E80 80240CE0 8FB3001C */ lw $s3, 0x1c($sp) -/* C80E84 80240CE4 8FB20018 */ lw $s2, 0x18($sp) -/* C80E88 80240CE8 8FB10014 */ lw $s1, 0x14($sp) -/* C80E8C 80240CEC 8FB00010 */ lw $s0, 0x10($sp) -/* C80E90 80240CF0 03E00008 */ jr $ra -/* C80E94 80240CF4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s index 07362dc1c8..2f6164f9a4 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s @@ -83,7 +83,7 @@ glabel func_8024176C_C8190C /* C81A3C 8024189C 0000102D */ daddu $v0, $zero, $zero /* C81A40 802418A0 0280202D */ daddu $a0, $s4, $zero /* C81A44 802418A4 0200282D */ daddu $a1, $s0, $zero -/* C81A48 802418A8 0C09030E */ jal func_80240C38_C80DD8 +/* C81A48 802418A8 0C09030E */ jal UnkNpcAIFunc1 /* C81A4C 802418AC 0260302D */ daddu $a2, $s3, $zero /* C81A50 802418B0 0280202D */ daddu $a0, $s4, $zero /* C81A54 802418B4 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s index 699797c083..b6ad4c8516 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s @@ -84,7 +84,7 @@ glabel func_80241D64_C81F04 /* C82038 80241E98 0000102D */ daddu $v0, $zero, $zero /* C8203C 80241E9C 0280202D */ daddu $a0, $s4, $zero /* C82040 80241EA0 0200282D */ daddu $a1, $s0, $zero -/* C82044 80241EA4 0C09030E */ jal func_80240C38_C80DD8 +/* C82044 80241EA4 0C09030E */ jal UnkNpcAIFunc1 /* C82048 80241EA8 0260302D */ daddu $a2, $s3, $zero /* C8204C 80241EAC 0280202D */ daddu $a0, $s4, $zero /* C82050 80241EB0 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242970_7ED680.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242970_7ED680.s deleted file mode 100644 index 1cd908fcbe..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242970_7ED680.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242970_7ED680 -/* 7ED680 80242970 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7ED684 80242974 AFB3001C */ sw $s3, 0x1c($sp) -/* 7ED688 80242978 0080982D */ daddu $s3, $a0, $zero -/* 7ED68C 8024297C AFBF0020 */ sw $ra, 0x20($sp) -/* 7ED690 80242980 AFB20018 */ sw $s2, 0x18($sp) -/* 7ED694 80242984 AFB10014 */ sw $s1, 0x14($sp) -/* 7ED698 80242988 AFB00010 */ sw $s0, 0x10($sp) -/* 7ED69C 8024298C 8E720148 */ lw $s2, 0x148($s3) -/* 7ED6A0 80242990 86440008 */ lh $a0, 8($s2) -/* 7ED6A4 80242994 0C00EABB */ jal get_npc_unsafe -/* 7ED6A8 80242998 00A0882D */ daddu $s1, $a1, $zero -/* 7ED6AC 8024299C 8E240008 */ lw $a0, 8($s1) -/* 7ED6B0 802429A0 0040802D */ daddu $s0, $v0, $zero -/* 7ED6B4 802429A4 00041FC2 */ srl $v1, $a0, 0x1f -/* 7ED6B8 802429A8 00832021 */ addu $a0, $a0, $v1 -/* 7ED6BC 802429AC 00042043 */ sra $a0, $a0, 1 -/* 7ED6C0 802429B0 0C00A67F */ jal rand_int -/* 7ED6C4 802429B4 24840001 */ addiu $a0, $a0, 1 -/* 7ED6C8 802429B8 8E230008 */ lw $v1, 8($s1) -/* 7ED6CC 802429BC 240400B4 */ addiu $a0, $zero, 0xb4 -/* 7ED6D0 802429C0 00032FC2 */ srl $a1, $v1, 0x1f -/* 7ED6D4 802429C4 00651821 */ addu $v1, $v1, $a1 -/* 7ED6D8 802429C8 00031843 */ sra $v1, $v1, 1 -/* 7ED6DC 802429CC 00621821 */ addu $v1, $v1, $v0 -/* 7ED6E0 802429D0 0C00A67F */ jal rand_int -/* 7ED6E4 802429D4 A603008E */ sh $v1, 0x8e($s0) -/* 7ED6E8 802429D8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 7ED6EC 802429DC 44820000 */ mtc1 $v0, $f0 -/* 7ED6F0 802429E0 00000000 */ nop -/* 7ED6F4 802429E4 46800020 */ cvt.s.w $f0, $f0 -/* 7ED6F8 802429E8 46006300 */ add.s $f12, $f12, $f0 -/* 7ED6FC 802429EC 3C0142B4 */ lui $at, 0x42b4 -/* 7ED700 802429F0 44810000 */ mtc1 $at, $f0 -/* 7ED704 802429F4 0C00A6C9 */ jal clamp_angle -/* 7ED708 802429F8 46006301 */ sub.s $f12, $f12, $f0 -/* 7ED70C 802429FC E600000C */ swc1 $f0, 0xc($s0) -/* 7ED710 80242A00 8E4200CC */ lw $v0, 0xcc($s2) -/* 7ED714 80242A04 8C420000 */ lw $v0, ($v0) -/* 7ED718 80242A08 AE020028 */ sw $v0, 0x28($s0) -/* 7ED71C 80242A0C 24020003 */ addiu $v0, $zero, 3 -/* 7ED720 80242A10 AE620070 */ sw $v0, 0x70($s3) -/* 7ED724 80242A14 8FBF0020 */ lw $ra, 0x20($sp) -/* 7ED728 80242A18 8FB3001C */ lw $s3, 0x1c($sp) -/* 7ED72C 80242A1C 8FB20018 */ lw $s2, 0x18($sp) -/* 7ED730 80242A20 8FB10014 */ lw $s1, 0x14($sp) -/* 7ED734 80242A24 8FB00010 */ lw $s0, 0x10($sp) -/* 7ED738 80242A28 03E00008 */ jr $ra -/* 7ED73C 80242A2C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s index 604f0404ce..7cd2934269 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s @@ -141,7 +141,7 @@ glabel func_80243104_7EDE14 /* 7EE01C 8024330C 00000000 */ nop /* 7EE020 80243310 0280202D */ daddu $a0, $s4, $zero /* 7EE024 80243314 0260282D */ daddu $a1, $s3, $zero -/* 7EE028 80243318 0C090A5C */ jal func_80242970_7ED680 +/* 7EE028 80243318 0C090A5C */ jal UnkNpcAIFunc1 /* 7EE02C 8024331C 02A0302D */ daddu $a2, $s5, $zero /* 7EE030 80243320 0280202D */ daddu $a0, $s4, $zero /* 7EE034 80243324 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241480_801D00.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241480_801D00.s deleted file mode 100644 index d5c06ee3e2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241480_801D00.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241480_801D00 -/* 801D00 80241480 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 801D04 80241484 AFB3001C */ sw $s3, 0x1c($sp) -/* 801D08 80241488 0080982D */ daddu $s3, $a0, $zero -/* 801D0C 8024148C AFBF0020 */ sw $ra, 0x20($sp) -/* 801D10 80241490 AFB20018 */ sw $s2, 0x18($sp) -/* 801D14 80241494 AFB10014 */ sw $s1, 0x14($sp) -/* 801D18 80241498 AFB00010 */ sw $s0, 0x10($sp) -/* 801D1C 8024149C 8E720148 */ lw $s2, 0x148($s3) -/* 801D20 802414A0 86440008 */ lh $a0, 8($s2) -/* 801D24 802414A4 0C00EABB */ jal get_npc_unsafe -/* 801D28 802414A8 00A0882D */ daddu $s1, $a1, $zero -/* 801D2C 802414AC 8E240008 */ lw $a0, 8($s1) -/* 801D30 802414B0 0040802D */ daddu $s0, $v0, $zero -/* 801D34 802414B4 00041FC2 */ srl $v1, $a0, 0x1f -/* 801D38 802414B8 00832021 */ addu $a0, $a0, $v1 -/* 801D3C 802414BC 00042043 */ sra $a0, $a0, 1 -/* 801D40 802414C0 0C00A67F */ jal rand_int -/* 801D44 802414C4 24840001 */ addiu $a0, $a0, 1 -/* 801D48 802414C8 8E230008 */ lw $v1, 8($s1) -/* 801D4C 802414CC 240400B4 */ addiu $a0, $zero, 0xb4 -/* 801D50 802414D0 00032FC2 */ srl $a1, $v1, 0x1f -/* 801D54 802414D4 00651821 */ addu $v1, $v1, $a1 -/* 801D58 802414D8 00031843 */ sra $v1, $v1, 1 -/* 801D5C 802414DC 00621821 */ addu $v1, $v1, $v0 -/* 801D60 802414E0 0C00A67F */ jal rand_int -/* 801D64 802414E4 A603008E */ sh $v1, 0x8e($s0) -/* 801D68 802414E8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 801D6C 802414EC 44820000 */ mtc1 $v0, $f0 -/* 801D70 802414F0 00000000 */ nop -/* 801D74 802414F4 46800020 */ cvt.s.w $f0, $f0 -/* 801D78 802414F8 46006300 */ add.s $f12, $f12, $f0 -/* 801D7C 802414FC 3C0142B4 */ lui $at, 0x42b4 -/* 801D80 80241500 44810000 */ mtc1 $at, $f0 -/* 801D84 80241504 0C00A6C9 */ jal clamp_angle -/* 801D88 80241508 46006301 */ sub.s $f12, $f12, $f0 -/* 801D8C 8024150C E600000C */ swc1 $f0, 0xc($s0) -/* 801D90 80241510 8E4200CC */ lw $v0, 0xcc($s2) -/* 801D94 80241514 8C420000 */ lw $v0, ($v0) -/* 801D98 80241518 AE020028 */ sw $v0, 0x28($s0) -/* 801D9C 8024151C 24020003 */ addiu $v0, $zero, 3 -/* 801DA0 80241520 AE620070 */ sw $v0, 0x70($s3) -/* 801DA4 80241524 8FBF0020 */ lw $ra, 0x20($sp) -/* 801DA8 80241528 8FB3001C */ lw $s3, 0x1c($sp) -/* 801DAC 8024152C 8FB20018 */ lw $s2, 0x18($sp) -/* 801DB0 80241530 8FB10014 */ lw $s1, 0x14($sp) -/* 801DB4 80241534 8FB00010 */ lw $s0, 0x10($sp) -/* 801DB8 80241538 03E00008 */ jr $ra -/* 801DBC 8024153C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s index a21dd82c7f..ea203cc6dc 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s @@ -141,7 +141,7 @@ glabel func_80241C14_802494 /* 80269C 80241E1C 00000000 */ nop /* 8026A0 80241E20 0280202D */ daddu $a0, $s4, $zero /* 8026A4 80241E24 0260282D */ daddu $a1, $s3, $zero -/* 8026A8 80241E28 0C090520 */ jal func_80241480_801D00 +/* 8026A8 80241E28 0C090520 */ jal UnkNpcAIFunc1 /* 8026AC 80241E2C 02A0302D */ daddu $a2, $s5, $zero /* 8026B0 80241E30 0280202D */ daddu $a0, $s4, $zero /* 8026B4 80241E34 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245950_8061D0.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245950_8061D0.s deleted file mode 100644 index e42425150f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245950_8061D0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245950_8061D0 -/* 8061D0 80245950 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8061D4 80245954 AFB3001C */ sw $s3, 0x1c($sp) -/* 8061D8 80245958 0080982D */ daddu $s3, $a0, $zero -/* 8061DC 8024595C AFBF0020 */ sw $ra, 0x20($sp) -/* 8061E0 80245960 AFB20018 */ sw $s2, 0x18($sp) -/* 8061E4 80245964 AFB10014 */ sw $s1, 0x14($sp) -/* 8061E8 80245968 AFB00010 */ sw $s0, 0x10($sp) -/* 8061EC 8024596C 8E720148 */ lw $s2, 0x148($s3) -/* 8061F0 80245970 86440008 */ lh $a0, 8($s2) -/* 8061F4 80245974 0C00EABB */ jal get_npc_unsafe -/* 8061F8 80245978 00A0882D */ daddu $s1, $a1, $zero -/* 8061FC 8024597C 8E240008 */ lw $a0, 8($s1) -/* 806200 80245980 0040802D */ daddu $s0, $v0, $zero -/* 806204 80245984 00041FC2 */ srl $v1, $a0, 0x1f -/* 806208 80245988 00832021 */ addu $a0, $a0, $v1 -/* 80620C 8024598C 00042043 */ sra $a0, $a0, 1 -/* 806210 80245990 0C00A67F */ jal rand_int -/* 806214 80245994 24840001 */ addiu $a0, $a0, 1 -/* 806218 80245998 8E230008 */ lw $v1, 8($s1) -/* 80621C 8024599C 240400B4 */ addiu $a0, $zero, 0xb4 -/* 806220 802459A0 00032FC2 */ srl $a1, $v1, 0x1f -/* 806224 802459A4 00651821 */ addu $v1, $v1, $a1 -/* 806228 802459A8 00031843 */ sra $v1, $v1, 1 -/* 80622C 802459AC 00621821 */ addu $v1, $v1, $v0 -/* 806230 802459B0 0C00A67F */ jal rand_int -/* 806234 802459B4 A603008E */ sh $v1, 0x8e($s0) -/* 806238 802459B8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 80623C 802459BC 44820000 */ mtc1 $v0, $f0 -/* 806240 802459C0 00000000 */ nop -/* 806244 802459C4 46800020 */ cvt.s.w $f0, $f0 -/* 806248 802459C8 46006300 */ add.s $f12, $f12, $f0 -/* 80624C 802459CC 3C0142B4 */ lui $at, 0x42b4 -/* 806250 802459D0 44810000 */ mtc1 $at, $f0 -/* 806254 802459D4 0C00A6C9 */ jal clamp_angle -/* 806258 802459D8 46006301 */ sub.s $f12, $f12, $f0 -/* 80625C 802459DC E600000C */ swc1 $f0, 0xc($s0) -/* 806260 802459E0 8E4200CC */ lw $v0, 0xcc($s2) -/* 806264 802459E4 8C420000 */ lw $v0, ($v0) -/* 806268 802459E8 AE020028 */ sw $v0, 0x28($s0) -/* 80626C 802459EC 24020003 */ addiu $v0, $zero, 3 -/* 806270 802459F0 AE620070 */ sw $v0, 0x70($s3) -/* 806274 802459F4 8FBF0020 */ lw $ra, 0x20($sp) -/* 806278 802459F8 8FB3001C */ lw $s3, 0x1c($sp) -/* 80627C 802459FC 8FB20018 */ lw $s2, 0x18($sp) -/* 806280 80245A00 8FB10014 */ lw $s1, 0x14($sp) -/* 806284 80245A04 8FB00010 */ lw $s0, 0x10($sp) -/* 806288 80245A08 03E00008 */ jr $ra -/* 80628C 80245A0C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s index f76272a2e1..66f8e3902f 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s @@ -141,7 +141,7 @@ glabel func_802460E4_806964 /* 806B6C 802462EC 00000000 */ nop /* 806B70 802462F0 0280202D */ daddu $a0, $s4, $zero /* 806B74 802462F4 0260282D */ daddu $a1, $s3, $zero -/* 806B78 802462F8 0C091654 */ jal func_80245950_8061D0 +/* 806B78 802462F8 0C091654 */ jal UnkNpcAIFunc1 /* 806B7C 802462FC 02A0302D */ daddu $a2, $s5, $zero /* 806B80 80246300 0280202D */ daddu $a0, $s4, $zero /* 806B84 80246304 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240D30_823FF0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240D30_823FF0.s deleted file mode 100644 index 707e1674c8..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240D30_823FF0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D30_823FF0 -/* 823FF0 80240D30 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 823FF4 80240D34 AFB3001C */ sw $s3, 0x1c($sp) -/* 823FF8 80240D38 0080982D */ daddu $s3, $a0, $zero -/* 823FFC 80240D3C AFBF0020 */ sw $ra, 0x20($sp) -/* 824000 80240D40 AFB20018 */ sw $s2, 0x18($sp) -/* 824004 80240D44 AFB10014 */ sw $s1, 0x14($sp) -/* 824008 80240D48 AFB00010 */ sw $s0, 0x10($sp) -/* 82400C 80240D4C 8E720148 */ lw $s2, 0x148($s3) -/* 824010 80240D50 86440008 */ lh $a0, 8($s2) -/* 824014 80240D54 0C00EABB */ jal get_npc_unsafe -/* 824018 80240D58 00A0882D */ daddu $s1, $a1, $zero -/* 82401C 80240D5C 8E240008 */ lw $a0, 8($s1) -/* 824020 80240D60 0040802D */ daddu $s0, $v0, $zero -/* 824024 80240D64 00041FC2 */ srl $v1, $a0, 0x1f -/* 824028 80240D68 00832021 */ addu $a0, $a0, $v1 -/* 82402C 80240D6C 00042043 */ sra $a0, $a0, 1 -/* 824030 80240D70 0C00A67F */ jal rand_int -/* 824034 80240D74 24840001 */ addiu $a0, $a0, 1 -/* 824038 80240D78 8E230008 */ lw $v1, 8($s1) -/* 82403C 80240D7C 240400B4 */ addiu $a0, $zero, 0xb4 -/* 824040 80240D80 00032FC2 */ srl $a1, $v1, 0x1f -/* 824044 80240D84 00651821 */ addu $v1, $v1, $a1 -/* 824048 80240D88 00031843 */ sra $v1, $v1, 1 -/* 82404C 80240D8C 00621821 */ addu $v1, $v1, $v0 -/* 824050 80240D90 0C00A67F */ jal rand_int -/* 824054 80240D94 A603008E */ sh $v1, 0x8e($s0) -/* 824058 80240D98 C60C000C */ lwc1 $f12, 0xc($s0) -/* 82405C 80240D9C 44820000 */ mtc1 $v0, $f0 -/* 824060 80240DA0 00000000 */ nop -/* 824064 80240DA4 46800020 */ cvt.s.w $f0, $f0 -/* 824068 80240DA8 46006300 */ add.s $f12, $f12, $f0 -/* 82406C 80240DAC 3C0142B4 */ lui $at, 0x42b4 -/* 824070 80240DB0 44810000 */ mtc1 $at, $f0 -/* 824074 80240DB4 0C00A6C9 */ jal clamp_angle -/* 824078 80240DB8 46006301 */ sub.s $f12, $f12, $f0 -/* 82407C 80240DBC E600000C */ swc1 $f0, 0xc($s0) -/* 824080 80240DC0 8E4200CC */ lw $v0, 0xcc($s2) -/* 824084 80240DC4 8C420000 */ lw $v0, ($v0) -/* 824088 80240DC8 AE020028 */ sw $v0, 0x28($s0) -/* 82408C 80240DCC 24020003 */ addiu $v0, $zero, 3 -/* 824090 80240DD0 AE620070 */ sw $v0, 0x70($s3) -/* 824094 80240DD4 8FBF0020 */ lw $ra, 0x20($sp) -/* 824098 80240DD8 8FB3001C */ lw $s3, 0x1c($sp) -/* 82409C 80240DDC 8FB20018 */ lw $s2, 0x18($sp) -/* 8240A0 80240DE0 8FB10014 */ lw $s1, 0x14($sp) -/* 8240A4 80240DE4 8FB00010 */ lw $s0, 0x10($sp) -/* 8240A8 80240DE8 03E00008 */ jr $ra -/* 8240AC 80240DEC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s index be45d20fa9..214941caa9 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s @@ -141,7 +141,7 @@ glabel func_802414C4_824784 /* 82498C 802416CC 00000000 */ nop /* 824990 802416D0 0280202D */ daddu $a0, $s4, $zero /* 824994 802416D4 0260282D */ daddu $a1, $s3, $zero -/* 824998 802416D8 0C09034C */ jal func_80240D30_823FF0 +/* 824998 802416D8 0C09034C */ jal UnkNpcAIFunc1 /* 82499C 802416DC 02A0302D */ daddu $a2, $s5, $zero /* 8249A0 802416E0 0280202D */ daddu $a0, $s4, $zero /* 8249A4 802416E4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240890_852A00.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240890_852A00.s deleted file mode 100644 index 4fb2757e15..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240890_852A00.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240890_852A00 -/* 852A00 80240890 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 852A04 80240894 AFB3001C */ sw $s3, 0x1c($sp) -/* 852A08 80240898 0080982D */ daddu $s3, $a0, $zero -/* 852A0C 8024089C AFBF0020 */ sw $ra, 0x20($sp) -/* 852A10 802408A0 AFB20018 */ sw $s2, 0x18($sp) -/* 852A14 802408A4 AFB10014 */ sw $s1, 0x14($sp) -/* 852A18 802408A8 AFB00010 */ sw $s0, 0x10($sp) -/* 852A1C 802408AC 8E720148 */ lw $s2, 0x148($s3) -/* 852A20 802408B0 86440008 */ lh $a0, 8($s2) -/* 852A24 802408B4 0C00EABB */ jal get_npc_unsafe -/* 852A28 802408B8 00A0882D */ daddu $s1, $a1, $zero -/* 852A2C 802408BC 8E240008 */ lw $a0, 8($s1) -/* 852A30 802408C0 0040802D */ daddu $s0, $v0, $zero -/* 852A34 802408C4 00041FC2 */ srl $v1, $a0, 0x1f -/* 852A38 802408C8 00832021 */ addu $a0, $a0, $v1 -/* 852A3C 802408CC 00042043 */ sra $a0, $a0, 1 -/* 852A40 802408D0 0C00A67F */ jal rand_int -/* 852A44 802408D4 24840001 */ addiu $a0, $a0, 1 -/* 852A48 802408D8 8E230008 */ lw $v1, 8($s1) -/* 852A4C 802408DC 240400B4 */ addiu $a0, $zero, 0xb4 -/* 852A50 802408E0 00032FC2 */ srl $a1, $v1, 0x1f -/* 852A54 802408E4 00651821 */ addu $v1, $v1, $a1 -/* 852A58 802408E8 00031843 */ sra $v1, $v1, 1 -/* 852A5C 802408EC 00621821 */ addu $v1, $v1, $v0 -/* 852A60 802408F0 0C00A67F */ jal rand_int -/* 852A64 802408F4 A603008E */ sh $v1, 0x8e($s0) -/* 852A68 802408F8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 852A6C 802408FC 44820000 */ mtc1 $v0, $f0 -/* 852A70 80240900 00000000 */ nop -/* 852A74 80240904 46800020 */ cvt.s.w $f0, $f0 -/* 852A78 80240908 46006300 */ add.s $f12, $f12, $f0 -/* 852A7C 8024090C 3C0142B4 */ lui $at, 0x42b4 -/* 852A80 80240910 44810000 */ mtc1 $at, $f0 -/* 852A84 80240914 0C00A6C9 */ jal clamp_angle -/* 852A88 80240918 46006301 */ sub.s $f12, $f12, $f0 -/* 852A8C 8024091C E600000C */ swc1 $f0, 0xc($s0) -/* 852A90 80240920 8E4200CC */ lw $v0, 0xcc($s2) -/* 852A94 80240924 8C420000 */ lw $v0, ($v0) -/* 852A98 80240928 AE020028 */ sw $v0, 0x28($s0) -/* 852A9C 8024092C 24020003 */ addiu $v0, $zero, 3 -/* 852AA0 80240930 AE620070 */ sw $v0, 0x70($s3) -/* 852AA4 80240934 8FBF0020 */ lw $ra, 0x20($sp) -/* 852AA8 80240938 8FB3001C */ lw $s3, 0x1c($sp) -/* 852AAC 8024093C 8FB20018 */ lw $s2, 0x18($sp) -/* 852AB0 80240940 8FB10014 */ lw $s1, 0x14($sp) -/* 852AB4 80240944 8FB00010 */ lw $s0, 0x10($sp) -/* 852AB8 80240948 03E00008 */ jr $ra -/* 852ABC 8024094C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s index 19182f02e4..155f83347d 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s @@ -141,7 +141,7 @@ glabel func_80241024_853194 /* 85339C 8024122C 00000000 */ nop /* 8533A0 80241230 0280202D */ daddu $a0, $s4, $zero /* 8533A4 80241234 0260282D */ daddu $a1, $s3, $zero -/* 8533A8 80241238 0C090224 */ jal func_80240890_852A00 +/* 8533A8 80241238 0C090224 */ jal UnkNpcAIFunc1 /* 8533AC 8024123C 02A0302D */ daddu $a2, $s5, $zero /* 8533B0 80241240 0280202D */ daddu $a0, $s4, $zero /* 8533B4 80241244 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802406E0_E0EE80.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802406E0_E0EE80.s deleted file mode 100644 index 3e80b5fc57..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802406E0_E0EE80.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406E0_E0EE80 -/* E0EE80 802406E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E0EE84 802406E4 AFB3001C */ sw $s3, 0x1c($sp) -/* E0EE88 802406E8 0080982D */ daddu $s3, $a0, $zero -/* E0EE8C 802406EC AFBF0020 */ sw $ra, 0x20($sp) -/* E0EE90 802406F0 AFB20018 */ sw $s2, 0x18($sp) -/* E0EE94 802406F4 AFB10014 */ sw $s1, 0x14($sp) -/* E0EE98 802406F8 AFB00010 */ sw $s0, 0x10($sp) -/* E0EE9C 802406FC 8E720148 */ lw $s2, 0x148($s3) -/* E0EEA0 80240700 86440008 */ lh $a0, 8($s2) -/* E0EEA4 80240704 0C00EABB */ jal get_npc_unsafe -/* E0EEA8 80240708 00A0882D */ daddu $s1, $a1, $zero -/* E0EEAC 8024070C 8E240008 */ lw $a0, 8($s1) -/* E0EEB0 80240710 0040802D */ daddu $s0, $v0, $zero -/* E0EEB4 80240714 00041FC2 */ srl $v1, $a0, 0x1f -/* E0EEB8 80240718 00832021 */ addu $a0, $a0, $v1 -/* E0EEBC 8024071C 00042043 */ sra $a0, $a0, 1 -/* E0EEC0 80240720 0C00A67F */ jal rand_int -/* E0EEC4 80240724 24840001 */ addiu $a0, $a0, 1 -/* E0EEC8 80240728 8E230008 */ lw $v1, 8($s1) -/* E0EECC 8024072C 240400B4 */ addiu $a0, $zero, 0xb4 -/* E0EED0 80240730 00032FC2 */ srl $a1, $v1, 0x1f -/* E0EED4 80240734 00651821 */ addu $v1, $v1, $a1 -/* E0EED8 80240738 00031843 */ sra $v1, $v1, 1 -/* E0EEDC 8024073C 00621821 */ addu $v1, $v1, $v0 -/* E0EEE0 80240740 0C00A67F */ jal rand_int -/* E0EEE4 80240744 A603008E */ sh $v1, 0x8e($s0) -/* E0EEE8 80240748 C60C000C */ lwc1 $f12, 0xc($s0) -/* E0EEEC 8024074C 44820000 */ mtc1 $v0, $f0 -/* E0EEF0 80240750 00000000 */ nop -/* E0EEF4 80240754 46800020 */ cvt.s.w $f0, $f0 -/* E0EEF8 80240758 46006300 */ add.s $f12, $f12, $f0 -/* E0EEFC 8024075C 3C0142B4 */ lui $at, 0x42b4 -/* E0EF00 80240760 44810000 */ mtc1 $at, $f0 -/* E0EF04 80240764 0C00A6C9 */ jal clamp_angle -/* E0EF08 80240768 46006301 */ sub.s $f12, $f12, $f0 -/* E0EF0C 8024076C E600000C */ swc1 $f0, 0xc($s0) -/* E0EF10 80240770 8E4200CC */ lw $v0, 0xcc($s2) -/* E0EF14 80240774 8C420000 */ lw $v0, ($v0) -/* E0EF18 80240778 AE020028 */ sw $v0, 0x28($s0) -/* E0EF1C 8024077C 24020003 */ addiu $v0, $zero, 3 -/* E0EF20 80240780 AE620070 */ sw $v0, 0x70($s3) -/* E0EF24 80240784 8FBF0020 */ lw $ra, 0x20($sp) -/* E0EF28 80240788 8FB3001C */ lw $s3, 0x1c($sp) -/* E0EF2C 8024078C 8FB20018 */ lw $s2, 0x18($sp) -/* E0EF30 80240790 8FB10014 */ lw $s1, 0x14($sp) -/* E0EF34 80240794 8FB00010 */ lw $s0, 0x10($sp) -/* E0EF38 80240798 03E00008 */ jr $ra -/* E0EF3C 8024079C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s index 2ea272337e..90813933a1 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s @@ -141,7 +141,7 @@ glabel func_80240E74_E0F614 /* E0F81C 8024107C 00000000 */ nop /* E0F820 80241080 0280202D */ daddu $a0, $s4, $zero /* E0F824 80241084 0260282D */ daddu $a1, $s3, $zero -/* E0F828 80241088 0C0901B8 */ jal func_802406E0_E0EE80 +/* E0F828 80241088 0C0901B8 */ jal UnkNpcAIFunc1 /* E0F82C 8024108C 02A0302D */ daddu $a2, $s5, $zero /* E0F830 80241090 0280202D */ daddu $a0, $s4, $zero /* E0F834 80241094 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802405D8_B981D8.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802405D8_B981D8.s deleted file mode 100644 index 93abcaad68..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802405D8_B981D8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405D8_B981D8 -/* B981D8 802405D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B981DC 802405DC AFB3001C */ sw $s3, 0x1c($sp) -/* B981E0 802405E0 0080982D */ daddu $s3, $a0, $zero -/* B981E4 802405E4 AFBF0020 */ sw $ra, 0x20($sp) -/* B981E8 802405E8 AFB20018 */ sw $s2, 0x18($sp) -/* B981EC 802405EC AFB10014 */ sw $s1, 0x14($sp) -/* B981F0 802405F0 AFB00010 */ sw $s0, 0x10($sp) -/* B981F4 802405F4 8E720148 */ lw $s2, 0x148($s3) -/* B981F8 802405F8 86440008 */ lh $a0, 8($s2) -/* B981FC 802405FC 0C00EABB */ jal get_npc_unsafe -/* B98200 80240600 00A0882D */ daddu $s1, $a1, $zero -/* B98204 80240604 8E240008 */ lw $a0, 8($s1) -/* B98208 80240608 0040802D */ daddu $s0, $v0, $zero -/* B9820C 8024060C 00041FC2 */ srl $v1, $a0, 0x1f -/* B98210 80240610 00832021 */ addu $a0, $a0, $v1 -/* B98214 80240614 00042043 */ sra $a0, $a0, 1 -/* B98218 80240618 0C00A67F */ jal rand_int -/* B9821C 8024061C 24840001 */ addiu $a0, $a0, 1 -/* B98220 80240620 8E230008 */ lw $v1, 8($s1) -/* B98224 80240624 240400B4 */ addiu $a0, $zero, 0xb4 -/* B98228 80240628 00032FC2 */ srl $a1, $v1, 0x1f -/* B9822C 8024062C 00651821 */ addu $v1, $v1, $a1 -/* B98230 80240630 00031843 */ sra $v1, $v1, 1 -/* B98234 80240634 00621821 */ addu $v1, $v1, $v0 -/* B98238 80240638 0C00A67F */ jal rand_int -/* B9823C 8024063C A603008E */ sh $v1, 0x8e($s0) -/* B98240 80240640 C60C000C */ lwc1 $f12, 0xc($s0) -/* B98244 80240644 44820000 */ mtc1 $v0, $f0 -/* B98248 80240648 00000000 */ nop -/* B9824C 8024064C 46800020 */ cvt.s.w $f0, $f0 -/* B98250 80240650 46006300 */ add.s $f12, $f12, $f0 -/* B98254 80240654 3C0142B4 */ lui $at, 0x42b4 -/* B98258 80240658 44810000 */ mtc1 $at, $f0 -/* B9825C 8024065C 0C00A6C9 */ jal clamp_angle -/* B98260 80240660 46006301 */ sub.s $f12, $f12, $f0 -/* B98264 80240664 E600000C */ swc1 $f0, 0xc($s0) -/* B98268 80240668 8E4200CC */ lw $v0, 0xcc($s2) -/* B9826C 8024066C 8C420000 */ lw $v0, ($v0) -/* B98270 80240670 AE020028 */ sw $v0, 0x28($s0) -/* B98274 80240674 24020003 */ addiu $v0, $zero, 3 -/* B98278 80240678 AE620070 */ sw $v0, 0x70($s3) -/* B9827C 8024067C 8FBF0020 */ lw $ra, 0x20($sp) -/* B98280 80240680 8FB3001C */ lw $s3, 0x1c($sp) -/* B98284 80240684 8FB20018 */ lw $s2, 0x18($sp) -/* B98288 80240688 8FB10014 */ lw $s1, 0x14($sp) -/* B9828C 8024068C 8FB00010 */ lw $s0, 0x10($sp) -/* B98290 80240690 03E00008 */ jr $ra -/* B98294 80240694 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s index 8eae94b6c4..39bfe07bb8 100644 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s +++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s @@ -105,7 +105,7 @@ glabel func_80240C60_B98860 /* B989E8 80240DE8 0000102D */ daddu $v0, $zero, $zero /* B989EC 80240DEC 0260202D */ daddu $a0, $s3, $zero /* B989F0 80240DF0 0280282D */ daddu $a1, $s4, $zero -/* B989F4 80240DF4 0C090176 */ jal func_802405D8_B981D8 +/* B989F4 80240DF4 0C090176 */ jal UnkNpcAIFunc1 /* B989F8 80240DF8 0200302D */ daddu $a2, $s0, $zero /* B989FC 80240DFC 8E630070 */ lw $v1, 0x70($s3) /* B98A00 80240E00 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240768_B9E0C8.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240768_B9E0C8.s deleted file mode 100644 index a765f3789d..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240768_B9E0C8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240768_B9E0C8 -/* B9E0C8 80240768 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B9E0CC 8024076C AFB3001C */ sw $s3, 0x1c($sp) -/* B9E0D0 80240770 0080982D */ daddu $s3, $a0, $zero -/* B9E0D4 80240774 AFBF0020 */ sw $ra, 0x20($sp) -/* B9E0D8 80240778 AFB20018 */ sw $s2, 0x18($sp) -/* B9E0DC 8024077C AFB10014 */ sw $s1, 0x14($sp) -/* B9E0E0 80240780 AFB00010 */ sw $s0, 0x10($sp) -/* B9E0E4 80240784 8E720148 */ lw $s2, 0x148($s3) -/* B9E0E8 80240788 86440008 */ lh $a0, 8($s2) -/* B9E0EC 8024078C 0C00EABB */ jal get_npc_unsafe -/* B9E0F0 80240790 00A0882D */ daddu $s1, $a1, $zero -/* B9E0F4 80240794 8E240008 */ lw $a0, 8($s1) -/* B9E0F8 80240798 0040802D */ daddu $s0, $v0, $zero -/* B9E0FC 8024079C 00041FC2 */ srl $v1, $a0, 0x1f -/* B9E100 802407A0 00832021 */ addu $a0, $a0, $v1 -/* B9E104 802407A4 00042043 */ sra $a0, $a0, 1 -/* B9E108 802407A8 0C00A67F */ jal rand_int -/* B9E10C 802407AC 24840001 */ addiu $a0, $a0, 1 -/* B9E110 802407B0 8E230008 */ lw $v1, 8($s1) -/* B9E114 802407B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* B9E118 802407B8 00032FC2 */ srl $a1, $v1, 0x1f -/* B9E11C 802407BC 00651821 */ addu $v1, $v1, $a1 -/* B9E120 802407C0 00031843 */ sra $v1, $v1, 1 -/* B9E124 802407C4 00621821 */ addu $v1, $v1, $v0 -/* B9E128 802407C8 0C00A67F */ jal rand_int -/* B9E12C 802407CC A603008E */ sh $v1, 0x8e($s0) -/* B9E130 802407D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* B9E134 802407D4 44820000 */ mtc1 $v0, $f0 -/* B9E138 802407D8 00000000 */ nop -/* B9E13C 802407DC 46800020 */ cvt.s.w $f0, $f0 -/* B9E140 802407E0 46006300 */ add.s $f12, $f12, $f0 -/* B9E144 802407E4 3C0142B4 */ lui $at, 0x42b4 -/* B9E148 802407E8 44810000 */ mtc1 $at, $f0 -/* B9E14C 802407EC 0C00A6C9 */ jal clamp_angle -/* B9E150 802407F0 46006301 */ sub.s $f12, $f12, $f0 -/* B9E154 802407F4 E600000C */ swc1 $f0, 0xc($s0) -/* B9E158 802407F8 8E4200CC */ lw $v0, 0xcc($s2) -/* B9E15C 802407FC 8C420000 */ lw $v0, ($v0) -/* B9E160 80240800 AE020028 */ sw $v0, 0x28($s0) -/* B9E164 80240804 24020003 */ addiu $v0, $zero, 3 -/* B9E168 80240808 AE620070 */ sw $v0, 0x70($s3) -/* B9E16C 8024080C 8FBF0020 */ lw $ra, 0x20($sp) -/* B9E170 80240810 8FB3001C */ lw $s3, 0x1c($sp) -/* B9E174 80240814 8FB20018 */ lw $s2, 0x18($sp) -/* B9E178 80240818 8FB10014 */ lw $s1, 0x14($sp) -/* B9E17C 8024081C 8FB00010 */ lw $s0, 0x10($sp) -/* B9E180 80240820 03E00008 */ jr $ra -/* B9E184 80240824 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s index aa534816a1..5e606892d0 100644 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s +++ b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s @@ -105,7 +105,7 @@ glabel func_80240DF0_B9E750 /* B9E8D8 80240F78 0000102D */ daddu $v0, $zero, $zero /* B9E8DC 80240F7C 0260202D */ daddu $a0, $s3, $zero /* B9E8E0 80240F80 0280282D */ daddu $a1, $s4, $zero -/* B9E8E4 80240F84 0C0901DA */ jal func_80240768_B9E0C8 +/* B9E8E4 80240F84 0C0901DA */ jal UnkNpcAIFunc1 /* B9E8E8 80240F88 0200302D */ daddu $a2, $s0, $zero /* B9E8EC 80240F8C 8E630070 */ lw $v1, 0x70($s3) /* B9E8F0 80240F90 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024247C_BA6BFC.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024247C_BA6BFC.s deleted file mode 100644 index d44cb7733c..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024247C_BA6BFC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024247C_BA6BFC -/* BA6BFC 8024247C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BA6C00 80242480 AFB3001C */ sw $s3, 0x1c($sp) -/* BA6C04 80242484 0080982D */ daddu $s3, $a0, $zero -/* BA6C08 80242488 AFBF0020 */ sw $ra, 0x20($sp) -/* BA6C0C 8024248C AFB20018 */ sw $s2, 0x18($sp) -/* BA6C10 80242490 AFB10014 */ sw $s1, 0x14($sp) -/* BA6C14 80242494 AFB00010 */ sw $s0, 0x10($sp) -/* BA6C18 80242498 8E720148 */ lw $s2, 0x148($s3) -/* BA6C1C 8024249C 86440008 */ lh $a0, 8($s2) -/* BA6C20 802424A0 0C00EABB */ jal get_npc_unsafe -/* BA6C24 802424A4 00A0882D */ daddu $s1, $a1, $zero -/* BA6C28 802424A8 8E240008 */ lw $a0, 8($s1) -/* BA6C2C 802424AC 0040802D */ daddu $s0, $v0, $zero -/* BA6C30 802424B0 00041FC2 */ srl $v1, $a0, 0x1f -/* BA6C34 802424B4 00832021 */ addu $a0, $a0, $v1 -/* BA6C38 802424B8 00042043 */ sra $a0, $a0, 1 -/* BA6C3C 802424BC 0C00A67F */ jal rand_int -/* BA6C40 802424C0 24840001 */ addiu $a0, $a0, 1 -/* BA6C44 802424C4 8E230008 */ lw $v1, 8($s1) -/* BA6C48 802424C8 240400B4 */ addiu $a0, $zero, 0xb4 -/* BA6C4C 802424CC 00032FC2 */ srl $a1, $v1, 0x1f -/* BA6C50 802424D0 00651821 */ addu $v1, $v1, $a1 -/* BA6C54 802424D4 00031843 */ sra $v1, $v1, 1 -/* BA6C58 802424D8 00621821 */ addu $v1, $v1, $v0 -/* BA6C5C 802424DC 0C00A67F */ jal rand_int -/* BA6C60 802424E0 A603008E */ sh $v1, 0x8e($s0) -/* BA6C64 802424E4 C60C000C */ lwc1 $f12, 0xc($s0) -/* BA6C68 802424E8 44820000 */ mtc1 $v0, $f0 -/* BA6C6C 802424EC 00000000 */ nop -/* BA6C70 802424F0 46800020 */ cvt.s.w $f0, $f0 -/* BA6C74 802424F4 46006300 */ add.s $f12, $f12, $f0 -/* BA6C78 802424F8 3C0142B4 */ lui $at, 0x42b4 -/* BA6C7C 802424FC 44810000 */ mtc1 $at, $f0 -/* BA6C80 80242500 0C00A6C9 */ jal clamp_angle -/* BA6C84 80242504 46006301 */ sub.s $f12, $f12, $f0 -/* BA6C88 80242508 E600000C */ swc1 $f0, 0xc($s0) -/* BA6C8C 8024250C 8E4200CC */ lw $v0, 0xcc($s2) -/* BA6C90 80242510 8C420000 */ lw $v0, ($v0) -/* BA6C94 80242514 AE020028 */ sw $v0, 0x28($s0) -/* BA6C98 80242518 24020003 */ addiu $v0, $zero, 3 -/* BA6C9C 8024251C AE620070 */ sw $v0, 0x70($s3) -/* BA6CA0 80242520 8FBF0020 */ lw $ra, 0x20($sp) -/* BA6CA4 80242524 8FB3001C */ lw $s3, 0x1c($sp) -/* BA6CA8 80242528 8FB20018 */ lw $s2, 0x18($sp) -/* BA6CAC 8024252C 8FB10014 */ lw $s1, 0x14($sp) -/* BA6CB0 80242530 8FB00010 */ lw $s0, 0x10($sp) -/* BA6CB4 80242534 03E00008 */ jr $ra -/* BA6CB8 80242538 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s index 047faa9710..68d0a7070b 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s @@ -105,7 +105,7 @@ glabel func_80242B04_BA7284 /* BA740C 80242C8C 0000102D */ daddu $v0, $zero, $zero /* BA7410 80242C90 0260202D */ daddu $a0, $s3, $zero /* BA7414 80242C94 0280282D */ daddu $a1, $s4, $zero -/* BA7418 80242C98 0C09091F */ jal func_8024247C_BA6BFC +/* BA7418 80242C98 0C09091F */ jal UnkNpcAIFunc1 /* BA741C 80242C9C 0200302D */ daddu $a2, $s0, $zero /* BA7420 80242CA0 8E630070 */ lw $v1, 0x70($s3) /* BA7424 80242CA4 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_802407D8_BAA918.s b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_802407D8_BAA918.s deleted file mode 100644 index 56efa15a05..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_802407D8_BAA918.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D8_BAA918 -/* BAA918 802407D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BAA91C 802407DC AFB3001C */ sw $s3, 0x1c($sp) -/* BAA920 802407E0 0080982D */ daddu $s3, $a0, $zero -/* BAA924 802407E4 AFBF0020 */ sw $ra, 0x20($sp) -/* BAA928 802407E8 AFB20018 */ sw $s2, 0x18($sp) -/* BAA92C 802407EC AFB10014 */ sw $s1, 0x14($sp) -/* BAA930 802407F0 AFB00010 */ sw $s0, 0x10($sp) -/* BAA934 802407F4 8E720148 */ lw $s2, 0x148($s3) -/* BAA938 802407F8 86440008 */ lh $a0, 8($s2) -/* BAA93C 802407FC 0C00EABB */ jal get_npc_unsafe -/* BAA940 80240800 00A0882D */ daddu $s1, $a1, $zero -/* BAA944 80240804 8E240008 */ lw $a0, 8($s1) -/* BAA948 80240808 0040802D */ daddu $s0, $v0, $zero -/* BAA94C 8024080C 00041FC2 */ srl $v1, $a0, 0x1f -/* BAA950 80240810 00832021 */ addu $a0, $a0, $v1 -/* BAA954 80240814 00042043 */ sra $a0, $a0, 1 -/* BAA958 80240818 0C00A67F */ jal rand_int -/* BAA95C 8024081C 24840001 */ addiu $a0, $a0, 1 -/* BAA960 80240820 8E230008 */ lw $v1, 8($s1) -/* BAA964 80240824 240400B4 */ addiu $a0, $zero, 0xb4 -/* BAA968 80240828 00032FC2 */ srl $a1, $v1, 0x1f -/* BAA96C 8024082C 00651821 */ addu $v1, $v1, $a1 -/* BAA970 80240830 00031843 */ sra $v1, $v1, 1 -/* BAA974 80240834 00621821 */ addu $v1, $v1, $v0 -/* BAA978 80240838 0C00A67F */ jal rand_int -/* BAA97C 8024083C A603008E */ sh $v1, 0x8e($s0) -/* BAA980 80240840 C60C000C */ lwc1 $f12, 0xc($s0) -/* BAA984 80240844 44820000 */ mtc1 $v0, $f0 -/* BAA988 80240848 00000000 */ nop -/* BAA98C 8024084C 46800020 */ cvt.s.w $f0, $f0 -/* BAA990 80240850 46006300 */ add.s $f12, $f12, $f0 -/* BAA994 80240854 3C0142B4 */ lui $at, 0x42b4 -/* BAA998 80240858 44810000 */ mtc1 $at, $f0 -/* BAA99C 8024085C 0C00A6C9 */ jal clamp_angle -/* BAA9A0 80240860 46006301 */ sub.s $f12, $f12, $f0 -/* BAA9A4 80240864 E600000C */ swc1 $f0, 0xc($s0) -/* BAA9A8 80240868 8E4200CC */ lw $v0, 0xcc($s2) -/* BAA9AC 8024086C 8C420000 */ lw $v0, ($v0) -/* BAA9B0 80240870 AE020028 */ sw $v0, 0x28($s0) -/* BAA9B4 80240874 24020003 */ addiu $v0, $zero, 3 -/* BAA9B8 80240878 AE620070 */ sw $v0, 0x70($s3) -/* BAA9BC 8024087C 8FBF0020 */ lw $ra, 0x20($sp) -/* BAA9C0 80240880 8FB3001C */ lw $s3, 0x1c($sp) -/* BAA9C4 80240884 8FB20018 */ lw $s2, 0x18($sp) -/* BAA9C8 80240888 8FB10014 */ lw $s1, 0x14($sp) -/* BAA9CC 8024088C 8FB00010 */ lw $s0, 0x10($sp) -/* BAA9D0 80240890 03E00008 */ jr $ra -/* BAA9D4 80240894 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s index 3f653198a8..1343cc4399 100644 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s @@ -105,7 +105,7 @@ glabel func_80240E60_BAAFA0 /* BAB128 80240FE8 0000102D */ daddu $v0, $zero, $zero /* BAB12C 80240FEC 0260202D */ daddu $a0, $s3, $zero /* BAB130 80240FF0 0280282D */ daddu $a1, $s4, $zero -/* BAB134 80240FF4 0C0901F6 */ jal func_802407D8_BAA918 +/* BAB134 80240FF4 0C0901F6 */ jal UnkNpcAIFunc1 /* BAB138 80240FF8 0200302D */ daddu $a2, $s0, $zero /* BAB13C 80240FFC 8E630070 */ lw $v1, 0x70($s3) /* BAB140 80241000 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240878_BAE1B8.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240878_BAE1B8.s deleted file mode 100644 index 99da355b0f..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240878_BAE1B8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240878_BAE1B8 -/* BAE1B8 80240878 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BAE1BC 8024087C AFB3001C */ sw $s3, 0x1c($sp) -/* BAE1C0 80240880 0080982D */ daddu $s3, $a0, $zero -/* BAE1C4 80240884 AFBF0020 */ sw $ra, 0x20($sp) -/* BAE1C8 80240888 AFB20018 */ sw $s2, 0x18($sp) -/* BAE1CC 8024088C AFB10014 */ sw $s1, 0x14($sp) -/* BAE1D0 80240890 AFB00010 */ sw $s0, 0x10($sp) -/* BAE1D4 80240894 8E720148 */ lw $s2, 0x148($s3) -/* BAE1D8 80240898 86440008 */ lh $a0, 8($s2) -/* BAE1DC 8024089C 0C00EABB */ jal get_npc_unsafe -/* BAE1E0 802408A0 00A0882D */ daddu $s1, $a1, $zero -/* BAE1E4 802408A4 8E240008 */ lw $a0, 8($s1) -/* BAE1E8 802408A8 0040802D */ daddu $s0, $v0, $zero -/* BAE1EC 802408AC 00041FC2 */ srl $v1, $a0, 0x1f -/* BAE1F0 802408B0 00832021 */ addu $a0, $a0, $v1 -/* BAE1F4 802408B4 00042043 */ sra $a0, $a0, 1 -/* BAE1F8 802408B8 0C00A67F */ jal rand_int -/* BAE1FC 802408BC 24840001 */ addiu $a0, $a0, 1 -/* BAE200 802408C0 8E230008 */ lw $v1, 8($s1) -/* BAE204 802408C4 240400B4 */ addiu $a0, $zero, 0xb4 -/* BAE208 802408C8 00032FC2 */ srl $a1, $v1, 0x1f -/* BAE20C 802408CC 00651821 */ addu $v1, $v1, $a1 -/* BAE210 802408D0 00031843 */ sra $v1, $v1, 1 -/* BAE214 802408D4 00621821 */ addu $v1, $v1, $v0 -/* BAE218 802408D8 0C00A67F */ jal rand_int -/* BAE21C 802408DC A603008E */ sh $v1, 0x8e($s0) -/* BAE220 802408E0 C60C000C */ lwc1 $f12, 0xc($s0) -/* BAE224 802408E4 44820000 */ mtc1 $v0, $f0 -/* BAE228 802408E8 00000000 */ nop -/* BAE22C 802408EC 46800020 */ cvt.s.w $f0, $f0 -/* BAE230 802408F0 46006300 */ add.s $f12, $f12, $f0 -/* BAE234 802408F4 3C0142B4 */ lui $at, 0x42b4 -/* BAE238 802408F8 44810000 */ mtc1 $at, $f0 -/* BAE23C 802408FC 0C00A6C9 */ jal clamp_angle -/* BAE240 80240900 46006301 */ sub.s $f12, $f12, $f0 -/* BAE244 80240904 E600000C */ swc1 $f0, 0xc($s0) -/* BAE248 80240908 8E4200CC */ lw $v0, 0xcc($s2) -/* BAE24C 8024090C 8C420000 */ lw $v0, ($v0) -/* BAE250 80240910 AE020028 */ sw $v0, 0x28($s0) -/* BAE254 80240914 24020003 */ addiu $v0, $zero, 3 -/* BAE258 80240918 AE620070 */ sw $v0, 0x70($s3) -/* BAE25C 8024091C 8FBF0020 */ lw $ra, 0x20($sp) -/* BAE260 80240920 8FB3001C */ lw $s3, 0x1c($sp) -/* BAE264 80240924 8FB20018 */ lw $s2, 0x18($sp) -/* BAE268 80240928 8FB10014 */ lw $s1, 0x14($sp) -/* BAE26C 8024092C 8FB00010 */ lw $s0, 0x10($sp) -/* BAE270 80240930 03E00008 */ jr $ra -/* BAE274 80240934 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s index 2e99fa01c7..ae02b12f57 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s @@ -83,7 +83,7 @@ glabel func_802413AC_BAECEC /* BAEE1C 802414DC 0000102D */ daddu $v0, $zero, $zero /* BAEE20 802414E0 0280202D */ daddu $a0, $s4, $zero /* BAEE24 802414E4 0200282D */ daddu $a1, $s0, $zero -/* BAEE28 802414E8 0C09021E */ jal func_80240878_BAE1B8 +/* BAEE28 802414E8 0C09021E */ jal UnkNpcAIFunc1 /* BAEE2C 802414EC 0260302D */ daddu $a2, $s3, $zero /* BAEE30 802414F0 0280202D */ daddu $a0, $s4, $zero /* BAEE34 802414F4 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240608_BB3408.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240608_BB3408.s deleted file mode 100644 index e3efb6389e..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240608_BB3408.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240608_BB3408 -/* BB3408 80240608 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BB340C 8024060C AFB3001C */ sw $s3, 0x1c($sp) -/* BB3410 80240610 0080982D */ daddu $s3, $a0, $zero -/* BB3414 80240614 AFBF0020 */ sw $ra, 0x20($sp) -/* BB3418 80240618 AFB20018 */ sw $s2, 0x18($sp) -/* BB341C 8024061C AFB10014 */ sw $s1, 0x14($sp) -/* BB3420 80240620 AFB00010 */ sw $s0, 0x10($sp) -/* BB3424 80240624 8E720148 */ lw $s2, 0x148($s3) -/* BB3428 80240628 86440008 */ lh $a0, 8($s2) -/* BB342C 8024062C 0C00EABB */ jal get_npc_unsafe -/* BB3430 80240630 00A0882D */ daddu $s1, $a1, $zero -/* BB3434 80240634 8E240008 */ lw $a0, 8($s1) -/* BB3438 80240638 0040802D */ daddu $s0, $v0, $zero -/* BB343C 8024063C 00041FC2 */ srl $v1, $a0, 0x1f -/* BB3440 80240640 00832021 */ addu $a0, $a0, $v1 -/* BB3444 80240644 00042043 */ sra $a0, $a0, 1 -/* BB3448 80240648 0C00A67F */ jal rand_int -/* BB344C 8024064C 24840001 */ addiu $a0, $a0, 1 -/* BB3450 80240650 8E230008 */ lw $v1, 8($s1) -/* BB3454 80240654 240400B4 */ addiu $a0, $zero, 0xb4 -/* BB3458 80240658 00032FC2 */ srl $a1, $v1, 0x1f -/* BB345C 8024065C 00651821 */ addu $v1, $v1, $a1 -/* BB3460 80240660 00031843 */ sra $v1, $v1, 1 -/* BB3464 80240664 00621821 */ addu $v1, $v1, $v0 -/* BB3468 80240668 0C00A67F */ jal rand_int -/* BB346C 8024066C A603008E */ sh $v1, 0x8e($s0) -/* BB3470 80240670 C60C000C */ lwc1 $f12, 0xc($s0) -/* BB3474 80240674 44820000 */ mtc1 $v0, $f0 -/* BB3478 80240678 00000000 */ nop -/* BB347C 8024067C 46800020 */ cvt.s.w $f0, $f0 -/* BB3480 80240680 46006300 */ add.s $f12, $f12, $f0 -/* BB3484 80240684 3C0142B4 */ lui $at, 0x42b4 -/* BB3488 80240688 44810000 */ mtc1 $at, $f0 -/* BB348C 8024068C 0C00A6C9 */ jal clamp_angle -/* BB3490 80240690 46006301 */ sub.s $f12, $f12, $f0 -/* BB3494 80240694 E600000C */ swc1 $f0, 0xc($s0) -/* BB3498 80240698 8E4200CC */ lw $v0, 0xcc($s2) -/* BB349C 8024069C 8C420000 */ lw $v0, ($v0) -/* BB34A0 802406A0 AE020028 */ sw $v0, 0x28($s0) -/* BB34A4 802406A4 24020003 */ addiu $v0, $zero, 3 -/* BB34A8 802406A8 AE620070 */ sw $v0, 0x70($s3) -/* BB34AC 802406AC 8FBF0020 */ lw $ra, 0x20($sp) -/* BB34B0 802406B0 8FB3001C */ lw $s3, 0x1c($sp) -/* BB34B4 802406B4 8FB20018 */ lw $s2, 0x18($sp) -/* BB34B8 802406B8 8FB10014 */ lw $s1, 0x14($sp) -/* BB34BC 802406BC 8FB00010 */ lw $s0, 0x10($sp) -/* BB34C0 802406C0 03E00008 */ jr $ra -/* BB34C4 802406C4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s index 1a598f27f6..2a01c84133 100644 --- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s +++ b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s @@ -105,7 +105,7 @@ glabel func_80240C90_BB3A90 /* BB3C18 80240E18 0000102D */ daddu $v0, $zero, $zero /* BB3C1C 80240E1C 0260202D */ daddu $a0, $s3, $zero /* BB3C20 80240E20 0280282D */ daddu $a1, $s4, $zero -/* BB3C24 80240E24 0C090182 */ jal func_80240608_BB3408 +/* BB3C24 80240E24 0C090182 */ jal UnkNpcAIFunc1 /* BB3C28 80240E28 0200302D */ daddu $a2, $s0, $zero /* BB3C2C 80240E2C 8E630070 */ lw $v1, 0x70($s3) /* BB3C30 80240E30 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240E80_9D7EA0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240E80_9D7EA0.s deleted file mode 100644 index 352b09cc7e..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240E80_9D7EA0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E80_9D7EA0 -/* 9D7EA0 80240E80 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9D7EA4 80240E84 AFB3001C */ sw $s3, 0x1c($sp) -/* 9D7EA8 80240E88 0080982D */ daddu $s3, $a0, $zero -/* 9D7EAC 80240E8C AFBF0020 */ sw $ra, 0x20($sp) -/* 9D7EB0 80240E90 AFB20018 */ sw $s2, 0x18($sp) -/* 9D7EB4 80240E94 AFB10014 */ sw $s1, 0x14($sp) -/* 9D7EB8 80240E98 AFB00010 */ sw $s0, 0x10($sp) -/* 9D7EBC 80240E9C 8E720148 */ lw $s2, 0x148($s3) -/* 9D7EC0 80240EA0 86440008 */ lh $a0, 8($s2) -/* 9D7EC4 80240EA4 0C00EABB */ jal get_npc_unsafe -/* 9D7EC8 80240EA8 00A0882D */ daddu $s1, $a1, $zero -/* 9D7ECC 80240EAC 8E240008 */ lw $a0, 8($s1) -/* 9D7ED0 80240EB0 0040802D */ daddu $s0, $v0, $zero -/* 9D7ED4 80240EB4 00041FC2 */ srl $v1, $a0, 0x1f -/* 9D7ED8 80240EB8 00832021 */ addu $a0, $a0, $v1 -/* 9D7EDC 80240EBC 00042043 */ sra $a0, $a0, 1 -/* 9D7EE0 80240EC0 0C00A67F */ jal rand_int -/* 9D7EE4 80240EC4 24840001 */ addiu $a0, $a0, 1 -/* 9D7EE8 80240EC8 8E230008 */ lw $v1, 8($s1) -/* 9D7EEC 80240ECC 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9D7EF0 80240ED0 00032FC2 */ srl $a1, $v1, 0x1f -/* 9D7EF4 80240ED4 00651821 */ addu $v1, $v1, $a1 -/* 9D7EF8 80240ED8 00031843 */ sra $v1, $v1, 1 -/* 9D7EFC 80240EDC 00621821 */ addu $v1, $v1, $v0 -/* 9D7F00 80240EE0 0C00A67F */ jal rand_int -/* 9D7F04 80240EE4 A603008E */ sh $v1, 0x8e($s0) -/* 9D7F08 80240EE8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9D7F0C 80240EEC 44820000 */ mtc1 $v0, $f0 -/* 9D7F10 80240EF0 00000000 */ nop -/* 9D7F14 80240EF4 46800020 */ cvt.s.w $f0, $f0 -/* 9D7F18 80240EF8 46006300 */ add.s $f12, $f12, $f0 -/* 9D7F1C 80240EFC 3C0142B4 */ lui $at, 0x42b4 -/* 9D7F20 80240F00 44810000 */ mtc1 $at, $f0 -/* 9D7F24 80240F04 0C00A6C9 */ jal clamp_angle -/* 9D7F28 80240F08 46006301 */ sub.s $f12, $f12, $f0 -/* 9D7F2C 80240F0C E600000C */ swc1 $f0, 0xc($s0) -/* 9D7F30 80240F10 8E4200CC */ lw $v0, 0xcc($s2) -/* 9D7F34 80240F14 8C420000 */ lw $v0, ($v0) -/* 9D7F38 80240F18 AE020028 */ sw $v0, 0x28($s0) -/* 9D7F3C 80240F1C 24020003 */ addiu $v0, $zero, 3 -/* 9D7F40 80240F20 AE620070 */ sw $v0, 0x70($s3) -/* 9D7F44 80240F24 8FBF0020 */ lw $ra, 0x20($sp) -/* 9D7F48 80240F28 8FB3001C */ lw $s3, 0x1c($sp) -/* 9D7F4C 80240F2C 8FB20018 */ lw $s2, 0x18($sp) -/* 9D7F50 80240F30 8FB10014 */ lw $s1, 0x14($sp) -/* 9D7F54 80240F34 8FB00010 */ lw $s0, 0x10($sp) -/* 9D7F58 80240F38 03E00008 */ jr $ra -/* 9D7F5C 80240F3C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s index 742a272a8a..8b3542f0ab 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s @@ -141,7 +141,7 @@ glabel func_80241614_9D8634 /* 9D883C 8024181C 00000000 */ nop /* 9D8840 80241820 0280202D */ daddu $a0, $s4, $zero /* 9D8844 80241824 0260282D */ daddu $a1, $s3, $zero -/* 9D8848 80241828 0C0903A0 */ jal func_80240E80_9D7EA0 +/* 9D8848 80241828 0C0903A0 */ jal UnkNpcAIFunc1 /* 9D884C 8024182C 02A0302D */ daddu $a2, $s5, $zero /* 9D8850 80241830 0280202D */ daddu $a0, $s4, $zero /* 9D8854 80241834 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240568_9EBD58.s b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240568_9EBD58.s deleted file mode 100644 index 3a1108673d..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240568_9EBD58.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568_9EBD58 -/* 9EBD58 80240568 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9EBD5C 8024056C AFB3001C */ sw $s3, 0x1c($sp) -/* 9EBD60 80240570 0080982D */ daddu $s3, $a0, $zero -/* 9EBD64 80240574 AFBF0020 */ sw $ra, 0x20($sp) -/* 9EBD68 80240578 AFB20018 */ sw $s2, 0x18($sp) -/* 9EBD6C 8024057C AFB10014 */ sw $s1, 0x14($sp) -/* 9EBD70 80240580 AFB00010 */ sw $s0, 0x10($sp) -/* 9EBD74 80240584 8E720148 */ lw $s2, 0x148($s3) -/* 9EBD78 80240588 86440008 */ lh $a0, 8($s2) -/* 9EBD7C 8024058C 0C00EABB */ jal get_npc_unsafe -/* 9EBD80 80240590 00A0882D */ daddu $s1, $a1, $zero -/* 9EBD84 80240594 8E240008 */ lw $a0, 8($s1) -/* 9EBD88 80240598 0040802D */ daddu $s0, $v0, $zero -/* 9EBD8C 8024059C 00041FC2 */ srl $v1, $a0, 0x1f -/* 9EBD90 802405A0 00832021 */ addu $a0, $a0, $v1 -/* 9EBD94 802405A4 00042043 */ sra $a0, $a0, 1 -/* 9EBD98 802405A8 0C00A67F */ jal rand_int -/* 9EBD9C 802405AC 24840001 */ addiu $a0, $a0, 1 -/* 9EBDA0 802405B0 8E230008 */ lw $v1, 8($s1) -/* 9EBDA4 802405B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9EBDA8 802405B8 00032FC2 */ srl $a1, $v1, 0x1f -/* 9EBDAC 802405BC 00651821 */ addu $v1, $v1, $a1 -/* 9EBDB0 802405C0 00031843 */ sra $v1, $v1, 1 -/* 9EBDB4 802405C4 00621821 */ addu $v1, $v1, $v0 -/* 9EBDB8 802405C8 0C00A67F */ jal rand_int -/* 9EBDBC 802405CC A603008E */ sh $v1, 0x8e($s0) -/* 9EBDC0 802405D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9EBDC4 802405D4 44820000 */ mtc1 $v0, $f0 -/* 9EBDC8 802405D8 00000000 */ nop -/* 9EBDCC 802405DC 46800020 */ cvt.s.w $f0, $f0 -/* 9EBDD0 802405E0 46006300 */ add.s $f12, $f12, $f0 -/* 9EBDD4 802405E4 3C0142B4 */ lui $at, 0x42b4 -/* 9EBDD8 802405E8 44810000 */ mtc1 $at, $f0 -/* 9EBDDC 802405EC 0C00A6C9 */ jal clamp_angle -/* 9EBDE0 802405F0 46006301 */ sub.s $f12, $f12, $f0 -/* 9EBDE4 802405F4 E600000C */ swc1 $f0, 0xc($s0) -/* 9EBDE8 802405F8 8E4200CC */ lw $v0, 0xcc($s2) -/* 9EBDEC 802405FC 8C420000 */ lw $v0, ($v0) -/* 9EBDF0 80240600 AE020028 */ sw $v0, 0x28($s0) -/* 9EBDF4 80240604 24020003 */ addiu $v0, $zero, 3 -/* 9EBDF8 80240608 AE620070 */ sw $v0, 0x70($s3) -/* 9EBDFC 8024060C 8FBF0020 */ lw $ra, 0x20($sp) -/* 9EBE00 80240610 8FB3001C */ lw $s3, 0x1c($sp) -/* 9EBE04 80240614 8FB20018 */ lw $s2, 0x18($sp) -/* 9EBE08 80240618 8FB10014 */ lw $s1, 0x14($sp) -/* 9EBE0C 8024061C 8FB00010 */ lw $s0, 0x10($sp) -/* 9EBE10 80240620 03E00008 */ jr $ra -/* 9EBE14 80240624 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s index 55a22f6e99..7b835a3d36 100644 --- a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s +++ b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s @@ -105,7 +105,7 @@ glabel func_80240BF0_9EC3E0 /* 9EC568 80240D78 0000102D */ daddu $v0, $zero, $zero /* 9EC56C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 9EC570 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 9EC574 80240D84 0C09015A */ jal func_80240568_9EBD58 +/* 9EC574 80240D84 0C09015A */ jal UnkNpcAIFunc1 /* 9EC578 80240D88 0200302D */ daddu $a2, $s0, $zero /* 9EC57C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 9EC580 80240D90 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240FAC_9F59EC.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240FAC_9F59EC.s deleted file mode 100644 index bf18817f8e..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240FAC_9F59EC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FAC_9F59EC -/* 9F59EC 80240FAC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9F59F0 80240FB0 AFB3001C */ sw $s3, 0x1c($sp) -/* 9F59F4 80240FB4 0080982D */ daddu $s3, $a0, $zero -/* 9F59F8 80240FB8 AFBF0020 */ sw $ra, 0x20($sp) -/* 9F59FC 80240FBC AFB20018 */ sw $s2, 0x18($sp) -/* 9F5A00 80240FC0 AFB10014 */ sw $s1, 0x14($sp) -/* 9F5A04 80240FC4 AFB00010 */ sw $s0, 0x10($sp) -/* 9F5A08 80240FC8 8E720148 */ lw $s2, 0x148($s3) -/* 9F5A0C 80240FCC 86440008 */ lh $a0, 8($s2) -/* 9F5A10 80240FD0 0C00EABB */ jal get_npc_unsafe -/* 9F5A14 80240FD4 00A0882D */ daddu $s1, $a1, $zero -/* 9F5A18 80240FD8 8E240008 */ lw $a0, 8($s1) -/* 9F5A1C 80240FDC 0040802D */ daddu $s0, $v0, $zero -/* 9F5A20 80240FE0 00041FC2 */ srl $v1, $a0, 0x1f -/* 9F5A24 80240FE4 00832021 */ addu $a0, $a0, $v1 -/* 9F5A28 80240FE8 00042043 */ sra $a0, $a0, 1 -/* 9F5A2C 80240FEC 0C00A67F */ jal rand_int -/* 9F5A30 80240FF0 24840001 */ addiu $a0, $a0, 1 -/* 9F5A34 80240FF4 8E230008 */ lw $v1, 8($s1) -/* 9F5A38 80240FF8 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9F5A3C 80240FFC 00032FC2 */ srl $a1, $v1, 0x1f -/* 9F5A40 80241000 00651821 */ addu $v1, $v1, $a1 -/* 9F5A44 80241004 00031843 */ sra $v1, $v1, 1 -/* 9F5A48 80241008 00621821 */ addu $v1, $v1, $v0 -/* 9F5A4C 8024100C 0C00A67F */ jal rand_int -/* 9F5A50 80241010 A603008E */ sh $v1, 0x8e($s0) -/* 9F5A54 80241014 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9F5A58 80241018 44820000 */ mtc1 $v0, $f0 -/* 9F5A5C 8024101C 00000000 */ nop -/* 9F5A60 80241020 46800020 */ cvt.s.w $f0, $f0 -/* 9F5A64 80241024 46006300 */ add.s $f12, $f12, $f0 -/* 9F5A68 80241028 3C0142B4 */ lui $at, 0x42b4 -/* 9F5A6C 8024102C 44810000 */ mtc1 $at, $f0 -/* 9F5A70 80241030 0C00A6C9 */ jal clamp_angle -/* 9F5A74 80241034 46006301 */ sub.s $f12, $f12, $f0 -/* 9F5A78 80241038 E600000C */ swc1 $f0, 0xc($s0) -/* 9F5A7C 8024103C 8E4200CC */ lw $v0, 0xcc($s2) -/* 9F5A80 80241040 8C420000 */ lw $v0, ($v0) -/* 9F5A84 80241044 AE020028 */ sw $v0, 0x28($s0) -/* 9F5A88 80241048 24020003 */ addiu $v0, $zero, 3 -/* 9F5A8C 8024104C AE620070 */ sw $v0, 0x70($s3) -/* 9F5A90 80241050 8FBF0020 */ lw $ra, 0x20($sp) -/* 9F5A94 80241054 8FB3001C */ lw $s3, 0x1c($sp) -/* 9F5A98 80241058 8FB20018 */ lw $s2, 0x18($sp) -/* 9F5A9C 8024105C 8FB10014 */ lw $s1, 0x14($sp) -/* 9F5AA0 80241060 8FB00010 */ lw $s0, 0x10($sp) -/* 9F5AA4 80241064 03E00008 */ jr $ra -/* 9F5AA8 80241068 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s index 6e7f600888..d4194e3736 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s @@ -83,7 +83,7 @@ glabel func_80241AE0_9F6520 /* 9F6650 80241C10 0000102D */ daddu $v0, $zero, $zero /* 9F6654 80241C14 0280202D */ daddu $a0, $s4, $zero /* 9F6658 80241C18 0200282D */ daddu $a1, $s0, $zero -/* 9F665C 80241C1C 0C0903EB */ jal func_80240FAC_9F59EC +/* 9F665C 80241C1C 0C0903EB */ jal UnkNpcAIFunc1 /* 9F6660 80241C20 0260302D */ daddu $a2, $s3, $zero /* 9F6664 80241C24 0280202D */ daddu $a0, $s4, $zero /* 9F6668 80241C28 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241144_9FB934.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241144_9FB934.s deleted file mode 100644 index 661ad56312..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241144_9FB934.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241144_9FB934 -/* 9FB934 80241144 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9FB938 80241148 AFB3001C */ sw $s3, 0x1c($sp) -/* 9FB93C 8024114C 0080982D */ daddu $s3, $a0, $zero -/* 9FB940 80241150 AFBF0020 */ sw $ra, 0x20($sp) -/* 9FB944 80241154 AFB20018 */ sw $s2, 0x18($sp) -/* 9FB948 80241158 AFB10014 */ sw $s1, 0x14($sp) -/* 9FB94C 8024115C AFB00010 */ sw $s0, 0x10($sp) -/* 9FB950 80241160 8E720148 */ lw $s2, 0x148($s3) -/* 9FB954 80241164 86440008 */ lh $a0, 8($s2) -/* 9FB958 80241168 0C00EABB */ jal get_npc_unsafe -/* 9FB95C 8024116C 00A0882D */ daddu $s1, $a1, $zero -/* 9FB960 80241170 8E240008 */ lw $a0, 8($s1) -/* 9FB964 80241174 0040802D */ daddu $s0, $v0, $zero -/* 9FB968 80241178 00041FC2 */ srl $v1, $a0, 0x1f -/* 9FB96C 8024117C 00832021 */ addu $a0, $a0, $v1 -/* 9FB970 80241180 00042043 */ sra $a0, $a0, 1 -/* 9FB974 80241184 0C00A67F */ jal rand_int -/* 9FB978 80241188 24840001 */ addiu $a0, $a0, 1 -/* 9FB97C 8024118C 8E230008 */ lw $v1, 8($s1) -/* 9FB980 80241190 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9FB984 80241194 00032FC2 */ srl $a1, $v1, 0x1f -/* 9FB988 80241198 00651821 */ addu $v1, $v1, $a1 -/* 9FB98C 8024119C 00031843 */ sra $v1, $v1, 1 -/* 9FB990 802411A0 00621821 */ addu $v1, $v1, $v0 -/* 9FB994 802411A4 0C00A67F */ jal rand_int -/* 9FB998 802411A8 A603008E */ sh $v1, 0x8e($s0) -/* 9FB99C 802411AC C60C000C */ lwc1 $f12, 0xc($s0) -/* 9FB9A0 802411B0 44820000 */ mtc1 $v0, $f0 -/* 9FB9A4 802411B4 00000000 */ nop -/* 9FB9A8 802411B8 46800020 */ cvt.s.w $f0, $f0 -/* 9FB9AC 802411BC 46006300 */ add.s $f12, $f12, $f0 -/* 9FB9B0 802411C0 3C0142B4 */ lui $at, 0x42b4 -/* 9FB9B4 802411C4 44810000 */ mtc1 $at, $f0 -/* 9FB9B8 802411C8 0C00A6C9 */ jal clamp_angle -/* 9FB9BC 802411CC 46006301 */ sub.s $f12, $f12, $f0 -/* 9FB9C0 802411D0 E600000C */ swc1 $f0, 0xc($s0) -/* 9FB9C4 802411D4 8E4200CC */ lw $v0, 0xcc($s2) -/* 9FB9C8 802411D8 8C420000 */ lw $v0, ($v0) -/* 9FB9CC 802411DC AE020028 */ sw $v0, 0x28($s0) -/* 9FB9D0 802411E0 24020003 */ addiu $v0, $zero, 3 -/* 9FB9D4 802411E4 AE620070 */ sw $v0, 0x70($s3) -/* 9FB9D8 802411E8 8FBF0020 */ lw $ra, 0x20($sp) -/* 9FB9DC 802411EC 8FB3001C */ lw $s3, 0x1c($sp) -/* 9FB9E0 802411F0 8FB20018 */ lw $s2, 0x18($sp) -/* 9FB9E4 802411F4 8FB10014 */ lw $s1, 0x14($sp) -/* 9FB9E8 802411F8 8FB00010 */ lw $s0, 0x10($sp) -/* 9FB9EC 802411FC 03E00008 */ jr $ra -/* 9FB9F0 80241200 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s index 0d0590e275..379f252e32 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s @@ -141,7 +141,7 @@ glabel func_802418D8_9FC0C8 /* 9FC2D0 80241AE0 00000000 */ nop /* 9FC2D4 80241AE4 0280202D */ daddu $a0, $s4, $zero /* 9FC2D8 80241AE8 0260282D */ daddu $a1, $s3, $zero -/* 9FC2DC 80241AEC 0C090451 */ jal func_80241144_9FB934 +/* 9FC2DC 80241AEC 0C090451 */ jal UnkNpcAIFunc1 /* 9FC2E0 80241AF0 02A0302D */ daddu $a2, $s5, $zero /* 9FC2E4 80241AF4 0280202D */ daddu $a0, $s4, $zero /* 9FC2E8 80241AF8 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s index 5242862212..b39e4bd6e2 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s @@ -153,7 +153,7 @@ glabel func_80241BD4_9FC3C4 /* 9FC5FC 80241E0C 00000000 */ nop /* 9FC600 80241E10 0260202D */ daddu $a0, $s3, $zero /* 9FC604 80241E14 0280282D */ daddu $a1, $s4, $zero -/* 9FC608 80241E18 0C090451 */ jal func_80241144_9FB934 +/* 9FC608 80241E18 0C090451 */ jal UnkNpcAIFunc1 /* 9FC60C 80241E1C 02A0302D */ daddu $a2, $s5, $zero /* 9FC610 80241E20 0260202D */ daddu $a0, $s3, $zero /* 9FC614 80241E24 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240568_A00B68.s b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240568_A00B68.s deleted file mode 100644 index 9cc04efa17..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240568_A00B68.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568_A00B68 -/* A00B68 80240568 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A00B6C 8024056C AFB3001C */ sw $s3, 0x1c($sp) -/* A00B70 80240570 0080982D */ daddu $s3, $a0, $zero -/* A00B74 80240574 AFBF0020 */ sw $ra, 0x20($sp) -/* A00B78 80240578 AFB20018 */ sw $s2, 0x18($sp) -/* A00B7C 8024057C AFB10014 */ sw $s1, 0x14($sp) -/* A00B80 80240580 AFB00010 */ sw $s0, 0x10($sp) -/* A00B84 80240584 8E720148 */ lw $s2, 0x148($s3) -/* A00B88 80240588 86440008 */ lh $a0, 8($s2) -/* A00B8C 8024058C 0C00EABB */ jal get_npc_unsafe -/* A00B90 80240590 00A0882D */ daddu $s1, $a1, $zero -/* A00B94 80240594 8E240008 */ lw $a0, 8($s1) -/* A00B98 80240598 0040802D */ daddu $s0, $v0, $zero -/* A00B9C 8024059C 00041FC2 */ srl $v1, $a0, 0x1f -/* A00BA0 802405A0 00832021 */ addu $a0, $a0, $v1 -/* A00BA4 802405A4 00042043 */ sra $a0, $a0, 1 -/* A00BA8 802405A8 0C00A67F */ jal rand_int -/* A00BAC 802405AC 24840001 */ addiu $a0, $a0, 1 -/* A00BB0 802405B0 8E230008 */ lw $v1, 8($s1) -/* A00BB4 802405B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* A00BB8 802405B8 00032FC2 */ srl $a1, $v1, 0x1f -/* A00BBC 802405BC 00651821 */ addu $v1, $v1, $a1 -/* A00BC0 802405C0 00031843 */ sra $v1, $v1, 1 -/* A00BC4 802405C4 00621821 */ addu $v1, $v1, $v0 -/* A00BC8 802405C8 0C00A67F */ jal rand_int -/* A00BCC 802405CC A603008E */ sh $v1, 0x8e($s0) -/* A00BD0 802405D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* A00BD4 802405D4 44820000 */ mtc1 $v0, $f0 -/* A00BD8 802405D8 00000000 */ nop -/* A00BDC 802405DC 46800020 */ cvt.s.w $f0, $f0 -/* A00BE0 802405E0 46006300 */ add.s $f12, $f12, $f0 -/* A00BE4 802405E4 3C0142B4 */ lui $at, 0x42b4 -/* A00BE8 802405E8 44810000 */ mtc1 $at, $f0 -/* A00BEC 802405EC 0C00A6C9 */ jal clamp_angle -/* A00BF0 802405F0 46006301 */ sub.s $f12, $f12, $f0 -/* A00BF4 802405F4 E600000C */ swc1 $f0, 0xc($s0) -/* A00BF8 802405F8 8E4200CC */ lw $v0, 0xcc($s2) -/* A00BFC 802405FC 8C420000 */ lw $v0, ($v0) -/* A00C00 80240600 AE020028 */ sw $v0, 0x28($s0) -/* A00C04 80240604 24020003 */ addiu $v0, $zero, 3 -/* A00C08 80240608 AE620070 */ sw $v0, 0x70($s3) -/* A00C0C 8024060C 8FBF0020 */ lw $ra, 0x20($sp) -/* A00C10 80240610 8FB3001C */ lw $s3, 0x1c($sp) -/* A00C14 80240614 8FB20018 */ lw $s2, 0x18($sp) -/* A00C18 80240618 8FB10014 */ lw $s1, 0x14($sp) -/* A00C1C 8024061C 8FB00010 */ lw $s0, 0x10($sp) -/* A00C20 80240620 03E00008 */ jr $ra -/* A00C24 80240624 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s index 75b03c6cf9..9d8648fd55 100644 --- a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s +++ b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s @@ -105,7 +105,7 @@ glabel func_80240BF0_A011F0 /* A01378 80240D78 0000102D */ daddu $v0, $zero, $zero /* A0137C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* A01380 80240D80 0280282D */ daddu $a1, $s4, $zero -/* A01384 80240D84 0C09015A */ jal func_80240568_A00B68 +/* A01384 80240D84 0C09015A */ jal UnkNpcAIFunc1 /* A01388 80240D88 0200302D */ daddu $a2, $s0, $zero /* A0138C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* A01390 80240D90 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024116C_A039AC.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024116C_A039AC.s deleted file mode 100644 index 62a602931e..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024116C_A039AC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024116C_A039AC -/* A039AC 8024116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A039B0 80241170 AFB3001C */ sw $s3, 0x1c($sp) -/* A039B4 80241174 0080982D */ daddu $s3, $a0, $zero -/* A039B8 80241178 AFBF0020 */ sw $ra, 0x20($sp) -/* A039BC 8024117C AFB20018 */ sw $s2, 0x18($sp) -/* A039C0 80241180 AFB10014 */ sw $s1, 0x14($sp) -/* A039C4 80241184 AFB00010 */ sw $s0, 0x10($sp) -/* A039C8 80241188 8E720148 */ lw $s2, 0x148($s3) -/* A039CC 8024118C 86440008 */ lh $a0, 8($s2) -/* A039D0 80241190 0C00EABB */ jal get_npc_unsafe -/* A039D4 80241194 00A0882D */ daddu $s1, $a1, $zero -/* A039D8 80241198 8E240008 */ lw $a0, 8($s1) -/* A039DC 8024119C 0040802D */ daddu $s0, $v0, $zero -/* A039E0 802411A0 00041FC2 */ srl $v1, $a0, 0x1f -/* A039E4 802411A4 00832021 */ addu $a0, $a0, $v1 -/* A039E8 802411A8 00042043 */ sra $a0, $a0, 1 -/* A039EC 802411AC 0C00A67F */ jal rand_int -/* A039F0 802411B0 24840001 */ addiu $a0, $a0, 1 -/* A039F4 802411B4 8E230008 */ lw $v1, 8($s1) -/* A039F8 802411B8 240400B4 */ addiu $a0, $zero, 0xb4 -/* A039FC 802411BC 00032FC2 */ srl $a1, $v1, 0x1f -/* A03A00 802411C0 00651821 */ addu $v1, $v1, $a1 -/* A03A04 802411C4 00031843 */ sra $v1, $v1, 1 -/* A03A08 802411C8 00621821 */ addu $v1, $v1, $v0 -/* A03A0C 802411CC 0C00A67F */ jal rand_int -/* A03A10 802411D0 A603008E */ sh $v1, 0x8e($s0) -/* A03A14 802411D4 C60C000C */ lwc1 $f12, 0xc($s0) -/* A03A18 802411D8 44820000 */ mtc1 $v0, $f0 -/* A03A1C 802411DC 00000000 */ nop -/* A03A20 802411E0 46800020 */ cvt.s.w $f0, $f0 -/* A03A24 802411E4 46006300 */ add.s $f12, $f12, $f0 -/* A03A28 802411E8 3C0142B4 */ lui $at, 0x42b4 -/* A03A2C 802411EC 44810000 */ mtc1 $at, $f0 -/* A03A30 802411F0 0C00A6C9 */ jal clamp_angle -/* A03A34 802411F4 46006301 */ sub.s $f12, $f12, $f0 -/* A03A38 802411F8 E600000C */ swc1 $f0, 0xc($s0) -/* A03A3C 802411FC 8E4200CC */ lw $v0, 0xcc($s2) -/* A03A40 80241200 8C420000 */ lw $v0, ($v0) -/* A03A44 80241204 AE020028 */ sw $v0, 0x28($s0) -/* A03A48 80241208 24020003 */ addiu $v0, $zero, 3 -/* A03A4C 8024120C AE620070 */ sw $v0, 0x70($s3) -/* A03A50 80241210 8FBF0020 */ lw $ra, 0x20($sp) -/* A03A54 80241214 8FB3001C */ lw $s3, 0x1c($sp) -/* A03A58 80241218 8FB20018 */ lw $s2, 0x18($sp) -/* A03A5C 8024121C 8FB10014 */ lw $s1, 0x14($sp) -/* A03A60 80241220 8FB00010 */ lw $s0, 0x10($sp) -/* A03A64 80241224 03E00008 */ jr $ra -/* A03A68 80241228 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s index 1369a223d6..864bdd13ba 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s @@ -83,7 +83,7 @@ glabel func_80241CA0_A044E0 /* A04610 80241DD0 0000102D */ daddu $v0, $zero, $zero /* A04614 80241DD4 0280202D */ daddu $a0, $s4, $zero /* A04618 80241DD8 0200282D */ daddu $a1, $s0, $zero -/* A0461C 80241DDC 0C09045B */ jal func_8024116C_A039AC +/* A0461C 80241DDC 0C09045B */ jal UnkNpcAIFunc1 /* A04620 80241DE0 0260302D */ daddu $a2, $s3, $zero /* A04624 80241DE4 0280202D */ daddu $a0, $s4, $zero /* A04628 80241DE8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s index 19bc860e78..c8d926112f 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s @@ -88,7 +88,7 @@ glabel func_802421CC_A04A0C /* A04B50 80242310 0000102D */ daddu $v0, $zero, $zero /* A04B54 80242314 0260202D */ daddu $a0, $s3, $zero /* A04B58 80242318 0200282D */ daddu $a1, $s0, $zero -/* A04B5C 8024231C 0C09045B */ jal func_8024116C_A039AC +/* A04B5C 8024231C 0C09045B */ jal UnkNpcAIFunc1 /* A04B60 80242320 0280302D */ daddu $a2, $s4, $zero /* A04B64 80242324 0260202D */ daddu $a0, $s3, $zero /* A04B68 80242328 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024128C_A0818C.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024128C_A0818C.s deleted file mode 100644 index 808927853c..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024128C_A0818C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024128C_A0818C -/* A0818C 8024128C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A08190 80241290 AFB3001C */ sw $s3, 0x1c($sp) -/* A08194 80241294 0080982D */ daddu $s3, $a0, $zero -/* A08198 80241298 AFBF0020 */ sw $ra, 0x20($sp) -/* A0819C 8024129C AFB20018 */ sw $s2, 0x18($sp) -/* A081A0 802412A0 AFB10014 */ sw $s1, 0x14($sp) -/* A081A4 802412A4 AFB00010 */ sw $s0, 0x10($sp) -/* A081A8 802412A8 8E720148 */ lw $s2, 0x148($s3) -/* A081AC 802412AC 86440008 */ lh $a0, 8($s2) -/* A081B0 802412B0 0C00EABB */ jal get_npc_unsafe -/* A081B4 802412B4 00A0882D */ daddu $s1, $a1, $zero -/* A081B8 802412B8 8E240008 */ lw $a0, 8($s1) -/* A081BC 802412BC 0040802D */ daddu $s0, $v0, $zero -/* A081C0 802412C0 00041FC2 */ srl $v1, $a0, 0x1f -/* A081C4 802412C4 00832021 */ addu $a0, $a0, $v1 -/* A081C8 802412C8 00042043 */ sra $a0, $a0, 1 -/* A081CC 802412CC 0C00A67F */ jal rand_int -/* A081D0 802412D0 24840001 */ addiu $a0, $a0, 1 -/* A081D4 802412D4 8E230008 */ lw $v1, 8($s1) -/* A081D8 802412D8 240400B4 */ addiu $a0, $zero, 0xb4 -/* A081DC 802412DC 00032FC2 */ srl $a1, $v1, 0x1f -/* A081E0 802412E0 00651821 */ addu $v1, $v1, $a1 -/* A081E4 802412E4 00031843 */ sra $v1, $v1, 1 -/* A081E8 802412E8 00621821 */ addu $v1, $v1, $v0 -/* A081EC 802412EC 0C00A67F */ jal rand_int -/* A081F0 802412F0 A603008E */ sh $v1, 0x8e($s0) -/* A081F4 802412F4 C60C000C */ lwc1 $f12, 0xc($s0) -/* A081F8 802412F8 44820000 */ mtc1 $v0, $f0 -/* A081FC 802412FC 00000000 */ nop -/* A08200 80241300 46800020 */ cvt.s.w $f0, $f0 -/* A08204 80241304 46006300 */ add.s $f12, $f12, $f0 -/* A08208 80241308 3C0142B4 */ lui $at, 0x42b4 -/* A0820C 8024130C 44810000 */ mtc1 $at, $f0 -/* A08210 80241310 0C00A6C9 */ jal clamp_angle -/* A08214 80241314 46006301 */ sub.s $f12, $f12, $f0 -/* A08218 80241318 E600000C */ swc1 $f0, 0xc($s0) -/* A0821C 8024131C 8E4200CC */ lw $v0, 0xcc($s2) -/* A08220 80241320 8C420000 */ lw $v0, ($v0) -/* A08224 80241324 AE020028 */ sw $v0, 0x28($s0) -/* A08228 80241328 24020003 */ addiu $v0, $zero, 3 -/* A0822C 8024132C AE620070 */ sw $v0, 0x70($s3) -/* A08230 80241330 8FBF0020 */ lw $ra, 0x20($sp) -/* A08234 80241334 8FB3001C */ lw $s3, 0x1c($sp) -/* A08238 80241338 8FB20018 */ lw $s2, 0x18($sp) -/* A0823C 8024133C 8FB10014 */ lw $s1, 0x14($sp) -/* A08240 80241340 8FB00010 */ lw $s0, 0x10($sp) -/* A08244 80241344 03E00008 */ jr $ra -/* A08248 80241348 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s index 3e90afdc4b..6caa7d6db5 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s @@ -83,7 +83,7 @@ glabel func_80241DC0_A08CC0 /* A08DF0 80241EF0 0000102D */ daddu $v0, $zero, $zero /* A08DF4 80241EF4 0280202D */ daddu $a0, $s4, $zero /* A08DF8 80241EF8 0200282D */ daddu $a1, $s0, $zero -/* A08DFC 80241EFC 0C0904A3 */ jal func_8024128C_A0818C +/* A08DFC 80241EFC 0C0904A3 */ jal UnkNpcAIFunc1 /* A08E00 80241F00 0260302D */ daddu $a2, $s3, $zero /* A08E04 80241F04 0280202D */ daddu $a0, $s4, $zero /* A08E08 80241F08 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s index 9c6f0d252b..dd76dbfda5 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s @@ -88,7 +88,7 @@ glabel func_802422EC_A091EC /* A09330 80242430 0000102D */ daddu $v0, $zero, $zero /* A09334 80242434 0260202D */ daddu $a0, $s3, $zero /* A09338 80242438 0200282D */ daddu $a1, $s0, $zero -/* A0933C 8024243C 0C0904A3 */ jal func_8024128C_A0818C +/* A0933C 8024243C 0C0904A3 */ jal UnkNpcAIFunc1 /* A09340 80242440 0280302D */ daddu $a2, $s4, $zero /* A09344 80242444 0260202D */ daddu $a0, $s3, $zero /* A09348 80242448 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240B78_DADF78.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240B78_DADF78.s deleted file mode 100644 index 7a4d79f352..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240B78_DADF78.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B78_DADF78 -/* DADF78 80240B78 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DADF7C 80240B7C AFB3001C */ sw $s3, 0x1c($sp) -/* DADF80 80240B80 0080982D */ daddu $s3, $a0, $zero -/* DADF84 80240B84 AFBF0020 */ sw $ra, 0x20($sp) -/* DADF88 80240B88 AFB20018 */ sw $s2, 0x18($sp) -/* DADF8C 80240B8C AFB10014 */ sw $s1, 0x14($sp) -/* DADF90 80240B90 AFB00010 */ sw $s0, 0x10($sp) -/* DADF94 80240B94 8E720148 */ lw $s2, 0x148($s3) -/* DADF98 80240B98 86440008 */ lh $a0, 8($s2) -/* DADF9C 80240B9C 0C00EABB */ jal get_npc_unsafe -/* DADFA0 80240BA0 00A0882D */ daddu $s1, $a1, $zero -/* DADFA4 80240BA4 8E240008 */ lw $a0, 8($s1) -/* DADFA8 80240BA8 0040802D */ daddu $s0, $v0, $zero -/* DADFAC 80240BAC 00041FC2 */ srl $v1, $a0, 0x1f -/* DADFB0 80240BB0 00832021 */ addu $a0, $a0, $v1 -/* DADFB4 80240BB4 00042043 */ sra $a0, $a0, 1 -/* DADFB8 80240BB8 0C00A67F */ jal rand_int -/* DADFBC 80240BBC 24840001 */ addiu $a0, $a0, 1 -/* DADFC0 80240BC0 8E230008 */ lw $v1, 8($s1) -/* DADFC4 80240BC4 240400B4 */ addiu $a0, $zero, 0xb4 -/* DADFC8 80240BC8 00032FC2 */ srl $a1, $v1, 0x1f -/* DADFCC 80240BCC 00651821 */ addu $v1, $v1, $a1 -/* DADFD0 80240BD0 00031843 */ sra $v1, $v1, 1 -/* DADFD4 80240BD4 00621821 */ addu $v1, $v1, $v0 -/* DADFD8 80240BD8 0C00A67F */ jal rand_int -/* DADFDC 80240BDC A603008E */ sh $v1, 0x8e($s0) -/* DADFE0 80240BE0 C60C000C */ lwc1 $f12, 0xc($s0) -/* DADFE4 80240BE4 44820000 */ mtc1 $v0, $f0 -/* DADFE8 80240BE8 00000000 */ nop -/* DADFEC 80240BEC 46800020 */ cvt.s.w $f0, $f0 -/* DADFF0 80240BF0 46006300 */ add.s $f12, $f12, $f0 -/* DADFF4 80240BF4 3C0142B4 */ lui $at, 0x42b4 -/* DADFF8 80240BF8 44810000 */ mtc1 $at, $f0 -/* DADFFC 80240BFC 0C00A6C9 */ jal clamp_angle -/* DAE000 80240C00 46006301 */ sub.s $f12, $f12, $f0 -/* DAE004 80240C04 E600000C */ swc1 $f0, 0xc($s0) -/* DAE008 80240C08 8E4200CC */ lw $v0, 0xcc($s2) -/* DAE00C 80240C0C 8C420000 */ lw $v0, ($v0) -/* DAE010 80240C10 AE020028 */ sw $v0, 0x28($s0) -/* DAE014 80240C14 24020003 */ addiu $v0, $zero, 3 -/* DAE018 80240C18 AE620070 */ sw $v0, 0x70($s3) -/* DAE01C 80240C1C 8FBF0020 */ lw $ra, 0x20($sp) -/* DAE020 80240C20 8FB3001C */ lw $s3, 0x1c($sp) -/* DAE024 80240C24 8FB20018 */ lw $s2, 0x18($sp) -/* DAE028 80240C28 8FB10014 */ lw $s1, 0x14($sp) -/* DAE02C 80240C2C 8FB00010 */ lw $s0, 0x10($sp) -/* DAE030 80240C30 03E00008 */ jr $ra -/* DAE034 80240C34 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s index c2cc66c093..ddf06ed8a0 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s @@ -83,7 +83,7 @@ glabel func_802416AC_DAEAAC /* DAEBDC 802417DC 0000102D */ daddu $v0, $zero, $zero /* DAEBE0 802417E0 0280202D */ daddu $a0, $s4, $zero /* DAEBE4 802417E4 0200282D */ daddu $a1, $s0, $zero -/* DAEBE8 802417E8 0C0902DE */ jal func_80240B78_DADF78 +/* DAEBE8 802417E8 0C0902DE */ jal UnkNpcAIFunc1 /* DAEBEC 802417EC 0260302D */ daddu $a2, $s3, $zero /* DAEBF0 802417F0 0280202D */ daddu $a0, $s4, $zero /* DAEBF4 802417F4 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_8024122C_DB34EC.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_8024122C_DB34EC.s deleted file mode 100644 index 7b754499ce..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_8024122C_DB34EC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024122C_DB34EC -/* DB34EC 8024122C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DB34F0 80241230 AFB3001C */ sw $s3, 0x1c($sp) -/* DB34F4 80241234 0080982D */ daddu $s3, $a0, $zero -/* DB34F8 80241238 AFBF0020 */ sw $ra, 0x20($sp) -/* DB34FC 8024123C AFB20018 */ sw $s2, 0x18($sp) -/* DB3500 80241240 AFB10014 */ sw $s1, 0x14($sp) -/* DB3504 80241244 AFB00010 */ sw $s0, 0x10($sp) -/* DB3508 80241248 8E720148 */ lw $s2, 0x148($s3) -/* DB350C 8024124C 86440008 */ lh $a0, 8($s2) -/* DB3510 80241250 0C00EABB */ jal get_npc_unsafe -/* DB3514 80241254 00A0882D */ daddu $s1, $a1, $zero -/* DB3518 80241258 8E240008 */ lw $a0, 8($s1) -/* DB351C 8024125C 0040802D */ daddu $s0, $v0, $zero -/* DB3520 80241260 00041FC2 */ srl $v1, $a0, 0x1f -/* DB3524 80241264 00832021 */ addu $a0, $a0, $v1 -/* DB3528 80241268 00042043 */ sra $a0, $a0, 1 -/* DB352C 8024126C 0C00A67F */ jal rand_int -/* DB3530 80241270 24840001 */ addiu $a0, $a0, 1 -/* DB3534 80241274 8E230008 */ lw $v1, 8($s1) -/* DB3538 80241278 240400B4 */ addiu $a0, $zero, 0xb4 -/* DB353C 8024127C 00032FC2 */ srl $a1, $v1, 0x1f -/* DB3540 80241280 00651821 */ addu $v1, $v1, $a1 -/* DB3544 80241284 00031843 */ sra $v1, $v1, 1 -/* DB3548 80241288 00621821 */ addu $v1, $v1, $v0 -/* DB354C 8024128C 0C00A67F */ jal rand_int -/* DB3550 80241290 A603008E */ sh $v1, 0x8e($s0) -/* DB3554 80241294 C60C000C */ lwc1 $f12, 0xc($s0) -/* DB3558 80241298 44820000 */ mtc1 $v0, $f0 -/* DB355C 8024129C 00000000 */ nop -/* DB3560 802412A0 46800020 */ cvt.s.w $f0, $f0 -/* DB3564 802412A4 46006300 */ add.s $f12, $f12, $f0 -/* DB3568 802412A8 3C0142B4 */ lui $at, 0x42b4 -/* DB356C 802412AC 44810000 */ mtc1 $at, $f0 -/* DB3570 802412B0 0C00A6C9 */ jal clamp_angle -/* DB3574 802412B4 46006301 */ sub.s $f12, $f12, $f0 -/* DB3578 802412B8 E600000C */ swc1 $f0, 0xc($s0) -/* DB357C 802412BC 8E4200CC */ lw $v0, 0xcc($s2) -/* DB3580 802412C0 8C420000 */ lw $v0, ($v0) -/* DB3584 802412C4 AE020028 */ sw $v0, 0x28($s0) -/* DB3588 802412C8 24020003 */ addiu $v0, $zero, 3 -/* DB358C 802412CC AE620070 */ sw $v0, 0x70($s3) -/* DB3590 802412D0 8FBF0020 */ lw $ra, 0x20($sp) -/* DB3594 802412D4 8FB3001C */ lw $s3, 0x1c($sp) -/* DB3598 802412D8 8FB20018 */ lw $s2, 0x18($sp) -/* DB359C 802412DC 8FB10014 */ lw $s1, 0x14($sp) -/* DB35A0 802412E0 8FB00010 */ lw $s0, 0x10($sp) -/* DB35A4 802412E4 03E00008 */ jr $ra -/* DB35A8 802412E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s index be38ea0d45..45d65e20dc 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s @@ -83,7 +83,7 @@ glabel func_80241D60_DB4020 /* DB4150 80241E90 0000102D */ daddu $v0, $zero, $zero /* DB4154 80241E94 0280202D */ daddu $a0, $s4, $zero /* DB4158 80241E98 0200282D */ daddu $a1, $s0, $zero -/* DB415C 80241E9C 0C09048B */ jal func_8024122C_DB34EC +/* DB415C 80241E9C 0C09048B */ jal UnkNpcAIFunc1 /* DB4160 80241EA0 0260302D */ daddu $a2, $s3, $zero /* DB4164 80241EA4 0280202D */ daddu $a0, $s4, $zero /* DB4168 80241EA8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024096C_DBDC1C.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024096C_DBDC1C.s deleted file mode 100644 index 1fd4d54aeb..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024096C_DBDC1C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024096C_DBDC1C -/* DBDC1C 8024096C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DBDC20 80240970 AFB3001C */ sw $s3, 0x1c($sp) -/* DBDC24 80240974 0080982D */ daddu $s3, $a0, $zero -/* DBDC28 80240978 AFBF0020 */ sw $ra, 0x20($sp) -/* DBDC2C 8024097C AFB20018 */ sw $s2, 0x18($sp) -/* DBDC30 80240980 AFB10014 */ sw $s1, 0x14($sp) -/* DBDC34 80240984 AFB00010 */ sw $s0, 0x10($sp) -/* DBDC38 80240988 8E720148 */ lw $s2, 0x148($s3) -/* DBDC3C 8024098C 86440008 */ lh $a0, 8($s2) -/* DBDC40 80240990 0C00EABB */ jal get_npc_unsafe -/* DBDC44 80240994 00A0882D */ daddu $s1, $a1, $zero -/* DBDC48 80240998 8E240008 */ lw $a0, 8($s1) -/* DBDC4C 8024099C 0040802D */ daddu $s0, $v0, $zero -/* DBDC50 802409A0 00041FC2 */ srl $v1, $a0, 0x1f -/* DBDC54 802409A4 00832021 */ addu $a0, $a0, $v1 -/* DBDC58 802409A8 00042043 */ sra $a0, $a0, 1 -/* DBDC5C 802409AC 0C00A67F */ jal rand_int -/* DBDC60 802409B0 24840001 */ addiu $a0, $a0, 1 -/* DBDC64 802409B4 8E230008 */ lw $v1, 8($s1) -/* DBDC68 802409B8 240400B4 */ addiu $a0, $zero, 0xb4 -/* DBDC6C 802409BC 00032FC2 */ srl $a1, $v1, 0x1f -/* DBDC70 802409C0 00651821 */ addu $v1, $v1, $a1 -/* DBDC74 802409C4 00031843 */ sra $v1, $v1, 1 -/* DBDC78 802409C8 00621821 */ addu $v1, $v1, $v0 -/* DBDC7C 802409CC 0C00A67F */ jal rand_int -/* DBDC80 802409D0 A603008E */ sh $v1, 0x8e($s0) -/* DBDC84 802409D4 C60C000C */ lwc1 $f12, 0xc($s0) -/* DBDC88 802409D8 44820000 */ mtc1 $v0, $f0 -/* DBDC8C 802409DC 00000000 */ nop -/* DBDC90 802409E0 46800020 */ cvt.s.w $f0, $f0 -/* DBDC94 802409E4 46006300 */ add.s $f12, $f12, $f0 -/* DBDC98 802409E8 3C0142B4 */ lui $at, 0x42b4 -/* DBDC9C 802409EC 44810000 */ mtc1 $at, $f0 -/* DBDCA0 802409F0 0C00A6C9 */ jal clamp_angle -/* DBDCA4 802409F4 46006301 */ sub.s $f12, $f12, $f0 -/* DBDCA8 802409F8 E600000C */ swc1 $f0, 0xc($s0) -/* DBDCAC 802409FC 8E4200CC */ lw $v0, 0xcc($s2) -/* DBDCB0 80240A00 8C420000 */ lw $v0, ($v0) -/* DBDCB4 80240A04 AE020028 */ sw $v0, 0x28($s0) -/* DBDCB8 80240A08 24020003 */ addiu $v0, $zero, 3 -/* DBDCBC 80240A0C AE620070 */ sw $v0, 0x70($s3) -/* DBDCC0 80240A10 8FBF0020 */ lw $ra, 0x20($sp) -/* DBDCC4 80240A14 8FB3001C */ lw $s3, 0x1c($sp) -/* DBDCC8 80240A18 8FB20018 */ lw $s2, 0x18($sp) -/* DBDCCC 80240A1C 8FB10014 */ lw $s1, 0x14($sp) -/* DBDCD0 80240A20 8FB00010 */ lw $s0, 0x10($sp) -/* DBDCD4 80240A24 03E00008 */ jr $ra -/* DBDCD8 80240A28 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s index 2552222db7..c0b3c23372 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s @@ -141,7 +141,7 @@ glabel func_80241100_DBE3B0 /* DBE5B8 80241308 00000000 */ nop /* DBE5BC 8024130C 0280202D */ daddu $a0, $s4, $zero /* DBE5C0 80241310 0260282D */ daddu $a1, $s3, $zero -/* DBE5C4 80241314 0C09025B */ jal func_8024096C_DBDC1C +/* DBE5C4 80241314 0C09025B */ jal UnkNpcAIFunc1 /* DBE5C8 80241318 02A0302D */ daddu $a2, $s5, $zero /* DBE5CC 8024131C 0280202D */ daddu $a0, $s4, $zero /* DBE5D0 80241320 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s index 0555f0e4a1..57c4af48bd 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s @@ -141,7 +141,7 @@ glabel func_80241634_DBE8E4 /* DBEAEC 8024183C 00000000 */ nop /* DBEAF0 80241840 0260202D */ daddu $a0, $s3, $zero /* DBEAF4 80241844 0280282D */ daddu $a1, $s4, $zero -/* DBEAF8 80241848 0C09025B */ jal func_8024096C_DBDC1C +/* DBEAF8 80241848 0C09025B */ jal UnkNpcAIFunc1 /* DBEAFC 8024184C 02A0302D */ daddu $a2, $s5, $zero /* DBEB00 80241850 0260202D */ daddu $a0, $s3, $zero /* DBEB04 80241854 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024134C_DCE01C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024134C_DCE01C.s deleted file mode 100644 index 3c6d2aba76..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024134C_DCE01C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024134C_DCE01C -/* DCE01C 8024134C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DCE020 80241350 AFB3001C */ sw $s3, 0x1c($sp) -/* DCE024 80241354 0080982D */ daddu $s3, $a0, $zero -/* DCE028 80241358 AFBF0020 */ sw $ra, 0x20($sp) -/* DCE02C 8024135C AFB20018 */ sw $s2, 0x18($sp) -/* DCE030 80241360 AFB10014 */ sw $s1, 0x14($sp) -/* DCE034 80241364 AFB00010 */ sw $s0, 0x10($sp) -/* DCE038 80241368 8E720148 */ lw $s2, 0x148($s3) -/* DCE03C 8024136C 86440008 */ lh $a0, 8($s2) -/* DCE040 80241370 0C00EABB */ jal get_npc_unsafe -/* DCE044 80241374 00A0882D */ daddu $s1, $a1, $zero -/* DCE048 80241378 8E240008 */ lw $a0, 8($s1) -/* DCE04C 8024137C 0040802D */ daddu $s0, $v0, $zero -/* DCE050 80241380 00041FC2 */ srl $v1, $a0, 0x1f -/* DCE054 80241384 00832021 */ addu $a0, $a0, $v1 -/* DCE058 80241388 00042043 */ sra $a0, $a0, 1 -/* DCE05C 8024138C 0C00A67F */ jal rand_int -/* DCE060 80241390 24840001 */ addiu $a0, $a0, 1 -/* DCE064 80241394 8E230008 */ lw $v1, 8($s1) -/* DCE068 80241398 240400B4 */ addiu $a0, $zero, 0xb4 -/* DCE06C 8024139C 00032FC2 */ srl $a1, $v1, 0x1f -/* DCE070 802413A0 00651821 */ addu $v1, $v1, $a1 -/* DCE074 802413A4 00031843 */ sra $v1, $v1, 1 -/* DCE078 802413A8 00621821 */ addu $v1, $v1, $v0 -/* DCE07C 802413AC 0C00A67F */ jal rand_int -/* DCE080 802413B0 A603008E */ sh $v1, 0x8e($s0) -/* DCE084 802413B4 C60C000C */ lwc1 $f12, 0xc($s0) -/* DCE088 802413B8 44820000 */ mtc1 $v0, $f0 -/* DCE08C 802413BC 00000000 */ nop -/* DCE090 802413C0 46800020 */ cvt.s.w $f0, $f0 -/* DCE094 802413C4 46006300 */ add.s $f12, $f12, $f0 -/* DCE098 802413C8 3C0142B4 */ lui $at, 0x42b4 -/* DCE09C 802413CC 44810000 */ mtc1 $at, $f0 -/* DCE0A0 802413D0 0C00A6C9 */ jal clamp_angle -/* DCE0A4 802413D4 46006301 */ sub.s $f12, $f12, $f0 -/* DCE0A8 802413D8 E600000C */ swc1 $f0, 0xc($s0) -/* DCE0AC 802413DC 8E4200CC */ lw $v0, 0xcc($s2) -/* DCE0B0 802413E0 8C420000 */ lw $v0, ($v0) -/* DCE0B4 802413E4 AE020028 */ sw $v0, 0x28($s0) -/* DCE0B8 802413E8 24020003 */ addiu $v0, $zero, 3 -/* DCE0BC 802413EC AE620070 */ sw $v0, 0x70($s3) -/* DCE0C0 802413F0 8FBF0020 */ lw $ra, 0x20($sp) -/* DCE0C4 802413F4 8FB3001C */ lw $s3, 0x1c($sp) -/* DCE0C8 802413F8 8FB20018 */ lw $s2, 0x18($sp) -/* DCE0CC 802413FC 8FB10014 */ lw $s1, 0x14($sp) -/* DCE0D0 80241400 8FB00010 */ lw $s0, 0x10($sp) -/* DCE0D4 80241404 03E00008 */ jr $ra -/* DCE0D8 80241408 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s index b96af05373..4486b65964 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s @@ -141,7 +141,7 @@ glabel func_80241AE0_DCE7B0 /* DCE9B8 80241CE8 00000000 */ nop /* DCE9BC 80241CEC 0280202D */ daddu $a0, $s4, $zero /* DCE9C0 80241CF0 0260282D */ daddu $a1, $s3, $zero -/* DCE9C4 80241CF4 0C0904D3 */ jal func_8024134C_DCE01C +/* DCE9C4 80241CF4 0C0904D3 */ jal UnkNpcAIFunc1 /* DCE9C8 80241CF8 02A0302D */ daddu $a2, $s5, $zero /* DCE9CC 80241CFC 0280202D */ daddu $a0, $s4, $zero /* DCE9D0 80241D00 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s index 0ed26c1877..2361334362 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s @@ -141,7 +141,7 @@ glabel func_80242014_DCECE4 /* DCEEEC 8024221C 00000000 */ nop /* DCEEF0 80242220 0260202D */ daddu $a0, $s3, $zero /* DCEEF4 80242224 0280282D */ daddu $a1, $s4, $zero -/* DCEEF8 80242228 0C0904D3 */ jal func_8024134C_DCE01C +/* DCEEF8 80242228 0C0904D3 */ jal UnkNpcAIFunc1 /* DCEEFC 8024222C 02A0302D */ daddu $a2, $s5, $zero /* DCEF00 80242230 0260202D */ daddu $a0, $s3, $zero /* DCEF04 80242234 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024178C_DF062C.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024178C_DF062C.s deleted file mode 100644 index 1fa9a42b98..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024178C_DF062C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024178C_DF062C -/* DF062C 8024178C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DF0630 80241790 AFB3001C */ sw $s3, 0x1c($sp) -/* DF0634 80241794 0080982D */ daddu $s3, $a0, $zero -/* DF0638 80241798 AFBF0020 */ sw $ra, 0x20($sp) -/* DF063C 8024179C AFB20018 */ sw $s2, 0x18($sp) -/* DF0640 802417A0 AFB10014 */ sw $s1, 0x14($sp) -/* DF0644 802417A4 AFB00010 */ sw $s0, 0x10($sp) -/* DF0648 802417A8 8E720148 */ lw $s2, 0x148($s3) -/* DF064C 802417AC 86440008 */ lh $a0, 8($s2) -/* DF0650 802417B0 0C00EABB */ jal get_npc_unsafe -/* DF0654 802417B4 00A0882D */ daddu $s1, $a1, $zero -/* DF0658 802417B8 8E240008 */ lw $a0, 8($s1) -/* DF065C 802417BC 0040802D */ daddu $s0, $v0, $zero -/* DF0660 802417C0 00041FC2 */ srl $v1, $a0, 0x1f -/* DF0664 802417C4 00832021 */ addu $a0, $a0, $v1 -/* DF0668 802417C8 00042043 */ sra $a0, $a0, 1 -/* DF066C 802417CC 0C00A67F */ jal rand_int -/* DF0670 802417D0 24840001 */ addiu $a0, $a0, 1 -/* DF0674 802417D4 8E230008 */ lw $v1, 8($s1) -/* DF0678 802417D8 240400B4 */ addiu $a0, $zero, 0xb4 -/* DF067C 802417DC 00032FC2 */ srl $a1, $v1, 0x1f -/* DF0680 802417E0 00651821 */ addu $v1, $v1, $a1 -/* DF0684 802417E4 00031843 */ sra $v1, $v1, 1 -/* DF0688 802417E8 00621821 */ addu $v1, $v1, $v0 -/* DF068C 802417EC 0C00A67F */ jal rand_int -/* DF0690 802417F0 A603008E */ sh $v1, 0x8e($s0) -/* DF0694 802417F4 C60C000C */ lwc1 $f12, 0xc($s0) -/* DF0698 802417F8 44820000 */ mtc1 $v0, $f0 -/* DF069C 802417FC 00000000 */ nop -/* DF06A0 80241800 46800020 */ cvt.s.w $f0, $f0 -/* DF06A4 80241804 46006300 */ add.s $f12, $f12, $f0 -/* DF06A8 80241808 3C0142B4 */ lui $at, 0x42b4 -/* DF06AC 8024180C 44810000 */ mtc1 $at, $f0 -/* DF06B0 80241810 0C00A6C9 */ jal clamp_angle -/* DF06B4 80241814 46006301 */ sub.s $f12, $f12, $f0 -/* DF06B8 80241818 E600000C */ swc1 $f0, 0xc($s0) -/* DF06BC 8024181C 8E4200CC */ lw $v0, 0xcc($s2) -/* DF06C0 80241820 8C420000 */ lw $v0, ($v0) -/* DF06C4 80241824 AE020028 */ sw $v0, 0x28($s0) -/* DF06C8 80241828 24020003 */ addiu $v0, $zero, 3 -/* DF06CC 8024182C AE620070 */ sw $v0, 0x70($s3) -/* DF06D0 80241830 8FBF0020 */ lw $ra, 0x20($sp) -/* DF06D4 80241834 8FB3001C */ lw $s3, 0x1c($sp) -/* DF06D8 80241838 8FB20018 */ lw $s2, 0x18($sp) -/* DF06DC 8024183C 8FB10014 */ lw $s1, 0x14($sp) -/* DF06E0 80241840 8FB00010 */ lw $s0, 0x10($sp) -/* DF06E4 80241844 03E00008 */ jr $ra -/* DF06E8 80241848 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s index 32adbed9c2..ddf803df36 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s @@ -83,7 +83,7 @@ glabel func_802422C0_DF1160 /* DF1290 802423F0 0000102D */ daddu $v0, $zero, $zero /* DF1294 802423F4 0280202D */ daddu $a0, $s4, $zero /* DF1298 802423F8 0200282D */ daddu $a1, $s0, $zero -/* DF129C 802423FC 0C0905E3 */ jal func_8024178C_DF062C +/* DF129C 802423FC 0C0905E3 */ jal UnkNpcAIFunc1 /* DF12A0 80242400 0260302D */ daddu $a2, $s3, $zero /* DF12A4 80242404 0280202D */ daddu $a0, $s4, $zero /* DF12A8 80242408 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241320_D8E570.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241320_D8E570.s deleted file mode 100644 index aed6642c59..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241320_D8E570.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241320_D8E570 -/* D8E570 80241320 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D8E574 80241324 AFB3001C */ sw $s3, 0x1c($sp) -/* D8E578 80241328 0080982D */ daddu $s3, $a0, $zero -/* D8E57C 8024132C AFBF0020 */ sw $ra, 0x20($sp) -/* D8E580 80241330 AFB20018 */ sw $s2, 0x18($sp) -/* D8E584 80241334 AFB10014 */ sw $s1, 0x14($sp) -/* D8E588 80241338 AFB00010 */ sw $s0, 0x10($sp) -/* D8E58C 8024133C 8E720148 */ lw $s2, 0x148($s3) -/* D8E590 80241340 86440008 */ lh $a0, 8($s2) -/* D8E594 80241344 0C00EABB */ jal get_npc_unsafe -/* D8E598 80241348 00A0882D */ daddu $s1, $a1, $zero -/* D8E59C 8024134C 8E240008 */ lw $a0, 8($s1) -/* D8E5A0 80241350 0040802D */ daddu $s0, $v0, $zero -/* D8E5A4 80241354 00041FC2 */ srl $v1, $a0, 0x1f -/* D8E5A8 80241358 00832021 */ addu $a0, $a0, $v1 -/* D8E5AC 8024135C 00042043 */ sra $a0, $a0, 1 -/* D8E5B0 80241360 0C00A67F */ jal rand_int -/* D8E5B4 80241364 24840001 */ addiu $a0, $a0, 1 -/* D8E5B8 80241368 8E230008 */ lw $v1, 8($s1) -/* D8E5BC 8024136C 240400B4 */ addiu $a0, $zero, 0xb4 -/* D8E5C0 80241370 00032FC2 */ srl $a1, $v1, 0x1f -/* D8E5C4 80241374 00651821 */ addu $v1, $v1, $a1 -/* D8E5C8 80241378 00031843 */ sra $v1, $v1, 1 -/* D8E5CC 8024137C 00621821 */ addu $v1, $v1, $v0 -/* D8E5D0 80241380 0C00A67F */ jal rand_int -/* D8E5D4 80241384 A603008E */ sh $v1, 0x8e($s0) -/* D8E5D8 80241388 C60C000C */ lwc1 $f12, 0xc($s0) -/* D8E5DC 8024138C 44820000 */ mtc1 $v0, $f0 -/* D8E5E0 80241390 00000000 */ nop -/* D8E5E4 80241394 46800020 */ cvt.s.w $f0, $f0 -/* D8E5E8 80241398 46006300 */ add.s $f12, $f12, $f0 -/* D8E5EC 8024139C 3C0142B4 */ lui $at, 0x42b4 -/* D8E5F0 802413A0 44810000 */ mtc1 $at, $f0 -/* D8E5F4 802413A4 0C00A6C9 */ jal clamp_angle -/* D8E5F8 802413A8 46006301 */ sub.s $f12, $f12, $f0 -/* D8E5FC 802413AC E600000C */ swc1 $f0, 0xc($s0) -/* D8E600 802413B0 8E4200CC */ lw $v0, 0xcc($s2) -/* D8E604 802413B4 8C420000 */ lw $v0, ($v0) -/* D8E608 802413B8 AE020028 */ sw $v0, 0x28($s0) -/* D8E60C 802413BC 24020003 */ addiu $v0, $zero, 3 -/* D8E610 802413C0 AE620070 */ sw $v0, 0x70($s3) -/* D8E614 802413C4 8FBF0020 */ lw $ra, 0x20($sp) -/* D8E618 802413C8 8FB3001C */ lw $s3, 0x1c($sp) -/* D8E61C 802413CC 8FB20018 */ lw $s2, 0x18($sp) -/* D8E620 802413D0 8FB10014 */ lw $s1, 0x14($sp) -/* D8E624 802413D4 8FB00010 */ lw $s0, 0x10($sp) -/* D8E628 802413D8 03E00008 */ jr $ra -/* D8E62C 802413DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s index 69e646a70d..cc57cdbf21 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s @@ -141,7 +141,7 @@ glabel func_80241AB4_D8ED04 /* D8EF0C 80241CBC 00000000 */ nop /* D8EF10 80241CC0 0280202D */ daddu $a0, $s4, $zero /* D8EF14 80241CC4 0260282D */ daddu $a1, $s3, $zero -/* D8EF18 80241CC8 0C0904C8 */ jal func_80241320_D8E570 +/* D8EF18 80241CC8 0C0904C8 */ jal UnkNpcAIFunc1 /* D8EF1C 80241CCC 02A0302D */ daddu $a2, $s5, $zero /* D8EF20 80241CD0 0280202D */ daddu $a0, $s4, $zero /* D8EF24 80241CD4 0260282D */ daddu $a1, $s3, $zero 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 19f3e139ee..4608a73b58 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s @@ -117,7 +117,7 @@ glabel func_802423CC_D8F61C /* D8F7C4 80242574 00000000 */ nop /* D8F7C8 80242578 0240202D */ daddu $a0, $s2, $zero /* D8F7CC 8024257C 0260282D */ daddu $a1, $s3, $zero -/* D8F7D0 80242580 0C0904C8 */ jal func_80241320_D8E570 +/* D8F7D0 80242580 0C0904C8 */ jal UnkNpcAIFunc1 /* D8F7D4 80242584 0280302D */ daddu $a2, $s4, $zero /* D8F7D8 80242588 0240202D */ daddu $a0, $s2, $zero /* D8F7DC 8024258C 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240D28_D20BB8.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240D28_D20BB8.s deleted file mode 100644 index a3d18994b4..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240D28_D20BB8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D28_D20BB8 -/* D20BB8 80240D28 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D20BBC 80240D2C AFB3001C */ sw $s3, 0x1c($sp) -/* D20BC0 80240D30 0080982D */ daddu $s3, $a0, $zero -/* D20BC4 80240D34 AFBF0020 */ sw $ra, 0x20($sp) -/* D20BC8 80240D38 AFB20018 */ sw $s2, 0x18($sp) -/* D20BCC 80240D3C AFB10014 */ sw $s1, 0x14($sp) -/* D20BD0 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D20BD4 80240D44 8E720148 */ lw $s2, 0x148($s3) -/* D20BD8 80240D48 86440008 */ lh $a0, 8($s2) -/* D20BDC 80240D4C 0C00EABB */ jal get_npc_unsafe -/* D20BE0 80240D50 00A0882D */ daddu $s1, $a1, $zero -/* D20BE4 80240D54 8E240008 */ lw $a0, 8($s1) -/* D20BE8 80240D58 0040802D */ daddu $s0, $v0, $zero -/* D20BEC 80240D5C 00041FC2 */ srl $v1, $a0, 0x1f -/* D20BF0 80240D60 00832021 */ addu $a0, $a0, $v1 -/* D20BF4 80240D64 00042043 */ sra $a0, $a0, 1 -/* D20BF8 80240D68 0C00A67F */ jal rand_int -/* D20BFC 80240D6C 24840001 */ addiu $a0, $a0, 1 -/* D20C00 80240D70 8E230008 */ lw $v1, 8($s1) -/* D20C04 80240D74 240400B4 */ addiu $a0, $zero, 0xb4 -/* D20C08 80240D78 00032FC2 */ srl $a1, $v1, 0x1f -/* D20C0C 80240D7C 00651821 */ addu $v1, $v1, $a1 -/* D20C10 80240D80 00031843 */ sra $v1, $v1, 1 -/* D20C14 80240D84 00621821 */ addu $v1, $v1, $v0 -/* D20C18 80240D88 0C00A67F */ jal rand_int -/* D20C1C 80240D8C A603008E */ sh $v1, 0x8e($s0) -/* D20C20 80240D90 C60C000C */ lwc1 $f12, 0xc($s0) -/* D20C24 80240D94 44820000 */ mtc1 $v0, $f0 -/* D20C28 80240D98 00000000 */ nop -/* D20C2C 80240D9C 46800020 */ cvt.s.w $f0, $f0 -/* D20C30 80240DA0 46006300 */ add.s $f12, $f12, $f0 -/* D20C34 80240DA4 3C0142B4 */ lui $at, 0x42b4 -/* D20C38 80240DA8 44810000 */ mtc1 $at, $f0 -/* D20C3C 80240DAC 0C00A6C9 */ jal clamp_angle -/* D20C40 80240DB0 46006301 */ sub.s $f12, $f12, $f0 -/* D20C44 80240DB4 E600000C */ swc1 $f0, 0xc($s0) -/* D20C48 80240DB8 8E4200CC */ lw $v0, 0xcc($s2) -/* D20C4C 80240DBC 8C420000 */ lw $v0, ($v0) -/* D20C50 80240DC0 AE020028 */ sw $v0, 0x28($s0) -/* D20C54 80240DC4 24020003 */ addiu $v0, $zero, 3 -/* D20C58 80240DC8 AE620070 */ sw $v0, 0x70($s3) -/* D20C5C 80240DCC 8FBF0020 */ lw $ra, 0x20($sp) -/* D20C60 80240DD0 8FB3001C */ lw $s3, 0x1c($sp) -/* D20C64 80240DD4 8FB20018 */ lw $s2, 0x18($sp) -/* D20C68 80240DD8 8FB10014 */ lw $s1, 0x14($sp) -/* D20C6C 80240DDC 8FB00010 */ lw $s0, 0x10($sp) -/* D20C70 80240DE0 03E00008 */ jr $ra -/* D20C74 80240DE4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s index 43f5be683c..77844bca49 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s @@ -83,7 +83,7 @@ glabel func_8024185C_D216EC /* D2181C 8024198C 0000102D */ daddu $v0, $zero, $zero /* D21820 80241990 0280202D */ daddu $a0, $s4, $zero /* D21824 80241994 0200282D */ daddu $a1, $s0, $zero -/* D21828 80241998 0C09034A */ jal func_80240D28_D20BB8 +/* D21828 80241998 0C09034A */ jal UnkNpcAIFunc1 /* D2182C 8024199C 0260302D */ daddu $a2, $s3, $zero /* D21830 802419A0 0280202D */ daddu $a0, $s4, $zero /* D21834 802419A4 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241BC8_87B7A8.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241BC8_87B7A8.s deleted file mode 100644 index e1ab7778a5..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241BC8_87B7A8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BC8_87B7A8 -/* 87B7A8 80241BC8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 87B7AC 80241BCC AFB3001C */ sw $s3, 0x1c($sp) -/* 87B7B0 80241BD0 0080982D */ daddu $s3, $a0, $zero -/* 87B7B4 80241BD4 AFBF0020 */ sw $ra, 0x20($sp) -/* 87B7B8 80241BD8 AFB20018 */ sw $s2, 0x18($sp) -/* 87B7BC 80241BDC AFB10014 */ sw $s1, 0x14($sp) -/* 87B7C0 80241BE0 AFB00010 */ sw $s0, 0x10($sp) -/* 87B7C4 80241BE4 8E720148 */ lw $s2, 0x148($s3) -/* 87B7C8 80241BE8 86440008 */ lh $a0, 8($s2) -/* 87B7CC 80241BEC 0C00EABB */ jal get_npc_unsafe -/* 87B7D0 80241BF0 00A0882D */ daddu $s1, $a1, $zero -/* 87B7D4 80241BF4 8E240008 */ lw $a0, 8($s1) -/* 87B7D8 80241BF8 0040802D */ daddu $s0, $v0, $zero -/* 87B7DC 80241BFC 00041FC2 */ srl $v1, $a0, 0x1f -/* 87B7E0 80241C00 00832021 */ addu $a0, $a0, $v1 -/* 87B7E4 80241C04 00042043 */ sra $a0, $a0, 1 -/* 87B7E8 80241C08 0C00A67F */ jal rand_int -/* 87B7EC 80241C0C 24840001 */ addiu $a0, $a0, 1 -/* 87B7F0 80241C10 8E230008 */ lw $v1, 8($s1) -/* 87B7F4 80241C14 240400B4 */ addiu $a0, $zero, 0xb4 -/* 87B7F8 80241C18 00032FC2 */ srl $a1, $v1, 0x1f -/* 87B7FC 80241C1C 00651821 */ addu $v1, $v1, $a1 -/* 87B800 80241C20 00031843 */ sra $v1, $v1, 1 -/* 87B804 80241C24 00621821 */ addu $v1, $v1, $v0 -/* 87B808 80241C28 0C00A67F */ jal rand_int -/* 87B80C 80241C2C A603008E */ sh $v1, 0x8e($s0) -/* 87B810 80241C30 C60C000C */ lwc1 $f12, 0xc($s0) -/* 87B814 80241C34 44820000 */ mtc1 $v0, $f0 -/* 87B818 80241C38 00000000 */ nop -/* 87B81C 80241C3C 46800020 */ cvt.s.w $f0, $f0 -/* 87B820 80241C40 46006300 */ add.s $f12, $f12, $f0 -/* 87B824 80241C44 3C0142B4 */ lui $at, 0x42b4 -/* 87B828 80241C48 44810000 */ mtc1 $at, $f0 -/* 87B82C 80241C4C 0C00A6C9 */ jal clamp_angle -/* 87B830 80241C50 46006301 */ sub.s $f12, $f12, $f0 -/* 87B834 80241C54 E600000C */ swc1 $f0, 0xc($s0) -/* 87B838 80241C58 8E4200CC */ lw $v0, 0xcc($s2) -/* 87B83C 80241C5C 8C420000 */ lw $v0, ($v0) -/* 87B840 80241C60 AE020028 */ sw $v0, 0x28($s0) -/* 87B844 80241C64 24020003 */ addiu $v0, $zero, 3 -/* 87B848 80241C68 AE620070 */ sw $v0, 0x70($s3) -/* 87B84C 80241C6C 8FBF0020 */ lw $ra, 0x20($sp) -/* 87B850 80241C70 8FB3001C */ lw $s3, 0x1c($sp) -/* 87B854 80241C74 8FB20018 */ lw $s2, 0x18($sp) -/* 87B858 80241C78 8FB10014 */ lw $s1, 0x14($sp) -/* 87B85C 80241C7C 8FB00010 */ lw $s0, 0x10($sp) -/* 87B860 80241C80 03E00008 */ jr $ra -/* 87B864 80241C84 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s index 49b86e363e..95a22fd1f3 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s @@ -83,7 +83,7 @@ glabel func_802426FC_87C2DC /* 87C40C 8024282C 0000102D */ daddu $v0, $zero, $zero /* 87C410 80242830 0280202D */ daddu $a0, $s4, $zero /* 87C414 80242834 0200282D */ daddu $a1, $s0, $zero -/* 87C418 80242838 0C0906F2 */ jal func_80241BC8_87B7A8 +/* 87C418 80242838 0C0906F2 */ jal UnkNpcAIFunc1 /* 87C41C 8024283C 0260302D */ daddu $a2, $s3, $zero /* 87C420 80242840 0280202D */ daddu $a0, $s4, $zero /* 87C424 80242844 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240CB4_9A1C94.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240CB4_9A1C94.s deleted file mode 100644 index 6294825fa9..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240CB4_9A1C94.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CB4_9A1C94 -/* 9A1C94 80240CB4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9A1C98 80240CB8 AFB3001C */ sw $s3, 0x1c($sp) -/* 9A1C9C 80240CBC 0080982D */ daddu $s3, $a0, $zero -/* 9A1CA0 80240CC0 AFBF0020 */ sw $ra, 0x20($sp) -/* 9A1CA4 80240CC4 AFB20018 */ sw $s2, 0x18($sp) -/* 9A1CA8 80240CC8 AFB10014 */ sw $s1, 0x14($sp) -/* 9A1CAC 80240CCC AFB00010 */ sw $s0, 0x10($sp) -/* 9A1CB0 80240CD0 8E720148 */ lw $s2, 0x148($s3) -/* 9A1CB4 80240CD4 86440008 */ lh $a0, 8($s2) -/* 9A1CB8 80240CD8 0C00EABB */ jal get_npc_unsafe -/* 9A1CBC 80240CDC 00A0882D */ daddu $s1, $a1, $zero -/* 9A1CC0 80240CE0 8E240008 */ lw $a0, 8($s1) -/* 9A1CC4 80240CE4 0040802D */ daddu $s0, $v0, $zero -/* 9A1CC8 80240CE8 00041FC2 */ srl $v1, $a0, 0x1f -/* 9A1CCC 80240CEC 00832021 */ addu $a0, $a0, $v1 -/* 9A1CD0 80240CF0 00042043 */ sra $a0, $a0, 1 -/* 9A1CD4 80240CF4 0C00A67F */ jal rand_int -/* 9A1CD8 80240CF8 24840001 */ addiu $a0, $a0, 1 -/* 9A1CDC 80240CFC 8E230008 */ lw $v1, 8($s1) -/* 9A1CE0 80240D00 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9A1CE4 80240D04 00032FC2 */ srl $a1, $v1, 0x1f -/* 9A1CE8 80240D08 00651821 */ addu $v1, $v1, $a1 -/* 9A1CEC 80240D0C 00031843 */ sra $v1, $v1, 1 -/* 9A1CF0 80240D10 00621821 */ addu $v1, $v1, $v0 -/* 9A1CF4 80240D14 0C00A67F */ jal rand_int -/* 9A1CF8 80240D18 A603008E */ sh $v1, 0x8e($s0) -/* 9A1CFC 80240D1C C60C000C */ lwc1 $f12, 0xc($s0) -/* 9A1D00 80240D20 44820000 */ mtc1 $v0, $f0 -/* 9A1D04 80240D24 00000000 */ nop -/* 9A1D08 80240D28 46800020 */ cvt.s.w $f0, $f0 -/* 9A1D0C 80240D2C 46006300 */ add.s $f12, $f12, $f0 -/* 9A1D10 80240D30 3C0142B4 */ lui $at, 0x42b4 -/* 9A1D14 80240D34 44810000 */ mtc1 $at, $f0 -/* 9A1D18 80240D38 0C00A6C9 */ jal clamp_angle -/* 9A1D1C 80240D3C 46006301 */ sub.s $f12, $f12, $f0 -/* 9A1D20 80240D40 E600000C */ swc1 $f0, 0xc($s0) -/* 9A1D24 80240D44 8E4200CC */ lw $v0, 0xcc($s2) -/* 9A1D28 80240D48 8C420000 */ lw $v0, ($v0) -/* 9A1D2C 80240D4C AE020028 */ sw $v0, 0x28($s0) -/* 9A1D30 80240D50 24020003 */ addiu $v0, $zero, 3 -/* 9A1D34 80240D54 AE620070 */ sw $v0, 0x70($s3) -/* 9A1D38 80240D58 8FBF0020 */ lw $ra, 0x20($sp) -/* 9A1D3C 80240D5C 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A1D40 80240D60 8FB20018 */ lw $s2, 0x18($sp) -/* 9A1D44 80240D64 8FB10014 */ lw $s1, 0x14($sp) -/* 9A1D48 80240D68 8FB00010 */ lw $s0, 0x10($sp) -/* 9A1D4C 80240D6C 03E00008 */ jr $ra -/* 9A1D50 80240D70 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s index 1e193d0c6a..9cb03b0b95 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s @@ -141,7 +141,7 @@ glabel func_80241448_9A2428 /* 9A2630 80241650 00000000 */ nop /* 9A2634 80241654 0280202D */ daddu $a0, $s4, $zero /* 9A2638 80241658 0260282D */ daddu $a1, $s3, $zero -/* 9A263C 8024165C 0C09032D */ jal func_80240CB4_9A1C94 +/* 9A263C 8024165C 0C09032D */ jal UnkNpcAIFunc1 /* 9A2640 80241660 02A0302D */ daddu $a2, $s5, $zero /* 9A2644 80241664 0280202D */ daddu $a0, $s4, $zero /* 9A2648 80241668 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s index f8aa5cb3da..0b32e7d094 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s @@ -153,7 +153,7 @@ glabel func_80241744_9A2724 /* 9A295C 8024197C 00000000 */ nop /* 9A2960 80241980 0260202D */ daddu $a0, $s3, $zero /* 9A2964 80241984 0280282D */ daddu $a1, $s4, $zero -/* 9A2968 80241988 0C09032D */ jal func_80240CB4_9A1C94 +/* 9A2968 80241988 0C09032D */ jal UnkNpcAIFunc1 /* 9A296C 8024198C 02A0302D */ daddu $a2, $s5, $zero /* 9A2970 80241990 0260202D */ daddu $a0, $s3, $zero /* 9A2974 80241994 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241084_9A9474.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241084_9A9474.s deleted file mode 100644 index 5d3d1ef4e9..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241084_9A9474.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241084_9A9474 -/* 9A9474 80241084 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9A9478 80241088 AFB3001C */ sw $s3, 0x1c($sp) -/* 9A947C 8024108C 0080982D */ daddu $s3, $a0, $zero -/* 9A9480 80241090 AFBF0020 */ sw $ra, 0x20($sp) -/* 9A9484 80241094 AFB20018 */ sw $s2, 0x18($sp) -/* 9A9488 80241098 AFB10014 */ sw $s1, 0x14($sp) -/* 9A948C 8024109C AFB00010 */ sw $s0, 0x10($sp) -/* 9A9490 802410A0 8E720148 */ lw $s2, 0x148($s3) -/* 9A9494 802410A4 86440008 */ lh $a0, 8($s2) -/* 9A9498 802410A8 0C00EABB */ jal get_npc_unsafe -/* 9A949C 802410AC 00A0882D */ daddu $s1, $a1, $zero -/* 9A94A0 802410B0 8E240008 */ lw $a0, 8($s1) -/* 9A94A4 802410B4 0040802D */ daddu $s0, $v0, $zero -/* 9A94A8 802410B8 00041FC2 */ srl $v1, $a0, 0x1f -/* 9A94AC 802410BC 00832021 */ addu $a0, $a0, $v1 -/* 9A94B0 802410C0 00042043 */ sra $a0, $a0, 1 -/* 9A94B4 802410C4 0C00A67F */ jal rand_int -/* 9A94B8 802410C8 24840001 */ addiu $a0, $a0, 1 -/* 9A94BC 802410CC 8E230008 */ lw $v1, 8($s1) -/* 9A94C0 802410D0 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9A94C4 802410D4 00032FC2 */ srl $a1, $v1, 0x1f -/* 9A94C8 802410D8 00651821 */ addu $v1, $v1, $a1 -/* 9A94CC 802410DC 00031843 */ sra $v1, $v1, 1 -/* 9A94D0 802410E0 00621821 */ addu $v1, $v1, $v0 -/* 9A94D4 802410E4 0C00A67F */ jal rand_int -/* 9A94D8 802410E8 A603008E */ sh $v1, 0x8e($s0) -/* 9A94DC 802410EC C60C000C */ lwc1 $f12, 0xc($s0) -/* 9A94E0 802410F0 44820000 */ mtc1 $v0, $f0 -/* 9A94E4 802410F4 00000000 */ nop -/* 9A94E8 802410F8 46800020 */ cvt.s.w $f0, $f0 -/* 9A94EC 802410FC 46006300 */ add.s $f12, $f12, $f0 -/* 9A94F0 80241100 3C0142B4 */ lui $at, 0x42b4 -/* 9A94F4 80241104 44810000 */ mtc1 $at, $f0 -/* 9A94F8 80241108 0C00A6C9 */ jal clamp_angle -/* 9A94FC 8024110C 46006301 */ sub.s $f12, $f12, $f0 -/* 9A9500 80241110 E600000C */ swc1 $f0, 0xc($s0) -/* 9A9504 80241114 8E4200CC */ lw $v0, 0xcc($s2) -/* 9A9508 80241118 8C420000 */ lw $v0, ($v0) -/* 9A950C 8024111C AE020028 */ sw $v0, 0x28($s0) -/* 9A9510 80241120 24020003 */ addiu $v0, $zero, 3 -/* 9A9514 80241124 AE620070 */ sw $v0, 0x70($s3) -/* 9A9518 80241128 8FBF0020 */ lw $ra, 0x20($sp) -/* 9A951C 8024112C 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A9520 80241130 8FB20018 */ lw $s2, 0x18($sp) -/* 9A9524 80241134 8FB10014 */ lw $s1, 0x14($sp) -/* 9A9528 80241138 8FB00010 */ lw $s0, 0x10($sp) -/* 9A952C 8024113C 03E00008 */ jr $ra -/* 9A9530 80241140 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s index e1f7657cac..7cbec14611 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s @@ -141,7 +141,7 @@ glabel func_80241818_9A9C08 /* 9A9E10 80241A20 00000000 */ nop /* 9A9E14 80241A24 0280202D */ daddu $a0, $s4, $zero /* 9A9E18 80241A28 0260282D */ daddu $a1, $s3, $zero -/* 9A9E1C 80241A2C 0C090421 */ jal func_80241084_9A9474 +/* 9A9E1C 80241A2C 0C090421 */ jal UnkNpcAIFunc1 /* 9A9E20 80241A30 02A0302D */ daddu $a2, $s5, $zero /* 9A9E24 80241A34 0280202D */ daddu $a0, $s4, $zero /* 9A9E28 80241A38 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s index 97c6b64e48..fdade50ea2 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s @@ -153,7 +153,7 @@ glabel func_80241B14_9A9F04 /* 9AA13C 80241D4C 00000000 */ nop /* 9AA140 80241D50 0260202D */ daddu $a0, $s3, $zero /* 9AA144 80241D54 0280282D */ daddu $a1, $s4, $zero -/* 9AA148 80241D58 0C090421 */ jal func_80241084_9A9474 +/* 9AA148 80241D58 0C090421 */ jal UnkNpcAIFunc1 /* 9AA14C 80241D5C 02A0302D */ daddu $a2, $s5, $zero /* 9AA150 80241D60 0260202D */ daddu $a0, $s3, $zero /* 9AA154 80241D64 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802412BC_9B7C3C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802412BC_9B7C3C.s deleted file mode 100644 index 4fc5c2f0f9..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802412BC_9B7C3C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412BC_9B7C3C -/* 9B7C3C 802412BC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9B7C40 802412C0 AFB3001C */ sw $s3, 0x1c($sp) -/* 9B7C44 802412C4 0080982D */ daddu $s3, $a0, $zero -/* 9B7C48 802412C8 AFBF0020 */ sw $ra, 0x20($sp) -/* 9B7C4C 802412CC AFB20018 */ sw $s2, 0x18($sp) -/* 9B7C50 802412D0 AFB10014 */ sw $s1, 0x14($sp) -/* 9B7C54 802412D4 AFB00010 */ sw $s0, 0x10($sp) -/* 9B7C58 802412D8 8E720148 */ lw $s2, 0x148($s3) -/* 9B7C5C 802412DC 86440008 */ lh $a0, 8($s2) -/* 9B7C60 802412E0 0C00EABB */ jal get_npc_unsafe -/* 9B7C64 802412E4 00A0882D */ daddu $s1, $a1, $zero -/* 9B7C68 802412E8 8E240008 */ lw $a0, 8($s1) -/* 9B7C6C 802412EC 0040802D */ daddu $s0, $v0, $zero -/* 9B7C70 802412F0 00041FC2 */ srl $v1, $a0, 0x1f -/* 9B7C74 802412F4 00832021 */ addu $a0, $a0, $v1 -/* 9B7C78 802412F8 00042043 */ sra $a0, $a0, 1 -/* 9B7C7C 802412FC 0C00A67F */ jal rand_int -/* 9B7C80 80241300 24840001 */ addiu $a0, $a0, 1 -/* 9B7C84 80241304 8E230008 */ lw $v1, 8($s1) -/* 9B7C88 80241308 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9B7C8C 8024130C 00032FC2 */ srl $a1, $v1, 0x1f -/* 9B7C90 80241310 00651821 */ addu $v1, $v1, $a1 -/* 9B7C94 80241314 00031843 */ sra $v1, $v1, 1 -/* 9B7C98 80241318 00621821 */ addu $v1, $v1, $v0 -/* 9B7C9C 8024131C 0C00A67F */ jal rand_int -/* 9B7CA0 80241320 A603008E */ sh $v1, 0x8e($s0) -/* 9B7CA4 80241324 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9B7CA8 80241328 44820000 */ mtc1 $v0, $f0 -/* 9B7CAC 8024132C 00000000 */ nop -/* 9B7CB0 80241330 46800020 */ cvt.s.w $f0, $f0 -/* 9B7CB4 80241334 46006300 */ add.s $f12, $f12, $f0 -/* 9B7CB8 80241338 3C0142B4 */ lui $at, 0x42b4 -/* 9B7CBC 8024133C 44810000 */ mtc1 $at, $f0 -/* 9B7CC0 80241340 0C00A6C9 */ jal clamp_angle -/* 9B7CC4 80241344 46006301 */ sub.s $f12, $f12, $f0 -/* 9B7CC8 80241348 E600000C */ swc1 $f0, 0xc($s0) -/* 9B7CCC 8024134C 8E4200CC */ lw $v0, 0xcc($s2) -/* 9B7CD0 80241350 8C420000 */ lw $v0, ($v0) -/* 9B7CD4 80241354 AE020028 */ sw $v0, 0x28($s0) -/* 9B7CD8 80241358 24020003 */ addiu $v0, $zero, 3 -/* 9B7CDC 8024135C AE620070 */ sw $v0, 0x70($s3) -/* 9B7CE0 80241360 8FBF0020 */ lw $ra, 0x20($sp) -/* 9B7CE4 80241364 8FB3001C */ lw $s3, 0x1c($sp) -/* 9B7CE8 80241368 8FB20018 */ lw $s2, 0x18($sp) -/* 9B7CEC 8024136C 8FB10014 */ lw $s1, 0x14($sp) -/* 9B7CF0 80241370 8FB00010 */ lw $s0, 0x10($sp) -/* 9B7CF4 80241374 03E00008 */ jr $ra -/* 9B7CF8 80241378 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s index dbb873afa0..0473b1caf0 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s @@ -83,7 +83,7 @@ glabel func_80241DF0_9B8770 /* 9B88A0 80241F20 0000102D */ daddu $v0, $zero, $zero /* 9B88A4 80241F24 0280202D */ daddu $a0, $s4, $zero /* 9B88A8 80241F28 0200282D */ daddu $a1, $s0, $zero -/* 9B88AC 80241F2C 0C0904AF */ jal func_802412BC_9B7C3C +/* 9B88AC 80241F2C 0C0904AF */ jal UnkNpcAIFunc1 /* 9B88B0 80241F30 0260302D */ daddu $a2, $s3, $zero /* 9B88B4 80241F34 0280202D */ daddu $a0, $s4, $zero /* 9B88B8 80241F38 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s index 58acd4ac5c..f636ffb153 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s @@ -88,7 +88,7 @@ glabel func_8024231C_9B8C9C /* 9B8DE0 80242460 0000102D */ daddu $v0, $zero, $zero /* 9B8DE4 80242464 0260202D */ daddu $a0, $s3, $zero /* 9B8DE8 80242468 0200282D */ daddu $a1, $s0, $zero -/* 9B8DEC 8024246C 0C0904AF */ jal func_802412BC_9B7C3C +/* 9B8DEC 8024246C 0C0904AF */ jal UnkNpcAIFunc1 /* 9B8DF0 80242470 0280302D */ daddu $a2, $s4, $zero /* 9B8DF4 80242474 0260202D */ daddu $a0, $s3, $zero /* 9B8DF8 80242478 0200282D */ daddu $a1, $s0, $zero diff --git a/include/map.h b/include/map.h index 8f17fd2fb6..7ab05366cb 100644 --- a/include/map.h +++ b/include/map.h @@ -55,6 +55,7 @@ typedef struct Area { /* 0x08 */ char* id; ///< "area_xxx" /* 0x0C */ char* name; ///< JP debug name. } Area; // size = 0x10 + typedef struct NpcAISettings { /* 0x00 */ f32 moveSpeed; /* 0x04 */ s32 moveTime; diff --git a/src/code_20ec0_len_5040.c b/src/code_20ec0_len_5040.c index 17520d652f..acb39e02ba 100644 --- a/src/code_20ec0_len_5040.c +++ b/src/code_20ec0_len_5040.c @@ -196,7 +196,16 @@ INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800495A0); INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800496B8); -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80049B44); +// Same as UnkNpcAIFunc1 +void func_80049B44(ScriptInstance *script, NpcAISettings *aiSettings) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration = (aiSettings->waitTime / 2) + rand_int((aiSettings->waitTime / 2) + 1); + npc->yaw = clamp_angle(npc->yaw + rand_int(180) - 90.0f); + npc->currentAnim = *enemy->animList; + script->functionTemp[0].s = 3; +} INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80049C04); diff --git a/src/world/area_arn/arn_03/BDED90.c b/src/world/area_arn/arn_03/BDED90.c index 69fe2c5441..78ae0b2cad 100644 --- a/src/world/area_arn/arn_03/BDED90.c +++ b/src/world/area_arn/arn_03/BDED90.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80240000_BDED90); INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80240158_BDEEE8); -INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80240400_BDF190); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_802404C0_BDF250); diff --git a/src/world/area_arn/arn_04/BE37B0.c b/src/world/area_arn/arn_04/BE37B0.c index 0f649000d4..f7d2ddbf78 100644 --- a/src/world/area_arn/arn_04/BE37B0.c +++ b/src/world/area_arn/arn_04/BE37B0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80240000_BE37B0); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80240158_BE3908); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80240400_BE3BB0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_802404C0_BE3C70); @@ -28,6 +28,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80240E90_BE4640); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241040_BE47F0); +// should be #include "world/common/UnkNpcAIFunc1.inc.c", probably missing file split INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241668_BE4E18); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241728_BE4ED8); diff --git a/src/world/area_arn/arn_05/BE7BE0.c b/src/world/area_arn/arn_05/BE7BE0.c index d958b2368d..835aebe819 100644 --- a/src/world/area_arn/arn_05/BE7BE0.c +++ b/src/world/area_arn/arn_05/BE7BE0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_80240000_BE7BE0); INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_80240158_BE7D38); -INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_80240400_BE7FE0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_802404C0_BE80A0); diff --git a/src/world/area_arn/arn_07/BED740.c b/src/world/area_arn/arn_07/BED740.c index 621a4338db..cf7f88b82f 100644 --- a/src/world/area_arn/arn_07/BED740.c +++ b/src/world/area_arn/arn_07/BED740.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80240950_BED740); INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80240B00_BED8F0); -INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80241128_BEDF18); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_802411E8_BEDFD8); diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index eec46265bb..4d1a166666 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240120_BFD9A0); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802402D0_BFDB50); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802408F8_BFE178); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802409B8_BFE238); @@ -48,6 +48,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_8024252C_BFFDAC); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242684_BFFF04); +// should be #include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_8024292C_C001AC); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802429EC_C0026C); diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index eadd5f6e3c..8649f19b60 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240B20_C32000); INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240C78_C32158); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240F20_C32400); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240FE0_C324C0); diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index f1a7127b31..a4f838f62d 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240000_C36530); INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802401B0_C366E0); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802407D8_C36D08); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240898_C36DC8); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index fca917271e..3043bb4367 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240000_C3FDB0); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240158_C3FF08); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240400_C401B0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802404C0_C40270); @@ -42,6 +42,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241760_C41510); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241910_C416C0); +// should be #include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241F38_C41CE8); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241FF8_C41DA8); diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 682248d50a..74d05f6d7e 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80241424_C48004); INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802415D4_C481B4); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80241BFC_C487DC); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80241CBC_C4889C); diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index b9815b6a64..b8f7f643a3 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802408D0_C4FDE0); INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240A28_C4FF38); -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240CD0_C501E0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240D90_C502A0); diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index 90666b9955..ba50d086b6 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_80240000_C55F40); INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_80240158_C56098); -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_80240400_C56340); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_802404C0_C56400); diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index e932d8d5aa..c126ef0b24 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802405E0_95B7E0); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240738_95B938); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802409E0_95BBE0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240AA0_95BCA0); diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index 53d51955b8..90f5b425f1 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240040_C9DF60); INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240198_C9E0B8); -INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240440_C9E360); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240500_C9E420); diff --git a/src/world/area_flo/flo_09/CB5320.c b/src/world/area_flo/flo_09/CB5320.c index 02d223bc23..8a70afdbc0 100644 --- a/src/world/area_flo/flo_09/CB5320.c +++ b/src/world/area_flo/flo_09/CB5320.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240320_CB5320); INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_802404D0_CB54D0); -INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240AF8_CB5AF8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240BB8_CB5BB8); diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index a82e8927f7..656ccc51a1 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_802401C4_CC39D4); INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240374_CC3B84); -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_8024099C_CC41AC); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240A5C_CC426C); diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index 47e757aea0..065b8f48a6 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80240B10_CCBE20); INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80240CC0_CCBFD0); -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_802412E8_CCC5F8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_802413A8_CCC6B8); diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c index 26cdc58465..e5bc36de86 100644 --- a/src/world/area_flo/flo_16/CD2C80.c +++ b/src/world/area_flo/flo_16/CD2C80.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80240E50_CD2C80); INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241000_CD2E30); -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241628_CD3458); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_802416E8_CD3518); diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index cad50f5ad1..8fa99eec86 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240070_CD7350); INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240220_CD7500); -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240848_CD7B28); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240908_CD7BE8); diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index 5bee272fa1..32e4b76ed9 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240040_CF2C10); INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_802401F0_CF2DC0); -INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240818_CF33E8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_802408D8_CF34A8); diff --git a/src/world/area_hos/hos_02/A17210.c b/src/world/area_hos/hos_02/A17210.c index 303fa5c199..1cd982479c 100644 --- a/src/world/area_hos/hos_02/A17210.c +++ b/src/world/area_hos/hos_02/A17210.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80240FF0_A17210); INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802411A0_A173C0); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802417C8_A179E8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241888_A17AA8); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 3149046f86..6439922b9e 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80240CB0_A1BDB0); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80240E60_A1BF60); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241488_A1C588); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241548_A1C648); diff --git a/src/world/area_isk/isk_05/97DAD0.c b/src/world/area_isk/isk_05/97DAD0.c index ce7c07e99c..828b210e6c 100644 --- a/src/world/area_isk/isk_05/97DAD0.c +++ b/src/world/area_isk/isk_05/97DAD0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240000_97DAD0); INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240230_97DD00); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240568_97E038); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240628_97E0F8); diff --git a/src/world/area_isk/isk_13/98F7E0.c b/src/world/area_isk/isk_13/98F7E0.c index 173440d41a..b49bb03484 100644 --- a/src/world/area_isk/isk_13/98F7E0.c +++ b/src/world/area_isk/isk_13/98F7E0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240000_98F7E0); INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240230_98FA10); -INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240568_98FD48); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240628_98FE08); diff --git a/src/world/area_isk/isk_14/992730.c b/src/world/area_isk/isk_14/992730.c index a477e90799..56065c071a 100644 --- a/src/world/area_isk/isk_14/992730.c +++ b/src/world/area_isk/isk_14/992730.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240000_992730); INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240230_992960); -INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240568_992C98); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240628_992D58); diff --git a/src/world/area_jan/jan_01/B28030.c b/src/world/area_jan/jan_01/B28030.c index 76f94da69e..44bb76dce8 100644 --- a/src/world/area_jan/jan_01/B28030.c +++ b/src/world/area_jan/jan_01/B28030.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240340_B28370); INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240570_B285A0); -INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_802408A8_B288D8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240968_B28998); diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index 1454a92b7a..0fcc35fbb4 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240430_B2C8A0); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240588_B2C9F8); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240830_B2CCA0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802408F0_B2CD60); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 716aa12127..672a2d2d63 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240620_B351F0); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240778_B35348); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240A20_B355F0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240AE0_B356B0); diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index d86ef7bf48..e0ebe101e8 100644 --- a/src/world/area_jan/jan_05/B4B260.c +++ b/src/world/area_jan/jan_05/B4B260.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802408A4_B4B314); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80240AD4_B4B544); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80240E0C_B4B87C); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80240ECC_B4B93C); diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index 7a923e4b54..0ad751f985 100644 --- a/src/world/area_jan/jan_06/B52F70.c +++ b/src/world/area_jan/jan_06/B52F70.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240740_B52F70); INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240970_B531A0); -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240CA8_B534D8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", delete_player_actor_B53598); diff --git a/src/world/area_jan/jan_10/B6C6A0.c b/src/world/area_jan/jan_10/B6C6A0.c index 962a99a07c..10690c75b2 100644 --- a/src/world/area_jan/jan_10/B6C6A0.c +++ b/src/world/area_jan/jan_10/B6C6A0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240310_B6C6A0); INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240540_B6C8D0); -INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240878_B6CC08); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240938_B6CCC8); diff --git a/src/world/area_jan/jan_14/B7A510.c b/src/world/area_jan/jan_14/B7A510.c index fae08d7e1d..4a73654440 100644 --- a/src/world/area_jan/jan_14/B7A510.c +++ b/src/world/area_jan/jan_14/B7A510.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_802404C0_B7A510); INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_802406F0_B7A740); -INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_80240A28_B7AA78); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_80240AE8_B7AB38); diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c index 1e9db6c3b3..808eac8e95 100644 --- a/src/world/area_jan/jan_22/B84180.c +++ b/src/world/area_jan/jan_22/B84180.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240000_B84180); INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240158_B842D8); -INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240400_B84580); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_802404C0_B84640); diff --git a/src/world/area_kkj/kkj_00/ABB340.c b/src/world/area_kkj/kkj_00/ABB340.c index 81da396205..cc676f787e 100644 --- a/src/world/area_kkj/kkj_00/ABB340.c +++ b/src/world/area_kkj/kkj_00/ABB340.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_802400B0_ABB340); INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240208_ABB498); -INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_802404B0_ABB740); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240570_ABB800); diff --git a/src/world/area_kkj/kkj_01/AC5170.c b/src/world/area_kkj/kkj_01/AC5170.c index 40615358f3..1a72f02cdd 100644 --- a/src/world/area_kkj/kkj_01/AC5170.c +++ b/src/world/area_kkj/kkj_01/AC5170.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_80240000_AC5170); INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_80240158_AC52C8); -INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_80240400_AC5570); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_802404C0_AC5630); diff --git a/src/world/area_kmr/kmr_05/8CE070.c b/src/world/area_kmr/kmr_05/8CE070.c index 00f47238a5..237b557bdc 100644 --- a/src/world/area_kmr/kmr_05/8CE070.c +++ b/src/world/area_kmr/kmr_05/8CE070.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240000_8CE070); INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_802401B0_8CE220); -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_802407D8_8CE848); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240898_8CE908); diff --git a/src/world/area_kmr/kmr_06/8D1510.c b/src/world/area_kmr/kmr_06/8D1510.c index cac0561e67..669d49b006 100644 --- a/src/world/area_kmr/kmr_06/8D1510.c +++ b/src/world/area_kmr/kmr_06/8D1510.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240000_8D1510); INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_802401B0_8D16C0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_802407D8_8D1CE8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240898_8D1DA8); diff --git a/src/world/area_kmr/kmr_09/8D5E00.c b/src/world/area_kmr/kmr_09/8D5E00.c index 485dac7e92..8882471e2e 100644 --- a/src/world/area_kmr/kmr_09/8D5E00.c +++ b/src/world/area_kmr/kmr_09/8D5E00.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240000_8D5E00); INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_802401B0_8D5FB0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_802407D8_8D65D8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240898_8D6698); diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index 65cb2e7b8f..7b63619924 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240000_A86A50); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240158_A86BA8); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240400_A86E50); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802404C0_A86F10); diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index 7e68509226..7fbd97704a 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802400E0_A8CB60); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240238_A8CCB8); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802404E0_A8CF60); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802405A0_A8D020); diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index 9a8e2dcb24..3e8d0ac22e 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802404E0_C5AC20); INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80240690_C5ADD0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80240CB8_C5B3F8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80240D78_C5B4B8); diff --git a/src/world/area_kzn/kzn_07/C6EA50.c b/src/world/area_kzn/kzn_07/C6EA50.c index c78be36dc6..4f77afb547 100644 --- a/src/world/area_kzn/kzn_07/C6EA50.c +++ b/src/world/area_kzn/kzn_07/C6EA50.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80240820_C6EB50); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802409D0_C6ED00); -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80240FF8_C6F328); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802410B8_C6F3E8); diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index d09fdb7b8f..32f8a80c5f 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80240A50_C71ED0); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80240C00_C72080); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80241228_C726A8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802412E8_C72768); diff --git a/src/world/area_kzn/kzn_11/C80600.c b/src/world/area_kzn/kzn_11/C80600.c index 78405aa592..f53fdd04dc 100644 --- a/src/world/area_kzn/kzn_11/C80600.c +++ b/src/world/area_kzn/kzn_11/C80600.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80240460_C80600); INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80240610_C807B0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80240C38_C80DD8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80240CF8_C80E98); diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index 049e466801..f972f7025f 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242570_7ED280); INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_802426C8_7ED3D8); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242970_7ED680); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242A30_7ED740); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index c3ad2a45a0..50aae096db 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241080_801900); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802411D8_801A58); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241480_801D00); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241540_801DC0); diff --git a/src/world/area_mac/mac_01/805DD0.c b/src/world/area_mac/mac_01/805DD0.c index 96396f7a47..b269efe401 100644 --- a/src/world/area_mac/mac_01/805DD0.c +++ b/src/world/area_mac/mac_01/805DD0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245550_805DD0); INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_802456A8_805F28); -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245950_8061D0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245A10_806290); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index 20595c6eb7..7dddbbe47a 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240930_823BF0); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240A88_823D48); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240D30_823FF0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240DF0_8240B0); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 839bf91196..f09b69412d 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240490_852600); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802405E8_852758); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240890_852A00); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240950_852AC0); diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index 4d77538bd3..6b442dd994 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_802402E0_E0EA80); INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240438_E0EBD8); -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_802406E0_E0EE80); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_802407A0_E0EF40); diff --git a/src/world/area_mim/mim_02/B97C70.c b/src/world/area_mim/mim_02/B97C70.c index 2a4b84dcb7..4cc3a30e1f 100644 --- a/src/world/area_mim/mim_02/B97C70.c +++ b/src/world/area_mim/mim_02/B97C70.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80240070_B97C70); INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_802402A0_B97EA0); -INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_802405D8_B981D8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80240698_B98298); diff --git a/src/world/area_mim/mim_04/B9DB60.c b/src/world/area_mim/mim_04/B9DB60.c index dfd088da04..e8e49c8c35 100644 --- a/src/world/area_mim/mim_04/B9DB60.c +++ b/src/world/area_mim/mim_04/B9DB60.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240200_B9DB60); INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240430_B9DD90); -INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240768_B9E0C8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240828_B9E188); diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c index e5c153e991..25fc5a045a 100644 --- a/src/world/area_mim/mim_06/BA4CF0.c +++ b/src/world/area_mim/mim_06/BA4CF0.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241F14_BA6694); INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80242144_BA68C4); -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_8024247C_BA6BFC); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_8024253C_BA6CBC); diff --git a/src/world/area_mim/mim_07/BAA3B0.c b/src/world/area_mim/mim_07/BAA3B0.c index 0fdeb90271..9b3db1109d 100644 --- a/src/world/area_mim/mim_07/BAA3B0.c +++ b/src/world/area_mim/mim_07/BAA3B0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_80240270_BAA3B0); INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_802404A0_BAA5E0); -INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_802407D8_BAA918); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_80240898_BAA9D8); diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index 120782cd18..e3951dd1df 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_802400A0_BAD9E0); INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240250_BADB90); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240878_BAE1B8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240938_BAE278); diff --git a/src/world/area_mim/mim_09/BB2E00.c b/src/world/area_mim/mim_09/BB2E00.c index 7546c60517..8af9d61707 100644 --- a/src/world/area_mim/mim_09/BB2E00.c +++ b/src/world/area_mim/mim_09/BB2E00.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_802400A0_BB2EA0); INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_802402D0_BB30D0); -INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_80240608_BB3408); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_802406C8_BB34C8); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index 9dc71cf4d2..1ca488166d 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240A80_9D7AA0); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240BD8_9D7BF8); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240E80_9D7EA0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240F40_9D7F60); diff --git a/src/world/area_nok/nok_03/9EB7F0.c b/src/world/area_nok/nok_03/9EB7F0.c index 8a88bffbd7..c937e6b0d8 100644 --- a/src/world/area_nok/nok_03/9EB7F0.c +++ b/src/world/area_nok/nok_03/9EB7F0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_80240000_9EB7F0); INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_80240230_9EBA20); -INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_80240568_9EBD58); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_80240628_9EBE18); diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c index d886558387..acc684c751 100644 --- a/src/world/area_nok/nok_11/9F4A40.c +++ b/src/world/area_nok/nok_11/9F4A40.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_802407D4_9F5214); INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80240984_9F53C4); -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80240FAC_9F59EC); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_8024106C_9F5AAC); diff --git a/src/world/area_nok/nok_12/9FAD60.c b/src/world/area_nok/nok_12/9FAD60.c index 2b39ab0f14..bb8910441c 100644 --- a/src/world/area_nok/nok_12/9FAD60.c +++ b/src/world/area_nok/nok_12/9FAD60.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80240D44_9FB534); INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80240E9C_9FB68C); -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241144_9FB934); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241204_9FB9F4); diff --git a/src/world/area_nok/nok_13/A00600.c b/src/world/area_nok/nok_13/A00600.c index 7d6a0bf6cc..52109b8a39 100644 --- a/src/world/area_nok/nok_13/A00600.c +++ b/src/world/area_nok/nok_13/A00600.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_80240000_A00600); INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_80240230_A00830); -INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_80240568_A00B68); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_80240628_A00C28); diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c index 7a0c67b23f..1e75c71b77 100644 --- a/src/world/area_nok/nok_14/A02A00.c +++ b/src/world/area_nok/nok_14/A02A00.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240994_A031D4); INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240B44_A03384); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_8024116C_A039AC); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_8024122C_A03A6C); diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 037bef92d6..34433fde75 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240AB4_A079B4); INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240C64_A07B64); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024128C_A0818C); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024134C_A0824C); diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index 07f629662a..942ff70697 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802403A0_DAD7A0); INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240550_DAD950); -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240B78_DADF78); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240C38_DAE038); diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index 74d1a340a7..b1f617f1b2 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240A54_DB2D14); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240C04_DB2EC4); -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_8024122C_DB34EC); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802412EC_DB35AC); diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index e3659b986e..be1f031d51 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024056C_DBD81C); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802406C4_DBD974); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024096C_DBDC1C); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240A2C_DBDCDC); @@ -48,6 +48,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241978_DBEC28); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241B28_DBEDD8); +// Should be #include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242150_DBF400); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242210_DBF4C0); diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index e3931a7435..4d35a90e46 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80240F4C_DCDC1C); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802410A4_DCDD74); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024134C_DCE01C); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024140C_DCE0DC); diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index 766dba621e..5f99a47bd6 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240FB4_DEFE54); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241164_DF0004); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_8024178C_DF062C); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_8024184C_DF06EC); diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index 89344f132d..3b23663749 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240F20_D8E170); INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241078_D8E2C8); -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241320_D8E570); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_802413E0_D8E630); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index 6f1be57830..ee279a4b20 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240550_D203E0); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240700_D20590); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240D28_D20BB8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240DE8_D20C78); diff --git a/src/world/area_tik/tik_07/87AC00.c b/src/world/area_tik/tik_07/87AC00.c index d691edea9f..92432041bb 100644 --- a/src/world/area_tik/tik_07/87AC00.c +++ b/src/world/area_tik/tik_07/87AC00.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802413F0_87AFD0); INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802415A0_87B180); -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241BC8_87B7A8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241C88_87B868); diff --git a/src/world/area_trd/trd_02/9A10C0.c b/src/world/area_trd/trd_02/9A10C0.c index 7615b0a9b2..0387dfa434 100644 --- a/src/world/area_trd/trd_02/9A10C0.c +++ b/src/world/area_trd/trd_02/9A10C0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_802408B4_9A1894); INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240A0C_9A19EC); -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240CB4_9A1C94); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240D74_9A1D54); diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index 57f607fbd7..c8cf98688e 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80240C84_9A9074); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80240DDC_9A91CC); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241084_9A9474); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241144_9A9534); @@ -40,6 +40,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241E18_9AA208); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241FC8_9AA3B8); +// Should be #include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802425F0_9AA9E0); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802426B0_9AAAA0); diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c index 4e8b919101..9aedc4df98 100644 --- a/src/world/area_trd/trd_07/9B6C90.c +++ b/src/world/area_trd/trd_07/9B6C90.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80240AE4_9B7464); INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80240C94_9B7614); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802412BC_9B7C3C); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024137C_9B7CFC); diff --git a/src/world/common/UnkNpcAIFunc1.inc.c b/src/world/common/UnkNpcAIFunc1.inc.c new file mode 100644 index 0000000000..8277c09c38 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc1.inc.c @@ -0,0 +1,12 @@ +#include "common.h" +#include "map.h" + +static void UnkNpcAIFunc1(ScriptInstance *script, NpcAISettings *aiSettings) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration = (aiSettings->waitTime / 2) + rand_int((aiSettings->waitTime / 2) + 1); + npc->yaw = clamp_angle(npc->yaw + rand_int(180) - 90.0f); + npc->currentAnim = *enemy->animList; + script->functionTemp[0].s = 3; +} diff --git a/tools/assist.py b/tools/assist.py index 7318638f25..74ed5c7d81 100755 --- a/tools/assist.py +++ b/tools/assist.py @@ -3,8 +3,6 @@ import argparse from collections import OrderedDict import os -import re -import pickle import sys script_dir = os.path.dirname(os.path.realpath(__file__)) @@ -34,6 +32,12 @@ def get_all_s_files(): return ret +def get_symbol_length(sym_name): + if "end" in map_offsets[sym_name] and "start" in map_offsets[sym_name]: + return map_offsets[sym_name]["end"] - map_offsets[sym_name]["start"] + return 0 + + def get_symbol_bytes(offsets, func): if func not in offsets or "start" not in offsets[func] or "end" not in offsets[func]: return None @@ -115,6 +119,8 @@ def diff_syms(qb, tb): if abs(len(larger) - len(smaller)) < 16 and is_zeros(larger[len(smaller):]): len_ratio = 1 + elif len_ratio < args.threshold: + return 0 n_bytes = len(smaller) matches = 0 @@ -131,6 +137,14 @@ def diff_syms(qb, tb): return score +def get_pair_score(query_bytes, b): + b_bytes = get_symbol_bytes(map_offsets, b) + + if query_bytes and b_bytes: + return diff_syms(query_bytes, b_bytes) + return 0 + + def get_matches(query): query_bytes = get_symbol_bytes(map_offsets, query) if query_bytes is None: @@ -139,11 +153,9 @@ def get_matches(query): ret = {} for symbol in map_offsets: if symbol is not None and query != symbol: - target_bytes = get_symbol_bytes(map_offsets, symbol) - if target_bytes is not None: - score = diff_syms(query_bytes, target_bytes) - if score >= args.threshold: - ret[symbol] = score + score = get_pair_score(query_bytes, symbol) + if score >= args.threshold: + ret[symbol] = score return OrderedDict(sorted(ret.items(), key=lambda kv: kv[1], reverse=True)) @@ -171,6 +183,37 @@ def do_query(query): i += 1 print() + +def do_cross_query(): + clusters = [] + max_cluster = None + max_cluster_len = 0 + + for sym_name in map_syms: + if not sym_name.startswith("_binary"): + sym = map_syms[sym_name] + if get_symbol_length(sym_name) > 8: + query_bytes = get_symbol_bytes(map_offsets, sym_name) + cluster_match = False + for cluster in clusters: + cluster_score = get_pair_score(query_bytes, cluster[0]) + if cluster_score >= args.threshold: + cluster.append(sym_name) + cluster_match = True + + if len(cluster) > max_cluster_len: + max_cluster_len = len(cluster) + max_cluster = cluster + + if len(cluster) % 10 == 0: + print("Cluster " + cluster[0] + " grew to size " + str(len(cluster))) + break + if not cluster_match: + clusters.append([sym_name]) + # print("Adding cluster for " + sym_name) + print(max_cluster[0]) + + parser = argparse.ArgumentParser(description="Tools to assist with decomp") parser.add_argument("query", help="function or file") parser.add_argument("--threshold", help="score threshold between 0 and 1 (higher is more restrictive)", type=float, default=0.95, required=False) @@ -191,4 +234,8 @@ if query_dir is not None: for f_name in files: do_query(f_name[:-2]) else: - do_query(args.query) + if args.query == "cross": + args.threshold = 1.0 + do_cross_query() + else: + do_query(args.query) diff --git a/tools/substitute.py b/tools/substitute.py index 0f1b79efb3..07bdc0eaea 100755 --- a/tools/substitute.py +++ b/tools/substitute.py @@ -1,11 +1,8 @@ #!/usr/bin/python3 import argparse -from collections import OrderedDict import os import re -import pickle -import sys script_dir = os.path.dirname(os.path.realpath(__file__)) root_dir = script_dir + "/../" @@ -13,7 +10,7 @@ src_dir = root_dir + "src/" parser = argparse.ArgumentParser(description="Replace many functions with one") -parser.add_argument("from_list", help="path to line-separated file of functions to be replaced") +parser.add_argument("from_list", help="path to line-separated file of functions to be replaced. first line is the string to replace them with") args = parser.parse_args() @@ -31,13 +28,10 @@ for from_line in from_text[1:]: for root, dirs, files in os.walk(src_dir): for f_name in files: if f_name.endswith(".c"): - if f_name == "D8FBA0.c": - dog = 5 - f_path = os.path.join(root, f_name) with open(f_path) as f: f_text_orig = f.read() - + f_text = f_text_orig for func in from_funcs: search_pattern = re.compile("\n.*" + func + "\).*\n") @@ -45,4 +39,4 @@ for root, dirs, files in os.walk(src_dir): if f_text != f_text_orig: with open(f_path, "w", newline="\n") as f: f.write(f_text) - + diff --git a/tools/substitute_asm.py b/tools/substitute_asm.py new file mode 100755 index 0000000000..9f92ce2cb5 --- /dev/null +++ b/tools/substitute_asm.py @@ -0,0 +1,41 @@ +#!/usr/bin/python3 + +import argparse +import os +import re + +script_dir = os.path.dirname(os.path.realpath(__file__)) +root_dir = script_dir + "/../" +asm_dir = root_dir + "asm/" + + +parser = argparse.ArgumentParser(description="Replace many functions with one") +parser.add_argument("from_list", help="path to line-separated file of functions to be replaced. first line is the string to replace them with") + +args = parser.parse_args() + +from_funcs = [] + +with open(args.from_list) as f: + from_text = f.readlines() + +to_line = from_text[0].strip() + +for from_line in from_text[1:]: + if len(from_line.strip()) > 0: + from_funcs.append(from_line.rstrip().split(" ")[-1]) + +for root, dirs, files in os.walk(asm_dir): + for f_name in files: + if f_name.endswith(".s"): + f_path = os.path.join(root, f_name) + with open(f_path) as f: + f_text_orig = f.read() + + f_text = f_text_orig + for func in from_funcs: + f_text = f_text.replace(func, to_line) + if f_text != f_text_orig: + with open(f_path, "w", newline="\n") as f: + f.write(f_text) + From 850635eea88d9949c136d6dc719a7719e30f6bb4 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 19 Nov 2020 23:21:23 -0500 Subject: [PATCH 04/38] NpcJumpFunc --- .../arn_03/BDED90/func_802407A4_BDF534.s | 35 ------------------- .../arn_03/BDED90/func_80240B94_BDF924.s | 2 +- .../arn_04/BE37B0/func_802407A4_BE3F54.s | 35 ------------------- .../arn_04/BE37B0/func_80240B94_BE4344.s | 2 +- .../arn_05/BE7BE0/func_802407A4_BE8384.s | 35 ------------------- .../arn_05/BE7BE0/func_80240B94_BE8774.s | 2 +- .../dgb_01/BFD9A0/func_80242CD0_C00550.s | 35 ------------------- .../dgb_01/BFD9A0/func_802430C0_C00940.s | 2 +- .../dgb_03/C31730/func_802412C4_C327A4.s | 35 ------------------- .../dgb_03/C31730/func_802416B4_C32B94.s | 2 +- .../dgb_03/C31730/func_802419B0_C32E90.s | 2 +- .../dgb_08/C3FDB0/func_802407A4_C40554.s | 35 ------------------- .../dgb_08/C3FDB0/func_80240B94_C40944.s | 2 +- .../dgb_15/C4F510/func_80241074_C50584.s | 35 ------------------- .../dgb_15/C4F510/func_80241464_C50974.s | 2 +- .../dgb_18/C55F40/func_802407A4_C566E4.s | 35 ------------------- .../dgb_18/C55F40/func_80240B94_C56AD4.s | 2 +- .../dro_01/95B7E0/func_80240D84_95BF84.s | 35 ------------------- .../dro_01/95B7E0/func_80241174_95C374.s | 2 +- .../flo_00/C9DF60/func_802407E4_C9E704.s | 35 ------------------- .../flo_00/C9DF60/func_80240BD4_C9EAF4.s | 2 +- .../jan_02/B2C8A0/func_80240BD4_B2D044.s | 35 ------------------- .../jan_02/B2C8A0/func_80240FC4_B2D434.s | 2 +- .../jan_03/B34BD0/func_80240DC4_B35994.s | 35 ------------------- .../jan_03/B34BD0/func_802411B4_B35D84.s | 2 +- .../jan_22/B84180/func_802407A4_B84924.s | 35 ------------------- .../jan_22/B84180/func_80240B94_B84D14.s | 2 +- .../kkj_00/ABB340/func_80240854_ABBAE4.s | 35 ------------------- .../kkj_00/ABB340/func_80240C44_ABBED4.s | 2 +- .../kkj_01/AC5170/func_802407A4_AC5914.s | 35 ------------------- .../kkj_01/AC5170/func_80240B94_AC5D04.s | 2 +- .../kmr_02/8B0070/func_80241658_8B16C8.s | 35 ------------------- .../kmr_02/8B0070/func_80241C18_8B1C88.s | 2 +- .../kmr_07/8D3DC0/func_80240234_8D3FF4.s | 35 ------------------- .../kmr_07/8D3DC0/func_802407F4_8D45B4.s | 2 +- .../kmr_11/8DA3A0/func_802405A4_8DA6A4.s | 35 ------------------- .../kmr_11/8DA3A0/func_80240B64_8DAC64.s | 2 +- .../kpa_91/A86A50/func_802407A4_A871F4.s | 35 ------------------- .../kpa_91/A86A50/func_80240B94_A875E4.s | 2 +- .../kpa_95/A8CB60/func_80240884_A8D304.s | 35 ------------------- .../kpa_95/A8CB60/func_80240C74_A8D6F4.s | 2 +- .../mac_00/7ED280/func_80242D14_7EDA24.s | 35 ------------------- .../mac_00/7ED280/func_80243104_7EDE14.s | 24 ++++++------- .../mac_01/8017D0/func_80241824_8020A4.s | 35 ------------------- .../mac_01/8017D0/func_80241C14_802494.s | 2 +- .../mac_01/805DD0/func_80245CF4_806574.s | 35 ------------------- .../mac_01/805DD0/func_802460E4_806964.s | 2 +- .../mac_02/823BF0/func_802410D4_824394.s | 35 ------------------- .../mac_02/823BF0/func_802414C4_824784.s | 2 +- .../mac_05/852170/func_80240C34_852DA4.s | 35 ------------------- .../mac_05/852170/func_80241024_853194.s | 2 +- .../mgm_00/E0E7A0/func_80240A84_E0F224.s | 35 ------------------- .../mgm_00/E0E7A0/func_80240E74_E0F614.s | 2 +- .../nok_01/9C53E0/func_80240234_9C5614.s | 35 ------------------- .../nok_01/9C53E0/func_802407F4_9C5BD4.s | 2 +- .../nok_02/9D7AA0/func_80241224_9D8244.s | 35 ------------------- .../nok_02/9D7AA0/func_80241614_9D8634.s | 2 +- .../nok_12/9FAD60/func_802414E8_9FBCD8.s | 35 ------------------- .../nok_12/9FAD60/func_802418D8_9FC0C8.s | 2 +- .../omo_02/D9D510/func_80241110_D9E5E0.s | 35 ------------------- .../omo_02/D9D510/func_802416D0_D9EBA0.s | 2 +- .../omo_07/DBD2B0/func_80240D10_DBDFC0.s | 35 ------------------- .../omo_07/DBD2B0/func_80241100_DBE3B0.s | 2 +- .../omo_07/DBD2B0/func_80241634_DBE8E4.s | 2 +- .../omo_09/DCD6B0/func_802416F0_DCE3C0.s | 35 ------------------- .../omo_09/DCD6B0/func_80241AE0_DCE7B0.s | 2 +- .../omo_09/DCD6B0/func_80242014_DCECE4.s | 2 +- .../pra_35/D8D270/func_802416C4_D8E914.s | 35 ------------------- .../pra_35/D8D270/func_80241AB4_D8ED04.s | 2 +- .../pra_35/D8D270/func_802423CC_D8F61C.s | 2 +- .../sbk_30/93F5B0/func_802405A4_93FB54.s | 35 ------------------- .../sbk_30/93F5B0/func_80240B64_940114.s | 2 +- .../trd_01/99CD80/func_80240DF8_99D788.s | 35 ------------------- .../trd_01/99CD80/func_802413B8_99DD48.s | 2 +- .../trd_02/9A10C0/func_80241058_9A2038.s | 35 ------------------- .../trd_02/9A10C0/func_80241448_9A2428.s | 2 +- .../trd_04/9A88A0/func_80241428_9A9818.s | 35 ------------------- .../trd_04/9A88A0/func_80241818_9A9C08.s | 2 +- src/world/area_arn/arn_03/BDED90.c | 2 +- src/world/area_arn/arn_04/BE37B0.c | 2 +- src/world/area_arn/arn_05/BE7BE0.c | 2 +- src/world/area_dgb/dgb_01/BFD9A0.c | 2 +- src/world/area_dgb/dgb_03/C31730.c | 2 +- src/world/area_dgb/dgb_08/C3FDB0.c | 2 +- src/world/area_dgb/dgb_15/C4F510.c | 2 +- src/world/area_dgb/dgb_18/C55F40.c | 2 +- src/world/area_dro/dro_01/95B7E0.c | 2 +- src/world/area_flo/flo_00/C9DF60.c | 2 +- src/world/area_jan/jan_02/B2C8A0.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_jan/jan_22/B84180.c | 2 +- src/world/area_kkj/kkj_00/ABB340.c | 2 +- src/world/area_kkj/kkj_01/AC5170.c | 2 +- src/world/area_kmr/kmr_02/8B0070.c | 2 +- src/world/area_kmr/kmr_07/8D3DC0.c | 2 +- src/world/area_kmr/kmr_11/8DA3A0.c | 2 +- src/world/area_kpa/kpa_91/A86A50.c | 2 +- src/world/area_kpa/kpa_95/A8CB60.c | 2 +- src/world/area_mac/mac_00/7ED280.c | 2 +- src/world/area_mac/mac_01/8017D0.c | 2 +- src/world/area_mac/mac_01/805DD0.c | 2 +- src/world/area_mac/mac_02/823BF0.c | 2 +- src/world/area_mac/mac_05/852170.c | 2 +- src/world/area_mgm/mgm_00/E0E7A0.c | 2 +- src/world/area_nok/nok_01/9C53E0.c | 2 +- src/world/area_nok/nok_02/9D7AA0.c | 2 +- src/world/area_nok/nok_12/9FAD60.c | 2 +- src/world/area_omo/omo_02/D9D510.c | 2 +- src/world/area_omo/omo_07/DBD2B0.c | 2 +- src/world/area_omo/omo_09/DCD6B0.c | 2 +- src/world/area_pra/pra_35/D8D270.c | 2 +- src/world/area_sbk/sbk_30/93F5B0.c | 2 +- src/world/area_trd/trd_01/99CD80.c | 2 +- src/world/area_trd/trd_02/9A10C0.c | 2 +- src/world/area_trd/trd_04/9A88A0.c | 2 +- src/world/common/NpcJumpFunc.inc.c | 16 +++++++++ 116 files changed, 105 insertions(+), 1384 deletions(-) delete mode 100644 asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802407A4_BDF534.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_802407A4_BE3F54.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_802407A4_BE8384.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242CD0_C00550.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802412C4_C327A4.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802407A4_C40554.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241074_C50584.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_802407A4_C566E4.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240D84_95BF84.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802407E4_C9E704.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240BD4_B2D044.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240DC4_B35994.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_22/B84180/func_802407A4_B84924.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240854_ABBAE4.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_802407A4_AC5914.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241658_8B16C8.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240234_8D3FF4.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802405A4_8DA6A4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802407A4_A871F4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240884_A8D304.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D14_7EDA24.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241824_8020A4.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245CF4_806574.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802410D4_824394.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80240C34_852DA4.s delete mode 100644 asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240A84_E0F224.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240234_9C5614.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241224_9D8244.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802414E8_9FBCD8.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241110_D9E5E0.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240D10_DBDFC0.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802416F0_DCE3C0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802416C4_D8E914.s delete mode 100644 asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802405A4_93FB54.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240DF8_99D788.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241058_9A2038.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241428_9A9818.s create mode 100644 src/world/common/NpcJumpFunc.inc.c diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802407A4_BDF534.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802407A4_BDF534.s deleted file mode 100644 index 4e7f57e80c..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802407A4_BDF534.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A4_BDF534 -/* BDF534 802407A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BDF538 802407A8 AFB00010 */ sw $s0, 0x10($sp) -/* BDF53C 802407AC 0080802D */ daddu $s0, $a0, $zero -/* BDF540 802407B0 AFBF0014 */ sw $ra, 0x14($sp) -/* BDF544 802407B4 8E020148 */ lw $v0, 0x148($s0) -/* BDF548 802407B8 0C00EABB */ jal get_npc_unsafe -/* BDF54C 802407BC 84440008 */ lh $a0, 8($v0) -/* BDF550 802407C0 0040202D */ daddu $a0, $v0, $zero -/* BDF554 802407C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* BDF558 802407C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* BDF55C 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* BDF560 802407D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* BDF564 802407D4 46040001 */ sub.s $f0, $f0, $f4 -/* BDF568 802407D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* BDF56C 802407DC 4602203C */ c.lt.s $f4, $f2 -/* BDF570 802407E0 E482003C */ swc1 $f2, 0x3c($a0) -/* BDF574 802407E4 45010009 */ bc1t .L8024080C -/* BDF578 802407E8 E480001C */ swc1 $f0, 0x1c($a0) -/* BDF57C 802407EC 8C820000 */ lw $v0, ($a0) -/* BDF580 802407F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* BDF584 802407F4 E484003C */ swc1 $f4, 0x3c($a0) -/* BDF588 802407F8 AC80001C */ sw $zero, 0x1c($a0) -/* BDF58C 802407FC 00431024 */ and $v0, $v0, $v1 -/* BDF590 80240800 AC820000 */ sw $v0, ($a0) -/* BDF594 80240804 2402000C */ addiu $v0, $zero, 0xc -/* BDF598 80240808 AE020070 */ sw $v0, 0x70($s0) -.L8024080C: -/* BDF59C 8024080C 8FBF0014 */ lw $ra, 0x14($sp) -/* BDF5A0 80240810 8FB00010 */ lw $s0, 0x10($sp) -/* BDF5A4 80240814 03E00008 */ jr $ra -/* BDF5A8 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s index 3d1cec7372..33b66fc89e 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s @@ -161,7 +161,7 @@ glabel func_80240B94_BDF924 /* BDFB7C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* BDFB80 80240DF0 0280202D */ daddu $a0, $s4, $zero /* BDFB84 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* BDFB88 80240DF8 0C0901E9 */ jal func_802407A4_BDF534 +/* BDFB88 80240DF8 0C0901E9 */ jal NpcJumpFunc /* BDFB8C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* BDFB90 80240E00 0809039A */ j .L80240E68 /* BDFB94 80240E04 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_802407A4_BE3F54.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_802407A4_BE3F54.s deleted file mode 100644 index 2d808f5d49..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_802407A4_BE3F54.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A4_BE3F54 -/* BE3F54 802407A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BE3F58 802407A8 AFB00010 */ sw $s0, 0x10($sp) -/* BE3F5C 802407AC 0080802D */ daddu $s0, $a0, $zero -/* BE3F60 802407B0 AFBF0014 */ sw $ra, 0x14($sp) -/* BE3F64 802407B4 8E020148 */ lw $v0, 0x148($s0) -/* BE3F68 802407B8 0C00EABB */ jal get_npc_unsafe -/* BE3F6C 802407BC 84440008 */ lh $a0, 8($v0) -/* BE3F70 802407C0 0040202D */ daddu $a0, $v0, $zero -/* BE3F74 802407C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* BE3F78 802407C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* BE3F7C 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* BE3F80 802407D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* BE3F84 802407D4 46040001 */ sub.s $f0, $f0, $f4 -/* BE3F88 802407D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* BE3F8C 802407DC 4602203C */ c.lt.s $f4, $f2 -/* BE3F90 802407E0 E482003C */ swc1 $f2, 0x3c($a0) -/* BE3F94 802407E4 45010009 */ bc1t .L8024080C -/* BE3F98 802407E8 E480001C */ swc1 $f0, 0x1c($a0) -/* BE3F9C 802407EC 8C820000 */ lw $v0, ($a0) -/* BE3FA0 802407F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* BE3FA4 802407F4 E484003C */ swc1 $f4, 0x3c($a0) -/* BE3FA8 802407F8 AC80001C */ sw $zero, 0x1c($a0) -/* BE3FAC 802407FC 00431024 */ and $v0, $v0, $v1 -/* BE3FB0 80240800 AC820000 */ sw $v0, ($a0) -/* BE3FB4 80240804 2402000C */ addiu $v0, $zero, 0xc -/* BE3FB8 80240808 AE020070 */ sw $v0, 0x70($s0) -.L8024080C: -/* BE3FBC 8024080C 8FBF0014 */ lw $ra, 0x14($sp) -/* BE3FC0 80240810 8FB00010 */ lw $s0, 0x10($sp) -/* BE3FC4 80240814 03E00008 */ jr $ra -/* BE3FC8 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s index 1d43ab817f..3f28e5babc 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s @@ -161,7 +161,7 @@ glabel func_80240B94_BE4344 /* BE459C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* BE45A0 80240DF0 0280202D */ daddu $a0, $s4, $zero /* BE45A4 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* BE45A8 80240DF8 0C0901E9 */ jal func_802407A4_BE3F54 +/* BE45A8 80240DF8 0C0901E9 */ jal NpcJumpFunc /* BE45AC 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* BE45B0 80240E00 0809039A */ j .L80240E68 /* BE45B4 80240E04 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_802407A4_BE8384.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_802407A4_BE8384.s deleted file mode 100644 index 35739cb728..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_802407A4_BE8384.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A4_BE8384 -/* BE8384 802407A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BE8388 802407A8 AFB00010 */ sw $s0, 0x10($sp) -/* BE838C 802407AC 0080802D */ daddu $s0, $a0, $zero -/* BE8390 802407B0 AFBF0014 */ sw $ra, 0x14($sp) -/* BE8394 802407B4 8E020148 */ lw $v0, 0x148($s0) -/* BE8398 802407B8 0C00EABB */ jal get_npc_unsafe -/* BE839C 802407BC 84440008 */ lh $a0, 8($v0) -/* BE83A0 802407C0 0040202D */ daddu $a0, $v0, $zero -/* BE83A4 802407C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* BE83A8 802407C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* BE83AC 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* BE83B0 802407D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* BE83B4 802407D4 46040001 */ sub.s $f0, $f0, $f4 -/* BE83B8 802407D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* BE83BC 802407DC 4602203C */ c.lt.s $f4, $f2 -/* BE83C0 802407E0 E482003C */ swc1 $f2, 0x3c($a0) -/* BE83C4 802407E4 45010009 */ bc1t .L8024080C -/* BE83C8 802407E8 E480001C */ swc1 $f0, 0x1c($a0) -/* BE83CC 802407EC 8C820000 */ lw $v0, ($a0) -/* BE83D0 802407F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* BE83D4 802407F4 E484003C */ swc1 $f4, 0x3c($a0) -/* BE83D8 802407F8 AC80001C */ sw $zero, 0x1c($a0) -/* BE83DC 802407FC 00431024 */ and $v0, $v0, $v1 -/* BE83E0 80240800 AC820000 */ sw $v0, ($a0) -/* BE83E4 80240804 2402000C */ addiu $v0, $zero, 0xc -/* BE83E8 80240808 AE020070 */ sw $v0, 0x70($s0) -.L8024080C: -/* BE83EC 8024080C 8FBF0014 */ lw $ra, 0x14($sp) -/* BE83F0 80240810 8FB00010 */ lw $s0, 0x10($sp) -/* BE83F4 80240814 03E00008 */ jr $ra -/* BE83F8 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s index ba80ae5ba8..f21c79d307 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s @@ -161,7 +161,7 @@ glabel func_80240B94_BE8774 /* BE89CC 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* BE89D0 80240DF0 0280202D */ daddu $a0, $s4, $zero /* BE89D4 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* BE89D8 80240DF8 0C0901E9 */ jal func_802407A4_BE8384 +/* BE89D8 80240DF8 0C0901E9 */ jal NpcJumpFunc /* BE89DC 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* BE89E0 80240E00 0809039A */ j .L80240E68 /* BE89E4 80240E04 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242CD0_C00550.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242CD0_C00550.s deleted file mode 100644 index 4bd7f8bb90..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242CD0_C00550.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242CD0_C00550 -/* C00550 80242CD0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C00554 80242CD4 AFB00010 */ sw $s0, 0x10($sp) -/* C00558 80242CD8 0080802D */ daddu $s0, $a0, $zero -/* C0055C 80242CDC AFBF0014 */ sw $ra, 0x14($sp) -/* C00560 80242CE0 8E020148 */ lw $v0, 0x148($s0) -/* C00564 80242CE4 0C00EABB */ jal get_npc_unsafe -/* C00568 80242CE8 84440008 */ lh $a0, 8($v0) -/* C0056C 80242CEC 0040202D */ daddu $a0, $v0, $zero -/* C00570 80242CF0 C482003C */ lwc1 $f2, 0x3c($a0) -/* C00574 80242CF4 C480001C */ lwc1 $f0, 0x1c($a0) -/* C00578 80242CF8 46001080 */ add.s $f2, $f2, $f0 -/* C0057C 80242CFC C4840014 */ lwc1 $f4, 0x14($a0) -/* C00580 80242D00 46040001 */ sub.s $f0, $f0, $f4 -/* C00584 80242D04 C4840064 */ lwc1 $f4, 0x64($a0) -/* C00588 80242D08 4602203C */ c.lt.s $f4, $f2 -/* C0058C 80242D0C E482003C */ swc1 $f2, 0x3c($a0) -/* C00590 80242D10 45010009 */ bc1t .L80242D38 -/* C00594 80242D14 E480001C */ swc1 $f0, 0x1c($a0) -/* C00598 80242D18 8C820000 */ lw $v0, ($a0) -/* C0059C 80242D1C 2403F7FF */ addiu $v1, $zero, -0x801 -/* C005A0 80242D20 E484003C */ swc1 $f4, 0x3c($a0) -/* C005A4 80242D24 AC80001C */ sw $zero, 0x1c($a0) -/* C005A8 80242D28 00431024 */ and $v0, $v0, $v1 -/* C005AC 80242D2C AC820000 */ sw $v0, ($a0) -/* C005B0 80242D30 2402000C */ addiu $v0, $zero, 0xc -/* C005B4 80242D34 AE020070 */ sw $v0, 0x70($s0) -.L80242D38: -/* C005B8 80242D38 8FBF0014 */ lw $ra, 0x14($sp) -/* C005BC 80242D3C 8FB00010 */ lw $s0, 0x10($sp) -/* C005C0 80242D40 03E00008 */ jr $ra -/* C005C4 80242D44 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s index 4c5c70ee7f..e91f20472b 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s @@ -161,7 +161,7 @@ glabel func_802430C0_C00940 /* C00B98 80243318 02A0302D */ daddu $a2, $s5, $zero /* C00B9C 8024331C 0280202D */ daddu $a0, $s4, $zero /* C00BA0 80243320 0260282D */ daddu $a1, $s3, $zero -/* C00BA4 80243324 0C090B34 */ jal func_80242CD0_C00550 +/* C00BA4 80243324 0C090B34 */ jal NpcJumpFunc /* C00BA8 80243328 02A0302D */ daddu $a2, $s5, $zero /* C00BAC 8024332C 08090CE5 */ j .L80243394 /* C00BB0 80243330 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802412C4_C327A4.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802412C4_C327A4.s deleted file mode 100644 index 694e60925b..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802412C4_C327A4.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412C4_C327A4 -/* C327A4 802412C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C327A8 802412C8 AFB00010 */ sw $s0, 0x10($sp) -/* C327AC 802412CC 0080802D */ daddu $s0, $a0, $zero -/* C327B0 802412D0 AFBF0014 */ sw $ra, 0x14($sp) -/* C327B4 802412D4 8E020148 */ lw $v0, 0x148($s0) -/* C327B8 802412D8 0C00EABB */ jal get_npc_unsafe -/* C327BC 802412DC 84440008 */ lh $a0, 8($v0) -/* C327C0 802412E0 0040202D */ daddu $a0, $v0, $zero -/* C327C4 802412E4 C482003C */ lwc1 $f2, 0x3c($a0) -/* C327C8 802412E8 C480001C */ lwc1 $f0, 0x1c($a0) -/* C327CC 802412EC 46001080 */ add.s $f2, $f2, $f0 -/* C327D0 802412F0 C4840014 */ lwc1 $f4, 0x14($a0) -/* C327D4 802412F4 46040001 */ sub.s $f0, $f0, $f4 -/* C327D8 802412F8 C4840064 */ lwc1 $f4, 0x64($a0) -/* C327DC 802412FC 4602203C */ c.lt.s $f4, $f2 -/* C327E0 80241300 E482003C */ swc1 $f2, 0x3c($a0) -/* C327E4 80241304 45010009 */ bc1t .L8024132C -/* C327E8 80241308 E480001C */ swc1 $f0, 0x1c($a0) -/* C327EC 8024130C 8C820000 */ lw $v0, ($a0) -/* C327F0 80241310 2403F7FF */ addiu $v1, $zero, -0x801 -/* C327F4 80241314 E484003C */ swc1 $f4, 0x3c($a0) -/* C327F8 80241318 AC80001C */ sw $zero, 0x1c($a0) -/* C327FC 8024131C 00431024 */ and $v0, $v0, $v1 -/* C32800 80241320 AC820000 */ sw $v0, ($a0) -/* C32804 80241324 2402000C */ addiu $v0, $zero, 0xc -/* C32808 80241328 AE020070 */ sw $v0, 0x70($s0) -.L8024132C: -/* C3280C 8024132C 8FBF0014 */ lw $ra, 0x14($sp) -/* C32810 80241330 8FB00010 */ lw $s0, 0x10($sp) -/* C32814 80241334 03E00008 */ jr $ra -/* C32818 80241338 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s index c7d7f3a59a..a84ecda729 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s @@ -161,7 +161,7 @@ glabel func_802416B4_C32B94 /* C32DEC 8024190C 02A0302D */ daddu $a2, $s5, $zero /* C32DF0 80241910 0280202D */ daddu $a0, $s4, $zero /* C32DF4 80241914 0260282D */ daddu $a1, $s3, $zero -/* C32DF8 80241918 0C0904B1 */ jal func_802412C4_C327A4 +/* C32DF8 80241918 0C0904B1 */ jal NpcJumpFunc /* C32DFC 8024191C 02A0302D */ daddu $a2, $s5, $zero /* C32E00 80241920 08090662 */ j .L80241988 /* C32E04 80241924 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s index 4ff2f4253b..ab4781faab 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 @@ -137,7 +137,7 @@ glabel func_802419B0_C32E90 /* C33088 80241BA8 0280302D */ daddu $a2, $s4, $zero /* C3308C 80241BAC 0240202D */ daddu $a0, $s2, $zero /* C33090 80241BB0 0260282D */ daddu $a1, $s3, $zero -/* C33094 80241BB4 0C0904B1 */ jal func_802412C4_C327A4 +/* C33094 80241BB4 0C0904B1 */ jal NpcJumpFunc /* C33098 80241BB8 0280302D */ daddu $a2, $s4, $zero /* C3309C 80241BBC 08090715 */ j .L80241C54 /* C330A0 80241BC0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802407A4_C40554.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802407A4_C40554.s deleted file mode 100644 index 11786ff8cd..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802407A4_C40554.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A4_C40554 -/* C40554 802407A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C40558 802407A8 AFB00010 */ sw $s0, 0x10($sp) -/* C4055C 802407AC 0080802D */ daddu $s0, $a0, $zero -/* C40560 802407B0 AFBF0014 */ sw $ra, 0x14($sp) -/* C40564 802407B4 8E020148 */ lw $v0, 0x148($s0) -/* C40568 802407B8 0C00EABB */ jal get_npc_unsafe -/* C4056C 802407BC 84440008 */ lh $a0, 8($v0) -/* C40570 802407C0 0040202D */ daddu $a0, $v0, $zero -/* C40574 802407C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* C40578 802407C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* C4057C 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* C40580 802407D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* C40584 802407D4 46040001 */ sub.s $f0, $f0, $f4 -/* C40588 802407D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* C4058C 802407DC 4602203C */ c.lt.s $f4, $f2 -/* C40590 802407E0 E482003C */ swc1 $f2, 0x3c($a0) -/* C40594 802407E4 45010009 */ bc1t .L8024080C -/* C40598 802407E8 E480001C */ swc1 $f0, 0x1c($a0) -/* C4059C 802407EC 8C820000 */ lw $v0, ($a0) -/* C405A0 802407F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* C405A4 802407F4 E484003C */ swc1 $f4, 0x3c($a0) -/* C405A8 802407F8 AC80001C */ sw $zero, 0x1c($a0) -/* C405AC 802407FC 00431024 */ and $v0, $v0, $v1 -/* C405B0 80240800 AC820000 */ sw $v0, ($a0) -/* C405B4 80240804 2402000C */ addiu $v0, $zero, 0xc -/* C405B8 80240808 AE020070 */ sw $v0, 0x70($s0) -.L8024080C: -/* C405BC 8024080C 8FBF0014 */ lw $ra, 0x14($sp) -/* C405C0 80240810 8FB00010 */ lw $s0, 0x10($sp) -/* C405C4 80240814 03E00008 */ jr $ra -/* C405C8 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s index 6b48c223b1..f1e40daafe 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s @@ -161,7 +161,7 @@ glabel func_80240B94_C40944 /* C40B9C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* C40BA0 80240DF0 0280202D */ daddu $a0, $s4, $zero /* C40BA4 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* C40BA8 80240DF8 0C0901E9 */ jal func_802407A4_C40554 +/* C40BA8 80240DF8 0C0901E9 */ jal NpcJumpFunc /* C40BAC 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* C40BB0 80240E00 0809039A */ j .L80240E68 /* C40BB4 80240E04 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241074_C50584.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241074_C50584.s deleted file mode 100644 index fc241ca5fd..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241074_C50584.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241074_C50584 -/* C50584 80241074 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C50588 80241078 AFB00010 */ sw $s0, 0x10($sp) -/* C5058C 8024107C 0080802D */ daddu $s0, $a0, $zero -/* C50590 80241080 AFBF0014 */ sw $ra, 0x14($sp) -/* C50594 80241084 8E020148 */ lw $v0, 0x148($s0) -/* C50598 80241088 0C00EABB */ jal get_npc_unsafe -/* C5059C 8024108C 84440008 */ lh $a0, 8($v0) -/* C505A0 80241090 0040202D */ daddu $a0, $v0, $zero -/* C505A4 80241094 C482003C */ lwc1 $f2, 0x3c($a0) -/* C505A8 80241098 C480001C */ lwc1 $f0, 0x1c($a0) -/* C505AC 8024109C 46001080 */ add.s $f2, $f2, $f0 -/* C505B0 802410A0 C4840014 */ lwc1 $f4, 0x14($a0) -/* C505B4 802410A4 46040001 */ sub.s $f0, $f0, $f4 -/* C505B8 802410A8 C4840064 */ lwc1 $f4, 0x64($a0) -/* C505BC 802410AC 4602203C */ c.lt.s $f4, $f2 -/* C505C0 802410B0 E482003C */ swc1 $f2, 0x3c($a0) -/* C505C4 802410B4 45010009 */ bc1t .L802410DC -/* C505C8 802410B8 E480001C */ swc1 $f0, 0x1c($a0) -/* C505CC 802410BC 8C820000 */ lw $v0, ($a0) -/* C505D0 802410C0 2403F7FF */ addiu $v1, $zero, -0x801 -/* C505D4 802410C4 E484003C */ swc1 $f4, 0x3c($a0) -/* C505D8 802410C8 AC80001C */ sw $zero, 0x1c($a0) -/* C505DC 802410CC 00431024 */ and $v0, $v0, $v1 -/* C505E0 802410D0 AC820000 */ sw $v0, ($a0) -/* C505E4 802410D4 2402000C */ addiu $v0, $zero, 0xc -/* C505E8 802410D8 AE020070 */ sw $v0, 0x70($s0) -.L802410DC: -/* C505EC 802410DC 8FBF0014 */ lw $ra, 0x14($sp) -/* C505F0 802410E0 8FB00010 */ lw $s0, 0x10($sp) -/* C505F4 802410E4 03E00008 */ jr $ra -/* C505F8 802410E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s index eef2309a87..5969903078 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s @@ -161,7 +161,7 @@ glabel func_80241464_C50974 /* C50BCC 802416BC 02A0302D */ daddu $a2, $s5, $zero /* C50BD0 802416C0 0280202D */ daddu $a0, $s4, $zero /* C50BD4 802416C4 0260282D */ daddu $a1, $s3, $zero -/* C50BD8 802416C8 0C09041D */ jal func_80241074_C50584 +/* C50BD8 802416C8 0C09041D */ jal NpcJumpFunc /* C50BDC 802416CC 02A0302D */ daddu $a2, $s5, $zero /* C50BE0 802416D0 080905CE */ j .L80241738 /* C50BE4 802416D4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_802407A4_C566E4.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_802407A4_C566E4.s deleted file mode 100644 index 9b25ec53dc..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_802407A4_C566E4.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A4_C566E4 -/* C566E4 802407A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C566E8 802407A8 AFB00010 */ sw $s0, 0x10($sp) -/* C566EC 802407AC 0080802D */ daddu $s0, $a0, $zero -/* C566F0 802407B0 AFBF0014 */ sw $ra, 0x14($sp) -/* C566F4 802407B4 8E020148 */ lw $v0, 0x148($s0) -/* C566F8 802407B8 0C00EABB */ jal get_npc_unsafe -/* C566FC 802407BC 84440008 */ lh $a0, 8($v0) -/* C56700 802407C0 0040202D */ daddu $a0, $v0, $zero -/* C56704 802407C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* C56708 802407C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* C5670C 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* C56710 802407D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* C56714 802407D4 46040001 */ sub.s $f0, $f0, $f4 -/* C56718 802407D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* C5671C 802407DC 4602203C */ c.lt.s $f4, $f2 -/* C56720 802407E0 E482003C */ swc1 $f2, 0x3c($a0) -/* C56724 802407E4 45010009 */ bc1t .L8024080C -/* C56728 802407E8 E480001C */ swc1 $f0, 0x1c($a0) -/* C5672C 802407EC 8C820000 */ lw $v0, ($a0) -/* C56730 802407F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* C56734 802407F4 E484003C */ swc1 $f4, 0x3c($a0) -/* C56738 802407F8 AC80001C */ sw $zero, 0x1c($a0) -/* C5673C 802407FC 00431024 */ and $v0, $v0, $v1 -/* C56740 80240800 AC820000 */ sw $v0, ($a0) -/* C56744 80240804 2402000C */ addiu $v0, $zero, 0xc -/* C56748 80240808 AE020070 */ sw $v0, 0x70($s0) -.L8024080C: -/* C5674C 8024080C 8FBF0014 */ lw $ra, 0x14($sp) -/* C56750 80240810 8FB00010 */ lw $s0, 0x10($sp) -/* C56754 80240814 03E00008 */ jr $ra -/* C56758 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s index a6292543e4..1635e6476d 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s @@ -161,7 +161,7 @@ glabel func_80240B94_C56AD4 /* C56D2C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* C56D30 80240DF0 0280202D */ daddu $a0, $s4, $zero /* C56D34 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* C56D38 80240DF8 0C0901E9 */ jal func_802407A4_C566E4 +/* C56D38 80240DF8 0C0901E9 */ jal NpcJumpFunc /* C56D3C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* C56D40 80240E00 0809039A */ j .L80240E68 /* C56D44 80240E04 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240D84_95BF84.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240D84_95BF84.s deleted file mode 100644 index efcd26be8f..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240D84_95BF84.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D84_95BF84 -/* 95BF84 80240D84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95BF88 80240D88 AFB00010 */ sw $s0, 0x10($sp) -/* 95BF8C 80240D8C 0080802D */ daddu $s0, $a0, $zero -/* 95BF90 80240D90 AFBF0014 */ sw $ra, 0x14($sp) -/* 95BF94 80240D94 8E020148 */ lw $v0, 0x148($s0) -/* 95BF98 80240D98 0C00EABB */ jal get_npc_unsafe -/* 95BF9C 80240D9C 84440008 */ lh $a0, 8($v0) -/* 95BFA0 80240DA0 0040202D */ daddu $a0, $v0, $zero -/* 95BFA4 80240DA4 C482003C */ lwc1 $f2, 0x3c($a0) -/* 95BFA8 80240DA8 C480001C */ lwc1 $f0, 0x1c($a0) -/* 95BFAC 80240DAC 46001080 */ add.s $f2, $f2, $f0 -/* 95BFB0 80240DB0 C4840014 */ lwc1 $f4, 0x14($a0) -/* 95BFB4 80240DB4 46040001 */ sub.s $f0, $f0, $f4 -/* 95BFB8 80240DB8 C4840064 */ lwc1 $f4, 0x64($a0) -/* 95BFBC 80240DBC 4602203C */ c.lt.s $f4, $f2 -/* 95BFC0 80240DC0 E482003C */ swc1 $f2, 0x3c($a0) -/* 95BFC4 80240DC4 45010009 */ bc1t .L80240DEC -/* 95BFC8 80240DC8 E480001C */ swc1 $f0, 0x1c($a0) -/* 95BFCC 80240DCC 8C820000 */ lw $v0, ($a0) -/* 95BFD0 80240DD0 2403F7FF */ addiu $v1, $zero, -0x801 -/* 95BFD4 80240DD4 E484003C */ swc1 $f4, 0x3c($a0) -/* 95BFD8 80240DD8 AC80001C */ sw $zero, 0x1c($a0) -/* 95BFDC 80240DDC 00431024 */ and $v0, $v0, $v1 -/* 95BFE0 80240DE0 AC820000 */ sw $v0, ($a0) -/* 95BFE4 80240DE4 2402000C */ addiu $v0, $zero, 0xc -/* 95BFE8 80240DE8 AE020070 */ sw $v0, 0x70($s0) -.L80240DEC: -/* 95BFEC 80240DEC 8FBF0014 */ lw $ra, 0x14($sp) -/* 95BFF0 80240DF0 8FB00010 */ lw $s0, 0x10($sp) -/* 95BFF4 80240DF4 03E00008 */ jr $ra -/* 95BFF8 80240DF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s index cc838a9ea9..540b8e3181 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s @@ -161,7 +161,7 @@ glabel func_80241174_95C374 /* 95C5CC 802413CC 02A0302D */ daddu $a2, $s5, $zero /* 95C5D0 802413D0 0280202D */ daddu $a0, $s4, $zero /* 95C5D4 802413D4 0260282D */ daddu $a1, $s3, $zero -/* 95C5D8 802413D8 0C090361 */ jal func_80240D84_95BF84 +/* 95C5D8 802413D8 0C090361 */ jal NpcJumpFunc /* 95C5DC 802413DC 02A0302D */ daddu $a2, $s5, $zero /* 95C5E0 802413E0 08090512 */ j .L80241448 /* 95C5E4 802413E4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802407E4_C9E704.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802407E4_C9E704.s deleted file mode 100644 index ffec1146d5..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802407E4_C9E704.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407E4_C9E704 -/* C9E704 802407E4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9E708 802407E8 AFB00010 */ sw $s0, 0x10($sp) -/* C9E70C 802407EC 0080802D */ daddu $s0, $a0, $zero -/* C9E710 802407F0 AFBF0014 */ sw $ra, 0x14($sp) -/* C9E714 802407F4 8E020148 */ lw $v0, 0x148($s0) -/* C9E718 802407F8 0C00EABB */ jal get_npc_unsafe -/* C9E71C 802407FC 84440008 */ lh $a0, 8($v0) -/* C9E720 80240800 0040202D */ daddu $a0, $v0, $zero -/* C9E724 80240804 C482003C */ lwc1 $f2, 0x3c($a0) -/* C9E728 80240808 C480001C */ lwc1 $f0, 0x1c($a0) -/* C9E72C 8024080C 46001080 */ add.s $f2, $f2, $f0 -/* C9E730 80240810 C4840014 */ lwc1 $f4, 0x14($a0) -/* C9E734 80240814 46040001 */ sub.s $f0, $f0, $f4 -/* C9E738 80240818 C4840064 */ lwc1 $f4, 0x64($a0) -/* C9E73C 8024081C 4602203C */ c.lt.s $f4, $f2 -/* C9E740 80240820 E482003C */ swc1 $f2, 0x3c($a0) -/* C9E744 80240824 45010009 */ bc1t .L8024084C -/* C9E748 80240828 E480001C */ swc1 $f0, 0x1c($a0) -/* C9E74C 8024082C 8C820000 */ lw $v0, ($a0) -/* C9E750 80240830 2403F7FF */ addiu $v1, $zero, -0x801 -/* C9E754 80240834 E484003C */ swc1 $f4, 0x3c($a0) -/* C9E758 80240838 AC80001C */ sw $zero, 0x1c($a0) -/* C9E75C 8024083C 00431024 */ and $v0, $v0, $v1 -/* C9E760 80240840 AC820000 */ sw $v0, ($a0) -/* C9E764 80240844 2402000C */ addiu $v0, $zero, 0xc -/* C9E768 80240848 AE020070 */ sw $v0, 0x70($s0) -.L8024084C: -/* C9E76C 8024084C 8FBF0014 */ lw $ra, 0x14($sp) -/* C9E770 80240850 8FB00010 */ lw $s0, 0x10($sp) -/* C9E774 80240854 03E00008 */ jr $ra -/* C9E778 80240858 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s index 382df070a1..e70e472ef5 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s @@ -161,7 +161,7 @@ glabel func_80240BD4_C9EAF4 /* C9ED4C 80240E2C 02A0302D */ daddu $a2, $s5, $zero /* C9ED50 80240E30 0280202D */ daddu $a0, $s4, $zero /* C9ED54 80240E34 0260282D */ daddu $a1, $s3, $zero -/* C9ED58 80240E38 0C0901F9 */ jal func_802407E4_C9E704 +/* C9ED58 80240E38 0C0901F9 */ jal NpcJumpFunc /* C9ED5C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* C9ED60 80240E40 080903AA */ j .L80240EA8 /* C9ED64 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240BD4_B2D044.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240BD4_B2D044.s deleted file mode 100644 index 6d863dd452..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240BD4_B2D044.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BD4_B2D044 -/* B2D044 80240BD4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2D048 80240BD8 AFB00010 */ sw $s0, 0x10($sp) -/* B2D04C 80240BDC 0080802D */ daddu $s0, $a0, $zero -/* B2D050 80240BE0 AFBF0014 */ sw $ra, 0x14($sp) -/* B2D054 80240BE4 8E020148 */ lw $v0, 0x148($s0) -/* B2D058 80240BE8 0C00EABB */ jal get_npc_unsafe -/* B2D05C 80240BEC 84440008 */ lh $a0, 8($v0) -/* B2D060 80240BF0 0040202D */ daddu $a0, $v0, $zero -/* B2D064 80240BF4 C482003C */ lwc1 $f2, 0x3c($a0) -/* B2D068 80240BF8 C480001C */ lwc1 $f0, 0x1c($a0) -/* B2D06C 80240BFC 46001080 */ add.s $f2, $f2, $f0 -/* B2D070 80240C00 C4840014 */ lwc1 $f4, 0x14($a0) -/* B2D074 80240C04 46040001 */ sub.s $f0, $f0, $f4 -/* B2D078 80240C08 C4840064 */ lwc1 $f4, 0x64($a0) -/* B2D07C 80240C0C 4602203C */ c.lt.s $f4, $f2 -/* B2D080 80240C10 E482003C */ swc1 $f2, 0x3c($a0) -/* B2D084 80240C14 45010009 */ bc1t .L80240C3C -/* B2D088 80240C18 E480001C */ swc1 $f0, 0x1c($a0) -/* B2D08C 80240C1C 8C820000 */ lw $v0, ($a0) -/* B2D090 80240C20 2403F7FF */ addiu $v1, $zero, -0x801 -/* B2D094 80240C24 E484003C */ swc1 $f4, 0x3c($a0) -/* B2D098 80240C28 AC80001C */ sw $zero, 0x1c($a0) -/* B2D09C 80240C2C 00431024 */ and $v0, $v0, $v1 -/* B2D0A0 80240C30 AC820000 */ sw $v0, ($a0) -/* B2D0A4 80240C34 2402000C */ addiu $v0, $zero, 0xc -/* B2D0A8 80240C38 AE020070 */ sw $v0, 0x70($s0) -.L80240C3C: -/* B2D0AC 80240C3C 8FBF0014 */ lw $ra, 0x14($sp) -/* B2D0B0 80240C40 8FB00010 */ lw $s0, 0x10($sp) -/* B2D0B4 80240C44 03E00008 */ jr $ra -/* B2D0B8 80240C48 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s index deeb08884f..257c4fd39e 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s @@ -161,7 +161,7 @@ glabel func_80240FC4_B2D434 /* B2D68C 8024121C 02A0302D */ daddu $a2, $s5, $zero /* B2D690 80241220 0280202D */ daddu $a0, $s4, $zero /* B2D694 80241224 0260282D */ daddu $a1, $s3, $zero -/* B2D698 80241228 0C0902F5 */ jal func_80240BD4_B2D044 +/* B2D698 80241228 0C0902F5 */ jal NpcJumpFunc /* B2D69C 8024122C 02A0302D */ daddu $a2, $s5, $zero /* B2D6A0 80241230 080904A6 */ j .L80241298 /* B2D6A4 80241234 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240DC4_B35994.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240DC4_B35994.s deleted file mode 100644 index 1944e27a9a..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240DC4_B35994.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DC4_B35994 -/* B35994 80240DC4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B35998 80240DC8 AFB00010 */ sw $s0, 0x10($sp) -/* B3599C 80240DCC 0080802D */ daddu $s0, $a0, $zero -/* B359A0 80240DD0 AFBF0014 */ sw $ra, 0x14($sp) -/* B359A4 80240DD4 8E020148 */ lw $v0, 0x148($s0) -/* B359A8 80240DD8 0C00EABB */ jal get_npc_unsafe -/* B359AC 80240DDC 84440008 */ lh $a0, 8($v0) -/* B359B0 80240DE0 0040202D */ daddu $a0, $v0, $zero -/* B359B4 80240DE4 C482003C */ lwc1 $f2, 0x3c($a0) -/* B359B8 80240DE8 C480001C */ lwc1 $f0, 0x1c($a0) -/* B359BC 80240DEC 46001080 */ add.s $f2, $f2, $f0 -/* B359C0 80240DF0 C4840014 */ lwc1 $f4, 0x14($a0) -/* B359C4 80240DF4 46040001 */ sub.s $f0, $f0, $f4 -/* B359C8 80240DF8 C4840064 */ lwc1 $f4, 0x64($a0) -/* B359CC 80240DFC 4602203C */ c.lt.s $f4, $f2 -/* B359D0 80240E00 E482003C */ swc1 $f2, 0x3c($a0) -/* B359D4 80240E04 45010009 */ bc1t .L80240E2C -/* B359D8 80240E08 E480001C */ swc1 $f0, 0x1c($a0) -/* B359DC 80240E0C 8C820000 */ lw $v0, ($a0) -/* B359E0 80240E10 2403F7FF */ addiu $v1, $zero, -0x801 -/* B359E4 80240E14 E484003C */ swc1 $f4, 0x3c($a0) -/* B359E8 80240E18 AC80001C */ sw $zero, 0x1c($a0) -/* B359EC 80240E1C 00431024 */ and $v0, $v0, $v1 -/* B359F0 80240E20 AC820000 */ sw $v0, ($a0) -/* B359F4 80240E24 2402000C */ addiu $v0, $zero, 0xc -/* B359F8 80240E28 AE020070 */ sw $v0, 0x70($s0) -.L80240E2C: -/* B359FC 80240E2C 8FBF0014 */ lw $ra, 0x14($sp) -/* B35A00 80240E30 8FB00010 */ lw $s0, 0x10($sp) -/* B35A04 80240E34 03E00008 */ jr $ra -/* B35A08 80240E38 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s index 7d5eb2265e..c009d40572 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s @@ -161,7 +161,7 @@ glabel func_802411B4_B35D84 /* B35FDC 8024140C 02A0302D */ daddu $a2, $s5, $zero /* B35FE0 80241410 0280202D */ daddu $a0, $s4, $zero /* B35FE4 80241414 0260282D */ daddu $a1, $s3, $zero -/* B35FE8 80241418 0C090371 */ jal func_80240DC4_B35994 +/* B35FE8 80241418 0C090371 */ jal NpcJumpFunc /* B35FEC 8024141C 02A0302D */ daddu $a2, $s5, $zero /* B35FF0 80241420 08090522 */ j .L80241488 /* B35FF4 80241424 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_802407A4_B84924.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_802407A4_B84924.s deleted file mode 100644 index c328dd7368..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_802407A4_B84924.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A4_B84924 -/* B84924 802407A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B84928 802407A8 AFB00010 */ sw $s0, 0x10($sp) -/* B8492C 802407AC 0080802D */ daddu $s0, $a0, $zero -/* B84930 802407B0 AFBF0014 */ sw $ra, 0x14($sp) -/* B84934 802407B4 8E020148 */ lw $v0, 0x148($s0) -/* B84938 802407B8 0C00EABB */ jal get_npc_unsafe -/* B8493C 802407BC 84440008 */ lh $a0, 8($v0) -/* B84940 802407C0 0040202D */ daddu $a0, $v0, $zero -/* B84944 802407C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* B84948 802407C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* B8494C 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* B84950 802407D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* B84954 802407D4 46040001 */ sub.s $f0, $f0, $f4 -/* B84958 802407D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* B8495C 802407DC 4602203C */ c.lt.s $f4, $f2 -/* B84960 802407E0 E482003C */ swc1 $f2, 0x3c($a0) -/* B84964 802407E4 45010009 */ bc1t .L8024080C -/* B84968 802407E8 E480001C */ swc1 $f0, 0x1c($a0) -/* B8496C 802407EC 8C820000 */ lw $v0, ($a0) -/* B84970 802407F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* B84974 802407F4 E484003C */ swc1 $f4, 0x3c($a0) -/* B84978 802407F8 AC80001C */ sw $zero, 0x1c($a0) -/* B8497C 802407FC 00431024 */ and $v0, $v0, $v1 -/* B84980 80240800 AC820000 */ sw $v0, ($a0) -/* B84984 80240804 2402000C */ addiu $v0, $zero, 0xc -/* B84988 80240808 AE020070 */ sw $v0, 0x70($s0) -.L8024080C: -/* B8498C 8024080C 8FBF0014 */ lw $ra, 0x14($sp) -/* B84990 80240810 8FB00010 */ lw $s0, 0x10($sp) -/* B84994 80240814 03E00008 */ jr $ra -/* B84998 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s index 54c39d55d9..4ba6de0880 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s @@ -161,7 +161,7 @@ glabel func_80240B94_B84D14 /* B84F6C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* B84F70 80240DF0 0280202D */ daddu $a0, $s4, $zero /* B84F74 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* B84F78 80240DF8 0C0901E9 */ jal func_802407A4_B84924 +/* B84F78 80240DF8 0C0901E9 */ jal NpcJumpFunc /* B84F7C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* B84F80 80240E00 0809039A */ j .L80240E68 /* B84F84 80240E04 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240854_ABBAE4.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240854_ABBAE4.s deleted file mode 100644 index e1c0edee8f..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240854_ABBAE4.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240854_ABBAE4 -/* ABBAE4 80240854 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ABBAE8 80240858 AFB00010 */ sw $s0, 0x10($sp) -/* ABBAEC 8024085C 0080802D */ daddu $s0, $a0, $zero -/* ABBAF0 80240860 AFBF0014 */ sw $ra, 0x14($sp) -/* ABBAF4 80240864 8E020148 */ lw $v0, 0x148($s0) -/* ABBAF8 80240868 0C00EABB */ jal get_npc_unsafe -/* ABBAFC 8024086C 84440008 */ lh $a0, 8($v0) -/* ABBB00 80240870 0040202D */ daddu $a0, $v0, $zero -/* ABBB04 80240874 C482003C */ lwc1 $f2, 0x3c($a0) -/* ABBB08 80240878 C480001C */ lwc1 $f0, 0x1c($a0) -/* ABBB0C 8024087C 46001080 */ add.s $f2, $f2, $f0 -/* ABBB10 80240880 C4840014 */ lwc1 $f4, 0x14($a0) -/* ABBB14 80240884 46040001 */ sub.s $f0, $f0, $f4 -/* ABBB18 80240888 C4840064 */ lwc1 $f4, 0x64($a0) -/* ABBB1C 8024088C 4602203C */ c.lt.s $f4, $f2 -/* ABBB20 80240890 E482003C */ swc1 $f2, 0x3c($a0) -/* ABBB24 80240894 45010009 */ bc1t .L802408BC -/* ABBB28 80240898 E480001C */ swc1 $f0, 0x1c($a0) -/* ABBB2C 8024089C 8C820000 */ lw $v0, ($a0) -/* ABBB30 802408A0 2403F7FF */ addiu $v1, $zero, -0x801 -/* ABBB34 802408A4 E484003C */ swc1 $f4, 0x3c($a0) -/* ABBB38 802408A8 AC80001C */ sw $zero, 0x1c($a0) -/* ABBB3C 802408AC 00431024 */ and $v0, $v0, $v1 -/* ABBB40 802408B0 AC820000 */ sw $v0, ($a0) -/* ABBB44 802408B4 2402000C */ addiu $v0, $zero, 0xc -/* ABBB48 802408B8 AE020070 */ sw $v0, 0x70($s0) -.L802408BC: -/* ABBB4C 802408BC 8FBF0014 */ lw $ra, 0x14($sp) -/* ABBB50 802408C0 8FB00010 */ lw $s0, 0x10($sp) -/* ABBB54 802408C4 03E00008 */ jr $ra -/* ABBB58 802408C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s index eed4dbacb6..be91223db2 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s @@ -161,7 +161,7 @@ glabel func_80240C44_ABBED4 /* ABC12C 80240E9C 02A0302D */ daddu $a2, $s5, $zero /* ABC130 80240EA0 0280202D */ daddu $a0, $s4, $zero /* ABC134 80240EA4 0260282D */ daddu $a1, $s3, $zero -/* ABC138 80240EA8 0C090215 */ jal func_80240854_ABBAE4 +/* ABC138 80240EA8 0C090215 */ jal NpcJumpFunc /* ABC13C 80240EAC 02A0302D */ daddu $a2, $s5, $zero /* ABC140 80240EB0 080903C6 */ j .L80240F18 /* ABC144 80240EB4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_802407A4_AC5914.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_802407A4_AC5914.s deleted file mode 100644 index f423faed44..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_802407A4_AC5914.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A4_AC5914 -/* AC5914 802407A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AC5918 802407A8 AFB00010 */ sw $s0, 0x10($sp) -/* AC591C 802407AC 0080802D */ daddu $s0, $a0, $zero -/* AC5920 802407B0 AFBF0014 */ sw $ra, 0x14($sp) -/* AC5924 802407B4 8E020148 */ lw $v0, 0x148($s0) -/* AC5928 802407B8 0C00EABB */ jal get_npc_unsafe -/* AC592C 802407BC 84440008 */ lh $a0, 8($v0) -/* AC5930 802407C0 0040202D */ daddu $a0, $v0, $zero -/* AC5934 802407C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* AC5938 802407C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* AC593C 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* AC5940 802407D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* AC5944 802407D4 46040001 */ sub.s $f0, $f0, $f4 -/* AC5948 802407D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* AC594C 802407DC 4602203C */ c.lt.s $f4, $f2 -/* AC5950 802407E0 E482003C */ swc1 $f2, 0x3c($a0) -/* AC5954 802407E4 45010009 */ bc1t .L8024080C -/* AC5958 802407E8 E480001C */ swc1 $f0, 0x1c($a0) -/* AC595C 802407EC 8C820000 */ lw $v0, ($a0) -/* AC5960 802407F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* AC5964 802407F4 E484003C */ swc1 $f4, 0x3c($a0) -/* AC5968 802407F8 AC80001C */ sw $zero, 0x1c($a0) -/* AC596C 802407FC 00431024 */ and $v0, $v0, $v1 -/* AC5970 80240800 AC820000 */ sw $v0, ($a0) -/* AC5974 80240804 2402000C */ addiu $v0, $zero, 0xc -/* AC5978 80240808 AE020070 */ sw $v0, 0x70($s0) -.L8024080C: -/* AC597C 8024080C 8FBF0014 */ lw $ra, 0x14($sp) -/* AC5980 80240810 8FB00010 */ lw $s0, 0x10($sp) -/* AC5984 80240814 03E00008 */ jr $ra -/* AC5988 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s index da8f68d326..f7c2be8734 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s +++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s @@ -161,7 +161,7 @@ glabel func_80240B94_AC5D04 /* AC5F5C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* AC5F60 80240DF0 0280202D */ daddu $a0, $s4, $zero /* AC5F64 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* AC5F68 80240DF8 0C0901E9 */ jal func_802407A4_AC5914 +/* AC5F68 80240DF8 0C0901E9 */ jal NpcJumpFunc /* AC5F6C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* AC5F70 80240E00 0809039A */ j .L80240E68 /* AC5F74 80240E04 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241658_8B16C8.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241658_8B16C8.s deleted file mode 100644 index 8c655535db..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241658_8B16C8.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241658_8B16C8 -/* 8B16C8 80241658 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B16CC 8024165C AFB00010 */ sw $s0, 0x10($sp) -/* 8B16D0 80241660 0080802D */ daddu $s0, $a0, $zero -/* 8B16D4 80241664 AFBF0014 */ sw $ra, 0x14($sp) -/* 8B16D8 80241668 8E020148 */ lw $v0, 0x148($s0) -/* 8B16DC 8024166C 0C00EABB */ jal get_npc_unsafe -/* 8B16E0 80241670 84440008 */ lh $a0, 8($v0) -/* 8B16E4 80241674 0040202D */ daddu $a0, $v0, $zero -/* 8B16E8 80241678 C482003C */ lwc1 $f2, 0x3c($a0) -/* 8B16EC 8024167C C480001C */ lwc1 $f0, 0x1c($a0) -/* 8B16F0 80241680 46001080 */ add.s $f2, $f2, $f0 -/* 8B16F4 80241684 C4840014 */ lwc1 $f4, 0x14($a0) -/* 8B16F8 80241688 46040001 */ sub.s $f0, $f0, $f4 -/* 8B16FC 8024168C C4840064 */ lwc1 $f4, 0x64($a0) -/* 8B1700 80241690 4602203C */ c.lt.s $f4, $f2 -/* 8B1704 80241694 E482003C */ swc1 $f2, 0x3c($a0) -/* 8B1708 80241698 45010009 */ bc1t .L802416C0 -/* 8B170C 8024169C E480001C */ swc1 $f0, 0x1c($a0) -/* 8B1710 802416A0 8C820000 */ lw $v0, ($a0) -/* 8B1714 802416A4 2403F7FF */ addiu $v1, $zero, -0x801 -/* 8B1718 802416A8 E484003C */ swc1 $f4, 0x3c($a0) -/* 8B171C 802416AC AC80001C */ sw $zero, 0x1c($a0) -/* 8B1720 802416B0 00431024 */ and $v0, $v0, $v1 -/* 8B1724 802416B4 AC820000 */ sw $v0, ($a0) -/* 8B1728 802416B8 2402000C */ addiu $v0, $zero, 0xc -/* 8B172C 802416BC AE020070 */ sw $v0, 0x70($s0) -.L802416C0: -/* 8B1730 802416C0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8B1734 802416C4 8FB00010 */ lw $s0, 0x10($sp) -/* 8B1738 802416C8 03E00008 */ jr $ra -/* 8B173C 802416CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s index 270f27cac6..da24c27dd9 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s @@ -123,7 +123,7 @@ glabel func_80241C18_8B1C88 /* 8B1E4C 80241DDC 02A0302D */ daddu $a2, $s5, $zero /* 8B1E50 80241DE0 0280202D */ daddu $a0, $s4, $zero /* 8B1E54 80241DE4 0260282D */ daddu $a1, $s3, $zero -/* 8B1E58 80241DE8 0C090596 */ jal func_80241658_8B16C8 +/* 8B1E58 80241DE8 0C090596 */ jal NpcJumpFunc /* 8B1E5C 80241DEC 02A0302D */ daddu $a2, $s5, $zero /* 8B1E60 80241DF0 0809079A */ j .L80241E68 /* 8B1E64 80241DF4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240234_8D3FF4.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240234_8D3FF4.s deleted file mode 100644 index 8ab8df6d82..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240234_8D3FF4.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240234_8D3FF4 -/* 8D3FF4 80240234 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D3FF8 80240238 AFB00010 */ sw $s0, 0x10($sp) -/* 8D3FFC 8024023C 0080802D */ daddu $s0, $a0, $zero -/* 8D4000 80240240 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D4004 80240244 8E020148 */ lw $v0, 0x148($s0) -/* 8D4008 80240248 0C00EABB */ jal get_npc_unsafe -/* 8D400C 8024024C 84440008 */ lh $a0, 8($v0) -/* 8D4010 80240250 0040202D */ daddu $a0, $v0, $zero -/* 8D4014 80240254 C482003C */ lwc1 $f2, 0x3c($a0) -/* 8D4018 80240258 C480001C */ lwc1 $f0, 0x1c($a0) -/* 8D401C 8024025C 46001080 */ add.s $f2, $f2, $f0 -/* 8D4020 80240260 C4840014 */ lwc1 $f4, 0x14($a0) -/* 8D4024 80240264 46040001 */ sub.s $f0, $f0, $f4 -/* 8D4028 80240268 C4840064 */ lwc1 $f4, 0x64($a0) -/* 8D402C 8024026C 4602203C */ c.lt.s $f4, $f2 -/* 8D4030 80240270 E482003C */ swc1 $f2, 0x3c($a0) -/* 8D4034 80240274 45010009 */ bc1t .L8024029C -/* 8D4038 80240278 E480001C */ swc1 $f0, 0x1c($a0) -/* 8D403C 8024027C 8C820000 */ lw $v0, ($a0) -/* 8D4040 80240280 2403F7FF */ addiu $v1, $zero, -0x801 -/* 8D4044 80240284 E484003C */ swc1 $f4, 0x3c($a0) -/* 8D4048 80240288 AC80001C */ sw $zero, 0x1c($a0) -/* 8D404C 8024028C 00431024 */ and $v0, $v0, $v1 -/* 8D4050 80240290 AC820000 */ sw $v0, ($a0) -/* 8D4054 80240294 2402000C */ addiu $v0, $zero, 0xc -/* 8D4058 80240298 AE020070 */ sw $v0, 0x70($s0) -.L8024029C: -/* 8D405C 8024029C 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D4060 802402A0 8FB00010 */ lw $s0, 0x10($sp) -/* 8D4064 802402A4 03E00008 */ jr $ra -/* 8D4068 802402A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s index 53243bfcd2..499779e184 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s @@ -123,7 +123,7 @@ glabel func_802407F4_8D45B4 /* 8D4778 802409B8 02A0302D */ daddu $a2, $s5, $zero /* 8D477C 802409BC 0280202D */ daddu $a0, $s4, $zero /* 8D4780 802409C0 0260282D */ daddu $a1, $s3, $zero -/* 8D4784 802409C4 0C09008D */ jal func_80240234_8D3FF4 +/* 8D4784 802409C4 0C09008D */ jal NpcJumpFunc /* 8D4788 802409C8 02A0302D */ daddu $a2, $s5, $zero /* 8D478C 802409CC 08090291 */ j .L80240A44 /* 8D4790 802409D0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802405A4_8DA6A4.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802405A4_8DA6A4.s deleted file mode 100644 index 6ce79668d7..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802405A4_8DA6A4.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A4_8DA6A4 -/* 8DA6A4 802405A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8DA6A8 802405A8 AFB00010 */ sw $s0, 0x10($sp) -/* 8DA6AC 802405AC 0080802D */ daddu $s0, $a0, $zero -/* 8DA6B0 802405B0 AFBF0014 */ sw $ra, 0x14($sp) -/* 8DA6B4 802405B4 8E020148 */ lw $v0, 0x148($s0) -/* 8DA6B8 802405B8 0C00EABB */ jal get_npc_unsafe -/* 8DA6BC 802405BC 84440008 */ lh $a0, 8($v0) -/* 8DA6C0 802405C0 0040202D */ daddu $a0, $v0, $zero -/* 8DA6C4 802405C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* 8DA6C8 802405C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* 8DA6CC 802405CC 46001080 */ add.s $f2, $f2, $f0 -/* 8DA6D0 802405D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* 8DA6D4 802405D4 46040001 */ sub.s $f0, $f0, $f4 -/* 8DA6D8 802405D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* 8DA6DC 802405DC 4602203C */ c.lt.s $f4, $f2 -/* 8DA6E0 802405E0 E482003C */ swc1 $f2, 0x3c($a0) -/* 8DA6E4 802405E4 45010009 */ bc1t .L8024060C -/* 8DA6E8 802405E8 E480001C */ swc1 $f0, 0x1c($a0) -/* 8DA6EC 802405EC 8C820000 */ lw $v0, ($a0) -/* 8DA6F0 802405F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* 8DA6F4 802405F4 E484003C */ swc1 $f4, 0x3c($a0) -/* 8DA6F8 802405F8 AC80001C */ sw $zero, 0x1c($a0) -/* 8DA6FC 802405FC 00431024 */ and $v0, $v0, $v1 -/* 8DA700 80240600 AC820000 */ sw $v0, ($a0) -/* 8DA704 80240604 2402000C */ addiu $v0, $zero, 0xc -/* 8DA708 80240608 AE020070 */ sw $v0, 0x70($s0) -.L8024060C: -/* 8DA70C 8024060C 8FBF0014 */ lw $ra, 0x14($sp) -/* 8DA710 80240610 8FB00010 */ lw $s0, 0x10($sp) -/* 8DA714 80240614 03E00008 */ jr $ra -/* 8DA718 80240618 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s index f8195752b0..162ae1ad96 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s @@ -123,7 +123,7 @@ glabel func_80240B64_8DAC64 /* 8DAE28 80240D28 02A0302D */ daddu $a2, $s5, $zero /* 8DAE2C 80240D2C 0280202D */ daddu $a0, $s4, $zero /* 8DAE30 80240D30 0260282D */ daddu $a1, $s3, $zero -/* 8DAE34 80240D34 0C090169 */ jal func_802405A4_8DA6A4 +/* 8DAE34 80240D34 0C090169 */ jal NpcJumpFunc /* 8DAE38 80240D38 02A0302D */ daddu $a2, $s5, $zero /* 8DAE3C 80240D3C 0809036D */ j .L80240DB4 /* 8DAE40 80240D40 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802407A4_A871F4.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802407A4_A871F4.s deleted file mode 100644 index f7ad3a4aca..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802407A4_A871F4.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A4_A871F4 -/* A871F4 802407A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A871F8 802407A8 AFB00010 */ sw $s0, 0x10($sp) -/* A871FC 802407AC 0080802D */ daddu $s0, $a0, $zero -/* A87200 802407B0 AFBF0014 */ sw $ra, 0x14($sp) -/* A87204 802407B4 8E020148 */ lw $v0, 0x148($s0) -/* A87208 802407B8 0C00EABB */ jal get_npc_unsafe -/* A8720C 802407BC 84440008 */ lh $a0, 8($v0) -/* A87210 802407C0 0040202D */ daddu $a0, $v0, $zero -/* A87214 802407C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* A87218 802407C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* A8721C 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* A87220 802407D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* A87224 802407D4 46040001 */ sub.s $f0, $f0, $f4 -/* A87228 802407D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* A8722C 802407DC 4602203C */ c.lt.s $f4, $f2 -/* A87230 802407E0 E482003C */ swc1 $f2, 0x3c($a0) -/* A87234 802407E4 45010009 */ bc1t .L8024080C -/* A87238 802407E8 E480001C */ swc1 $f0, 0x1c($a0) -/* A8723C 802407EC 8C820000 */ lw $v0, ($a0) -/* A87240 802407F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* A87244 802407F4 E484003C */ swc1 $f4, 0x3c($a0) -/* A87248 802407F8 AC80001C */ sw $zero, 0x1c($a0) -/* A8724C 802407FC 00431024 */ and $v0, $v0, $v1 -/* A87250 80240800 AC820000 */ sw $v0, ($a0) -/* A87254 80240804 2402000C */ addiu $v0, $zero, 0xc -/* A87258 80240808 AE020070 */ sw $v0, 0x70($s0) -.L8024080C: -/* A8725C 8024080C 8FBF0014 */ lw $ra, 0x14($sp) -/* A87260 80240810 8FB00010 */ lw $s0, 0x10($sp) -/* A87264 80240814 03E00008 */ jr $ra -/* A87268 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s index 82e79baa4a..a49f2fdc68 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s @@ -161,7 +161,7 @@ glabel func_80240B94_A875E4 /* A8783C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* A87840 80240DF0 0280202D */ daddu $a0, $s4, $zero /* A87844 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* A87848 80240DF8 0C0901E9 */ jal func_802407A4_A871F4 +/* A87848 80240DF8 0C0901E9 */ jal NpcJumpFunc /* A8784C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* A87850 80240E00 0809039A */ j .L80240E68 /* A87854 80240E04 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240884_A8D304.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240884_A8D304.s deleted file mode 100644 index 4861aca27e..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240884_A8D304.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240884_A8D304 -/* A8D304 80240884 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8D308 80240888 AFB00010 */ sw $s0, 0x10($sp) -/* A8D30C 8024088C 0080802D */ daddu $s0, $a0, $zero -/* A8D310 80240890 AFBF0014 */ sw $ra, 0x14($sp) -/* A8D314 80240894 8E020148 */ lw $v0, 0x148($s0) -/* A8D318 80240898 0C00EABB */ jal get_npc_unsafe -/* A8D31C 8024089C 84440008 */ lh $a0, 8($v0) -/* A8D320 802408A0 0040202D */ daddu $a0, $v0, $zero -/* A8D324 802408A4 C482003C */ lwc1 $f2, 0x3c($a0) -/* A8D328 802408A8 C480001C */ lwc1 $f0, 0x1c($a0) -/* A8D32C 802408AC 46001080 */ add.s $f2, $f2, $f0 -/* A8D330 802408B0 C4840014 */ lwc1 $f4, 0x14($a0) -/* A8D334 802408B4 46040001 */ sub.s $f0, $f0, $f4 -/* A8D338 802408B8 C4840064 */ lwc1 $f4, 0x64($a0) -/* A8D33C 802408BC 4602203C */ c.lt.s $f4, $f2 -/* A8D340 802408C0 E482003C */ swc1 $f2, 0x3c($a0) -/* A8D344 802408C4 45010009 */ bc1t .L802408EC -/* A8D348 802408C8 E480001C */ swc1 $f0, 0x1c($a0) -/* A8D34C 802408CC 8C820000 */ lw $v0, ($a0) -/* A8D350 802408D0 2403F7FF */ addiu $v1, $zero, -0x801 -/* A8D354 802408D4 E484003C */ swc1 $f4, 0x3c($a0) -/* A8D358 802408D8 AC80001C */ sw $zero, 0x1c($a0) -/* A8D35C 802408DC 00431024 */ and $v0, $v0, $v1 -/* A8D360 802408E0 AC820000 */ sw $v0, ($a0) -/* A8D364 802408E4 2402000C */ addiu $v0, $zero, 0xc -/* A8D368 802408E8 AE020070 */ sw $v0, 0x70($s0) -.L802408EC: -/* A8D36C 802408EC 8FBF0014 */ lw $ra, 0x14($sp) -/* A8D370 802408F0 8FB00010 */ lw $s0, 0x10($sp) -/* A8D374 802408F4 03E00008 */ jr $ra -/* A8D378 802408F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s index e0e2e5dcb1..c426c8cfc1 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s @@ -161,7 +161,7 @@ glabel func_80240C74_A8D6F4 /* A8D94C 80240ECC 02A0302D */ daddu $a2, $s5, $zero /* A8D950 80240ED0 0280202D */ daddu $a0, $s4, $zero /* A8D954 80240ED4 0260282D */ daddu $a1, $s3, $zero -/* A8D958 80240ED8 0C090221 */ jal func_80240884_A8D304 +/* A8D958 80240ED8 0C090221 */ jal NpcJumpFunc /* A8D95C 80240EDC 02A0302D */ daddu $a2, $s5, $zero /* A8D960 80240EE0 080903D2 */ j .L80240F48 /* A8D964 80240EE4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D14_7EDA24.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D14_7EDA24.s deleted file mode 100644 index 4a74e1dbdf..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D14_7EDA24.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D14_7EDA24 -/* 7EDA24 80242D14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EDA28 80242D18 AFB00010 */ sw $s0, 0x10($sp) -/* 7EDA2C 80242D1C 0080802D */ daddu $s0, $a0, $zero -/* 7EDA30 80242D20 AFBF0014 */ sw $ra, 0x14($sp) -/* 7EDA34 80242D24 8E020148 */ lw $v0, 0x148($s0) -/* 7EDA38 80242D28 0C00EABB */ jal get_npc_unsafe -/* 7EDA3C 80242D2C 84440008 */ lh $a0, 8($v0) -/* 7EDA40 80242D30 0040202D */ daddu $a0, $v0, $zero -/* 7EDA44 80242D34 C482003C */ lwc1 $f2, 0x3c($a0) -/* 7EDA48 80242D38 C480001C */ lwc1 $f0, 0x1c($a0) -/* 7EDA4C 80242D3C 46001080 */ add.s $f2, $f2, $f0 -/* 7EDA50 80242D40 C4840014 */ lwc1 $f4, 0x14($a0) -/* 7EDA54 80242D44 46040001 */ sub.s $f0, $f0, $f4 -/* 7EDA58 80242D48 C4840064 */ lwc1 $f4, 0x64($a0) -/* 7EDA5C 80242D4C 4602203C */ c.lt.s $f4, $f2 -/* 7EDA60 80242D50 E482003C */ swc1 $f2, 0x3c($a0) -/* 7EDA64 80242D54 45010009 */ bc1t .L80242D7C -/* 7EDA68 80242D58 E480001C */ swc1 $f0, 0x1c($a0) -/* 7EDA6C 80242D5C 8C820000 */ lw $v0, ($a0) -/* 7EDA70 80242D60 2403F7FF */ addiu $v1, $zero, -0x801 -/* 7EDA74 80242D64 E484003C */ swc1 $f4, 0x3c($a0) -/* 7EDA78 80242D68 AC80001C */ sw $zero, 0x1c($a0) -/* 7EDA7C 80242D6C 00431024 */ and $v0, $v0, $v1 -/* 7EDA80 80242D70 AC820000 */ sw $v0, ($a0) -/* 7EDA84 80242D74 2402000C */ addiu $v0, $zero, 0xc -/* 7EDA88 80242D78 AE020070 */ sw $v0, 0x70($s0) -.L80242D7C: -/* 7EDA8C 80242D7C 8FBF0014 */ lw $ra, 0x14($sp) -/* 7EDA90 80242D80 8FB00010 */ lw $s0, 0x10($sp) -/* 7EDA94 80242D84 03E00008 */ jr $ra -/* 7EDA98 80242D88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s index 7cd2934269..cff39d7604 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s @@ -46,7 +46,7 @@ glabel func_80243104_7EDE14 /* 7EDEB8 802431A8 8E2200B0 */ lw $v0, 0xb0($s1) /* 7EDEBC 802431AC 30420004 */ andi $v0, $v0, 4 /* 7EDEC0 802431B0 10400044 */ beqz $v0, .L802432C4 -/* 7EDEC4 802431B4 00000000 */ nop +/* 7EDEC4 802431B4 00000000 */ nop .L802431B8: /* 7EDEC8 802431B8 2404F7FF */ addiu $a0, $zero, -0x801 /* 7EDECC 802431BC AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80243104_7EDE14 /* 7EDF80 80243270 3C0142C8 */ lui $at, 0x42c8 /* 7EDF84 80243274 44812000 */ mtc1 $at, $f4 /* 7EDF88 80243278 44823000 */ mtc1 $v0, $f6 -/* 7EDF8C 8024327C 00000000 */ nop +/* 7EDF8C 8024327C 00000000 */ nop /* 7EDF90 80243280 468031A0 */ cvt.s.w $f6, $f6 /* 7EDF94 80243284 27A20044 */ addiu $v0, $sp, 0x44 /* 7EDF98 80243288 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80243104_7EDE14 /* 7EDFBC 802432AC 0C0372DF */ jal func_800DCB7C /* 7EDFC0 802432B0 27A70040 */ addiu $a3, $sp, 0x40 /* 7EDFC4 802432B4 10400003 */ beqz $v0, .L802432C4 -/* 7EDFC8 802432B8 00000000 */ nop +/* 7EDFC8 802432B8 00000000 */ nop /* 7EDFCC 802432BC C7A0003C */ lwc1 $f0, 0x3c($sp) /* 7EDFD0 802432C0 E640003C */ swc1 $f0, 0x3c($s2) .L802432C4: @@ -128,7 +128,7 @@ glabel func_80243104_7EDE14 /* 7EDFE8 802432D8 00220821 */ addu $at, $at, $v0 /* 7EDFEC 802432DC 8C2259D0 */ lw $v0, 0x59d0($at) /* 7EDFF0 802432E0 00400008 */ jr $v0 -/* 7EDFF4 802432E4 00000000 */ nop +/* 7EDFF4 802432E4 00000000 */ nop /* 7EDFF8 802432E8 0280202D */ daddu $a0, $s4, $zero /* 7EDFFC 802432EC 0260282D */ daddu $a1, $s3, $zero /* 7EE000 802432F0 0C09095C */ jal func_80242570_7ED280 @@ -138,7 +138,7 @@ glabel func_80243104_7EDE14 /* 7EE010 80243300 0C0909B2 */ jal func_802426C8_7ED3D8 /* 7EE014 80243304 02A0302D */ daddu $a2, $s5, $zero /* 7EE018 80243308 08090CF6 */ j .L802433D8 -/* 7EE01C 8024330C 00000000 */ nop +/* 7EE01C 8024330C 00000000 */ nop /* 7EE020 80243310 0280202D */ daddu $a0, $s4, $zero /* 7EE024 80243314 0260282D */ daddu $a1, $s3, $zero /* 7EE028 80243318 0C090A5C */ jal UnkNpcAIFunc1 @@ -148,23 +148,23 @@ glabel func_80243104_7EDE14 /* 7EE038 80243328 0C090A8C */ jal func_80242A30_7ED740 /* 7EE03C 8024332C 02A0302D */ daddu $a2, $s5, $zero /* 7EE040 80243330 08090CF6 */ j .L802433D8 -/* 7EE044 80243334 00000000 */ nop +/* 7EE044 80243334 00000000 */ nop /* 7EE048 80243338 0280202D */ daddu $a0, $s4, $zero /* 7EE04C 8024333C 0260282D */ daddu $a1, $s3, $zero /* 7EE050 80243340 0C090AFB */ jal func_80242BEC_7ED8FC /* 7EE054 80243344 02A0302D */ daddu $a2, $s5, $zero /* 7EE058 80243348 08090CF6 */ j .L802433D8 -/* 7EE05C 8024334C 00000000 */ nop +/* 7EE05C 8024334C 00000000 */ nop /* 7EE060 80243350 0280202D */ daddu $a0, $s4, $zero /* 7EE064 80243354 0260282D */ daddu $a1, $s3, $zero /* 7EE068 80243358 0C090B28 */ jal func_80242CA0_7ED9B0 /* 7EE06C 8024335C 02A0302D */ daddu $a2, $s5, $zero /* 7EE070 80243360 0280202D */ daddu $a0, $s4, $zero /* 7EE074 80243364 0260282D */ daddu $a1, $s3, $zero -/* 7EE078 80243368 0C090B45 */ jal func_80242D14_7EDA24 +/* 7EE078 80243368 0C090B45 */ jal NpcJumpFunc /* 7EE07C 8024336C 02A0302D */ daddu $a2, $s5, $zero /* 7EE080 80243370 08090CF6 */ j .L802433D8 -/* 7EE084 80243374 00000000 */ nop +/* 7EE084 80243374 00000000 */ nop /* 7EE088 80243378 0280202D */ daddu $a0, $s4, $zero /* 7EE08C 8024337C 0260282D */ daddu $a1, $s3, $zero /* 7EE090 80243380 0C090B63 */ jal func_80242D8C_7EDA9C @@ -174,19 +174,19 @@ glabel func_80243104_7EDE14 /* 7EE0A0 80243390 0C090BAF */ jal func_80242EBC_7EDBCC /* 7EE0A4 80243394 02A0302D */ daddu $a2, $s5, $zero /* 7EE0A8 80243398 08090CF6 */ j .L802433D8 -/* 7EE0AC 8024339C 00000000 */ nop +/* 7EE0AC 8024339C 00000000 */ nop /* 7EE0B0 802433A0 0280202D */ daddu $a0, $s4, $zero /* 7EE0B4 802433A4 0260282D */ daddu $a1, $s3, $zero /* 7EE0B8 802433A8 0C090BF7 */ jal func_80242FDC_7EDCEC /* 7EE0BC 802433AC 02A0302D */ daddu $a2, $s5, $zero /* 7EE0C0 802433B0 08090CF6 */ j .L802433D8 -/* 7EE0C4 802433B4 00000000 */ nop +/* 7EE0C4 802433B4 00000000 */ nop /* 7EE0C8 802433B8 0280202D */ daddu $a0, $s4, $zero /* 7EE0CC 802433BC 0260282D */ daddu $a1, $s3, $zero /* 7EE0D0 802433C0 0C090C11 */ jal func_80243044_7EDD54 /* 7EE0D4 802433C4 02A0302D */ daddu $a2, $s5, $zero /* 7EE0D8 802433C8 08090CF6 */ j .L802433D8 -/* 7EE0DC 802433CC 00000000 */ nop +/* 7EE0DC 802433CC 00000000 */ nop /* 7EE0E0 802433D0 0C0129CF */ jal func_8004A73C /* 7EE0E4 802433D4 0280202D */ daddu $a0, $s4, $zero .L802433D8: diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241824_8020A4.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241824_8020A4.s deleted file mode 100644 index bf2f0ac025..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241824_8020A4.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241824_8020A4 -/* 8020A4 80241824 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8020A8 80241828 AFB00010 */ sw $s0, 0x10($sp) -/* 8020AC 8024182C 0080802D */ daddu $s0, $a0, $zero -/* 8020B0 80241830 AFBF0014 */ sw $ra, 0x14($sp) -/* 8020B4 80241834 8E020148 */ lw $v0, 0x148($s0) -/* 8020B8 80241838 0C00EABB */ jal get_npc_unsafe -/* 8020BC 8024183C 84440008 */ lh $a0, 8($v0) -/* 8020C0 80241840 0040202D */ daddu $a0, $v0, $zero -/* 8020C4 80241844 C482003C */ lwc1 $f2, 0x3c($a0) -/* 8020C8 80241848 C480001C */ lwc1 $f0, 0x1c($a0) -/* 8020CC 8024184C 46001080 */ add.s $f2, $f2, $f0 -/* 8020D0 80241850 C4840014 */ lwc1 $f4, 0x14($a0) -/* 8020D4 80241854 46040001 */ sub.s $f0, $f0, $f4 -/* 8020D8 80241858 C4840064 */ lwc1 $f4, 0x64($a0) -/* 8020DC 8024185C 4602203C */ c.lt.s $f4, $f2 -/* 8020E0 80241860 E482003C */ swc1 $f2, 0x3c($a0) -/* 8020E4 80241864 45010009 */ bc1t .L8024188C -/* 8020E8 80241868 E480001C */ swc1 $f0, 0x1c($a0) -/* 8020EC 8024186C 8C820000 */ lw $v0, ($a0) -/* 8020F0 80241870 2403F7FF */ addiu $v1, $zero, -0x801 -/* 8020F4 80241874 E484003C */ swc1 $f4, 0x3c($a0) -/* 8020F8 80241878 AC80001C */ sw $zero, 0x1c($a0) -/* 8020FC 8024187C 00431024 */ and $v0, $v0, $v1 -/* 802100 80241880 AC820000 */ sw $v0, ($a0) -/* 802104 80241884 2402000C */ addiu $v0, $zero, 0xc -/* 802108 80241888 AE020070 */ sw $v0, 0x70($s0) -.L8024188C: -/* 80210C 8024188C 8FBF0014 */ lw $ra, 0x14($sp) -/* 802110 80241890 8FB00010 */ lw $s0, 0x10($sp) -/* 802114 80241894 03E00008 */ jr $ra -/* 802118 80241898 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s index ea203cc6dc..1fa92e83e1 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s @@ -161,7 +161,7 @@ glabel func_80241C14_802494 /* 8026EC 80241E6C 02A0302D */ daddu $a2, $s5, $zero /* 8026F0 80241E70 0280202D */ daddu $a0, $s4, $zero /* 8026F4 80241E74 0260282D */ daddu $a1, $s3, $zero -/* 8026F8 80241E78 0C090609 */ jal func_80241824_8020A4 +/* 8026F8 80241E78 0C090609 */ jal NpcJumpFunc /* 8026FC 80241E7C 02A0302D */ daddu $a2, $s5, $zero /* 802700 80241E80 080907BA */ j .L80241EE8 /* 802704 80241E84 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245CF4_806574.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245CF4_806574.s deleted file mode 100644 index fca8e6aa05..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245CF4_806574.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245CF4_806574 -/* 806574 80245CF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 806578 80245CF8 AFB00010 */ sw $s0, 0x10($sp) -/* 80657C 80245CFC 0080802D */ daddu $s0, $a0, $zero -/* 806580 80245D00 AFBF0014 */ sw $ra, 0x14($sp) -/* 806584 80245D04 8E020148 */ lw $v0, 0x148($s0) -/* 806588 80245D08 0C00EABB */ jal get_npc_unsafe -/* 80658C 80245D0C 84440008 */ lh $a0, 8($v0) -/* 806590 80245D10 0040202D */ daddu $a0, $v0, $zero -/* 806594 80245D14 C482003C */ lwc1 $f2, 0x3c($a0) -/* 806598 80245D18 C480001C */ lwc1 $f0, 0x1c($a0) -/* 80659C 80245D1C 46001080 */ add.s $f2, $f2, $f0 -/* 8065A0 80245D20 C4840014 */ lwc1 $f4, 0x14($a0) -/* 8065A4 80245D24 46040001 */ sub.s $f0, $f0, $f4 -/* 8065A8 80245D28 C4840064 */ lwc1 $f4, 0x64($a0) -/* 8065AC 80245D2C 4602203C */ c.lt.s $f4, $f2 -/* 8065B0 80245D30 E482003C */ swc1 $f2, 0x3c($a0) -/* 8065B4 80245D34 45010009 */ bc1t .L80245D5C -/* 8065B8 80245D38 E480001C */ swc1 $f0, 0x1c($a0) -/* 8065BC 80245D3C 8C820000 */ lw $v0, ($a0) -/* 8065C0 80245D40 2403F7FF */ addiu $v1, $zero, -0x801 -/* 8065C4 80245D44 E484003C */ swc1 $f4, 0x3c($a0) -/* 8065C8 80245D48 AC80001C */ sw $zero, 0x1c($a0) -/* 8065CC 80245D4C 00431024 */ and $v0, $v0, $v1 -/* 8065D0 80245D50 AC820000 */ sw $v0, ($a0) -/* 8065D4 80245D54 2402000C */ addiu $v0, $zero, 0xc -/* 8065D8 80245D58 AE020070 */ sw $v0, 0x70($s0) -.L80245D5C: -/* 8065DC 80245D5C 8FBF0014 */ lw $ra, 0x14($sp) -/* 8065E0 80245D60 8FB00010 */ lw $s0, 0x10($sp) -/* 8065E4 80245D64 03E00008 */ jr $ra -/* 8065E8 80245D68 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s index 66f8e3902f..cca65cbc8f 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s @@ -161,7 +161,7 @@ glabel func_802460E4_806964 /* 806BBC 8024633C 02A0302D */ daddu $a2, $s5, $zero /* 806BC0 80246340 0280202D */ daddu $a0, $s4, $zero /* 806BC4 80246344 0260282D */ daddu $a1, $s3, $zero -/* 806BC8 80246348 0C09173D */ jal func_80245CF4_806574 +/* 806BC8 80246348 0C09173D */ jal NpcJumpFunc /* 806BCC 8024634C 02A0302D */ daddu $a2, $s5, $zero /* 806BD0 80246350 080918EE */ j .L802463B8 /* 806BD4 80246354 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802410D4_824394.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802410D4_824394.s deleted file mode 100644 index 1a64e1612b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802410D4_824394.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410D4_824394 -/* 824394 802410D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 824398 802410D8 AFB00010 */ sw $s0, 0x10($sp) -/* 82439C 802410DC 0080802D */ daddu $s0, $a0, $zero -/* 8243A0 802410E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 8243A4 802410E4 8E020148 */ lw $v0, 0x148($s0) -/* 8243A8 802410E8 0C00EABB */ jal get_npc_unsafe -/* 8243AC 802410EC 84440008 */ lh $a0, 8($v0) -/* 8243B0 802410F0 0040202D */ daddu $a0, $v0, $zero -/* 8243B4 802410F4 C482003C */ lwc1 $f2, 0x3c($a0) -/* 8243B8 802410F8 C480001C */ lwc1 $f0, 0x1c($a0) -/* 8243BC 802410FC 46001080 */ add.s $f2, $f2, $f0 -/* 8243C0 80241100 C4840014 */ lwc1 $f4, 0x14($a0) -/* 8243C4 80241104 46040001 */ sub.s $f0, $f0, $f4 -/* 8243C8 80241108 C4840064 */ lwc1 $f4, 0x64($a0) -/* 8243CC 8024110C 4602203C */ c.lt.s $f4, $f2 -/* 8243D0 80241110 E482003C */ swc1 $f2, 0x3c($a0) -/* 8243D4 80241114 45010009 */ bc1t .L8024113C -/* 8243D8 80241118 E480001C */ swc1 $f0, 0x1c($a0) -/* 8243DC 8024111C 8C820000 */ lw $v0, ($a0) -/* 8243E0 80241120 2403F7FF */ addiu $v1, $zero, -0x801 -/* 8243E4 80241124 E484003C */ swc1 $f4, 0x3c($a0) -/* 8243E8 80241128 AC80001C */ sw $zero, 0x1c($a0) -/* 8243EC 8024112C 00431024 */ and $v0, $v0, $v1 -/* 8243F0 80241130 AC820000 */ sw $v0, ($a0) -/* 8243F4 80241134 2402000C */ addiu $v0, $zero, 0xc -/* 8243F8 80241138 AE020070 */ sw $v0, 0x70($s0) -.L8024113C: -/* 8243FC 8024113C 8FBF0014 */ lw $ra, 0x14($sp) -/* 824400 80241140 8FB00010 */ lw $s0, 0x10($sp) -/* 824404 80241144 03E00008 */ jr $ra -/* 824408 80241148 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s index 214941caa9..a1a41e4f7d 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s @@ -161,7 +161,7 @@ glabel func_802414C4_824784 /* 8249DC 8024171C 02A0302D */ daddu $a2, $s5, $zero /* 8249E0 80241720 0280202D */ daddu $a0, $s4, $zero /* 8249E4 80241724 0260282D */ daddu $a1, $s3, $zero -/* 8249E8 80241728 0C090435 */ jal func_802410D4_824394 +/* 8249E8 80241728 0C090435 */ jal NpcJumpFunc /* 8249EC 8024172C 02A0302D */ daddu $a2, $s5, $zero /* 8249F0 80241730 080905E6 */ j .L80241798 /* 8249F4 80241734 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240C34_852DA4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240C34_852DA4.s deleted file mode 100644 index f6b5122211..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240C34_852DA4.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C34_852DA4 -/* 852DA4 80240C34 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 852DA8 80240C38 AFB00010 */ sw $s0, 0x10($sp) -/* 852DAC 80240C3C 0080802D */ daddu $s0, $a0, $zero -/* 852DB0 80240C40 AFBF0014 */ sw $ra, 0x14($sp) -/* 852DB4 80240C44 8E020148 */ lw $v0, 0x148($s0) -/* 852DB8 80240C48 0C00EABB */ jal get_npc_unsafe -/* 852DBC 80240C4C 84440008 */ lh $a0, 8($v0) -/* 852DC0 80240C50 0040202D */ daddu $a0, $v0, $zero -/* 852DC4 80240C54 C482003C */ lwc1 $f2, 0x3c($a0) -/* 852DC8 80240C58 C480001C */ lwc1 $f0, 0x1c($a0) -/* 852DCC 80240C5C 46001080 */ add.s $f2, $f2, $f0 -/* 852DD0 80240C60 C4840014 */ lwc1 $f4, 0x14($a0) -/* 852DD4 80240C64 46040001 */ sub.s $f0, $f0, $f4 -/* 852DD8 80240C68 C4840064 */ lwc1 $f4, 0x64($a0) -/* 852DDC 80240C6C 4602203C */ c.lt.s $f4, $f2 -/* 852DE0 80240C70 E482003C */ swc1 $f2, 0x3c($a0) -/* 852DE4 80240C74 45010009 */ bc1t .L80240C9C -/* 852DE8 80240C78 E480001C */ swc1 $f0, 0x1c($a0) -/* 852DEC 80240C7C 8C820000 */ lw $v0, ($a0) -/* 852DF0 80240C80 2403F7FF */ addiu $v1, $zero, -0x801 -/* 852DF4 80240C84 E484003C */ swc1 $f4, 0x3c($a0) -/* 852DF8 80240C88 AC80001C */ sw $zero, 0x1c($a0) -/* 852DFC 80240C8C 00431024 */ and $v0, $v0, $v1 -/* 852E00 80240C90 AC820000 */ sw $v0, ($a0) -/* 852E04 80240C94 2402000C */ addiu $v0, $zero, 0xc -/* 852E08 80240C98 AE020070 */ sw $v0, 0x70($s0) -.L80240C9C: -/* 852E0C 80240C9C 8FBF0014 */ lw $ra, 0x14($sp) -/* 852E10 80240CA0 8FB00010 */ lw $s0, 0x10($sp) -/* 852E14 80240CA4 03E00008 */ jr $ra -/* 852E18 80240CA8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s index 155f83347d..7e32a8e7fe 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s @@ -161,7 +161,7 @@ glabel func_80241024_853194 /* 8533EC 8024127C 02A0302D */ daddu $a2, $s5, $zero /* 8533F0 80241280 0280202D */ daddu $a0, $s4, $zero /* 8533F4 80241284 0260282D */ daddu $a1, $s3, $zero -/* 8533F8 80241288 0C09030D */ jal func_80240C34_852DA4 +/* 8533F8 80241288 0C09030D */ jal NpcJumpFunc /* 8533FC 8024128C 02A0302D */ daddu $a2, $s5, $zero /* 853400 80241290 080904BE */ j .L802412F8 /* 853404 80241294 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240A84_E0F224.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240A84_E0F224.s deleted file mode 100644 index faba66310b..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240A84_E0F224.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A84_E0F224 -/* E0F224 80240A84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E0F228 80240A88 AFB00010 */ sw $s0, 0x10($sp) -/* E0F22C 80240A8C 0080802D */ daddu $s0, $a0, $zero -/* E0F230 80240A90 AFBF0014 */ sw $ra, 0x14($sp) -/* E0F234 80240A94 8E020148 */ lw $v0, 0x148($s0) -/* E0F238 80240A98 0C00EABB */ jal get_npc_unsafe -/* E0F23C 80240A9C 84440008 */ lh $a0, 8($v0) -/* E0F240 80240AA0 0040202D */ daddu $a0, $v0, $zero -/* E0F244 80240AA4 C482003C */ lwc1 $f2, 0x3c($a0) -/* E0F248 80240AA8 C480001C */ lwc1 $f0, 0x1c($a0) -/* E0F24C 80240AAC 46001080 */ add.s $f2, $f2, $f0 -/* E0F250 80240AB0 C4840014 */ lwc1 $f4, 0x14($a0) -/* E0F254 80240AB4 46040001 */ sub.s $f0, $f0, $f4 -/* E0F258 80240AB8 C4840064 */ lwc1 $f4, 0x64($a0) -/* E0F25C 80240ABC 4602203C */ c.lt.s $f4, $f2 -/* E0F260 80240AC0 E482003C */ swc1 $f2, 0x3c($a0) -/* E0F264 80240AC4 45010009 */ bc1t .L80240AEC -/* E0F268 80240AC8 E480001C */ swc1 $f0, 0x1c($a0) -/* E0F26C 80240ACC 8C820000 */ lw $v0, ($a0) -/* E0F270 80240AD0 2403F7FF */ addiu $v1, $zero, -0x801 -/* E0F274 80240AD4 E484003C */ swc1 $f4, 0x3c($a0) -/* E0F278 80240AD8 AC80001C */ sw $zero, 0x1c($a0) -/* E0F27C 80240ADC 00431024 */ and $v0, $v0, $v1 -/* E0F280 80240AE0 AC820000 */ sw $v0, ($a0) -/* E0F284 80240AE4 2402000C */ addiu $v0, $zero, 0xc -/* E0F288 80240AE8 AE020070 */ sw $v0, 0x70($s0) -.L80240AEC: -/* E0F28C 80240AEC 8FBF0014 */ lw $ra, 0x14($sp) -/* E0F290 80240AF0 8FB00010 */ lw $s0, 0x10($sp) -/* E0F294 80240AF4 03E00008 */ jr $ra -/* E0F298 80240AF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s index 90813933a1..5a6d2b6551 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s @@ -161,7 +161,7 @@ glabel func_80240E74_E0F614 /* E0F86C 802410CC 02A0302D */ daddu $a2, $s5, $zero /* E0F870 802410D0 0280202D */ daddu $a0, $s4, $zero /* E0F874 802410D4 0260282D */ daddu $a1, $s3, $zero -/* E0F878 802410D8 0C0902A1 */ jal func_80240A84_E0F224 +/* E0F878 802410D8 0C0902A1 */ jal NpcJumpFunc /* E0F87C 802410DC 02A0302D */ daddu $a2, $s5, $zero /* E0F880 802410E0 08090452 */ j .L80241148 /* E0F884 802410E4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240234_9C5614.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240234_9C5614.s deleted file mode 100644 index 03607e2ff0..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240234_9C5614.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240234_9C5614 -/* 9C5614 80240234 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C5618 80240238 AFB00010 */ sw $s0, 0x10($sp) -/* 9C561C 8024023C 0080802D */ daddu $s0, $a0, $zero -/* 9C5620 80240240 AFBF0014 */ sw $ra, 0x14($sp) -/* 9C5624 80240244 8E020148 */ lw $v0, 0x148($s0) -/* 9C5628 80240248 0C00EABB */ jal get_npc_unsafe -/* 9C562C 8024024C 84440008 */ lh $a0, 8($v0) -/* 9C5630 80240250 0040202D */ daddu $a0, $v0, $zero -/* 9C5634 80240254 C482003C */ lwc1 $f2, 0x3c($a0) -/* 9C5638 80240258 C480001C */ lwc1 $f0, 0x1c($a0) -/* 9C563C 8024025C 46001080 */ add.s $f2, $f2, $f0 -/* 9C5640 80240260 C4840014 */ lwc1 $f4, 0x14($a0) -/* 9C5644 80240264 46040001 */ sub.s $f0, $f0, $f4 -/* 9C5648 80240268 C4840064 */ lwc1 $f4, 0x64($a0) -/* 9C564C 8024026C 4602203C */ c.lt.s $f4, $f2 -/* 9C5650 80240270 E482003C */ swc1 $f2, 0x3c($a0) -/* 9C5654 80240274 45010009 */ bc1t .L8024029C -/* 9C5658 80240278 E480001C */ swc1 $f0, 0x1c($a0) -/* 9C565C 8024027C 8C820000 */ lw $v0, ($a0) -/* 9C5660 80240280 2403F7FF */ addiu $v1, $zero, -0x801 -/* 9C5664 80240284 E484003C */ swc1 $f4, 0x3c($a0) -/* 9C5668 80240288 AC80001C */ sw $zero, 0x1c($a0) -/* 9C566C 8024028C 00431024 */ and $v0, $v0, $v1 -/* 9C5670 80240290 AC820000 */ sw $v0, ($a0) -/* 9C5674 80240294 2402000C */ addiu $v0, $zero, 0xc -/* 9C5678 80240298 AE020070 */ sw $v0, 0x70($s0) -.L8024029C: -/* 9C567C 8024029C 8FBF0014 */ lw $ra, 0x14($sp) -/* 9C5680 802402A0 8FB00010 */ lw $s0, 0x10($sp) -/* 9C5684 802402A4 03E00008 */ jr $ra -/* 9C5688 802402A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s index 6ff4823bcc..bb1c0d54b3 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s @@ -123,7 +123,7 @@ glabel func_802407F4_9C5BD4 /* 9C5D98 802409B8 02A0302D */ daddu $a2, $s5, $zero /* 9C5D9C 802409BC 0280202D */ daddu $a0, $s4, $zero /* 9C5DA0 802409C0 0260282D */ daddu $a1, $s3, $zero -/* 9C5DA4 802409C4 0C09008D */ jal func_80240234_9C5614 +/* 9C5DA4 802409C4 0C09008D */ jal NpcJumpFunc /* 9C5DA8 802409C8 02A0302D */ daddu $a2, $s5, $zero /* 9C5DAC 802409CC 08090291 */ j .L80240A44 /* 9C5DB0 802409D0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241224_9D8244.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241224_9D8244.s deleted file mode 100644 index 2aa1ad5f1a..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241224_9D8244.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241224_9D8244 -/* 9D8244 80241224 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D8248 80241228 AFB00010 */ sw $s0, 0x10($sp) -/* 9D824C 8024122C 0080802D */ daddu $s0, $a0, $zero -/* 9D8250 80241230 AFBF0014 */ sw $ra, 0x14($sp) -/* 9D8254 80241234 8E020148 */ lw $v0, 0x148($s0) -/* 9D8258 80241238 0C00EABB */ jal get_npc_unsafe -/* 9D825C 8024123C 84440008 */ lh $a0, 8($v0) -/* 9D8260 80241240 0040202D */ daddu $a0, $v0, $zero -/* 9D8264 80241244 C482003C */ lwc1 $f2, 0x3c($a0) -/* 9D8268 80241248 C480001C */ lwc1 $f0, 0x1c($a0) -/* 9D826C 8024124C 46001080 */ add.s $f2, $f2, $f0 -/* 9D8270 80241250 C4840014 */ lwc1 $f4, 0x14($a0) -/* 9D8274 80241254 46040001 */ sub.s $f0, $f0, $f4 -/* 9D8278 80241258 C4840064 */ lwc1 $f4, 0x64($a0) -/* 9D827C 8024125C 4602203C */ c.lt.s $f4, $f2 -/* 9D8280 80241260 E482003C */ swc1 $f2, 0x3c($a0) -/* 9D8284 80241264 45010009 */ bc1t .L8024128C -/* 9D8288 80241268 E480001C */ swc1 $f0, 0x1c($a0) -/* 9D828C 8024126C 8C820000 */ lw $v0, ($a0) -/* 9D8290 80241270 2403F7FF */ addiu $v1, $zero, -0x801 -/* 9D8294 80241274 E484003C */ swc1 $f4, 0x3c($a0) -/* 9D8298 80241278 AC80001C */ sw $zero, 0x1c($a0) -/* 9D829C 8024127C 00431024 */ and $v0, $v0, $v1 -/* 9D82A0 80241280 AC820000 */ sw $v0, ($a0) -/* 9D82A4 80241284 2402000C */ addiu $v0, $zero, 0xc -/* 9D82A8 80241288 AE020070 */ sw $v0, 0x70($s0) -.L8024128C: -/* 9D82AC 8024128C 8FBF0014 */ lw $ra, 0x14($sp) -/* 9D82B0 80241290 8FB00010 */ lw $s0, 0x10($sp) -/* 9D82B4 80241294 03E00008 */ jr $ra -/* 9D82B8 80241298 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s index 8b3542f0ab..b83da0d644 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s @@ -161,7 +161,7 @@ glabel func_80241614_9D8634 /* 9D888C 8024186C 02A0302D */ daddu $a2, $s5, $zero /* 9D8890 80241870 0280202D */ daddu $a0, $s4, $zero /* 9D8894 80241874 0260282D */ daddu $a1, $s3, $zero -/* 9D8898 80241878 0C090489 */ jal func_80241224_9D8244 +/* 9D8898 80241878 0C090489 */ jal NpcJumpFunc /* 9D889C 8024187C 02A0302D */ daddu $a2, $s5, $zero /* 9D88A0 80241880 0809063A */ j .L802418E8 /* 9D88A4 80241884 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802414E8_9FBCD8.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802414E8_9FBCD8.s deleted file mode 100644 index 19104b548f..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802414E8_9FBCD8.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414E8_9FBCD8 -/* 9FBCD8 802414E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9FBCDC 802414EC AFB00010 */ sw $s0, 0x10($sp) -/* 9FBCE0 802414F0 0080802D */ daddu $s0, $a0, $zero -/* 9FBCE4 802414F4 AFBF0014 */ sw $ra, 0x14($sp) -/* 9FBCE8 802414F8 8E020148 */ lw $v0, 0x148($s0) -/* 9FBCEC 802414FC 0C00EABB */ jal get_npc_unsafe -/* 9FBCF0 80241500 84440008 */ lh $a0, 8($v0) -/* 9FBCF4 80241504 0040202D */ daddu $a0, $v0, $zero -/* 9FBCF8 80241508 C482003C */ lwc1 $f2, 0x3c($a0) -/* 9FBCFC 8024150C C480001C */ lwc1 $f0, 0x1c($a0) -/* 9FBD00 80241510 46001080 */ add.s $f2, $f2, $f0 -/* 9FBD04 80241514 C4840014 */ lwc1 $f4, 0x14($a0) -/* 9FBD08 80241518 46040001 */ sub.s $f0, $f0, $f4 -/* 9FBD0C 8024151C C4840064 */ lwc1 $f4, 0x64($a0) -/* 9FBD10 80241520 4602203C */ c.lt.s $f4, $f2 -/* 9FBD14 80241524 E482003C */ swc1 $f2, 0x3c($a0) -/* 9FBD18 80241528 45010009 */ bc1t .L80241550 -/* 9FBD1C 8024152C E480001C */ swc1 $f0, 0x1c($a0) -/* 9FBD20 80241530 8C820000 */ lw $v0, ($a0) -/* 9FBD24 80241534 2403F7FF */ addiu $v1, $zero, -0x801 -/* 9FBD28 80241538 E484003C */ swc1 $f4, 0x3c($a0) -/* 9FBD2C 8024153C AC80001C */ sw $zero, 0x1c($a0) -/* 9FBD30 80241540 00431024 */ and $v0, $v0, $v1 -/* 9FBD34 80241544 AC820000 */ sw $v0, ($a0) -/* 9FBD38 80241548 2402000C */ addiu $v0, $zero, 0xc -/* 9FBD3C 8024154C AE020070 */ sw $v0, 0x70($s0) -.L80241550: -/* 9FBD40 80241550 8FBF0014 */ lw $ra, 0x14($sp) -/* 9FBD44 80241554 8FB00010 */ lw $s0, 0x10($sp) -/* 9FBD48 80241558 03E00008 */ jr $ra -/* 9FBD4C 8024155C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s index 379f252e32..87f00640f3 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s @@ -161,7 +161,7 @@ glabel func_802418D8_9FC0C8 /* 9FC320 80241B30 02A0302D */ daddu $a2, $s5, $zero /* 9FC324 80241B34 0280202D */ daddu $a0, $s4, $zero /* 9FC328 80241B38 0260282D */ daddu $a1, $s3, $zero -/* 9FC32C 80241B3C 0C09053A */ jal func_802414E8_9FBCD8 +/* 9FC32C 80241B3C 0C09053A */ jal NpcJumpFunc /* 9FC330 80241B40 02A0302D */ daddu $a2, $s5, $zero /* 9FC334 80241B44 080906EB */ j .L80241BAC /* 9FC338 80241B48 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241110_D9E5E0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241110_D9E5E0.s deleted file mode 100644 index 1d614e70bf..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241110_D9E5E0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241110_D9E5E0 -/* D9E5E0 80241110 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D9E5E4 80241114 AFB00010 */ sw $s0, 0x10($sp) -/* D9E5E8 80241118 0080802D */ daddu $s0, $a0, $zero -/* D9E5EC 8024111C AFBF0014 */ sw $ra, 0x14($sp) -/* D9E5F0 80241120 8E020148 */ lw $v0, 0x148($s0) -/* D9E5F4 80241124 0C00EABB */ jal get_npc_unsafe -/* D9E5F8 80241128 84440008 */ lh $a0, 8($v0) -/* D9E5FC 8024112C 0040202D */ daddu $a0, $v0, $zero -/* D9E600 80241130 C482003C */ lwc1 $f2, 0x3c($a0) -/* D9E604 80241134 C480001C */ lwc1 $f0, 0x1c($a0) -/* D9E608 80241138 46001080 */ add.s $f2, $f2, $f0 -/* D9E60C 8024113C C4840014 */ lwc1 $f4, 0x14($a0) -/* D9E610 80241140 46040001 */ sub.s $f0, $f0, $f4 -/* D9E614 80241144 C4840064 */ lwc1 $f4, 0x64($a0) -/* D9E618 80241148 4602203C */ c.lt.s $f4, $f2 -/* D9E61C 8024114C E482003C */ swc1 $f2, 0x3c($a0) -/* D9E620 80241150 45010009 */ bc1t .L80241178 -/* D9E624 80241154 E480001C */ swc1 $f0, 0x1c($a0) -/* D9E628 80241158 8C820000 */ lw $v0, ($a0) -/* D9E62C 8024115C 2403F7FF */ addiu $v1, $zero, -0x801 -/* D9E630 80241160 E484003C */ swc1 $f4, 0x3c($a0) -/* D9E634 80241164 AC80001C */ sw $zero, 0x1c($a0) -/* D9E638 80241168 00431024 */ and $v0, $v0, $v1 -/* D9E63C 8024116C AC820000 */ sw $v0, ($a0) -/* D9E640 80241170 2402000C */ addiu $v0, $zero, 0xc -/* D9E644 80241174 AE020070 */ sw $v0, 0x70($s0) -.L80241178: -/* D9E648 80241178 8FBF0014 */ lw $ra, 0x14($sp) -/* D9E64C 8024117C 8FB00010 */ lw $s0, 0x10($sp) -/* D9E650 80241180 03E00008 */ jr $ra -/* D9E654 80241184 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s index a104c74be8..f55191ad3b 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s @@ -123,7 +123,7 @@ glabel func_802416D0_D9EBA0 /* D9ED64 80241894 02A0302D */ daddu $a2, $s5, $zero /* D9ED68 80241898 0280202D */ daddu $a0, $s4, $zero /* D9ED6C 8024189C 0260282D */ daddu $a1, $s3, $zero -/* D9ED70 802418A0 0C090444 */ jal func_80241110_D9E5E0 +/* D9ED70 802418A0 0C090444 */ jal NpcJumpFunc /* D9ED74 802418A4 02A0302D */ daddu $a2, $s5, $zero /* D9ED78 802418A8 08090648 */ j .L80241920 /* D9ED7C 802418AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240D10_DBDFC0.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240D10_DBDFC0.s deleted file mode 100644 index 1849f71c97..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240D10_DBDFC0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D10_DBDFC0 -/* DBDFC0 80240D10 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DBDFC4 80240D14 AFB00010 */ sw $s0, 0x10($sp) -/* DBDFC8 80240D18 0080802D */ daddu $s0, $a0, $zero -/* DBDFCC 80240D1C AFBF0014 */ sw $ra, 0x14($sp) -/* DBDFD0 80240D20 8E020148 */ lw $v0, 0x148($s0) -/* DBDFD4 80240D24 0C00EABB */ jal get_npc_unsafe -/* DBDFD8 80240D28 84440008 */ lh $a0, 8($v0) -/* DBDFDC 80240D2C 0040202D */ daddu $a0, $v0, $zero -/* DBDFE0 80240D30 C482003C */ lwc1 $f2, 0x3c($a0) -/* DBDFE4 80240D34 C480001C */ lwc1 $f0, 0x1c($a0) -/* DBDFE8 80240D38 46001080 */ add.s $f2, $f2, $f0 -/* DBDFEC 80240D3C C4840014 */ lwc1 $f4, 0x14($a0) -/* DBDFF0 80240D40 46040001 */ sub.s $f0, $f0, $f4 -/* DBDFF4 80240D44 C4840064 */ lwc1 $f4, 0x64($a0) -/* DBDFF8 80240D48 4602203C */ c.lt.s $f4, $f2 -/* DBDFFC 80240D4C E482003C */ swc1 $f2, 0x3c($a0) -/* DBE000 80240D50 45010009 */ bc1t .L80240D78 -/* DBE004 80240D54 E480001C */ swc1 $f0, 0x1c($a0) -/* DBE008 80240D58 8C820000 */ lw $v0, ($a0) -/* DBE00C 80240D5C 2403F7FF */ addiu $v1, $zero, -0x801 -/* DBE010 80240D60 E484003C */ swc1 $f4, 0x3c($a0) -/* DBE014 80240D64 AC80001C */ sw $zero, 0x1c($a0) -/* DBE018 80240D68 00431024 */ and $v0, $v0, $v1 -/* DBE01C 80240D6C AC820000 */ sw $v0, ($a0) -/* DBE020 80240D70 2402000C */ addiu $v0, $zero, 0xc -/* DBE024 80240D74 AE020070 */ sw $v0, 0x70($s0) -.L80240D78: -/* DBE028 80240D78 8FBF0014 */ lw $ra, 0x14($sp) -/* DBE02C 80240D7C 8FB00010 */ lw $s0, 0x10($sp) -/* DBE030 80240D80 03E00008 */ jr $ra -/* DBE034 80240D84 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s index c0b3c23372..4c1b4a25a1 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s @@ -161,7 +161,7 @@ glabel func_80241100_DBE3B0 /* DBE608 80241358 02A0302D */ daddu $a2, $s5, $zero /* DBE60C 8024135C 0280202D */ daddu $a0, $s4, $zero /* DBE610 80241360 0260282D */ daddu $a1, $s3, $zero -/* DBE614 80241364 0C090344 */ jal func_80240D10_DBDFC0 +/* DBE614 80241364 0C090344 */ jal NpcJumpFunc /* DBE618 80241368 02A0302D */ daddu $a2, $s5, $zero /* DBE61C 8024136C 080904F5 */ j .L802413D4 /* DBE620 80241370 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s index 57c4af48bd..693f890633 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s @@ -161,7 +161,7 @@ glabel func_80241634_DBE8E4 /* DBEB3C 8024188C 02A0302D */ daddu $a2, $s5, $zero /* DBEB40 80241890 0260202D */ daddu $a0, $s3, $zero /* DBEB44 80241894 0280282D */ daddu $a1, $s4, $zero -/* DBEB48 80241898 0C090344 */ jal func_80240D10_DBDFC0 +/* DBEB48 80241898 0C090344 */ jal NpcJumpFunc /* DBEB4C 8024189C 02A0302D */ daddu $a2, $s5, $zero /* DBEB50 802418A0 08090654 */ j .L80241950 /* DBEB54 802418A4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802416F0_DCE3C0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802416F0_DCE3C0.s deleted file mode 100644 index 780b5437b9..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802416F0_DCE3C0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416F0_DCE3C0 -/* DCE3C0 802416F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DCE3C4 802416F4 AFB00010 */ sw $s0, 0x10($sp) -/* DCE3C8 802416F8 0080802D */ daddu $s0, $a0, $zero -/* DCE3CC 802416FC AFBF0014 */ sw $ra, 0x14($sp) -/* DCE3D0 80241700 8E020148 */ lw $v0, 0x148($s0) -/* DCE3D4 80241704 0C00EABB */ jal get_npc_unsafe -/* DCE3D8 80241708 84440008 */ lh $a0, 8($v0) -/* DCE3DC 8024170C 0040202D */ daddu $a0, $v0, $zero -/* DCE3E0 80241710 C482003C */ lwc1 $f2, 0x3c($a0) -/* DCE3E4 80241714 C480001C */ lwc1 $f0, 0x1c($a0) -/* DCE3E8 80241718 46001080 */ add.s $f2, $f2, $f0 -/* DCE3EC 8024171C C4840014 */ lwc1 $f4, 0x14($a0) -/* DCE3F0 80241720 46040001 */ sub.s $f0, $f0, $f4 -/* DCE3F4 80241724 C4840064 */ lwc1 $f4, 0x64($a0) -/* DCE3F8 80241728 4602203C */ c.lt.s $f4, $f2 -/* DCE3FC 8024172C E482003C */ swc1 $f2, 0x3c($a0) -/* DCE400 80241730 45010009 */ bc1t .L80241758 -/* DCE404 80241734 E480001C */ swc1 $f0, 0x1c($a0) -/* DCE408 80241738 8C820000 */ lw $v0, ($a0) -/* DCE40C 8024173C 2403F7FF */ addiu $v1, $zero, -0x801 -/* DCE410 80241740 E484003C */ swc1 $f4, 0x3c($a0) -/* DCE414 80241744 AC80001C */ sw $zero, 0x1c($a0) -/* DCE418 80241748 00431024 */ and $v0, $v0, $v1 -/* DCE41C 8024174C AC820000 */ sw $v0, ($a0) -/* DCE420 80241750 2402000C */ addiu $v0, $zero, 0xc -/* DCE424 80241754 AE020070 */ sw $v0, 0x70($s0) -.L80241758: -/* DCE428 80241758 8FBF0014 */ lw $ra, 0x14($sp) -/* DCE42C 8024175C 8FB00010 */ lw $s0, 0x10($sp) -/* DCE430 80241760 03E00008 */ jr $ra -/* DCE434 80241764 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s index 4486b65964..adb18aae40 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s @@ -161,7 +161,7 @@ glabel func_80241AE0_DCE7B0 /* DCEA08 80241D38 02A0302D */ daddu $a2, $s5, $zero /* DCEA0C 80241D3C 0280202D */ daddu $a0, $s4, $zero /* DCEA10 80241D40 0260282D */ daddu $a1, $s3, $zero -/* DCEA14 80241D44 0C0905BC */ jal func_802416F0_DCE3C0 +/* DCEA14 80241D44 0C0905BC */ jal NpcJumpFunc /* DCEA18 80241D48 02A0302D */ daddu $a2, $s5, $zero /* DCEA1C 80241D4C 0809076D */ j .L80241DB4 /* DCEA20 80241D50 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s index 2361334362..9cabea2884 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s @@ -161,7 +161,7 @@ glabel func_80242014_DCECE4 /* DCEF3C 8024226C 02A0302D */ daddu $a2, $s5, $zero /* DCEF40 80242270 0260202D */ daddu $a0, $s3, $zero /* DCEF44 80242274 0280282D */ daddu $a1, $s4, $zero -/* DCEF48 80242278 0C0905BC */ jal func_802416F0_DCE3C0 +/* DCEF48 80242278 0C0905BC */ jal NpcJumpFunc /* DCEF4C 8024227C 02A0302D */ daddu $a2, $s5, $zero /* DCEF50 80242280 080908CC */ j .L80242330 /* DCEF54 80242284 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802416C4_D8E914.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802416C4_D8E914.s deleted file mode 100644 index 136e653f10..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802416C4_D8E914.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416C4_D8E914 -/* D8E914 802416C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8E918 802416C8 AFB00010 */ sw $s0, 0x10($sp) -/* D8E91C 802416CC 0080802D */ daddu $s0, $a0, $zero -/* D8E920 802416D0 AFBF0014 */ sw $ra, 0x14($sp) -/* D8E924 802416D4 8E020148 */ lw $v0, 0x148($s0) -/* D8E928 802416D8 0C00EABB */ jal get_npc_unsafe -/* D8E92C 802416DC 84440008 */ lh $a0, 8($v0) -/* D8E930 802416E0 0040202D */ daddu $a0, $v0, $zero -/* D8E934 802416E4 C482003C */ lwc1 $f2, 0x3c($a0) -/* D8E938 802416E8 C480001C */ lwc1 $f0, 0x1c($a0) -/* D8E93C 802416EC 46001080 */ add.s $f2, $f2, $f0 -/* D8E940 802416F0 C4840014 */ lwc1 $f4, 0x14($a0) -/* D8E944 802416F4 46040001 */ sub.s $f0, $f0, $f4 -/* D8E948 802416F8 C4840064 */ lwc1 $f4, 0x64($a0) -/* D8E94C 802416FC 4602203C */ c.lt.s $f4, $f2 -/* D8E950 80241700 E482003C */ swc1 $f2, 0x3c($a0) -/* D8E954 80241704 45010009 */ bc1t .L8024172C -/* D8E958 80241708 E480001C */ swc1 $f0, 0x1c($a0) -/* D8E95C 8024170C 8C820000 */ lw $v0, ($a0) -/* D8E960 80241710 2403F7FF */ addiu $v1, $zero, -0x801 -/* D8E964 80241714 E484003C */ swc1 $f4, 0x3c($a0) -/* D8E968 80241718 AC80001C */ sw $zero, 0x1c($a0) -/* D8E96C 8024171C 00431024 */ and $v0, $v0, $v1 -/* D8E970 80241720 AC820000 */ sw $v0, ($a0) -/* D8E974 80241724 2402000C */ addiu $v0, $zero, 0xc -/* D8E978 80241728 AE020070 */ sw $v0, 0x70($s0) -.L8024172C: -/* D8E97C 8024172C 8FBF0014 */ lw $ra, 0x14($sp) -/* D8E980 80241730 8FB00010 */ lw $s0, 0x10($sp) -/* D8E984 80241734 03E00008 */ jr $ra -/* D8E988 80241738 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s index cc57cdbf21..80cde65feb 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s @@ -161,7 +161,7 @@ glabel func_80241AB4_D8ED04 /* D8EF5C 80241D0C 02A0302D */ daddu $a2, $s5, $zero /* D8EF60 80241D10 0280202D */ daddu $a0, $s4, $zero /* D8EF64 80241D14 0260282D */ daddu $a1, $s3, $zero -/* D8EF68 80241D18 0C0905B1 */ jal func_802416C4_D8E914 +/* D8EF68 80241D18 0C0905B1 */ jal NpcJumpFunc /* D8EF6C 80241D1C 02A0302D */ daddu $a2, $s5, $zero /* D8EF70 80241D20 08090762 */ j .L80241D88 /* D8EF74 80241D24 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s index 4608a73b58..176ffdb2e4 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 @@ -137,7 +137,7 @@ glabel func_802423CC_D8F61C /* D8F814 802425C4 0280302D */ daddu $a2, $s4, $zero /* D8F818 802425C8 0240202D */ daddu $a0, $s2, $zero /* D8F81C 802425CC 0260282D */ daddu $a1, $s3, $zero -/* D8F820 802425D0 0C0905B1 */ jal func_802416C4_D8E914 +/* D8F820 802425D0 0C0905B1 */ jal NpcJumpFunc /* D8F824 802425D4 0280302D */ daddu $a2, $s4, $zero /* D8F828 802425D8 0809099C */ j .L80242670 /* D8F82C 802425DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802405A4_93FB54.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802405A4_93FB54.s deleted file mode 100644 index 048aa4a696..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802405A4_93FB54.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A4_93FB54 -/* 93FB54 802405A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 93FB58 802405A8 AFB00010 */ sw $s0, 0x10($sp) -/* 93FB5C 802405AC 0080802D */ daddu $s0, $a0, $zero -/* 93FB60 802405B0 AFBF0014 */ sw $ra, 0x14($sp) -/* 93FB64 802405B4 8E020148 */ lw $v0, 0x148($s0) -/* 93FB68 802405B8 0C00EABB */ jal get_npc_unsafe -/* 93FB6C 802405BC 84440008 */ lh $a0, 8($v0) -/* 93FB70 802405C0 0040202D */ daddu $a0, $v0, $zero -/* 93FB74 802405C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* 93FB78 802405C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* 93FB7C 802405CC 46001080 */ add.s $f2, $f2, $f0 -/* 93FB80 802405D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* 93FB84 802405D4 46040001 */ sub.s $f0, $f0, $f4 -/* 93FB88 802405D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* 93FB8C 802405DC 4602203C */ c.lt.s $f4, $f2 -/* 93FB90 802405E0 E482003C */ swc1 $f2, 0x3c($a0) -/* 93FB94 802405E4 45010009 */ bc1t .L8024060C -/* 93FB98 802405E8 E480001C */ swc1 $f0, 0x1c($a0) -/* 93FB9C 802405EC 8C820000 */ lw $v0, ($a0) -/* 93FBA0 802405F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* 93FBA4 802405F4 E484003C */ swc1 $f4, 0x3c($a0) -/* 93FBA8 802405F8 AC80001C */ sw $zero, 0x1c($a0) -/* 93FBAC 802405FC 00431024 */ and $v0, $v0, $v1 -/* 93FBB0 80240600 AC820000 */ sw $v0, ($a0) -/* 93FBB4 80240604 2402000C */ addiu $v0, $zero, 0xc -/* 93FBB8 80240608 AE020070 */ sw $v0, 0x70($s0) -.L8024060C: -/* 93FBBC 8024060C 8FBF0014 */ lw $ra, 0x14($sp) -/* 93FBC0 80240610 8FB00010 */ lw $s0, 0x10($sp) -/* 93FBC4 80240614 03E00008 */ jr $ra -/* 93FBC8 80240618 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s index 1c6d92e27f..39d8472c7f 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s @@ -123,7 +123,7 @@ glabel func_80240B64_940114 /* 9402D8 80240D28 02A0302D */ daddu $a2, $s5, $zero /* 9402DC 80240D2C 0280202D */ daddu $a0, $s4, $zero /* 9402E0 80240D30 0260282D */ daddu $a1, $s3, $zero -/* 9402E4 80240D34 0C090169 */ jal func_802405A4_93FB54 +/* 9402E4 80240D34 0C090169 */ jal NpcJumpFunc /* 9402E8 80240D38 02A0302D */ daddu $a2, $s5, $zero /* 9402EC 80240D3C 0809036D */ j .L80240DB4 /* 9402F0 80240D40 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240DF8_99D788.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240DF8_99D788.s deleted file mode 100644 index de5f4b2b5b..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240DF8_99D788.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF8_99D788 -/* 99D788 80240DF8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99D78C 80240DFC AFB00010 */ sw $s0, 0x10($sp) -/* 99D790 80240E00 0080802D */ daddu $s0, $a0, $zero -/* 99D794 80240E04 AFBF0014 */ sw $ra, 0x14($sp) -/* 99D798 80240E08 8E020148 */ lw $v0, 0x148($s0) -/* 99D79C 80240E0C 0C00EABB */ jal get_npc_unsafe -/* 99D7A0 80240E10 84440008 */ lh $a0, 8($v0) -/* 99D7A4 80240E14 0040202D */ daddu $a0, $v0, $zero -/* 99D7A8 80240E18 C482003C */ lwc1 $f2, 0x3c($a0) -/* 99D7AC 80240E1C C480001C */ lwc1 $f0, 0x1c($a0) -/* 99D7B0 80240E20 46001080 */ add.s $f2, $f2, $f0 -/* 99D7B4 80240E24 C4840014 */ lwc1 $f4, 0x14($a0) -/* 99D7B8 80240E28 46040001 */ sub.s $f0, $f0, $f4 -/* 99D7BC 80240E2C C4840064 */ lwc1 $f4, 0x64($a0) -/* 99D7C0 80240E30 4602203C */ c.lt.s $f4, $f2 -/* 99D7C4 80240E34 E482003C */ swc1 $f2, 0x3c($a0) -/* 99D7C8 80240E38 45010009 */ bc1t .L80240E60 -/* 99D7CC 80240E3C E480001C */ swc1 $f0, 0x1c($a0) -/* 99D7D0 80240E40 8C820000 */ lw $v0, ($a0) -/* 99D7D4 80240E44 2403F7FF */ addiu $v1, $zero, -0x801 -/* 99D7D8 80240E48 E484003C */ swc1 $f4, 0x3c($a0) -/* 99D7DC 80240E4C AC80001C */ sw $zero, 0x1c($a0) -/* 99D7E0 80240E50 00431024 */ and $v0, $v0, $v1 -/* 99D7E4 80240E54 AC820000 */ sw $v0, ($a0) -/* 99D7E8 80240E58 2402000C */ addiu $v0, $zero, 0xc -/* 99D7EC 80240E5C AE020070 */ sw $v0, 0x70($s0) -.L80240E60: -/* 99D7F0 80240E60 8FBF0014 */ lw $ra, 0x14($sp) -/* 99D7F4 80240E64 8FB00010 */ lw $s0, 0x10($sp) -/* 99D7F8 80240E68 03E00008 */ jr $ra -/* 99D7FC 80240E6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s index c4e84313dd..c7e4853f59 100644 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s @@ -123,7 +123,7 @@ glabel func_802413B8_99DD48 /* 99DF0C 8024157C 02A0302D */ daddu $a2, $s5, $zero /* 99DF10 80241580 0280202D */ daddu $a0, $s4, $zero /* 99DF14 80241584 0260282D */ daddu $a1, $s3, $zero -/* 99DF18 80241588 0C09037E */ jal func_80240DF8_99D788 +/* 99DF18 80241588 0C09037E */ jal NpcJumpFunc /* 99DF1C 8024158C 02A0302D */ daddu $a2, $s5, $zero /* 99DF20 80241590 08090582 */ j .L80241608 /* 99DF24 80241594 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241058_9A2038.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241058_9A2038.s deleted file mode 100644 index 72df7abcb4..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241058_9A2038.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241058_9A2038 -/* 9A2038 80241058 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9A203C 8024105C AFB00010 */ sw $s0, 0x10($sp) -/* 9A2040 80241060 0080802D */ daddu $s0, $a0, $zero -/* 9A2044 80241064 AFBF0014 */ sw $ra, 0x14($sp) -/* 9A2048 80241068 8E020148 */ lw $v0, 0x148($s0) -/* 9A204C 8024106C 0C00EABB */ jal get_npc_unsafe -/* 9A2050 80241070 84440008 */ lh $a0, 8($v0) -/* 9A2054 80241074 0040202D */ daddu $a0, $v0, $zero -/* 9A2058 80241078 C482003C */ lwc1 $f2, 0x3c($a0) -/* 9A205C 8024107C C480001C */ lwc1 $f0, 0x1c($a0) -/* 9A2060 80241080 46001080 */ add.s $f2, $f2, $f0 -/* 9A2064 80241084 C4840014 */ lwc1 $f4, 0x14($a0) -/* 9A2068 80241088 46040001 */ sub.s $f0, $f0, $f4 -/* 9A206C 8024108C C4840064 */ lwc1 $f4, 0x64($a0) -/* 9A2070 80241090 4602203C */ c.lt.s $f4, $f2 -/* 9A2074 80241094 E482003C */ swc1 $f2, 0x3c($a0) -/* 9A2078 80241098 45010009 */ bc1t .L802410C0 -/* 9A207C 8024109C E480001C */ swc1 $f0, 0x1c($a0) -/* 9A2080 802410A0 8C820000 */ lw $v0, ($a0) -/* 9A2084 802410A4 2403F7FF */ addiu $v1, $zero, -0x801 -/* 9A2088 802410A8 E484003C */ swc1 $f4, 0x3c($a0) -/* 9A208C 802410AC AC80001C */ sw $zero, 0x1c($a0) -/* 9A2090 802410B0 00431024 */ and $v0, $v0, $v1 -/* 9A2094 802410B4 AC820000 */ sw $v0, ($a0) -/* 9A2098 802410B8 2402000C */ addiu $v0, $zero, 0xc -/* 9A209C 802410BC AE020070 */ sw $v0, 0x70($s0) -.L802410C0: -/* 9A20A0 802410C0 8FBF0014 */ lw $ra, 0x14($sp) -/* 9A20A4 802410C4 8FB00010 */ lw $s0, 0x10($sp) -/* 9A20A8 802410C8 03E00008 */ jr $ra -/* 9A20AC 802410CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s index 9cb03b0b95..3f0a1704c3 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s @@ -161,7 +161,7 @@ glabel func_80241448_9A2428 /* 9A2680 802416A0 02A0302D */ daddu $a2, $s5, $zero /* 9A2684 802416A4 0280202D */ daddu $a0, $s4, $zero /* 9A2688 802416A8 0260282D */ daddu $a1, $s3, $zero -/* 9A268C 802416AC 0C090416 */ jal func_80241058_9A2038 +/* 9A268C 802416AC 0C090416 */ jal NpcJumpFunc /* 9A2690 802416B0 02A0302D */ daddu $a2, $s5, $zero /* 9A2694 802416B4 080905C7 */ j .L8024171C /* 9A2698 802416B8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241428_9A9818.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241428_9A9818.s deleted file mode 100644 index 1f69a98611..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241428_9A9818.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241428_9A9818 -/* 9A9818 80241428 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9A981C 8024142C AFB00010 */ sw $s0, 0x10($sp) -/* 9A9820 80241430 0080802D */ daddu $s0, $a0, $zero -/* 9A9824 80241434 AFBF0014 */ sw $ra, 0x14($sp) -/* 9A9828 80241438 8E020148 */ lw $v0, 0x148($s0) -/* 9A982C 8024143C 0C00EABB */ jal get_npc_unsafe -/* 9A9830 80241440 84440008 */ lh $a0, 8($v0) -/* 9A9834 80241444 0040202D */ daddu $a0, $v0, $zero -/* 9A9838 80241448 C482003C */ lwc1 $f2, 0x3c($a0) -/* 9A983C 8024144C C480001C */ lwc1 $f0, 0x1c($a0) -/* 9A9840 80241450 46001080 */ add.s $f2, $f2, $f0 -/* 9A9844 80241454 C4840014 */ lwc1 $f4, 0x14($a0) -/* 9A9848 80241458 46040001 */ sub.s $f0, $f0, $f4 -/* 9A984C 8024145C C4840064 */ lwc1 $f4, 0x64($a0) -/* 9A9850 80241460 4602203C */ c.lt.s $f4, $f2 -/* 9A9854 80241464 E482003C */ swc1 $f2, 0x3c($a0) -/* 9A9858 80241468 45010009 */ bc1t .L80241490 -/* 9A985C 8024146C E480001C */ swc1 $f0, 0x1c($a0) -/* 9A9860 80241470 8C820000 */ lw $v0, ($a0) -/* 9A9864 80241474 2403F7FF */ addiu $v1, $zero, -0x801 -/* 9A9868 80241478 E484003C */ swc1 $f4, 0x3c($a0) -/* 9A986C 8024147C AC80001C */ sw $zero, 0x1c($a0) -/* 9A9870 80241480 00431024 */ and $v0, $v0, $v1 -/* 9A9874 80241484 AC820000 */ sw $v0, ($a0) -/* 9A9878 80241488 2402000C */ addiu $v0, $zero, 0xc -/* 9A987C 8024148C AE020070 */ sw $v0, 0x70($s0) -.L80241490: -/* 9A9880 80241490 8FBF0014 */ lw $ra, 0x14($sp) -/* 9A9884 80241494 8FB00010 */ lw $s0, 0x10($sp) -/* 9A9888 80241498 03E00008 */ jr $ra -/* 9A988C 8024149C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s index 7cbec14611..f3a8204ba4 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s @@ -161,7 +161,7 @@ glabel func_80241818_9A9C08 /* 9A9E60 80241A70 02A0302D */ daddu $a2, $s5, $zero /* 9A9E64 80241A74 0280202D */ daddu $a0, $s4, $zero /* 9A9E68 80241A78 0260282D */ daddu $a1, $s3, $zero -/* 9A9E6C 80241A7C 0C09050A */ jal func_80241428_9A9818 +/* 9A9E6C 80241A7C 0C09050A */ jal NpcJumpFunc /* 9A9E70 80241A80 02A0302D */ daddu $a2, $s5, $zero /* 9A9E74 80241A84 080906BB */ j .L80241AEC /* 9A9E78 80241A88 00000000 */ nop diff --git a/src/world/area_arn/arn_03/BDED90.c b/src/world/area_arn/arn_03/BDED90.c index 78ae0b2cad..4c6231dd92 100644 --- a/src/world/area_arn/arn_03/BDED90.c +++ b/src/world/area_arn/arn_03/BDED90.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_8024067C_BDF40C); INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80240730_BDF4C0); -INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_802407A4_BDF534); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_8024081C_BDF5AC); diff --git a/src/world/area_arn/arn_04/BE37B0.c b/src/world/area_arn/arn_04/BE37B0.c index f7d2ddbf78..7ea505bd88 100644 --- a/src/world/area_arn/arn_04/BE37B0.c +++ b/src/world/area_arn/arn_04/BE37B0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_8024067C_BE3E2C); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80240730_BE3EE0); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_802407A4_BE3F54); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_8024081C_BE3FCC); diff --git a/src/world/area_arn/arn_05/BE7BE0.c b/src/world/area_arn/arn_05/BE7BE0.c index 835aebe819..90f3f7a874 100644 --- a/src/world/area_arn/arn_05/BE7BE0.c +++ b/src/world/area_arn/arn_05/BE7BE0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_8024067C_BE825C); INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_80240730_BE8310); -INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_802407A4_BE8384); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_8024081C_BE83FC); diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index 4d1a166666..8977d6b64f 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -57,7 +57,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242BA8_C00428); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242C5C_C004DC); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242CD0_C00550); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242D48_C005C8); diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index 8649f19b60..baa6626218 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024119C_C3267C); INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80241250_C32730); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802412C4_C327A4); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024133C_C3281C); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 3043bb4367..4306fa4816 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_8024067C_C4042C); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240730_C404E0); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802407A4_C40554); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_8024081C_C405CC); diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index b8f7f643a3..13f739f441 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240F4C_C5045C); INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80241000_C50510); -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80241074_C50584); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802410EC_C505FC); diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index ba50d086b6..e3042222c7 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_8024067C_C565BC); INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_80240730_C56670); -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_802407A4_C566E4); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_8024081C_C5675C); diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index c126ef0b24..264b2f94ba 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240C5C_95BE5C); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240D10_95BF10); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240D84_95BF84); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240DFC_95BFFC); diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index 90f5b425f1..8097332b73 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_802406BC_C9E5DC); INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240770_C9E690); -INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_802407E4_C9E704); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_8024085C_C9E77C); diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index 0fcc35fbb4..d68ca8f9ba 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240AAC_B2CF1C); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240B60_B2CFD0); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240BD4_B2D044); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240C4C_B2D0BC); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 672a2d2d63..7d3265e56e 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240C9C_B3586C); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240D50_B35920); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240DC4_B35994); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240E3C_B35A0C); diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c index 808eac8e95..4100ffb495 100644 --- a/src/world/area_jan/jan_22/B84180.c +++ b/src/world/area_jan/jan_22/B84180.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_8024067C_B847FC); INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240730_B848B0); -INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_802407A4_B84924); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_8024081C_B8499C); diff --git a/src/world/area_kkj/kkj_00/ABB340.c b/src/world/area_kkj/kkj_00/ABB340.c index cc676f787e..20c714f903 100644 --- a/src/world/area_kkj/kkj_00/ABB340.c +++ b/src/world/area_kkj/kkj_00/ABB340.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_8024072C_ABB9BC); INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_802407E0_ABBA70); -INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240854_ABBAE4); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_802408CC_ABBB5C); diff --git a/src/world/area_kkj/kkj_01/AC5170.c b/src/world/area_kkj/kkj_01/AC5170.c index 1a72f02cdd..90b0419dac 100644 --- a/src/world/area_kkj/kkj_01/AC5170.c +++ b/src/world/area_kkj/kkj_01/AC5170.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_8024067C_AC57EC); INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_80240730_AC58A0); -INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_802407A4_AC5914); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_8024081C_AC598C); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 36c5e9da8e..31bb487694 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -72,7 +72,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802414D8_8B1548); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802415F8_8B1668); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241658_8B16C8); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802416D0_8B1740); diff --git a/src/world/area_kmr/kmr_07/8D3DC0.c b/src/world/area_kmr/kmr_07/8D3DC0.c index 25c7c298dd..42be6f7db9 100644 --- a/src/world/area_kmr/kmr_07/8D3DC0.c +++ b/src/world/area_kmr/kmr_07/8D3DC0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802400B4_8D3E74); INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802401D4_8D3F94); -INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_80240234_8D3FF4); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802402AC_8D406C); diff --git a/src/world/area_kmr/kmr_11/8DA3A0.c b/src/world/area_kmr/kmr_11/8DA3A0.c index 044aca3abf..79dbff0ddb 100644 --- a/src/world/area_kmr/kmr_11/8DA3A0.c +++ b/src/world/area_kmr/kmr_11/8DA3A0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240424_8DA524); INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240544_8DA644); -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_802405A4_8DA6A4); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_8024061C_8DA71C); diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index 7b63619924..bcabfdbbd9 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024067C_A870CC); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240730_A87180); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802407A4_A871F4); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024081C_A8726C); diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index 7fbd97704a..8f8132b197 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_8024075C_A8D1DC); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240810_A8D290); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240884_A8D304); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802408FC_A8D37C); diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index f972f7025f..a4eb121043 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242BEC_7ED8FC); INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242CA0_7ED9B0); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242D14_7EDA24); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242D8C_7EDA9C); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 50aae096db..e0f105140c 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802416FC_801F7C); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802417B0_802030); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241824_8020A4); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024189C_80211C); diff --git a/src/world/area_mac/mac_01/805DD0.c b/src/world/area_mac/mac_01/805DD0.c index b269efe401..8467ceb54b 100644 --- a/src/world/area_mac/mac_01/805DD0.c +++ b/src/world/area_mac/mac_01/805DD0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245BCC_80644C); INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245C80_806500); -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245CF4_806574); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245D6C_8065EC); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index 7dddbbe47a..9222cd3be9 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240FAC_82426C); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241060_824320); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802410D4_824394); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024114C_82440C); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index f09b69412d..2354fee36f 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240B0C_852C7C); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240BC0_852D30); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240C34_852DA4); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240CAC_852E1C); diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index 6b442dd994..c028e94df7 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_8024095C_E0F0FC); INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240A10_E0F1B0); -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240A84_E0F224); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240AFC_E0F29C); diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 8747b47e2d..144c25bcea 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802400B4_9C5494); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802401D4_9C55B4); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240234_9C5614); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802402AC_9C568C); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index 1ca488166d..75608686c2 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802410FC_9D811C); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802411B0_9D81D0); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241224_9D8244); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024129C_9D82BC); diff --git a/src/world/area_nok/nok_12/9FAD60.c b/src/world/area_nok/nok_12/9FAD60.c index bb8910441c..aac03c2fdd 100644 --- a/src/world/area_nok/nok_12/9FAD60.c +++ b/src/world/area_nok/nok_12/9FAD60.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_802413C0_9FBBB0); INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241474_9FBC64); -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_802414E8_9FBCD8); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241560_9FBD50); diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c index 865db80436..e483675d7a 100644 --- a/src/world/area_omo/omo_02/D9D510.c +++ b/src/world/area_omo/omo_02/D9D510.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240F90_D9E460); INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_802410B0_D9E580); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241110_D9E5E0); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241188_D9E658); diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index be1f031d51..a4e2f9c439 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240BE8_DBDE98); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240C9C_DBDF4C); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240D10_DBDFC0); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240D88_DBE038); diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index 4d35a90e46..b0409e3a1c 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802415C8_DCE298); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024167C_DCE34C); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802416F0_DCE3C0); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241768_DCE438); diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index 3b23663749..96016a129c 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_8024159C_D8E7EC); INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241650_D8E8A0); -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_802416C4_D8E914); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_8024173C_D8E98C); diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index b98c4ab45f..6e1d4e05af 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240424_93F9D4); INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240544_93FAF4); -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802405A4_93FB54); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_8024061C_93FBCC); diff --git a/src/world/area_trd/trd_01/99CD80.c b/src/world/area_trd/trd_01/99CD80.c index b5c5e4b8ad..7478eecdeb 100644 --- a/src/world/area_trd/trd_01/99CD80.c +++ b/src/world/area_trd/trd_01/99CD80.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240C78_99D608); INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240D98_99D728); -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240DF8_99D788); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240E70_99D800); diff --git a/src/world/area_trd/trd_02/9A10C0.c b/src/world/area_trd/trd_02/9A10C0.c index 0387dfa434..c730ec8538 100644 --- a/src/world/area_trd/trd_02/9A10C0.c +++ b/src/world/area_trd/trd_02/9A10C0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240F30_9A1F10); INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240FE4_9A1FC4); -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241058_9A2038); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_802410D0_9A20B0); diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index c8cf98688e..ea02179b91 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241300_9A96F0); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802413B4_9A97A4); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241428_9A9818); +# include "world/common/NpcJumpFunc.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802414A0_9A9890); diff --git a/src/world/common/NpcJumpFunc.inc.c b/src/world/common/NpcJumpFunc.inc.c new file mode 100644 index 0000000000..3af3272483 --- /dev/null +++ b/src/world/common/NpcJumpFunc.inc.c @@ -0,0 +1,16 @@ +#include "common.h" +#include "map.h" + +static void NpcJumpFunc(ScriptInstance *script) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + npc->pos.y += npc->jumpVelocity; + npc->jumpVelocity -= npc->jumpScale; + + if (!(npc->pos.y > npc->moveToPos.y)) { + npc->pos.y = npc->moveToPos.y; + npc->jumpVelocity = 0.0f; + npc->flags &= ~0x800; + script->functionTemp[0].s = 12; + } +} From fb85b1d269d437c7e2fa743d3c159ee4f9abeba9 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 20 Nov 2020 00:16:08 -0500 Subject: [PATCH 05/38] another --- .../code_109660_len_1270/func_802E8A58.s | 8 ++++---- asm/nonmatchings/code_319670/func_802BD660.s | 8 ++++---- .../area_mac/mac_00/7EB340/func_80242224_7ECF34.s | 15 --------------- src/world/area_mac/mac_00/7EB340.c | 6 +++++- tools/symbol_addrs.txt | 2 +- 5 files changed, 14 insertions(+), 25 deletions(-) delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E8A58.s b/asm/nonmatchings/code_109660_len_1270/func_802E8A58.s index 15762c05f1..5b46f26299 100644 --- a/asm/nonmatchings/code_109660_len_1270/func_802E8A58.s +++ b/asm/nonmatchings/code_109660_len_1270/func_802E8A58.s @@ -19,15 +19,15 @@ glabel func_802E8A58 /* 10A310 802E8A90 080BA2B2 */ j .L802E8AC8 /* 10A314 802E8A94 00000000 */ nop .L802E8A98: -/* 10A318 802E8A98 3C028016 */ lui $v0, 0x8016 -/* 10A31C 802E8A9C 8442A552 */ lh $v0, -0x5aae($v0) +/* 10A318 802E8A98 3C028016 */ lui $v0, %hi(gCollisionStatus+0x2) +/* 10A31C 802E8A9C 8442A552 */ lh $v0, %lo(gCollisionStatus+0x2)($v0) /* 10A320 802E8AA0 1840000B */ blez $v0, .L802E8AD0 /* 10A324 802E8AA4 24020001 */ addiu $v0, $zero, 1 /* 10A328 802E8AA8 080BA2B4 */ j .L802E8AD0 /* 10A32C 802E8AAC ACA20004 */ sw $v0, 4($a1) .L802E8AB0: -/* 10A330 802E8AB0 3C028016 */ lui $v0, 0x8016 -/* 10A334 802E8AB4 8442A552 */ lh $v0, -0x5aae($v0) +/* 10A330 802E8AB0 3C028016 */ lui $v0, %hi(gCollisionStatus+0x2) +/* 10A334 802E8AB4 8442A552 */ lh $v0, %lo(gCollisionStatus+0x2)($v0) /* 10A338 802E8AB8 04410005 */ bgez $v0, .L802E8AD0 /* 10A33C 802E8ABC 24020002 */ addiu $v0, $zero, 2 /* 10A340 802E8AC0 080BA2B4 */ j .L802E8AD0 diff --git a/asm/nonmatchings/code_319670/func_802BD660.s b/asm/nonmatchings/code_319670/func_802BD660.s index 6711f880f2..f5d64b5805 100644 --- a/asm/nonmatchings/code_319670/func_802BD660.s +++ b/asm/nonmatchings/code_319670/func_802BD660.s @@ -772,14 +772,14 @@ glabel func_802BD660 /* 31A764 802BE1F4 AC620000 */ sw $v0, ($v1) /* 31A768 802BE1F8 2402FFFF */ addiu $v0, $zero, -1 /* 31A76C 802BE1FC E6020064 */ swc1 $f2, 0x64($s0) -/* 31A770 802BE200 3C018016 */ lui $at, 0x8016 -/* 31A774 802BE204 A422A552 */ sh $v0, -0x5aae($at) +/* 31A770 802BE200 3C018016 */ lui $at, %hi(gCollisionStatus+0x2) +/* 31A774 802BE204 A422A552 */ sh $v0, %lo(gCollisionStatus+0x2)($at) /* 31A778 802BE208 080AF9E3 */ j .L802BE78C /* 31A77C 802BE20C 00000000 */ nop /* 31A780 802BE210 0C0AF556 */ jal func_802BD558 /* 31A784 802BE214 24150015 */ addiu $s5, $zero, 0x15 -/* 31A788 802BE218 3C018016 */ lui $at, 0x8016 -/* 31A78C 802BE21C A422A552 */ sh $v0, -0x5aae($at) +/* 31A788 802BE218 3C018016 */ lui $at, %hi(gCollisionStatus+0x2) +/* 31A78C 802BE21C A422A552 */ sh $v0, %lo(gCollisionStatus+0x2)($at) /* 31A790 802BE220 822300B4 */ lb $v1, 0xb4($s1) /* 31A794 802BE224 10750156 */ beq $v1, $s5, .L802BE780 /* 31A798 802BE228 24020017 */ addiu $v0, $zero, 0x17 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s deleted file mode 100644 index f5db5f7529..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242224_7ECF34 -/* 7ECF34 80242224 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7ECF38 80242228 24020001 */ addiu $v0, $zero, 1 -/* 7ECF3C 8024222C AFBF0010 */ sw $ra, 0x10($sp) -/* 7ECF40 80242230 3C018011 */ lui $at, %hi(gPlayerData+0x2) -/* 7ECF44 80242234 A022F292 */ sb $v0, %lo(gPlayerData+0x2)($at) -/* 7ECF48 80242238 0C03A6DB */ jal sync_status_menu -/* 7ECF4C 8024223C 00000000 */ nop -/* 7ECF50 80242240 8FBF0010 */ lw $ra, 0x10($sp) -/* 7ECF54 80242244 24020002 */ addiu $v0, $zero, 2 -/* 7ECF58 80242248 03E00008 */ jr $ra -/* 7ECF5C 8024224C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index 2678144c2e..0d497c8be1 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -84,7 +84,11 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242178_7ECE88); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802421D0_7ECEE0); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242224_7ECF34); +ApiStatus func_80242224_7ECF34(ScriptInstance* script, s32 isInitialCall) { + gPlayerData.curHP = 1; + sync_status_menu(); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242250_7ECF60); diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt index be3ee0c4d9..dda23ceeca 100644 --- a/tools/symbol_addrs.txt +++ b/tools/symbol_addrs.txt @@ -899,7 +899,7 @@ gMusicTargetVolume = 0x80159AE2; gMusicUnkVolume2 = 0x80159AE4; gMusicCurrentVolume = 0x80159AE6; gMusicPlayers = 0x80159AF0; -gCollisionStatus = 0x8015A550; +gCollisionStatus = 0x8015A550; // size:0x28 get_dpad_input_radial = 0x8023E000; initialize_battle = 0x8023E130; update_actor_shadows = 0x8023E404; From 26417ed814a448eacf1d830ea9efaf3a44a504ba Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 20 Nov 2020 09:44:08 -0500 Subject: [PATCH 06/38] UnkMusicFunc --- .../mac_01/8017D0/func_80240F50_8017D0.s | 20 ++++---- .../mac_02/823BF0/func_802433F0_8266B0.s | 20 ++++---- include/common_structs.h | 10 ++-- include/functions.h | 1 + src/world/area_mac/mac_00/7ECFD0.c | 2 +- src/world/area_mac/mac_01/8017D0.c | 2 +- src/world/area_mac/mac_02/823BF0.c | 2 +- src/world/area_mac/mac_04/844AC0.c | 2 +- src/world/common/UnkMusicFunc.inc.c | 50 +++++++++++++++++++ 9 files changed, 81 insertions(+), 28 deletions(-) create mode 100644 src/world/common/UnkMusicFunc.inc.c diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80240F50_8017D0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80240F50_8017D0.s index 7cac02a655..d77897ec92 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80240F50_8017D0.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80240F50_8017D0.s @@ -13,7 +13,7 @@ glabel func_80240F50_8017D0 /* 8017F0 80240F70 0000902D */ daddu $s2, $zero, $zero /* 8017F4 80240F74 8C450000 */ lw $a1, ($v0) /* 8017F8 80240F78 0C0B1EAF */ jal get_variable -/* 8017FC 80240F7C 00000000 */ nop +/* 8017FC 80240F7C 00000000 */ nop /* 801800 80240F80 AE020070 */ sw $v0, 0x70($s0) /* 801804 80240F84 AE000074 */ sw $zero, 0x74($s0) /* 801808 80240F88 8C420014 */ lw $v0, 0x14($v0) @@ -27,7 +27,7 @@ glabel func_80240F50_8017D0 /* 801824 80240FA4 24030002 */ addiu $v1, $zero, 2 /* 801828 80240FA8 8E020074 */ lw $v0, 0x74($s0) /* 80182C 80240FAC 10430027 */ beq $v0, $v1, .L8024104C -/* 801830 80240FB0 00000000 */ nop +/* 801830 80240FB0 00000000 */ nop /* 801834 80240FB4 08090412 */ j .L80241048 /* 801838 80240FB8 AE030074 */ sw $v1, 0x74($s0) .L80240FBC: @@ -46,34 +46,34 @@ glabel func_80240F50_8017D0 /* 80186C 80240FEC 50400005 */ beql $v0, $zero, .L80241004 /* 801870 80240FF0 24020002 */ addiu $v0, $zero, 2 /* 801874 80240FF4 10600007 */ beqz $v1, .L80241014 -/* 801878 80240FF8 00000000 */ nop +/* 801878 80240FF8 00000000 */ nop /* 80187C 80240FFC 08090413 */ j .L8024104C -/* 801880 80241000 00000000 */ nop +/* 801880 80241000 00000000 */ nop .L80241004: /* 801884 80241004 50620010 */ beql $v1, $v0, .L80241048 /* 801888 80241008 AE040074 */ sw $a0, 0x74($s0) /* 80188C 8024100C 08090413 */ j .L8024104C -/* 801890 80241010 00000000 */ nop +/* 801890 80241010 00000000 */ nop .L80241014: /* 801894 80241014 C6200008 */ lwc1 $f0, 8($s1) /* 801898 80241018 4600103C */ c.lt.s $f2, $f0 -/* 80189C 8024101C 00000000 */ nop +/* 80189C 8024101C 00000000 */ nop /* 8018A0 80241020 4500000A */ bc1f .L8024104C -/* 8018A4 80241024 00000000 */ nop +/* 8018A4 80241024 00000000 */ nop /* 8018A8 80241028 08090412 */ j .L80241048 /* 8018AC 8024102C AE040074 */ sw $a0, 0x74($s0) .L80241030: /* 8018B0 80241030 C620000C */ lwc1 $f0, 0xc($s1) /* 8018B4 80241034 4602003C */ c.lt.s $f0, $f2 -/* 8018B8 80241038 00000000 */ nop +/* 8018B8 80241038 00000000 */ nop /* 8018BC 8024103C 45000003 */ bc1f .L8024104C -/* 8018C0 80241040 00000000 */ nop +/* 8018C0 80241040 00000000 */ nop /* 8018C4 80241044 AE000074 */ sw $zero, 0x74($s0) .L80241048: /* 8018C8 80241048 24120001 */ addiu $s2, $zero, 1 .L8024104C: /* 8018CC 8024104C 12400005 */ beqz $s2, .L80241064 -/* 8018D0 80241050 00000000 */ nop +/* 8018D0 80241050 00000000 */ nop /* 8018D4 80241054 8E250010 */ lw $a1, 0x10($s1) /* 8018D8 80241058 86060076 */ lh $a2, 0x76($s0) /* 8018DC 8024105C 0C052A95 */ jal func_8014AA54 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433F0_8266B0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433F0_8266B0.s index 81488fff85..451159b593 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433F0_8266B0.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433F0_8266B0.s @@ -13,7 +13,7 @@ glabel func_802433F0_8266B0 /* 8266D0 80243410 0000902D */ daddu $s2, $zero, $zero /* 8266D4 80243414 8C450000 */ lw $a1, ($v0) /* 8266D8 80243418 0C0B1EAF */ jal get_variable -/* 8266DC 8024341C 00000000 */ nop +/* 8266DC 8024341C 00000000 */ nop /* 8266E0 80243420 AE020070 */ sw $v0, 0x70($s0) /* 8266E4 80243424 AE000074 */ sw $zero, 0x74($s0) /* 8266E8 80243428 8C420014 */ lw $v0, 0x14($v0) @@ -27,7 +27,7 @@ glabel func_802433F0_8266B0 /* 826704 80243444 24030002 */ addiu $v1, $zero, 2 /* 826708 80243448 8E020074 */ lw $v0, 0x74($s0) /* 82670C 8024344C 10430027 */ beq $v0, $v1, .L802434EC -/* 826710 80243450 00000000 */ nop +/* 826710 80243450 00000000 */ nop /* 826714 80243454 08090D3A */ j .L802434E8 /* 826718 80243458 AE030074 */ sw $v1, 0x74($s0) .L8024345C: @@ -46,34 +46,34 @@ glabel func_802433F0_8266B0 /* 82674C 8024348C 50400005 */ beql $v0, $zero, .L802434A4 /* 826750 80243490 24020002 */ addiu $v0, $zero, 2 /* 826754 80243494 10600007 */ beqz $v1, .L802434B4 -/* 826758 80243498 00000000 */ nop +/* 826758 80243498 00000000 */ nop /* 82675C 8024349C 08090D3B */ j .L802434EC -/* 826760 802434A0 00000000 */ nop +/* 826760 802434A0 00000000 */ nop .L802434A4: /* 826764 802434A4 50620010 */ beql $v1, $v0, .L802434E8 /* 826768 802434A8 AE040074 */ sw $a0, 0x74($s0) /* 82676C 802434AC 08090D3B */ j .L802434EC -/* 826770 802434B0 00000000 */ nop +/* 826770 802434B0 00000000 */ nop .L802434B4: /* 826774 802434B4 C6200008 */ lwc1 $f0, 8($s1) /* 826778 802434B8 4600103C */ c.lt.s $f2, $f0 -/* 82677C 802434BC 00000000 */ nop +/* 82677C 802434BC 00000000 */ nop /* 826780 802434C0 4500000A */ bc1f .L802434EC -/* 826784 802434C4 00000000 */ nop +/* 826784 802434C4 00000000 */ nop /* 826788 802434C8 08090D3A */ j .L802434E8 /* 82678C 802434CC AE040074 */ sw $a0, 0x74($s0) .L802434D0: /* 826790 802434D0 C620000C */ lwc1 $f0, 0xc($s1) /* 826794 802434D4 4602003C */ c.lt.s $f0, $f2 -/* 826798 802434D8 00000000 */ nop +/* 826798 802434D8 00000000 */ nop /* 82679C 802434DC 45000003 */ bc1f .L802434EC -/* 8267A0 802434E0 00000000 */ nop +/* 8267A0 802434E0 00000000 */ nop /* 8267A4 802434E4 AE000074 */ sw $zero, 0x74($s0) .L802434E8: /* 8267A8 802434E8 24120001 */ addiu $s2, $zero, 1 .L802434EC: /* 8267AC 802434EC 12400005 */ beqz $s2, .L80243504 -/* 8267B0 802434F0 00000000 */ nop +/* 8267B0 802434F0 00000000 */ nop /* 8267B4 802434F4 8E250010 */ lw $a1, 0x10($s1) /* 8267B8 802434F8 86060076 */ lh $a2, 0x76($s0) /* 8267BC 802434FC 0C052A95 */ jal func_8014AA54 diff --git a/include/common_structs.h b/include/common_structs.h index bb867232eb..859151d6cd 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -210,6 +210,11 @@ typedef struct Trigger { typedef Trigger* TriggerList[MAX_TRIGGERS]; +typedef union X32 { + s32 s; + f32 f; +} X32; + typedef struct ScriptInstance { /* 0x000 */ u8 state; /* 0x001 */ u8 currentArgc; @@ -227,10 +232,7 @@ typedef struct ScriptInstance { /* 0x064 */ struct ScriptInstance* blockingParent; /* parent? */ /* 0x068 */ struct ScriptInstance* childScript; /* 0x06C */ struct ScriptInstance* parentScript; /* brother? */ - /* 0x070 */ union { - s32 s; - f32 f; - } functionTemp[4]; + /* 0x070 */ X32 functionTemp[4]; /* 0x080 */ ApiFunc callFunction; /* 0x084 */ s32 varTable[16]; /* 0x0C4 */ s32 varFlags[3]; diff --git a/include/functions.h b/include/functions.h index a23ba73f5e..e16cd9fdb9 100644 --- a/include/functions.h +++ b/include/functions.h @@ -133,6 +133,7 @@ void add_vec2D_polar(f32* x, f32* y, f32 r, f32 theta); s32 func_801499EC(s32 soundID, s32 arg1, f32 arg2, f32 arg3, f32 arg4); s32 play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ); s32 set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume); +s32 func_8014AA54(s32 playerIndex, s32 arg1, s16 arg2); ScriptInstance* get_script_by_index(s32 index); diff --git a/src/world/area_mac/mac_00/7ECFD0.c b/src/world/area_mac/mac_00/7ECFD0.c index cfff9a3ebf..924f6b3d3d 100644 --- a/src/world/area_mac/mac_00/7ECFD0.c +++ b/src/world/area_mac/mac_00/7ECFD0.c @@ -1,5 +1,5 @@ #include "mac_00.h" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ECFD0", func_802422C0_7ECFD0); +#include "world/common/UnkMusicFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7ECFD0", func_802423F0_7ED100); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index e0f105140c..c78cb34d24 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -1,6 +1,6 @@ #include "mac_01.h" -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80240F50_8017D0); +#include "world/common/UnkMusicFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241080_801900); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index 9222cd3be9..942f35e936 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -106,4 +106,4 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80243380_826640); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802433C4_826684); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802433F0_8266B0); +#include "world/common/UnkMusicFunc.inc.c" diff --git a/src/world/area_mac/mac_04/844AC0.c b/src/world/area_mac/mac_04/844AC0.c index c675a8e095..325929242e 100644 --- a/src/world/area_mac/mac_04/844AC0.c +++ b/src/world/area_mac/mac_04/844AC0.c @@ -1,3 +1,3 @@ #include "mac_04.h" -INCLUDE_ASM(s32, "world/area_mac/mac_04/844AC0", func_80241EF0_844AC0); +#include "world/common/UnkMusicFunc.inc.c" diff --git a/src/world/common/UnkMusicFunc.inc.c b/src/world/common/UnkMusicFunc.inc.c new file mode 100644 index 0000000000..564d8cd55f --- /dev/null +++ b/src/world/common/UnkMusicFunc.inc.c @@ -0,0 +1,50 @@ +#include "common.h" + +static ApiStatus UnkMusicFunc(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + X32* something; + s32 cond = 0; + f32 dist; + + if (isInitialCall) { + script->functionTemp[0].s = get_variable(script, *args); + script->functionTemp[1].s = 0; + script->functionTemp[2].s = ((s32*)(script->functionTemp[0].s))[5]; + } + + something = script->functionTemp[0].s; + + if (get_variable(script, script->functionTemp[2].s)) { + if (script->functionTemp[1].s != 2) { + script->functionTemp[1].s = 2; + cond = TRUE; + } + } else { + dist = dist2D(gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z, something[0].f, something[1].f); + + switch (script->functionTemp[1].s) { + case 0: + if (dist < something[2].f) { + script->functionTemp[1].s = 1; + cond = TRUE; + } + break; + case 1: + if (dist > something[3].f) { + script->functionTemp[1].s = 0; + cond = TRUE; + } + break; + case 2: + script->functionTemp[1].s = 1; + cond = TRUE; + break; + } + } + + if (cond) { + func_8014AA54(0, something[4].s, script->functionTemp[1].s); + } + + return ApiStatus_BLOCK; +} From 7ae4f565f72f003eaaade07cd735d9b3d3126118 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 20 Nov 2020 09:55:56 -0500 Subject: [PATCH 07/38] UnkNpcDurationFlagFunc --- .../arn_03/BDED90/func_80240A6C_BDF7FC.s | 32 ------- .../arn_03/BDED90/func_80240B94_BDF924.s | 2 +- .../arn_04/BE37B0/func_80240A6C_BE421C.s | 32 ------- .../arn_04/BE37B0/func_80240B94_BE4344.s | 2 +- .../arn_05/BE7BE0/func_80240A6C_BE864C.s | 32 ------- .../arn_05/BE7BE0/func_80240B94_BE8774.s | 2 +- .../dgb_01/BFD9A0/func_80242F98_C00818.s | 32 ------- .../dgb_01/BFD9A0/func_802430C0_C00940.s | 2 +- .../dgb_03/C31730/func_8024158C_C32A6C.s | 32 ------- .../dgb_03/C31730/func_802416B4_C32B94.s | 2 +- .../dgb_03/C31730/func_802419B0_C32E90.s | 2 +- .../dgb_08/C3FDB0/func_80240A6C_C4081C.s | 32 ------- .../dgb_08/C3FDB0/func_80240B94_C40944.s | 2 +- .../dgb_15/C4F510/func_8024133C_C5084C.s | 32 ------- .../dgb_15/C4F510/func_80241464_C50974.s | 2 +- .../dgb_18/C55F40/func_80240A6C_C569AC.s | 32 ------- .../dgb_18/C55F40/func_80240B94_C56AD4.s | 2 +- .../dro_01/95B7E0/func_8024104C_95C24C.s | 32 ------- .../dro_01/95B7E0/func_80241174_95C374.s | 2 +- .../flo_00/C9DF60/func_80240AAC_C9E9CC.s | 32 ------- .../flo_00/C9DF60/func_80240BD4_C9EAF4.s | 2 +- .../jan_02/B2C8A0/func_80240E9C_B2D30C.s | 32 ------- .../jan_02/B2C8A0/func_80240FC4_B2D434.s | 2 +- .../jan_03/B34BD0/func_8024108C_B35C5C.s | 32 ------- .../jan_03/B34BD0/func_802411B4_B35D84.s | 2 +- .../jan_22/B84180/func_80240A6C_B84BEC.s | 32 ------- .../jan_22/B84180/func_80240B94_B84D14.s | 2 +- .../kkj_00/ABB340/func_80240B1C_ABBDAC.s | 32 ------- .../kkj_00/ABB340/func_80240C44_ABBED4.s | 2 +- .../kkj_01/AC5170/func_80240A6C_AC5BDC.s | 32 ------- .../kkj_01/AC5170/func_80240B94_AC5D04.s | 2 +- .../kpa_91/A86A50/func_80240A6C_A874BC.s | 32 ------- .../kpa_91/A86A50/func_80240B94_A875E4.s | 2 +- .../kpa_95/A8CB60/func_80240B4C_A8D5CC.s | 32 ------- .../kpa_95/A8CB60/func_80240C74_A8D6F4.s | 2 +- .../mac_00/7ECFD0/func_802422C0_7ECFD0.s | 88 ------------------- .../mac_00/7ED280/func_80242FDC_7EDCEC.s | 32 ------- .../mac_00/7ED280/func_80243104_7EDE14.s | 2 +- .../mac_01/8017D0/func_80240F50_8017D0.s | 88 ------------------- .../mac_01/8017D0/func_80241AEC_80236C.s | 32 ------- .../mac_01/8017D0/func_80241C14_802494.s | 2 +- .../mac_01/805DD0/func_80245FBC_80683C.s | 32 ------- .../mac_01/805DD0/func_802460E4_806964.s | 2 +- .../mac_02/823BF0/func_8024139C_82465C.s | 32 ------- .../mac_02/823BF0/func_802414C4_824784.s | 2 +- .../mac_02/823BF0/func_802433F0_8266B0.s | 88 ------------------- .../mac_04/844AC0/func_80241EF0_844AC0.s | 88 ------------------- .../mac_05/852170/func_80240EFC_85306C.s | 32 ------- .../mac_05/852170/func_80241024_853194.s | 2 +- .../mgm_00/E0E7A0/func_80240D4C_E0F4EC.s | 32 ------- .../mgm_00/E0E7A0/func_80240E74_E0F614.s | 2 +- .../nok_02/9D7AA0/func_802414EC_9D850C.s | 32 ------- .../nok_02/9D7AA0/func_80241614_9D8634.s | 2 +- .../nok_12/9FAD60/func_802417B0_9FBFA0.s | 32 ------- .../nok_12/9FAD60/func_802418D8_9FC0C8.s | 2 +- .../omo_07/DBD2B0/func_80240FD8_DBE288.s | 32 ------- .../omo_07/DBD2B0/func_80241100_DBE3B0.s | 2 +- .../omo_09/DCD6B0/func_802419B8_DCE688.s | 32 ------- .../omo_09/DCD6B0/func_80241AE0_DCE7B0.s | 2 +- .../pra_35/D8D270/func_8024198C_D8EBDC.s | 32 ------- .../pra_35/D8D270/func_80241AB4_D8ED04.s | 2 +- .../pra_35/D8D270/func_802423CC_D8F61C.s | 2 +- .../trd_02/9A10C0/func_80241320_9A2300.s | 32 ------- .../trd_02/9A10C0/func_80241448_9A2428.s | 2 +- .../trd_04/9A88A0/func_802416F0_9A9AE0.s | 32 ------- .../trd_04/9A88A0/func_80241818_9A9C08.s | 2 +- include/map.h | 4 +- src/world/area_arn/arn_03/BDED90.c | 2 +- src/world/area_arn/arn_04/BE37B0.c | 2 +- src/world/area_arn/arn_05/BE7BE0.c | 2 +- src/world/area_dgb/dgb_01/BFD9A0.c | 2 +- src/world/area_dgb/dgb_03/C31730.c | 2 +- src/world/area_dgb/dgb_08/C3FDB0.c | 2 +- src/world/area_dgb/dgb_15/C4F510.c | 2 +- src/world/area_dgb/dgb_18/C55F40.c | 2 +- src/world/area_dro/dro_01/95B7E0.c | 2 +- src/world/area_flo/flo_00/C9DF60.c | 2 +- src/world/area_jan/jan_02/B2C8A0.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_jan/jan_22/B84180.c | 2 +- src/world/area_kkj/kkj_00/ABB340.c | 2 +- src/world/area_kkj/kkj_01/AC5170.c | 2 +- src/world/area_kpa/kpa_91/A86A50.c | 2 +- src/world/area_kpa/kpa_95/A8CB60.c | 2 +- src/world/area_mac/mac_00/7ED280.c | 2 +- src/world/area_mac/mac_01/8017D0.c | 2 +- src/world/area_mac/mac_01/805DD0.c | 2 +- src/world/area_mac/mac_02/823BF0.c | 2 +- src/world/area_mac/mac_05/852170.c | 2 +- src/world/area_mgm/mgm_00/E0E7A0.c | 2 +- src/world/area_nok/nok_02/9D7AA0.c | 2 +- src/world/area_nok/nok_12/9FAD60.c | 2 +- src/world/area_omo/omo_07/DBD2B0.c | 2 +- src/world/area_omo/omo_09/DCD6B0.c | 2 +- src/world/area_pra/pra_35/D8D270.c | 2 +- src/world/area_trd/trd_02/9A10C0.c | 2 +- src/world/area_trd/trd_04/9A88A0.c | 2 +- src/world/common/UnkNpcDurationFlagFunc.inc.c | 16 ++++ 98 files changed, 81 insertions(+), 1375 deletions(-) delete mode 100644 asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240A6C_BDF7FC.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240A6C_BE421C.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240A6C_BE864C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242F98_C00818.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024158C_C32A6C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240A6C_C4081C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024133C_C5084C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240A6C_C569AC.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024104C_95C24C.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240AAC_C9E9CC.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240E9C_B2D30C.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024108C_B35C5C.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240A6C_B84BEC.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B1C_ABBDAC.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240A6C_AC5BDC.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240A6C_A874BC.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240B4C_A8D5CC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802422C0_7ECFD0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242FDC_7EDCEC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80240F50_8017D0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241AEC_80236C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245FBC_80683C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024139C_82465C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433F0_8266B0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/844AC0/func_80241EF0_844AC0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80240EFC_85306C.s delete mode 100644 asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240D4C_E0F4EC.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802414EC_9D850C.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802417B0_9FBFA0.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240FD8_DBE288.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802419B8_DCE688.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024198C_D8EBDC.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241320_9A2300.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802416F0_9A9AE0.s create mode 100644 src/world/common/UnkNpcDurationFlagFunc.inc.c diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240A6C_BDF7FC.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240A6C_BDF7FC.s deleted file mode 100644 index aceb159907..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240A6C_BDF7FC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_BDF7FC -/* BDF7FC 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BDF800 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* BDF804 80240A74 0080882D */ daddu $s1, $a0, $zero -/* BDF808 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* BDF80C 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* BDF810 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* BDF814 80240A84 0C00EABB */ jal get_npc_unsafe -/* BDF818 80240A88 86040008 */ lh $a0, 8($s0) -/* BDF81C 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* BDF820 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* BDF824 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* BDF828 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* BDF82C 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* BDF830 80240AA0 00000000 */ nop -/* BDF834 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* BDF838 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* BDF83C 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* BDF840 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* BDF844 80240AB4 080902B0 */ j .L80240AC0 -/* BDF848 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* BDF84C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* BDF850 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* BDF854 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* BDF858 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* BDF85C 80240ACC 03E00008 */ jr $ra -/* BDF860 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s index 33b66fc89e..841d8b127c 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s @@ -177,7 +177,7 @@ glabel func_80240B94_BDF924 /* BDFBBC 80240E2C 00000000 */ nop /* BDFBC0 80240E30 0280202D */ daddu $a0, $s4, $zero /* BDFBC4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* BDFBC8 80240E38 0C09029B */ jal func_80240A6C_BDF7FC +/* BDFBC8 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc /* BDFBCC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* BDFBD0 80240E40 0809039A */ j .L80240E68 /* BDFBD4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240A6C_BE421C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240A6C_BE421C.s deleted file mode 100644 index c67d13c240..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240A6C_BE421C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_BE421C -/* BE421C 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE4220 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* BE4224 80240A74 0080882D */ daddu $s1, $a0, $zero -/* BE4228 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* BE422C 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* BE4230 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* BE4234 80240A84 0C00EABB */ jal get_npc_unsafe -/* BE4238 80240A88 86040008 */ lh $a0, 8($s0) -/* BE423C 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* BE4240 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* BE4244 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* BE4248 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* BE424C 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* BE4250 80240AA0 00000000 */ nop -/* BE4254 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* BE4258 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* BE425C 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* BE4260 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* BE4264 80240AB4 080902B0 */ j .L80240AC0 -/* BE4268 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* BE426C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* BE4270 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* BE4274 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* BE4278 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* BE427C 80240ACC 03E00008 */ jr $ra -/* BE4280 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s index 3f28e5babc..6b757eadca 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s @@ -177,7 +177,7 @@ glabel func_80240B94_BE4344 /* BE45DC 80240E2C 00000000 */ nop /* BE45E0 80240E30 0280202D */ daddu $a0, $s4, $zero /* BE45E4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* BE45E8 80240E38 0C09029B */ jal func_80240A6C_BE421C +/* BE45E8 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc /* BE45EC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* BE45F0 80240E40 0809039A */ j .L80240E68 /* BE45F4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240A6C_BE864C.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240A6C_BE864C.s deleted file mode 100644 index b67fdd2dca..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240A6C_BE864C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_BE864C -/* BE864C 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE8650 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* BE8654 80240A74 0080882D */ daddu $s1, $a0, $zero -/* BE8658 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* BE865C 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* BE8660 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* BE8664 80240A84 0C00EABB */ jal get_npc_unsafe -/* BE8668 80240A88 86040008 */ lh $a0, 8($s0) -/* BE866C 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* BE8670 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* BE8674 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* BE8678 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* BE867C 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* BE8680 80240AA0 00000000 */ nop -/* BE8684 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* BE8688 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* BE868C 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* BE8690 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* BE8694 80240AB4 080902B0 */ j .L80240AC0 -/* BE8698 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* BE869C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* BE86A0 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* BE86A4 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* BE86A8 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* BE86AC 80240ACC 03E00008 */ jr $ra -/* BE86B0 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s index f21c79d307..4fada23213 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s @@ -177,7 +177,7 @@ glabel func_80240B94_BE8774 /* BE8A0C 80240E2C 00000000 */ nop /* BE8A10 80240E30 0280202D */ daddu $a0, $s4, $zero /* BE8A14 80240E34 0260282D */ daddu $a1, $s3, $zero -/* BE8A18 80240E38 0C09029B */ jal func_80240A6C_BE864C +/* BE8A18 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc /* BE8A1C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* BE8A20 80240E40 0809039A */ j .L80240E68 /* BE8A24 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242F98_C00818.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242F98_C00818.s deleted file mode 100644 index 0c4a55bb2c..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242F98_C00818.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F98_C00818 -/* C00818 80242F98 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C0081C 80242F9C AFB10014 */ sw $s1, 0x14($sp) -/* C00820 80242FA0 0080882D */ daddu $s1, $a0, $zero -/* C00824 80242FA4 AFBF0018 */ sw $ra, 0x18($sp) -/* C00828 80242FA8 AFB00010 */ sw $s0, 0x10($sp) -/* C0082C 80242FAC 8E300148 */ lw $s0, 0x148($s1) -/* C00830 80242FB0 0C00EABB */ jal get_npc_unsafe -/* C00834 80242FB4 86040008 */ lh $a0, 8($s0) -/* C00838 80242FB8 9443008E */ lhu $v1, 0x8e($v0) -/* C0083C 80242FBC 2463FFFF */ addiu $v1, $v1, -1 -/* C00840 80242FC0 A443008E */ sh $v1, 0x8e($v0) -/* C00844 80242FC4 00031C00 */ sll $v1, $v1, 0x10 -/* C00848 80242FC8 14600008 */ bnez $v1, .L80242FEC -/* C0084C 80242FCC 00000000 */ nop -/* C00850 80242FD0 8E0200B0 */ lw $v0, 0xb0($s0) -/* C00854 80242FD4 30420080 */ andi $v0, $v0, 0x80 -/* C00858 80242FD8 10400003 */ beqz $v0, .L80242FE8 -/* C0085C 80242FDC 2402000F */ addiu $v0, $zero, 0xf -/* C00860 80242FE0 08090BFB */ j .L80242FEC -/* C00864 80242FE4 AE220070 */ sw $v0, 0x70($s1) -.L80242FE8: -/* C00868 80242FE8 AE200070 */ sw $zero, 0x70($s1) -.L80242FEC: -/* C0086C 80242FEC 8FBF0018 */ lw $ra, 0x18($sp) -/* C00870 80242FF0 8FB10014 */ lw $s1, 0x14($sp) -/* C00874 80242FF4 8FB00010 */ lw $s0, 0x10($sp) -/* C00878 80242FF8 03E00008 */ jr $ra -/* C0087C 80242FFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s index e91f20472b..737aeb3ac9 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s @@ -177,7 +177,7 @@ glabel func_802430C0_C00940 /* C00BD8 80243358 00000000 */ nop /* C00BDC 8024335C 0280202D */ daddu $a0, $s4, $zero /* C00BE0 80243360 0260282D */ daddu $a1, $s3, $zero -/* C00BE4 80243364 0C090BE6 */ jal func_80242F98_C00818 +/* C00BE4 80243364 0C090BE6 */ jal UnkNpcDurationFlagFunc /* C00BE8 80243368 02A0302D */ daddu $a2, $s5, $zero /* C00BEC 8024336C 08090CE5 */ j .L80243394 /* C00BF0 80243370 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024158C_C32A6C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024158C_C32A6C.s deleted file mode 100644 index 81bd112502..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024158C_C32A6C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024158C_C32A6C -/* C32A6C 8024158C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C32A70 80241590 AFB10014 */ sw $s1, 0x14($sp) -/* C32A74 80241594 0080882D */ daddu $s1, $a0, $zero -/* C32A78 80241598 AFBF0018 */ sw $ra, 0x18($sp) -/* C32A7C 8024159C AFB00010 */ sw $s0, 0x10($sp) -/* C32A80 802415A0 8E300148 */ lw $s0, 0x148($s1) -/* C32A84 802415A4 0C00EABB */ jal get_npc_unsafe -/* C32A88 802415A8 86040008 */ lh $a0, 8($s0) -/* C32A8C 802415AC 9443008E */ lhu $v1, 0x8e($v0) -/* C32A90 802415B0 2463FFFF */ addiu $v1, $v1, -1 -/* C32A94 802415B4 A443008E */ sh $v1, 0x8e($v0) -/* C32A98 802415B8 00031C00 */ sll $v1, $v1, 0x10 -/* C32A9C 802415BC 14600008 */ bnez $v1, .L802415E0 -/* C32AA0 802415C0 00000000 */ nop -/* C32AA4 802415C4 8E0200B0 */ lw $v0, 0xb0($s0) -/* C32AA8 802415C8 30420080 */ andi $v0, $v0, 0x80 -/* C32AAC 802415CC 10400003 */ beqz $v0, .L802415DC -/* C32AB0 802415D0 2402000F */ addiu $v0, $zero, 0xf -/* C32AB4 802415D4 08090578 */ j .L802415E0 -/* C32AB8 802415D8 AE220070 */ sw $v0, 0x70($s1) -.L802415DC: -/* C32ABC 802415DC AE200070 */ sw $zero, 0x70($s1) -.L802415E0: -/* C32AC0 802415E0 8FBF0018 */ lw $ra, 0x18($sp) -/* C32AC4 802415E4 8FB10014 */ lw $s1, 0x14($sp) -/* C32AC8 802415E8 8FB00010 */ lw $s0, 0x10($sp) -/* C32ACC 802415EC 03E00008 */ jr $ra -/* C32AD0 802415F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s index a84ecda729..45fcb997b9 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s @@ -177,7 +177,7 @@ glabel func_802416B4_C32B94 /* C32E2C 8024194C 00000000 */ nop /* C32E30 80241950 0280202D */ daddu $a0, $s4, $zero /* C32E34 80241954 0260282D */ daddu $a1, $s3, $zero -/* C32E38 80241958 0C090563 */ jal func_8024158C_C32A6C +/* C32E38 80241958 0C090563 */ jal UnkNpcDurationFlagFunc /* C32E3C 8024195C 02A0302D */ daddu $a2, $s5, $zero /* C32E40 80241960 08090662 */ j .L80241988 /* C32E44 80241964 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s index ab4781faab..1f78fe290e 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 @@ -153,7 +153,7 @@ glabel func_802419B0_C32E90 /* C330C8 80241BE8 00000000 */ nop /* C330CC 80241BEC 0240202D */ daddu $a0, $s2, $zero /* C330D0 80241BF0 0260282D */ daddu $a1, $s3, $zero -/* C330D4 80241BF4 0C090563 */ jal func_8024158C_C32A6C +/* C330D4 80241BF4 0C090563 */ jal UnkNpcDurationFlagFunc /* C330D8 80241BF8 0280302D */ daddu $a2, $s4, $zero /* C330DC 80241BFC 08090715 */ j .L80241C54 /* C330E0 80241C00 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240A6C_C4081C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240A6C_C4081C.s deleted file mode 100644 index d9db53685a..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240A6C_C4081C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_C4081C -/* C4081C 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C40820 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* C40824 80240A74 0080882D */ daddu $s1, $a0, $zero -/* C40828 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* C4082C 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* C40830 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* C40834 80240A84 0C00EABB */ jal get_npc_unsafe -/* C40838 80240A88 86040008 */ lh $a0, 8($s0) -/* C4083C 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* C40840 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* C40844 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* C40848 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* C4084C 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* C40850 80240AA0 00000000 */ nop -/* C40854 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* C40858 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* C4085C 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* C40860 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* C40864 80240AB4 080902B0 */ j .L80240AC0 -/* C40868 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* C4086C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* C40870 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* C40874 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* C40878 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* C4087C 80240ACC 03E00008 */ jr $ra -/* C40880 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s index f1e40daafe..522db1c848 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s @@ -177,7 +177,7 @@ glabel func_80240B94_C40944 /* C40BDC 80240E2C 00000000 */ nop /* C40BE0 80240E30 0280202D */ daddu $a0, $s4, $zero /* C40BE4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* C40BE8 80240E38 0C09029B */ jal func_80240A6C_C4081C +/* C40BE8 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc /* C40BEC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* C40BF0 80240E40 0809039A */ j .L80240E68 /* C40BF4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024133C_C5084C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024133C_C5084C.s deleted file mode 100644 index 0cad4a343b..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024133C_C5084C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024133C_C5084C -/* C5084C 8024133C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C50850 80241340 AFB10014 */ sw $s1, 0x14($sp) -/* C50854 80241344 0080882D */ daddu $s1, $a0, $zero -/* C50858 80241348 AFBF0018 */ sw $ra, 0x18($sp) -/* C5085C 8024134C AFB00010 */ sw $s0, 0x10($sp) -/* C50860 80241350 8E300148 */ lw $s0, 0x148($s1) -/* C50864 80241354 0C00EABB */ jal get_npc_unsafe -/* C50868 80241358 86040008 */ lh $a0, 8($s0) -/* C5086C 8024135C 9443008E */ lhu $v1, 0x8e($v0) -/* C50870 80241360 2463FFFF */ addiu $v1, $v1, -1 -/* C50874 80241364 A443008E */ sh $v1, 0x8e($v0) -/* C50878 80241368 00031C00 */ sll $v1, $v1, 0x10 -/* C5087C 8024136C 14600008 */ bnez $v1, .L80241390 -/* C50880 80241370 00000000 */ nop -/* C50884 80241374 8E0200B0 */ lw $v0, 0xb0($s0) -/* C50888 80241378 30420080 */ andi $v0, $v0, 0x80 -/* C5088C 8024137C 10400003 */ beqz $v0, .L8024138C -/* C50890 80241380 2402000F */ addiu $v0, $zero, 0xf -/* C50894 80241384 080904E4 */ j .L80241390 -/* C50898 80241388 AE220070 */ sw $v0, 0x70($s1) -.L8024138C: -/* C5089C 8024138C AE200070 */ sw $zero, 0x70($s1) -.L80241390: -/* C508A0 80241390 8FBF0018 */ lw $ra, 0x18($sp) -/* C508A4 80241394 8FB10014 */ lw $s1, 0x14($sp) -/* C508A8 80241398 8FB00010 */ lw $s0, 0x10($sp) -/* C508AC 8024139C 03E00008 */ jr $ra -/* C508B0 802413A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s index 5969903078..593c51e5fe 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s @@ -177,7 +177,7 @@ glabel func_80241464_C50974 /* C50C0C 802416FC 00000000 */ nop /* C50C10 80241700 0280202D */ daddu $a0, $s4, $zero /* C50C14 80241704 0260282D */ daddu $a1, $s3, $zero -/* C50C18 80241708 0C0904CF */ jal func_8024133C_C5084C +/* C50C18 80241708 0C0904CF */ jal UnkNpcDurationFlagFunc /* C50C1C 8024170C 02A0302D */ daddu $a2, $s5, $zero /* C50C20 80241710 080905CE */ j .L80241738 /* C50C24 80241714 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240A6C_C569AC.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240A6C_C569AC.s deleted file mode 100644 index 30dd6eb008..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240A6C_C569AC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_C569AC -/* C569AC 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C569B0 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* C569B4 80240A74 0080882D */ daddu $s1, $a0, $zero -/* C569B8 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* C569BC 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* C569C0 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* C569C4 80240A84 0C00EABB */ jal get_npc_unsafe -/* C569C8 80240A88 86040008 */ lh $a0, 8($s0) -/* C569CC 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* C569D0 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* C569D4 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* C569D8 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* C569DC 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* C569E0 80240AA0 00000000 */ nop -/* C569E4 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* C569E8 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* C569EC 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* C569F0 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* C569F4 80240AB4 080902B0 */ j .L80240AC0 -/* C569F8 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* C569FC 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* C56A00 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* C56A04 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* C56A08 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* C56A0C 80240ACC 03E00008 */ jr $ra -/* C56A10 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s index 1635e6476d..89618d4a72 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s @@ -177,7 +177,7 @@ glabel func_80240B94_C56AD4 /* C56D6C 80240E2C 00000000 */ nop /* C56D70 80240E30 0280202D */ daddu $a0, $s4, $zero /* C56D74 80240E34 0260282D */ daddu $a1, $s3, $zero -/* C56D78 80240E38 0C09029B */ jal func_80240A6C_C569AC +/* C56D78 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc /* C56D7C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* C56D80 80240E40 0809039A */ j .L80240E68 /* C56D84 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024104C_95C24C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024104C_95C24C.s deleted file mode 100644 index c325388baf..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024104C_95C24C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024104C_95C24C -/* 95C24C 8024104C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95C250 80241050 AFB10014 */ sw $s1, 0x14($sp) -/* 95C254 80241054 0080882D */ daddu $s1, $a0, $zero -/* 95C258 80241058 AFBF0018 */ sw $ra, 0x18($sp) -/* 95C25C 8024105C AFB00010 */ sw $s0, 0x10($sp) -/* 95C260 80241060 8E300148 */ lw $s0, 0x148($s1) -/* 95C264 80241064 0C00EABB */ jal get_npc_unsafe -/* 95C268 80241068 86040008 */ lh $a0, 8($s0) -/* 95C26C 8024106C 9443008E */ lhu $v1, 0x8e($v0) -/* 95C270 80241070 2463FFFF */ addiu $v1, $v1, -1 -/* 95C274 80241074 A443008E */ sh $v1, 0x8e($v0) -/* 95C278 80241078 00031C00 */ sll $v1, $v1, 0x10 -/* 95C27C 8024107C 14600008 */ bnez $v1, .L802410A0 -/* 95C280 80241080 00000000 */ nop -/* 95C284 80241084 8E0200B0 */ lw $v0, 0xb0($s0) -/* 95C288 80241088 30420080 */ andi $v0, $v0, 0x80 -/* 95C28C 8024108C 10400003 */ beqz $v0, .L8024109C -/* 95C290 80241090 2402000F */ addiu $v0, $zero, 0xf -/* 95C294 80241094 08090428 */ j .L802410A0 -/* 95C298 80241098 AE220070 */ sw $v0, 0x70($s1) -.L8024109C: -/* 95C29C 8024109C AE200070 */ sw $zero, 0x70($s1) -.L802410A0: -/* 95C2A0 802410A0 8FBF0018 */ lw $ra, 0x18($sp) -/* 95C2A4 802410A4 8FB10014 */ lw $s1, 0x14($sp) -/* 95C2A8 802410A8 8FB00010 */ lw $s0, 0x10($sp) -/* 95C2AC 802410AC 03E00008 */ jr $ra -/* 95C2B0 802410B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s index 540b8e3181..f451072cc0 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s @@ -177,7 +177,7 @@ glabel func_80241174_95C374 /* 95C60C 8024140C 00000000 */ nop /* 95C610 80241410 0280202D */ daddu $a0, $s4, $zero /* 95C614 80241414 0260282D */ daddu $a1, $s3, $zero -/* 95C618 80241418 0C090413 */ jal func_8024104C_95C24C +/* 95C618 80241418 0C090413 */ jal UnkNpcDurationFlagFunc /* 95C61C 8024141C 02A0302D */ daddu $a2, $s5, $zero /* 95C620 80241420 08090512 */ j .L80241448 /* 95C624 80241424 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240AAC_C9E9CC.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240AAC_C9E9CC.s deleted file mode 100644 index 852a15f512..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240AAC_C9E9CC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AAC_C9E9CC -/* C9E9CC 80240AAC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C9E9D0 80240AB0 AFB10014 */ sw $s1, 0x14($sp) -/* C9E9D4 80240AB4 0080882D */ daddu $s1, $a0, $zero -/* C9E9D8 80240AB8 AFBF0018 */ sw $ra, 0x18($sp) -/* C9E9DC 80240ABC AFB00010 */ sw $s0, 0x10($sp) -/* C9E9E0 80240AC0 8E300148 */ lw $s0, 0x148($s1) -/* C9E9E4 80240AC4 0C00EABB */ jal get_npc_unsafe -/* C9E9E8 80240AC8 86040008 */ lh $a0, 8($s0) -/* C9E9EC 80240ACC 9443008E */ lhu $v1, 0x8e($v0) -/* C9E9F0 80240AD0 2463FFFF */ addiu $v1, $v1, -1 -/* C9E9F4 80240AD4 A443008E */ sh $v1, 0x8e($v0) -/* C9E9F8 80240AD8 00031C00 */ sll $v1, $v1, 0x10 -/* C9E9FC 80240ADC 14600008 */ bnez $v1, .L80240B00 -/* C9EA00 80240AE0 00000000 */ nop -/* C9EA04 80240AE4 8E0200B0 */ lw $v0, 0xb0($s0) -/* C9EA08 80240AE8 30420080 */ andi $v0, $v0, 0x80 -/* C9EA0C 80240AEC 10400003 */ beqz $v0, .L80240AFC -/* C9EA10 80240AF0 2402000F */ addiu $v0, $zero, 0xf -/* C9EA14 80240AF4 080902C0 */ j .L80240B00 -/* C9EA18 80240AF8 AE220070 */ sw $v0, 0x70($s1) -.L80240AFC: -/* C9EA1C 80240AFC AE200070 */ sw $zero, 0x70($s1) -.L80240B00: -/* C9EA20 80240B00 8FBF0018 */ lw $ra, 0x18($sp) -/* C9EA24 80240B04 8FB10014 */ lw $s1, 0x14($sp) -/* C9EA28 80240B08 8FB00010 */ lw $s0, 0x10($sp) -/* C9EA2C 80240B0C 03E00008 */ jr $ra -/* C9EA30 80240B10 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s index e70e472ef5..f6ff921b84 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s @@ -177,7 +177,7 @@ glabel func_80240BD4_C9EAF4 /* C9ED8C 80240E6C 00000000 */ nop /* C9ED90 80240E70 0280202D */ daddu $a0, $s4, $zero /* C9ED94 80240E74 0260282D */ daddu $a1, $s3, $zero -/* C9ED98 80240E78 0C0902AB */ jal func_80240AAC_C9E9CC +/* C9ED98 80240E78 0C0902AB */ jal UnkNpcDurationFlagFunc /* C9ED9C 80240E7C 02A0302D */ daddu $a2, $s5, $zero /* C9EDA0 80240E80 080903AA */ j .L80240EA8 /* C9EDA4 80240E84 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240E9C_B2D30C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240E9C_B2D30C.s deleted file mode 100644 index dc96d5ef47..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240E9C_B2D30C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E9C_B2D30C -/* B2D30C 80240E9C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2D310 80240EA0 AFB10014 */ sw $s1, 0x14($sp) -/* B2D314 80240EA4 0080882D */ daddu $s1, $a0, $zero -/* B2D318 80240EA8 AFBF0018 */ sw $ra, 0x18($sp) -/* B2D31C 80240EAC AFB00010 */ sw $s0, 0x10($sp) -/* B2D320 80240EB0 8E300148 */ lw $s0, 0x148($s1) -/* B2D324 80240EB4 0C00EABB */ jal get_npc_unsafe -/* B2D328 80240EB8 86040008 */ lh $a0, 8($s0) -/* B2D32C 80240EBC 9443008E */ lhu $v1, 0x8e($v0) -/* B2D330 80240EC0 2463FFFF */ addiu $v1, $v1, -1 -/* B2D334 80240EC4 A443008E */ sh $v1, 0x8e($v0) -/* B2D338 80240EC8 00031C00 */ sll $v1, $v1, 0x10 -/* B2D33C 80240ECC 14600008 */ bnez $v1, .L80240EF0 -/* B2D340 80240ED0 00000000 */ nop -/* B2D344 80240ED4 8E0200B0 */ lw $v0, 0xb0($s0) -/* B2D348 80240ED8 30420080 */ andi $v0, $v0, 0x80 -/* B2D34C 80240EDC 10400003 */ beqz $v0, .L80240EEC -/* B2D350 80240EE0 2402000F */ addiu $v0, $zero, 0xf -/* B2D354 80240EE4 080903BC */ j .L80240EF0 -/* B2D358 80240EE8 AE220070 */ sw $v0, 0x70($s1) -.L80240EEC: -/* B2D35C 80240EEC AE200070 */ sw $zero, 0x70($s1) -.L80240EF0: -/* B2D360 80240EF0 8FBF0018 */ lw $ra, 0x18($sp) -/* B2D364 80240EF4 8FB10014 */ lw $s1, 0x14($sp) -/* B2D368 80240EF8 8FB00010 */ lw $s0, 0x10($sp) -/* B2D36C 80240EFC 03E00008 */ jr $ra -/* B2D370 80240F00 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s index 257c4fd39e..63a6b2c85f 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s @@ -177,7 +177,7 @@ glabel func_80240FC4_B2D434 /* B2D6CC 8024125C 00000000 */ nop /* B2D6D0 80241260 0280202D */ daddu $a0, $s4, $zero /* B2D6D4 80241264 0260282D */ daddu $a1, $s3, $zero -/* B2D6D8 80241268 0C0903A7 */ jal func_80240E9C_B2D30C +/* B2D6D8 80241268 0C0903A7 */ jal UnkNpcDurationFlagFunc /* B2D6DC 8024126C 02A0302D */ daddu $a2, $s5, $zero /* B2D6E0 80241270 080904A6 */ j .L80241298 /* B2D6E4 80241274 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024108C_B35C5C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024108C_B35C5C.s deleted file mode 100644 index 88cedb3afe..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024108C_B35C5C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024108C_B35C5C -/* B35C5C 8024108C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B35C60 80241090 AFB10014 */ sw $s1, 0x14($sp) -/* B35C64 80241094 0080882D */ daddu $s1, $a0, $zero -/* B35C68 80241098 AFBF0018 */ sw $ra, 0x18($sp) -/* B35C6C 8024109C AFB00010 */ sw $s0, 0x10($sp) -/* B35C70 802410A0 8E300148 */ lw $s0, 0x148($s1) -/* B35C74 802410A4 0C00EABB */ jal get_npc_unsafe -/* B35C78 802410A8 86040008 */ lh $a0, 8($s0) -/* B35C7C 802410AC 9443008E */ lhu $v1, 0x8e($v0) -/* B35C80 802410B0 2463FFFF */ addiu $v1, $v1, -1 -/* B35C84 802410B4 A443008E */ sh $v1, 0x8e($v0) -/* B35C88 802410B8 00031C00 */ sll $v1, $v1, 0x10 -/* B35C8C 802410BC 14600008 */ bnez $v1, .L802410E0 -/* B35C90 802410C0 00000000 */ nop -/* B35C94 802410C4 8E0200B0 */ lw $v0, 0xb0($s0) -/* B35C98 802410C8 30420080 */ andi $v0, $v0, 0x80 -/* B35C9C 802410CC 10400003 */ beqz $v0, .L802410DC -/* B35CA0 802410D0 2402000F */ addiu $v0, $zero, 0xf -/* B35CA4 802410D4 08090438 */ j .L802410E0 -/* B35CA8 802410D8 AE220070 */ sw $v0, 0x70($s1) -.L802410DC: -/* B35CAC 802410DC AE200070 */ sw $zero, 0x70($s1) -.L802410E0: -/* B35CB0 802410E0 8FBF0018 */ lw $ra, 0x18($sp) -/* B35CB4 802410E4 8FB10014 */ lw $s1, 0x14($sp) -/* B35CB8 802410E8 8FB00010 */ lw $s0, 0x10($sp) -/* B35CBC 802410EC 03E00008 */ jr $ra -/* B35CC0 802410F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s index c009d40572..e334fc3112 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s @@ -177,7 +177,7 @@ glabel func_802411B4_B35D84 /* B3601C 8024144C 00000000 */ nop /* B36020 80241450 0280202D */ daddu $a0, $s4, $zero /* B36024 80241454 0260282D */ daddu $a1, $s3, $zero -/* B36028 80241458 0C090423 */ jal func_8024108C_B35C5C +/* B36028 80241458 0C090423 */ jal UnkNpcDurationFlagFunc /* B3602C 8024145C 02A0302D */ daddu $a2, $s5, $zero /* B36030 80241460 08090522 */ j .L80241488 /* B36034 80241464 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240A6C_B84BEC.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240A6C_B84BEC.s deleted file mode 100644 index 00e7ec1786..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240A6C_B84BEC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_B84BEC -/* B84BEC 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B84BF0 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* B84BF4 80240A74 0080882D */ daddu $s1, $a0, $zero -/* B84BF8 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* B84BFC 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* B84C00 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* B84C04 80240A84 0C00EABB */ jal get_npc_unsafe -/* B84C08 80240A88 86040008 */ lh $a0, 8($s0) -/* B84C0C 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* B84C10 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* B84C14 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* B84C18 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* B84C1C 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* B84C20 80240AA0 00000000 */ nop -/* B84C24 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* B84C28 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* B84C2C 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* B84C30 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* B84C34 80240AB4 080902B0 */ j .L80240AC0 -/* B84C38 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* B84C3C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* B84C40 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* B84C44 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* B84C48 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* B84C4C 80240ACC 03E00008 */ jr $ra -/* B84C50 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s index 4ba6de0880..160eaf364e 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s @@ -177,7 +177,7 @@ glabel func_80240B94_B84D14 /* B84FAC 80240E2C 00000000 */ nop /* B84FB0 80240E30 0280202D */ daddu $a0, $s4, $zero /* B84FB4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* B84FB8 80240E38 0C09029B */ jal func_80240A6C_B84BEC +/* B84FB8 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc /* B84FBC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* B84FC0 80240E40 0809039A */ j .L80240E68 /* B84FC4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B1C_ABBDAC.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B1C_ABBDAC.s deleted file mode 100644 index 121f358aa2..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B1C_ABBDAC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B1C_ABBDAC -/* ABBDAC 80240B1C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* ABBDB0 80240B20 AFB10014 */ sw $s1, 0x14($sp) -/* ABBDB4 80240B24 0080882D */ daddu $s1, $a0, $zero -/* ABBDB8 80240B28 AFBF0018 */ sw $ra, 0x18($sp) -/* ABBDBC 80240B2C AFB00010 */ sw $s0, 0x10($sp) -/* ABBDC0 80240B30 8E300148 */ lw $s0, 0x148($s1) -/* ABBDC4 80240B34 0C00EABB */ jal get_npc_unsafe -/* ABBDC8 80240B38 86040008 */ lh $a0, 8($s0) -/* ABBDCC 80240B3C 9443008E */ lhu $v1, 0x8e($v0) -/* ABBDD0 80240B40 2463FFFF */ addiu $v1, $v1, -1 -/* ABBDD4 80240B44 A443008E */ sh $v1, 0x8e($v0) -/* ABBDD8 80240B48 00031C00 */ sll $v1, $v1, 0x10 -/* ABBDDC 80240B4C 14600008 */ bnez $v1, .L80240B70 -/* ABBDE0 80240B50 00000000 */ nop -/* ABBDE4 80240B54 8E0200B0 */ lw $v0, 0xb0($s0) -/* ABBDE8 80240B58 30420080 */ andi $v0, $v0, 0x80 -/* ABBDEC 80240B5C 10400003 */ beqz $v0, .L80240B6C -/* ABBDF0 80240B60 2402000F */ addiu $v0, $zero, 0xf -/* ABBDF4 80240B64 080902DC */ j .L80240B70 -/* ABBDF8 80240B68 AE220070 */ sw $v0, 0x70($s1) -.L80240B6C: -/* ABBDFC 80240B6C AE200070 */ sw $zero, 0x70($s1) -.L80240B70: -/* ABBE00 80240B70 8FBF0018 */ lw $ra, 0x18($sp) -/* ABBE04 80240B74 8FB10014 */ lw $s1, 0x14($sp) -/* ABBE08 80240B78 8FB00010 */ lw $s0, 0x10($sp) -/* ABBE0C 80240B7C 03E00008 */ jr $ra -/* ABBE10 80240B80 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s index be91223db2..472181ac41 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s @@ -177,7 +177,7 @@ glabel func_80240C44_ABBED4 /* ABC16C 80240EDC 00000000 */ nop /* ABC170 80240EE0 0280202D */ daddu $a0, $s4, $zero /* ABC174 80240EE4 0260282D */ daddu $a1, $s3, $zero -/* ABC178 80240EE8 0C0902C7 */ jal func_80240B1C_ABBDAC +/* ABC178 80240EE8 0C0902C7 */ jal UnkNpcDurationFlagFunc /* ABC17C 80240EEC 02A0302D */ daddu $a2, $s5, $zero /* ABC180 80240EF0 080903C6 */ j .L80240F18 /* ABC184 80240EF4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240A6C_AC5BDC.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240A6C_AC5BDC.s deleted file mode 100644 index c7af9efa79..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240A6C_AC5BDC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_AC5BDC -/* AC5BDC 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AC5BE0 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* AC5BE4 80240A74 0080882D */ daddu $s1, $a0, $zero -/* AC5BE8 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* AC5BEC 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* AC5BF0 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* AC5BF4 80240A84 0C00EABB */ jal get_npc_unsafe -/* AC5BF8 80240A88 86040008 */ lh $a0, 8($s0) -/* AC5BFC 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* AC5C00 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* AC5C04 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* AC5C08 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* AC5C0C 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* AC5C10 80240AA0 00000000 */ nop -/* AC5C14 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* AC5C18 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* AC5C1C 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* AC5C20 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* AC5C24 80240AB4 080902B0 */ j .L80240AC0 -/* AC5C28 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* AC5C2C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* AC5C30 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* AC5C34 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* AC5C38 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* AC5C3C 80240ACC 03E00008 */ jr $ra -/* AC5C40 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s index f7c2be8734..62da46c41a 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s +++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s @@ -177,7 +177,7 @@ glabel func_80240B94_AC5D04 /* AC5F9C 80240E2C 00000000 */ nop /* AC5FA0 80240E30 0280202D */ daddu $a0, $s4, $zero /* AC5FA4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* AC5FA8 80240E38 0C09029B */ jal func_80240A6C_AC5BDC +/* AC5FA8 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc /* AC5FAC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* AC5FB0 80240E40 0809039A */ j .L80240E68 /* AC5FB4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240A6C_A874BC.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240A6C_A874BC.s deleted file mode 100644 index 93d4835229..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240A6C_A874BC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_A874BC -/* A874BC 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A874C0 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* A874C4 80240A74 0080882D */ daddu $s1, $a0, $zero -/* A874C8 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* A874CC 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* A874D0 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* A874D4 80240A84 0C00EABB */ jal get_npc_unsafe -/* A874D8 80240A88 86040008 */ lh $a0, 8($s0) -/* A874DC 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* A874E0 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* A874E4 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* A874E8 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* A874EC 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* A874F0 80240AA0 00000000 */ nop -/* A874F4 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* A874F8 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* A874FC 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* A87500 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* A87504 80240AB4 080902B0 */ j .L80240AC0 -/* A87508 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* A8750C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* A87510 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* A87514 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* A87518 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* A8751C 80240ACC 03E00008 */ jr $ra -/* A87520 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s index a49f2fdc68..62f45c550f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s @@ -177,7 +177,7 @@ glabel func_80240B94_A875E4 /* A8787C 80240E2C 00000000 */ nop /* A87880 80240E30 0280202D */ daddu $a0, $s4, $zero /* A87884 80240E34 0260282D */ daddu $a1, $s3, $zero -/* A87888 80240E38 0C09029B */ jal func_80240A6C_A874BC +/* A87888 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc /* A8788C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* A87890 80240E40 0809039A */ j .L80240E68 /* A87894 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240B4C_A8D5CC.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240B4C_A8D5CC.s deleted file mode 100644 index c074259ea3..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240B4C_A8D5CC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B4C_A8D5CC -/* A8D5CC 80240B4C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A8D5D0 80240B50 AFB10014 */ sw $s1, 0x14($sp) -/* A8D5D4 80240B54 0080882D */ daddu $s1, $a0, $zero -/* A8D5D8 80240B58 AFBF0018 */ sw $ra, 0x18($sp) -/* A8D5DC 80240B5C AFB00010 */ sw $s0, 0x10($sp) -/* A8D5E0 80240B60 8E300148 */ lw $s0, 0x148($s1) -/* A8D5E4 80240B64 0C00EABB */ jal get_npc_unsafe -/* A8D5E8 80240B68 86040008 */ lh $a0, 8($s0) -/* A8D5EC 80240B6C 9443008E */ lhu $v1, 0x8e($v0) -/* A8D5F0 80240B70 2463FFFF */ addiu $v1, $v1, -1 -/* A8D5F4 80240B74 A443008E */ sh $v1, 0x8e($v0) -/* A8D5F8 80240B78 00031C00 */ sll $v1, $v1, 0x10 -/* A8D5FC 80240B7C 14600008 */ bnez $v1, .L80240BA0 -/* A8D600 80240B80 00000000 */ nop -/* A8D604 80240B84 8E0200B0 */ lw $v0, 0xb0($s0) -/* A8D608 80240B88 30420080 */ andi $v0, $v0, 0x80 -/* A8D60C 80240B8C 10400003 */ beqz $v0, .L80240B9C -/* A8D610 80240B90 2402000F */ addiu $v0, $zero, 0xf -/* A8D614 80240B94 080902E8 */ j .L80240BA0 -/* A8D618 80240B98 AE220070 */ sw $v0, 0x70($s1) -.L80240B9C: -/* A8D61C 80240B9C AE200070 */ sw $zero, 0x70($s1) -.L80240BA0: -/* A8D620 80240BA0 8FBF0018 */ lw $ra, 0x18($sp) -/* A8D624 80240BA4 8FB10014 */ lw $s1, 0x14($sp) -/* A8D628 80240BA8 8FB00010 */ lw $s0, 0x10($sp) -/* A8D62C 80240BAC 03E00008 */ jr $ra -/* A8D630 80240BB0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s index c426c8cfc1..68375b9d2c 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s @@ -177,7 +177,7 @@ glabel func_80240C74_A8D6F4 /* A8D98C 80240F0C 00000000 */ nop /* A8D990 80240F10 0280202D */ daddu $a0, $s4, $zero /* A8D994 80240F14 0260282D */ daddu $a1, $s3, $zero -/* A8D998 80240F18 0C0902D3 */ jal func_80240B4C_A8D5CC +/* A8D998 80240F18 0C0902D3 */ jal UnkNpcDurationFlagFunc /* A8D99C 80240F1C 02A0302D */ daddu $a2, $s5, $zero /* A8D9A0 80240F20 080903D2 */ j .L80240F48 /* A8D9A4 80240F24 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802422C0_7ECFD0.s b/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802422C0_7ECFD0.s deleted file mode 100644 index 40364bb9e2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802422C0_7ECFD0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422C0_7ECFD0 -/* 7ECFD0 802422C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7ECFD4 802422C4 AFB00010 */ sw $s0, 0x10($sp) -/* 7ECFD8 802422C8 0080802D */ daddu $s0, $a0, $zero -/* 7ECFDC 802422CC AFB20018 */ sw $s2, 0x18($sp) -/* 7ECFE0 802422D0 AFBF001C */ sw $ra, 0x1c($sp) -/* 7ECFE4 802422D4 AFB10014 */ sw $s1, 0x14($sp) -/* 7ECFE8 802422D8 8E02000C */ lw $v0, 0xc($s0) -/* 7ECFEC 802422DC 10A00008 */ beqz $a1, .L80242300 -/* 7ECFF0 802422E0 0000902D */ daddu $s2, $zero, $zero -/* 7ECFF4 802422E4 8C450000 */ lw $a1, ($v0) -/* 7ECFF8 802422E8 0C0B1EAF */ jal get_variable -/* 7ECFFC 802422EC 00000000 */ nop -/* 7ED000 802422F0 AE020070 */ sw $v0, 0x70($s0) -/* 7ED004 802422F4 AE000074 */ sw $zero, 0x74($s0) -/* 7ED008 802422F8 8C420014 */ lw $v0, 0x14($v0) -/* 7ED00C 802422FC AE020078 */ sw $v0, 0x78($s0) -.L80242300: -/* 7ED010 80242300 8E050078 */ lw $a1, 0x78($s0) -/* 7ED014 80242304 8E110070 */ lw $s1, 0x70($s0) -/* 7ED018 80242308 0C0B1EAF */ jal get_variable -/* 7ED01C 8024230C 0200202D */ daddu $a0, $s0, $zero -/* 7ED020 80242310 10400006 */ beqz $v0, .L8024232C -/* 7ED024 80242314 24030002 */ addiu $v1, $zero, 2 -/* 7ED028 80242318 8E020074 */ lw $v0, 0x74($s0) -/* 7ED02C 8024231C 10430027 */ beq $v0, $v1, .L802423BC -/* 7ED030 80242320 00000000 */ nop -/* 7ED034 80242324 080908EE */ j .L802423B8 -/* 7ED038 80242328 AE030074 */ sw $v1, 0x74($s0) -.L8024232C: -/* 7ED03C 8024232C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 7ED040 80242330 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 7ED044 80242334 8E260000 */ lw $a2, ($s1) -/* 7ED048 80242338 8E270004 */ lw $a3, 4($s1) -/* 7ED04C 8024233C C44C0028 */ lwc1 $f12, 0x28($v0) -/* 7ED050 80242340 0C00A7B5 */ jal dist2D -/* 7ED054 80242344 C44E0030 */ lwc1 $f14, 0x30($v0) -/* 7ED058 80242348 8E030074 */ lw $v1, 0x74($s0) -/* 7ED05C 8024234C 24040001 */ addiu $a0, $zero, 1 -/* 7ED060 80242350 10640013 */ beq $v1, $a0, .L802423A0 -/* 7ED064 80242354 46000086 */ mov.s $f2, $f0 -/* 7ED068 80242358 28620002 */ slti $v0, $v1, 2 -/* 7ED06C 8024235C 50400005 */ beql $v0, $zero, .L80242374 -/* 7ED070 80242360 24020002 */ addiu $v0, $zero, 2 -/* 7ED074 80242364 10600007 */ beqz $v1, .L80242384 -/* 7ED078 80242368 00000000 */ nop -/* 7ED07C 8024236C 080908EF */ j .L802423BC -/* 7ED080 80242370 00000000 */ nop -.L80242374: -/* 7ED084 80242374 50620010 */ beql $v1, $v0, .L802423B8 -/* 7ED088 80242378 AE040074 */ sw $a0, 0x74($s0) -/* 7ED08C 8024237C 080908EF */ j .L802423BC -/* 7ED090 80242380 00000000 */ nop -.L80242384: -/* 7ED094 80242384 C6200008 */ lwc1 $f0, 8($s1) -/* 7ED098 80242388 4600103C */ c.lt.s $f2, $f0 -/* 7ED09C 8024238C 00000000 */ nop -/* 7ED0A0 80242390 4500000A */ bc1f .L802423BC -/* 7ED0A4 80242394 00000000 */ nop -/* 7ED0A8 80242398 080908EE */ j .L802423B8 -/* 7ED0AC 8024239C AE040074 */ sw $a0, 0x74($s0) -.L802423A0: -/* 7ED0B0 802423A0 C620000C */ lwc1 $f0, 0xc($s1) -/* 7ED0B4 802423A4 4602003C */ c.lt.s $f0, $f2 -/* 7ED0B8 802423A8 00000000 */ nop -/* 7ED0BC 802423AC 45000003 */ bc1f .L802423BC -/* 7ED0C0 802423B0 00000000 */ nop -/* 7ED0C4 802423B4 AE000074 */ sw $zero, 0x74($s0) -.L802423B8: -/* 7ED0C8 802423B8 24120001 */ addiu $s2, $zero, 1 -.L802423BC: -/* 7ED0CC 802423BC 12400005 */ beqz $s2, .L802423D4 -/* 7ED0D0 802423C0 00000000 */ nop -/* 7ED0D4 802423C4 8E250010 */ lw $a1, 0x10($s1) -/* 7ED0D8 802423C8 86060076 */ lh $a2, 0x76($s0) -/* 7ED0DC 802423CC 0C052A95 */ jal func_8014AA54 -/* 7ED0E0 802423D0 0000202D */ daddu $a0, $zero, $zero -.L802423D4: -/* 7ED0E4 802423D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 7ED0E8 802423D8 8FB20018 */ lw $s2, 0x18($sp) -/* 7ED0EC 802423DC 8FB10014 */ lw $s1, 0x14($sp) -/* 7ED0F0 802423E0 8FB00010 */ lw $s0, 0x10($sp) -/* 7ED0F4 802423E4 0000102D */ daddu $v0, $zero, $zero -/* 7ED0F8 802423E8 03E00008 */ jr $ra -/* 7ED0FC 802423EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242FDC_7EDCEC.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242FDC_7EDCEC.s deleted file mode 100644 index 9d2bfc7d91..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242FDC_7EDCEC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242FDC_7EDCEC -/* 7EDCEC 80242FDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EDCF0 80242FE0 AFB10014 */ sw $s1, 0x14($sp) -/* 7EDCF4 80242FE4 0080882D */ daddu $s1, $a0, $zero -/* 7EDCF8 80242FE8 AFBF0018 */ sw $ra, 0x18($sp) -/* 7EDCFC 80242FEC AFB00010 */ sw $s0, 0x10($sp) -/* 7EDD00 80242FF0 8E300148 */ lw $s0, 0x148($s1) -/* 7EDD04 80242FF4 0C00EABB */ jal get_npc_unsafe -/* 7EDD08 80242FF8 86040008 */ lh $a0, 8($s0) -/* 7EDD0C 80242FFC 9443008E */ lhu $v1, 0x8e($v0) -/* 7EDD10 80243000 2463FFFF */ addiu $v1, $v1, -1 -/* 7EDD14 80243004 A443008E */ sh $v1, 0x8e($v0) -/* 7EDD18 80243008 00031C00 */ sll $v1, $v1, 0x10 -/* 7EDD1C 8024300C 14600008 */ bnez $v1, .L80243030 -/* 7EDD20 80243010 00000000 */ nop -/* 7EDD24 80243014 8E0200B0 */ lw $v0, 0xb0($s0) -/* 7EDD28 80243018 30420080 */ andi $v0, $v0, 0x80 -/* 7EDD2C 8024301C 10400003 */ beqz $v0, .L8024302C -/* 7EDD30 80243020 2402000F */ addiu $v0, $zero, 0xf -/* 7EDD34 80243024 08090C0C */ j .L80243030 -/* 7EDD38 80243028 AE220070 */ sw $v0, 0x70($s1) -.L8024302C: -/* 7EDD3C 8024302C AE200070 */ sw $zero, 0x70($s1) -.L80243030: -/* 7EDD40 80243030 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EDD44 80243034 8FB10014 */ lw $s1, 0x14($sp) -/* 7EDD48 80243038 8FB00010 */ lw $s0, 0x10($sp) -/* 7EDD4C 8024303C 03E00008 */ jr $ra -/* 7EDD50 80243040 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s index cff39d7604..158008b2c8 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s @@ -177,7 +177,7 @@ glabel func_80243104_7EDE14 /* 7EE0AC 8024339C 00000000 */ nop /* 7EE0B0 802433A0 0280202D */ daddu $a0, $s4, $zero /* 7EE0B4 802433A4 0260282D */ daddu $a1, $s3, $zero -/* 7EE0B8 802433A8 0C090BF7 */ jal func_80242FDC_7EDCEC +/* 7EE0B8 802433A8 0C090BF7 */ jal UnkNpcDurationFlagFunc /* 7EE0BC 802433AC 02A0302D */ daddu $a2, $s5, $zero /* 7EE0C0 802433B0 08090CF6 */ j .L802433D8 /* 7EE0C4 802433B4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80240F50_8017D0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80240F50_8017D0.s deleted file mode 100644 index d77897ec92..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80240F50_8017D0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F50_8017D0 -/* 8017D0 80240F50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8017D4 80240F54 AFB00010 */ sw $s0, 0x10($sp) -/* 8017D8 80240F58 0080802D */ daddu $s0, $a0, $zero -/* 8017DC 80240F5C AFB20018 */ sw $s2, 0x18($sp) -/* 8017E0 80240F60 AFBF001C */ sw $ra, 0x1c($sp) -/* 8017E4 80240F64 AFB10014 */ sw $s1, 0x14($sp) -/* 8017E8 80240F68 8E02000C */ lw $v0, 0xc($s0) -/* 8017EC 80240F6C 10A00008 */ beqz $a1, .L80240F90 -/* 8017F0 80240F70 0000902D */ daddu $s2, $zero, $zero -/* 8017F4 80240F74 8C450000 */ lw $a1, ($v0) -/* 8017F8 80240F78 0C0B1EAF */ jal get_variable -/* 8017FC 80240F7C 00000000 */ nop -/* 801800 80240F80 AE020070 */ sw $v0, 0x70($s0) -/* 801804 80240F84 AE000074 */ sw $zero, 0x74($s0) -/* 801808 80240F88 8C420014 */ lw $v0, 0x14($v0) -/* 80180C 80240F8C AE020078 */ sw $v0, 0x78($s0) -.L80240F90: -/* 801810 80240F90 8E050078 */ lw $a1, 0x78($s0) -/* 801814 80240F94 8E110070 */ lw $s1, 0x70($s0) -/* 801818 80240F98 0C0B1EAF */ jal get_variable -/* 80181C 80240F9C 0200202D */ daddu $a0, $s0, $zero -/* 801820 80240FA0 10400006 */ beqz $v0, .L80240FBC -/* 801824 80240FA4 24030002 */ addiu $v1, $zero, 2 -/* 801828 80240FA8 8E020074 */ lw $v0, 0x74($s0) -/* 80182C 80240FAC 10430027 */ beq $v0, $v1, .L8024104C -/* 801830 80240FB0 00000000 */ nop -/* 801834 80240FB4 08090412 */ j .L80241048 -/* 801838 80240FB8 AE030074 */ sw $v1, 0x74($s0) -.L80240FBC: -/* 80183C 80240FBC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 801840 80240FC0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 801844 80240FC4 8E260000 */ lw $a2, ($s1) -/* 801848 80240FC8 8E270004 */ lw $a3, 4($s1) -/* 80184C 80240FCC C44C0028 */ lwc1 $f12, 0x28($v0) -/* 801850 80240FD0 0C00A7B5 */ jal dist2D -/* 801854 80240FD4 C44E0030 */ lwc1 $f14, 0x30($v0) -/* 801858 80240FD8 8E030074 */ lw $v1, 0x74($s0) -/* 80185C 80240FDC 24040001 */ addiu $a0, $zero, 1 -/* 801860 80240FE0 10640013 */ beq $v1, $a0, .L80241030 -/* 801864 80240FE4 46000086 */ mov.s $f2, $f0 -/* 801868 80240FE8 28620002 */ slti $v0, $v1, 2 -/* 80186C 80240FEC 50400005 */ beql $v0, $zero, .L80241004 -/* 801870 80240FF0 24020002 */ addiu $v0, $zero, 2 -/* 801874 80240FF4 10600007 */ beqz $v1, .L80241014 -/* 801878 80240FF8 00000000 */ nop -/* 80187C 80240FFC 08090413 */ j .L8024104C -/* 801880 80241000 00000000 */ nop -.L80241004: -/* 801884 80241004 50620010 */ beql $v1, $v0, .L80241048 -/* 801888 80241008 AE040074 */ sw $a0, 0x74($s0) -/* 80188C 8024100C 08090413 */ j .L8024104C -/* 801890 80241010 00000000 */ nop -.L80241014: -/* 801894 80241014 C6200008 */ lwc1 $f0, 8($s1) -/* 801898 80241018 4600103C */ c.lt.s $f2, $f0 -/* 80189C 8024101C 00000000 */ nop -/* 8018A0 80241020 4500000A */ bc1f .L8024104C -/* 8018A4 80241024 00000000 */ nop -/* 8018A8 80241028 08090412 */ j .L80241048 -/* 8018AC 8024102C AE040074 */ sw $a0, 0x74($s0) -.L80241030: -/* 8018B0 80241030 C620000C */ lwc1 $f0, 0xc($s1) -/* 8018B4 80241034 4602003C */ c.lt.s $f0, $f2 -/* 8018B8 80241038 00000000 */ nop -/* 8018BC 8024103C 45000003 */ bc1f .L8024104C -/* 8018C0 80241040 00000000 */ nop -/* 8018C4 80241044 AE000074 */ sw $zero, 0x74($s0) -.L80241048: -/* 8018C8 80241048 24120001 */ addiu $s2, $zero, 1 -.L8024104C: -/* 8018CC 8024104C 12400005 */ beqz $s2, .L80241064 -/* 8018D0 80241050 00000000 */ nop -/* 8018D4 80241054 8E250010 */ lw $a1, 0x10($s1) -/* 8018D8 80241058 86060076 */ lh $a2, 0x76($s0) -/* 8018DC 8024105C 0C052A95 */ jal func_8014AA54 -/* 8018E0 80241060 0000202D */ daddu $a0, $zero, $zero -.L80241064: -/* 8018E4 80241064 8FBF001C */ lw $ra, 0x1c($sp) -/* 8018E8 80241068 8FB20018 */ lw $s2, 0x18($sp) -/* 8018EC 8024106C 8FB10014 */ lw $s1, 0x14($sp) -/* 8018F0 80241070 8FB00010 */ lw $s0, 0x10($sp) -/* 8018F4 80241074 0000102D */ daddu $v0, $zero, $zero -/* 8018F8 80241078 03E00008 */ jr $ra -/* 8018FC 8024107C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241AEC_80236C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241AEC_80236C.s deleted file mode 100644 index de12a6ac4a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241AEC_80236C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AEC_80236C -/* 80236C 80241AEC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 802370 80241AF0 AFB10014 */ sw $s1, 0x14($sp) -/* 802374 80241AF4 0080882D */ daddu $s1, $a0, $zero -/* 802378 80241AF8 AFBF0018 */ sw $ra, 0x18($sp) -/* 80237C 80241AFC AFB00010 */ sw $s0, 0x10($sp) -/* 802380 80241B00 8E300148 */ lw $s0, 0x148($s1) -/* 802384 80241B04 0C00EABB */ jal get_npc_unsafe -/* 802388 80241B08 86040008 */ lh $a0, 8($s0) -/* 80238C 80241B0C 9443008E */ lhu $v1, 0x8e($v0) -/* 802390 80241B10 2463FFFF */ addiu $v1, $v1, -1 -/* 802394 80241B14 A443008E */ sh $v1, 0x8e($v0) -/* 802398 80241B18 00031C00 */ sll $v1, $v1, 0x10 -/* 80239C 80241B1C 14600008 */ bnez $v1, .L80241B40 -/* 8023A0 80241B20 00000000 */ nop -/* 8023A4 80241B24 8E0200B0 */ lw $v0, 0xb0($s0) -/* 8023A8 80241B28 30420080 */ andi $v0, $v0, 0x80 -/* 8023AC 80241B2C 10400003 */ beqz $v0, .L80241B3C -/* 8023B0 80241B30 2402000F */ addiu $v0, $zero, 0xf -/* 8023B4 80241B34 080906D0 */ j .L80241B40 -/* 8023B8 80241B38 AE220070 */ sw $v0, 0x70($s1) -.L80241B3C: -/* 8023BC 80241B3C AE200070 */ sw $zero, 0x70($s1) -.L80241B40: -/* 8023C0 80241B40 8FBF0018 */ lw $ra, 0x18($sp) -/* 8023C4 80241B44 8FB10014 */ lw $s1, 0x14($sp) -/* 8023C8 80241B48 8FB00010 */ lw $s0, 0x10($sp) -/* 8023CC 80241B4C 03E00008 */ jr $ra -/* 8023D0 80241B50 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s index 1fa92e83e1..dc32f65969 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s @@ -177,7 +177,7 @@ glabel func_80241C14_802494 /* 80272C 80241EAC 00000000 */ nop /* 802730 80241EB0 0280202D */ daddu $a0, $s4, $zero /* 802734 80241EB4 0260282D */ daddu $a1, $s3, $zero -/* 802738 80241EB8 0C0906BB */ jal func_80241AEC_80236C +/* 802738 80241EB8 0C0906BB */ jal UnkNpcDurationFlagFunc /* 80273C 80241EBC 02A0302D */ daddu $a2, $s5, $zero /* 802740 80241EC0 080907BA */ j .L80241EE8 /* 802744 80241EC4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245FBC_80683C.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245FBC_80683C.s deleted file mode 100644 index c776e4d6dc..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245FBC_80683C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245FBC_80683C -/* 80683C 80245FBC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 806840 80245FC0 AFB10014 */ sw $s1, 0x14($sp) -/* 806844 80245FC4 0080882D */ daddu $s1, $a0, $zero -/* 806848 80245FC8 AFBF0018 */ sw $ra, 0x18($sp) -/* 80684C 80245FCC AFB00010 */ sw $s0, 0x10($sp) -/* 806850 80245FD0 8E300148 */ lw $s0, 0x148($s1) -/* 806854 80245FD4 0C00EABB */ jal get_npc_unsafe -/* 806858 80245FD8 86040008 */ lh $a0, 8($s0) -/* 80685C 80245FDC 9443008E */ lhu $v1, 0x8e($v0) -/* 806860 80245FE0 2463FFFF */ addiu $v1, $v1, -1 -/* 806864 80245FE4 A443008E */ sh $v1, 0x8e($v0) -/* 806868 80245FE8 00031C00 */ sll $v1, $v1, 0x10 -/* 80686C 80245FEC 14600008 */ bnez $v1, .L80246010 -/* 806870 80245FF0 00000000 */ nop -/* 806874 80245FF4 8E0200B0 */ lw $v0, 0xb0($s0) -/* 806878 80245FF8 30420080 */ andi $v0, $v0, 0x80 -/* 80687C 80245FFC 10400003 */ beqz $v0, .L8024600C -/* 806880 80246000 2402000F */ addiu $v0, $zero, 0xf -/* 806884 80246004 08091804 */ j .L80246010 -/* 806888 80246008 AE220070 */ sw $v0, 0x70($s1) -.L8024600C: -/* 80688C 8024600C AE200070 */ sw $zero, 0x70($s1) -.L80246010: -/* 806890 80246010 8FBF0018 */ lw $ra, 0x18($sp) -/* 806894 80246014 8FB10014 */ lw $s1, 0x14($sp) -/* 806898 80246018 8FB00010 */ lw $s0, 0x10($sp) -/* 80689C 8024601C 03E00008 */ jr $ra -/* 8068A0 80246020 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s index cca65cbc8f..d0a821bdd7 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s @@ -177,7 +177,7 @@ glabel func_802460E4_806964 /* 806BFC 8024637C 00000000 */ nop /* 806C00 80246380 0280202D */ daddu $a0, $s4, $zero /* 806C04 80246384 0260282D */ daddu $a1, $s3, $zero -/* 806C08 80246388 0C0917EF */ jal func_80245FBC_80683C +/* 806C08 80246388 0C0917EF */ jal UnkNpcDurationFlagFunc /* 806C0C 8024638C 02A0302D */ daddu $a2, $s5, $zero /* 806C10 80246390 080918EE */ j .L802463B8 /* 806C14 80246394 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024139C_82465C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024139C_82465C.s deleted file mode 100644 index 44357e1367..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024139C_82465C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024139C_82465C -/* 82465C 8024139C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 824660 802413A0 AFB10014 */ sw $s1, 0x14($sp) -/* 824664 802413A4 0080882D */ daddu $s1, $a0, $zero -/* 824668 802413A8 AFBF0018 */ sw $ra, 0x18($sp) -/* 82466C 802413AC AFB00010 */ sw $s0, 0x10($sp) -/* 824670 802413B0 8E300148 */ lw $s0, 0x148($s1) -/* 824674 802413B4 0C00EABB */ jal get_npc_unsafe -/* 824678 802413B8 86040008 */ lh $a0, 8($s0) -/* 82467C 802413BC 9443008E */ lhu $v1, 0x8e($v0) -/* 824680 802413C0 2463FFFF */ addiu $v1, $v1, -1 -/* 824684 802413C4 A443008E */ sh $v1, 0x8e($v0) -/* 824688 802413C8 00031C00 */ sll $v1, $v1, 0x10 -/* 82468C 802413CC 14600008 */ bnez $v1, .L802413F0 -/* 824690 802413D0 00000000 */ nop -/* 824694 802413D4 8E0200B0 */ lw $v0, 0xb0($s0) -/* 824698 802413D8 30420080 */ andi $v0, $v0, 0x80 -/* 82469C 802413DC 10400003 */ beqz $v0, .L802413EC -/* 8246A0 802413E0 2402000F */ addiu $v0, $zero, 0xf -/* 8246A4 802413E4 080904FC */ j .L802413F0 -/* 8246A8 802413E8 AE220070 */ sw $v0, 0x70($s1) -.L802413EC: -/* 8246AC 802413EC AE200070 */ sw $zero, 0x70($s1) -.L802413F0: -/* 8246B0 802413F0 8FBF0018 */ lw $ra, 0x18($sp) -/* 8246B4 802413F4 8FB10014 */ lw $s1, 0x14($sp) -/* 8246B8 802413F8 8FB00010 */ lw $s0, 0x10($sp) -/* 8246BC 802413FC 03E00008 */ jr $ra -/* 8246C0 80241400 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s index a1a41e4f7d..0fe1a19c71 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s @@ -177,7 +177,7 @@ glabel func_802414C4_824784 /* 824A1C 8024175C 00000000 */ nop /* 824A20 80241760 0280202D */ daddu $a0, $s4, $zero /* 824A24 80241764 0260282D */ daddu $a1, $s3, $zero -/* 824A28 80241768 0C0904E7 */ jal func_8024139C_82465C +/* 824A28 80241768 0C0904E7 */ jal UnkNpcDurationFlagFunc /* 824A2C 8024176C 02A0302D */ daddu $a2, $s5, $zero /* 824A30 80241770 080905E6 */ j .L80241798 /* 824A34 80241774 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433F0_8266B0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433F0_8266B0.s deleted file mode 100644 index 451159b593..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433F0_8266B0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802433F0_8266B0 -/* 8266B0 802433F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8266B4 802433F4 AFB00010 */ sw $s0, 0x10($sp) -/* 8266B8 802433F8 0080802D */ daddu $s0, $a0, $zero -/* 8266BC 802433FC AFB20018 */ sw $s2, 0x18($sp) -/* 8266C0 80243400 AFBF001C */ sw $ra, 0x1c($sp) -/* 8266C4 80243404 AFB10014 */ sw $s1, 0x14($sp) -/* 8266C8 80243408 8E02000C */ lw $v0, 0xc($s0) -/* 8266CC 8024340C 10A00008 */ beqz $a1, .L80243430 -/* 8266D0 80243410 0000902D */ daddu $s2, $zero, $zero -/* 8266D4 80243414 8C450000 */ lw $a1, ($v0) -/* 8266D8 80243418 0C0B1EAF */ jal get_variable -/* 8266DC 8024341C 00000000 */ nop -/* 8266E0 80243420 AE020070 */ sw $v0, 0x70($s0) -/* 8266E4 80243424 AE000074 */ sw $zero, 0x74($s0) -/* 8266E8 80243428 8C420014 */ lw $v0, 0x14($v0) -/* 8266EC 8024342C AE020078 */ sw $v0, 0x78($s0) -.L80243430: -/* 8266F0 80243430 8E050078 */ lw $a1, 0x78($s0) -/* 8266F4 80243434 8E110070 */ lw $s1, 0x70($s0) -/* 8266F8 80243438 0C0B1EAF */ jal get_variable -/* 8266FC 8024343C 0200202D */ daddu $a0, $s0, $zero -/* 826700 80243440 10400006 */ beqz $v0, .L8024345C -/* 826704 80243444 24030002 */ addiu $v1, $zero, 2 -/* 826708 80243448 8E020074 */ lw $v0, 0x74($s0) -/* 82670C 8024344C 10430027 */ beq $v0, $v1, .L802434EC -/* 826710 80243450 00000000 */ nop -/* 826714 80243454 08090D3A */ j .L802434E8 -/* 826718 80243458 AE030074 */ sw $v1, 0x74($s0) -.L8024345C: -/* 82671C 8024345C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 826720 80243460 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 826724 80243464 8E260000 */ lw $a2, ($s1) -/* 826728 80243468 8E270004 */ lw $a3, 4($s1) -/* 82672C 8024346C C44C0028 */ lwc1 $f12, 0x28($v0) -/* 826730 80243470 0C00A7B5 */ jal dist2D -/* 826734 80243474 C44E0030 */ lwc1 $f14, 0x30($v0) -/* 826738 80243478 8E030074 */ lw $v1, 0x74($s0) -/* 82673C 8024347C 24040001 */ addiu $a0, $zero, 1 -/* 826740 80243480 10640013 */ beq $v1, $a0, .L802434D0 -/* 826744 80243484 46000086 */ mov.s $f2, $f0 -/* 826748 80243488 28620002 */ slti $v0, $v1, 2 -/* 82674C 8024348C 50400005 */ beql $v0, $zero, .L802434A4 -/* 826750 80243490 24020002 */ addiu $v0, $zero, 2 -/* 826754 80243494 10600007 */ beqz $v1, .L802434B4 -/* 826758 80243498 00000000 */ nop -/* 82675C 8024349C 08090D3B */ j .L802434EC -/* 826760 802434A0 00000000 */ nop -.L802434A4: -/* 826764 802434A4 50620010 */ beql $v1, $v0, .L802434E8 -/* 826768 802434A8 AE040074 */ sw $a0, 0x74($s0) -/* 82676C 802434AC 08090D3B */ j .L802434EC -/* 826770 802434B0 00000000 */ nop -.L802434B4: -/* 826774 802434B4 C6200008 */ lwc1 $f0, 8($s1) -/* 826778 802434B8 4600103C */ c.lt.s $f2, $f0 -/* 82677C 802434BC 00000000 */ nop -/* 826780 802434C0 4500000A */ bc1f .L802434EC -/* 826784 802434C4 00000000 */ nop -/* 826788 802434C8 08090D3A */ j .L802434E8 -/* 82678C 802434CC AE040074 */ sw $a0, 0x74($s0) -.L802434D0: -/* 826790 802434D0 C620000C */ lwc1 $f0, 0xc($s1) -/* 826794 802434D4 4602003C */ c.lt.s $f0, $f2 -/* 826798 802434D8 00000000 */ nop -/* 82679C 802434DC 45000003 */ bc1f .L802434EC -/* 8267A0 802434E0 00000000 */ nop -/* 8267A4 802434E4 AE000074 */ sw $zero, 0x74($s0) -.L802434E8: -/* 8267A8 802434E8 24120001 */ addiu $s2, $zero, 1 -.L802434EC: -/* 8267AC 802434EC 12400005 */ beqz $s2, .L80243504 -/* 8267B0 802434F0 00000000 */ nop -/* 8267B4 802434F4 8E250010 */ lw $a1, 0x10($s1) -/* 8267B8 802434F8 86060076 */ lh $a2, 0x76($s0) -/* 8267BC 802434FC 0C052A95 */ jal func_8014AA54 -/* 8267C0 80243500 0000202D */ daddu $a0, $zero, $zero -.L80243504: -/* 8267C4 80243504 8FBF001C */ lw $ra, 0x1c($sp) -/* 8267C8 80243508 8FB20018 */ lw $s2, 0x18($sp) -/* 8267CC 8024350C 8FB10014 */ lw $s1, 0x14($sp) -/* 8267D0 80243510 8FB00010 */ lw $s0, 0x10($sp) -/* 8267D4 80243514 0000102D */ daddu $v0, $zero, $zero -/* 8267D8 80243518 03E00008 */ jr $ra -/* 8267DC 8024351C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/844AC0/func_80241EF0_844AC0.s b/asm/nonmatchings/world/area_mac/mac_04/844AC0/func_80241EF0_844AC0.s deleted file mode 100644 index 4747ef3ec3..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/844AC0/func_80241EF0_844AC0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EF0_844AC0 -/* 844AC0 80241EF0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 844AC4 80241EF4 AFB00010 */ sw $s0, 0x10($sp) -/* 844AC8 80241EF8 0080802D */ daddu $s0, $a0, $zero -/* 844ACC 80241EFC AFB20018 */ sw $s2, 0x18($sp) -/* 844AD0 80241F00 AFBF001C */ sw $ra, 0x1c($sp) -/* 844AD4 80241F04 AFB10014 */ sw $s1, 0x14($sp) -/* 844AD8 80241F08 8E02000C */ lw $v0, 0xc($s0) -/* 844ADC 80241F0C 10A00008 */ beqz $a1, .L80241F30 -/* 844AE0 80241F10 0000902D */ daddu $s2, $zero, $zero -/* 844AE4 80241F14 8C450000 */ lw $a1, ($v0) -/* 844AE8 80241F18 0C0B1EAF */ jal get_variable -/* 844AEC 80241F1C 00000000 */ nop -/* 844AF0 80241F20 AE020070 */ sw $v0, 0x70($s0) -/* 844AF4 80241F24 AE000074 */ sw $zero, 0x74($s0) -/* 844AF8 80241F28 8C420014 */ lw $v0, 0x14($v0) -/* 844AFC 80241F2C AE020078 */ sw $v0, 0x78($s0) -.L80241F30: -/* 844B00 80241F30 8E050078 */ lw $a1, 0x78($s0) -/* 844B04 80241F34 8E110070 */ lw $s1, 0x70($s0) -/* 844B08 80241F38 0C0B1EAF */ jal get_variable -/* 844B0C 80241F3C 0200202D */ daddu $a0, $s0, $zero -/* 844B10 80241F40 10400006 */ beqz $v0, .L80241F5C -/* 844B14 80241F44 24030002 */ addiu $v1, $zero, 2 -/* 844B18 80241F48 8E020074 */ lw $v0, 0x74($s0) -/* 844B1C 80241F4C 10430027 */ beq $v0, $v1, .L80241FEC -/* 844B20 80241F50 00000000 */ nop -/* 844B24 80241F54 080907FA */ j .L80241FE8 -/* 844B28 80241F58 AE030074 */ sw $v1, 0x74($s0) -.L80241F5C: -/* 844B2C 80241F5C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 844B30 80241F60 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 844B34 80241F64 8E260000 */ lw $a2, ($s1) -/* 844B38 80241F68 8E270004 */ lw $a3, 4($s1) -/* 844B3C 80241F6C C44C0028 */ lwc1 $f12, 0x28($v0) -/* 844B40 80241F70 0C00A7B5 */ jal dist2D -/* 844B44 80241F74 C44E0030 */ lwc1 $f14, 0x30($v0) -/* 844B48 80241F78 8E030074 */ lw $v1, 0x74($s0) -/* 844B4C 80241F7C 24040001 */ addiu $a0, $zero, 1 -/* 844B50 80241F80 10640013 */ beq $v1, $a0, .L80241FD0 -/* 844B54 80241F84 46000086 */ mov.s $f2, $f0 -/* 844B58 80241F88 28620002 */ slti $v0, $v1, 2 -/* 844B5C 80241F8C 50400005 */ beql $v0, $zero, .L80241FA4 -/* 844B60 80241F90 24020002 */ addiu $v0, $zero, 2 -/* 844B64 80241F94 10600007 */ beqz $v1, .L80241FB4 -/* 844B68 80241F98 00000000 */ nop -/* 844B6C 80241F9C 080907FB */ j .L80241FEC -/* 844B70 80241FA0 00000000 */ nop -.L80241FA4: -/* 844B74 80241FA4 50620010 */ beql $v1, $v0, .L80241FE8 -/* 844B78 80241FA8 AE040074 */ sw $a0, 0x74($s0) -/* 844B7C 80241FAC 080907FB */ j .L80241FEC -/* 844B80 80241FB0 00000000 */ nop -.L80241FB4: -/* 844B84 80241FB4 C6200008 */ lwc1 $f0, 8($s1) -/* 844B88 80241FB8 4600103C */ c.lt.s $f2, $f0 -/* 844B8C 80241FBC 00000000 */ nop -/* 844B90 80241FC0 4500000A */ bc1f .L80241FEC -/* 844B94 80241FC4 00000000 */ nop -/* 844B98 80241FC8 080907FA */ j .L80241FE8 -/* 844B9C 80241FCC AE040074 */ sw $a0, 0x74($s0) -.L80241FD0: -/* 844BA0 80241FD0 C620000C */ lwc1 $f0, 0xc($s1) -/* 844BA4 80241FD4 4602003C */ c.lt.s $f0, $f2 -/* 844BA8 80241FD8 00000000 */ nop -/* 844BAC 80241FDC 45000003 */ bc1f .L80241FEC -/* 844BB0 80241FE0 00000000 */ nop -/* 844BB4 80241FE4 AE000074 */ sw $zero, 0x74($s0) -.L80241FE8: -/* 844BB8 80241FE8 24120001 */ addiu $s2, $zero, 1 -.L80241FEC: -/* 844BBC 80241FEC 12400005 */ beqz $s2, .L80242004 -/* 844BC0 80241FF0 00000000 */ nop -/* 844BC4 80241FF4 8E250010 */ lw $a1, 0x10($s1) -/* 844BC8 80241FF8 86060076 */ lh $a2, 0x76($s0) -/* 844BCC 80241FFC 0C052A95 */ jal func_8014AA54 -/* 844BD0 80242000 0000202D */ daddu $a0, $zero, $zero -.L80242004: -/* 844BD4 80242004 8FBF001C */ lw $ra, 0x1c($sp) -/* 844BD8 80242008 8FB20018 */ lw $s2, 0x18($sp) -/* 844BDC 8024200C 8FB10014 */ lw $s1, 0x14($sp) -/* 844BE0 80242010 8FB00010 */ lw $s0, 0x10($sp) -/* 844BE4 80242014 0000102D */ daddu $v0, $zero, $zero -/* 844BE8 80242018 03E00008 */ jr $ra -/* 844BEC 8024201C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240EFC_85306C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240EFC_85306C.s deleted file mode 100644 index 1452bffff1..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240EFC_85306C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EFC_85306C -/* 85306C 80240EFC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 853070 80240F00 AFB10014 */ sw $s1, 0x14($sp) -/* 853074 80240F04 0080882D */ daddu $s1, $a0, $zero -/* 853078 80240F08 AFBF0018 */ sw $ra, 0x18($sp) -/* 85307C 80240F0C AFB00010 */ sw $s0, 0x10($sp) -/* 853080 80240F10 8E300148 */ lw $s0, 0x148($s1) -/* 853084 80240F14 0C00EABB */ jal get_npc_unsafe -/* 853088 80240F18 86040008 */ lh $a0, 8($s0) -/* 85308C 80240F1C 9443008E */ lhu $v1, 0x8e($v0) -/* 853090 80240F20 2463FFFF */ addiu $v1, $v1, -1 -/* 853094 80240F24 A443008E */ sh $v1, 0x8e($v0) -/* 853098 80240F28 00031C00 */ sll $v1, $v1, 0x10 -/* 85309C 80240F2C 14600008 */ bnez $v1, .L80240F50 -/* 8530A0 80240F30 00000000 */ nop -/* 8530A4 80240F34 8E0200B0 */ lw $v0, 0xb0($s0) -/* 8530A8 80240F38 30420080 */ andi $v0, $v0, 0x80 -/* 8530AC 80240F3C 10400003 */ beqz $v0, .L80240F4C -/* 8530B0 80240F40 2402000F */ addiu $v0, $zero, 0xf -/* 8530B4 80240F44 080903D4 */ j .L80240F50 -/* 8530B8 80240F48 AE220070 */ sw $v0, 0x70($s1) -.L80240F4C: -/* 8530BC 80240F4C AE200070 */ sw $zero, 0x70($s1) -.L80240F50: -/* 8530C0 80240F50 8FBF0018 */ lw $ra, 0x18($sp) -/* 8530C4 80240F54 8FB10014 */ lw $s1, 0x14($sp) -/* 8530C8 80240F58 8FB00010 */ lw $s0, 0x10($sp) -/* 8530CC 80240F5C 03E00008 */ jr $ra -/* 8530D0 80240F60 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s index 7e32a8e7fe..1390f79e7e 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s @@ -177,7 +177,7 @@ glabel func_80241024_853194 /* 85342C 802412BC 00000000 */ nop /* 853430 802412C0 0280202D */ daddu $a0, $s4, $zero /* 853434 802412C4 0260282D */ daddu $a1, $s3, $zero -/* 853438 802412C8 0C0903BF */ jal func_80240EFC_85306C +/* 853438 802412C8 0C0903BF */ jal UnkNpcDurationFlagFunc /* 85343C 802412CC 02A0302D */ daddu $a2, $s5, $zero /* 853440 802412D0 080904BE */ j .L802412F8 /* 853444 802412D4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240D4C_E0F4EC.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240D4C_E0F4EC.s deleted file mode 100644 index ecc987254a..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240D4C_E0F4EC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D4C_E0F4EC -/* E0F4EC 80240D4C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E0F4F0 80240D50 AFB10014 */ sw $s1, 0x14($sp) -/* E0F4F4 80240D54 0080882D */ daddu $s1, $a0, $zero -/* E0F4F8 80240D58 AFBF0018 */ sw $ra, 0x18($sp) -/* E0F4FC 80240D5C AFB00010 */ sw $s0, 0x10($sp) -/* E0F500 80240D60 8E300148 */ lw $s0, 0x148($s1) -/* E0F504 80240D64 0C00EABB */ jal get_npc_unsafe -/* E0F508 80240D68 86040008 */ lh $a0, 8($s0) -/* E0F50C 80240D6C 9443008E */ lhu $v1, 0x8e($v0) -/* E0F510 80240D70 2463FFFF */ addiu $v1, $v1, -1 -/* E0F514 80240D74 A443008E */ sh $v1, 0x8e($v0) -/* E0F518 80240D78 00031C00 */ sll $v1, $v1, 0x10 -/* E0F51C 80240D7C 14600008 */ bnez $v1, .L80240DA0 -/* E0F520 80240D80 00000000 */ nop -/* E0F524 80240D84 8E0200B0 */ lw $v0, 0xb0($s0) -/* E0F528 80240D88 30420080 */ andi $v0, $v0, 0x80 -/* E0F52C 80240D8C 10400003 */ beqz $v0, .L80240D9C -/* E0F530 80240D90 2402000F */ addiu $v0, $zero, 0xf -/* E0F534 80240D94 08090368 */ j .L80240DA0 -/* E0F538 80240D98 AE220070 */ sw $v0, 0x70($s1) -.L80240D9C: -/* E0F53C 80240D9C AE200070 */ sw $zero, 0x70($s1) -.L80240DA0: -/* E0F540 80240DA0 8FBF0018 */ lw $ra, 0x18($sp) -/* E0F544 80240DA4 8FB10014 */ lw $s1, 0x14($sp) -/* E0F548 80240DA8 8FB00010 */ lw $s0, 0x10($sp) -/* E0F54C 80240DAC 03E00008 */ jr $ra -/* E0F550 80240DB0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s index 5a6d2b6551..ddf4f0e9e7 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s @@ -177,7 +177,7 @@ glabel func_80240E74_E0F614 /* E0F8AC 8024110C 00000000 */ nop /* E0F8B0 80241110 0280202D */ daddu $a0, $s4, $zero /* E0F8B4 80241114 0260282D */ daddu $a1, $s3, $zero -/* E0F8B8 80241118 0C090353 */ jal func_80240D4C_E0F4EC +/* E0F8B8 80241118 0C090353 */ jal UnkNpcDurationFlagFunc /* E0F8BC 8024111C 02A0302D */ daddu $a2, $s5, $zero /* E0F8C0 80241120 08090452 */ j .L80241148 /* E0F8C4 80241124 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802414EC_9D850C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802414EC_9D850C.s deleted file mode 100644 index 61d5664fa3..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802414EC_9D850C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414EC_9D850C -/* 9D850C 802414EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D8510 802414F0 AFB10014 */ sw $s1, 0x14($sp) -/* 9D8514 802414F4 0080882D */ daddu $s1, $a0, $zero -/* 9D8518 802414F8 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D851C 802414FC AFB00010 */ sw $s0, 0x10($sp) -/* 9D8520 80241500 8E300148 */ lw $s0, 0x148($s1) -/* 9D8524 80241504 0C00EABB */ jal get_npc_unsafe -/* 9D8528 80241508 86040008 */ lh $a0, 8($s0) -/* 9D852C 8024150C 9443008E */ lhu $v1, 0x8e($v0) -/* 9D8530 80241510 2463FFFF */ addiu $v1, $v1, -1 -/* 9D8534 80241514 A443008E */ sh $v1, 0x8e($v0) -/* 9D8538 80241518 00031C00 */ sll $v1, $v1, 0x10 -/* 9D853C 8024151C 14600008 */ bnez $v1, .L80241540 -/* 9D8540 80241520 00000000 */ nop -/* 9D8544 80241524 8E0200B0 */ lw $v0, 0xb0($s0) -/* 9D8548 80241528 30420080 */ andi $v0, $v0, 0x80 -/* 9D854C 8024152C 10400003 */ beqz $v0, .L8024153C -/* 9D8550 80241530 2402000F */ addiu $v0, $zero, 0xf -/* 9D8554 80241534 08090550 */ j .L80241540 -/* 9D8558 80241538 AE220070 */ sw $v0, 0x70($s1) -.L8024153C: -/* 9D855C 8024153C AE200070 */ sw $zero, 0x70($s1) -.L80241540: -/* 9D8560 80241540 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D8564 80241544 8FB10014 */ lw $s1, 0x14($sp) -/* 9D8568 80241548 8FB00010 */ lw $s0, 0x10($sp) -/* 9D856C 8024154C 03E00008 */ jr $ra -/* 9D8570 80241550 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s index b83da0d644..95780227eb 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s @@ -177,7 +177,7 @@ glabel func_80241614_9D8634 /* 9D88CC 802418AC 00000000 */ nop /* 9D88D0 802418B0 0280202D */ daddu $a0, $s4, $zero /* 9D88D4 802418B4 0260282D */ daddu $a1, $s3, $zero -/* 9D88D8 802418B8 0C09053B */ jal func_802414EC_9D850C +/* 9D88D8 802418B8 0C09053B */ jal UnkNpcDurationFlagFunc /* 9D88DC 802418BC 02A0302D */ daddu $a2, $s5, $zero /* 9D88E0 802418C0 0809063A */ j .L802418E8 /* 9D88E4 802418C4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802417B0_9FBFA0.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802417B0_9FBFA0.s deleted file mode 100644 index 072eb07829..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802417B0_9FBFA0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417B0_9FBFA0 -/* 9FBFA0 802417B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9FBFA4 802417B4 AFB10014 */ sw $s1, 0x14($sp) -/* 9FBFA8 802417B8 0080882D */ daddu $s1, $a0, $zero -/* 9FBFAC 802417BC AFBF0018 */ sw $ra, 0x18($sp) -/* 9FBFB0 802417C0 AFB00010 */ sw $s0, 0x10($sp) -/* 9FBFB4 802417C4 8E300148 */ lw $s0, 0x148($s1) -/* 9FBFB8 802417C8 0C00EABB */ jal get_npc_unsafe -/* 9FBFBC 802417CC 86040008 */ lh $a0, 8($s0) -/* 9FBFC0 802417D0 9443008E */ lhu $v1, 0x8e($v0) -/* 9FBFC4 802417D4 2463FFFF */ addiu $v1, $v1, -1 -/* 9FBFC8 802417D8 A443008E */ sh $v1, 0x8e($v0) -/* 9FBFCC 802417DC 00031C00 */ sll $v1, $v1, 0x10 -/* 9FBFD0 802417E0 14600008 */ bnez $v1, .L80241804 -/* 9FBFD4 802417E4 00000000 */ nop -/* 9FBFD8 802417E8 8E0200B0 */ lw $v0, 0xb0($s0) -/* 9FBFDC 802417EC 30420080 */ andi $v0, $v0, 0x80 -/* 9FBFE0 802417F0 10400003 */ beqz $v0, .L80241800 -/* 9FBFE4 802417F4 2402000F */ addiu $v0, $zero, 0xf -/* 9FBFE8 802417F8 08090601 */ j .L80241804 -/* 9FBFEC 802417FC AE220070 */ sw $v0, 0x70($s1) -.L80241800: -/* 9FBFF0 80241800 AE200070 */ sw $zero, 0x70($s1) -.L80241804: -/* 9FBFF4 80241804 8FBF0018 */ lw $ra, 0x18($sp) -/* 9FBFF8 80241808 8FB10014 */ lw $s1, 0x14($sp) -/* 9FBFFC 8024180C 8FB00010 */ lw $s0, 0x10($sp) -/* 9FC000 80241810 03E00008 */ jr $ra -/* 9FC004 80241814 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s index 87f00640f3..2913b3acde 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s @@ -177,7 +177,7 @@ glabel func_802418D8_9FC0C8 /* 9FC360 80241B70 00000000 */ nop /* 9FC364 80241B74 0280202D */ daddu $a0, $s4, $zero /* 9FC368 80241B78 0260282D */ daddu $a1, $s3, $zero -/* 9FC36C 80241B7C 0C0905EC */ jal func_802417B0_9FBFA0 +/* 9FC36C 80241B7C 0C0905EC */ jal UnkNpcDurationFlagFunc /* 9FC370 80241B80 02A0302D */ daddu $a2, $s5, $zero /* 9FC374 80241B84 080906EB */ j .L80241BAC /* 9FC378 80241B88 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240FD8_DBE288.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240FD8_DBE288.s deleted file mode 100644 index 7881b30db3..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240FD8_DBE288.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FD8_DBE288 -/* DBE288 80240FD8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DBE28C 80240FDC AFB10014 */ sw $s1, 0x14($sp) -/* DBE290 80240FE0 0080882D */ daddu $s1, $a0, $zero -/* DBE294 80240FE4 AFBF0018 */ sw $ra, 0x18($sp) -/* DBE298 80240FE8 AFB00010 */ sw $s0, 0x10($sp) -/* DBE29C 80240FEC 8E300148 */ lw $s0, 0x148($s1) -/* DBE2A0 80240FF0 0C00EABB */ jal get_npc_unsafe -/* DBE2A4 80240FF4 86040008 */ lh $a0, 8($s0) -/* DBE2A8 80240FF8 9443008E */ lhu $v1, 0x8e($v0) -/* DBE2AC 80240FFC 2463FFFF */ addiu $v1, $v1, -1 -/* DBE2B0 80241000 A443008E */ sh $v1, 0x8e($v0) -/* DBE2B4 80241004 00031C00 */ sll $v1, $v1, 0x10 -/* DBE2B8 80241008 14600008 */ bnez $v1, .L8024102C -/* DBE2BC 8024100C 00000000 */ nop -/* DBE2C0 80241010 8E0200B0 */ lw $v0, 0xb0($s0) -/* DBE2C4 80241014 30420080 */ andi $v0, $v0, 0x80 -/* DBE2C8 80241018 10400003 */ beqz $v0, .L80241028 -/* DBE2CC 8024101C 2402000F */ addiu $v0, $zero, 0xf -/* DBE2D0 80241020 0809040B */ j .L8024102C -/* DBE2D4 80241024 AE220070 */ sw $v0, 0x70($s1) -.L80241028: -/* DBE2D8 80241028 AE200070 */ sw $zero, 0x70($s1) -.L8024102C: -/* DBE2DC 8024102C 8FBF0018 */ lw $ra, 0x18($sp) -/* DBE2E0 80241030 8FB10014 */ lw $s1, 0x14($sp) -/* DBE2E4 80241034 8FB00010 */ lw $s0, 0x10($sp) -/* DBE2E8 80241038 03E00008 */ jr $ra -/* DBE2EC 8024103C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s index 4c1b4a25a1..c20926ba17 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s @@ -177,7 +177,7 @@ glabel func_80241100_DBE3B0 /* DBE648 80241398 00000000 */ nop /* DBE64C 8024139C 0280202D */ daddu $a0, $s4, $zero /* DBE650 802413A0 0260282D */ daddu $a1, $s3, $zero -/* DBE654 802413A4 0C0903F6 */ jal func_80240FD8_DBE288 +/* DBE654 802413A4 0C0903F6 */ jal UnkNpcDurationFlagFunc /* DBE658 802413A8 02A0302D */ daddu $a2, $s5, $zero /* DBE65C 802413AC 080904F5 */ j .L802413D4 /* DBE660 802413B0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802419B8_DCE688.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802419B8_DCE688.s deleted file mode 100644 index 6d1964bdbc..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802419B8_DCE688.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419B8_DCE688 -/* DCE688 802419B8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCE68C 802419BC AFB10014 */ sw $s1, 0x14($sp) -/* DCE690 802419C0 0080882D */ daddu $s1, $a0, $zero -/* DCE694 802419C4 AFBF0018 */ sw $ra, 0x18($sp) -/* DCE698 802419C8 AFB00010 */ sw $s0, 0x10($sp) -/* DCE69C 802419CC 8E300148 */ lw $s0, 0x148($s1) -/* DCE6A0 802419D0 0C00EABB */ jal get_npc_unsafe -/* DCE6A4 802419D4 86040008 */ lh $a0, 8($s0) -/* DCE6A8 802419D8 9443008E */ lhu $v1, 0x8e($v0) -/* DCE6AC 802419DC 2463FFFF */ addiu $v1, $v1, -1 -/* DCE6B0 802419E0 A443008E */ sh $v1, 0x8e($v0) -/* DCE6B4 802419E4 00031C00 */ sll $v1, $v1, 0x10 -/* DCE6B8 802419E8 14600008 */ bnez $v1, .L80241A0C -/* DCE6BC 802419EC 00000000 */ nop -/* DCE6C0 802419F0 8E0200B0 */ lw $v0, 0xb0($s0) -/* DCE6C4 802419F4 30420080 */ andi $v0, $v0, 0x80 -/* DCE6C8 802419F8 10400003 */ beqz $v0, .L80241A08 -/* DCE6CC 802419FC 2402000F */ addiu $v0, $zero, 0xf -/* DCE6D0 80241A00 08090683 */ j .L80241A0C -/* DCE6D4 80241A04 AE220070 */ sw $v0, 0x70($s1) -.L80241A08: -/* DCE6D8 80241A08 AE200070 */ sw $zero, 0x70($s1) -.L80241A0C: -/* DCE6DC 80241A0C 8FBF0018 */ lw $ra, 0x18($sp) -/* DCE6E0 80241A10 8FB10014 */ lw $s1, 0x14($sp) -/* DCE6E4 80241A14 8FB00010 */ lw $s0, 0x10($sp) -/* DCE6E8 80241A18 03E00008 */ jr $ra -/* DCE6EC 80241A1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s index adb18aae40..1cc2a5e08b 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s @@ -177,7 +177,7 @@ glabel func_80241AE0_DCE7B0 /* DCEA48 80241D78 00000000 */ nop /* DCEA4C 80241D7C 0280202D */ daddu $a0, $s4, $zero /* DCEA50 80241D80 0260282D */ daddu $a1, $s3, $zero -/* DCEA54 80241D84 0C09066E */ jal func_802419B8_DCE688 +/* DCEA54 80241D84 0C09066E */ jal UnkNpcDurationFlagFunc /* DCEA58 80241D88 02A0302D */ daddu $a2, $s5, $zero /* DCEA5C 80241D8C 0809076D */ j .L80241DB4 /* DCEA60 80241D90 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024198C_D8EBDC.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024198C_D8EBDC.s deleted file mode 100644 index 29131e9657..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024198C_D8EBDC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024198C_D8EBDC -/* D8EBDC 8024198C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8EBE0 80241990 AFB10014 */ sw $s1, 0x14($sp) -/* D8EBE4 80241994 0080882D */ daddu $s1, $a0, $zero -/* D8EBE8 80241998 AFBF0018 */ sw $ra, 0x18($sp) -/* D8EBEC 8024199C AFB00010 */ sw $s0, 0x10($sp) -/* D8EBF0 802419A0 8E300148 */ lw $s0, 0x148($s1) -/* D8EBF4 802419A4 0C00EABB */ jal get_npc_unsafe -/* D8EBF8 802419A8 86040008 */ lh $a0, 8($s0) -/* D8EBFC 802419AC 9443008E */ lhu $v1, 0x8e($v0) -/* D8EC00 802419B0 2463FFFF */ addiu $v1, $v1, -1 -/* D8EC04 802419B4 A443008E */ sh $v1, 0x8e($v0) -/* D8EC08 802419B8 00031C00 */ sll $v1, $v1, 0x10 -/* D8EC0C 802419BC 14600008 */ bnez $v1, .L802419E0 -/* D8EC10 802419C0 00000000 */ nop -/* D8EC14 802419C4 8E0200B0 */ lw $v0, 0xb0($s0) -/* D8EC18 802419C8 30420080 */ andi $v0, $v0, 0x80 -/* D8EC1C 802419CC 10400003 */ beqz $v0, .L802419DC -/* D8EC20 802419D0 2402000F */ addiu $v0, $zero, 0xf -/* D8EC24 802419D4 08090678 */ j .L802419E0 -/* D8EC28 802419D8 AE220070 */ sw $v0, 0x70($s1) -.L802419DC: -/* D8EC2C 802419DC AE200070 */ sw $zero, 0x70($s1) -.L802419E0: -/* D8EC30 802419E0 8FBF0018 */ lw $ra, 0x18($sp) -/* D8EC34 802419E4 8FB10014 */ lw $s1, 0x14($sp) -/* D8EC38 802419E8 8FB00010 */ lw $s0, 0x10($sp) -/* D8EC3C 802419EC 03E00008 */ jr $ra -/* D8EC40 802419F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s index 80cde65feb..dfef4bf1d4 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s @@ -177,7 +177,7 @@ glabel func_80241AB4_D8ED04 /* D8EF9C 80241D4C 00000000 */ nop /* D8EFA0 80241D50 0280202D */ daddu $a0, $s4, $zero /* D8EFA4 80241D54 0260282D */ daddu $a1, $s3, $zero -/* D8EFA8 80241D58 0C090663 */ jal func_8024198C_D8EBDC +/* D8EFA8 80241D58 0C090663 */ jal UnkNpcDurationFlagFunc /* D8EFAC 80241D5C 02A0302D */ daddu $a2, $s5, $zero /* D8EFB0 80241D60 08090762 */ j .L80241D88 /* D8EFB4 80241D64 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s index 176ffdb2e4..6ad738523d 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 @@ -153,7 +153,7 @@ glabel func_802423CC_D8F61C /* D8F854 80242604 00000000 */ nop /* D8F858 80242608 0240202D */ daddu $a0, $s2, $zero /* D8F85C 8024260C 0260282D */ daddu $a1, $s3, $zero -/* D8F860 80242610 0C090663 */ jal func_8024198C_D8EBDC +/* D8F860 80242610 0C090663 */ jal UnkNpcDurationFlagFunc /* D8F864 80242614 0280302D */ daddu $a2, $s4, $zero /* D8F868 80242618 0809099C */ j .L80242670 /* D8F86C 8024261C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241320_9A2300.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241320_9A2300.s deleted file mode 100644 index 84a3fd4ef4..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241320_9A2300.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241320_9A2300 -/* 9A2300 80241320 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A2304 80241324 AFB10014 */ sw $s1, 0x14($sp) -/* 9A2308 80241328 0080882D */ daddu $s1, $a0, $zero -/* 9A230C 8024132C AFBF0018 */ sw $ra, 0x18($sp) -/* 9A2310 80241330 AFB00010 */ sw $s0, 0x10($sp) -/* 9A2314 80241334 8E300148 */ lw $s0, 0x148($s1) -/* 9A2318 80241338 0C00EABB */ jal get_npc_unsafe -/* 9A231C 8024133C 86040008 */ lh $a0, 8($s0) -/* 9A2320 80241340 9443008E */ lhu $v1, 0x8e($v0) -/* 9A2324 80241344 2463FFFF */ addiu $v1, $v1, -1 -/* 9A2328 80241348 A443008E */ sh $v1, 0x8e($v0) -/* 9A232C 8024134C 00031C00 */ sll $v1, $v1, 0x10 -/* 9A2330 80241350 14600008 */ bnez $v1, .L80241374 -/* 9A2334 80241354 00000000 */ nop -/* 9A2338 80241358 8E0200B0 */ lw $v0, 0xb0($s0) -/* 9A233C 8024135C 30420080 */ andi $v0, $v0, 0x80 -/* 9A2340 80241360 10400003 */ beqz $v0, .L80241370 -/* 9A2344 80241364 2402000F */ addiu $v0, $zero, 0xf -/* 9A2348 80241368 080904DD */ j .L80241374 -/* 9A234C 8024136C AE220070 */ sw $v0, 0x70($s1) -.L80241370: -/* 9A2350 80241370 AE200070 */ sw $zero, 0x70($s1) -.L80241374: -/* 9A2354 80241374 8FBF0018 */ lw $ra, 0x18($sp) -/* 9A2358 80241378 8FB10014 */ lw $s1, 0x14($sp) -/* 9A235C 8024137C 8FB00010 */ lw $s0, 0x10($sp) -/* 9A2360 80241380 03E00008 */ jr $ra -/* 9A2364 80241384 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s index 3f0a1704c3..9f4f5106e3 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s @@ -177,7 +177,7 @@ glabel func_80241448_9A2428 /* 9A26C0 802416E0 00000000 */ nop /* 9A26C4 802416E4 0280202D */ daddu $a0, $s4, $zero /* 9A26C8 802416E8 0260282D */ daddu $a1, $s3, $zero -/* 9A26CC 802416EC 0C0904C8 */ jal func_80241320_9A2300 +/* 9A26CC 802416EC 0C0904C8 */ jal UnkNpcDurationFlagFunc /* 9A26D0 802416F0 02A0302D */ daddu $a2, $s5, $zero /* 9A26D4 802416F4 080905C7 */ j .L8024171C /* 9A26D8 802416F8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802416F0_9A9AE0.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802416F0_9A9AE0.s deleted file mode 100644 index ffd7ebc4c3..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802416F0_9A9AE0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416F0_9A9AE0 -/* 9A9AE0 802416F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A9AE4 802416F4 AFB10014 */ sw $s1, 0x14($sp) -/* 9A9AE8 802416F8 0080882D */ daddu $s1, $a0, $zero -/* 9A9AEC 802416FC AFBF0018 */ sw $ra, 0x18($sp) -/* 9A9AF0 80241700 AFB00010 */ sw $s0, 0x10($sp) -/* 9A9AF4 80241704 8E300148 */ lw $s0, 0x148($s1) -/* 9A9AF8 80241708 0C00EABB */ jal get_npc_unsafe -/* 9A9AFC 8024170C 86040008 */ lh $a0, 8($s0) -/* 9A9B00 80241710 9443008E */ lhu $v1, 0x8e($v0) -/* 9A9B04 80241714 2463FFFF */ addiu $v1, $v1, -1 -/* 9A9B08 80241718 A443008E */ sh $v1, 0x8e($v0) -/* 9A9B0C 8024171C 00031C00 */ sll $v1, $v1, 0x10 -/* 9A9B10 80241720 14600008 */ bnez $v1, .L80241744 -/* 9A9B14 80241724 00000000 */ nop -/* 9A9B18 80241728 8E0200B0 */ lw $v0, 0xb0($s0) -/* 9A9B1C 8024172C 30420080 */ andi $v0, $v0, 0x80 -/* 9A9B20 80241730 10400003 */ beqz $v0, .L80241740 -/* 9A9B24 80241734 2402000F */ addiu $v0, $zero, 0xf -/* 9A9B28 80241738 080905D1 */ j .L80241744 -/* 9A9B2C 8024173C AE220070 */ sw $v0, 0x70($s1) -.L80241740: -/* 9A9B30 80241740 AE200070 */ sw $zero, 0x70($s1) -.L80241744: -/* 9A9B34 80241744 8FBF0018 */ lw $ra, 0x18($sp) -/* 9A9B38 80241748 8FB10014 */ lw $s1, 0x14($sp) -/* 9A9B3C 8024174C 8FB00010 */ lw $s0, 0x10($sp) -/* 9A9B40 80241750 03E00008 */ jr $ra -/* 9A9B44 80241754 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s index f3a8204ba4..462c8d489b 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s @@ -177,7 +177,7 @@ glabel func_80241818_9A9C08 /* 9A9EA0 80241AB0 00000000 */ nop /* 9A9EA4 80241AB4 0280202D */ daddu $a0, $s4, $zero /* 9A9EA8 80241AB8 0260282D */ daddu $a1, $s3, $zero -/* 9A9EAC 80241ABC 0C0905BC */ jal func_802416F0_9A9AE0 +/* 9A9EAC 80241ABC 0C0905BC */ jal UnkNpcDurationFlagFunc /* 9A9EB0 80241AC0 02A0302D */ daddu $a2, $s5, $zero /* 9A9EB4 80241AC4 080906BB */ j .L80241AEC /* 9A9EB8 80241AC8 00000000 */ nop diff --git a/include/map.h b/include/map.h index 7ab05366cb..04a57dc333 100644 --- a/include/map.h +++ b/include/map.h @@ -223,7 +223,9 @@ typedef struct Enemy { /* 0x60 */ ScriptID defeatScriptID; /* 0x64 */ char unk_64[8]; /* 0x6C */ s32 varTable[16]; - /* 0xAC */ char unk_AC[9]; + /* 0xAC */ char unk_AC[4]; + /* 0xB0 */ s32 unk_B0; + /* 0xB4 */ char unk_B4; /* 0xB5 */ s8 unk_B5; /* 0xB6 */ char unk_B6[2]; /* 0xB8 */ s32 unkSettings24; diff --git a/src/world/area_arn/arn_03/BDED90.c b/src/world/area_arn/arn_03/BDED90.c index 4c6231dd92..7f7a100c26 100644 --- a/src/world/area_arn/arn_03/BDED90.c +++ b/src/world/area_arn/arn_03/BDED90.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_8024081C_BDF5AC); INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_8024094C_BDF6DC); -INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80240A6C_BDF7FC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80240AD4_BDF864); diff --git a/src/world/area_arn/arn_04/BE37B0.c b/src/world/area_arn/arn_04/BE37B0.c index 7ea505bd88..a32f8f737a 100644 --- a/src/world/area_arn/arn_04/BE37B0.c +++ b/src/world/area_arn/arn_04/BE37B0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_8024081C_BE3FCC); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_8024094C_BE40FC); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80240A6C_BE421C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80240AD4_BE4284); diff --git a/src/world/area_arn/arn_05/BE7BE0.c b/src/world/area_arn/arn_05/BE7BE0.c index 90f3f7a874..ba54bc1c11 100644 --- a/src/world/area_arn/arn_05/BE7BE0.c +++ b/src/world/area_arn/arn_05/BE7BE0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_8024081C_BE83FC); INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_8024094C_BE852C); -INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_80240A6C_BE864C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_80240AD4_BE86B4); diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index 8977d6b64f..22e1e1db51 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -63,7 +63,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242D48_C005C8); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242E78_C006F8); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242F98_C00818); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80243000_C00880); diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index baa6626218..7a3934bced 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024133C_C3281C); INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024146C_C3294C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024158C_C32A6C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802415F4_C32AD4); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 4306fa4816..f64d5c7035 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_8024081C_C405CC); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_8024094C_C406FC); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240A6C_C4081C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240AD4_C40884); diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 13f739f441..15899dd86c 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802410EC_C505FC); INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_8024121C_C5072C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_8024133C_C5084C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802413A4_C508B4); diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index e3042222c7..adf4ea2623 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_8024081C_C5675C); INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_8024094C_C5688C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_80240A6C_C569AC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_80240AD4_C56A14); diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 264b2f94ba..50220c3c24 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240DFC_95BFFC); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240F2C_95C12C); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024104C_95C24C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802410B4_95C2B4); diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index 8097332b73..f06fef643c 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_8024085C_C9E77C); INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_8024098C_C9E8AC); -INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240AAC_C9E9CC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240B14_C9EA34); diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index d68ca8f9ba..e081d2f5d7 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240C4C_B2D0BC); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240D7C_B2D1EC); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240E9C_B2D30C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240F04_B2D374); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 7d3265e56e..8e5b41f429 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240E3C_B35A0C); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240F6C_B35B3C); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024108C_B35C5C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802410F4_B35CC4); diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c index 4100ffb495..442bb6242f 100644 --- a/src/world/area_jan/jan_22/B84180.c +++ b/src/world/area_jan/jan_22/B84180.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_8024081C_B8499C); INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_8024094C_B84ACC); -INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240A6C_B84BEC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240AD4_B84C54); diff --git a/src/world/area_kkj/kkj_00/ABB340.c b/src/world/area_kkj/kkj_00/ABB340.c index 20c714f903..588d0a9fcf 100644 --- a/src/world/area_kkj/kkj_00/ABB340.c +++ b/src/world/area_kkj/kkj_00/ABB340.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_802408CC_ABBB5C); INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_802409FC_ABBC8C); -INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240B1C_ABBDAC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240B84_ABBE14); diff --git a/src/world/area_kkj/kkj_01/AC5170.c b/src/world/area_kkj/kkj_01/AC5170.c index 90b0419dac..9550074ce6 100644 --- a/src/world/area_kkj/kkj_01/AC5170.c +++ b/src/world/area_kkj/kkj_01/AC5170.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_8024081C_AC598C); INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_8024094C_AC5ABC); -INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_80240A6C_AC5BDC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_80240AD4_AC5C44); diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index bcabfdbbd9..33818bc2a0 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024081C_A8726C); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024094C_A8739C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240A6C_A874BC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240AD4_A87524); diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index 8f8132b197..080bed746f 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802408FC_A8D37C); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240A2C_A8D4AC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240B4C_A8D5CC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240BB4_A8D634); diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index a4eb121043..eadf3dcb29 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242D8C_7EDA9C); INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242EBC_7EDBCC); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242FDC_7EDCEC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243044_7EDD54); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index c78cb34d24..748fc4fea8 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024189C_80211C); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802419CC_80224C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241AEC_80236C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241B54_8023D4); diff --git a/src/world/area_mac/mac_01/805DD0.c b/src/world/area_mac/mac_01/805DD0.c index 8467ceb54b..7241ca67a0 100644 --- a/src/world/area_mac/mac_01/805DD0.c +++ b/src/world/area_mac/mac_01/805DD0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245D6C_8065EC); INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245E9C_80671C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245FBC_80683C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80246024_8068A4); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index 942f35e936..a3f9099d01 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024114C_82440C); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024127C_82453C); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024139C_82465C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241404_8246C4); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 2354fee36f..0fd2f45eeb 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240CAC_852E1C); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240DDC_852F4C); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240EFC_85306C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240F64_8530D4); diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index c028e94df7..3ec855f55b 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240AFC_E0F29C); INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240C2C_E0F3CC); -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240D4C_E0F4EC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240DB4_E0F554); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index 75608686c2..4e5da4dc1c 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024129C_9D82BC); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802413CC_9D83EC); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802414EC_9D850C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241554_9D8574); diff --git a/src/world/area_nok/nok_12/9FAD60.c b/src/world/area_nok/nok_12/9FAD60.c index aac03c2fdd..013dafb2bd 100644 --- a/src/world/area_nok/nok_12/9FAD60.c +++ b/src/world/area_nok/nok_12/9FAD60.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241560_9FBD50); INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241690_9FBE80); -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_802417B0_9FBFA0); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241818_9FC008); diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index a4e2f9c439..63f60c0476 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240D88_DBE038); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240EB8_DBE168); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240FD8_DBE288); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241040_DBE2F0); diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index b0409e3a1c..07fe8b10fd 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241768_DCE438); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241898_DCE568); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802419B8_DCE688); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241A20_DCE6F0); diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index 96016a129c..6c254e4c94 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_8024173C_D8E98C); INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_8024186C_D8EABC); -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_8024198C_D8EBDC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_802419F4_D8EC44); diff --git a/src/world/area_trd/trd_02/9A10C0.c b/src/world/area_trd/trd_02/9A10C0.c index c730ec8538..29cbb15056 100644 --- a/src/world/area_trd/trd_02/9A10C0.c +++ b/src/world/area_trd/trd_02/9A10C0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_802410D0_9A20B0); INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241200_9A21E0); -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241320_9A2300); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241388_9A2368); diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index ea02179b91..9b55ad193a 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802414A0_9A9890); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802415D0_9A99C0); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802416F0_9A9AE0); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241758_9A9B48); diff --git a/src/world/common/UnkNpcDurationFlagFunc.inc.c b/src/world/common/UnkNpcDurationFlagFunc.inc.c new file mode 100644 index 0000000000..8b8b54edbd --- /dev/null +++ b/src/world/common/UnkNpcDurationFlagFunc.inc.c @@ -0,0 +1,16 @@ +#include "common.h" +#include "map.h" + +static void UnkNpcDurationFlagFunc(ScriptInstance* script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if ((npc->duration << 0x10) == 0) { + if (enemy->unk_B0 & 0x80) { + script->functionTemp[0].s = 15; + } else { + script->functionTemp[0].s = 0; + } + } +} From 24d87054ffaf0ed164dfb5da8ad8c85338778472 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 20 Nov 2020 10:04:59 -0500 Subject: [PATCH 08/38] NpcJumpFunc2 --- .../arn_03/BDED90/func_80240730_BDF4C0.s | 33 ------------------- .../arn_03/BDED90/func_80240B94_BDF924.s | 2 +- .../arn_04/BE37B0/func_80240730_BE3EE0.s | 33 ------------------- .../arn_04/BE37B0/func_80240B94_BE4344.s | 2 +- .../arn_05/BE7BE0/func_80240730_BE8310.s | 33 ------------------- .../arn_05/BE7BE0/func_80240B94_BE8774.s | 2 +- .../dgb_01/BFD9A0/func_80242C5C_C004DC.s | 33 ------------------- .../dgb_01/BFD9A0/func_802430C0_C00940.s | 2 +- .../dgb_03/C31730/func_80241250_C32730.s | 33 ------------------- .../dgb_03/C31730/func_802416B4_C32B94.s | 2 +- .../dgb_03/C31730/func_802419B0_C32E90.s | 2 +- .../dgb_08/C3FDB0/func_80240730_C404E0.s | 33 ------------------- .../dgb_08/C3FDB0/func_80240B94_C40944.s | 2 +- .../dgb_15/C4F510/func_80241000_C50510.s | 33 ------------------- .../dgb_15/C4F510/func_80241464_C50974.s | 2 +- .../dgb_18/C55F40/func_80240730_C56670.s | 33 ------------------- .../dgb_18/C55F40/func_80240B94_C56AD4.s | 2 +- .../dro_01/95B7E0/func_80240D10_95BF10.s | 33 ------------------- .../dro_01/95B7E0/func_80241174_95C374.s | 2 +- .../flo_00/C9DF60/func_80240770_C9E690.s | 33 ------------------- .../flo_00/C9DF60/func_80240BD4_C9EAF4.s | 2 +- .../jan_02/B2C8A0/func_80240B60_B2CFD0.s | 33 ------------------- .../jan_02/B2C8A0/func_80240FC4_B2D434.s | 2 +- .../jan_03/B34BD0/func_80240D50_B35920.s | 33 ------------------- .../jan_03/B34BD0/func_802411B4_B35D84.s | 2 +- .../jan_22/B84180/func_80240730_B848B0.s | 33 ------------------- .../jan_22/B84180/func_80240B94_B84D14.s | 2 +- .../kkj_00/ABB340/func_802407E0_ABBA70.s | 33 ------------------- .../kkj_00/ABB340/func_80240C44_ABBED4.s | 2 +- .../kkj_01/AC5170/func_80240730_AC58A0.s | 33 ------------------- .../kkj_01/AC5170/func_80240B94_AC5D04.s | 2 +- .../kpa_91/A86A50/func_80240730_A87180.s | 33 ------------------- .../kpa_91/A86A50/func_80240B94_A875E4.s | 2 +- .../kpa_95/A8CB60/func_80240810_A8D290.s | 33 ------------------- .../kpa_95/A8CB60/func_80240C74_A8D6F4.s | 2 +- .../mac_00/7ED280/func_80242CA0_7ED9B0.s | 33 ------------------- .../mac_00/7ED280/func_80243104_7EDE14.s | 2 +- .../mac_01/8017D0/func_802417B0_802030.s | 33 ------------------- .../mac_01/8017D0/func_80241C14_802494.s | 2 +- .../mac_01/805DD0/func_80245C80_806500.s | 33 ------------------- .../mac_01/805DD0/func_802460E4_806964.s | 2 +- .../mac_02/823BF0/func_80241060_824320.s | 33 ------------------- .../mac_02/823BF0/func_802414C4_824784.s | 2 +- .../mac_05/852170/func_80240BC0_852D30.s | 33 ------------------- .../mac_05/852170/func_80241024_853194.s | 2 +- .../mgm_00/E0E7A0/func_80240A10_E0F1B0.s | 33 ------------------- .../mgm_00/E0E7A0/func_80240E74_E0F614.s | 2 +- .../nok_02/9D7AA0/func_802411B0_9D81D0.s | 33 ------------------- .../nok_02/9D7AA0/func_80241614_9D8634.s | 2 +- .../nok_12/9FAD60/func_80241474_9FBC64.s | 33 ------------------- .../nok_12/9FAD60/func_802418D8_9FC0C8.s | 2 +- .../omo_07/DBD2B0/func_80240C9C_DBDF4C.s | 33 ------------------- .../omo_07/DBD2B0/func_80241100_DBE3B0.s | 2 +- .../omo_07/DBD2B0/func_80241634_DBE8E4.s | 2 +- .../omo_09/DCD6B0/func_8024167C_DCE34C.s | 33 ------------------- .../omo_09/DCD6B0/func_80241AE0_DCE7B0.s | 2 +- .../omo_09/DCD6B0/func_80242014_DCECE4.s | 2 +- .../pra_35/D8D270/func_80241650_D8E8A0.s | 33 ------------------- .../pra_35/D8D270/func_80241AB4_D8ED04.s | 2 +- .../pra_35/D8D270/func_802423CC_D8F61C.s | 2 +- .../trd_02/9A10C0/func_80240FE4_9A1FC4.s | 33 ------------------- .../trd_02/9A10C0/func_80241448_9A2428.s | 2 +- .../trd_04/9A88A0/func_802413B4_9A97A4.s | 33 ------------------- .../trd_04/9A88A0/func_80241818_9A9C08.s | 2 +- src/world/area_arn/arn_03/BDED90.c | 2 +- src/world/area_arn/arn_04/BE37B0.c | 2 +- src/world/area_arn/arn_05/BE7BE0.c | 2 +- src/world/area_dgb/dgb_01/BFD9A0.c | 2 +- src/world/area_dgb/dgb_03/C31730.c | 2 +- src/world/area_dgb/dgb_08/C3FDB0.c | 2 +- src/world/area_dgb/dgb_15/C4F510.c | 2 +- src/world/area_dgb/dgb_18/C55F40.c | 2 +- src/world/area_dro/dro_01/95B7E0.c | 2 +- src/world/area_flo/flo_00/C9DF60.c | 2 +- src/world/area_jan/jan_02/B2C8A0.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_jan/jan_22/B84180.c | 2 +- src/world/area_kkj/kkj_00/ABB340.c | 2 +- src/world/area_kkj/kkj_01/AC5170.c | 2 +- src/world/area_kpa/kpa_91/A86A50.c | 2 +- src/world/area_kpa/kpa_95/A8CB60.c | 2 +- src/world/area_mac/mac_00/7ED280.c | 2 +- src/world/area_mac/mac_01/8017D0.c | 2 +- src/world/area_mac/mac_01/805DD0.c | 2 +- src/world/area_mac/mac_02/823BF0.c | 2 +- src/world/area_mac/mac_05/852170.c | 2 +- src/world/area_mgm/mgm_00/E0E7A0.c | 2 +- src/world/area_nok/nok_02/9D7AA0.c | 2 +- src/world/area_nok/nok_12/9FAD60.c | 2 +- src/world/area_omo/omo_07/DBD2B0.c | 2 +- src/world/area_omo/omo_09/DCD6B0.c | 2 +- src/world/area_pra/pra_35/D8D270.c | 2 +- src/world/area_trd/trd_02/9A10C0.c | 2 +- src/world/area_trd/trd_04/9A88A0.c | 2 +- src/world/common/NpcJumpFunc2.inc.c | 14 ++++++++ 95 files changed, 78 insertions(+), 1054 deletions(-) delete mode 100644 asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240730_BDF4C0.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240730_BE3EE0.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240730_BE8310.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242C5C_C004DC.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241250_C32730.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240730_C404E0.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241000_C50510.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240730_C56670.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240D10_95BF10.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240770_C9E690.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240B60_B2CFD0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240D50_B35920.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240730_B848B0.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802407E0_ABBA70.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240730_AC58A0.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240730_A87180.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240810_A8D290.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242CA0_7ED9B0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802417B0_802030.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245C80_806500.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241060_824320.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80240BC0_852D30.s delete mode 100644 asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240A10_E0F1B0.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802411B0_9D81D0.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241474_9FBC64.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240C9C_DBDF4C.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024167C_DCE34C.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241650_D8E8A0.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240FE4_9A1FC4.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802413B4_9A97A4.s create mode 100644 src/world/common/NpcJumpFunc2.inc.c diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240730_BDF4C0.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240730_BDF4C0.s deleted file mode 100644 index 16e0c0b97b..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240730_BDF4C0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_BDF4C0 -/* BDF4C0 80240730 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BDF4C4 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* BDF4C8 80240738 0080882D */ daddu $s1, $a0, $zero -/* BDF4CC 8024073C AFBF0018 */ sw $ra, 0x18($sp) -/* BDF4D0 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* BDF4D4 80240744 8E300148 */ lw $s0, 0x148($s1) -/* BDF4D8 80240748 0C00EABB */ jal get_npc_unsafe -/* BDF4DC 8024074C 86040008 */ lh $a0, 8($s0) -/* BDF4E0 80240750 8E0300CC */ lw $v1, 0xcc($s0) -/* BDF4E4 80240754 3C014120 */ lui $at, 0x4120 -/* BDF4E8 80240758 44812000 */ mtc1 $at, $f4 -/* BDF4EC 8024075C 3C014000 */ lui $at, 0x4000 -/* BDF4F0 80240760 44810000 */ mtc1 $at, $f0 -/* BDF4F4 80240764 C442003C */ lwc1 $f2, 0x3c($v0) -/* BDF4F8 80240768 8C640010 */ lw $a0, 0x10($v1) -/* BDF4FC 8024076C 8C430000 */ lw $v1, ($v0) -/* BDF500 80240770 E444001C */ swc1 $f4, 0x1c($v0) -/* BDF504 80240774 E4400014 */ swc1 $f0, 0x14($v0) -/* BDF508 80240778 E4420064 */ swc1 $f2, 0x64($v0) -/* BDF50C 8024077C 34630800 */ ori $v1, $v1, 0x800 -/* BDF510 80240780 AC430000 */ sw $v1, ($v0) -/* BDF514 80240784 AC440028 */ sw $a0, 0x28($v0) -/* BDF518 80240788 2402000B */ addiu $v0, $zero, 0xb -/* BDF51C 8024078C AE220070 */ sw $v0, 0x70($s1) -/* BDF520 80240790 8FBF0018 */ lw $ra, 0x18($sp) -/* BDF524 80240794 8FB10014 */ lw $s1, 0x14($sp) -/* BDF528 80240798 8FB00010 */ lw $s0, 0x10($sp) -/* BDF52C 8024079C 03E00008 */ jr $ra -/* BDF530 802407A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s index 841d8b127c..7d61ab0823 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s @@ -157,7 +157,7 @@ glabel func_80240B94_BDF924 /* BDFB6C 80240DDC 00000000 */ nop /* BDFB70 80240DE0 0280202D */ daddu $a0, $s4, $zero /* BDFB74 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* BDFB78 80240DE8 0C0901CC */ jal func_80240730_BDF4C0 +/* BDFB78 80240DE8 0C0901CC */ jal NpcJumpFunc2 /* BDFB7C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* BDFB80 80240DF0 0280202D */ daddu $a0, $s4, $zero /* BDFB84 80240DF4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240730_BE3EE0.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240730_BE3EE0.s deleted file mode 100644 index 89dd223ba0..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240730_BE3EE0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_BE3EE0 -/* BE3EE0 80240730 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE3EE4 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* BE3EE8 80240738 0080882D */ daddu $s1, $a0, $zero -/* BE3EEC 8024073C AFBF0018 */ sw $ra, 0x18($sp) -/* BE3EF0 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* BE3EF4 80240744 8E300148 */ lw $s0, 0x148($s1) -/* BE3EF8 80240748 0C00EABB */ jal get_npc_unsafe -/* BE3EFC 8024074C 86040008 */ lh $a0, 8($s0) -/* BE3F00 80240750 8E0300CC */ lw $v1, 0xcc($s0) -/* BE3F04 80240754 3C014120 */ lui $at, 0x4120 -/* BE3F08 80240758 44812000 */ mtc1 $at, $f4 -/* BE3F0C 8024075C 3C014000 */ lui $at, 0x4000 -/* BE3F10 80240760 44810000 */ mtc1 $at, $f0 -/* BE3F14 80240764 C442003C */ lwc1 $f2, 0x3c($v0) -/* BE3F18 80240768 8C640010 */ lw $a0, 0x10($v1) -/* BE3F1C 8024076C 8C430000 */ lw $v1, ($v0) -/* BE3F20 80240770 E444001C */ swc1 $f4, 0x1c($v0) -/* BE3F24 80240774 E4400014 */ swc1 $f0, 0x14($v0) -/* BE3F28 80240778 E4420064 */ swc1 $f2, 0x64($v0) -/* BE3F2C 8024077C 34630800 */ ori $v1, $v1, 0x800 -/* BE3F30 80240780 AC430000 */ sw $v1, ($v0) -/* BE3F34 80240784 AC440028 */ sw $a0, 0x28($v0) -/* BE3F38 80240788 2402000B */ addiu $v0, $zero, 0xb -/* BE3F3C 8024078C AE220070 */ sw $v0, 0x70($s1) -/* BE3F40 80240790 8FBF0018 */ lw $ra, 0x18($sp) -/* BE3F44 80240794 8FB10014 */ lw $s1, 0x14($sp) -/* BE3F48 80240798 8FB00010 */ lw $s0, 0x10($sp) -/* BE3F4C 8024079C 03E00008 */ jr $ra -/* BE3F50 802407A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s index 6b757eadca..0e6ec81db0 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s @@ -157,7 +157,7 @@ glabel func_80240B94_BE4344 /* BE458C 80240DDC 00000000 */ nop /* BE4590 80240DE0 0280202D */ daddu $a0, $s4, $zero /* BE4594 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* BE4598 80240DE8 0C0901CC */ jal func_80240730_BE3EE0 +/* BE4598 80240DE8 0C0901CC */ jal NpcJumpFunc2 /* BE459C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* BE45A0 80240DF0 0280202D */ daddu $a0, $s4, $zero /* BE45A4 80240DF4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240730_BE8310.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240730_BE8310.s deleted file mode 100644 index 396baf608d..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240730_BE8310.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_BE8310 -/* BE8310 80240730 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE8314 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* BE8318 80240738 0080882D */ daddu $s1, $a0, $zero -/* BE831C 8024073C AFBF0018 */ sw $ra, 0x18($sp) -/* BE8320 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* BE8324 80240744 8E300148 */ lw $s0, 0x148($s1) -/* BE8328 80240748 0C00EABB */ jal get_npc_unsafe -/* BE832C 8024074C 86040008 */ lh $a0, 8($s0) -/* BE8330 80240750 8E0300CC */ lw $v1, 0xcc($s0) -/* BE8334 80240754 3C014120 */ lui $at, 0x4120 -/* BE8338 80240758 44812000 */ mtc1 $at, $f4 -/* BE833C 8024075C 3C014000 */ lui $at, 0x4000 -/* BE8340 80240760 44810000 */ mtc1 $at, $f0 -/* BE8344 80240764 C442003C */ lwc1 $f2, 0x3c($v0) -/* BE8348 80240768 8C640010 */ lw $a0, 0x10($v1) -/* BE834C 8024076C 8C430000 */ lw $v1, ($v0) -/* BE8350 80240770 E444001C */ swc1 $f4, 0x1c($v0) -/* BE8354 80240774 E4400014 */ swc1 $f0, 0x14($v0) -/* BE8358 80240778 E4420064 */ swc1 $f2, 0x64($v0) -/* BE835C 8024077C 34630800 */ ori $v1, $v1, 0x800 -/* BE8360 80240780 AC430000 */ sw $v1, ($v0) -/* BE8364 80240784 AC440028 */ sw $a0, 0x28($v0) -/* BE8368 80240788 2402000B */ addiu $v0, $zero, 0xb -/* BE836C 8024078C AE220070 */ sw $v0, 0x70($s1) -/* BE8370 80240790 8FBF0018 */ lw $ra, 0x18($sp) -/* BE8374 80240794 8FB10014 */ lw $s1, 0x14($sp) -/* BE8378 80240798 8FB00010 */ lw $s0, 0x10($sp) -/* BE837C 8024079C 03E00008 */ jr $ra -/* BE8380 802407A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s index 4fada23213..67e0f9e0a3 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s @@ -157,7 +157,7 @@ glabel func_80240B94_BE8774 /* BE89BC 80240DDC 00000000 */ nop /* BE89C0 80240DE0 0280202D */ daddu $a0, $s4, $zero /* BE89C4 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* BE89C8 80240DE8 0C0901CC */ jal func_80240730_BE8310 +/* BE89C8 80240DE8 0C0901CC */ jal NpcJumpFunc2 /* BE89CC 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* BE89D0 80240DF0 0280202D */ daddu $a0, $s4, $zero /* BE89D4 80240DF4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242C5C_C004DC.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242C5C_C004DC.s deleted file mode 100644 index 9ea44ce924..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242C5C_C004DC.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C5C_C004DC -/* C004DC 80242C5C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C004E0 80242C60 AFB10014 */ sw $s1, 0x14($sp) -/* C004E4 80242C64 0080882D */ daddu $s1, $a0, $zero -/* C004E8 80242C68 AFBF0018 */ sw $ra, 0x18($sp) -/* C004EC 80242C6C AFB00010 */ sw $s0, 0x10($sp) -/* C004F0 80242C70 8E300148 */ lw $s0, 0x148($s1) -/* C004F4 80242C74 0C00EABB */ jal get_npc_unsafe -/* C004F8 80242C78 86040008 */ lh $a0, 8($s0) -/* C004FC 80242C7C 8E0300CC */ lw $v1, 0xcc($s0) -/* C00500 80242C80 3C014120 */ lui $at, 0x4120 -/* C00504 80242C84 44812000 */ mtc1 $at, $f4 -/* C00508 80242C88 3C014000 */ lui $at, 0x4000 -/* C0050C 80242C8C 44810000 */ mtc1 $at, $f0 -/* C00510 80242C90 C442003C */ lwc1 $f2, 0x3c($v0) -/* C00514 80242C94 8C640010 */ lw $a0, 0x10($v1) -/* C00518 80242C98 8C430000 */ lw $v1, ($v0) -/* C0051C 80242C9C E444001C */ swc1 $f4, 0x1c($v0) -/* C00520 80242CA0 E4400014 */ swc1 $f0, 0x14($v0) -/* C00524 80242CA4 E4420064 */ swc1 $f2, 0x64($v0) -/* C00528 80242CA8 34630800 */ ori $v1, $v1, 0x800 -/* C0052C 80242CAC AC430000 */ sw $v1, ($v0) -/* C00530 80242CB0 AC440028 */ sw $a0, 0x28($v0) -/* C00534 80242CB4 2402000B */ addiu $v0, $zero, 0xb -/* C00538 80242CB8 AE220070 */ sw $v0, 0x70($s1) -/* C0053C 80242CBC 8FBF0018 */ lw $ra, 0x18($sp) -/* C00540 80242CC0 8FB10014 */ lw $s1, 0x14($sp) -/* C00544 80242CC4 8FB00010 */ lw $s0, 0x10($sp) -/* C00548 80242CC8 03E00008 */ jr $ra -/* C0054C 80242CCC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s index 737aeb3ac9..56188ecfed 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s @@ -157,7 +157,7 @@ glabel func_802430C0_C00940 /* C00B88 80243308 00000000 */ nop /* C00B8C 8024330C 0280202D */ daddu $a0, $s4, $zero /* C00B90 80243310 0260282D */ daddu $a1, $s3, $zero -/* C00B94 80243314 0C090B17 */ jal func_80242C5C_C004DC +/* C00B94 80243314 0C090B17 */ jal NpcJumpFunc2 /* C00B98 80243318 02A0302D */ daddu $a2, $s5, $zero /* C00B9C 8024331C 0280202D */ daddu $a0, $s4, $zero /* C00BA0 80243320 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241250_C32730.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241250_C32730.s deleted file mode 100644 index 5752f47e4c..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241250_C32730.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241250_C32730 -/* C32730 80241250 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C32734 80241254 AFB10014 */ sw $s1, 0x14($sp) -/* C32738 80241258 0080882D */ daddu $s1, $a0, $zero -/* C3273C 8024125C AFBF0018 */ sw $ra, 0x18($sp) -/* C32740 80241260 AFB00010 */ sw $s0, 0x10($sp) -/* C32744 80241264 8E300148 */ lw $s0, 0x148($s1) -/* C32748 80241268 0C00EABB */ jal get_npc_unsafe -/* C3274C 8024126C 86040008 */ lh $a0, 8($s0) -/* C32750 80241270 8E0300CC */ lw $v1, 0xcc($s0) -/* C32754 80241274 3C014120 */ lui $at, 0x4120 -/* C32758 80241278 44812000 */ mtc1 $at, $f4 -/* C3275C 8024127C 3C014000 */ lui $at, 0x4000 -/* C32760 80241280 44810000 */ mtc1 $at, $f0 -/* C32764 80241284 C442003C */ lwc1 $f2, 0x3c($v0) -/* C32768 80241288 8C640010 */ lw $a0, 0x10($v1) -/* C3276C 8024128C 8C430000 */ lw $v1, ($v0) -/* C32770 80241290 E444001C */ swc1 $f4, 0x1c($v0) -/* C32774 80241294 E4400014 */ swc1 $f0, 0x14($v0) -/* C32778 80241298 E4420064 */ swc1 $f2, 0x64($v0) -/* C3277C 8024129C 34630800 */ ori $v1, $v1, 0x800 -/* C32780 802412A0 AC430000 */ sw $v1, ($v0) -/* C32784 802412A4 AC440028 */ sw $a0, 0x28($v0) -/* C32788 802412A8 2402000B */ addiu $v0, $zero, 0xb -/* C3278C 802412AC AE220070 */ sw $v0, 0x70($s1) -/* C32790 802412B0 8FBF0018 */ lw $ra, 0x18($sp) -/* C32794 802412B4 8FB10014 */ lw $s1, 0x14($sp) -/* C32798 802412B8 8FB00010 */ lw $s0, 0x10($sp) -/* C3279C 802412BC 03E00008 */ jr $ra -/* C327A0 802412C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s index 45fcb997b9..7ea0de2767 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s @@ -157,7 +157,7 @@ glabel func_802416B4_C32B94 /* C32DDC 802418FC 00000000 */ nop /* C32DE0 80241900 0280202D */ daddu $a0, $s4, $zero /* C32DE4 80241904 0260282D */ daddu $a1, $s3, $zero -/* C32DE8 80241908 0C090494 */ jal func_80241250_C32730 +/* C32DE8 80241908 0C090494 */ jal NpcJumpFunc2 /* C32DEC 8024190C 02A0302D */ daddu $a2, $s5, $zero /* C32DF0 80241910 0280202D */ daddu $a0, $s4, $zero /* C32DF4 80241914 0260282D */ daddu $a1, $s3, $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 1f78fe290e..0f3cd0b104 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 @@ -133,7 +133,7 @@ glabel func_802419B0_C32E90 /* C33078 80241B98 00000000 */ nop /* C3307C 80241B9C 0240202D */ daddu $a0, $s2, $zero /* C33080 80241BA0 0260282D */ daddu $a1, $s3, $zero -/* C33084 80241BA4 0C090494 */ jal func_80241250_C32730 +/* C33084 80241BA4 0C090494 */ jal NpcJumpFunc2 /* C33088 80241BA8 0280302D */ daddu $a2, $s4, $zero /* C3308C 80241BAC 0240202D */ daddu $a0, $s2, $zero /* C33090 80241BB0 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240730_C404E0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240730_C404E0.s deleted file mode 100644 index 27abf1d1f8..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240730_C404E0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_C404E0 -/* C404E0 80240730 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C404E4 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* C404E8 80240738 0080882D */ daddu $s1, $a0, $zero -/* C404EC 8024073C AFBF0018 */ sw $ra, 0x18($sp) -/* C404F0 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* C404F4 80240744 8E300148 */ lw $s0, 0x148($s1) -/* C404F8 80240748 0C00EABB */ jal get_npc_unsafe -/* C404FC 8024074C 86040008 */ lh $a0, 8($s0) -/* C40500 80240750 8E0300CC */ lw $v1, 0xcc($s0) -/* C40504 80240754 3C014120 */ lui $at, 0x4120 -/* C40508 80240758 44812000 */ mtc1 $at, $f4 -/* C4050C 8024075C 3C014000 */ lui $at, 0x4000 -/* C40510 80240760 44810000 */ mtc1 $at, $f0 -/* C40514 80240764 C442003C */ lwc1 $f2, 0x3c($v0) -/* C40518 80240768 8C640010 */ lw $a0, 0x10($v1) -/* C4051C 8024076C 8C430000 */ lw $v1, ($v0) -/* C40520 80240770 E444001C */ swc1 $f4, 0x1c($v0) -/* C40524 80240774 E4400014 */ swc1 $f0, 0x14($v0) -/* C40528 80240778 E4420064 */ swc1 $f2, 0x64($v0) -/* C4052C 8024077C 34630800 */ ori $v1, $v1, 0x800 -/* C40530 80240780 AC430000 */ sw $v1, ($v0) -/* C40534 80240784 AC440028 */ sw $a0, 0x28($v0) -/* C40538 80240788 2402000B */ addiu $v0, $zero, 0xb -/* C4053C 8024078C AE220070 */ sw $v0, 0x70($s1) -/* C40540 80240790 8FBF0018 */ lw $ra, 0x18($sp) -/* C40544 80240794 8FB10014 */ lw $s1, 0x14($sp) -/* C40548 80240798 8FB00010 */ lw $s0, 0x10($sp) -/* C4054C 8024079C 03E00008 */ jr $ra -/* C40550 802407A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s index 522db1c848..5c091d492e 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s @@ -157,7 +157,7 @@ glabel func_80240B94_C40944 /* C40B8C 80240DDC 00000000 */ nop /* C40B90 80240DE0 0280202D */ daddu $a0, $s4, $zero /* C40B94 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* C40B98 80240DE8 0C0901CC */ jal func_80240730_C404E0 +/* C40B98 80240DE8 0C0901CC */ jal NpcJumpFunc2 /* C40B9C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* C40BA0 80240DF0 0280202D */ daddu $a0, $s4, $zero /* C40BA4 80240DF4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241000_C50510.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241000_C50510.s deleted file mode 100644 index 7adfdf213e..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241000_C50510.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241000_C50510 -/* C50510 80241000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C50514 80241004 AFB10014 */ sw $s1, 0x14($sp) -/* C50518 80241008 0080882D */ daddu $s1, $a0, $zero -/* C5051C 8024100C AFBF0018 */ sw $ra, 0x18($sp) -/* C50520 80241010 AFB00010 */ sw $s0, 0x10($sp) -/* C50524 80241014 8E300148 */ lw $s0, 0x148($s1) -/* C50528 80241018 0C00EABB */ jal get_npc_unsafe -/* C5052C 8024101C 86040008 */ lh $a0, 8($s0) -/* C50530 80241020 8E0300CC */ lw $v1, 0xcc($s0) -/* C50534 80241024 3C014120 */ lui $at, 0x4120 -/* C50538 80241028 44812000 */ mtc1 $at, $f4 -/* C5053C 8024102C 3C014000 */ lui $at, 0x4000 -/* C50540 80241030 44810000 */ mtc1 $at, $f0 -/* C50544 80241034 C442003C */ lwc1 $f2, 0x3c($v0) -/* C50548 80241038 8C640010 */ lw $a0, 0x10($v1) -/* C5054C 8024103C 8C430000 */ lw $v1, ($v0) -/* C50550 80241040 E444001C */ swc1 $f4, 0x1c($v0) -/* C50554 80241044 E4400014 */ swc1 $f0, 0x14($v0) -/* C50558 80241048 E4420064 */ swc1 $f2, 0x64($v0) -/* C5055C 8024104C 34630800 */ ori $v1, $v1, 0x800 -/* C50560 80241050 AC430000 */ sw $v1, ($v0) -/* C50564 80241054 AC440028 */ sw $a0, 0x28($v0) -/* C50568 80241058 2402000B */ addiu $v0, $zero, 0xb -/* C5056C 8024105C AE220070 */ sw $v0, 0x70($s1) -/* C50570 80241060 8FBF0018 */ lw $ra, 0x18($sp) -/* C50574 80241064 8FB10014 */ lw $s1, 0x14($sp) -/* C50578 80241068 8FB00010 */ lw $s0, 0x10($sp) -/* C5057C 8024106C 03E00008 */ jr $ra -/* C50580 80241070 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s index 593c51e5fe..3fbc07a9a7 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s @@ -157,7 +157,7 @@ glabel func_80241464_C50974 /* C50BBC 802416AC 00000000 */ nop /* C50BC0 802416B0 0280202D */ daddu $a0, $s4, $zero /* C50BC4 802416B4 0260282D */ daddu $a1, $s3, $zero -/* C50BC8 802416B8 0C090400 */ jal func_80241000_C50510 +/* C50BC8 802416B8 0C090400 */ jal NpcJumpFunc2 /* C50BCC 802416BC 02A0302D */ daddu $a2, $s5, $zero /* C50BD0 802416C0 0280202D */ daddu $a0, $s4, $zero /* C50BD4 802416C4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240730_C56670.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240730_C56670.s deleted file mode 100644 index 26d8f8c2b9..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240730_C56670.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_C56670 -/* C56670 80240730 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C56674 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* C56678 80240738 0080882D */ daddu $s1, $a0, $zero -/* C5667C 8024073C AFBF0018 */ sw $ra, 0x18($sp) -/* C56680 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* C56684 80240744 8E300148 */ lw $s0, 0x148($s1) -/* C56688 80240748 0C00EABB */ jal get_npc_unsafe -/* C5668C 8024074C 86040008 */ lh $a0, 8($s0) -/* C56690 80240750 8E0300CC */ lw $v1, 0xcc($s0) -/* C56694 80240754 3C014120 */ lui $at, 0x4120 -/* C56698 80240758 44812000 */ mtc1 $at, $f4 -/* C5669C 8024075C 3C014000 */ lui $at, 0x4000 -/* C566A0 80240760 44810000 */ mtc1 $at, $f0 -/* C566A4 80240764 C442003C */ lwc1 $f2, 0x3c($v0) -/* C566A8 80240768 8C640010 */ lw $a0, 0x10($v1) -/* C566AC 8024076C 8C430000 */ lw $v1, ($v0) -/* C566B0 80240770 E444001C */ swc1 $f4, 0x1c($v0) -/* C566B4 80240774 E4400014 */ swc1 $f0, 0x14($v0) -/* C566B8 80240778 E4420064 */ swc1 $f2, 0x64($v0) -/* C566BC 8024077C 34630800 */ ori $v1, $v1, 0x800 -/* C566C0 80240780 AC430000 */ sw $v1, ($v0) -/* C566C4 80240784 AC440028 */ sw $a0, 0x28($v0) -/* C566C8 80240788 2402000B */ addiu $v0, $zero, 0xb -/* C566CC 8024078C AE220070 */ sw $v0, 0x70($s1) -/* C566D0 80240790 8FBF0018 */ lw $ra, 0x18($sp) -/* C566D4 80240794 8FB10014 */ lw $s1, 0x14($sp) -/* C566D8 80240798 8FB00010 */ lw $s0, 0x10($sp) -/* C566DC 8024079C 03E00008 */ jr $ra -/* C566E0 802407A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s index 89618d4a72..285089f100 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s @@ -157,7 +157,7 @@ glabel func_80240B94_C56AD4 /* C56D1C 80240DDC 00000000 */ nop /* C56D20 80240DE0 0280202D */ daddu $a0, $s4, $zero /* C56D24 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* C56D28 80240DE8 0C0901CC */ jal func_80240730_C56670 +/* C56D28 80240DE8 0C0901CC */ jal NpcJumpFunc2 /* C56D2C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* C56D30 80240DF0 0280202D */ daddu $a0, $s4, $zero /* C56D34 80240DF4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240D10_95BF10.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240D10_95BF10.s deleted file mode 100644 index ed26aab7fc..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240D10_95BF10.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D10_95BF10 -/* 95BF10 80240D10 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95BF14 80240D14 AFB10014 */ sw $s1, 0x14($sp) -/* 95BF18 80240D18 0080882D */ daddu $s1, $a0, $zero -/* 95BF1C 80240D1C AFBF0018 */ sw $ra, 0x18($sp) -/* 95BF20 80240D20 AFB00010 */ sw $s0, 0x10($sp) -/* 95BF24 80240D24 8E300148 */ lw $s0, 0x148($s1) -/* 95BF28 80240D28 0C00EABB */ jal get_npc_unsafe -/* 95BF2C 80240D2C 86040008 */ lh $a0, 8($s0) -/* 95BF30 80240D30 8E0300CC */ lw $v1, 0xcc($s0) -/* 95BF34 80240D34 3C014120 */ lui $at, 0x4120 -/* 95BF38 80240D38 44812000 */ mtc1 $at, $f4 -/* 95BF3C 80240D3C 3C014000 */ lui $at, 0x4000 -/* 95BF40 80240D40 44810000 */ mtc1 $at, $f0 -/* 95BF44 80240D44 C442003C */ lwc1 $f2, 0x3c($v0) -/* 95BF48 80240D48 8C640010 */ lw $a0, 0x10($v1) -/* 95BF4C 80240D4C 8C430000 */ lw $v1, ($v0) -/* 95BF50 80240D50 E444001C */ swc1 $f4, 0x1c($v0) -/* 95BF54 80240D54 E4400014 */ swc1 $f0, 0x14($v0) -/* 95BF58 80240D58 E4420064 */ swc1 $f2, 0x64($v0) -/* 95BF5C 80240D5C 34630800 */ ori $v1, $v1, 0x800 -/* 95BF60 80240D60 AC430000 */ sw $v1, ($v0) -/* 95BF64 80240D64 AC440028 */ sw $a0, 0x28($v0) -/* 95BF68 80240D68 2402000B */ addiu $v0, $zero, 0xb -/* 95BF6C 80240D6C AE220070 */ sw $v0, 0x70($s1) -/* 95BF70 80240D70 8FBF0018 */ lw $ra, 0x18($sp) -/* 95BF74 80240D74 8FB10014 */ lw $s1, 0x14($sp) -/* 95BF78 80240D78 8FB00010 */ lw $s0, 0x10($sp) -/* 95BF7C 80240D7C 03E00008 */ jr $ra -/* 95BF80 80240D80 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s index f451072cc0..675473ab89 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s @@ -157,7 +157,7 @@ glabel func_80241174_95C374 /* 95C5BC 802413BC 00000000 */ nop /* 95C5C0 802413C0 0280202D */ daddu $a0, $s4, $zero /* 95C5C4 802413C4 0260282D */ daddu $a1, $s3, $zero -/* 95C5C8 802413C8 0C090344 */ jal func_80240D10_95BF10 +/* 95C5C8 802413C8 0C090344 */ jal NpcJumpFunc2 /* 95C5CC 802413CC 02A0302D */ daddu $a2, $s5, $zero /* 95C5D0 802413D0 0280202D */ daddu $a0, $s4, $zero /* 95C5D4 802413D4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240770_C9E690.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240770_C9E690.s deleted file mode 100644 index 34112785b0..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240770_C9E690.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240770_C9E690 -/* C9E690 80240770 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C9E694 80240774 AFB10014 */ sw $s1, 0x14($sp) -/* C9E698 80240778 0080882D */ daddu $s1, $a0, $zero -/* C9E69C 8024077C AFBF0018 */ sw $ra, 0x18($sp) -/* C9E6A0 80240780 AFB00010 */ sw $s0, 0x10($sp) -/* C9E6A4 80240784 8E300148 */ lw $s0, 0x148($s1) -/* C9E6A8 80240788 0C00EABB */ jal get_npc_unsafe -/* C9E6AC 8024078C 86040008 */ lh $a0, 8($s0) -/* C9E6B0 80240790 8E0300CC */ lw $v1, 0xcc($s0) -/* C9E6B4 80240794 3C014120 */ lui $at, 0x4120 -/* C9E6B8 80240798 44812000 */ mtc1 $at, $f4 -/* C9E6BC 8024079C 3C014000 */ lui $at, 0x4000 -/* C9E6C0 802407A0 44810000 */ mtc1 $at, $f0 -/* C9E6C4 802407A4 C442003C */ lwc1 $f2, 0x3c($v0) -/* C9E6C8 802407A8 8C640010 */ lw $a0, 0x10($v1) -/* C9E6CC 802407AC 8C430000 */ lw $v1, ($v0) -/* C9E6D0 802407B0 E444001C */ swc1 $f4, 0x1c($v0) -/* C9E6D4 802407B4 E4400014 */ swc1 $f0, 0x14($v0) -/* C9E6D8 802407B8 E4420064 */ swc1 $f2, 0x64($v0) -/* C9E6DC 802407BC 34630800 */ ori $v1, $v1, 0x800 -/* C9E6E0 802407C0 AC430000 */ sw $v1, ($v0) -/* C9E6E4 802407C4 AC440028 */ sw $a0, 0x28($v0) -/* C9E6E8 802407C8 2402000B */ addiu $v0, $zero, 0xb -/* C9E6EC 802407CC AE220070 */ sw $v0, 0x70($s1) -/* C9E6F0 802407D0 8FBF0018 */ lw $ra, 0x18($sp) -/* C9E6F4 802407D4 8FB10014 */ lw $s1, 0x14($sp) -/* C9E6F8 802407D8 8FB00010 */ lw $s0, 0x10($sp) -/* C9E6FC 802407DC 03E00008 */ jr $ra -/* C9E700 802407E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s index f6ff921b84..f5ee25f370 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s @@ -157,7 +157,7 @@ glabel func_80240BD4_C9EAF4 /* C9ED3C 80240E1C 00000000 */ nop /* C9ED40 80240E20 0280202D */ daddu $a0, $s4, $zero /* C9ED44 80240E24 0260282D */ daddu $a1, $s3, $zero -/* C9ED48 80240E28 0C0901DC */ jal func_80240770_C9E690 +/* C9ED48 80240E28 0C0901DC */ jal NpcJumpFunc2 /* C9ED4C 80240E2C 02A0302D */ daddu $a2, $s5, $zero /* C9ED50 80240E30 0280202D */ daddu $a0, $s4, $zero /* C9ED54 80240E34 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240B60_B2CFD0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240B60_B2CFD0.s deleted file mode 100644 index 06ab47a00a..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240B60_B2CFD0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B60_B2CFD0 -/* B2CFD0 80240B60 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2CFD4 80240B64 AFB10014 */ sw $s1, 0x14($sp) -/* B2CFD8 80240B68 0080882D */ daddu $s1, $a0, $zero -/* B2CFDC 80240B6C AFBF0018 */ sw $ra, 0x18($sp) -/* B2CFE0 80240B70 AFB00010 */ sw $s0, 0x10($sp) -/* B2CFE4 80240B74 8E300148 */ lw $s0, 0x148($s1) -/* B2CFE8 80240B78 0C00EABB */ jal get_npc_unsafe -/* B2CFEC 80240B7C 86040008 */ lh $a0, 8($s0) -/* B2CFF0 80240B80 8E0300CC */ lw $v1, 0xcc($s0) -/* B2CFF4 80240B84 3C014120 */ lui $at, 0x4120 -/* B2CFF8 80240B88 44812000 */ mtc1 $at, $f4 -/* B2CFFC 80240B8C 3C014000 */ lui $at, 0x4000 -/* B2D000 80240B90 44810000 */ mtc1 $at, $f0 -/* B2D004 80240B94 C442003C */ lwc1 $f2, 0x3c($v0) -/* B2D008 80240B98 8C640010 */ lw $a0, 0x10($v1) -/* B2D00C 80240B9C 8C430000 */ lw $v1, ($v0) -/* B2D010 80240BA0 E444001C */ swc1 $f4, 0x1c($v0) -/* B2D014 80240BA4 E4400014 */ swc1 $f0, 0x14($v0) -/* B2D018 80240BA8 E4420064 */ swc1 $f2, 0x64($v0) -/* B2D01C 80240BAC 34630800 */ ori $v1, $v1, 0x800 -/* B2D020 80240BB0 AC430000 */ sw $v1, ($v0) -/* B2D024 80240BB4 AC440028 */ sw $a0, 0x28($v0) -/* B2D028 80240BB8 2402000B */ addiu $v0, $zero, 0xb -/* B2D02C 80240BBC AE220070 */ sw $v0, 0x70($s1) -/* B2D030 80240BC0 8FBF0018 */ lw $ra, 0x18($sp) -/* B2D034 80240BC4 8FB10014 */ lw $s1, 0x14($sp) -/* B2D038 80240BC8 8FB00010 */ lw $s0, 0x10($sp) -/* B2D03C 80240BCC 03E00008 */ jr $ra -/* B2D040 80240BD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s index 63a6b2c85f..6576492cd4 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s @@ -157,7 +157,7 @@ glabel func_80240FC4_B2D434 /* B2D67C 8024120C 00000000 */ nop /* B2D680 80241210 0280202D */ daddu $a0, $s4, $zero /* B2D684 80241214 0260282D */ daddu $a1, $s3, $zero -/* B2D688 80241218 0C0902D8 */ jal func_80240B60_B2CFD0 +/* B2D688 80241218 0C0902D8 */ jal NpcJumpFunc2 /* B2D68C 8024121C 02A0302D */ daddu $a2, $s5, $zero /* B2D690 80241220 0280202D */ daddu $a0, $s4, $zero /* B2D694 80241224 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240D50_B35920.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240D50_B35920.s deleted file mode 100644 index 933f2131a5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240D50_B35920.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D50_B35920 -/* B35920 80240D50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B35924 80240D54 AFB10014 */ sw $s1, 0x14($sp) -/* B35928 80240D58 0080882D */ daddu $s1, $a0, $zero -/* B3592C 80240D5C AFBF0018 */ sw $ra, 0x18($sp) -/* B35930 80240D60 AFB00010 */ sw $s0, 0x10($sp) -/* B35934 80240D64 8E300148 */ lw $s0, 0x148($s1) -/* B35938 80240D68 0C00EABB */ jal get_npc_unsafe -/* B3593C 80240D6C 86040008 */ lh $a0, 8($s0) -/* B35940 80240D70 8E0300CC */ lw $v1, 0xcc($s0) -/* B35944 80240D74 3C014120 */ lui $at, 0x4120 -/* B35948 80240D78 44812000 */ mtc1 $at, $f4 -/* B3594C 80240D7C 3C014000 */ lui $at, 0x4000 -/* B35950 80240D80 44810000 */ mtc1 $at, $f0 -/* B35954 80240D84 C442003C */ lwc1 $f2, 0x3c($v0) -/* B35958 80240D88 8C640010 */ lw $a0, 0x10($v1) -/* B3595C 80240D8C 8C430000 */ lw $v1, ($v0) -/* B35960 80240D90 E444001C */ swc1 $f4, 0x1c($v0) -/* B35964 80240D94 E4400014 */ swc1 $f0, 0x14($v0) -/* B35968 80240D98 E4420064 */ swc1 $f2, 0x64($v0) -/* B3596C 80240D9C 34630800 */ ori $v1, $v1, 0x800 -/* B35970 80240DA0 AC430000 */ sw $v1, ($v0) -/* B35974 80240DA4 AC440028 */ sw $a0, 0x28($v0) -/* B35978 80240DA8 2402000B */ addiu $v0, $zero, 0xb -/* B3597C 80240DAC AE220070 */ sw $v0, 0x70($s1) -/* B35980 80240DB0 8FBF0018 */ lw $ra, 0x18($sp) -/* B35984 80240DB4 8FB10014 */ lw $s1, 0x14($sp) -/* B35988 80240DB8 8FB00010 */ lw $s0, 0x10($sp) -/* B3598C 80240DBC 03E00008 */ jr $ra -/* B35990 80240DC0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s index e334fc3112..18d7ebb482 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s @@ -157,7 +157,7 @@ glabel func_802411B4_B35D84 /* B35FCC 802413FC 00000000 */ nop /* B35FD0 80241400 0280202D */ daddu $a0, $s4, $zero /* B35FD4 80241404 0260282D */ daddu $a1, $s3, $zero -/* B35FD8 80241408 0C090354 */ jal func_80240D50_B35920 +/* B35FD8 80241408 0C090354 */ jal NpcJumpFunc2 /* B35FDC 8024140C 02A0302D */ daddu $a2, $s5, $zero /* B35FE0 80241410 0280202D */ daddu $a0, $s4, $zero /* B35FE4 80241414 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240730_B848B0.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240730_B848B0.s deleted file mode 100644 index c2cf13da92..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240730_B848B0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_B848B0 -/* B848B0 80240730 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B848B4 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* B848B8 80240738 0080882D */ daddu $s1, $a0, $zero -/* B848BC 8024073C AFBF0018 */ sw $ra, 0x18($sp) -/* B848C0 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* B848C4 80240744 8E300148 */ lw $s0, 0x148($s1) -/* B848C8 80240748 0C00EABB */ jal get_npc_unsafe -/* B848CC 8024074C 86040008 */ lh $a0, 8($s0) -/* B848D0 80240750 8E0300CC */ lw $v1, 0xcc($s0) -/* B848D4 80240754 3C014120 */ lui $at, 0x4120 -/* B848D8 80240758 44812000 */ mtc1 $at, $f4 -/* B848DC 8024075C 3C014000 */ lui $at, 0x4000 -/* B848E0 80240760 44810000 */ mtc1 $at, $f0 -/* B848E4 80240764 C442003C */ lwc1 $f2, 0x3c($v0) -/* B848E8 80240768 8C640010 */ lw $a0, 0x10($v1) -/* B848EC 8024076C 8C430000 */ lw $v1, ($v0) -/* B848F0 80240770 E444001C */ swc1 $f4, 0x1c($v0) -/* B848F4 80240774 E4400014 */ swc1 $f0, 0x14($v0) -/* B848F8 80240778 E4420064 */ swc1 $f2, 0x64($v0) -/* B848FC 8024077C 34630800 */ ori $v1, $v1, 0x800 -/* B84900 80240780 AC430000 */ sw $v1, ($v0) -/* B84904 80240784 AC440028 */ sw $a0, 0x28($v0) -/* B84908 80240788 2402000B */ addiu $v0, $zero, 0xb -/* B8490C 8024078C AE220070 */ sw $v0, 0x70($s1) -/* B84910 80240790 8FBF0018 */ lw $ra, 0x18($sp) -/* B84914 80240794 8FB10014 */ lw $s1, 0x14($sp) -/* B84918 80240798 8FB00010 */ lw $s0, 0x10($sp) -/* B8491C 8024079C 03E00008 */ jr $ra -/* B84920 802407A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s index 160eaf364e..a40a992616 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s @@ -157,7 +157,7 @@ glabel func_80240B94_B84D14 /* B84F5C 80240DDC 00000000 */ nop /* B84F60 80240DE0 0280202D */ daddu $a0, $s4, $zero /* B84F64 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* B84F68 80240DE8 0C0901CC */ jal func_80240730_B848B0 +/* B84F68 80240DE8 0C0901CC */ jal NpcJumpFunc2 /* B84F6C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* B84F70 80240DF0 0280202D */ daddu $a0, $s4, $zero /* B84F74 80240DF4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802407E0_ABBA70.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802407E0_ABBA70.s deleted file mode 100644 index 553059a511..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802407E0_ABBA70.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407E0_ABBA70 -/* ABBA70 802407E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* ABBA74 802407E4 AFB10014 */ sw $s1, 0x14($sp) -/* ABBA78 802407E8 0080882D */ daddu $s1, $a0, $zero -/* ABBA7C 802407EC AFBF0018 */ sw $ra, 0x18($sp) -/* ABBA80 802407F0 AFB00010 */ sw $s0, 0x10($sp) -/* ABBA84 802407F4 8E300148 */ lw $s0, 0x148($s1) -/* ABBA88 802407F8 0C00EABB */ jal get_npc_unsafe -/* ABBA8C 802407FC 86040008 */ lh $a0, 8($s0) -/* ABBA90 80240800 8E0300CC */ lw $v1, 0xcc($s0) -/* ABBA94 80240804 3C014120 */ lui $at, 0x4120 -/* ABBA98 80240808 44812000 */ mtc1 $at, $f4 -/* ABBA9C 8024080C 3C014000 */ lui $at, 0x4000 -/* ABBAA0 80240810 44810000 */ mtc1 $at, $f0 -/* ABBAA4 80240814 C442003C */ lwc1 $f2, 0x3c($v0) -/* ABBAA8 80240818 8C640010 */ lw $a0, 0x10($v1) -/* ABBAAC 8024081C 8C430000 */ lw $v1, ($v0) -/* ABBAB0 80240820 E444001C */ swc1 $f4, 0x1c($v0) -/* ABBAB4 80240824 E4400014 */ swc1 $f0, 0x14($v0) -/* ABBAB8 80240828 E4420064 */ swc1 $f2, 0x64($v0) -/* ABBABC 8024082C 34630800 */ ori $v1, $v1, 0x800 -/* ABBAC0 80240830 AC430000 */ sw $v1, ($v0) -/* ABBAC4 80240834 AC440028 */ sw $a0, 0x28($v0) -/* ABBAC8 80240838 2402000B */ addiu $v0, $zero, 0xb -/* ABBACC 8024083C AE220070 */ sw $v0, 0x70($s1) -/* ABBAD0 80240840 8FBF0018 */ lw $ra, 0x18($sp) -/* ABBAD4 80240844 8FB10014 */ lw $s1, 0x14($sp) -/* ABBAD8 80240848 8FB00010 */ lw $s0, 0x10($sp) -/* ABBADC 8024084C 03E00008 */ jr $ra -/* ABBAE0 80240850 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s index 472181ac41..ec8a97c57a 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s @@ -157,7 +157,7 @@ glabel func_80240C44_ABBED4 /* ABC11C 80240E8C 00000000 */ nop /* ABC120 80240E90 0280202D */ daddu $a0, $s4, $zero /* ABC124 80240E94 0260282D */ daddu $a1, $s3, $zero -/* ABC128 80240E98 0C0901F8 */ jal func_802407E0_ABBA70 +/* ABC128 80240E98 0C0901F8 */ jal NpcJumpFunc2 /* ABC12C 80240E9C 02A0302D */ daddu $a2, $s5, $zero /* ABC130 80240EA0 0280202D */ daddu $a0, $s4, $zero /* ABC134 80240EA4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240730_AC58A0.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240730_AC58A0.s deleted file mode 100644 index 1dc7f17fb8..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240730_AC58A0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_AC58A0 -/* AC58A0 80240730 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AC58A4 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* AC58A8 80240738 0080882D */ daddu $s1, $a0, $zero -/* AC58AC 8024073C AFBF0018 */ sw $ra, 0x18($sp) -/* AC58B0 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* AC58B4 80240744 8E300148 */ lw $s0, 0x148($s1) -/* AC58B8 80240748 0C00EABB */ jal get_npc_unsafe -/* AC58BC 8024074C 86040008 */ lh $a0, 8($s0) -/* AC58C0 80240750 8E0300CC */ lw $v1, 0xcc($s0) -/* AC58C4 80240754 3C014120 */ lui $at, 0x4120 -/* AC58C8 80240758 44812000 */ mtc1 $at, $f4 -/* AC58CC 8024075C 3C014000 */ lui $at, 0x4000 -/* AC58D0 80240760 44810000 */ mtc1 $at, $f0 -/* AC58D4 80240764 C442003C */ lwc1 $f2, 0x3c($v0) -/* AC58D8 80240768 8C640010 */ lw $a0, 0x10($v1) -/* AC58DC 8024076C 8C430000 */ lw $v1, ($v0) -/* AC58E0 80240770 E444001C */ swc1 $f4, 0x1c($v0) -/* AC58E4 80240774 E4400014 */ swc1 $f0, 0x14($v0) -/* AC58E8 80240778 E4420064 */ swc1 $f2, 0x64($v0) -/* AC58EC 8024077C 34630800 */ ori $v1, $v1, 0x800 -/* AC58F0 80240780 AC430000 */ sw $v1, ($v0) -/* AC58F4 80240784 AC440028 */ sw $a0, 0x28($v0) -/* AC58F8 80240788 2402000B */ addiu $v0, $zero, 0xb -/* AC58FC 8024078C AE220070 */ sw $v0, 0x70($s1) -/* AC5900 80240790 8FBF0018 */ lw $ra, 0x18($sp) -/* AC5904 80240794 8FB10014 */ lw $s1, 0x14($sp) -/* AC5908 80240798 8FB00010 */ lw $s0, 0x10($sp) -/* AC590C 8024079C 03E00008 */ jr $ra -/* AC5910 802407A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s index 62da46c41a..6837052c56 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s +++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s @@ -157,7 +157,7 @@ glabel func_80240B94_AC5D04 /* AC5F4C 80240DDC 00000000 */ nop /* AC5F50 80240DE0 0280202D */ daddu $a0, $s4, $zero /* AC5F54 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* AC5F58 80240DE8 0C0901CC */ jal func_80240730_AC58A0 +/* AC5F58 80240DE8 0C0901CC */ jal NpcJumpFunc2 /* AC5F5C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* AC5F60 80240DF0 0280202D */ daddu $a0, $s4, $zero /* AC5F64 80240DF4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240730_A87180.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240730_A87180.s deleted file mode 100644 index 12d8e07ec4..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240730_A87180.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_A87180 -/* A87180 80240730 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A87184 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* A87188 80240738 0080882D */ daddu $s1, $a0, $zero -/* A8718C 8024073C AFBF0018 */ sw $ra, 0x18($sp) -/* A87190 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* A87194 80240744 8E300148 */ lw $s0, 0x148($s1) -/* A87198 80240748 0C00EABB */ jal get_npc_unsafe -/* A8719C 8024074C 86040008 */ lh $a0, 8($s0) -/* A871A0 80240750 8E0300CC */ lw $v1, 0xcc($s0) -/* A871A4 80240754 3C014120 */ lui $at, 0x4120 -/* A871A8 80240758 44812000 */ mtc1 $at, $f4 -/* A871AC 8024075C 3C014000 */ lui $at, 0x4000 -/* A871B0 80240760 44810000 */ mtc1 $at, $f0 -/* A871B4 80240764 C442003C */ lwc1 $f2, 0x3c($v0) -/* A871B8 80240768 8C640010 */ lw $a0, 0x10($v1) -/* A871BC 8024076C 8C430000 */ lw $v1, ($v0) -/* A871C0 80240770 E444001C */ swc1 $f4, 0x1c($v0) -/* A871C4 80240774 E4400014 */ swc1 $f0, 0x14($v0) -/* A871C8 80240778 E4420064 */ swc1 $f2, 0x64($v0) -/* A871CC 8024077C 34630800 */ ori $v1, $v1, 0x800 -/* A871D0 80240780 AC430000 */ sw $v1, ($v0) -/* A871D4 80240784 AC440028 */ sw $a0, 0x28($v0) -/* A871D8 80240788 2402000B */ addiu $v0, $zero, 0xb -/* A871DC 8024078C AE220070 */ sw $v0, 0x70($s1) -/* A871E0 80240790 8FBF0018 */ lw $ra, 0x18($sp) -/* A871E4 80240794 8FB10014 */ lw $s1, 0x14($sp) -/* A871E8 80240798 8FB00010 */ lw $s0, 0x10($sp) -/* A871EC 8024079C 03E00008 */ jr $ra -/* A871F0 802407A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s index 62f45c550f..5ca26d0a86 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s @@ -157,7 +157,7 @@ glabel func_80240B94_A875E4 /* A8782C 80240DDC 00000000 */ nop /* A87830 80240DE0 0280202D */ daddu $a0, $s4, $zero /* A87834 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* A87838 80240DE8 0C0901CC */ jal func_80240730_A87180 +/* A87838 80240DE8 0C0901CC */ jal NpcJumpFunc2 /* A8783C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* A87840 80240DF0 0280202D */ daddu $a0, $s4, $zero /* A87844 80240DF4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240810_A8D290.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240810_A8D290.s deleted file mode 100644 index 4ed38b4923..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240810_A8D290.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240810_A8D290 -/* A8D290 80240810 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A8D294 80240814 AFB10014 */ sw $s1, 0x14($sp) -/* A8D298 80240818 0080882D */ daddu $s1, $a0, $zero -/* A8D29C 8024081C AFBF0018 */ sw $ra, 0x18($sp) -/* A8D2A0 80240820 AFB00010 */ sw $s0, 0x10($sp) -/* A8D2A4 80240824 8E300148 */ lw $s0, 0x148($s1) -/* A8D2A8 80240828 0C00EABB */ jal get_npc_unsafe -/* A8D2AC 8024082C 86040008 */ lh $a0, 8($s0) -/* A8D2B0 80240830 8E0300CC */ lw $v1, 0xcc($s0) -/* A8D2B4 80240834 3C014120 */ lui $at, 0x4120 -/* A8D2B8 80240838 44812000 */ mtc1 $at, $f4 -/* A8D2BC 8024083C 3C014000 */ lui $at, 0x4000 -/* A8D2C0 80240840 44810000 */ mtc1 $at, $f0 -/* A8D2C4 80240844 C442003C */ lwc1 $f2, 0x3c($v0) -/* A8D2C8 80240848 8C640010 */ lw $a0, 0x10($v1) -/* A8D2CC 8024084C 8C430000 */ lw $v1, ($v0) -/* A8D2D0 80240850 E444001C */ swc1 $f4, 0x1c($v0) -/* A8D2D4 80240854 E4400014 */ swc1 $f0, 0x14($v0) -/* A8D2D8 80240858 E4420064 */ swc1 $f2, 0x64($v0) -/* A8D2DC 8024085C 34630800 */ ori $v1, $v1, 0x800 -/* A8D2E0 80240860 AC430000 */ sw $v1, ($v0) -/* A8D2E4 80240864 AC440028 */ sw $a0, 0x28($v0) -/* A8D2E8 80240868 2402000B */ addiu $v0, $zero, 0xb -/* A8D2EC 8024086C AE220070 */ sw $v0, 0x70($s1) -/* A8D2F0 80240870 8FBF0018 */ lw $ra, 0x18($sp) -/* A8D2F4 80240874 8FB10014 */ lw $s1, 0x14($sp) -/* A8D2F8 80240878 8FB00010 */ lw $s0, 0x10($sp) -/* A8D2FC 8024087C 03E00008 */ jr $ra -/* A8D300 80240880 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s index 68375b9d2c..aff86105af 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s @@ -157,7 +157,7 @@ glabel func_80240C74_A8D6F4 /* A8D93C 80240EBC 00000000 */ nop /* A8D940 80240EC0 0280202D */ daddu $a0, $s4, $zero /* A8D944 80240EC4 0260282D */ daddu $a1, $s3, $zero -/* A8D948 80240EC8 0C090204 */ jal func_80240810_A8D290 +/* A8D948 80240EC8 0C090204 */ jal NpcJumpFunc2 /* A8D94C 80240ECC 02A0302D */ daddu $a2, $s5, $zero /* A8D950 80240ED0 0280202D */ daddu $a0, $s4, $zero /* A8D954 80240ED4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242CA0_7ED9B0.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242CA0_7ED9B0.s deleted file mode 100644 index 242b8a3e0d..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242CA0_7ED9B0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242CA0_7ED9B0 -/* 7ED9B0 80242CA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7ED9B4 80242CA4 AFB10014 */ sw $s1, 0x14($sp) -/* 7ED9B8 80242CA8 0080882D */ daddu $s1, $a0, $zero -/* 7ED9BC 80242CAC AFBF0018 */ sw $ra, 0x18($sp) -/* 7ED9C0 80242CB0 AFB00010 */ sw $s0, 0x10($sp) -/* 7ED9C4 80242CB4 8E300148 */ lw $s0, 0x148($s1) -/* 7ED9C8 80242CB8 0C00EABB */ jal get_npc_unsafe -/* 7ED9CC 80242CBC 86040008 */ lh $a0, 8($s0) -/* 7ED9D0 80242CC0 8E0300CC */ lw $v1, 0xcc($s0) -/* 7ED9D4 80242CC4 3C014120 */ lui $at, 0x4120 -/* 7ED9D8 80242CC8 44812000 */ mtc1 $at, $f4 -/* 7ED9DC 80242CCC 3C014000 */ lui $at, 0x4000 -/* 7ED9E0 80242CD0 44810000 */ mtc1 $at, $f0 -/* 7ED9E4 80242CD4 C442003C */ lwc1 $f2, 0x3c($v0) -/* 7ED9E8 80242CD8 8C640010 */ lw $a0, 0x10($v1) -/* 7ED9EC 80242CDC 8C430000 */ lw $v1, ($v0) -/* 7ED9F0 80242CE0 E444001C */ swc1 $f4, 0x1c($v0) -/* 7ED9F4 80242CE4 E4400014 */ swc1 $f0, 0x14($v0) -/* 7ED9F8 80242CE8 E4420064 */ swc1 $f2, 0x64($v0) -/* 7ED9FC 80242CEC 34630800 */ ori $v1, $v1, 0x800 -/* 7EDA00 80242CF0 AC430000 */ sw $v1, ($v0) -/* 7EDA04 80242CF4 AC440028 */ sw $a0, 0x28($v0) -/* 7EDA08 80242CF8 2402000B */ addiu $v0, $zero, 0xb -/* 7EDA0C 80242CFC AE220070 */ sw $v0, 0x70($s1) -/* 7EDA10 80242D00 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EDA14 80242D04 8FB10014 */ lw $s1, 0x14($sp) -/* 7EDA18 80242D08 8FB00010 */ lw $s0, 0x10($sp) -/* 7EDA1C 80242D0C 03E00008 */ jr $ra -/* 7EDA20 80242D10 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s index 158008b2c8..53143d88e3 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s @@ -157,7 +157,7 @@ glabel func_80243104_7EDE14 /* 7EE05C 8024334C 00000000 */ nop /* 7EE060 80243350 0280202D */ daddu $a0, $s4, $zero /* 7EE064 80243354 0260282D */ daddu $a1, $s3, $zero -/* 7EE068 80243358 0C090B28 */ jal func_80242CA0_7ED9B0 +/* 7EE068 80243358 0C090B28 */ jal NpcJumpFunc2 /* 7EE06C 8024335C 02A0302D */ daddu $a2, $s5, $zero /* 7EE070 80243360 0280202D */ daddu $a0, $s4, $zero /* 7EE074 80243364 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802417B0_802030.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802417B0_802030.s deleted file mode 100644 index ff679d7876..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802417B0_802030.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417B0_802030 -/* 802030 802417B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 802034 802417B4 AFB10014 */ sw $s1, 0x14($sp) -/* 802038 802417B8 0080882D */ daddu $s1, $a0, $zero -/* 80203C 802417BC AFBF0018 */ sw $ra, 0x18($sp) -/* 802040 802417C0 AFB00010 */ sw $s0, 0x10($sp) -/* 802044 802417C4 8E300148 */ lw $s0, 0x148($s1) -/* 802048 802417C8 0C00EABB */ jal get_npc_unsafe -/* 80204C 802417CC 86040008 */ lh $a0, 8($s0) -/* 802050 802417D0 8E0300CC */ lw $v1, 0xcc($s0) -/* 802054 802417D4 3C014120 */ lui $at, 0x4120 -/* 802058 802417D8 44812000 */ mtc1 $at, $f4 -/* 80205C 802417DC 3C014000 */ lui $at, 0x4000 -/* 802060 802417E0 44810000 */ mtc1 $at, $f0 -/* 802064 802417E4 C442003C */ lwc1 $f2, 0x3c($v0) -/* 802068 802417E8 8C640010 */ lw $a0, 0x10($v1) -/* 80206C 802417EC 8C430000 */ lw $v1, ($v0) -/* 802070 802417F0 E444001C */ swc1 $f4, 0x1c($v0) -/* 802074 802417F4 E4400014 */ swc1 $f0, 0x14($v0) -/* 802078 802417F8 E4420064 */ swc1 $f2, 0x64($v0) -/* 80207C 802417FC 34630800 */ ori $v1, $v1, 0x800 -/* 802080 80241800 AC430000 */ sw $v1, ($v0) -/* 802084 80241804 AC440028 */ sw $a0, 0x28($v0) -/* 802088 80241808 2402000B */ addiu $v0, $zero, 0xb -/* 80208C 8024180C AE220070 */ sw $v0, 0x70($s1) -/* 802090 80241810 8FBF0018 */ lw $ra, 0x18($sp) -/* 802094 80241814 8FB10014 */ lw $s1, 0x14($sp) -/* 802098 80241818 8FB00010 */ lw $s0, 0x10($sp) -/* 80209C 8024181C 03E00008 */ jr $ra -/* 8020A0 80241820 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s index dc32f65969..e5a9771162 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s @@ -157,7 +157,7 @@ glabel func_80241C14_802494 /* 8026DC 80241E5C 00000000 */ nop /* 8026E0 80241E60 0280202D */ daddu $a0, $s4, $zero /* 8026E4 80241E64 0260282D */ daddu $a1, $s3, $zero -/* 8026E8 80241E68 0C0905EC */ jal func_802417B0_802030 +/* 8026E8 80241E68 0C0905EC */ jal NpcJumpFunc2 /* 8026EC 80241E6C 02A0302D */ daddu $a2, $s5, $zero /* 8026F0 80241E70 0280202D */ daddu $a0, $s4, $zero /* 8026F4 80241E74 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245C80_806500.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245C80_806500.s deleted file mode 100644 index 8ad4bafcaf..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245C80_806500.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245C80_806500 -/* 806500 80245C80 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 806504 80245C84 AFB10014 */ sw $s1, 0x14($sp) -/* 806508 80245C88 0080882D */ daddu $s1, $a0, $zero -/* 80650C 80245C8C AFBF0018 */ sw $ra, 0x18($sp) -/* 806510 80245C90 AFB00010 */ sw $s0, 0x10($sp) -/* 806514 80245C94 8E300148 */ lw $s0, 0x148($s1) -/* 806518 80245C98 0C00EABB */ jal get_npc_unsafe -/* 80651C 80245C9C 86040008 */ lh $a0, 8($s0) -/* 806520 80245CA0 8E0300CC */ lw $v1, 0xcc($s0) -/* 806524 80245CA4 3C014120 */ lui $at, 0x4120 -/* 806528 80245CA8 44812000 */ mtc1 $at, $f4 -/* 80652C 80245CAC 3C014000 */ lui $at, 0x4000 -/* 806530 80245CB0 44810000 */ mtc1 $at, $f0 -/* 806534 80245CB4 C442003C */ lwc1 $f2, 0x3c($v0) -/* 806538 80245CB8 8C640010 */ lw $a0, 0x10($v1) -/* 80653C 80245CBC 8C430000 */ lw $v1, ($v0) -/* 806540 80245CC0 E444001C */ swc1 $f4, 0x1c($v0) -/* 806544 80245CC4 E4400014 */ swc1 $f0, 0x14($v0) -/* 806548 80245CC8 E4420064 */ swc1 $f2, 0x64($v0) -/* 80654C 80245CCC 34630800 */ ori $v1, $v1, 0x800 -/* 806550 80245CD0 AC430000 */ sw $v1, ($v0) -/* 806554 80245CD4 AC440028 */ sw $a0, 0x28($v0) -/* 806558 80245CD8 2402000B */ addiu $v0, $zero, 0xb -/* 80655C 80245CDC AE220070 */ sw $v0, 0x70($s1) -/* 806560 80245CE0 8FBF0018 */ lw $ra, 0x18($sp) -/* 806564 80245CE4 8FB10014 */ lw $s1, 0x14($sp) -/* 806568 80245CE8 8FB00010 */ lw $s0, 0x10($sp) -/* 80656C 80245CEC 03E00008 */ jr $ra -/* 806570 80245CF0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s index d0a821bdd7..907bf895e9 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s @@ -157,7 +157,7 @@ glabel func_802460E4_806964 /* 806BAC 8024632C 00000000 */ nop /* 806BB0 80246330 0280202D */ daddu $a0, $s4, $zero /* 806BB4 80246334 0260282D */ daddu $a1, $s3, $zero -/* 806BB8 80246338 0C091720 */ jal func_80245C80_806500 +/* 806BB8 80246338 0C091720 */ jal NpcJumpFunc2 /* 806BBC 8024633C 02A0302D */ daddu $a2, $s5, $zero /* 806BC0 80246340 0280202D */ daddu $a0, $s4, $zero /* 806BC4 80246344 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241060_824320.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241060_824320.s deleted file mode 100644 index 13af817cd2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241060_824320.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241060_824320 -/* 824320 80241060 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 824324 80241064 AFB10014 */ sw $s1, 0x14($sp) -/* 824328 80241068 0080882D */ daddu $s1, $a0, $zero -/* 82432C 8024106C AFBF0018 */ sw $ra, 0x18($sp) -/* 824330 80241070 AFB00010 */ sw $s0, 0x10($sp) -/* 824334 80241074 8E300148 */ lw $s0, 0x148($s1) -/* 824338 80241078 0C00EABB */ jal get_npc_unsafe -/* 82433C 8024107C 86040008 */ lh $a0, 8($s0) -/* 824340 80241080 8E0300CC */ lw $v1, 0xcc($s0) -/* 824344 80241084 3C014120 */ lui $at, 0x4120 -/* 824348 80241088 44812000 */ mtc1 $at, $f4 -/* 82434C 8024108C 3C014000 */ lui $at, 0x4000 -/* 824350 80241090 44810000 */ mtc1 $at, $f0 -/* 824354 80241094 C442003C */ lwc1 $f2, 0x3c($v0) -/* 824358 80241098 8C640010 */ lw $a0, 0x10($v1) -/* 82435C 8024109C 8C430000 */ lw $v1, ($v0) -/* 824360 802410A0 E444001C */ swc1 $f4, 0x1c($v0) -/* 824364 802410A4 E4400014 */ swc1 $f0, 0x14($v0) -/* 824368 802410A8 E4420064 */ swc1 $f2, 0x64($v0) -/* 82436C 802410AC 34630800 */ ori $v1, $v1, 0x800 -/* 824370 802410B0 AC430000 */ sw $v1, ($v0) -/* 824374 802410B4 AC440028 */ sw $a0, 0x28($v0) -/* 824378 802410B8 2402000B */ addiu $v0, $zero, 0xb -/* 82437C 802410BC AE220070 */ sw $v0, 0x70($s1) -/* 824380 802410C0 8FBF0018 */ lw $ra, 0x18($sp) -/* 824384 802410C4 8FB10014 */ lw $s1, 0x14($sp) -/* 824388 802410C8 8FB00010 */ lw $s0, 0x10($sp) -/* 82438C 802410CC 03E00008 */ jr $ra -/* 824390 802410D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s index 0fe1a19c71..040b3e162f 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s @@ -157,7 +157,7 @@ glabel func_802414C4_824784 /* 8249CC 8024170C 00000000 */ nop /* 8249D0 80241710 0280202D */ daddu $a0, $s4, $zero /* 8249D4 80241714 0260282D */ daddu $a1, $s3, $zero -/* 8249D8 80241718 0C090418 */ jal func_80241060_824320 +/* 8249D8 80241718 0C090418 */ jal NpcJumpFunc2 /* 8249DC 8024171C 02A0302D */ daddu $a2, $s5, $zero /* 8249E0 80241720 0280202D */ daddu $a0, $s4, $zero /* 8249E4 80241724 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240BC0_852D30.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240BC0_852D30.s deleted file mode 100644 index 97c6a5e257..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240BC0_852D30.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BC0_852D30 -/* 852D30 80240BC0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 852D34 80240BC4 AFB10014 */ sw $s1, 0x14($sp) -/* 852D38 80240BC8 0080882D */ daddu $s1, $a0, $zero -/* 852D3C 80240BCC AFBF0018 */ sw $ra, 0x18($sp) -/* 852D40 80240BD0 AFB00010 */ sw $s0, 0x10($sp) -/* 852D44 80240BD4 8E300148 */ lw $s0, 0x148($s1) -/* 852D48 80240BD8 0C00EABB */ jal get_npc_unsafe -/* 852D4C 80240BDC 86040008 */ lh $a0, 8($s0) -/* 852D50 80240BE0 8E0300CC */ lw $v1, 0xcc($s0) -/* 852D54 80240BE4 3C014120 */ lui $at, 0x4120 -/* 852D58 80240BE8 44812000 */ mtc1 $at, $f4 -/* 852D5C 80240BEC 3C014000 */ lui $at, 0x4000 -/* 852D60 80240BF0 44810000 */ mtc1 $at, $f0 -/* 852D64 80240BF4 C442003C */ lwc1 $f2, 0x3c($v0) -/* 852D68 80240BF8 8C640010 */ lw $a0, 0x10($v1) -/* 852D6C 80240BFC 8C430000 */ lw $v1, ($v0) -/* 852D70 80240C00 E444001C */ swc1 $f4, 0x1c($v0) -/* 852D74 80240C04 E4400014 */ swc1 $f0, 0x14($v0) -/* 852D78 80240C08 E4420064 */ swc1 $f2, 0x64($v0) -/* 852D7C 80240C0C 34630800 */ ori $v1, $v1, 0x800 -/* 852D80 80240C10 AC430000 */ sw $v1, ($v0) -/* 852D84 80240C14 AC440028 */ sw $a0, 0x28($v0) -/* 852D88 80240C18 2402000B */ addiu $v0, $zero, 0xb -/* 852D8C 80240C1C AE220070 */ sw $v0, 0x70($s1) -/* 852D90 80240C20 8FBF0018 */ lw $ra, 0x18($sp) -/* 852D94 80240C24 8FB10014 */ lw $s1, 0x14($sp) -/* 852D98 80240C28 8FB00010 */ lw $s0, 0x10($sp) -/* 852D9C 80240C2C 03E00008 */ jr $ra -/* 852DA0 80240C30 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s index 1390f79e7e..c5318742a6 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s @@ -157,7 +157,7 @@ glabel func_80241024_853194 /* 8533DC 8024126C 00000000 */ nop /* 8533E0 80241270 0280202D */ daddu $a0, $s4, $zero /* 8533E4 80241274 0260282D */ daddu $a1, $s3, $zero -/* 8533E8 80241278 0C0902F0 */ jal func_80240BC0_852D30 +/* 8533E8 80241278 0C0902F0 */ jal NpcJumpFunc2 /* 8533EC 8024127C 02A0302D */ daddu $a2, $s5, $zero /* 8533F0 80241280 0280202D */ daddu $a0, $s4, $zero /* 8533F4 80241284 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240A10_E0F1B0.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240A10_E0F1B0.s deleted file mode 100644 index ddfa46214b..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240A10_E0F1B0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A10_E0F1B0 -/* E0F1B0 80240A10 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E0F1B4 80240A14 AFB10014 */ sw $s1, 0x14($sp) -/* E0F1B8 80240A18 0080882D */ daddu $s1, $a0, $zero -/* E0F1BC 80240A1C AFBF0018 */ sw $ra, 0x18($sp) -/* E0F1C0 80240A20 AFB00010 */ sw $s0, 0x10($sp) -/* E0F1C4 80240A24 8E300148 */ lw $s0, 0x148($s1) -/* E0F1C8 80240A28 0C00EABB */ jal get_npc_unsafe -/* E0F1CC 80240A2C 86040008 */ lh $a0, 8($s0) -/* E0F1D0 80240A30 8E0300CC */ lw $v1, 0xcc($s0) -/* E0F1D4 80240A34 3C014120 */ lui $at, 0x4120 -/* E0F1D8 80240A38 44812000 */ mtc1 $at, $f4 -/* E0F1DC 80240A3C 3C014000 */ lui $at, 0x4000 -/* E0F1E0 80240A40 44810000 */ mtc1 $at, $f0 -/* E0F1E4 80240A44 C442003C */ lwc1 $f2, 0x3c($v0) -/* E0F1E8 80240A48 8C640010 */ lw $a0, 0x10($v1) -/* E0F1EC 80240A4C 8C430000 */ lw $v1, ($v0) -/* E0F1F0 80240A50 E444001C */ swc1 $f4, 0x1c($v0) -/* E0F1F4 80240A54 E4400014 */ swc1 $f0, 0x14($v0) -/* E0F1F8 80240A58 E4420064 */ swc1 $f2, 0x64($v0) -/* E0F1FC 80240A5C 34630800 */ ori $v1, $v1, 0x800 -/* E0F200 80240A60 AC430000 */ sw $v1, ($v0) -/* E0F204 80240A64 AC440028 */ sw $a0, 0x28($v0) -/* E0F208 80240A68 2402000B */ addiu $v0, $zero, 0xb -/* E0F20C 80240A6C AE220070 */ sw $v0, 0x70($s1) -/* E0F210 80240A70 8FBF0018 */ lw $ra, 0x18($sp) -/* E0F214 80240A74 8FB10014 */ lw $s1, 0x14($sp) -/* E0F218 80240A78 8FB00010 */ lw $s0, 0x10($sp) -/* E0F21C 80240A7C 03E00008 */ jr $ra -/* E0F220 80240A80 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s index ddf4f0e9e7..458f9e6414 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s @@ -157,7 +157,7 @@ glabel func_80240E74_E0F614 /* E0F85C 802410BC 00000000 */ nop /* E0F860 802410C0 0280202D */ daddu $a0, $s4, $zero /* E0F864 802410C4 0260282D */ daddu $a1, $s3, $zero -/* E0F868 802410C8 0C090284 */ jal func_80240A10_E0F1B0 +/* E0F868 802410C8 0C090284 */ jal NpcJumpFunc2 /* E0F86C 802410CC 02A0302D */ daddu $a2, $s5, $zero /* E0F870 802410D0 0280202D */ daddu $a0, $s4, $zero /* E0F874 802410D4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802411B0_9D81D0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802411B0_9D81D0.s deleted file mode 100644 index 03c15f84de..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802411B0_9D81D0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411B0_9D81D0 -/* 9D81D0 802411B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D81D4 802411B4 AFB10014 */ sw $s1, 0x14($sp) -/* 9D81D8 802411B8 0080882D */ daddu $s1, $a0, $zero -/* 9D81DC 802411BC AFBF0018 */ sw $ra, 0x18($sp) -/* 9D81E0 802411C0 AFB00010 */ sw $s0, 0x10($sp) -/* 9D81E4 802411C4 8E300148 */ lw $s0, 0x148($s1) -/* 9D81E8 802411C8 0C00EABB */ jal get_npc_unsafe -/* 9D81EC 802411CC 86040008 */ lh $a0, 8($s0) -/* 9D81F0 802411D0 8E0300CC */ lw $v1, 0xcc($s0) -/* 9D81F4 802411D4 3C014120 */ lui $at, 0x4120 -/* 9D81F8 802411D8 44812000 */ mtc1 $at, $f4 -/* 9D81FC 802411DC 3C014000 */ lui $at, 0x4000 -/* 9D8200 802411E0 44810000 */ mtc1 $at, $f0 -/* 9D8204 802411E4 C442003C */ lwc1 $f2, 0x3c($v0) -/* 9D8208 802411E8 8C640010 */ lw $a0, 0x10($v1) -/* 9D820C 802411EC 8C430000 */ lw $v1, ($v0) -/* 9D8210 802411F0 E444001C */ swc1 $f4, 0x1c($v0) -/* 9D8214 802411F4 E4400014 */ swc1 $f0, 0x14($v0) -/* 9D8218 802411F8 E4420064 */ swc1 $f2, 0x64($v0) -/* 9D821C 802411FC 34630800 */ ori $v1, $v1, 0x800 -/* 9D8220 80241200 AC430000 */ sw $v1, ($v0) -/* 9D8224 80241204 AC440028 */ sw $a0, 0x28($v0) -/* 9D8228 80241208 2402000B */ addiu $v0, $zero, 0xb -/* 9D822C 8024120C AE220070 */ sw $v0, 0x70($s1) -/* 9D8230 80241210 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D8234 80241214 8FB10014 */ lw $s1, 0x14($sp) -/* 9D8238 80241218 8FB00010 */ lw $s0, 0x10($sp) -/* 9D823C 8024121C 03E00008 */ jr $ra -/* 9D8240 80241220 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s index 95780227eb..d0e173f86b 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s @@ -157,7 +157,7 @@ glabel func_80241614_9D8634 /* 9D887C 8024185C 00000000 */ nop /* 9D8880 80241860 0280202D */ daddu $a0, $s4, $zero /* 9D8884 80241864 0260282D */ daddu $a1, $s3, $zero -/* 9D8888 80241868 0C09046C */ jal func_802411B0_9D81D0 +/* 9D8888 80241868 0C09046C */ jal NpcJumpFunc2 /* 9D888C 8024186C 02A0302D */ daddu $a2, $s5, $zero /* 9D8890 80241870 0280202D */ daddu $a0, $s4, $zero /* 9D8894 80241874 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241474_9FBC64.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241474_9FBC64.s deleted file mode 100644 index b746d2b8cc..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241474_9FBC64.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241474_9FBC64 -/* 9FBC64 80241474 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9FBC68 80241478 AFB10014 */ sw $s1, 0x14($sp) -/* 9FBC6C 8024147C 0080882D */ daddu $s1, $a0, $zero -/* 9FBC70 80241480 AFBF0018 */ sw $ra, 0x18($sp) -/* 9FBC74 80241484 AFB00010 */ sw $s0, 0x10($sp) -/* 9FBC78 80241488 8E300148 */ lw $s0, 0x148($s1) -/* 9FBC7C 8024148C 0C00EABB */ jal get_npc_unsafe -/* 9FBC80 80241490 86040008 */ lh $a0, 8($s0) -/* 9FBC84 80241494 8E0300CC */ lw $v1, 0xcc($s0) -/* 9FBC88 80241498 3C014120 */ lui $at, 0x4120 -/* 9FBC8C 8024149C 44812000 */ mtc1 $at, $f4 -/* 9FBC90 802414A0 3C014000 */ lui $at, 0x4000 -/* 9FBC94 802414A4 44810000 */ mtc1 $at, $f0 -/* 9FBC98 802414A8 C442003C */ lwc1 $f2, 0x3c($v0) -/* 9FBC9C 802414AC 8C640010 */ lw $a0, 0x10($v1) -/* 9FBCA0 802414B0 8C430000 */ lw $v1, ($v0) -/* 9FBCA4 802414B4 E444001C */ swc1 $f4, 0x1c($v0) -/* 9FBCA8 802414B8 E4400014 */ swc1 $f0, 0x14($v0) -/* 9FBCAC 802414BC E4420064 */ swc1 $f2, 0x64($v0) -/* 9FBCB0 802414C0 34630800 */ ori $v1, $v1, 0x800 -/* 9FBCB4 802414C4 AC430000 */ sw $v1, ($v0) -/* 9FBCB8 802414C8 AC440028 */ sw $a0, 0x28($v0) -/* 9FBCBC 802414CC 2402000B */ addiu $v0, $zero, 0xb -/* 9FBCC0 802414D0 AE220070 */ sw $v0, 0x70($s1) -/* 9FBCC4 802414D4 8FBF0018 */ lw $ra, 0x18($sp) -/* 9FBCC8 802414D8 8FB10014 */ lw $s1, 0x14($sp) -/* 9FBCCC 802414DC 8FB00010 */ lw $s0, 0x10($sp) -/* 9FBCD0 802414E0 03E00008 */ jr $ra -/* 9FBCD4 802414E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s index 2913b3acde..ff38f254ee 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s @@ -157,7 +157,7 @@ glabel func_802418D8_9FC0C8 /* 9FC310 80241B20 00000000 */ nop /* 9FC314 80241B24 0280202D */ daddu $a0, $s4, $zero /* 9FC318 80241B28 0260282D */ daddu $a1, $s3, $zero -/* 9FC31C 80241B2C 0C09051D */ jal func_80241474_9FBC64 +/* 9FC31C 80241B2C 0C09051D */ jal NpcJumpFunc2 /* 9FC320 80241B30 02A0302D */ daddu $a2, $s5, $zero /* 9FC324 80241B34 0280202D */ daddu $a0, $s4, $zero /* 9FC328 80241B38 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240C9C_DBDF4C.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240C9C_DBDF4C.s deleted file mode 100644 index 1eff6f705c..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240C9C_DBDF4C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C9C_DBDF4C -/* DBDF4C 80240C9C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DBDF50 80240CA0 AFB10014 */ sw $s1, 0x14($sp) -/* DBDF54 80240CA4 0080882D */ daddu $s1, $a0, $zero -/* DBDF58 80240CA8 AFBF0018 */ sw $ra, 0x18($sp) -/* DBDF5C 80240CAC AFB00010 */ sw $s0, 0x10($sp) -/* DBDF60 80240CB0 8E300148 */ lw $s0, 0x148($s1) -/* DBDF64 80240CB4 0C00EABB */ jal get_npc_unsafe -/* DBDF68 80240CB8 86040008 */ lh $a0, 8($s0) -/* DBDF6C 80240CBC 8E0300CC */ lw $v1, 0xcc($s0) -/* DBDF70 80240CC0 3C014120 */ lui $at, 0x4120 -/* DBDF74 80240CC4 44812000 */ mtc1 $at, $f4 -/* DBDF78 80240CC8 3C014000 */ lui $at, 0x4000 -/* DBDF7C 80240CCC 44810000 */ mtc1 $at, $f0 -/* DBDF80 80240CD0 C442003C */ lwc1 $f2, 0x3c($v0) -/* DBDF84 80240CD4 8C640010 */ lw $a0, 0x10($v1) -/* DBDF88 80240CD8 8C430000 */ lw $v1, ($v0) -/* DBDF8C 80240CDC E444001C */ swc1 $f4, 0x1c($v0) -/* DBDF90 80240CE0 E4400014 */ swc1 $f0, 0x14($v0) -/* DBDF94 80240CE4 E4420064 */ swc1 $f2, 0x64($v0) -/* DBDF98 80240CE8 34630800 */ ori $v1, $v1, 0x800 -/* DBDF9C 80240CEC AC430000 */ sw $v1, ($v0) -/* DBDFA0 80240CF0 AC440028 */ sw $a0, 0x28($v0) -/* DBDFA4 80240CF4 2402000B */ addiu $v0, $zero, 0xb -/* DBDFA8 80240CF8 AE220070 */ sw $v0, 0x70($s1) -/* DBDFAC 80240CFC 8FBF0018 */ lw $ra, 0x18($sp) -/* DBDFB0 80240D00 8FB10014 */ lw $s1, 0x14($sp) -/* DBDFB4 80240D04 8FB00010 */ lw $s0, 0x10($sp) -/* DBDFB8 80240D08 03E00008 */ jr $ra -/* DBDFBC 80240D0C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s index c20926ba17..01ada6fa57 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s @@ -157,7 +157,7 @@ glabel func_80241100_DBE3B0 /* DBE5F8 80241348 00000000 */ nop /* DBE5FC 8024134C 0280202D */ daddu $a0, $s4, $zero /* DBE600 80241350 0260282D */ daddu $a1, $s3, $zero -/* DBE604 80241354 0C090327 */ jal func_80240C9C_DBDF4C +/* DBE604 80241354 0C090327 */ jal NpcJumpFunc2 /* DBE608 80241358 02A0302D */ daddu $a2, $s5, $zero /* DBE60C 8024135C 0280202D */ daddu $a0, $s4, $zero /* DBE610 80241360 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s index 693f890633..2b7a5d1f04 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s @@ -157,7 +157,7 @@ glabel func_80241634_DBE8E4 /* DBEB2C 8024187C 00000000 */ nop /* DBEB30 80241880 0260202D */ daddu $a0, $s3, $zero /* DBEB34 80241884 0280282D */ daddu $a1, $s4, $zero -/* DBEB38 80241888 0C090327 */ jal func_80240C9C_DBDF4C +/* DBEB38 80241888 0C090327 */ jal NpcJumpFunc2 /* DBEB3C 8024188C 02A0302D */ daddu $a2, $s5, $zero /* DBEB40 80241890 0260202D */ daddu $a0, $s3, $zero /* DBEB44 80241894 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024167C_DCE34C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024167C_DCE34C.s deleted file mode 100644 index 24773a0496..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024167C_DCE34C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024167C_DCE34C -/* DCE34C 8024167C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCE350 80241680 AFB10014 */ sw $s1, 0x14($sp) -/* DCE354 80241684 0080882D */ daddu $s1, $a0, $zero -/* DCE358 80241688 AFBF0018 */ sw $ra, 0x18($sp) -/* DCE35C 8024168C AFB00010 */ sw $s0, 0x10($sp) -/* DCE360 80241690 8E300148 */ lw $s0, 0x148($s1) -/* DCE364 80241694 0C00EABB */ jal get_npc_unsafe -/* DCE368 80241698 86040008 */ lh $a0, 8($s0) -/* DCE36C 8024169C 8E0300CC */ lw $v1, 0xcc($s0) -/* DCE370 802416A0 3C014120 */ lui $at, 0x4120 -/* DCE374 802416A4 44812000 */ mtc1 $at, $f4 -/* DCE378 802416A8 3C014000 */ lui $at, 0x4000 -/* DCE37C 802416AC 44810000 */ mtc1 $at, $f0 -/* DCE380 802416B0 C442003C */ lwc1 $f2, 0x3c($v0) -/* DCE384 802416B4 8C640010 */ lw $a0, 0x10($v1) -/* DCE388 802416B8 8C430000 */ lw $v1, ($v0) -/* DCE38C 802416BC E444001C */ swc1 $f4, 0x1c($v0) -/* DCE390 802416C0 E4400014 */ swc1 $f0, 0x14($v0) -/* DCE394 802416C4 E4420064 */ swc1 $f2, 0x64($v0) -/* DCE398 802416C8 34630800 */ ori $v1, $v1, 0x800 -/* DCE39C 802416CC AC430000 */ sw $v1, ($v0) -/* DCE3A0 802416D0 AC440028 */ sw $a0, 0x28($v0) -/* DCE3A4 802416D4 2402000B */ addiu $v0, $zero, 0xb -/* DCE3A8 802416D8 AE220070 */ sw $v0, 0x70($s1) -/* DCE3AC 802416DC 8FBF0018 */ lw $ra, 0x18($sp) -/* DCE3B0 802416E0 8FB10014 */ lw $s1, 0x14($sp) -/* DCE3B4 802416E4 8FB00010 */ lw $s0, 0x10($sp) -/* DCE3B8 802416E8 03E00008 */ jr $ra -/* DCE3BC 802416EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s index 1cc2a5e08b..1fe518d6b7 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s @@ -157,7 +157,7 @@ glabel func_80241AE0_DCE7B0 /* DCE9F8 80241D28 00000000 */ nop /* DCE9FC 80241D2C 0280202D */ daddu $a0, $s4, $zero /* DCEA00 80241D30 0260282D */ daddu $a1, $s3, $zero -/* DCEA04 80241D34 0C09059F */ jal func_8024167C_DCE34C +/* DCEA04 80241D34 0C09059F */ jal NpcJumpFunc2 /* DCEA08 80241D38 02A0302D */ daddu $a2, $s5, $zero /* DCEA0C 80241D3C 0280202D */ daddu $a0, $s4, $zero /* DCEA10 80241D40 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s index 9cabea2884..2151fcafdc 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s @@ -157,7 +157,7 @@ glabel func_80242014_DCECE4 /* DCEF2C 8024225C 00000000 */ nop /* DCEF30 80242260 0260202D */ daddu $a0, $s3, $zero /* DCEF34 80242264 0280282D */ daddu $a1, $s4, $zero -/* DCEF38 80242268 0C09059F */ jal func_8024167C_DCE34C +/* DCEF38 80242268 0C09059F */ jal NpcJumpFunc2 /* DCEF3C 8024226C 02A0302D */ daddu $a2, $s5, $zero /* DCEF40 80242270 0260202D */ daddu $a0, $s3, $zero /* DCEF44 80242274 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241650_D8E8A0.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241650_D8E8A0.s deleted file mode 100644 index 923c1785d3..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241650_D8E8A0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241650_D8E8A0 -/* D8E8A0 80241650 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8E8A4 80241654 AFB10014 */ sw $s1, 0x14($sp) -/* D8E8A8 80241658 0080882D */ daddu $s1, $a0, $zero -/* D8E8AC 8024165C AFBF0018 */ sw $ra, 0x18($sp) -/* D8E8B0 80241660 AFB00010 */ sw $s0, 0x10($sp) -/* D8E8B4 80241664 8E300148 */ lw $s0, 0x148($s1) -/* D8E8B8 80241668 0C00EABB */ jal get_npc_unsafe -/* D8E8BC 8024166C 86040008 */ lh $a0, 8($s0) -/* D8E8C0 80241670 8E0300CC */ lw $v1, 0xcc($s0) -/* D8E8C4 80241674 3C014120 */ lui $at, 0x4120 -/* D8E8C8 80241678 44812000 */ mtc1 $at, $f4 -/* D8E8CC 8024167C 3C014000 */ lui $at, 0x4000 -/* D8E8D0 80241680 44810000 */ mtc1 $at, $f0 -/* D8E8D4 80241684 C442003C */ lwc1 $f2, 0x3c($v0) -/* D8E8D8 80241688 8C640010 */ lw $a0, 0x10($v1) -/* D8E8DC 8024168C 8C430000 */ lw $v1, ($v0) -/* D8E8E0 80241690 E444001C */ swc1 $f4, 0x1c($v0) -/* D8E8E4 80241694 E4400014 */ swc1 $f0, 0x14($v0) -/* D8E8E8 80241698 E4420064 */ swc1 $f2, 0x64($v0) -/* D8E8EC 8024169C 34630800 */ ori $v1, $v1, 0x800 -/* D8E8F0 802416A0 AC430000 */ sw $v1, ($v0) -/* D8E8F4 802416A4 AC440028 */ sw $a0, 0x28($v0) -/* D8E8F8 802416A8 2402000B */ addiu $v0, $zero, 0xb -/* D8E8FC 802416AC AE220070 */ sw $v0, 0x70($s1) -/* D8E900 802416B0 8FBF0018 */ lw $ra, 0x18($sp) -/* D8E904 802416B4 8FB10014 */ lw $s1, 0x14($sp) -/* D8E908 802416B8 8FB00010 */ lw $s0, 0x10($sp) -/* D8E90C 802416BC 03E00008 */ jr $ra -/* D8E910 802416C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s index dfef4bf1d4..9eaf5b5758 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s @@ -157,7 +157,7 @@ glabel func_80241AB4_D8ED04 /* D8EF4C 80241CFC 00000000 */ nop /* D8EF50 80241D00 0280202D */ daddu $a0, $s4, $zero /* D8EF54 80241D04 0260282D */ daddu $a1, $s3, $zero -/* D8EF58 80241D08 0C090594 */ jal func_80241650_D8E8A0 +/* D8EF58 80241D08 0C090594 */ jal NpcJumpFunc2 /* D8EF5C 80241D0C 02A0302D */ daddu $a2, $s5, $zero /* D8EF60 80241D10 0280202D */ daddu $a0, $s4, $zero /* D8EF64 80241D14 0260282D */ daddu $a1, $s3, $zero 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 6ad738523d..ffd9eba4fa 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 @@ -133,7 +133,7 @@ glabel func_802423CC_D8F61C /* D8F804 802425B4 00000000 */ nop /* D8F808 802425B8 0240202D */ daddu $a0, $s2, $zero /* D8F80C 802425BC 0260282D */ daddu $a1, $s3, $zero -/* D8F810 802425C0 0C090594 */ jal func_80241650_D8E8A0 +/* D8F810 802425C0 0C090594 */ jal NpcJumpFunc2 /* D8F814 802425C4 0280302D */ daddu $a2, $s4, $zero /* D8F818 802425C8 0240202D */ daddu $a0, $s2, $zero /* D8F81C 802425CC 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240FE4_9A1FC4.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240FE4_9A1FC4.s deleted file mode 100644 index ac300c4097..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240FE4_9A1FC4.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FE4_9A1FC4 -/* 9A1FC4 80240FE4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A1FC8 80240FE8 AFB10014 */ sw $s1, 0x14($sp) -/* 9A1FCC 80240FEC 0080882D */ daddu $s1, $a0, $zero -/* 9A1FD0 80240FF0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9A1FD4 80240FF4 AFB00010 */ sw $s0, 0x10($sp) -/* 9A1FD8 80240FF8 8E300148 */ lw $s0, 0x148($s1) -/* 9A1FDC 80240FFC 0C00EABB */ jal get_npc_unsafe -/* 9A1FE0 80241000 86040008 */ lh $a0, 8($s0) -/* 9A1FE4 80241004 8E0300CC */ lw $v1, 0xcc($s0) -/* 9A1FE8 80241008 3C014120 */ lui $at, 0x4120 -/* 9A1FEC 8024100C 44812000 */ mtc1 $at, $f4 -/* 9A1FF0 80241010 3C014000 */ lui $at, 0x4000 -/* 9A1FF4 80241014 44810000 */ mtc1 $at, $f0 -/* 9A1FF8 80241018 C442003C */ lwc1 $f2, 0x3c($v0) -/* 9A1FFC 8024101C 8C640010 */ lw $a0, 0x10($v1) -/* 9A2000 80241020 8C430000 */ lw $v1, ($v0) -/* 9A2004 80241024 E444001C */ swc1 $f4, 0x1c($v0) -/* 9A2008 80241028 E4400014 */ swc1 $f0, 0x14($v0) -/* 9A200C 8024102C E4420064 */ swc1 $f2, 0x64($v0) -/* 9A2010 80241030 34630800 */ ori $v1, $v1, 0x800 -/* 9A2014 80241034 AC430000 */ sw $v1, ($v0) -/* 9A2018 80241038 AC440028 */ sw $a0, 0x28($v0) -/* 9A201C 8024103C 2402000B */ addiu $v0, $zero, 0xb -/* 9A2020 80241040 AE220070 */ sw $v0, 0x70($s1) -/* 9A2024 80241044 8FBF0018 */ lw $ra, 0x18($sp) -/* 9A2028 80241048 8FB10014 */ lw $s1, 0x14($sp) -/* 9A202C 8024104C 8FB00010 */ lw $s0, 0x10($sp) -/* 9A2030 80241050 03E00008 */ jr $ra -/* 9A2034 80241054 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s index 9f4f5106e3..20edc05cad 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s @@ -157,7 +157,7 @@ glabel func_80241448_9A2428 /* 9A2670 80241690 00000000 */ nop /* 9A2674 80241694 0280202D */ daddu $a0, $s4, $zero /* 9A2678 80241698 0260282D */ daddu $a1, $s3, $zero -/* 9A267C 8024169C 0C0903F9 */ jal func_80240FE4_9A1FC4 +/* 9A267C 8024169C 0C0903F9 */ jal NpcJumpFunc2 /* 9A2680 802416A0 02A0302D */ daddu $a2, $s5, $zero /* 9A2684 802416A4 0280202D */ daddu $a0, $s4, $zero /* 9A2688 802416A8 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802413B4_9A97A4.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802413B4_9A97A4.s deleted file mode 100644 index c142e388a3..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802413B4_9A97A4.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413B4_9A97A4 -/* 9A97A4 802413B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A97A8 802413B8 AFB10014 */ sw $s1, 0x14($sp) -/* 9A97AC 802413BC 0080882D */ daddu $s1, $a0, $zero -/* 9A97B0 802413C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9A97B4 802413C4 AFB00010 */ sw $s0, 0x10($sp) -/* 9A97B8 802413C8 8E300148 */ lw $s0, 0x148($s1) -/* 9A97BC 802413CC 0C00EABB */ jal get_npc_unsafe -/* 9A97C0 802413D0 86040008 */ lh $a0, 8($s0) -/* 9A97C4 802413D4 8E0300CC */ lw $v1, 0xcc($s0) -/* 9A97C8 802413D8 3C014120 */ lui $at, 0x4120 -/* 9A97CC 802413DC 44812000 */ mtc1 $at, $f4 -/* 9A97D0 802413E0 3C014000 */ lui $at, 0x4000 -/* 9A97D4 802413E4 44810000 */ mtc1 $at, $f0 -/* 9A97D8 802413E8 C442003C */ lwc1 $f2, 0x3c($v0) -/* 9A97DC 802413EC 8C640010 */ lw $a0, 0x10($v1) -/* 9A97E0 802413F0 8C430000 */ lw $v1, ($v0) -/* 9A97E4 802413F4 E444001C */ swc1 $f4, 0x1c($v0) -/* 9A97E8 802413F8 E4400014 */ swc1 $f0, 0x14($v0) -/* 9A97EC 802413FC E4420064 */ swc1 $f2, 0x64($v0) -/* 9A97F0 80241400 34630800 */ ori $v1, $v1, 0x800 -/* 9A97F4 80241404 AC430000 */ sw $v1, ($v0) -/* 9A97F8 80241408 AC440028 */ sw $a0, 0x28($v0) -/* 9A97FC 8024140C 2402000B */ addiu $v0, $zero, 0xb -/* 9A9800 80241410 AE220070 */ sw $v0, 0x70($s1) -/* 9A9804 80241414 8FBF0018 */ lw $ra, 0x18($sp) -/* 9A9808 80241418 8FB10014 */ lw $s1, 0x14($sp) -/* 9A980C 8024141C 8FB00010 */ lw $s0, 0x10($sp) -/* 9A9810 80241420 03E00008 */ jr $ra -/* 9A9814 80241424 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s index 462c8d489b..cc3e36566e 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s @@ -157,7 +157,7 @@ glabel func_80241818_9A9C08 /* 9A9E50 80241A60 00000000 */ nop /* 9A9E54 80241A64 0280202D */ daddu $a0, $s4, $zero /* 9A9E58 80241A68 0260282D */ daddu $a1, $s3, $zero -/* 9A9E5C 80241A6C 0C0904ED */ jal func_802413B4_9A97A4 +/* 9A9E5C 80241A6C 0C0904ED */ jal NpcJumpFunc2 /* 9A9E60 80241A70 02A0302D */ daddu $a2, $s5, $zero /* 9A9E64 80241A74 0280202D */ daddu $a0, $s4, $zero /* 9A9E68 80241A78 0260282D */ daddu $a1, $s3, $zero diff --git a/src/world/area_arn/arn_03/BDED90.c b/src/world/area_arn/arn_03/BDED90.c index 7f7a100c26..a4e2c58fd1 100644 --- a/src/world/area_arn/arn_03/BDED90.c +++ b/src/world/area_arn/arn_03/BDED90.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_802404C0_BDF250); INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_8024067C_BDF40C); -INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80240730_BDF4C0); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_arn/arn_04/BE37B0.c b/src/world/area_arn/arn_04/BE37B0.c index a32f8f737a..a8f481e32b 100644 --- a/src/world/area_arn/arn_04/BE37B0.c +++ b/src/world/area_arn/arn_04/BE37B0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_802404C0_BE3C70); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_8024067C_BE3E2C); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80240730_BE3EE0); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_arn/arn_05/BE7BE0.c b/src/world/area_arn/arn_05/BE7BE0.c index ba54bc1c11..b2693b5b22 100644 --- a/src/world/area_arn/arn_05/BE7BE0.c +++ b/src/world/area_arn/arn_05/BE7BE0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_802404C0_BE80A0); INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_8024067C_BE825C); -INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_80240730_BE8310); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index 22e1e1db51..0e7b795655 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -55,7 +55,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802429EC_C0026C); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242BA8_C00428); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242C5C_C004DC); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index 7a3934bced..eb8f5fcd1e 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240FE0_C324C0); INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024119C_C3267C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80241250_C32730); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index f64d5c7035..8f23033842 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802404C0_C40270); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_8024067C_C4042C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240730_C404E0); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 15899dd86c..b0d742db14 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240D90_C502A0); INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240F4C_C5045C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80241000_C50510); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index adf4ea2623..b3e2c91766 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_802404C0_C56400); INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_8024067C_C565BC); -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_80240730_C56670); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 50220c3c24..39d3851a58 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240AA0_95BCA0); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240C5C_95BE5C); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240D10_95BF10); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index f06fef643c..7e470ce3e4 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240500_C9E420); INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_802406BC_C9E5DC); -INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240770_C9E690); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index e081d2f5d7..346d6f3d80 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802408F0_B2CD60); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240AAC_B2CF1C); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240B60_B2CFD0); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 8e5b41f429..a7a8c07b19 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240AE0_B356B0); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240C9C_B3586C); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240D50_B35920); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c index 442bb6242f..e07b038f66 100644 --- a/src/world/area_jan/jan_22/B84180.c +++ b/src/world/area_jan/jan_22/B84180.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_802404C0_B84640); INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_8024067C_B847FC); -INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240730_B848B0); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_kkj/kkj_00/ABB340.c b/src/world/area_kkj/kkj_00/ABB340.c index 588d0a9fcf..42fd5d99f9 100644 --- a/src/world/area_kkj/kkj_00/ABB340.c +++ b/src/world/area_kkj/kkj_00/ABB340.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240570_ABB800); INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_8024072C_ABB9BC); -INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_802407E0_ABBA70); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_kkj/kkj_01/AC5170.c b/src/world/area_kkj/kkj_01/AC5170.c index 9550074ce6..8eaa2bbbfa 100644 --- a/src/world/area_kkj/kkj_01/AC5170.c +++ b/src/world/area_kkj/kkj_01/AC5170.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_802404C0_AC5630); INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_8024067C_AC57EC); -INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_80240730_AC58A0); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index 33818bc2a0..420454214d 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802404C0_A86F10); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024067C_A870CC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240730_A87180); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index 080bed746f..9e80966f78 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802405A0_A8D020); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_8024075C_A8D1DC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240810_A8D290); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index eadf3dcb29..8de45985e0 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242A30_7ED740); INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242BEC_7ED8FC); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242CA0_7ED9B0); +# include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 748fc4fea8..b3dd6a74ee 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241540_801DC0); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802416FC_801F7C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802417B0_802030); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_mac/mac_01/805DD0.c b/src/world/area_mac/mac_01/805DD0.c index 7241ca67a0..9d04485e22 100644 --- a/src/world/area_mac/mac_01/805DD0.c +++ b/src/world/area_mac/mac_01/805DD0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245A10_806290); INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245BCC_80644C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245C80_806500); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index a3f9099d01..58eb66c3dd 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240DF0_8240B0); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240FAC_82426C); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241060_824320); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 0fd2f45eeb..b954aa1d4a 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240950_852AC0); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240B0C_852C7C); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240BC0_852D30); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index 3ec855f55b..aef1ea698c 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_802407A0_E0EF40); INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_8024095C_E0F0FC); -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240A10_E0F1B0); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index 4e5da4dc1c..14f5db9dd4 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240F40_9D7F60); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802410FC_9D811C); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802411B0_9D81D0); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_nok/nok_12/9FAD60.c b/src/world/area_nok/nok_12/9FAD60.c index 013dafb2bd..76a2c69b82 100644 --- a/src/world/area_nok/nok_12/9FAD60.c +++ b/src/world/area_nok/nok_12/9FAD60.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241204_9FB9F4); INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_802413C0_9FBBB0); -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241474_9FBC64); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index 63f60c0476..229f38cf3d 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240A2C_DBDCDC); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240BE8_DBDE98); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240C9C_DBDF4C); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index 07fe8b10fd..3c29e3c094 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024140C_DCE0DC); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802415C8_DCE298); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024167C_DCE34C); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index 6c254e4c94..9f767698dc 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_802413E0_D8E630); INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_8024159C_D8E7EC); -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241650_D8E8A0); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_trd/trd_02/9A10C0.c b/src/world/area_trd/trd_02/9A10C0.c index 29cbb15056..3101eec997 100644 --- a/src/world/area_trd/trd_02/9A10C0.c +++ b/src/world/area_trd/trd_02/9A10C0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240D74_9A1D54); INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240F30_9A1F10); -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240FE4_9A1FC4); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index 9b55ad193a..1961e3d13d 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241144_9A9534); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241300_9A96F0); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802413B4_9A97A4); +#include "world/common/NpcJumpFunc2.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/common/NpcJumpFunc2.inc.c b/src/world/common/NpcJumpFunc2.inc.c new file mode 100644 index 0000000000..fe6e1925ba --- /dev/null +++ b/src/world/common/NpcJumpFunc2.inc.c @@ -0,0 +1,14 @@ +#include "common.h" +#include "map.h" + +static void NpcJumpFunc2(ScriptInstance* script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->currentAnim = enemy->animList[4]; + npc->jumpVelocity = 10.0f; + npc->jumpScale = 2.0f; + npc->moveToPos.y = npc->pos.y; + npc->flags |= 0x800; + script->functionTemp[0].s = 11; +} From e0e8885781d40288e44fe55388f08e8b99d38182 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 20 Nov 2020 17:45:02 -0500 Subject: [PATCH 09/38] GetEncounterEnemyIsOwner --- .../iwa_01/90FBD0/func_8024228C_91193C.s | 18 ----------------- .../kpa_03/A48720/func_80241DC4_A4A384.s | 18 ----------------- .../kpa_08/A4CAC0/func_8024141C_A4DE3C.s | 18 ----------------- .../kpa_09/A4F0A0/func_802412B4_A502B4.s | 19 ------------------ .../kpa_102/A93A50/func_80241524_A94C64.s | 18 ----------------- .../kpa_111/A99590/func_80241384_A9A914.s | 19 ------------------ .../kpa_115/A9ED40/func_80241384_AA00C4.s | 19 ------------------ .../kpa_50/A609D0/func_80241214_A61BE4.s | 18 ----------------- .../kpa_51/A640E0/func_802413CC_A6545C.s | 18 ----------------- .../kpa_52/A671E0/func_802412F4_A683F4.s | 19 ------------------ .../kpa_61/A6E6F0/func_802422B8_A70698.s | 18 ----------------- .../omo_02/D9D510/func_80242B70_DA0040.s | 20 ------------------- .../omo_09/DCD6B0/func_80243580_DD0250.s | 18 ----------------- .../omo_17/DEF400/func_802436D4_DF2574.s | 19 ------------------ src/world/area_iwa/iwa_01/90FBD0.c | 2 +- src/world/area_kpa/kpa_03/A48720.c | 2 +- src/world/area_kpa/kpa_08/A4CAC0.c | 2 +- src/world/area_kpa/kpa_09/A4F0A0.c | 2 +- src/world/area_kpa/kpa_102/A93A50.c | 3 ++- src/world/area_kpa/kpa_111/A99590.c | 2 +- src/world/area_kpa/kpa_115/A9ED40.c | 2 +- src/world/area_kpa/kpa_50/A609D0.c | 2 +- src/world/area_kpa/kpa_51/A640E0.c | 2 +- src/world/area_kpa/kpa_52/A671E0.c | 2 +- src/world/area_kpa/kpa_61/A6E6F0.c | 2 +- src/world/area_omo/omo_02/D9D510.c | 2 +- src/world/area_omo/omo_09/DCD6B0.c | 2 +- src/world/area_omo/omo_17/DEF400.c | 2 +- .../common/GetEncounterEnemyIsOwner.inc.c | 9 +++++++++ 29 files changed, 24 insertions(+), 273 deletions(-) delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024228C_91193C.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4_A4A384.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C_A4DE3C.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4_A502B4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241524_A94C64.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384_A9A914.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241384_AA00C4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214_A61BE4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802413CC_A6545C.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4_A683F4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8_A70698.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70_DA0040.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580_DD0250.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4_DF2574.s create mode 100644 src/world/common/GetEncounterEnemyIsOwner.inc.c diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024228C_91193C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024228C_91193C.s deleted file mode 100644 index 0807b080c8..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024228C_91193C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024228C_91193C -/* 91193C 8024228C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 911940 80242290 3C05FE36 */ lui $a1, 0xfe36 -/* 911944 80242294 AFBF0010 */ sw $ra, 0x10($sp) -/* 911948 80242298 8C820148 */ lw $v0, 0x148($a0) -/* 91194C 8024229C 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* 911950 802422A0 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* 911954 802422A4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 911958 802422A8 00C23026 */ xor $a2, $a2, $v0 -/* 91195C 802422AC 0C0B2026 */ jal set_variable -/* 911960 802422B0 2CC60001 */ sltiu $a2, $a2, 1 -/* 911964 802422B4 8FBF0010 */ lw $ra, 0x10($sp) -/* 911968 802422B8 24020002 */ addiu $v0, $zero, 2 -/* 91196C 802422BC 03E00008 */ jr $ra -/* 911970 802422C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4_A4A384.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4_A4A384.s deleted file mode 100644 index fc4c63b986..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4_A4A384.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DC4_A4A384 -/* A4A384 80241DC4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A4A388 80241DC8 3C05FE36 */ lui $a1, 0xfe36 -/* A4A38C 80241DCC AFBF0010 */ sw $ra, 0x10($sp) -/* A4A390 80241DD0 8C820148 */ lw $v0, 0x148($a0) -/* A4A394 80241DD4 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* A4A398 80241DD8 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* A4A39C 80241DDC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A4A3A0 80241DE0 00C23026 */ xor $a2, $a2, $v0 -/* A4A3A4 80241DE4 0C0B2026 */ jal set_variable -/* A4A3A8 80241DE8 2CC60001 */ sltiu $a2, $a2, 1 -/* A4A3AC 80241DEC 8FBF0010 */ lw $ra, 0x10($sp) -/* A4A3B0 80241DF0 24020002 */ addiu $v0, $zero, 2 -/* A4A3B4 80241DF4 03E00008 */ jr $ra -/* A4A3B8 80241DF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C_A4DE3C.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C_A4DE3C.s deleted file mode 100644 index 210996abf8..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C_A4DE3C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024141C_A4DE3C -/* A4DE3C 8024141C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A4DE40 80241420 3C05FE36 */ lui $a1, 0xfe36 -/* A4DE44 80241424 AFBF0010 */ sw $ra, 0x10($sp) -/* A4DE48 80241428 8C820148 */ lw $v0, 0x148($a0) -/* A4DE4C 8024142C 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* A4DE50 80241430 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* A4DE54 80241434 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A4DE58 80241438 00C23026 */ xor $a2, $a2, $v0 -/* A4DE5C 8024143C 0C0B2026 */ jal set_variable -/* A4DE60 80241440 2CC60001 */ sltiu $a2, $a2, 1 -/* A4DE64 80241444 8FBF0010 */ lw $ra, 0x10($sp) -/* A4DE68 80241448 24020002 */ addiu $v0, $zero, 2 -/* A4DE6C 8024144C 03E00008 */ jr $ra -/* A4DE70 80241450 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4_A502B4.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4_A502B4.s deleted file mode 100644 index e123baebee..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4_A502B4.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412B4_A502B4 -/* A502B4 802412B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A502B8 802412B8 3C05FE36 */ lui $a1, 0xfe36 -/* A502BC 802412BC AFBF0010 */ sw $ra, 0x10($sp) -/* A502C0 802412C0 8C820148 */ lw $v0, 0x148($a0) -/* A502C4 802412C4 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* A502C8 802412C8 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* A502CC 802412CC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A502D0 802412D0 00C23026 */ xor $a2, $a2, $v0 -/* A502D4 802412D4 0C0B2026 */ jal set_variable -/* A502D8 802412D8 2CC60001 */ sltiu $a2, $a2, 1 -/* A502DC 802412DC 8FBF0010 */ lw $ra, 0x10($sp) -/* A502E0 802412E0 24020002 */ addiu $v0, $zero, 2 -/* A502E4 802412E4 03E00008 */ jr $ra -/* A502E8 802412E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* A502EC 802412EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241524_A94C64.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241524_A94C64.s deleted file mode 100644 index 2c0932f688..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241524_A94C64.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241524_A94C64 -/* A94C64 80241524 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A94C68 80241528 3C05FE36 */ lui $a1, 0xfe36 -/* A94C6C 8024152C AFBF0010 */ sw $ra, 0x10($sp) -/* A94C70 80241530 8C820148 */ lw $v0, 0x148($a0) -/* A94C74 80241534 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* A94C78 80241538 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* A94C7C 8024153C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A94C80 80241540 00C23026 */ xor $a2, $a2, $v0 -/* A94C84 80241544 0C0B2026 */ jal set_variable -/* A94C88 80241548 2CC60001 */ sltiu $a2, $a2, 1 -/* A94C8C 8024154C 8FBF0010 */ lw $ra, 0x10($sp) -/* A94C90 80241550 24020002 */ addiu $v0, $zero, 2 -/* A94C94 80241554 03E00008 */ jr $ra -/* A94C98 80241558 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384_A9A914.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384_A9A914.s deleted file mode 100644 index 4aff6c4dfa..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384_A9A914.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241384_A9A914 -/* A9A914 80241384 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A9A918 80241388 3C05FE36 */ lui $a1, 0xfe36 -/* A9A91C 8024138C AFBF0010 */ sw $ra, 0x10($sp) -/* A9A920 80241390 8C820148 */ lw $v0, 0x148($a0) -/* A9A924 80241394 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* A9A928 80241398 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* A9A92C 8024139C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A9A930 802413A0 00C23026 */ xor $a2, $a2, $v0 -/* A9A934 802413A4 0C0B2026 */ jal set_variable -/* A9A938 802413A8 2CC60001 */ sltiu $a2, $a2, 1 -/* A9A93C 802413AC 8FBF0010 */ lw $ra, 0x10($sp) -/* A9A940 802413B0 24020002 */ addiu $v0, $zero, 2 -/* A9A944 802413B4 03E00008 */ jr $ra -/* A9A948 802413B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* A9A94C 802413BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241384_AA00C4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241384_AA00C4.s deleted file mode 100644 index 6446b26c99..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241384_AA00C4.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241384_AA00C4 -/* AA00C4 80241384 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA00C8 80241388 3C05FE36 */ lui $a1, 0xfe36 -/* AA00CC 8024138C AFBF0010 */ sw $ra, 0x10($sp) -/* AA00D0 80241390 8C820148 */ lw $v0, 0x148($a0) -/* AA00D4 80241394 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* AA00D8 80241398 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* AA00DC 8024139C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* AA00E0 802413A0 00C23026 */ xor $a2, $a2, $v0 -/* AA00E4 802413A4 0C0B2026 */ jal set_variable -/* AA00E8 802413A8 2CC60001 */ sltiu $a2, $a2, 1 -/* AA00EC 802413AC 8FBF0010 */ lw $ra, 0x10($sp) -/* AA00F0 802413B0 24020002 */ addiu $v0, $zero, 2 -/* AA00F4 802413B4 03E00008 */ jr $ra -/* AA00F8 802413B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* AA00FC 802413BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214_A61BE4.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214_A61BE4.s deleted file mode 100644 index 8bc4b14a03..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214_A61BE4.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241214_A61BE4 -/* A61BE4 80241214 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A61BE8 80241218 3C05FE36 */ lui $a1, 0xfe36 -/* A61BEC 8024121C AFBF0010 */ sw $ra, 0x10($sp) -/* A61BF0 80241220 8C820148 */ lw $v0, 0x148($a0) -/* A61BF4 80241224 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* A61BF8 80241228 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* A61BFC 8024122C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A61C00 80241230 00C23026 */ xor $a2, $a2, $v0 -/* A61C04 80241234 0C0B2026 */ jal set_variable -/* A61C08 80241238 2CC60001 */ sltiu $a2, $a2, 1 -/* A61C0C 8024123C 8FBF0010 */ lw $ra, 0x10($sp) -/* A61C10 80241240 24020002 */ addiu $v0, $zero, 2 -/* A61C14 80241244 03E00008 */ jr $ra -/* A61C18 80241248 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802413CC_A6545C.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802413CC_A6545C.s deleted file mode 100644 index 614677514b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802413CC_A6545C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413CC_A6545C -/* A6545C 802413CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A65460 802413D0 3C05FE36 */ lui $a1, 0xfe36 -/* A65464 802413D4 AFBF0010 */ sw $ra, 0x10($sp) -/* A65468 802413D8 8C820148 */ lw $v0, 0x148($a0) -/* A6546C 802413DC 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* A65470 802413E0 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* A65474 802413E4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A65478 802413E8 00C23026 */ xor $a2, $a2, $v0 -/* A6547C 802413EC 0C0B2026 */ jal set_variable -/* A65480 802413F0 2CC60001 */ sltiu $a2, $a2, 1 -/* A65484 802413F4 8FBF0010 */ lw $ra, 0x10($sp) -/* A65488 802413F8 24020002 */ addiu $v0, $zero, 2 -/* A6548C 802413FC 03E00008 */ jr $ra -/* A65490 80241400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4_A683F4.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4_A683F4.s deleted file mode 100644 index 2b4c656970..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4_A683F4.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412F4_A683F4 -/* A683F4 802412F4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A683F8 802412F8 3C05FE36 */ lui $a1, 0xfe36 -/* A683FC 802412FC AFBF0010 */ sw $ra, 0x10($sp) -/* A68400 80241300 8C820148 */ lw $v0, 0x148($a0) -/* A68404 80241304 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* A68408 80241308 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* A6840C 8024130C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A68410 80241310 00C23026 */ xor $a2, $a2, $v0 -/* A68414 80241314 0C0B2026 */ jal set_variable -/* A68418 80241318 2CC60001 */ sltiu $a2, $a2, 1 -/* A6841C 8024131C 8FBF0010 */ lw $ra, 0x10($sp) -/* A68420 80241320 24020002 */ addiu $v0, $zero, 2 -/* A68424 80241324 03E00008 */ jr $ra -/* A68428 80241328 27BD0018 */ addiu $sp, $sp, 0x18 -/* A6842C 8024132C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8_A70698.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8_A70698.s deleted file mode 100644 index 5a1b21582d..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8_A70698.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422B8_A70698 -/* A70698 802422B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A7069C 802422BC 3C05FE36 */ lui $a1, 0xfe36 -/* A706A0 802422C0 AFBF0010 */ sw $ra, 0x10($sp) -/* A706A4 802422C4 8C820148 */ lw $v0, 0x148($a0) -/* A706A8 802422C8 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* A706AC 802422CC 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* A706B0 802422D0 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A706B4 802422D4 00C23026 */ xor $a2, $a2, $v0 -/* A706B8 802422D8 0C0B2026 */ jal set_variable -/* A706BC 802422DC 2CC60001 */ sltiu $a2, $a2, 1 -/* A706C0 802422E0 8FBF0010 */ lw $ra, 0x10($sp) -/* A706C4 802422E4 24020002 */ addiu $v0, $zero, 2 -/* A706C8 802422E8 03E00008 */ jr $ra -/* A706CC 802422EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70_DA0040.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70_DA0040.s deleted file mode 100644 index 434e29bc59..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70_DA0040.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B70_DA0040 -/* DA0040 80242B70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DA0044 80242B74 3C05FE36 */ lui $a1, 0xfe36 -/* DA0048 80242B78 AFBF0010 */ sw $ra, 0x10($sp) -/* DA004C 80242B7C 8C820148 */ lw $v0, 0x148($a0) -/* DA0050 80242B80 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* DA0054 80242B84 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* DA0058 80242B88 34A53C80 */ ori $a1, $a1, 0x3c80 -/* DA005C 80242B8C 00C23026 */ xor $a2, $a2, $v0 -/* DA0060 80242B90 0C0B2026 */ jal set_variable -/* DA0064 80242B94 2CC60001 */ sltiu $a2, $a2, 1 -/* DA0068 80242B98 8FBF0010 */ lw $ra, 0x10($sp) -/* DA006C 80242B9C 24020002 */ addiu $v0, $zero, 2 -/* DA0070 80242BA0 03E00008 */ jr $ra -/* DA0074 80242BA4 27BD0018 */ addiu $sp, $sp, 0x18 -/* DA0078 80242BA8 00000000 */ nop -/* DA007C 80242BAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580_DD0250.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580_DD0250.s deleted file mode 100644 index f7a949c140..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580_DD0250.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243580_DD0250 -/* DD0250 80243580 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DD0254 80243584 3C05FE36 */ lui $a1, 0xfe36 -/* DD0258 80243588 AFBF0010 */ sw $ra, 0x10($sp) -/* DD025C 8024358C 8C820148 */ lw $v0, 0x148($a0) -/* DD0260 80243590 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* DD0264 80243594 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* DD0268 80243598 34A53C80 */ ori $a1, $a1, 0x3c80 -/* DD026C 8024359C 00C23026 */ xor $a2, $a2, $v0 -/* DD0270 802435A0 0C0B2026 */ jal set_variable -/* DD0274 802435A4 2CC60001 */ sltiu $a2, $a2, 1 -/* DD0278 802435A8 8FBF0010 */ lw $ra, 0x10($sp) -/* DD027C 802435AC 24020002 */ addiu $v0, $zero, 2 -/* DD0280 802435B0 03E00008 */ jr $ra -/* DD0284 802435B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4_DF2574.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4_DF2574.s deleted file mode 100644 index 770626c909..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4_DF2574.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802436D4_DF2574 -/* DF2574 802436D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DF2578 802436D8 3C05FE36 */ lui $a1, 0xfe36 -/* DF257C 802436DC AFBF0010 */ sw $ra, 0x10($sp) -/* DF2580 802436E0 8C820148 */ lw $v0, 0x148($a0) -/* DF2584 802436E4 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* DF2588 802436E8 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* DF258C 802436EC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* DF2590 802436F0 00C23026 */ xor $a2, $a2, $v0 -/* DF2594 802436F4 0C0B2026 */ jal set_variable -/* DF2598 802436F8 2CC60001 */ sltiu $a2, $a2, 1 -/* DF259C 802436FC 8FBF0010 */ lw $ra, 0x10($sp) -/* DF25A0 80243700 24020002 */ addiu $v0, $zero, 2 -/* DF25A4 80243704 03E00008 */ jr $ra -/* DF25A8 80243708 27BD0018 */ addiu $sp, $sp, 0x18 -/* DF25AC 8024370C 00000000 */ nop diff --git a/src/world/area_iwa/iwa_01/90FBD0.c b/src/world/area_iwa/iwa_01/90FBD0.c index e338751117..80bae76a5c 100644 --- a/src/world/area_iwa/iwa_01/90FBD0.c +++ b/src/world/area_iwa/iwa_01/90FBD0.c @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241D70_911420); INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241F6C_91161C); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_8024228C_91193C); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_802422C4_911974); diff --git a/src/world/area_kpa/kpa_03/A48720.c b/src/world/area_kpa/kpa_03/A48720.c index ebb5c86a49..e0934095cb 100644 --- a/src/world/area_kpa/kpa_03/A48720.c +++ b/src/world/area_kpa/kpa_03/A48720.c @@ -44,6 +44,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241D20_A4A2E0); INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241D6C_A4A32C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241DC4_A4A384); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241DFC_A4A3BC); diff --git a/src/world/area_kpa/kpa_08/A4CAC0.c b/src/world/area_kpa/kpa_08/A4CAC0.c index 65b3b813f6..ed1a8e393d 100644 --- a/src/world/area_kpa/kpa_08/A4CAC0.c +++ b/src/world/area_kpa/kpa_08/A4CAC0.c @@ -32,6 +32,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80241378_A4DD98); INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_802413C4_A4DDE4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_8024141C_A4DE3C); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80241454_A4DE74); diff --git a/src/world/area_kpa/kpa_09/A4F0A0.c b/src/world/area_kpa/kpa_09/A4F0A0.c index 1e2c040072..d743fdfada 100644 --- a/src/world/area_kpa/kpa_09/A4F0A0.c +++ b/src/world/area_kpa/kpa_09/A4F0A0.c @@ -18,4 +18,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240B38_A4FB38); INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240F94_A4FF94); -INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802412B4_A502B4); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_102/A93A50.c b/src/world/area_kpa/kpa_102/A93A50.c index aa2a75d518..9dfe396b46 100644 --- a/src/world/area_kpa/kpa_102/A93A50.c +++ b/src/world/area_kpa/kpa_102/A93A50.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240DA8_A944E8); INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80241204_A94944); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80241524_A94C64); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_8024155C_A94C9C); @@ -58,6 +58,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80243198_A968D8); INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80243270_A969B0); +// Should be #include "world/common/GetEncounterEnemyIsOwner.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80243504_A96C44); INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_8024353C_A96C7C); diff --git a/src/world/area_kpa/kpa_111/A99590.c b/src/world/area_kpa/kpa_111/A99590.c index 8dce9e0b33..fa015f3ce2 100644 --- a/src/world/area_kpa/kpa_111/A99590.c +++ b/src/world/area_kpa/kpa_111/A99590.c @@ -22,4 +22,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80240C08_A9A198); INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80241064_A9A5F4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80241384_A9A914); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_115/A9ED40.c b/src/world/area_kpa/kpa_115/A9ED40.c index a0565dc965..18a449af2e 100644 --- a/src/world/area_kpa/kpa_115/A9ED40.c +++ b/src/world/area_kpa/kpa_115/A9ED40.c @@ -22,4 +22,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_80240C08_A9F948); INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_80241064_A9FDA4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_80241384_AA00C4); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_50/A609D0.c b/src/world/area_kpa/kpa_50/A609D0.c index a6331c4ed8..bd09c0f292 100644 --- a/src/world/area_kpa/kpa_50/A609D0.c +++ b/src/world/area_kpa/kpa_50/A609D0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240A98_A61468); INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240EF4_A618C4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80241214_A61BE4); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_8024124C_A61C1C); diff --git a/src/world/area_kpa/kpa_51/A640E0.c b/src/world/area_kpa/kpa_51/A640E0.c index c95cf9cf60..34a635e984 100644 --- a/src/world/area_kpa/kpa_51/A640E0.c +++ b/src/world/area_kpa/kpa_51/A640E0.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241328_A653B8); INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241374_A65404); -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802413CC_A6545C); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241404_A65494); diff --git a/src/world/area_kpa/kpa_52/A671E0.c b/src/world/area_kpa/kpa_52/A671E0.c index f99b8b7b90..60ecd38b10 100644 --- a/src/world/area_kpa/kpa_52/A671E0.c +++ b/src/world/area_kpa/kpa_52/A671E0.c @@ -18,4 +18,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240B78_A67C78); INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240FD4_A680D4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_802412F4_A683F4); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_61/A6E6F0.c b/src/world/area_kpa/kpa_61/A6E6F0.c index bf70addef6..81693950ac 100644 --- a/src/world/area_kpa/kpa_61/A6E6F0.c +++ b/src/world/area_kpa/kpa_61/A6E6F0.c @@ -38,6 +38,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80241F4C_A7032C); INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", update_heroes_start_turn_A70404); -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_802422B8_A70698); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_802422F0_A706D0); diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c index e483675d7a..4309be5666 100644 --- a/src/world/area_omo/omo_02/D9D510.c +++ b/src/world/area_omo/omo_02/D9D510.c @@ -56,4 +56,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_8024283C_D9FD0C); INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80242B5C_DA002C); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80242B70_DA0040); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index 3c29e3c094..e6cefd9193 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -64,7 +64,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024324C_DCFF1C); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024356C_DD023C); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80243580_DD0250); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802435B8_DD0288); diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index 5f99a47bd6..ec96ab11c7 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -58,4 +58,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802433A0_DF2240); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802436C0_DF2560); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802436D4_DF2574); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/common/GetEncounterEnemyIsOwner.inc.c b/src/world/common/GetEncounterEnemyIsOwner.inc.c new file mode 100644 index 0000000000..5104d73901 --- /dev/null +++ b/src/world/common/GetEncounterEnemyIsOwner.inc.c @@ -0,0 +1,9 @@ +#include "common.h" +#include "map.h" + +static ApiStatus GetEncounterEnemyIsOwner(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + + set_variable(script, SI_VAR(0), gCurrentEncounter.currentEnemy == enemy); + return ApiStatus_DONE2; +} From 266e94ddfda425b7ef9b7f3ab59380403d3b9350 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 20 Nov 2020 18:00:44 -0500 Subject: [PATCH 10/38] UnkSetDurationFunc --- .../iwa_01/90FBD0/func_80241F6C_91161C.s | 30 +++++++++---------- .../kpa_09/A4F0A0/func_802404D4_A4F4D4.s | 2 +- .../kpa_09/A4F0A0/func_80240F94_A4FF94.s | 2 +- .../kpa_102/A93A50/func_80240744_A93E84.s | 2 +- .../kpa_102/A93A50/func_80241204_A94944.s | 2 +- .../kpa_111/A99590/func_802405A4_A99B34.s | 2 +- .../kpa_111/A99590/func_80241064_A9A5F4.s | 2 +- .../kpa_115/A9ED40/func_802405A4_A9F2E4.s | 2 +- .../kpa_115/A9ED40/func_80241064_A9FDA4.s | 2 +- .../kpa_50/A609D0/func_80240434_A60E04.s | 2 +- .../kpa_50/A609D0/func_80240EF4_A618C4.s | 2 +- .../kpa_52/A671E0/func_80240514_A67614.s | 2 +- .../kpa_52/A671E0/func_80240FD4_A680D4.s | 2 +- .../omo_02/D9D510/func_80241D7C_D9F24C.s | 2 +- .../omo_02/D9D510/func_8024283C_D9FD0C.s | 2 +- .../omo_09/DCD6B0/func_8024278C_DCF45C.s | 2 +- .../omo_09/DCD6B0/func_8024324C_DCFF1C.s | 2 +- .../omo_17/DEF400/func_802428E0_DF1780.s | 2 +- .../omo_17/DEF400/func_802433A0_DF2240.s | 2 +- src/world/area_iwa/iwa_01/90FBD0.c | 2 +- src/world/area_kpa/kpa_09/A4F0A0.c | 2 +- src/world/area_kpa/kpa_102/A93A50.c | 2 +- src/world/area_kpa/kpa_111/A99590.c | 2 +- src/world/area_kpa/kpa_115/A9ED40.c | 2 +- src/world/area_kpa/kpa_50/A609D0.c | 2 +- src/world/area_kpa/kpa_52/A671E0.c | 2 +- src/world/area_omo/omo_02/D9D510.c | 2 +- src/world/area_omo/omo_09/DCD6B0.c | 2 +- src/world/area_omo/omo_17/DEF400.c | 2 +- src/world/common/UnkSetDurationFunc.inc.c | 9 ++++++ 30 files changed, 52 insertions(+), 43 deletions(-) create mode 100644 src/world/common/UnkSetDurationFunc.inc.c diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s index 4f897974d1..3a79951a46 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s @@ -46,7 +46,7 @@ glabel func_80241F6C_91161C /* 9116C0 80242010 8E4200B0 */ lw $v0, 0xb0($s2) /* 9116C4 80242014 30420004 */ andi $v0, $v0, 4 /* 9116C8 80242018 1040002F */ beqz $v0, .L802420D8 -/* 9116CC 8024201C 00000000 */ nop +/* 9116CC 8024201C 00000000 */ nop .L80242020: /* 9116D0 80242020 2404F7FF */ addiu $a0, $zero, -0x801 /* 9116D4 80242024 AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80241F6C_91161C /* 91179C 802420EC 00220821 */ addu $at, $at, $v0 /* 9117A0 802420F0 8C226430 */ lw $v0, 0x6430($at) /* 9117A4 802420F4 00400008 */ jr $v0 -/* 9117A8 802420F8 00000000 */ nop +/* 9117A8 802420F8 00000000 */ nop /* 9117AC 802420FC 0260202D */ daddu $a0, $s3, $zero /* 9117B0 80242100 0200282D */ daddu $a1, $s0, $zero /* 9117B4 80242104 0C012568 */ jal func_800495A0 @@ -117,7 +117,7 @@ glabel func_80241F6C_91161C /* 9117C4 80242114 0C0125AE */ jal func_800496B8 /* 9117C8 80242118 02A0302D */ daddu $a2, $s5, $zero /* 9117CC 8024211C 08090899 */ j .L80242264 -/* 9117D0 80242120 00000000 */ nop +/* 9117D0 80242120 00000000 */ nop /* 9117D4 80242124 0260202D */ daddu $a0, $s3, $zero /* 9117D8 80242128 0200282D */ daddu $a1, $s0, $zero /* 9117DC 8024212C 0C0126D1 */ jal func_80049B44 @@ -127,7 +127,7 @@ glabel func_80241F6C_91161C /* 9117EC 8024213C 0C012701 */ jal func_80049C04 /* 9117F0 80242140 02A0302D */ daddu $a2, $s5, $zero /* 9117F4 80242144 08090899 */ j .L80242264 -/* 9117F8 80242148 00000000 */ nop +/* 9117F8 80242148 00000000 */ nop /* 9117FC 8024214C 0260202D */ daddu $a0, $s3, $zero /* 911800 80242150 0200282D */ daddu $a1, $s0, $zero /* 911804 80242154 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80241F6C_91161C /* 911814 80242164 0C0127B3 */ jal func_80049ECC /* 911818 80242168 02A0302D */ daddu $a2, $s5, $zero /* 91181C 8024216C 08090899 */ j .L80242264 -/* 911820 80242170 00000000 */ nop +/* 911820 80242170 00000000 */ nop /* 911824 80242174 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 911828 80242178 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 91182C 8024217C C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80241F6C_91161C /* 911844 80242194 10400008 */ beqz $v0, .L802421B8 /* 911848 80242198 46000086 */ mov.s $f2, $f0 /* 91184C 8024219C 44820000 */ mtc1 $v0, $f0 -/* 911850 802421A0 00000000 */ nop +/* 911850 802421A0 00000000 */ nop /* 911854 802421A4 46800020 */ cvt.s.w $f0, $f0 /* 911858 802421A8 4602003C */ c.lt.s $f0, $f2 -/* 91185C 802421AC 00000000 */ nop +/* 91185C 802421AC 00000000 */ nop /* 911860 802421B0 4500000B */ bc1f .L802421E0 /* 911864 802421B4 0260202D */ daddu $a0, $s3, $zero .L802421B8: @@ -164,7 +164,7 @@ glabel func_80241F6C_91161C /* 91187C 802421CC 8E630070 */ lw $v1, 0x70($s3) /* 911880 802421D0 2402000C */ addiu $v0, $zero, 0xc /* 911884 802421D4 14620023 */ bne $v1, $v0, .L80242264 -/* 911888 802421D8 00000000 */ nop +/* 911888 802421D8 00000000 */ nop /* 91188C 802421DC 0260202D */ daddu $a0, $s3, $zero .L802421E0: /* 911890 802421E0 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80241F6C_91161C /* 9118A4 802421F4 0C012849 */ jal func_8004A124 /* 9118A8 802421F8 02A0302D */ daddu $a2, $s5, $zero /* 9118AC 802421FC 08090899 */ j .L80242264 -/* 9118B0 80242200 00000000 */ nop +/* 9118B0 80242200 00000000 */ nop /* 9118B4 80242204 0260202D */ daddu $a0, $s3, $zero /* 9118B8 80242208 0200282D */ daddu $a1, $s0, $zero /* 9118BC 8024220C 0C0128FA */ jal func_8004A3E8 /* 9118C0 80242210 02A0302D */ daddu $a2, $s5, $zero /* 9118C4 80242214 08090899 */ j .L80242264 -/* 9118C8 80242218 00000000 */ nop +/* 9118C8 80242218 00000000 */ nop /* 9118CC 8024221C 0C090215 */ jal func_80240854_90FF04 /* 9118D0 80242220 0260202D */ daddu $a0, $s3, $zero /* 9118D4 80242224 08090899 */ j .L80242264 -/* 9118D8 80242228 00000000 */ nop -/* 9118DC 8024222C 0C090255 */ jal func_80240954_910004 +/* 9118D8 80242228 00000000 */ nop +/* 9118DC 8024222C 0C090255 */ jal UnkSetDurationFunc /* 9118E0 80242230 0260202D */ daddu $a0, $s3, $zero /* 9118E4 80242234 08090899 */ j .L80242264 -/* 9118E8 80242238 00000000 */ nop +/* 9118E8 80242238 00000000 */ nop /* 9118EC 8024223C 0C090266 */ jal func_80240998_910048 /* 9118F0 80242240 0260202D */ daddu $a0, $s3, $zero /* 9118F4 80242244 08090899 */ j .L80242264 -/* 9118F8 80242248 00000000 */ nop +/* 9118F8 80242248 00000000 */ nop /* 9118FC 8024224C 0C09028E */ jal func_80240A38_9100E8 /* 911900 80242250 0260202D */ daddu $a0, $s3, $zero /* 911904 80242254 08090899 */ j .L80242264 -/* 911908 80242258 00000000 */ nop +/* 911908 80242258 00000000 */ nop /* 91190C 8024225C 0C0129CF */ jal func_8004A73C /* 911910 80242260 0260202D */ daddu $a0, $s3, $zero .L80242264: diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802404D4_A4F4D4.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802404D4_A4F4D4.s index f7fa132325..0870874688 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802404D4_A4F4D4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802404D4_A4F4D4.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802404D4_A4F4D4 +glabel UnkSetDurationFunc /* A4F4D4 802404D4 27BDFFE0 */ addiu $sp, $sp, -0x20 /* A4F4D8 802404D8 AFB10014 */ sw $s1, 0x14($sp) /* A4F4DC 802404DC 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s index 0c81f6627b..76bf8244e1 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s @@ -186,7 +186,7 @@ glabel func_80240F94_A4FF94 /* A50248 80241248 0260202D */ daddu $a0, $s3, $zero /* A5024C 8024124C 080904A3 */ j .L8024128C /* A50250 80241250 00000000 */ nop -/* A50254 80241254 0C090135 */ jal func_802404D4_A4F4D4 +/* A50254 80241254 0C090135 */ jal UnkSetDurationFunc /* A50258 80241258 0260202D */ daddu $a0, $s3, $zero /* A5025C 8024125C 080904A3 */ j .L8024128C /* A50260 80241260 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s index 30bba8bac4..200bede539 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80240744_A93E84 +glabel UnkSetDurationFunc /* A93E84 80240744 27BDFFE0 */ addiu $sp, $sp, -0x20 /* A93E88 80240748 AFB10014 */ sw $s1, 0x14($sp) /* A93E8C 8024074C 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s index a870b7a8f0..ae10bb1ac8 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s @@ -186,7 +186,7 @@ glabel func_80241204_A94944 /* A94BF8 802414B8 0260202D */ daddu $a0, $s3, $zero /* A94BFC 802414BC 0809053F */ j .L802414FC /* A94C00 802414C0 00000000 */ nop -/* A94C04 802414C4 0C0901D1 */ jal func_80240744_A93E84 +/* A94C04 802414C4 0C0901D1 */ jal UnkSetDurationFunc /* A94C08 802414C8 0260202D */ daddu $a0, $s3, $zero /* A94C0C 802414CC 0809053F */ j .L802414FC /* A94C10 802414D0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405A4_A99B34.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405A4_A99B34.s index b433994234..99bd529326 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405A4_A99B34.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405A4_A99B34.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802405A4_A99B34 +glabel UnkSetDurationFunc /* A99B34 802405A4 27BDFFE0 */ addiu $sp, $sp, -0x20 /* A99B38 802405A8 AFB10014 */ sw $s1, 0x14($sp) /* A99B3C 802405AC 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s index 06dea9a1b9..c4e4157e13 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s @@ -186,7 +186,7 @@ glabel func_80241064_A9A5F4 /* A9A8A8 80241318 0260202D */ daddu $a0, $s3, $zero /* A9A8AC 8024131C 080904D7 */ j .L8024135C /* A9A8B0 80241320 00000000 */ nop -/* A9A8B4 80241324 0C090169 */ jal func_802405A4_A99B34 +/* A9A8B4 80241324 0C090169 */ jal UnkSetDurationFunc /* A9A8B8 80241328 0260202D */ daddu $a0, $s3, $zero /* A9A8BC 8024132C 080904D7 */ j .L8024135C /* A9A8C0 80241330 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405A4_A9F2E4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405A4_A9F2E4.s index 051c7d201b..efbe6554a6 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405A4_A9F2E4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405A4_A9F2E4.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802405A4_A9F2E4 +glabel UnkSetDurationFunc /* A9F2E4 802405A4 27BDFFE0 */ addiu $sp, $sp, -0x20 /* A9F2E8 802405A8 AFB10014 */ sw $s1, 0x14($sp) /* A9F2EC 802405AC 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s index a5f11e2249..1d2422436d 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s @@ -186,7 +186,7 @@ glabel func_80241064_A9FDA4 /* AA0058 80241318 0260202D */ daddu $a0, $s3, $zero /* AA005C 8024131C 080904D7 */ j .L8024135C /* AA0060 80241320 00000000 */ nop -/* AA0064 80241324 0C090169 */ jal func_802405A4_A9F2E4 +/* AA0064 80241324 0C090169 */ jal UnkSetDurationFunc /* AA0068 80241328 0260202D */ daddu $a0, $s3, $zero /* AA006C 8024132C 080904D7 */ j .L8024135C /* AA0070 80241330 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240434_A60E04.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240434_A60E04.s index 62108dbe19..4686f622aa 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240434_A60E04.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240434_A60E04.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80240434_A60E04 +glabel UnkSetDurationFunc /* A60E04 80240434 27BDFFE0 */ addiu $sp, $sp, -0x20 /* A60E08 80240438 AFB10014 */ sw $s1, 0x14($sp) /* A60E0C 8024043C 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s index 391e8bf717..a4e0aec796 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s @@ -186,7 +186,7 @@ glabel func_80240EF4_A618C4 /* A61B78 802411A8 0260202D */ daddu $a0, $s3, $zero /* A61B7C 802411AC 0809047B */ j .L802411EC /* A61B80 802411B0 00000000 */ nop -/* A61B84 802411B4 0C09010D */ jal func_80240434_A60E04 +/* A61B84 802411B4 0C09010D */ jal UnkSetDurationFunc /* A61B88 802411B8 0260202D */ daddu $a0, $s3, $zero /* A61B8C 802411BC 0809047B */ j .L802411EC /* A61B90 802411C0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240514_A67614.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240514_A67614.s index 90046ce125..4f04470e70 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240514_A67614.s +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240514_A67614.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80240514_A67614 +glabel UnkSetDurationFunc /* A67614 80240514 27BDFFE0 */ addiu $sp, $sp, -0x20 /* A67618 80240518 AFB10014 */ sw $s1, 0x14($sp) /* A6761C 8024051C 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s index 12cd949e49..af063492dc 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s @@ -186,7 +186,7 @@ glabel func_80240FD4_A680D4 /* A68388 80241288 0260202D */ daddu $a0, $s3, $zero /* A6838C 8024128C 080904B3 */ j .L802412CC /* A68390 80241290 00000000 */ nop -/* A68394 80241294 0C090145 */ jal func_80240514_A67614 +/* A68394 80241294 0C090145 */ jal UnkSetDurationFunc /* A68398 80241298 0260202D */ daddu $a0, $s3, $zero /* A6839C 8024129C 080904B3 */ j .L802412CC /* A683A0 802412A0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241D7C_D9F24C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241D7C_D9F24C.s index e21409c4d8..8edbbc232a 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241D7C_D9F24C.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241D7C_D9F24C.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80241D7C_D9F24C +glabel UnkSetDurationFunc /* D9F24C 80241D7C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* D9F250 80241D80 AFB10014 */ sw $s1, 0x14($sp) /* D9F254 80241D84 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s index 43a4c79f9c..96d75154bd 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s @@ -186,7 +186,7 @@ glabel func_8024283C_D9FD0C /* D9FFC0 80242AF0 0260202D */ daddu $a0, $s3, $zero /* D9FFC4 80242AF4 08090ACD */ j .L80242B34 /* D9FFC8 80242AF8 00000000 */ nop -/* D9FFCC 80242AFC 0C09075F */ jal func_80241D7C_D9F24C +/* D9FFCC 80242AFC 0C09075F */ jal UnkSetDurationFunc /* D9FFD0 80242B00 0260202D */ daddu $a0, $s3, $zero /* D9FFD4 80242B04 08090ACD */ j .L80242B34 /* D9FFD8 80242B08 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s index ece5c8ac3c..1c6f75d13f 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8024278C_DCF45C +glabel UnkSetDurationFunc /* DCF45C 8024278C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* DCF460 80242790 AFB10014 */ sw $s1, 0x14($sp) /* DCF464 80242794 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s index b42d328927..f93ad892cd 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s @@ -186,7 +186,7 @@ glabel func_8024324C_DCFF1C /* DD01D0 80243500 0260202D */ daddu $a0, $s3, $zero /* DD01D4 80243504 08090D51 */ j .L80243544 /* DD01D8 80243508 00000000 */ nop -/* DD01DC 8024350C 0C0909E3 */ jal func_8024278C_DCF45C +/* DD01DC 8024350C 0C0909E3 */ jal UnkSetDurationFunc /* DD01E0 80243510 0260202D */ daddu $a0, $s3, $zero /* DD01E4 80243514 08090D51 */ j .L80243544 /* DD01E8 80243518 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802428E0_DF1780.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802428E0_DF1780.s index a163fa1c95..f463d4ee4d 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802428E0_DF1780.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802428E0_DF1780.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802428E0_DF1780 +glabel UnkSetDurationFunc /* DF1780 802428E0 27BDFFE0 */ addiu $sp, $sp, -0x20 /* DF1784 802428E4 AFB10014 */ sw $s1, 0x14($sp) /* DF1788 802428E8 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s index 29086d5938..7162257d52 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s @@ -186,7 +186,7 @@ glabel func_802433A0_DF2240 /* DF24F4 80243654 0260202D */ daddu $a0, $s3, $zero /* DF24F8 80243658 08090DA6 */ j .L80243698 /* DF24FC 8024365C 00000000 */ nop -/* DF2500 80243660 0C090A38 */ jal func_802428E0_DF1780 +/* DF2500 80243660 0C090A38 */ jal UnkSetDurationFunc /* DF2504 80243664 0260202D */ daddu $a0, $s3, $zero /* DF2508 80243668 08090DA6 */ j .L80243698 /* DF250C 8024366C 00000000 */ nop diff --git a/src/world/area_iwa/iwa_01/90FBD0.c b/src/world/area_iwa/iwa_01/90FBD0.c index 80bae76a5c..3b3d44b4ee 100644 --- a/src/world/area_iwa/iwa_01/90FBD0.c +++ b/src/world/area_iwa/iwa_01/90FBD0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240710_90FDC0); INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240854_90FF04); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240954_910004); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240998_910048); diff --git a/src/world/area_kpa/kpa_09/A4F0A0.c b/src/world/area_kpa/kpa_09/A4F0A0.c index d743fdfada..e862319622 100644 --- a/src/world/area_kpa/kpa_09/A4F0A0.c +++ b/src/world/area_kpa/kpa_09/A4F0A0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240290_A4F290); INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802403D4_A4F3D4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802404D4_A4F4D4); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240518_A4F518); diff --git a/src/world/area_kpa/kpa_102/A93A50.c b/src/world/area_kpa/kpa_102/A93A50.c index 9dfe396b46..821ea121f7 100644 --- a/src/world/area_kpa/kpa_102/A93A50.c +++ b/src/world/area_kpa/kpa_102/A93A50.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240500_A93C40); INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240644_A93D84); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240744_A93E84); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240788_A93EC8); diff --git a/src/world/area_kpa/kpa_111/A99590.c b/src/world/area_kpa/kpa_111/A99590.c index fa015f3ce2..6d37aca4a8 100644 --- a/src/world/area_kpa/kpa_111/A99590.c +++ b/src/world/area_kpa/kpa_111/A99590.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80240360_A998F0); INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802404A4_A99A34); -INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802405A4_A99B34); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802405E8_A99B78); diff --git a/src/world/area_kpa/kpa_115/A9ED40.c b/src/world/area_kpa/kpa_115/A9ED40.c index 18a449af2e..5b0b901907 100644 --- a/src/world/area_kpa/kpa_115/A9ED40.c +++ b/src/world/area_kpa/kpa_115/A9ED40.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_80240360_A9F0A0); INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_802404A4_A9F1E4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_802405A4_A9F2E4); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_802405E8_A9F328); diff --git a/src/world/area_kpa/kpa_50/A609D0.c b/src/world/area_kpa/kpa_50/A609D0.c index bd09c0f292..c1ab9fc7ef 100644 --- a/src/world/area_kpa/kpa_50/A609D0.c +++ b/src/world/area_kpa/kpa_50/A609D0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_802401F0_A60BC0); INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240334_A60D04); -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240434_A60E04); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240478_A60E48); diff --git a/src/world/area_kpa/kpa_52/A671E0.c b/src/world/area_kpa/kpa_52/A671E0.c index 60ecd38b10..f1442ec7c4 100644 --- a/src/world/area_kpa/kpa_52/A671E0.c +++ b/src/world/area_kpa/kpa_52/A671E0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_802402D0_A673D0); INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240414_A67514); -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240514_A67614); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240558_A67658); diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c index 4309be5666..9b12ed7cb0 100644 --- a/src/world/area_omo/omo_02/D9D510.c +++ b/src/world/area_omo/omo_02/D9D510.c @@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241B38_D9F008); INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241C7C_D9F14C); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241D7C_D9F24C); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241DC0_D9F290); diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index e6cefd9193..121afd9eef 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -50,7 +50,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80242548_DCF218); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024268C_DCF35C); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024278C_DCF45C); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802427D0_DCF4A0); diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index ec96ab11c7..9db434890b 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_8024269C_DF153C); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802427E0_DF1680); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802428E0_DF1780); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80242924_DF17C4); diff --git a/src/world/common/UnkSetDurationFunc.inc.c b/src/world/common/UnkSetDurationFunc.inc.c new file mode 100644 index 0000000000..33de10476d --- /dev/null +++ b/src/world/common/UnkSetDurationFunc.inc.c @@ -0,0 +1,9 @@ +#include "common.h" +#include "map.h" + +static void UnkSetDurationFunc(ScriptInstance* script) { + Enemy* enemy = script->owner1.enemy; + + get_npc_unsafe(enemy->npcID)->duration = enemy->varTable[2]; + script->functionTemp[0].s = 33; +} From bfa719011a44c95ebc5863366bd6009d878a4e95 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 20 Nov 2020 18:01:08 -0500 Subject: [PATCH 11/38] Removing extras --- .../iwa_01/90FBD0/func_80240954_910004.s | 21 ------------------- .../kpa_09/A4F0A0/func_802404D4_A4F4D4.s | 21 ------------------- .../kpa_102/A93A50/func_80240744_A93E84.s | 21 ------------------- .../kpa_111/A99590/func_802405A4_A99B34.s | 21 ------------------- .../kpa_115/A9ED40/func_802405A4_A9F2E4.s | 21 ------------------- .../kpa_50/A609D0/func_80240434_A60E04.s | 21 ------------------- .../kpa_52/A671E0/func_80240514_A67614.s | 21 ------------------- .../omo_02/D9D510/func_80241D7C_D9F24C.s | 21 ------------------- .../omo_09/DCD6B0/func_8024278C_DCF45C.s | 21 ------------------- .../omo_17/DEF400/func_802428E0_DF1780.s | 21 ------------------- 10 files changed, 210 deletions(-) delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240954_910004.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802404D4_A4F4D4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405A4_A99B34.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405A4_A9F2E4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240434_A60E04.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240514_A67614.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241D7C_D9F24C.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802428E0_DF1780.s diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240954_910004.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240954_910004.s deleted file mode 100644 index e936bd2749..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240954_910004.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240954_910004 -/* 910004 80240954 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 910008 80240958 AFB10014 */ sw $s1, 0x14($sp) -/* 91000C 8024095C 0080882D */ daddu $s1, $a0, $zero -/* 910010 80240960 AFBF0018 */ sw $ra, 0x18($sp) -/* 910014 80240964 AFB00010 */ sw $s0, 0x10($sp) -/* 910018 80240968 8E300148 */ lw $s0, 0x148($s1) -/* 91001C 8024096C 0C00EABB */ jal get_npc_unsafe -/* 910020 80240970 86040008 */ lh $a0, 8($s0) -/* 910024 80240974 96030076 */ lhu $v1, 0x76($s0) -/* 910028 80240978 A443008E */ sh $v1, 0x8e($v0) -/* 91002C 8024097C 24020021 */ addiu $v0, $zero, 0x21 -/* 910030 80240980 AE220070 */ sw $v0, 0x70($s1) -/* 910034 80240984 8FBF0018 */ lw $ra, 0x18($sp) -/* 910038 80240988 8FB10014 */ lw $s1, 0x14($sp) -/* 91003C 8024098C 8FB00010 */ lw $s0, 0x10($sp) -/* 910040 80240990 03E00008 */ jr $ra -/* 910044 80240994 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802404D4_A4F4D4.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802404D4_A4F4D4.s deleted file mode 100644 index 0870874688..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802404D4_A4F4D4.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkSetDurationFunc -/* A4F4D4 802404D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4F4D8 802404D8 AFB10014 */ sw $s1, 0x14($sp) -/* A4F4DC 802404DC 0080882D */ daddu $s1, $a0, $zero -/* A4F4E0 802404E0 AFBF0018 */ sw $ra, 0x18($sp) -/* A4F4E4 802404E4 AFB00010 */ sw $s0, 0x10($sp) -/* A4F4E8 802404E8 8E300148 */ lw $s0, 0x148($s1) -/* A4F4EC 802404EC 0C00EABB */ jal get_npc_unsafe -/* A4F4F0 802404F0 86040008 */ lh $a0, 8($s0) -/* A4F4F4 802404F4 96030076 */ lhu $v1, 0x76($s0) -/* A4F4F8 802404F8 A443008E */ sh $v1, 0x8e($v0) -/* A4F4FC 802404FC 24020021 */ addiu $v0, $zero, 0x21 -/* A4F500 80240500 AE220070 */ sw $v0, 0x70($s1) -/* A4F504 80240504 8FBF0018 */ lw $ra, 0x18($sp) -/* A4F508 80240508 8FB10014 */ lw $s1, 0x14($sp) -/* A4F50C 8024050C 8FB00010 */ lw $s0, 0x10($sp) -/* A4F510 80240510 03E00008 */ jr $ra -/* A4F514 80240514 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s deleted file mode 100644 index 200bede539..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkSetDurationFunc -/* A93E84 80240744 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A93E88 80240748 AFB10014 */ sw $s1, 0x14($sp) -/* A93E8C 8024074C 0080882D */ daddu $s1, $a0, $zero -/* A93E90 80240750 AFBF0018 */ sw $ra, 0x18($sp) -/* A93E94 80240754 AFB00010 */ sw $s0, 0x10($sp) -/* A93E98 80240758 8E300148 */ lw $s0, 0x148($s1) -/* A93E9C 8024075C 0C00EABB */ jal get_npc_unsafe -/* A93EA0 80240760 86040008 */ lh $a0, 8($s0) -/* A93EA4 80240764 96030076 */ lhu $v1, 0x76($s0) -/* A93EA8 80240768 A443008E */ sh $v1, 0x8e($v0) -/* A93EAC 8024076C 24020021 */ addiu $v0, $zero, 0x21 -/* A93EB0 80240770 AE220070 */ sw $v0, 0x70($s1) -/* A93EB4 80240774 8FBF0018 */ lw $ra, 0x18($sp) -/* A93EB8 80240778 8FB10014 */ lw $s1, 0x14($sp) -/* A93EBC 8024077C 8FB00010 */ lw $s0, 0x10($sp) -/* A93EC0 80240780 03E00008 */ jr $ra -/* A93EC4 80240784 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405A4_A99B34.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405A4_A99B34.s deleted file mode 100644 index 99bd529326..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405A4_A99B34.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkSetDurationFunc -/* A99B34 802405A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A99B38 802405A8 AFB10014 */ sw $s1, 0x14($sp) -/* A99B3C 802405AC 0080882D */ daddu $s1, $a0, $zero -/* A99B40 802405B0 AFBF0018 */ sw $ra, 0x18($sp) -/* A99B44 802405B4 AFB00010 */ sw $s0, 0x10($sp) -/* A99B48 802405B8 8E300148 */ lw $s0, 0x148($s1) -/* A99B4C 802405BC 0C00EABB */ jal get_npc_unsafe -/* A99B50 802405C0 86040008 */ lh $a0, 8($s0) -/* A99B54 802405C4 96030076 */ lhu $v1, 0x76($s0) -/* A99B58 802405C8 A443008E */ sh $v1, 0x8e($v0) -/* A99B5C 802405CC 24020021 */ addiu $v0, $zero, 0x21 -/* A99B60 802405D0 AE220070 */ sw $v0, 0x70($s1) -/* A99B64 802405D4 8FBF0018 */ lw $ra, 0x18($sp) -/* A99B68 802405D8 8FB10014 */ lw $s1, 0x14($sp) -/* A99B6C 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* A99B70 802405E0 03E00008 */ jr $ra -/* A99B74 802405E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405A4_A9F2E4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405A4_A9F2E4.s deleted file mode 100644 index efbe6554a6..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405A4_A9F2E4.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkSetDurationFunc -/* A9F2E4 802405A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A9F2E8 802405A8 AFB10014 */ sw $s1, 0x14($sp) -/* A9F2EC 802405AC 0080882D */ daddu $s1, $a0, $zero -/* A9F2F0 802405B0 AFBF0018 */ sw $ra, 0x18($sp) -/* A9F2F4 802405B4 AFB00010 */ sw $s0, 0x10($sp) -/* A9F2F8 802405B8 8E300148 */ lw $s0, 0x148($s1) -/* A9F2FC 802405BC 0C00EABB */ jal get_npc_unsafe -/* A9F300 802405C0 86040008 */ lh $a0, 8($s0) -/* A9F304 802405C4 96030076 */ lhu $v1, 0x76($s0) -/* A9F308 802405C8 A443008E */ sh $v1, 0x8e($v0) -/* A9F30C 802405CC 24020021 */ addiu $v0, $zero, 0x21 -/* A9F310 802405D0 AE220070 */ sw $v0, 0x70($s1) -/* A9F314 802405D4 8FBF0018 */ lw $ra, 0x18($sp) -/* A9F318 802405D8 8FB10014 */ lw $s1, 0x14($sp) -/* A9F31C 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* A9F320 802405E0 03E00008 */ jr $ra -/* A9F324 802405E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240434_A60E04.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240434_A60E04.s deleted file mode 100644 index 4686f622aa..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240434_A60E04.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkSetDurationFunc -/* A60E04 80240434 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A60E08 80240438 AFB10014 */ sw $s1, 0x14($sp) -/* A60E0C 8024043C 0080882D */ daddu $s1, $a0, $zero -/* A60E10 80240440 AFBF0018 */ sw $ra, 0x18($sp) -/* A60E14 80240444 AFB00010 */ sw $s0, 0x10($sp) -/* A60E18 80240448 8E300148 */ lw $s0, 0x148($s1) -/* A60E1C 8024044C 0C00EABB */ jal get_npc_unsafe -/* A60E20 80240450 86040008 */ lh $a0, 8($s0) -/* A60E24 80240454 96030076 */ lhu $v1, 0x76($s0) -/* A60E28 80240458 A443008E */ sh $v1, 0x8e($v0) -/* A60E2C 8024045C 24020021 */ addiu $v0, $zero, 0x21 -/* A60E30 80240460 AE220070 */ sw $v0, 0x70($s1) -/* A60E34 80240464 8FBF0018 */ lw $ra, 0x18($sp) -/* A60E38 80240468 8FB10014 */ lw $s1, 0x14($sp) -/* A60E3C 8024046C 8FB00010 */ lw $s0, 0x10($sp) -/* A60E40 80240470 03E00008 */ jr $ra -/* A60E44 80240474 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240514_A67614.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240514_A67614.s deleted file mode 100644 index 4f04470e70..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240514_A67614.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkSetDurationFunc -/* A67614 80240514 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A67618 80240518 AFB10014 */ sw $s1, 0x14($sp) -/* A6761C 8024051C 0080882D */ daddu $s1, $a0, $zero -/* A67620 80240520 AFBF0018 */ sw $ra, 0x18($sp) -/* A67624 80240524 AFB00010 */ sw $s0, 0x10($sp) -/* A67628 80240528 8E300148 */ lw $s0, 0x148($s1) -/* A6762C 8024052C 0C00EABB */ jal get_npc_unsafe -/* A67630 80240530 86040008 */ lh $a0, 8($s0) -/* A67634 80240534 96030076 */ lhu $v1, 0x76($s0) -/* A67638 80240538 A443008E */ sh $v1, 0x8e($v0) -/* A6763C 8024053C 24020021 */ addiu $v0, $zero, 0x21 -/* A67640 80240540 AE220070 */ sw $v0, 0x70($s1) -/* A67644 80240544 8FBF0018 */ lw $ra, 0x18($sp) -/* A67648 80240548 8FB10014 */ lw $s1, 0x14($sp) -/* A6764C 8024054C 8FB00010 */ lw $s0, 0x10($sp) -/* A67650 80240550 03E00008 */ jr $ra -/* A67654 80240554 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241D7C_D9F24C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241D7C_D9F24C.s deleted file mode 100644 index 8edbbc232a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241D7C_D9F24C.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkSetDurationFunc -/* D9F24C 80241D7C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D9F250 80241D80 AFB10014 */ sw $s1, 0x14($sp) -/* D9F254 80241D84 0080882D */ daddu $s1, $a0, $zero -/* D9F258 80241D88 AFBF0018 */ sw $ra, 0x18($sp) -/* D9F25C 80241D8C AFB00010 */ sw $s0, 0x10($sp) -/* D9F260 80241D90 8E300148 */ lw $s0, 0x148($s1) -/* D9F264 80241D94 0C00EABB */ jal get_npc_unsafe -/* D9F268 80241D98 86040008 */ lh $a0, 8($s0) -/* D9F26C 80241D9C 96030076 */ lhu $v1, 0x76($s0) -/* D9F270 80241DA0 A443008E */ sh $v1, 0x8e($v0) -/* D9F274 80241DA4 24020021 */ addiu $v0, $zero, 0x21 -/* D9F278 80241DA8 AE220070 */ sw $v0, 0x70($s1) -/* D9F27C 80241DAC 8FBF0018 */ lw $ra, 0x18($sp) -/* D9F280 80241DB0 8FB10014 */ lw $s1, 0x14($sp) -/* D9F284 80241DB4 8FB00010 */ lw $s0, 0x10($sp) -/* D9F288 80241DB8 03E00008 */ jr $ra -/* D9F28C 80241DBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s deleted file mode 100644 index 1c6f75d13f..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkSetDurationFunc -/* DCF45C 8024278C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCF460 80242790 AFB10014 */ sw $s1, 0x14($sp) -/* DCF464 80242794 0080882D */ daddu $s1, $a0, $zero -/* DCF468 80242798 AFBF0018 */ sw $ra, 0x18($sp) -/* DCF46C 8024279C AFB00010 */ sw $s0, 0x10($sp) -/* DCF470 802427A0 8E300148 */ lw $s0, 0x148($s1) -/* DCF474 802427A4 0C00EABB */ jal get_npc_unsafe -/* DCF478 802427A8 86040008 */ lh $a0, 8($s0) -/* DCF47C 802427AC 96030076 */ lhu $v1, 0x76($s0) -/* DCF480 802427B0 A443008E */ sh $v1, 0x8e($v0) -/* DCF484 802427B4 24020021 */ addiu $v0, $zero, 0x21 -/* DCF488 802427B8 AE220070 */ sw $v0, 0x70($s1) -/* DCF48C 802427BC 8FBF0018 */ lw $ra, 0x18($sp) -/* DCF490 802427C0 8FB10014 */ lw $s1, 0x14($sp) -/* DCF494 802427C4 8FB00010 */ lw $s0, 0x10($sp) -/* DCF498 802427C8 03E00008 */ jr $ra -/* DCF49C 802427CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802428E0_DF1780.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802428E0_DF1780.s deleted file mode 100644 index f463d4ee4d..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802428E0_DF1780.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkSetDurationFunc -/* DF1780 802428E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DF1784 802428E4 AFB10014 */ sw $s1, 0x14($sp) -/* DF1788 802428E8 0080882D */ daddu $s1, $a0, $zero -/* DF178C 802428EC AFBF0018 */ sw $ra, 0x18($sp) -/* DF1790 802428F0 AFB00010 */ sw $s0, 0x10($sp) -/* DF1794 802428F4 8E300148 */ lw $s0, 0x148($s1) -/* DF1798 802428F8 0C00EABB */ jal get_npc_unsafe -/* DF179C 802428FC 86040008 */ lh $a0, 8($s0) -/* DF17A0 80242900 96030076 */ lhu $v1, 0x76($s0) -/* DF17A4 80242904 A443008E */ sh $v1, 0x8e($v0) -/* DF17A8 80242908 24020021 */ addiu $v0, $zero, 0x21 -/* DF17AC 8024290C AE220070 */ sw $v0, 0x70($s1) -/* DF17B0 80242910 8FBF0018 */ lw $ra, 0x18($sp) -/* DF17B4 80242914 8FB10014 */ lw $s1, 0x14($sp) -/* DF17B8 80242918 8FB00010 */ lw $s0, 0x10($sp) -/* DF17BC 8024291C 03E00008 */ jr $ra -/* DF17C0 80242920 27BD0020 */ addiu $sp, $sp, 0x20 From 2d3e328905fd9e7315fd3994a29e3851a20af6ae Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 21 Nov 2020 19:34:13 -0500 Subject: [PATCH 12/38] UnkDurationCheck --- Makefile | 4 ++++ .../arn_02/BDD1B0/func_80240C4C_BDDDFC.s | 22 ------------------- .../arn_02/BDD1B0/func_80240C90_BDDE40.s | 2 +- .../arn_04/BE37B0/func_80242FD4_BE6784.s | 22 ------------------- .../arn_04/BE37B0/func_80243018_BE67C8.s | 2 +- .../isk_05/97DAD0/func_80240BAC_97E67C.s | 22 ------------------- .../isk_05/97DAD0/func_80240BF0_97E6C0.s | 2 +- .../isk_05/97DAD0/func_80240F3C_97EA0C.s | 2 +- .../isk_13/98F7E0/func_80240BAC_99038C.s | 22 ------------------- .../isk_13/98F7E0/func_80240BF0_9903D0.s | 2 +- .../isk_13/98F7E0/func_80240F3C_99071C.s | 2 +- .../isk_14/992730/func_80240BAC_9932DC.s | 22 ------------------- .../isk_14/992730/func_80240BF0_993320.s | 2 +- .../isk_14/992730/func_80240F3C_99366C.s | 2 +- .../iwa_01/90FBD0/func_80240A38_9100E8.s | 22 ------------------- .../iwa_01/90FBD0/func_80241F6C_91161C.s | 2 +- .../iwa_02/915D70/func_80240C4C_9169BC.s | 22 ------------------- .../iwa_02/915D70/func_80240C90_916A00.s | 2 +- .../iwa_03/918EF0/func_80240F8C_919B3C.s | 22 ------------------- .../iwa_03/918EF0/func_80240FD0_919B80.s | 2 +- .../iwa_04/91B8E0/func_80240CCC_91C5AC.s | 22 ------------------- .../iwa_04/91B8E0/func_80240D10_91C5F0.s | 2 +- .../jan_01/B28030/func_80240EEC_B28F1C.s | 22 ------------------- .../jan_01/B28030/func_80240F30_B28F60.s | 2 +- .../jan_05/B4B260/func_80241450_B4BEC0.s | 22 ------------------- .../jan_05/B4B260/func_80241494_B4BF04.s | 2 +- .../jan_06/B52F70/func_802412EC_B53B1C.s | 22 ------------------- .../jan_06/B52F70/func_80241330_B53B60.s | 2 +- .../jan_10/B6C6A0/func_80240EBC_B6D24C.s | 22 ------------------- .../jan_10/B6C6A0/func_80240F00_B6D290.s | 2 +- .../jan_14/B7A510/func_8024106C_B7B0BC.s | 22 ------------------- .../jan_14/B7A510/func_802410B0_B7B100.s | 2 +- .../kpa_09/A4F0A0/func_802405B8_A4F5B8.s | 22 ------------------- .../kpa_09/A4F0A0/func_80240F94_A4FF94.s | 2 +- .../kpa_102/A93A50/func_80240828_A93F68.s | 22 ------------------- .../kpa_102/A93A50/func_80241204_A94944.s | 2 +- .../kpa_111/A99590/func_80240688_A99C18.s | 22 ------------------- .../kpa_111/A99590/func_80241064_A9A5F4.s | 2 +- .../kpa_115/A9ED40/func_80240688_A9F3C8.s | 22 ------------------- .../kpa_115/A9ED40/func_80241064_A9FDA4.s | 2 +- .../kpa_50/A609D0/func_80240518_A60EE8.s | 22 ------------------- .../kpa_50/A609D0/func_80240EF4_A618C4.s | 2 +- .../kpa_52/A671E0/func_802405F8_A676F8.s | 22 ------------------- .../kpa_52/A671E0/func_80240FD4_A680D4.s | 2 +- .../mim_02/B97C70/func_80240C1C_B9881C.s | 22 ------------------- .../mim_02/B97C70/func_80240C60_B98860.s | 2 +- .../mim_04/B9DB60/func_80240DAC_B9E70C.s | 22 ------------------- .../mim_04/B9DB60/func_80240DF0_B9E750.s | 2 +- .../mim_06/BA4CF0/func_80242AC0_BA7240.s | 22 ------------------- .../mim_06/BA4CF0/func_80242B04_BA7284.s | 2 +- .../mim_07/BAA3B0/func_80240E1C_BAAF5C.s | 22 ------------------- .../mim_07/BAA3B0/func_80240E60_BAAFA0.s | 2 +- .../mim_09/BB2E00/func_80240C4C_BB3A4C.s | 22 ------------------- .../mim_09/BB2E00/func_80240C90_BB3A90.s | 2 +- .../nok_03/9EB7F0/func_80240BAC_9EC39C.s | 22 ------------------- .../nok_03/9EB7F0/func_80240BF0_9EC3E0.s | 2 +- .../nok_13/A00600/func_80240BAC_A011AC.s | 22 ------------------- .../nok_13/A00600/func_80240BF0_A011F0.s | 2 +- .../nok_14/A02A00/func_80242188_A049C8.s | 22 ------------------- .../nok_14/A02A00/func_802421CC_A04A0C.s | 2 +- .../nok_15/A06F00/func_802422A8_A091A8.s | 22 ------------------- .../nok_15/A06F00/func_802422EC_A091EC.s | 2 +- .../omo_02/D9D510/func_80241E60_D9F330.s | 22 ------------------- .../omo_02/D9D510/func_8024283C_D9FD0C.s | 2 +- .../omo_09/DCD6B0/func_80242870_DCF540.s | 22 ------------------- .../omo_09/DCD6B0/func_8024324C_DCFF1C.s | 2 +- .../omo_17/DEF400/func_802429C4_DF1864.s | 22 ------------------- .../omo_17/DEF400/func_802433A0_DF2240.s | 2 +- .../trd_04/9A88A0/func_8024360C_9AB9FC.s | 22 ------------------- .../trd_04/9A88A0/func_80243650_9ABA40.s | 2 +- .../trd_07/9B6C90/func_802422D8_9B8C58.s | 22 ------------------- .../trd_07/9B6C90/func_8024231C_9B8C9C.s | 2 +- src/world/area_arn/arn_02/BDD1B0.c | 2 +- src/world/area_arn/arn_04/BE37B0.c | 2 +- src/world/area_isk/isk_05/97DAD0.c | 2 +- src/world/area_isk/isk_13/98F7E0.c | 2 +- src/world/area_isk/isk_14/992730.c | 2 +- src/world/area_iwa/iwa_01/90FBD0.c | 3 ++- src/world/area_iwa/iwa_02/915D70.c | 2 +- src/world/area_iwa/iwa_03/918EF0.c | 2 +- src/world/area_iwa/iwa_04/91B8E0.c | 2 +- src/world/area_jan/jan_01/B28030.c | 2 +- src/world/area_jan/jan_05/B4B260.c | 2 +- src/world/area_jan/jan_06/B52F70.c | 2 +- src/world/area_jan/jan_10/B6C6A0.c | 2 +- src/world/area_jan/jan_14/B7A510.c | 2 +- src/world/area_kpa/kpa_09/A4F0A0.c | 2 +- src/world/area_kpa/kpa_102/A93A50.c | 2 +- src/world/area_kpa/kpa_111/A99590.c | 2 +- src/world/area_kpa/kpa_115/A9ED40.c | 2 +- src/world/area_kpa/kpa_50/A609D0.c | 2 +- src/world/area_kpa/kpa_52/A671E0.c | 2 +- src/world/area_mim/mim_02/B97C70.c | 2 +- src/world/area_mim/mim_04/B9DB60.c | 2 +- src/world/area_mim/mim_06/BA4CF0.c | 2 +- src/world/area_mim/mim_07/BAA3B0.c | 2 +- src/world/area_mim/mim_09/BB2E00.c | 2 +- src/world/area_nok/nok_03/9EB7F0.c | 2 +- src/world/area_nok/nok_13/A00600.c | 2 +- src/world/area_nok/nok_14/A02A00.c | 2 +- src/world/area_nok/nok_15/A06F00.c | 2 +- src/world/area_omo/omo_02/D9D510.c | 2 +- src/world/area_omo/omo_09/DCD6B0.c | 2 +- src/world/area_omo/omo_17/DEF400.c | 2 +- src/world/area_trd/trd_04/9A88A0.c | 2 +- src/world/area_trd/trd_07/9B6C90.c | 2 +- src/world/common/UnkDurationCheck.inc.c | 11 ++++++++++ 107 files changed, 87 insertions(+), 819 deletions(-) delete mode 100644 asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C4C_BDDDFC.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242FD4_BE6784.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BAC_97E67C.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BAC_99038C.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BAC_9932DC.s delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240A38_9100E8.s delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C4C_9169BC.s delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F8C_919B3C.s delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240CCC_91C5AC.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240EEC_B28F1C.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241450_B4BEC0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802412EC_B53B1C.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240EBC_B6D24C.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_14/B7A510/func_8024106C_B7B0BC.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405B8_A4F5B8.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240828_A93F68.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240688_A99C18.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240688_A9F3C8.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240518_A60EE8.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802405F8_A676F8.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C1C_B9881C.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DAC_B9E70C.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242AC0_BA7240.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E1C_BAAF5C.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C4C_BB3A4C.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BAC_9EC39C.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BAC_A011AC.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242188_A049C8.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422A8_A091A8.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241E60_D9F330.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242870_DCF540.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802429C4_DF1864.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024360C_9AB9FC.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802422D8_9B8C58.s create mode 100644 src/world/common/UnkDurationCheck.inc.c diff --git a/Makefile b/Makefile index cf93519fb9..cb5ffe729d 100644 --- a/Makefile +++ b/Makefile @@ -77,6 +77,10 @@ endif include sources.mk +ifeq ($(PERMUTER),1) +override OBJECTS:=$(filter %.c.o, $(OBJECTS)) +endif + %.d: ; ifeq ($(WATCH_INCLUDES),1) diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C4C_BDDDFC.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C4C_BDDDFC.s deleted file mode 100644 index 61c1126312..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C4C_BDDDFC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_BDDDFC -/* BDDDFC 80240C4C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BDDE00 80240C50 AFB00010 */ sw $s0, 0x10($sp) -/* BDDE04 80240C54 0080802D */ daddu $s0, $a0, $zero -/* BDDE08 80240C58 AFBF0014 */ sw $ra, 0x14($sp) -/* BDDE0C 80240C5C 8E020148 */ lw $v0, 0x148($s0) -/* BDDE10 80240C60 0C00EABB */ jal get_npc_unsafe -/* BDDE14 80240C64 84440008 */ lh $a0, 8($v0) -/* BDDE18 80240C68 9443008E */ lhu $v1, 0x8e($v0) -/* BDDE1C 80240C6C 2463FFFF */ addiu $v1, $v1, -1 -/* BDDE20 80240C70 A443008E */ sh $v1, 0x8e($v0) -/* BDDE24 80240C74 00031C00 */ sll $v1, $v1, 0x10 -/* BDDE28 80240C78 58600001 */ blezl $v1, .L80240C80 -/* BDDE2C 80240C7C AE000070 */ sw $zero, 0x70($s0) -.L80240C80: -/* BDDE30 80240C80 8FBF0014 */ lw $ra, 0x14($sp) -/* BDDE34 80240C84 8FB00010 */ lw $s0, 0x10($sp) -/* BDDE38 80240C88 03E00008 */ jr $ra -/* BDDE3C 80240C8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s index a9a883d21c..a700f84246 100644 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s +++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s @@ -207,7 +207,7 @@ glabel func_80240C90_BDDE40 /* BDE154 80240FA4 0000102D */ daddu $v0, $zero, $zero /* BDE158 80240FA8 0260202D */ daddu $a0, $s3, $zero /* BDE15C 80240FAC 0280282D */ daddu $a1, $s4, $zero -/* BDE160 80240FB0 0C090313 */ jal func_80240C4C_BDDDFC +/* BDE160 80240FB0 0C090313 */ jal UnkDurationCheck /* BDE164 80240FB4 0200302D */ daddu $a2, $s0, $zero .L80240FB8: /* BDE168 80240FB8 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242FD4_BE6784.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242FD4_BE6784.s deleted file mode 100644 index f61b14e888..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242FD4_BE6784.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242FD4_BE6784 -/* BE6784 80242FD4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BE6788 80242FD8 AFB00010 */ sw $s0, 0x10($sp) -/* BE678C 80242FDC 0080802D */ daddu $s0, $a0, $zero -/* BE6790 80242FE0 AFBF0014 */ sw $ra, 0x14($sp) -/* BE6794 80242FE4 8E020148 */ lw $v0, 0x148($s0) -/* BE6798 80242FE8 0C00EABB */ jal get_npc_unsafe -/* BE679C 80242FEC 84440008 */ lh $a0, 8($v0) -/* BE67A0 80242FF0 9443008E */ lhu $v1, 0x8e($v0) -/* BE67A4 80242FF4 2463FFFF */ addiu $v1, $v1, -1 -/* BE67A8 80242FF8 A443008E */ sh $v1, 0x8e($v0) -/* BE67AC 80242FFC 00031C00 */ sll $v1, $v1, 0x10 -/* BE67B0 80243000 58600001 */ blezl $v1, .L80243008 -/* BE67B4 80243004 AE000070 */ sw $zero, 0x70($s0) -.L80243008: -/* BE67B8 80243008 8FBF0014 */ lw $ra, 0x14($sp) -/* BE67BC 8024300C 8FB00010 */ lw $s0, 0x10($sp) -/* BE67C0 80243010 03E00008 */ jr $ra -/* BE67C4 80243014 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s index f7c872a56f..ece2264f05 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s @@ -207,7 +207,7 @@ glabel func_80243018_BE67C8 /* BE6ADC 8024332C 0000102D */ daddu $v0, $zero, $zero /* BE6AE0 80243330 0260202D */ daddu $a0, $s3, $zero /* BE6AE4 80243334 0280282D */ daddu $a1, $s4, $zero -/* BE6AE8 80243338 0C090BF5 */ jal func_80242FD4_BE6784 +/* BE6AE8 80243338 0C090BF5 */ jal UnkDurationCheck /* BE6AEC 8024333C 0200302D */ daddu $a2, $s0, $zero .L80243340: /* BE6AF0 80243340 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BAC_97E67C.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BAC_97E67C.s deleted file mode 100644 index 22b1d220dd..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BAC_97E67C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BAC_97E67C -/* 97E67C 80240BAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 97E680 80240BB0 AFB00010 */ sw $s0, 0x10($sp) -/* 97E684 80240BB4 0080802D */ daddu $s0, $a0, $zero -/* 97E688 80240BB8 AFBF0014 */ sw $ra, 0x14($sp) -/* 97E68C 80240BBC 8E020148 */ lw $v0, 0x148($s0) -/* 97E690 80240BC0 0C00EABB */ jal get_npc_unsafe -/* 97E694 80240BC4 84440008 */ lh $a0, 8($v0) -/* 97E698 80240BC8 9443008E */ lhu $v1, 0x8e($v0) -/* 97E69C 80240BCC 2463FFFF */ addiu $v1, $v1, -1 -/* 97E6A0 80240BD0 A443008E */ sh $v1, 0x8e($v0) -/* 97E6A4 80240BD4 00031C00 */ sll $v1, $v1, 0x10 -/* 97E6A8 80240BD8 58600001 */ blezl $v1, .L80240BE0 -/* 97E6AC 80240BDC AE000070 */ sw $zero, 0x70($s0) -.L80240BE0: -/* 97E6B0 80240BE0 8FBF0014 */ lw $ra, 0x14($sp) -/* 97E6B4 80240BE4 8FB00010 */ lw $s0, 0x10($sp) -/* 97E6B8 80240BE8 03E00008 */ jr $ra -/* 97E6BC 80240BEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s index 2b01610267..c84e977603 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s @@ -129,7 +129,7 @@ glabel func_80240BF0_97E6C0 /* 97E8A8 80240DD8 0000102D */ daddu $v0, $zero, $zero /* 97E8AC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 97E8B0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 97E8B4 80240DE4 0C0902EB */ jal func_80240BAC_97E67C +/* 97E8B4 80240DE4 0C0902EB */ jal UnkDurationCheck /* 97E8B8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* 97E8BC 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s index 52deef631c..b8ec54257c 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s @@ -106,7 +106,7 @@ glabel func_80240F3C_97EA0C /* 97EB9C 802410CC 00000000 */ nop /* 97EBA0 802410D0 0280202D */ daddu $a0, $s4, $zero /* 97EBA4 802410D4 0200282D */ daddu $a1, $s0, $zero -/* 97EBA8 802410D8 0C0902EB */ jal func_80240BAC_97E67C +/* 97EBA8 802410D8 0C0902EB */ jal UnkDurationCheck /* 97EBAC 802410DC 0260302D */ daddu $a2, $s3, $zero .L802410E0: /* 97EBB0 802410E0 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BAC_99038C.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BAC_99038C.s deleted file mode 100644 index 66e706a3a9..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BAC_99038C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BAC_99038C -/* 99038C 80240BAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 990390 80240BB0 AFB00010 */ sw $s0, 0x10($sp) -/* 990394 80240BB4 0080802D */ daddu $s0, $a0, $zero -/* 990398 80240BB8 AFBF0014 */ sw $ra, 0x14($sp) -/* 99039C 80240BBC 8E020148 */ lw $v0, 0x148($s0) -/* 9903A0 80240BC0 0C00EABB */ jal get_npc_unsafe -/* 9903A4 80240BC4 84440008 */ lh $a0, 8($v0) -/* 9903A8 80240BC8 9443008E */ lhu $v1, 0x8e($v0) -/* 9903AC 80240BCC 2463FFFF */ addiu $v1, $v1, -1 -/* 9903B0 80240BD0 A443008E */ sh $v1, 0x8e($v0) -/* 9903B4 80240BD4 00031C00 */ sll $v1, $v1, 0x10 -/* 9903B8 80240BD8 58600001 */ blezl $v1, .L80240BE0 -/* 9903BC 80240BDC AE000070 */ sw $zero, 0x70($s0) -.L80240BE0: -/* 9903C0 80240BE0 8FBF0014 */ lw $ra, 0x14($sp) -/* 9903C4 80240BE4 8FB00010 */ lw $s0, 0x10($sp) -/* 9903C8 80240BE8 03E00008 */ jr $ra -/* 9903CC 80240BEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s index 2334ece135..2fe962f256 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s @@ -129,7 +129,7 @@ glabel func_80240BF0_9903D0 /* 9905B8 80240DD8 0000102D */ daddu $v0, $zero, $zero /* 9905BC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 9905C0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 9905C4 80240DE4 0C0902EB */ jal func_80240BAC_99038C +/* 9905C4 80240DE4 0C0902EB */ jal UnkDurationCheck /* 9905C8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* 9905CC 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s index 9455ee17b7..9f80c1af40 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s @@ -106,7 +106,7 @@ glabel func_80240F3C_99071C /* 9908AC 802410CC 00000000 */ nop /* 9908B0 802410D0 0280202D */ daddu $a0, $s4, $zero /* 9908B4 802410D4 0200282D */ daddu $a1, $s0, $zero -/* 9908B8 802410D8 0C0902EB */ jal func_80240BAC_99038C +/* 9908B8 802410D8 0C0902EB */ jal UnkDurationCheck /* 9908BC 802410DC 0260302D */ daddu $a2, $s3, $zero .L802410E0: /* 9908C0 802410E0 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BAC_9932DC.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BAC_9932DC.s deleted file mode 100644 index d077bee2ca..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BAC_9932DC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BAC_9932DC -/* 9932DC 80240BAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9932E0 80240BB0 AFB00010 */ sw $s0, 0x10($sp) -/* 9932E4 80240BB4 0080802D */ daddu $s0, $a0, $zero -/* 9932E8 80240BB8 AFBF0014 */ sw $ra, 0x14($sp) -/* 9932EC 80240BBC 8E020148 */ lw $v0, 0x148($s0) -/* 9932F0 80240BC0 0C00EABB */ jal get_npc_unsafe -/* 9932F4 80240BC4 84440008 */ lh $a0, 8($v0) -/* 9932F8 80240BC8 9443008E */ lhu $v1, 0x8e($v0) -/* 9932FC 80240BCC 2463FFFF */ addiu $v1, $v1, -1 -/* 993300 80240BD0 A443008E */ sh $v1, 0x8e($v0) -/* 993304 80240BD4 00031C00 */ sll $v1, $v1, 0x10 -/* 993308 80240BD8 58600001 */ blezl $v1, .L80240BE0 -/* 99330C 80240BDC AE000070 */ sw $zero, 0x70($s0) -.L80240BE0: -/* 993310 80240BE0 8FBF0014 */ lw $ra, 0x14($sp) -/* 993314 80240BE4 8FB00010 */ lw $s0, 0x10($sp) -/* 993318 80240BE8 03E00008 */ jr $ra -/* 99331C 80240BEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s index f82c71d64a..9d5bdcf89d 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s @@ -129,7 +129,7 @@ glabel func_80240BF0_993320 /* 993508 80240DD8 0000102D */ daddu $v0, $zero, $zero /* 99350C 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 993510 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 993514 80240DE4 0C0902EB */ jal func_80240BAC_9932DC +/* 993514 80240DE4 0C0902EB */ jal UnkDurationCheck /* 993518 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* 99351C 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s index d1ed197fe9..9bbc92e817 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s @@ -106,7 +106,7 @@ glabel func_80240F3C_99366C /* 9937FC 802410CC 00000000 */ nop /* 993800 802410D0 0280202D */ daddu $a0, $s4, $zero /* 993804 802410D4 0200282D */ daddu $a1, $s0, $zero -/* 993808 802410D8 0C0902EB */ jal func_80240BAC_9932DC +/* 993808 802410D8 0C0902EB */ jal UnkDurationCheck /* 99380C 802410DC 0260302D */ daddu $a2, $s3, $zero .L802410E0: /* 993810 802410E0 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240A38_9100E8.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240A38_9100E8.s deleted file mode 100644 index fe37336b9e..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240A38_9100E8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A38_9100E8 -/* 9100E8 80240A38 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9100EC 80240A3C AFB00010 */ sw $s0, 0x10($sp) -/* 9100F0 80240A40 0080802D */ daddu $s0, $a0, $zero -/* 9100F4 80240A44 AFBF0014 */ sw $ra, 0x14($sp) -/* 9100F8 80240A48 8E020148 */ lw $v0, 0x148($s0) -/* 9100FC 80240A4C 0C00EABB */ jal get_npc_unsafe -/* 910100 80240A50 84440008 */ lh $a0, 8($v0) -/* 910104 80240A54 9443008E */ lhu $v1, 0x8e($v0) -/* 910108 80240A58 2463FFFF */ addiu $v1, $v1, -1 -/* 91010C 80240A5C A443008E */ sh $v1, 0x8e($v0) -/* 910110 80240A60 00031C00 */ sll $v1, $v1, 0x10 -/* 910114 80240A64 58600001 */ blezl $v1, .L80240A6C -/* 910118 80240A68 AE000070 */ sw $zero, 0x70($s0) -.L80240A6C: -/* 91011C 80240A6C 8FBF0014 */ lw $ra, 0x14($sp) -/* 910120 80240A70 8FB00010 */ lw $s0, 0x10($sp) -/* 910124 80240A74 03E00008 */ jr $ra -/* 910128 80240A78 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s index 3a79951a46..8e41a32a98 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s @@ -194,7 +194,7 @@ glabel func_80241F6C_91161C /* 9118F0 80242240 0260202D */ daddu $a0, $s3, $zero /* 9118F4 80242244 08090899 */ j .L80242264 /* 9118F8 80242248 00000000 */ nop -/* 9118FC 8024224C 0C09028E */ jal func_80240A38_9100E8 +/* 9118FC 8024224C 0C09028E */ jal UnkDurationCheck /* 911900 80242250 0260202D */ daddu $a0, $s3, $zero /* 911904 80242254 08090899 */ j .L80242264 /* 911908 80242258 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C4C_9169BC.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C4C_9169BC.s deleted file mode 100644 index cff5f0cfa5..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C4C_9169BC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_9169BC -/* 9169BC 80240C4C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9169C0 80240C50 AFB00010 */ sw $s0, 0x10($sp) -/* 9169C4 80240C54 0080802D */ daddu $s0, $a0, $zero -/* 9169C8 80240C58 AFBF0014 */ sw $ra, 0x14($sp) -/* 9169CC 80240C5C 8E020148 */ lw $v0, 0x148($s0) -/* 9169D0 80240C60 0C00EABB */ jal get_npc_unsafe -/* 9169D4 80240C64 84440008 */ lh $a0, 8($v0) -/* 9169D8 80240C68 9443008E */ lhu $v1, 0x8e($v0) -/* 9169DC 80240C6C 2463FFFF */ addiu $v1, $v1, -1 -/* 9169E0 80240C70 A443008E */ sh $v1, 0x8e($v0) -/* 9169E4 80240C74 00031C00 */ sll $v1, $v1, 0x10 -/* 9169E8 80240C78 58600001 */ blezl $v1, .L80240C80 -/* 9169EC 80240C7C AE000070 */ sw $zero, 0x70($s0) -.L80240C80: -/* 9169F0 80240C80 8FBF0014 */ lw $ra, 0x14($sp) -/* 9169F4 80240C84 8FB00010 */ lw $s0, 0x10($sp) -/* 9169F8 80240C88 03E00008 */ jr $ra -/* 9169FC 80240C8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s index 32f7f8c1c4..f25cbb8379 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s @@ -207,7 +207,7 @@ glabel func_80240C90_916A00 /* 916D14 80240FA4 0000102D */ daddu $v0, $zero, $zero /* 916D18 80240FA8 0260202D */ daddu $a0, $s3, $zero /* 916D1C 80240FAC 0280282D */ daddu $a1, $s4, $zero -/* 916D20 80240FB0 0C090313 */ jal func_80240C4C_9169BC +/* 916D20 80240FB0 0C090313 */ jal UnkDurationCheck /* 916D24 80240FB4 0200302D */ daddu $a2, $s0, $zero .L80240FB8: /* 916D28 80240FB8 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F8C_919B3C.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F8C_919B3C.s deleted file mode 100644 index 72fabeed68..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F8C_919B3C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F8C_919B3C -/* 919B3C 80240F8C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 919B40 80240F90 AFB00010 */ sw $s0, 0x10($sp) -/* 919B44 80240F94 0080802D */ daddu $s0, $a0, $zero -/* 919B48 80240F98 AFBF0014 */ sw $ra, 0x14($sp) -/* 919B4C 80240F9C 8E020148 */ lw $v0, 0x148($s0) -/* 919B50 80240FA0 0C00EABB */ jal get_npc_unsafe -/* 919B54 80240FA4 84440008 */ lh $a0, 8($v0) -/* 919B58 80240FA8 9443008E */ lhu $v1, 0x8e($v0) -/* 919B5C 80240FAC 2463FFFF */ addiu $v1, $v1, -1 -/* 919B60 80240FB0 A443008E */ sh $v1, 0x8e($v0) -/* 919B64 80240FB4 00031C00 */ sll $v1, $v1, 0x10 -/* 919B68 80240FB8 58600001 */ blezl $v1, .L80240FC0 -/* 919B6C 80240FBC AE000070 */ sw $zero, 0x70($s0) -.L80240FC0: -/* 919B70 80240FC0 8FBF0014 */ lw $ra, 0x14($sp) -/* 919B74 80240FC4 8FB00010 */ lw $s0, 0x10($sp) -/* 919B78 80240FC8 03E00008 */ jr $ra -/* 919B7C 80240FCC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s index fef23cdc40..6f1da41cdb 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s @@ -207,7 +207,7 @@ glabel func_80240FD0_919B80 /* 919E94 802412E4 0000102D */ daddu $v0, $zero, $zero /* 919E98 802412E8 0260202D */ daddu $a0, $s3, $zero /* 919E9C 802412EC 0280282D */ daddu $a1, $s4, $zero -/* 919EA0 802412F0 0C0903E3 */ jal func_80240F8C_919B3C +/* 919EA0 802412F0 0C0903E3 */ jal UnkDurationCheck /* 919EA4 802412F4 0200302D */ daddu $a2, $s0, $zero .L802412F8: /* 919EA8 802412F8 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240CCC_91C5AC.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240CCC_91C5AC.s deleted file mode 100644 index a78c00eff9..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240CCC_91C5AC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CCC_91C5AC -/* 91C5AC 80240CCC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 91C5B0 80240CD0 AFB00010 */ sw $s0, 0x10($sp) -/* 91C5B4 80240CD4 0080802D */ daddu $s0, $a0, $zero -/* 91C5B8 80240CD8 AFBF0014 */ sw $ra, 0x14($sp) -/* 91C5BC 80240CDC 8E020148 */ lw $v0, 0x148($s0) -/* 91C5C0 80240CE0 0C00EABB */ jal get_npc_unsafe -/* 91C5C4 80240CE4 84440008 */ lh $a0, 8($v0) -/* 91C5C8 80240CE8 9443008E */ lhu $v1, 0x8e($v0) -/* 91C5CC 80240CEC 2463FFFF */ addiu $v1, $v1, -1 -/* 91C5D0 80240CF0 A443008E */ sh $v1, 0x8e($v0) -/* 91C5D4 80240CF4 00031C00 */ sll $v1, $v1, 0x10 -/* 91C5D8 80240CF8 58600001 */ blezl $v1, .L80240D00 -/* 91C5DC 80240CFC AE000070 */ sw $zero, 0x70($s0) -.L80240D00: -/* 91C5E0 80240D00 8FBF0014 */ lw $ra, 0x14($sp) -/* 91C5E4 80240D04 8FB00010 */ lw $s0, 0x10($sp) -/* 91C5E8 80240D08 03E00008 */ jr $ra -/* 91C5EC 80240D0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s index a0ad8cb2a1..3350e240e3 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s @@ -207,7 +207,7 @@ glabel func_80240D10_91C5F0 /* 91C904 80241024 0000102D */ daddu $v0, $zero, $zero /* 91C908 80241028 0260202D */ daddu $a0, $s3, $zero /* 91C90C 8024102C 0280282D */ daddu $a1, $s4, $zero -/* 91C910 80241030 0C090333 */ jal func_80240CCC_91C5AC +/* 91C910 80241030 0C090333 */ jal UnkDurationCheck /* 91C914 80241034 0200302D */ daddu $a2, $s0, $zero .L80241038: /* 91C918 80241038 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240EEC_B28F1C.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240EEC_B28F1C.s deleted file mode 100644 index ad1ffa7704..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240EEC_B28F1C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_B28F1C -/* B28F1C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B28F20 80240EF0 AFB00010 */ sw $s0, 0x10($sp) -/* B28F24 80240EF4 0080802D */ daddu $s0, $a0, $zero -/* B28F28 80240EF8 AFBF0014 */ sw $ra, 0x14($sp) -/* B28F2C 80240EFC 8E020148 */ lw $v0, 0x148($s0) -/* B28F30 80240F00 0C00EABB */ jal get_npc_unsafe -/* B28F34 80240F04 84440008 */ lh $a0, 8($v0) -/* B28F38 80240F08 9443008E */ lhu $v1, 0x8e($v0) -/* B28F3C 80240F0C 2463FFFF */ addiu $v1, $v1, -1 -/* B28F40 80240F10 A443008E */ sh $v1, 0x8e($v0) -/* B28F44 80240F14 00031C00 */ sll $v1, $v1, 0x10 -/* B28F48 80240F18 58600001 */ blezl $v1, .L80240F20 -/* B28F4C 80240F1C AE000070 */ sw $zero, 0x70($s0) -.L80240F20: -/* B28F50 80240F20 8FBF0014 */ lw $ra, 0x14($sp) -/* B28F54 80240F24 8FB00010 */ lw $s0, 0x10($sp) -/* B28F58 80240F28 03E00008 */ jr $ra -/* B28F5C 80240F2C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s index e7c2a551c2..4622b3cad8 100644 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s +++ b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s @@ -129,7 +129,7 @@ glabel func_80240F30_B28F60 /* B29148 80241118 0000102D */ daddu $v0, $zero, $zero /* B2914C 8024111C 0260202D */ daddu $a0, $s3, $zero /* B29150 80241120 0280282D */ daddu $a1, $s4, $zero -/* B29154 80241124 0C0903BB */ jal func_80240EEC_B28F1C +/* B29154 80241124 0C0903BB */ jal UnkDurationCheck /* B29158 80241128 0200302D */ daddu $a2, $s0, $zero .L8024112C: /* B2915C 8024112C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241450_B4BEC0.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241450_B4BEC0.s deleted file mode 100644 index e40c78e661..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241450_B4BEC0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241450_B4BEC0 -/* B4BEC0 80241450 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B4BEC4 80241454 AFB00010 */ sw $s0, 0x10($sp) -/* B4BEC8 80241458 0080802D */ daddu $s0, $a0, $zero -/* B4BECC 8024145C AFBF0014 */ sw $ra, 0x14($sp) -/* B4BED0 80241460 8E020148 */ lw $v0, 0x148($s0) -/* B4BED4 80241464 0C00EABB */ jal get_npc_unsafe -/* B4BED8 80241468 84440008 */ lh $a0, 8($v0) -/* B4BEDC 8024146C 9443008E */ lhu $v1, 0x8e($v0) -/* B4BEE0 80241470 2463FFFF */ addiu $v1, $v1, -1 -/* B4BEE4 80241474 A443008E */ sh $v1, 0x8e($v0) -/* B4BEE8 80241478 00031C00 */ sll $v1, $v1, 0x10 -/* B4BEEC 8024147C 58600001 */ blezl $v1, .L80241484 -/* B4BEF0 80241480 AE000070 */ sw $zero, 0x70($s0) -.L80241484: -/* B4BEF4 80241484 8FBF0014 */ lw $ra, 0x14($sp) -/* B4BEF8 80241488 8FB00010 */ lw $s0, 0x10($sp) -/* B4BEFC 8024148C 03E00008 */ jr $ra -/* B4BF00 80241490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s index 2cc29d90d8..02d7ee09f5 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s @@ -129,7 +129,7 @@ glabel func_80241494_B4BF04 /* B4C0EC 8024167C 0000102D */ daddu $v0, $zero, $zero /* B4C0F0 80241680 0260202D */ daddu $a0, $s3, $zero /* B4C0F4 80241684 0280282D */ daddu $a1, $s4, $zero -/* B4C0F8 80241688 0C090514 */ jal func_80241450_B4BEC0 +/* B4C0F8 80241688 0C090514 */ jal UnkDurationCheck /* B4C0FC 8024168C 0200302D */ daddu $a2, $s0, $zero .L80241690: /* B4C100 80241690 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802412EC_B53B1C.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802412EC_B53B1C.s deleted file mode 100644 index 0a7c246729..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802412EC_B53B1C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412EC_B53B1C -/* B53B1C 802412EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B53B20 802412F0 AFB00010 */ sw $s0, 0x10($sp) -/* B53B24 802412F4 0080802D */ daddu $s0, $a0, $zero -/* B53B28 802412F8 AFBF0014 */ sw $ra, 0x14($sp) -/* B53B2C 802412FC 8E020148 */ lw $v0, 0x148($s0) -/* B53B30 80241300 0C00EABB */ jal get_npc_unsafe -/* B53B34 80241304 84440008 */ lh $a0, 8($v0) -/* B53B38 80241308 9443008E */ lhu $v1, 0x8e($v0) -/* B53B3C 8024130C 2463FFFF */ addiu $v1, $v1, -1 -/* B53B40 80241310 A443008E */ sh $v1, 0x8e($v0) -/* B53B44 80241314 00031C00 */ sll $v1, $v1, 0x10 -/* B53B48 80241318 58600001 */ blezl $v1, .L80241320 -/* B53B4C 8024131C AE000070 */ sw $zero, 0x70($s0) -.L80241320: -/* B53B50 80241320 8FBF0014 */ lw $ra, 0x14($sp) -/* B53B54 80241324 8FB00010 */ lw $s0, 0x10($sp) -/* B53B58 80241328 03E00008 */ jr $ra -/* B53B5C 8024132C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s index cb7df1248a..47eebdcc84 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s @@ -129,7 +129,7 @@ glabel func_80241330_B53B60 /* B53D48 80241518 0000102D */ daddu $v0, $zero, $zero /* B53D4C 8024151C 0260202D */ daddu $a0, $s3, $zero /* B53D50 80241520 0280282D */ daddu $a1, $s4, $zero -/* B53D54 80241524 0C0904BB */ jal func_802412EC_B53B1C +/* B53D54 80241524 0C0904BB */ jal UnkDurationCheck /* B53D58 80241528 0200302D */ daddu $a2, $s0, $zero .L8024152C: /* B53D5C 8024152C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240EBC_B6D24C.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240EBC_B6D24C.s deleted file mode 100644 index 23b618bfd6..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240EBC_B6D24C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EBC_B6D24C -/* B6D24C 80240EBC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6D250 80240EC0 AFB00010 */ sw $s0, 0x10($sp) -/* B6D254 80240EC4 0080802D */ daddu $s0, $a0, $zero -/* B6D258 80240EC8 AFBF0014 */ sw $ra, 0x14($sp) -/* B6D25C 80240ECC 8E020148 */ lw $v0, 0x148($s0) -/* B6D260 80240ED0 0C00EABB */ jal get_npc_unsafe -/* B6D264 80240ED4 84440008 */ lh $a0, 8($v0) -/* B6D268 80240ED8 9443008E */ lhu $v1, 0x8e($v0) -/* B6D26C 80240EDC 2463FFFF */ addiu $v1, $v1, -1 -/* B6D270 80240EE0 A443008E */ sh $v1, 0x8e($v0) -/* B6D274 80240EE4 00031C00 */ sll $v1, $v1, 0x10 -/* B6D278 80240EE8 58600001 */ blezl $v1, .L80240EF0 -/* B6D27C 80240EEC AE000070 */ sw $zero, 0x70($s0) -.L80240EF0: -/* B6D280 80240EF0 8FBF0014 */ lw $ra, 0x14($sp) -/* B6D284 80240EF4 8FB00010 */ lw $s0, 0x10($sp) -/* B6D288 80240EF8 03E00008 */ jr $ra -/* B6D28C 80240EFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s index d10352c659..a7d0de149b 100644 --- a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s +++ b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s @@ -129,7 +129,7 @@ glabel func_80240F00_B6D290 /* B6D478 802410E8 0000102D */ daddu $v0, $zero, $zero /* B6D47C 802410EC 0260202D */ daddu $a0, $s3, $zero /* B6D480 802410F0 0280282D */ daddu $a1, $s4, $zero -/* B6D484 802410F4 0C0903AF */ jal func_80240EBC_B6D24C +/* B6D484 802410F4 0C0903AF */ jal UnkDurationCheck /* B6D488 802410F8 0200302D */ daddu $a2, $s0, $zero .L802410FC: /* B6D48C 802410FC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_8024106C_B7B0BC.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_8024106C_B7B0BC.s deleted file mode 100644 index 76d8372fc7..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_8024106C_B7B0BC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024106C_B7B0BC -/* B7B0BC 8024106C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B7B0C0 80241070 AFB00010 */ sw $s0, 0x10($sp) -/* B7B0C4 80241074 0080802D */ daddu $s0, $a0, $zero -/* B7B0C8 80241078 AFBF0014 */ sw $ra, 0x14($sp) -/* B7B0CC 8024107C 8E020148 */ lw $v0, 0x148($s0) -/* B7B0D0 80241080 0C00EABB */ jal get_npc_unsafe -/* B7B0D4 80241084 84440008 */ lh $a0, 8($v0) -/* B7B0D8 80241088 9443008E */ lhu $v1, 0x8e($v0) -/* B7B0DC 8024108C 2463FFFF */ addiu $v1, $v1, -1 -/* B7B0E0 80241090 A443008E */ sh $v1, 0x8e($v0) -/* B7B0E4 80241094 00031C00 */ sll $v1, $v1, 0x10 -/* B7B0E8 80241098 58600001 */ blezl $v1, .L802410A0 -/* B7B0EC 8024109C AE000070 */ sw $zero, 0x70($s0) -.L802410A0: -/* B7B0F0 802410A0 8FBF0014 */ lw $ra, 0x14($sp) -/* B7B0F4 802410A4 8FB00010 */ lw $s0, 0x10($sp) -/* B7B0F8 802410A8 03E00008 */ jr $ra -/* B7B0FC 802410AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s index 925ad652d4..f00f97e0a4 100644 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s @@ -129,7 +129,7 @@ glabel func_802410B0_B7B100 /* B7B2E8 80241298 0000102D */ daddu $v0, $zero, $zero /* B7B2EC 8024129C 0260202D */ daddu $a0, $s3, $zero /* B7B2F0 802412A0 0280282D */ daddu $a1, $s4, $zero -/* B7B2F4 802412A4 0C09041B */ jal func_8024106C_B7B0BC +/* B7B2F4 802412A4 0C09041B */ jal UnkDurationCheck /* B7B2F8 802412A8 0200302D */ daddu $a2, $s0, $zero .L802412AC: /* B7B2FC 802412AC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405B8_A4F5B8.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405B8_A4F5B8.s deleted file mode 100644 index 8b216e511c..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405B8_A4F5B8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405B8_A4F5B8 -/* A4F5B8 802405B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A4F5BC 802405BC AFB00010 */ sw $s0, 0x10($sp) -/* A4F5C0 802405C0 0080802D */ daddu $s0, $a0, $zero -/* A4F5C4 802405C4 AFBF0014 */ sw $ra, 0x14($sp) -/* A4F5C8 802405C8 8E020148 */ lw $v0, 0x148($s0) -/* A4F5CC 802405CC 0C00EABB */ jal get_npc_unsafe -/* A4F5D0 802405D0 84440008 */ lh $a0, 8($v0) -/* A4F5D4 802405D4 9443008E */ lhu $v1, 0x8e($v0) -/* A4F5D8 802405D8 2463FFFF */ addiu $v1, $v1, -1 -/* A4F5DC 802405DC A443008E */ sh $v1, 0x8e($v0) -/* A4F5E0 802405E0 00031C00 */ sll $v1, $v1, 0x10 -/* A4F5E4 802405E4 58600001 */ blezl $v1, .L802405EC -/* A4F5E8 802405E8 AE000070 */ sw $zero, 0x70($s0) -.L802405EC: -/* A4F5EC 802405EC 8FBF0014 */ lw $ra, 0x14($sp) -/* A4F5F0 802405F0 8FB00010 */ lw $s0, 0x10($sp) -/* A4F5F4 802405F4 03E00008 */ jr $ra -/* A4F5F8 802405F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s index 76bf8244e1..45c24730f1 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s @@ -194,7 +194,7 @@ glabel func_80240F94_A4FF94 /* A50268 80241268 0260202D */ daddu $a0, $s3, $zero /* A5026C 8024126C 080904A3 */ j .L8024128C /* A50270 80241270 00000000 */ nop -/* A50274 80241274 0C09016E */ jal func_802405B8_A4F5B8 +/* A50274 80241274 0C09016E */ jal UnkDurationCheck /* A50278 80241278 0260202D */ daddu $a0, $s3, $zero /* A5027C 8024127C 080904A3 */ j .L8024128C /* A50280 80241280 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240828_A93F68.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240828_A93F68.s deleted file mode 100644 index 232cc64685..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240828_A93F68.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240828_A93F68 -/* A93F68 80240828 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A93F6C 8024082C AFB00010 */ sw $s0, 0x10($sp) -/* A93F70 80240830 0080802D */ daddu $s0, $a0, $zero -/* A93F74 80240834 AFBF0014 */ sw $ra, 0x14($sp) -/* A93F78 80240838 8E020148 */ lw $v0, 0x148($s0) -/* A93F7C 8024083C 0C00EABB */ jal get_npc_unsafe -/* A93F80 80240840 84440008 */ lh $a0, 8($v0) -/* A93F84 80240844 9443008E */ lhu $v1, 0x8e($v0) -/* A93F88 80240848 2463FFFF */ addiu $v1, $v1, -1 -/* A93F8C 8024084C A443008E */ sh $v1, 0x8e($v0) -/* A93F90 80240850 00031C00 */ sll $v1, $v1, 0x10 -/* A93F94 80240854 58600001 */ blezl $v1, .L8024085C -/* A93F98 80240858 AE000070 */ sw $zero, 0x70($s0) -.L8024085C: -/* A93F9C 8024085C 8FBF0014 */ lw $ra, 0x14($sp) -/* A93FA0 80240860 8FB00010 */ lw $s0, 0x10($sp) -/* A93FA4 80240864 03E00008 */ jr $ra -/* A93FA8 80240868 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s index ae10bb1ac8..06ecb0f84e 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s @@ -194,7 +194,7 @@ glabel func_80241204_A94944 /* A94C18 802414D8 0260202D */ daddu $a0, $s3, $zero /* A94C1C 802414DC 0809053F */ j .L802414FC /* A94C20 802414E0 00000000 */ nop -/* A94C24 802414E4 0C09020A */ jal func_80240828_A93F68 +/* A94C24 802414E4 0C09020A */ jal UnkDurationCheck /* A94C28 802414E8 0260202D */ daddu $a0, $s3, $zero /* A94C2C 802414EC 0809053F */ j .L802414FC /* A94C30 802414F0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240688_A99C18.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240688_A99C18.s deleted file mode 100644 index 7e1d64f2cb..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240688_A99C18.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240688_A99C18 -/* A99C18 80240688 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A99C1C 8024068C AFB00010 */ sw $s0, 0x10($sp) -/* A99C20 80240690 0080802D */ daddu $s0, $a0, $zero -/* A99C24 80240694 AFBF0014 */ sw $ra, 0x14($sp) -/* A99C28 80240698 8E020148 */ lw $v0, 0x148($s0) -/* A99C2C 8024069C 0C00EABB */ jal get_npc_unsafe -/* A99C30 802406A0 84440008 */ lh $a0, 8($v0) -/* A99C34 802406A4 9443008E */ lhu $v1, 0x8e($v0) -/* A99C38 802406A8 2463FFFF */ addiu $v1, $v1, -1 -/* A99C3C 802406AC A443008E */ sh $v1, 0x8e($v0) -/* A99C40 802406B0 00031C00 */ sll $v1, $v1, 0x10 -/* A99C44 802406B4 58600001 */ blezl $v1, .L802406BC -/* A99C48 802406B8 AE000070 */ sw $zero, 0x70($s0) -.L802406BC: -/* A99C4C 802406BC 8FBF0014 */ lw $ra, 0x14($sp) -/* A99C50 802406C0 8FB00010 */ lw $s0, 0x10($sp) -/* A99C54 802406C4 03E00008 */ jr $ra -/* A99C58 802406C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s index c4e4157e13..e262b966e6 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s @@ -194,7 +194,7 @@ glabel func_80241064_A9A5F4 /* A9A8C8 80241338 0260202D */ daddu $a0, $s3, $zero /* A9A8CC 8024133C 080904D7 */ j .L8024135C /* A9A8D0 80241340 00000000 */ nop -/* A9A8D4 80241344 0C0901A2 */ jal func_80240688_A99C18 +/* A9A8D4 80241344 0C0901A2 */ jal UnkDurationCheck /* A9A8D8 80241348 0260202D */ daddu $a0, $s3, $zero /* A9A8DC 8024134C 080904D7 */ j .L8024135C /* A9A8E0 80241350 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240688_A9F3C8.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240688_A9F3C8.s deleted file mode 100644 index 92004e4bce..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240688_A9F3C8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240688_A9F3C8 -/* A9F3C8 80240688 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A9F3CC 8024068C AFB00010 */ sw $s0, 0x10($sp) -/* A9F3D0 80240690 0080802D */ daddu $s0, $a0, $zero -/* A9F3D4 80240694 AFBF0014 */ sw $ra, 0x14($sp) -/* A9F3D8 80240698 8E020148 */ lw $v0, 0x148($s0) -/* A9F3DC 8024069C 0C00EABB */ jal get_npc_unsafe -/* A9F3E0 802406A0 84440008 */ lh $a0, 8($v0) -/* A9F3E4 802406A4 9443008E */ lhu $v1, 0x8e($v0) -/* A9F3E8 802406A8 2463FFFF */ addiu $v1, $v1, -1 -/* A9F3EC 802406AC A443008E */ sh $v1, 0x8e($v0) -/* A9F3F0 802406B0 00031C00 */ sll $v1, $v1, 0x10 -/* A9F3F4 802406B4 58600001 */ blezl $v1, .L802406BC -/* A9F3F8 802406B8 AE000070 */ sw $zero, 0x70($s0) -.L802406BC: -/* A9F3FC 802406BC 8FBF0014 */ lw $ra, 0x14($sp) -/* A9F400 802406C0 8FB00010 */ lw $s0, 0x10($sp) -/* A9F404 802406C4 03E00008 */ jr $ra -/* A9F408 802406C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s index 1d2422436d..c13095ba06 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s @@ -194,7 +194,7 @@ glabel func_80241064_A9FDA4 /* AA0078 80241338 0260202D */ daddu $a0, $s3, $zero /* AA007C 8024133C 080904D7 */ j .L8024135C /* AA0080 80241340 00000000 */ nop -/* AA0084 80241344 0C0901A2 */ jal func_80240688_A9F3C8 +/* AA0084 80241344 0C0901A2 */ jal UnkDurationCheck /* AA0088 80241348 0260202D */ daddu $a0, $s3, $zero /* AA008C 8024134C 080904D7 */ j .L8024135C /* AA0090 80241350 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240518_A60EE8.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240518_A60EE8.s deleted file mode 100644 index 52d2dd2f11..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240518_A60EE8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240518_A60EE8 -/* A60EE8 80240518 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A60EEC 8024051C AFB00010 */ sw $s0, 0x10($sp) -/* A60EF0 80240520 0080802D */ daddu $s0, $a0, $zero -/* A60EF4 80240524 AFBF0014 */ sw $ra, 0x14($sp) -/* A60EF8 80240528 8E020148 */ lw $v0, 0x148($s0) -/* A60EFC 8024052C 0C00EABB */ jal get_npc_unsafe -/* A60F00 80240530 84440008 */ lh $a0, 8($v0) -/* A60F04 80240534 9443008E */ lhu $v1, 0x8e($v0) -/* A60F08 80240538 2463FFFF */ addiu $v1, $v1, -1 -/* A60F0C 8024053C A443008E */ sh $v1, 0x8e($v0) -/* A60F10 80240540 00031C00 */ sll $v1, $v1, 0x10 -/* A60F14 80240544 58600001 */ blezl $v1, .L8024054C -/* A60F18 80240548 AE000070 */ sw $zero, 0x70($s0) -.L8024054C: -/* A60F1C 8024054C 8FBF0014 */ lw $ra, 0x14($sp) -/* A60F20 80240550 8FB00010 */ lw $s0, 0x10($sp) -/* A60F24 80240554 03E00008 */ jr $ra -/* A60F28 80240558 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s index a4e0aec796..cd90d02fde 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s @@ -194,7 +194,7 @@ glabel func_80240EF4_A618C4 /* A61B98 802411C8 0260202D */ daddu $a0, $s3, $zero /* A61B9C 802411CC 0809047B */ j .L802411EC /* A61BA0 802411D0 00000000 */ nop -/* A61BA4 802411D4 0C090146 */ jal func_80240518_A60EE8 +/* A61BA4 802411D4 0C090146 */ jal UnkDurationCheck /* A61BA8 802411D8 0260202D */ daddu $a0, $s3, $zero /* A61BAC 802411DC 0809047B */ j .L802411EC /* A61BB0 802411E0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802405F8_A676F8.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802405F8_A676F8.s deleted file mode 100644 index e02a5ac486..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802405F8_A676F8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F8_A676F8 -/* A676F8 802405F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A676FC 802405FC AFB00010 */ sw $s0, 0x10($sp) -/* A67700 80240600 0080802D */ daddu $s0, $a0, $zero -/* A67704 80240604 AFBF0014 */ sw $ra, 0x14($sp) -/* A67708 80240608 8E020148 */ lw $v0, 0x148($s0) -/* A6770C 8024060C 0C00EABB */ jal get_npc_unsafe -/* A67710 80240610 84440008 */ lh $a0, 8($v0) -/* A67714 80240614 9443008E */ lhu $v1, 0x8e($v0) -/* A67718 80240618 2463FFFF */ addiu $v1, $v1, -1 -/* A6771C 8024061C A443008E */ sh $v1, 0x8e($v0) -/* A67720 80240620 00031C00 */ sll $v1, $v1, 0x10 -/* A67724 80240624 58600001 */ blezl $v1, .L8024062C -/* A67728 80240628 AE000070 */ sw $zero, 0x70($s0) -.L8024062C: -/* A6772C 8024062C 8FBF0014 */ lw $ra, 0x14($sp) -/* A67730 80240630 8FB00010 */ lw $s0, 0x10($sp) -/* A67734 80240634 03E00008 */ jr $ra -/* A67738 80240638 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s index af063492dc..23b7f8e3d0 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s @@ -194,7 +194,7 @@ glabel func_80240FD4_A680D4 /* A683A8 802412A8 0260202D */ daddu $a0, $s3, $zero /* A683AC 802412AC 080904B3 */ j .L802412CC /* A683B0 802412B0 00000000 */ nop -/* A683B4 802412B4 0C09017E */ jal func_802405F8_A676F8 +/* A683B4 802412B4 0C09017E */ jal UnkDurationCheck /* A683B8 802412B8 0260202D */ daddu $a0, $s3, $zero /* A683BC 802412BC 080904B3 */ j .L802412CC /* A683C0 802412C0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C1C_B9881C.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C1C_B9881C.s deleted file mode 100644 index a794aeaab1..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C1C_B9881C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C1C_B9881C -/* B9881C 80240C1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B98820 80240C20 AFB00010 */ sw $s0, 0x10($sp) -/* B98824 80240C24 0080802D */ daddu $s0, $a0, $zero -/* B98828 80240C28 AFBF0014 */ sw $ra, 0x14($sp) -/* B9882C 80240C2C 8E020148 */ lw $v0, 0x148($s0) -/* B98830 80240C30 0C00EABB */ jal get_npc_unsafe -/* B98834 80240C34 84440008 */ lh $a0, 8($v0) -/* B98838 80240C38 9443008E */ lhu $v1, 0x8e($v0) -/* B9883C 80240C3C 2463FFFF */ addiu $v1, $v1, -1 -/* B98840 80240C40 A443008E */ sh $v1, 0x8e($v0) -/* B98844 80240C44 00031C00 */ sll $v1, $v1, 0x10 -/* B98848 80240C48 58600001 */ blezl $v1, .L80240C50 -/* B9884C 80240C4C AE000070 */ sw $zero, 0x70($s0) -.L80240C50: -/* B98850 80240C50 8FBF0014 */ lw $ra, 0x14($sp) -/* B98854 80240C54 8FB00010 */ lw $s0, 0x10($sp) -/* B98858 80240C58 03E00008 */ jr $ra -/* B9885C 80240C5C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s index 39bfe07bb8..14b4634244 100644 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s +++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s @@ -129,7 +129,7 @@ glabel func_80240C60_B98860 /* B98A48 80240E48 0000102D */ daddu $v0, $zero, $zero /* B98A4C 80240E4C 0260202D */ daddu $a0, $s3, $zero /* B98A50 80240E50 0280282D */ daddu $a1, $s4, $zero -/* B98A54 80240E54 0C090307 */ jal func_80240C1C_B9881C +/* B98A54 80240E54 0C090307 */ jal UnkDurationCheck /* B98A58 80240E58 0200302D */ daddu $a2, $s0, $zero .L80240E5C: /* B98A5C 80240E5C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DAC_B9E70C.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DAC_B9E70C.s deleted file mode 100644 index 615426b56c..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DAC_B9E70C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DAC_B9E70C -/* B9E70C 80240DAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B9E710 80240DB0 AFB00010 */ sw $s0, 0x10($sp) -/* B9E714 80240DB4 0080802D */ daddu $s0, $a0, $zero -/* B9E718 80240DB8 AFBF0014 */ sw $ra, 0x14($sp) -/* B9E71C 80240DBC 8E020148 */ lw $v0, 0x148($s0) -/* B9E720 80240DC0 0C00EABB */ jal get_npc_unsafe -/* B9E724 80240DC4 84440008 */ lh $a0, 8($v0) -/* B9E728 80240DC8 9443008E */ lhu $v1, 0x8e($v0) -/* B9E72C 80240DCC 2463FFFF */ addiu $v1, $v1, -1 -/* B9E730 80240DD0 A443008E */ sh $v1, 0x8e($v0) -/* B9E734 80240DD4 00031C00 */ sll $v1, $v1, 0x10 -/* B9E738 80240DD8 58600001 */ blezl $v1, .L80240DE0 -/* B9E73C 80240DDC AE000070 */ sw $zero, 0x70($s0) -.L80240DE0: -/* B9E740 80240DE0 8FBF0014 */ lw $ra, 0x14($sp) -/* B9E744 80240DE4 8FB00010 */ lw $s0, 0x10($sp) -/* B9E748 80240DE8 03E00008 */ jr $ra -/* B9E74C 80240DEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s index 5e606892d0..dff067074e 100644 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s +++ b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s @@ -129,7 +129,7 @@ glabel func_80240DF0_B9E750 /* B9E938 80240FD8 0000102D */ daddu $v0, $zero, $zero /* B9E93C 80240FDC 0260202D */ daddu $a0, $s3, $zero /* B9E940 80240FE0 0280282D */ daddu $a1, $s4, $zero -/* B9E944 80240FE4 0C09036B */ jal func_80240DAC_B9E70C +/* B9E944 80240FE4 0C09036B */ jal UnkDurationCheck /* B9E948 80240FE8 0200302D */ daddu $a2, $s0, $zero .L80240FEC: /* B9E94C 80240FEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242AC0_BA7240.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242AC0_BA7240.s deleted file mode 100644 index d6769c1105..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242AC0_BA7240.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AC0_BA7240 -/* BA7240 80242AC0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BA7244 80242AC4 AFB00010 */ sw $s0, 0x10($sp) -/* BA7248 80242AC8 0080802D */ daddu $s0, $a0, $zero -/* BA724C 80242ACC AFBF0014 */ sw $ra, 0x14($sp) -/* BA7250 80242AD0 8E020148 */ lw $v0, 0x148($s0) -/* BA7254 80242AD4 0C00EABB */ jal get_npc_unsafe -/* BA7258 80242AD8 84440008 */ lh $a0, 8($v0) -/* BA725C 80242ADC 9443008E */ lhu $v1, 0x8e($v0) -/* BA7260 80242AE0 2463FFFF */ addiu $v1, $v1, -1 -/* BA7264 80242AE4 A443008E */ sh $v1, 0x8e($v0) -/* BA7268 80242AE8 00031C00 */ sll $v1, $v1, 0x10 -/* BA726C 80242AEC 58600001 */ blezl $v1, .L80242AF4 -/* BA7270 80242AF0 AE000070 */ sw $zero, 0x70($s0) -.L80242AF4: -/* BA7274 80242AF4 8FBF0014 */ lw $ra, 0x14($sp) -/* BA7278 80242AF8 8FB00010 */ lw $s0, 0x10($sp) -/* BA727C 80242AFC 03E00008 */ jr $ra -/* BA7280 80242B00 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s index 68d0a7070b..74680c8e50 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s @@ -129,7 +129,7 @@ glabel func_80242B04_BA7284 /* BA746C 80242CEC 0000102D */ daddu $v0, $zero, $zero /* BA7470 80242CF0 0260202D */ daddu $a0, $s3, $zero /* BA7474 80242CF4 0280282D */ daddu $a1, $s4, $zero -/* BA7478 80242CF8 0C090AB0 */ jal func_80242AC0_BA7240 +/* BA7478 80242CF8 0C090AB0 */ jal UnkDurationCheck /* BA747C 80242CFC 0200302D */ daddu $a2, $s0, $zero .L80242D00: /* BA7480 80242D00 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E1C_BAAF5C.s b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E1C_BAAF5C.s deleted file mode 100644 index 2e17611a72..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E1C_BAAF5C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E1C_BAAF5C -/* BAAF5C 80240E1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BAAF60 80240E20 AFB00010 */ sw $s0, 0x10($sp) -/* BAAF64 80240E24 0080802D */ daddu $s0, $a0, $zero -/* BAAF68 80240E28 AFBF0014 */ sw $ra, 0x14($sp) -/* BAAF6C 80240E2C 8E020148 */ lw $v0, 0x148($s0) -/* BAAF70 80240E30 0C00EABB */ jal get_npc_unsafe -/* BAAF74 80240E34 84440008 */ lh $a0, 8($v0) -/* BAAF78 80240E38 9443008E */ lhu $v1, 0x8e($v0) -/* BAAF7C 80240E3C 2463FFFF */ addiu $v1, $v1, -1 -/* BAAF80 80240E40 A443008E */ sh $v1, 0x8e($v0) -/* BAAF84 80240E44 00031C00 */ sll $v1, $v1, 0x10 -/* BAAF88 80240E48 58600001 */ blezl $v1, .L80240E50 -/* BAAF8C 80240E4C AE000070 */ sw $zero, 0x70($s0) -.L80240E50: -/* BAAF90 80240E50 8FBF0014 */ lw $ra, 0x14($sp) -/* BAAF94 80240E54 8FB00010 */ lw $s0, 0x10($sp) -/* BAAF98 80240E58 03E00008 */ jr $ra -/* BAAF9C 80240E5C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s index 1343cc4399..1acc6229f8 100644 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s @@ -129,7 +129,7 @@ glabel func_80240E60_BAAFA0 /* BAB188 80241048 0000102D */ daddu $v0, $zero, $zero /* BAB18C 8024104C 0260202D */ daddu $a0, $s3, $zero /* BAB190 80241050 0280282D */ daddu $a1, $s4, $zero -/* BAB194 80241054 0C090387 */ jal func_80240E1C_BAAF5C +/* BAB194 80241054 0C090387 */ jal UnkDurationCheck /* BAB198 80241058 0200302D */ daddu $a2, $s0, $zero .L8024105C: /* BAB19C 8024105C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C4C_BB3A4C.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C4C_BB3A4C.s deleted file mode 100644 index c68ea30b0c..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C4C_BB3A4C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_BB3A4C -/* BB3A4C 80240C4C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB3A50 80240C50 AFB00010 */ sw $s0, 0x10($sp) -/* BB3A54 80240C54 0080802D */ daddu $s0, $a0, $zero -/* BB3A58 80240C58 AFBF0014 */ sw $ra, 0x14($sp) -/* BB3A5C 80240C5C 8E020148 */ lw $v0, 0x148($s0) -/* BB3A60 80240C60 0C00EABB */ jal get_npc_unsafe -/* BB3A64 80240C64 84440008 */ lh $a0, 8($v0) -/* BB3A68 80240C68 9443008E */ lhu $v1, 0x8e($v0) -/* BB3A6C 80240C6C 2463FFFF */ addiu $v1, $v1, -1 -/* BB3A70 80240C70 A443008E */ sh $v1, 0x8e($v0) -/* BB3A74 80240C74 00031C00 */ sll $v1, $v1, 0x10 -/* BB3A78 80240C78 58600001 */ blezl $v1, .L80240C80 -/* BB3A7C 80240C7C AE000070 */ sw $zero, 0x70($s0) -.L80240C80: -/* BB3A80 80240C80 8FBF0014 */ lw $ra, 0x14($sp) -/* BB3A84 80240C84 8FB00010 */ lw $s0, 0x10($sp) -/* BB3A88 80240C88 03E00008 */ jr $ra -/* BB3A8C 80240C8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s index 2a01c84133..e2f3caeefe 100644 --- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s +++ b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s @@ -129,7 +129,7 @@ glabel func_80240C90_BB3A90 /* BB3C78 80240E78 0000102D */ daddu $v0, $zero, $zero /* BB3C7C 80240E7C 0260202D */ daddu $a0, $s3, $zero /* BB3C80 80240E80 0280282D */ daddu $a1, $s4, $zero -/* BB3C84 80240E84 0C090313 */ jal func_80240C4C_BB3A4C +/* BB3C84 80240E84 0C090313 */ jal UnkDurationCheck /* BB3C88 80240E88 0200302D */ daddu $a2, $s0, $zero .L80240E8C: /* BB3C8C 80240E8C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BAC_9EC39C.s b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BAC_9EC39C.s deleted file mode 100644 index ef7f03f1ee..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BAC_9EC39C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BAC_9EC39C -/* 9EC39C 80240BAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9EC3A0 80240BB0 AFB00010 */ sw $s0, 0x10($sp) -/* 9EC3A4 80240BB4 0080802D */ daddu $s0, $a0, $zero -/* 9EC3A8 80240BB8 AFBF0014 */ sw $ra, 0x14($sp) -/* 9EC3AC 80240BBC 8E020148 */ lw $v0, 0x148($s0) -/* 9EC3B0 80240BC0 0C00EABB */ jal get_npc_unsafe -/* 9EC3B4 80240BC4 84440008 */ lh $a0, 8($v0) -/* 9EC3B8 80240BC8 9443008E */ lhu $v1, 0x8e($v0) -/* 9EC3BC 80240BCC 2463FFFF */ addiu $v1, $v1, -1 -/* 9EC3C0 80240BD0 A443008E */ sh $v1, 0x8e($v0) -/* 9EC3C4 80240BD4 00031C00 */ sll $v1, $v1, 0x10 -/* 9EC3C8 80240BD8 58600001 */ blezl $v1, .L80240BE0 -/* 9EC3CC 80240BDC AE000070 */ sw $zero, 0x70($s0) -.L80240BE0: -/* 9EC3D0 80240BE0 8FBF0014 */ lw $ra, 0x14($sp) -/* 9EC3D4 80240BE4 8FB00010 */ lw $s0, 0x10($sp) -/* 9EC3D8 80240BE8 03E00008 */ jr $ra -/* 9EC3DC 80240BEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s index 7b835a3d36..14ae891fe0 100644 --- a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s +++ b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s @@ -129,7 +129,7 @@ glabel func_80240BF0_9EC3E0 /* 9EC5C8 80240DD8 0000102D */ daddu $v0, $zero, $zero /* 9EC5CC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 9EC5D0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 9EC5D4 80240DE4 0C0902EB */ jal func_80240BAC_9EC39C +/* 9EC5D4 80240DE4 0C0902EB */ jal UnkDurationCheck /* 9EC5D8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* 9EC5DC 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BAC_A011AC.s b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BAC_A011AC.s deleted file mode 100644 index 5ab0fa61d1..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BAC_A011AC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BAC_A011AC -/* A011AC 80240BAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A011B0 80240BB0 AFB00010 */ sw $s0, 0x10($sp) -/* A011B4 80240BB4 0080802D */ daddu $s0, $a0, $zero -/* A011B8 80240BB8 AFBF0014 */ sw $ra, 0x14($sp) -/* A011BC 80240BBC 8E020148 */ lw $v0, 0x148($s0) -/* A011C0 80240BC0 0C00EABB */ jal get_npc_unsafe -/* A011C4 80240BC4 84440008 */ lh $a0, 8($v0) -/* A011C8 80240BC8 9443008E */ lhu $v1, 0x8e($v0) -/* A011CC 80240BCC 2463FFFF */ addiu $v1, $v1, -1 -/* A011D0 80240BD0 A443008E */ sh $v1, 0x8e($v0) -/* A011D4 80240BD4 00031C00 */ sll $v1, $v1, 0x10 -/* A011D8 80240BD8 58600001 */ blezl $v1, .L80240BE0 -/* A011DC 80240BDC AE000070 */ sw $zero, 0x70($s0) -.L80240BE0: -/* A011E0 80240BE0 8FBF0014 */ lw $ra, 0x14($sp) -/* A011E4 80240BE4 8FB00010 */ lw $s0, 0x10($sp) -/* A011E8 80240BE8 03E00008 */ jr $ra -/* A011EC 80240BEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s index 9d8648fd55..3170a7463f 100644 --- a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s +++ b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s @@ -129,7 +129,7 @@ glabel func_80240BF0_A011F0 /* A013D8 80240DD8 0000102D */ daddu $v0, $zero, $zero /* A013DC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* A013E0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* A013E4 80240DE4 0C0902EB */ jal func_80240BAC_A011AC +/* A013E4 80240DE4 0C0902EB */ jal UnkDurationCheck /* A013E8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* A013EC 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242188_A049C8.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242188_A049C8.s deleted file mode 100644 index ea0ed7d733..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242188_A049C8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242188_A049C8 -/* A049C8 80242188 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A049CC 8024218C AFB00010 */ sw $s0, 0x10($sp) -/* A049D0 80242190 0080802D */ daddu $s0, $a0, $zero -/* A049D4 80242194 AFBF0014 */ sw $ra, 0x14($sp) -/* A049D8 80242198 8E020148 */ lw $v0, 0x148($s0) -/* A049DC 8024219C 0C00EABB */ jal get_npc_unsafe -/* A049E0 802421A0 84440008 */ lh $a0, 8($v0) -/* A049E4 802421A4 9443008E */ lhu $v1, 0x8e($v0) -/* A049E8 802421A8 2463FFFF */ addiu $v1, $v1, -1 -/* A049EC 802421AC A443008E */ sh $v1, 0x8e($v0) -/* A049F0 802421B0 00031C00 */ sll $v1, $v1, 0x10 -/* A049F4 802421B4 58600001 */ blezl $v1, .L802421BC -/* A049F8 802421B8 AE000070 */ sw $zero, 0x70($s0) -.L802421BC: -/* A049FC 802421BC 8FBF0014 */ lw $ra, 0x14($sp) -/* A04A00 802421C0 8FB00010 */ lw $s0, 0x10($sp) -/* A04A04 802421C4 03E00008 */ jr $ra -/* A04A08 802421C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s index c8d926112f..6ca2e2867e 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s @@ -140,7 +140,7 @@ glabel func_802421CC_A04A0C /* A04C20 802423E0 0000102D */ daddu $v0, $zero, $zero /* A04C24 802423E4 0260202D */ daddu $a0, $s3, $zero /* A04C28 802423E8 0200282D */ daddu $a1, $s0, $zero -/* A04C2C 802423EC 0C090862 */ jal func_80242188_A049C8 +/* A04C2C 802423EC 0C090862 */ jal UnkDurationCheck /* A04C30 802423F0 0280302D */ daddu $a2, $s4, $zero .L802423F4: /* A04C34 802423F4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422A8_A091A8.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422A8_A091A8.s deleted file mode 100644 index 3167c48405..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422A8_A091A8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422A8_A091A8 -/* A091A8 802422A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A091AC 802422AC AFB00010 */ sw $s0, 0x10($sp) -/* A091B0 802422B0 0080802D */ daddu $s0, $a0, $zero -/* A091B4 802422B4 AFBF0014 */ sw $ra, 0x14($sp) -/* A091B8 802422B8 8E020148 */ lw $v0, 0x148($s0) -/* A091BC 802422BC 0C00EABB */ jal get_npc_unsafe -/* A091C0 802422C0 84440008 */ lh $a0, 8($v0) -/* A091C4 802422C4 9443008E */ lhu $v1, 0x8e($v0) -/* A091C8 802422C8 2463FFFF */ addiu $v1, $v1, -1 -/* A091CC 802422CC A443008E */ sh $v1, 0x8e($v0) -/* A091D0 802422D0 00031C00 */ sll $v1, $v1, 0x10 -/* A091D4 802422D4 58600001 */ blezl $v1, .L802422DC -/* A091D8 802422D8 AE000070 */ sw $zero, 0x70($s0) -.L802422DC: -/* A091DC 802422DC 8FBF0014 */ lw $ra, 0x14($sp) -/* A091E0 802422E0 8FB00010 */ lw $s0, 0x10($sp) -/* A091E4 802422E4 03E00008 */ jr $ra -/* A091E8 802422E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s index dd76dbfda5..e9544fcee5 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s @@ -140,7 +140,7 @@ glabel func_802422EC_A091EC /* A09400 80242500 0000102D */ daddu $v0, $zero, $zero /* A09404 80242504 0260202D */ daddu $a0, $s3, $zero /* A09408 80242508 0200282D */ daddu $a1, $s0, $zero -/* A0940C 8024250C 0C0908AA */ jal func_802422A8_A091A8 +/* A0940C 8024250C 0C0908AA */ jal UnkDurationCheck /* A09410 80242510 0280302D */ daddu $a2, $s4, $zero .L80242514: /* A09414 80242514 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241E60_D9F330.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241E60_D9F330.s deleted file mode 100644 index f208bede15..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241E60_D9F330.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E60_D9F330 -/* D9F330 80241E60 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D9F334 80241E64 AFB00010 */ sw $s0, 0x10($sp) -/* D9F338 80241E68 0080802D */ daddu $s0, $a0, $zero -/* D9F33C 80241E6C AFBF0014 */ sw $ra, 0x14($sp) -/* D9F340 80241E70 8E020148 */ lw $v0, 0x148($s0) -/* D9F344 80241E74 0C00EABB */ jal get_npc_unsafe -/* D9F348 80241E78 84440008 */ lh $a0, 8($v0) -/* D9F34C 80241E7C 9443008E */ lhu $v1, 0x8e($v0) -/* D9F350 80241E80 2463FFFF */ addiu $v1, $v1, -1 -/* D9F354 80241E84 A443008E */ sh $v1, 0x8e($v0) -/* D9F358 80241E88 00031C00 */ sll $v1, $v1, 0x10 -/* D9F35C 80241E8C 58600001 */ blezl $v1, .L80241E94 -/* D9F360 80241E90 AE000070 */ sw $zero, 0x70($s0) -.L80241E94: -/* D9F364 80241E94 8FBF0014 */ lw $ra, 0x14($sp) -/* D9F368 80241E98 8FB00010 */ lw $s0, 0x10($sp) -/* D9F36C 80241E9C 03E00008 */ jr $ra -/* D9F370 80241EA0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s index 96d75154bd..3b90b9e1ce 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s @@ -194,7 +194,7 @@ glabel func_8024283C_D9FD0C /* D9FFE0 80242B10 0260202D */ daddu $a0, $s3, $zero /* D9FFE4 80242B14 08090ACD */ j .L80242B34 /* D9FFE8 80242B18 00000000 */ nop -/* D9FFEC 80242B1C 0C090798 */ jal func_80241E60_D9F330 +/* D9FFEC 80242B1C 0C090798 */ jal UnkDurationCheck /* D9FFF0 80242B20 0260202D */ daddu $a0, $s3, $zero /* D9FFF4 80242B24 08090ACD */ j .L80242B34 /* D9FFF8 80242B28 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242870_DCF540.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242870_DCF540.s deleted file mode 100644 index f4a2ff9f4a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242870_DCF540.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242870_DCF540 -/* DCF540 80242870 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DCF544 80242874 AFB00010 */ sw $s0, 0x10($sp) -/* DCF548 80242878 0080802D */ daddu $s0, $a0, $zero -/* DCF54C 8024287C AFBF0014 */ sw $ra, 0x14($sp) -/* DCF550 80242880 8E020148 */ lw $v0, 0x148($s0) -/* DCF554 80242884 0C00EABB */ jal get_npc_unsafe -/* DCF558 80242888 84440008 */ lh $a0, 8($v0) -/* DCF55C 8024288C 9443008E */ lhu $v1, 0x8e($v0) -/* DCF560 80242890 2463FFFF */ addiu $v1, $v1, -1 -/* DCF564 80242894 A443008E */ sh $v1, 0x8e($v0) -/* DCF568 80242898 00031C00 */ sll $v1, $v1, 0x10 -/* DCF56C 8024289C 58600001 */ blezl $v1, .L802428A4 -/* DCF570 802428A0 AE000070 */ sw $zero, 0x70($s0) -.L802428A4: -/* DCF574 802428A4 8FBF0014 */ lw $ra, 0x14($sp) -/* DCF578 802428A8 8FB00010 */ lw $s0, 0x10($sp) -/* DCF57C 802428AC 03E00008 */ jr $ra -/* DCF580 802428B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s index f93ad892cd..6e81866c38 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s @@ -194,7 +194,7 @@ glabel func_8024324C_DCFF1C /* DD01F0 80243520 0260202D */ daddu $a0, $s3, $zero /* DD01F4 80243524 08090D51 */ j .L80243544 /* DD01F8 80243528 00000000 */ nop -/* DD01FC 8024352C 0C090A1C */ jal func_80242870_DCF540 +/* DD01FC 8024352C 0C090A1C */ jal UnkDurationCheck /* DD0200 80243530 0260202D */ daddu $a0, $s3, $zero /* DD0204 80243534 08090D51 */ j .L80243544 /* DD0208 80243538 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802429C4_DF1864.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802429C4_DF1864.s deleted file mode 100644 index efe9ee4654..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802429C4_DF1864.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802429C4_DF1864 -/* DF1864 802429C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DF1868 802429C8 AFB00010 */ sw $s0, 0x10($sp) -/* DF186C 802429CC 0080802D */ daddu $s0, $a0, $zero -/* DF1870 802429D0 AFBF0014 */ sw $ra, 0x14($sp) -/* DF1874 802429D4 8E020148 */ lw $v0, 0x148($s0) -/* DF1878 802429D8 0C00EABB */ jal get_npc_unsafe -/* DF187C 802429DC 84440008 */ lh $a0, 8($v0) -/* DF1880 802429E0 9443008E */ lhu $v1, 0x8e($v0) -/* DF1884 802429E4 2463FFFF */ addiu $v1, $v1, -1 -/* DF1888 802429E8 A443008E */ sh $v1, 0x8e($v0) -/* DF188C 802429EC 00031C00 */ sll $v1, $v1, 0x10 -/* DF1890 802429F0 58600001 */ blezl $v1, .L802429F8 -/* DF1894 802429F4 AE000070 */ sw $zero, 0x70($s0) -.L802429F8: -/* DF1898 802429F8 8FBF0014 */ lw $ra, 0x14($sp) -/* DF189C 802429FC 8FB00010 */ lw $s0, 0x10($sp) -/* DF18A0 80242A00 03E00008 */ jr $ra -/* DF18A4 80242A04 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s index 7162257d52..59b911538e 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s @@ -194,7 +194,7 @@ glabel func_802433A0_DF2240 /* DF2514 80243674 0260202D */ daddu $a0, $s3, $zero /* DF2518 80243678 08090DA6 */ j .L80243698 /* DF251C 8024367C 00000000 */ nop -/* DF2520 80243680 0C090A71 */ jal func_802429C4_DF1864 +/* DF2520 80243680 0C090A71 */ jal UnkDurationCheck /* DF2524 80243684 0260202D */ daddu $a0, $s3, $zero /* DF2528 80243688 08090DA6 */ j .L80243698 /* DF252C 8024368C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024360C_9AB9FC.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024360C_9AB9FC.s deleted file mode 100644 index beed9d2f54..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024360C_9AB9FC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024360C_9AB9FC -/* 9AB9FC 8024360C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9ABA00 80243610 AFB00010 */ sw $s0, 0x10($sp) -/* 9ABA04 80243614 0080802D */ daddu $s0, $a0, $zero -/* 9ABA08 80243618 AFBF0014 */ sw $ra, 0x14($sp) -/* 9ABA0C 8024361C 8E020148 */ lw $v0, 0x148($s0) -/* 9ABA10 80243620 0C00EABB */ jal get_npc_unsafe -/* 9ABA14 80243624 84440008 */ lh $a0, 8($v0) -/* 9ABA18 80243628 9443008E */ lhu $v1, 0x8e($v0) -/* 9ABA1C 8024362C 2463FFFF */ addiu $v1, $v1, -1 -/* 9ABA20 80243630 A443008E */ sh $v1, 0x8e($v0) -/* 9ABA24 80243634 00031C00 */ sll $v1, $v1, 0x10 -/* 9ABA28 80243638 58600001 */ blezl $v1, .L80243640 -/* 9ABA2C 8024363C AE000070 */ sw $zero, 0x70($s0) -.L80243640: -/* 9ABA30 80243640 8FBF0014 */ lw $ra, 0x14($sp) -/* 9ABA34 80243644 8FB00010 */ lw $s0, 0x10($sp) -/* 9ABA38 80243648 03E00008 */ jr $ra -/* 9ABA3C 8024364C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s index 5741e71c26..bf659cc3b8 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s @@ -140,7 +140,7 @@ glabel func_80243650_9ABA40 /* 9ABC54 80243864 0000102D */ daddu $v0, $zero, $zero /* 9ABC58 80243868 0260202D */ daddu $a0, $s3, $zero /* 9ABC5C 8024386C 0200282D */ daddu $a1, $s0, $zero -/* 9ABC60 80243870 0C090D83 */ jal func_8024360C_9AB9FC +/* 9ABC60 80243870 0C090D83 */ jal UnkDurationCheck /* 9ABC64 80243874 0280302D */ daddu $a2, $s4, $zero .L80243878: /* 9ABC68 80243878 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802422D8_9B8C58.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802422D8_9B8C58.s deleted file mode 100644 index 077ec8258e..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802422D8_9B8C58.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422D8_9B8C58 -/* 9B8C58 802422D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B8C5C 802422DC AFB00010 */ sw $s0, 0x10($sp) -/* 9B8C60 802422E0 0080802D */ daddu $s0, $a0, $zero -/* 9B8C64 802422E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 9B8C68 802422E8 8E020148 */ lw $v0, 0x148($s0) -/* 9B8C6C 802422EC 0C00EABB */ jal get_npc_unsafe -/* 9B8C70 802422F0 84440008 */ lh $a0, 8($v0) -/* 9B8C74 802422F4 9443008E */ lhu $v1, 0x8e($v0) -/* 9B8C78 802422F8 2463FFFF */ addiu $v1, $v1, -1 -/* 9B8C7C 802422FC A443008E */ sh $v1, 0x8e($v0) -/* 9B8C80 80242300 00031C00 */ sll $v1, $v1, 0x10 -/* 9B8C84 80242304 58600001 */ blezl $v1, .L8024230C -/* 9B8C88 80242308 AE000070 */ sw $zero, 0x70($s0) -.L8024230C: -/* 9B8C8C 8024230C 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B8C90 80242310 8FB00010 */ lw $s0, 0x10($sp) -/* 9B8C94 80242314 03E00008 */ jr $ra -/* 9B8C98 80242318 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s index f636ffb153..e01ba01128 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s @@ -140,7 +140,7 @@ glabel func_8024231C_9B8C9C /* 9B8EB0 80242530 0000102D */ daddu $v0, $zero, $zero /* 9B8EB4 80242534 0260202D */ daddu $a0, $s3, $zero /* 9B8EB8 80242538 0200282D */ daddu $a1, $s0, $zero -/* 9B8EBC 8024253C 0C0908B6 */ jal func_802422D8_9B8C58 +/* 9B8EBC 8024253C 0C0908B6 */ jal UnkDurationCheck /* 9B8EC0 80242540 0280302D */ daddu $a2, $s4, $zero .L80242544: /* 9B8EC4 80242544 0000102D */ daddu $v0, $zero, $zero diff --git a/src/world/area_arn/arn_02/BDD1B0.c b/src/world/area_arn/arn_02/BDD1B0.c index af73d9d01d..ec71d0ea89 100644 --- a/src/world/area_arn/arn_02/BDD1B0.c +++ b/src/world/area_arn/arn_02/BDD1B0.c @@ -28,6 +28,6 @@ INCLUDE_ASM(s32, "world/area_arn/arn_02/BDD1B0", func_80240B68_BDDD18); INCLUDE_ASM(s32, "world/area_arn/arn_02/BDD1B0", func_80240BE4_BDDD94); -INCLUDE_ASM(s32, "world/area_arn/arn_02/BDD1B0", func_80240C4C_BDDDFC); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_02/BDD1B0", func_80240C90_BDDE40); diff --git a/src/world/area_arn/arn_04/BE37B0.c b/src/world/area_arn/arn_04/BE37B0.c index a8f481e32b..6c66f39caf 100644 --- a/src/world/area_arn/arn_04/BE37B0.c +++ b/src/world/area_arn/arn_04/BE37B0.c @@ -75,6 +75,6 @@ INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242EF0_BE66A0); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242F6C_BE671C); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242FD4_BE6784); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80243018_BE67C8); diff --git a/src/world/area_isk/isk_05/97DAD0.c b/src/world/area_isk/isk_05/97DAD0.c index 828b210e6c..6af4505ca1 100644 --- a/src/world/area_isk/isk_05/97DAD0.c +++ b/src/world/area_isk/isk_05/97DAD0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_802407CC_97E29C); INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_802408AC_97E37C); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240BAC_97E67C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240BF0_97E6C0); diff --git a/src/world/area_isk/isk_13/98F7E0.c b/src/world/area_isk/isk_13/98F7E0.c index b49bb03484..271d8df102 100644 --- a/src/world/area_isk/isk_13/98F7E0.c +++ b/src/world/area_isk/isk_13/98F7E0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_802407CC_98FFAC); INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_802408AC_99008C); -INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240BAC_99038C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240BF0_9903D0); diff --git a/src/world/area_isk/isk_14/992730.c b/src/world/area_isk/isk_14/992730.c index 56065c071a..aaae2df28f 100644 --- a/src/world/area_isk/isk_14/992730.c +++ b/src/world/area_isk/isk_14/992730.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_802407CC_992EFC); INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_802408AC_992FDC); -INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240BAC_9932DC); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240BF0_993320); diff --git a/src/world/area_iwa/iwa_01/90FBD0.c b/src/world/area_iwa/iwa_01/90FBD0.c index 3b3d44b4ee..e2f13d1cfc 100644 --- a/src/world/area_iwa/iwa_01/90FBD0.c +++ b/src/world/area_iwa/iwa_01/90FBD0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240854_90FF04); INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240998_910048); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240A38_9100E8); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240A7C_91012C); @@ -68,6 +68,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242E2C_9124DC); INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242EA8_912558); +// Should be #include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242F10_9125C0); INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242F54_912604); diff --git a/src/world/area_iwa/iwa_02/915D70.c b/src/world/area_iwa/iwa_02/915D70.c index cba098d994..4a22dea0ec 100644 --- a/src/world/area_iwa/iwa_02/915D70.c +++ b/src/world/area_iwa/iwa_02/915D70.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240B68_9168D8); INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240BE4_916954); -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240C4C_9169BC); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240C90_916A00); diff --git a/src/world/area_iwa/iwa_03/918EF0.c b/src/world/area_iwa/iwa_03/918EF0.c index 33f4840513..62cbf07747 100644 --- a/src/world/area_iwa/iwa_03/918EF0.c +++ b/src/world/area_iwa/iwa_03/918EF0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240EA8_919A58); INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240F24_919AD4); -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240F8C_919B3C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240FD0_919B80); diff --git a/src/world/area_iwa/iwa_04/91B8E0.c b/src/world/area_iwa/iwa_04/91B8E0.c index c14a5ccccf..4a06178562 100644 --- a/src/world/area_iwa/iwa_04/91B8E0.c +++ b/src/world/area_iwa/iwa_04/91B8E0.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240BE8_91C4C8); INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240C64_91C544); -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240CCC_91C5AC); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240D10_91C5F0); diff --git a/src/world/area_jan/jan_01/B28030.c b/src/world/area_jan/jan_01/B28030.c index 44bb76dce8..f4b95eaf9f 100644 --- a/src/world/area_jan/jan_01/B28030.c +++ b/src/world/area_jan/jan_01/B28030.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240B0C_B28B3C); INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240BEC_B28C1C); -INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240EEC_B28F1C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240F30_B28F60); diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index e0ebe101e8..9d70f9dab5 100644 --- a/src/world/area_jan/jan_05/B4B260.c +++ b/src/world/area_jan/jan_05/B4B260.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241070_B4BAE0); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241150_B4BBC0); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241450_B4BEC0); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241494_B4BF04); diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index 0ad751f985..8c2f650b3f 100644 --- a/src/world/area_jan/jan_06/B52F70.c +++ b/src/world/area_jan/jan_06/B52F70.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240F0C_B5373C); INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240FEC_B5381C); -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802412EC_B53B1C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241330_B53B60); diff --git a/src/world/area_jan/jan_10/B6C6A0.c b/src/world/area_jan/jan_10/B6C6A0.c index 10690c75b2..d66e571d77 100644 --- a/src/world/area_jan/jan_10/B6C6A0.c +++ b/src/world/area_jan/jan_10/B6C6A0.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240ADC_B6CE6C); INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", delete_actor_B6CF4C); -INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240EBC_B6D24C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240F00_B6D290); diff --git a/src/world/area_jan/jan_14/B7A510.c b/src/world/area_jan/jan_14/B7A510.c index 4a73654440..dca0a7aa2f 100644 --- a/src/world/area_jan/jan_14/B7A510.c +++ b/src/world/area_jan/jan_14/B7A510.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_80240C8C_B7ACDC); INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_80240D6C_B7ADBC); -INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_8024106C_B7B0BC); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_802410B0_B7B100); diff --git a/src/world/area_kpa/kpa_09/A4F0A0.c b/src/world/area_kpa/kpa_09/A4F0A0.c index e862319622..7574a79b66 100644 --- a/src/world/area_kpa/kpa_09/A4F0A0.c +++ b/src/world/area_kpa/kpa_09/A4F0A0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802403D4_A4F3D4); INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240518_A4F518); -INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802405B8_A4F5B8); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802405FC_A4F5FC); diff --git a/src/world/area_kpa/kpa_102/A93A50.c b/src/world/area_kpa/kpa_102/A93A50.c index 821ea121f7..3eae62e43c 100644 --- a/src/world/area_kpa/kpa_102/A93A50.c +++ b/src/world/area_kpa/kpa_102/A93A50.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240644_A93D84); INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240788_A93EC8); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240828_A93F68); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_8024086C_A93FAC); diff --git a/src/world/area_kpa/kpa_111/A99590.c b/src/world/area_kpa/kpa_111/A99590.c index 6d37aca4a8..d3be68e55a 100644 --- a/src/world/area_kpa/kpa_111/A99590.c +++ b/src/world/area_kpa/kpa_111/A99590.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802404A4_A99A34); INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802405E8_A99B78); -INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80240688_A99C18); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802406CC_A99C5C); diff --git a/src/world/area_kpa/kpa_115/A9ED40.c b/src/world/area_kpa/kpa_115/A9ED40.c index 5b0b901907..675dce92b7 100644 --- a/src/world/area_kpa/kpa_115/A9ED40.c +++ b/src/world/area_kpa/kpa_115/A9ED40.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_802404A4_A9F1E4); INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_802405E8_A9F328); -INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_80240688_A9F3C8); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_802406CC_A9F40C); diff --git a/src/world/area_kpa/kpa_50/A609D0.c b/src/world/area_kpa/kpa_50/A609D0.c index c1ab9fc7ef..a6e88a177f 100644 --- a/src/world/area_kpa/kpa_50/A609D0.c +++ b/src/world/area_kpa/kpa_50/A609D0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240334_A60D04); INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240478_A60E48); -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240518_A60EE8); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_8024055C_A60F2C); diff --git a/src/world/area_kpa/kpa_52/A671E0.c b/src/world/area_kpa/kpa_52/A671E0.c index f1442ec7c4..2463afef16 100644 --- a/src/world/area_kpa/kpa_52/A671E0.c +++ b/src/world/area_kpa/kpa_52/A671E0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240414_A67514); INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240558_A67658); -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_802405F8_A676F8); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_8024063C_A6773C); diff --git a/src/world/area_mim/mim_02/B97C70.c b/src/world/area_mim/mim_02/B97C70.c index 4cc3a30e1f..c1cb67ad99 100644 --- a/src/world/area_mim/mim_02/B97C70.c +++ b/src/world/area_mim/mim_02/B97C70.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_8024083C_B9843C); INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_8024091C_B9851C); -INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80240C1C_B9881C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80240C60_B98860); diff --git a/src/world/area_mim/mim_04/B9DB60.c b/src/world/area_mim/mim_04/B9DB60.c index e8e49c8c35..d01646e7bd 100644 --- a/src/world/area_mim/mim_04/B9DB60.c +++ b/src/world/area_mim/mim_04/B9DB60.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_802409CC_B9E32C); INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240AAC_B9E40C); -INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240DAC_B9E70C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240DF0_B9E750); diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c index 25fc5a045a..51e18ba938 100644 --- a/src/world/area_mim/mim_06/BA4CF0.c +++ b/src/world/area_mim/mim_06/BA4CF0.c @@ -42,6 +42,6 @@ INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_802426E0_BA6E60); INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_802427C0_BA6F40); -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80242AC0_BA7240); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80242B04_BA7284); diff --git a/src/world/area_mim/mim_07/BAA3B0.c b/src/world/area_mim/mim_07/BAA3B0.c index 9b3db1109d..20435058fa 100644 --- a/src/world/area_mim/mim_07/BAA3B0.c +++ b/src/world/area_mim/mim_07/BAA3B0.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_80240A3C_BAAB7C); INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_80240B1C_BAAC5C); -INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_80240E1C_BAAF5C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_80240E60_BAAFA0); diff --git a/src/world/area_mim/mim_09/BB2E00.c b/src/world/area_mim/mim_09/BB2E00.c index 8af9d61707..f4a29f4a27 100644 --- a/src/world/area_mim/mim_09/BB2E00.c +++ b/src/world/area_mim/mim_09/BB2E00.c @@ -16,6 +16,6 @@ INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_8024086C_BB366C); INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_8024094C_BB374C); -INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_80240C4C_BB3A4C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_80240C90_BB3A90); diff --git a/src/world/area_nok/nok_03/9EB7F0.c b/src/world/area_nok/nok_03/9EB7F0.c index c937e6b0d8..6f65ca93bd 100644 --- a/src/world/area_nok/nok_03/9EB7F0.c +++ b/src/world/area_nok/nok_03/9EB7F0.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_802407CC_9EBFBC); INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_802408AC_9EC09C); -INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_80240BAC_9EC39C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_80240BF0_9EC3E0); diff --git a/src/world/area_nok/nok_13/A00600.c b/src/world/area_nok/nok_13/A00600.c index 52109b8a39..24e52d2595 100644 --- a/src/world/area_nok/nok_13/A00600.c +++ b/src/world/area_nok/nok_13/A00600.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_802407CC_A00DCC); INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_802408AC_A00EAC); -INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_80240BAC_A011AC); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_80240BF0_A011F0); diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c index 1e75c71b77..23f833aec6 100644 --- a/src/world/area_nok/nok_14/A02A00.c +++ b/src/world/area_nok/nok_14/A02A00.c @@ -38,6 +38,6 @@ INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241FB4_A047F4); INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80242070_A048B0); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80242188_A049C8); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802421CC_A04A0C); diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 34433fde75..7d3ad7e37d 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -50,6 +50,6 @@ INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802420D4_A08FD4); INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80242190_A09090); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802422A8_A091A8); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802422EC_A091EC); diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c index 9b12ed7cb0..a5ef718593 100644 --- a/src/world/area_omo/omo_02/D9D510.c +++ b/src/world/area_omo/omo_02/D9D510.c @@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241C7C_D9F14C); INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241DC0_D9F290); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241E60_D9F330); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241EA4_D9F374); diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index 121afd9eef..94b422f644 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -54,7 +54,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024268C_DCF35C); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802427D0_DCF4A0); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80242870_DCF540); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802428B4_DCF584); diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index 9db434890b..534ddba058 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -48,7 +48,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802427E0_DF1680); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80242924_DF17C4); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802429C4_DF1864); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80242A08_DF18A8); diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index 1961e3d13d..d25ce5a0c1 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -65,6 +65,6 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243438_9AB828); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802434F4_9AB8E4); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_8024360C_9AB9FC); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243650_9ABA40); diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c index 9aedc4df98..41ba0a6d25 100644 --- a/src/world/area_trd/trd_07/9B6C90.c +++ b/src/world/area_trd/trd_07/9B6C90.c @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80242104_9B8A84); INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802421C0_9B8B40); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802422D8_9B8C58); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024231C_9B8C9C); diff --git a/src/world/common/UnkDurationCheck.inc.c b/src/world/common/UnkDurationCheck.inc.c new file mode 100644 index 0000000000..349be98203 --- /dev/null +++ b/src/world/common/UnkDurationCheck.inc.c @@ -0,0 +1,11 @@ +#include "common.h" +#include "map.h" + +static void UnkDurationCheck(ScriptInstance* script) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + npc->duration--; + if ((npc->duration << 0x10) <= 0) { + script->functionTemp[0].s = 0; + } +} From 7d09429fd67c65e966bebd46026084545487685f Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 21 Nov 2020 20:31:57 -0500 Subject: [PATCH 13/38] GetEntryPos --- .../dro_01/95B200/func_802400F0_95B2F0.s | 60 ------------------- .../dro_01/95E7A0/func_80243690_95E890.s | 60 ------------------- .../flo_11/CBDCD0/func_802400F0_CBDDC0.s | 60 ------------------- .../gv_01/E1E460/func_802400F0_E1E550.s | 60 ------------------- .../jan_03/B34BD0/func_802400F0_B34CC0.s | 60 ------------------- .../jan_09/B65AB0/func_802400F0_B65BA0.s | 60 ------------------- .../jan_11/B70860/func_80240248_B70AA8.s | 60 ------------------- .../kmr_02/8B0070/func_802400F0_8B0160.s | 60 ------------------- .../kmr_20/8EBE50/func_80240120_8EBF40.s | 60 ------------------- .../kmr_20/8ED5A0/func_80241870_8ED690.s | 60 ------------------- .../kmr_20/8EDB70/func_80241E40_8EDC60.s | 60 ------------------- .../mac_00/7EAD10/func_802400F0_7EAE00.s | 60 ------------------- .../mac_02/8232C0/func_802400F0_8233B0.s | 60 ------------------- .../mac_03/831800/func_802400F0_8318F0.s | 60 ------------------- .../mgm_00/E0E7A0/func_802400F0_E0E890.s | 60 ------------------- .../mim_11/BB7070/func_802400F0_BB7160.s | 60 ------------------- .../nok_02/9D7020/func_802400F0_9D7110.s | 60 ------------------- .../nok_15/A06F00/func_802400F0_A06FF0.s | 60 ------------------- .../sam_02/D05730/func_802400F0_D05820.s | 60 ------------------- .../tik_01/8694B0/func_802403FC_8698AC.s | 60 ------------------- .../tik_03/86EB00/func_802400F0_86EBF0.s | 60 ------------------- .../tik_04/871A30/func_802403FC_871E2C.s | 60 ------------------- .../tik_06/876EE0/func_802400F0_876FD0.s | 60 ------------------- .../tik_07/879BE0/func_802400F0_879CD0.s | 60 ------------------- .../tik_08/87EDF0/func_802400F0_87EEE0.s | 60 ------------------- .../tik_09/8821C0/func_802400F0_8822B0.s | 60 ------------------- .../tik_12/888BD0/func_802400F0_888CC0.s | 60 ------------------- .../tik_14/88D600/func_802400F0_88D6F0.s | 60 ------------------- .../tik_15/88FBA0/func_802400F0_88FC90.s | 60 ------------------- .../tik_17/893790/func_80240E60_893880.s | 60 ------------------- .../tik_19/8975E0/func_802400F0_8976D0.s | 60 ------------------- .../tik_20/89A350/func_802403FC_89A74C.s | 60 ------------------- .../tik_21/89D7A0/func_802403FC_89DB9C.s | 60 ------------------- .../tik_22/89FEF0/func_8024042C_8A02EC.s | 60 ------------------- .../tik_23/8A23D0/func_802400F0_8A24C0.s | 60 ------------------- include/map.h | 3 +- src/world/area_dro/dro_01/95B200.c | 2 +- src/world/area_dro/dro_01/95E7A0.c | 2 +- src/world/area_flo/flo_11/CBDCD0.c | 2 +- src/world/area_gv/gv_01/E1E460.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_jan/jan_09/B65AB0.c | 2 +- src/world/area_jan/jan_11/B70860.c | 2 +- src/world/area_kmr/kmr_02/8B0070.c | 2 +- src/world/area_kmr/kmr_03/8C7F90.c | 2 +- src/world/area_kmr/kmr_12/header.c | 2 +- src/world/area_kmr/kmr_20/8EBE50.c | 2 +- src/world/area_kmr/kmr_20/8ED5A0.c | 2 +- src/world/area_kmr/kmr_20/8EDB70.c | 2 +- src/world/area_mac/mac_00/7EAD10.c | 2 +- src/world/area_mac/mac_02/8232C0.c | 2 +- src/world/area_mac/mac_03/831800.c | 2 +- src/world/area_mgm/mgm_00/E0E7A0.c | 2 +- src/world/area_mim/mim_11/BB7070.c | 2 +- src/world/area_nok/nok_02/9D7020.c | 2 +- src/world/area_nok/nok_15/A06F00.c | 2 +- src/world/area_sam/sam_02/D05730.c | 2 +- src/world/area_sbk/sbk_00/929270.c | 2 +- src/world/area_sbk/sbk_01/929A90.c | 2 +- src/world/area_tik/tik_01/8694B0.c | 2 +- src/world/area_tik/tik_03/86EB00.c | 2 +- src/world/area_tik/tik_04/871A30.c | 2 +- src/world/area_tik/tik_06/876EE0.c | 2 +- src/world/area_tik/tik_07/879BE0.c | 2 +- src/world/area_tik/tik_08/87EDF0.c | 2 +- src/world/area_tik/tik_09/8821C0.c | 2 +- src/world/area_tik/tik_12/888BD0.c | 2 +- src/world/area_tik/tik_14/88D600.c | 2 +- src/world/area_tik/tik_15/88FBA0.c | 2 +- src/world/area_tik/tik_17/893790.c | 2 +- src/world/area_tik/tik_19/8975E0.c | 2 +- src/world/area_tik/tik_20/89A350.c | 2 +- src/world/area_tik/tik_21/89D7A0.c | 2 +- src/world/area_tik/tik_22/89FEF0.c | 2 +- src/world/area_tik/tik_23/8A23D0.c | 2 +- src/world/common/GetEntryPos.inc.c | 13 ++++ src/world/world.c | 2 +- 77 files changed, 55 insertions(+), 2141 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B200/func_802400F0_95B2F0.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243690_95E890.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_802400F0_CBDDC0.s delete mode 100644 asm/nonmatchings/world/area_gv/gv_01/E1E460/func_802400F0_E1E550.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802400F0_B34CC0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_802400F0_B65BA0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240248_B70AA8.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802400F0_8B0160.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240120_8EBF40.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241870_8ED690.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241E40_8EDC60.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802400F0_7EAE00.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/8232C0/func_802400F0_8233B0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831800/func_802400F0_8318F0.s delete mode 100644 asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802400F0_E0E890.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802400F0_BB7160.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802400F0_9D7110.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802400F0_A06FF0.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05730/func_802400F0_D05820.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802403FC_8698AC.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_03/86EB00/func_802400F0_86EBF0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_04/871A30/func_802403FC_871E2C.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_06/876EE0/func_802400F0_876FD0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802400F0_879CD0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_802400F0_87EEE0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_09/8821C0/func_802400F0_8822B0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_12/888BD0/func_802400F0_888CC0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_14/88D600/func_802400F0_88D6F0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_802400F0_88FC90.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_17/893790/func_80240E60_893880.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_19/8975E0/func_802400F0_8976D0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_20/89A350/func_802403FC_89A74C.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_802403FC_89DB9C.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024042C_8A02EC.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802400F0_8A24C0.s create mode 100644 src/world/common/GetEntryPos.inc.c diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802400F0_95B2F0.s b/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802400F0_95B2F0.s deleted file mode 100644 index 16a9b9c13f..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802400F0_95B2F0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_95B2F0 -/* 95B2F0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95B2F4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 95B2F8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 95B2FC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 95B300 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 95B304 80240104 0C016AFA */ jal get_current_map_header -/* 95B308 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 95B30C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 95B310 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 95B314 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 95B318 80240118 0C0B1EAF */ jal get_variable -/* 95B31C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 95B320 80240120 0220202D */ daddu $a0, $s1, $zero -/* 95B324 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 95B328 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 95B32C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 95B330 80240130 02031821 */ addu $v1, $s0, $v1 -/* 95B334 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 95B338 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 95B33C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 95B340 80240140 0C0B2026 */ jal set_variable -/* 95B344 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 95B348 80240148 0220202D */ daddu $a0, $s1, $zero -/* 95B34C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 95B350 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 95B354 80240154 02021021 */ addu $v0, $s0, $v0 -/* 95B358 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 95B35C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 95B360 80240160 44061000 */ mfc1 $a2, $f2 -/* 95B364 80240164 0C0B2026 */ jal set_variable -/* 95B368 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 95B36C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 95B370 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 95B374 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 95B378 80240178 02021021 */ addu $v0, $s0, $v0 -/* 95B37C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 95B380 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 95B384 80240184 44061000 */ mfc1 $a2, $f2 -/* 95B388 80240188 0C0B2026 */ jal set_variable -/* 95B38C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 95B390 80240190 0220202D */ daddu $a0, $s1, $zero -/* 95B394 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 95B398 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 95B39C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 95B3A0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 95B3A4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 95B3A8 802401A8 44061000 */ mfc1 $a2, $f2 -/* 95B3AC 802401AC 0C0B2026 */ jal set_variable -/* 95B3B0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 95B3B4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 95B3B8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 95B3BC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 95B3C0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 95B3C4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 95B3C8 802401C8 03E00008 */ jr $ra -/* 95B3CC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243690_95E890.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243690_95E890.s deleted file mode 100644 index 82b3ea1e7b..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243690_95E890.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243690_95E890 -/* 95E890 80243690 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95E894 80243694 AFB10014 */ sw $s1, 0x14($sp) -/* 95E898 80243698 0080882D */ daddu $s1, $a0, $zero -/* 95E89C 8024369C AFBF001C */ sw $ra, 0x1c($sp) -/* 95E8A0 802436A0 AFB20018 */ sw $s2, 0x18($sp) -/* 95E8A4 802436A4 0C016AFA */ jal get_current_map_header -/* 95E8A8 802436A8 AFB00010 */ sw $s0, 0x10($sp) -/* 95E8AC 802436AC 0220202D */ daddu $a0, $s1, $zero -/* 95E8B0 802436B0 3C05FE36 */ lui $a1, 0xfe36 -/* 95E8B4 802436B4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 95E8B8 802436B8 0C0B1EAF */ jal get_variable -/* 95E8BC 802436BC 0040902D */ daddu $s2, $v0, $zero -/* 95E8C0 802436C0 0220202D */ daddu $a0, $s1, $zero -/* 95E8C4 802436C4 3C05FE36 */ lui $a1, 0xfe36 -/* 95E8C8 802436C8 8E430014 */ lw $v1, 0x14($s2) -/* 95E8CC 802436CC 00028100 */ sll $s0, $v0, 4 -/* 95E8D0 802436D0 02031821 */ addu $v1, $s0, $v1 -/* 95E8D4 802436D4 C4600000 */ lwc1 $f0, ($v1) -/* 95E8D8 802436D8 4600008D */ trunc.w.s $f2, $f0 -/* 95E8DC 802436DC 44061000 */ mfc1 $a2, $f2 -/* 95E8E0 802436E0 0C0B2026 */ jal set_variable -/* 95E8E4 802436E4 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 95E8E8 802436E8 0220202D */ daddu $a0, $s1, $zero -/* 95E8EC 802436EC 8E420014 */ lw $v0, 0x14($s2) -/* 95E8F0 802436F0 3C05FE36 */ lui $a1, 0xfe36 -/* 95E8F4 802436F4 02021021 */ addu $v0, $s0, $v0 -/* 95E8F8 802436F8 C4400004 */ lwc1 $f0, 4($v0) -/* 95E8FC 802436FC 4600008D */ trunc.w.s $f2, $f0 -/* 95E900 80243700 44061000 */ mfc1 $a2, $f2 -/* 95E904 80243704 0C0B2026 */ jal set_variable -/* 95E908 80243708 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 95E90C 8024370C 0220202D */ daddu $a0, $s1, $zero -/* 95E910 80243710 8E420014 */ lw $v0, 0x14($s2) -/* 95E914 80243714 3C05FE36 */ lui $a1, 0xfe36 -/* 95E918 80243718 02021021 */ addu $v0, $s0, $v0 -/* 95E91C 8024371C C4400008 */ lwc1 $f0, 8($v0) -/* 95E920 80243720 4600008D */ trunc.w.s $f2, $f0 -/* 95E924 80243724 44061000 */ mfc1 $a2, $f2 -/* 95E928 80243728 0C0B2026 */ jal set_variable -/* 95E92C 8024372C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 95E930 80243730 0220202D */ daddu $a0, $s1, $zero -/* 95E934 80243734 8E420014 */ lw $v0, 0x14($s2) -/* 95E938 80243738 3C05FE36 */ lui $a1, 0xfe36 -/* 95E93C 8024373C 02028021 */ addu $s0, $s0, $v0 -/* 95E940 80243740 C600000C */ lwc1 $f0, 0xc($s0) -/* 95E944 80243744 4600008D */ trunc.w.s $f2, $f0 -/* 95E948 80243748 44061000 */ mfc1 $a2, $f2 -/* 95E94C 8024374C 0C0B2026 */ jal set_variable -/* 95E950 80243750 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 95E954 80243754 8FBF001C */ lw $ra, 0x1c($sp) -/* 95E958 80243758 8FB20018 */ lw $s2, 0x18($sp) -/* 95E95C 8024375C 8FB10014 */ lw $s1, 0x14($sp) -/* 95E960 80243760 8FB00010 */ lw $s0, 0x10($sp) -/* 95E964 80243764 24020002 */ addiu $v0, $zero, 2 -/* 95E968 80243768 03E00008 */ jr $ra -/* 95E96C 8024376C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_802400F0_CBDDC0.s b/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_802400F0_CBDDC0.s deleted file mode 100644 index 4ae194fc45..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_802400F0_CBDDC0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_CBDDC0 -/* CBDDC0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CBDDC4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* CBDDC8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* CBDDCC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* CBDDD0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* CBDDD4 80240104 0C016AFA */ jal get_current_map_header -/* CBDDD8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* CBDDDC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* CBDDE0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* CBDDE4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* CBDDE8 80240118 0C0B1EAF */ jal get_variable -/* CBDDEC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* CBDDF0 80240120 0220202D */ daddu $a0, $s1, $zero -/* CBDDF4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* CBDDF8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* CBDDFC 8024012C 00028100 */ sll $s0, $v0, 4 -/* CBDE00 80240130 02031821 */ addu $v1, $s0, $v1 -/* CBDE04 80240134 C4600000 */ lwc1 $f0, ($v1) -/* CBDE08 80240138 4600008D */ trunc.w.s $f2, $f0 -/* CBDE0C 8024013C 44061000 */ mfc1 $a2, $f2 -/* CBDE10 80240140 0C0B2026 */ jal set_variable -/* CBDE14 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* CBDE18 80240148 0220202D */ daddu $a0, $s1, $zero -/* CBDE1C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* CBDE20 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* CBDE24 80240154 02021021 */ addu $v0, $s0, $v0 -/* CBDE28 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* CBDE2C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* CBDE30 80240160 44061000 */ mfc1 $a2, $f2 -/* CBDE34 80240164 0C0B2026 */ jal set_variable -/* CBDE38 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* CBDE3C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* CBDE40 80240170 8E420014 */ lw $v0, 0x14($s2) -/* CBDE44 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* CBDE48 80240178 02021021 */ addu $v0, $s0, $v0 -/* CBDE4C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* CBDE50 80240180 4600008D */ trunc.w.s $f2, $f0 -/* CBDE54 80240184 44061000 */ mfc1 $a2, $f2 -/* CBDE58 80240188 0C0B2026 */ jal set_variable -/* CBDE5C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* CBDE60 80240190 0220202D */ daddu $a0, $s1, $zero -/* CBDE64 80240194 8E420014 */ lw $v0, 0x14($s2) -/* CBDE68 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* CBDE6C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* CBDE70 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* CBDE74 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* CBDE78 802401A8 44061000 */ mfc1 $a2, $f2 -/* CBDE7C 802401AC 0C0B2026 */ jal set_variable -/* CBDE80 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* CBDE84 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* CBDE88 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* CBDE8C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* CBDE90 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* CBDE94 802401C4 24020002 */ addiu $v0, $zero, 2 -/* CBDE98 802401C8 03E00008 */ jr $ra -/* CBDE9C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_802400F0_E1E550.s b/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_802400F0_E1E550.s deleted file mode 100644 index 64a13483fd..0000000000 --- a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_802400F0_E1E550.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_E1E550 -/* E1E550 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E1E554 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* E1E558 802400F8 0080882D */ daddu $s1, $a0, $zero -/* E1E55C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* E1E560 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* E1E564 80240104 0C016AFA */ jal get_current_map_header -/* E1E568 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* E1E56C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* E1E570 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* E1E574 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* E1E578 80240118 0C0B1EAF */ jal get_variable -/* E1E57C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* E1E580 80240120 0220202D */ daddu $a0, $s1, $zero -/* E1E584 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* E1E588 80240128 8E430014 */ lw $v1, 0x14($s2) -/* E1E58C 8024012C 00028100 */ sll $s0, $v0, 4 -/* E1E590 80240130 02031821 */ addu $v1, $s0, $v1 -/* E1E594 80240134 C4600000 */ lwc1 $f0, ($v1) -/* E1E598 80240138 4600008D */ trunc.w.s $f2, $f0 -/* E1E59C 8024013C 44061000 */ mfc1 $a2, $f2 -/* E1E5A0 80240140 0C0B2026 */ jal set_variable -/* E1E5A4 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* E1E5A8 80240148 0220202D */ daddu $a0, $s1, $zero -/* E1E5AC 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* E1E5B0 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* E1E5B4 80240154 02021021 */ addu $v0, $s0, $v0 -/* E1E5B8 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* E1E5BC 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* E1E5C0 80240160 44061000 */ mfc1 $a2, $f2 -/* E1E5C4 80240164 0C0B2026 */ jal set_variable -/* E1E5C8 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* E1E5CC 8024016C 0220202D */ daddu $a0, $s1, $zero -/* E1E5D0 80240170 8E420014 */ lw $v0, 0x14($s2) -/* E1E5D4 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* E1E5D8 80240178 02021021 */ addu $v0, $s0, $v0 -/* E1E5DC 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* E1E5E0 80240180 4600008D */ trunc.w.s $f2, $f0 -/* E1E5E4 80240184 44061000 */ mfc1 $a2, $f2 -/* E1E5E8 80240188 0C0B2026 */ jal set_variable -/* E1E5EC 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E1E5F0 80240190 0220202D */ daddu $a0, $s1, $zero -/* E1E5F4 80240194 8E420014 */ lw $v0, 0x14($s2) -/* E1E5F8 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* E1E5FC 8024019C 02028021 */ addu $s0, $s0, $v0 -/* E1E600 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* E1E604 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* E1E608 802401A8 44061000 */ mfc1 $a2, $f2 -/* E1E60C 802401AC 0C0B2026 */ jal set_variable -/* E1E610 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* E1E614 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* E1E618 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* E1E61C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* E1E620 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* E1E624 802401C4 24020002 */ addiu $v0, $zero, 2 -/* E1E628 802401C8 03E00008 */ jr $ra -/* E1E62C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802400F0_B34CC0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802400F0_B34CC0.s deleted file mode 100644 index 06b17b8424..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802400F0_B34CC0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_B34CC0 -/* B34CC0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B34CC4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* B34CC8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* B34CCC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* B34CD0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* B34CD4 80240104 0C016AFA */ jal get_current_map_header -/* B34CD8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* B34CDC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* B34CE0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* B34CE4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B34CE8 80240118 0C0B1EAF */ jal get_variable -/* B34CEC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* B34CF0 80240120 0220202D */ daddu $a0, $s1, $zero -/* B34CF4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* B34CF8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* B34CFC 8024012C 00028100 */ sll $s0, $v0, 4 -/* B34D00 80240130 02031821 */ addu $v1, $s0, $v1 -/* B34D04 80240134 C4600000 */ lwc1 $f0, ($v1) -/* B34D08 80240138 4600008D */ trunc.w.s $f2, $f0 -/* B34D0C 8024013C 44061000 */ mfc1 $a2, $f2 -/* B34D10 80240140 0C0B2026 */ jal set_variable -/* B34D14 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B34D18 80240148 0220202D */ daddu $a0, $s1, $zero -/* B34D1C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* B34D20 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* B34D24 80240154 02021021 */ addu $v0, $s0, $v0 -/* B34D28 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* B34D2C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* B34D30 80240160 44061000 */ mfc1 $a2, $f2 -/* B34D34 80240164 0C0B2026 */ jal set_variable -/* B34D38 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* B34D3C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* B34D40 80240170 8E420014 */ lw $v0, 0x14($s2) -/* B34D44 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* B34D48 80240178 02021021 */ addu $v0, $s0, $v0 -/* B34D4C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* B34D50 80240180 4600008D */ trunc.w.s $f2, $f0 -/* B34D54 80240184 44061000 */ mfc1 $a2, $f2 -/* B34D58 80240188 0C0B2026 */ jal set_variable -/* B34D5C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* B34D60 80240190 0220202D */ daddu $a0, $s1, $zero -/* B34D64 80240194 8E420014 */ lw $v0, 0x14($s2) -/* B34D68 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* B34D6C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* B34D70 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* B34D74 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* B34D78 802401A8 44061000 */ mfc1 $a2, $f2 -/* B34D7C 802401AC 0C0B2026 */ jal set_variable -/* B34D80 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* B34D84 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* B34D88 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* B34D8C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* B34D90 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* B34D94 802401C4 24020002 */ addiu $v0, $zero, 2 -/* B34D98 802401C8 03E00008 */ jr $ra -/* B34D9C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_802400F0_B65BA0.s b/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_802400F0_B65BA0.s deleted file mode 100644 index da04950534..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_802400F0_B65BA0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_B65BA0 -/* B65BA0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B65BA4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* B65BA8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* B65BAC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* B65BB0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* B65BB4 80240104 0C016AFA */ jal get_current_map_header -/* B65BB8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* B65BBC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* B65BC0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* B65BC4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B65BC8 80240118 0C0B1EAF */ jal get_variable -/* B65BCC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* B65BD0 80240120 0220202D */ daddu $a0, $s1, $zero -/* B65BD4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* B65BD8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* B65BDC 8024012C 00028100 */ sll $s0, $v0, 4 -/* B65BE0 80240130 02031821 */ addu $v1, $s0, $v1 -/* B65BE4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* B65BE8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* B65BEC 8024013C 44061000 */ mfc1 $a2, $f2 -/* B65BF0 80240140 0C0B2026 */ jal set_variable -/* B65BF4 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B65BF8 80240148 0220202D */ daddu $a0, $s1, $zero -/* B65BFC 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* B65C00 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* B65C04 80240154 02021021 */ addu $v0, $s0, $v0 -/* B65C08 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* B65C0C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* B65C10 80240160 44061000 */ mfc1 $a2, $f2 -/* B65C14 80240164 0C0B2026 */ jal set_variable -/* B65C18 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* B65C1C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* B65C20 80240170 8E420014 */ lw $v0, 0x14($s2) -/* B65C24 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* B65C28 80240178 02021021 */ addu $v0, $s0, $v0 -/* B65C2C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* B65C30 80240180 4600008D */ trunc.w.s $f2, $f0 -/* B65C34 80240184 44061000 */ mfc1 $a2, $f2 -/* B65C38 80240188 0C0B2026 */ jal set_variable -/* B65C3C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* B65C40 80240190 0220202D */ daddu $a0, $s1, $zero -/* B65C44 80240194 8E420014 */ lw $v0, 0x14($s2) -/* B65C48 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* B65C4C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* B65C50 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* B65C54 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* B65C58 802401A8 44061000 */ mfc1 $a2, $f2 -/* B65C5C 802401AC 0C0B2026 */ jal set_variable -/* B65C60 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* B65C64 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* B65C68 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* B65C6C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* B65C70 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* B65C74 802401C4 24020002 */ addiu $v0, $zero, 2 -/* B65C78 802401C8 03E00008 */ jr $ra -/* B65C7C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240248_B70AA8.s b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240248_B70AA8.s deleted file mode 100644 index f683ce8b8c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240248_B70AA8.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240248_B70AA8 -/* B70AA8 80240248 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B70AAC 8024024C AFB10014 */ sw $s1, 0x14($sp) -/* B70AB0 80240250 0080882D */ daddu $s1, $a0, $zero -/* B70AB4 80240254 AFBF001C */ sw $ra, 0x1c($sp) -/* B70AB8 80240258 AFB20018 */ sw $s2, 0x18($sp) -/* B70ABC 8024025C 0C016AFA */ jal get_current_map_header -/* B70AC0 80240260 AFB00010 */ sw $s0, 0x10($sp) -/* B70AC4 80240264 0220202D */ daddu $a0, $s1, $zero -/* B70AC8 80240268 3C05FE36 */ lui $a1, 0xfe36 -/* B70ACC 8024026C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B70AD0 80240270 0C0B1EAF */ jal get_variable -/* B70AD4 80240274 0040902D */ daddu $s2, $v0, $zero -/* B70AD8 80240278 0220202D */ daddu $a0, $s1, $zero -/* B70ADC 8024027C 3C05FE36 */ lui $a1, 0xfe36 -/* B70AE0 80240280 8E430014 */ lw $v1, 0x14($s2) -/* B70AE4 80240284 00028100 */ sll $s0, $v0, 4 -/* B70AE8 80240288 02031821 */ addu $v1, $s0, $v1 -/* B70AEC 8024028C C4600000 */ lwc1 $f0, ($v1) -/* B70AF0 80240290 4600008D */ trunc.w.s $f2, $f0 -/* B70AF4 80240294 44061000 */ mfc1 $a2, $f2 -/* B70AF8 80240298 0C0B2026 */ jal set_variable -/* B70AFC 8024029C 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B70B00 802402A0 0220202D */ daddu $a0, $s1, $zero -/* B70B04 802402A4 8E420014 */ lw $v0, 0x14($s2) -/* B70B08 802402A8 3C05FE36 */ lui $a1, 0xfe36 -/* B70B0C 802402AC 02021021 */ addu $v0, $s0, $v0 -/* B70B10 802402B0 C4400004 */ lwc1 $f0, 4($v0) -/* B70B14 802402B4 4600008D */ trunc.w.s $f2, $f0 -/* B70B18 802402B8 44061000 */ mfc1 $a2, $f2 -/* B70B1C 802402BC 0C0B2026 */ jal set_variable -/* B70B20 802402C0 34A53C82 */ ori $a1, $a1, 0x3c82 -/* B70B24 802402C4 0220202D */ daddu $a0, $s1, $zero -/* B70B28 802402C8 8E420014 */ lw $v0, 0x14($s2) -/* B70B2C 802402CC 3C05FE36 */ lui $a1, 0xfe36 -/* B70B30 802402D0 02021021 */ addu $v0, $s0, $v0 -/* B70B34 802402D4 C4400008 */ lwc1 $f0, 8($v0) -/* B70B38 802402D8 4600008D */ trunc.w.s $f2, $f0 -/* B70B3C 802402DC 44061000 */ mfc1 $a2, $f2 -/* B70B40 802402E0 0C0B2026 */ jal set_variable -/* B70B44 802402E4 34A53C83 */ ori $a1, $a1, 0x3c83 -/* B70B48 802402E8 0220202D */ daddu $a0, $s1, $zero -/* B70B4C 802402EC 8E420014 */ lw $v0, 0x14($s2) -/* B70B50 802402F0 3C05FE36 */ lui $a1, 0xfe36 -/* B70B54 802402F4 02028021 */ addu $s0, $s0, $v0 -/* B70B58 802402F8 C600000C */ lwc1 $f0, 0xc($s0) -/* B70B5C 802402FC 4600008D */ trunc.w.s $f2, $f0 -/* B70B60 80240300 44061000 */ mfc1 $a2, $f2 -/* B70B64 80240304 0C0B2026 */ jal set_variable -/* B70B68 80240308 34A53C84 */ ori $a1, $a1, 0x3c84 -/* B70B6C 8024030C 8FBF001C */ lw $ra, 0x1c($sp) -/* B70B70 80240310 8FB20018 */ lw $s2, 0x18($sp) -/* B70B74 80240314 8FB10014 */ lw $s1, 0x14($sp) -/* B70B78 80240318 8FB00010 */ lw $s0, 0x10($sp) -/* B70B7C 8024031C 24020002 */ addiu $v0, $zero, 2 -/* B70B80 80240320 03E00008 */ jr $ra -/* B70B84 80240324 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802400F0_8B0160.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802400F0_8B0160.s deleted file mode 100644 index c6ddcda55c..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802400F0_8B0160.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_8B0160 -/* 8B0160 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B0164 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 8B0168 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 8B016C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 8B0170 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 8B0174 80240104 0C016AFA */ jal get_current_map_header -/* 8B0178 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 8B017C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 8B0180 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 8B0184 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8B0188 80240118 0C0B1EAF */ jal get_variable -/* 8B018C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 8B0190 80240120 0220202D */ daddu $a0, $s1, $zero -/* 8B0194 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 8B0198 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 8B019C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 8B01A0 80240130 02031821 */ addu $v1, $s0, $v1 -/* 8B01A4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 8B01A8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 8B01AC 8024013C 44061000 */ mfc1 $a2, $f2 -/* 8B01B0 80240140 0C0B2026 */ jal set_variable -/* 8B01B4 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8B01B8 80240148 0220202D */ daddu $a0, $s1, $zero -/* 8B01BC 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 8B01C0 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 8B01C4 80240154 02021021 */ addu $v0, $s0, $v0 -/* 8B01C8 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 8B01CC 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 8B01D0 80240160 44061000 */ mfc1 $a2, $f2 -/* 8B01D4 80240164 0C0B2026 */ jal set_variable -/* 8B01D8 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8B01DC 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 8B01E0 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 8B01E4 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 8B01E8 80240178 02021021 */ addu $v0, $s0, $v0 -/* 8B01EC 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 8B01F0 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 8B01F4 80240184 44061000 */ mfc1 $a2, $f2 -/* 8B01F8 80240188 0C0B2026 */ jal set_variable -/* 8B01FC 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8B0200 80240190 0220202D */ daddu $a0, $s1, $zero -/* 8B0204 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 8B0208 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 8B020C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 8B0210 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 8B0214 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 8B0218 802401A8 44061000 */ mfc1 $a2, $f2 -/* 8B021C 802401AC 0C0B2026 */ jal set_variable -/* 8B0220 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8B0224 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 8B0228 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 8B022C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 8B0230 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 8B0234 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 8B0238 802401C8 03E00008 */ jr $ra -/* 8B023C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240120_8EBF40.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240120_8EBF40.s deleted file mode 100644 index d78aa60188..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240120_8EBF40.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240120_8EBF40 -/* 8EBF40 80240120 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8EBF44 80240124 AFB10014 */ sw $s1, 0x14($sp) -/* 8EBF48 80240128 0080882D */ daddu $s1, $a0, $zero -/* 8EBF4C 8024012C AFBF001C */ sw $ra, 0x1c($sp) -/* 8EBF50 80240130 AFB20018 */ sw $s2, 0x18($sp) -/* 8EBF54 80240134 0C016AFA */ jal get_current_map_header -/* 8EBF58 80240138 AFB00010 */ sw $s0, 0x10($sp) -/* 8EBF5C 8024013C 0220202D */ daddu $a0, $s1, $zero -/* 8EBF60 80240140 3C05FE36 */ lui $a1, 0xfe36 -/* 8EBF64 80240144 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8EBF68 80240148 0C0B1EAF */ jal get_variable -/* 8EBF6C 8024014C 0040902D */ daddu $s2, $v0, $zero -/* 8EBF70 80240150 0220202D */ daddu $a0, $s1, $zero -/* 8EBF74 80240154 3C05FE36 */ lui $a1, 0xfe36 -/* 8EBF78 80240158 8E430014 */ lw $v1, 0x14($s2) -/* 8EBF7C 8024015C 00028100 */ sll $s0, $v0, 4 -/* 8EBF80 80240160 02031821 */ addu $v1, $s0, $v1 -/* 8EBF84 80240164 C4600000 */ lwc1 $f0, ($v1) -/* 8EBF88 80240168 4600008D */ trunc.w.s $f2, $f0 -/* 8EBF8C 8024016C 44061000 */ mfc1 $a2, $f2 -/* 8EBF90 80240170 0C0B2026 */ jal set_variable -/* 8EBF94 80240174 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8EBF98 80240178 0220202D */ daddu $a0, $s1, $zero -/* 8EBF9C 8024017C 8E420014 */ lw $v0, 0x14($s2) -/* 8EBFA0 80240180 3C05FE36 */ lui $a1, 0xfe36 -/* 8EBFA4 80240184 02021021 */ addu $v0, $s0, $v0 -/* 8EBFA8 80240188 C4400004 */ lwc1 $f0, 4($v0) -/* 8EBFAC 8024018C 4600008D */ trunc.w.s $f2, $f0 -/* 8EBFB0 80240190 44061000 */ mfc1 $a2, $f2 -/* 8EBFB4 80240194 0C0B2026 */ jal set_variable -/* 8EBFB8 80240198 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8EBFBC 8024019C 0220202D */ daddu $a0, $s1, $zero -/* 8EBFC0 802401A0 8E420014 */ lw $v0, 0x14($s2) -/* 8EBFC4 802401A4 3C05FE36 */ lui $a1, 0xfe36 -/* 8EBFC8 802401A8 02021021 */ addu $v0, $s0, $v0 -/* 8EBFCC 802401AC C4400008 */ lwc1 $f0, 8($v0) -/* 8EBFD0 802401B0 4600008D */ trunc.w.s $f2, $f0 -/* 8EBFD4 802401B4 44061000 */ mfc1 $a2, $f2 -/* 8EBFD8 802401B8 0C0B2026 */ jal set_variable -/* 8EBFDC 802401BC 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8EBFE0 802401C0 0220202D */ daddu $a0, $s1, $zero -/* 8EBFE4 802401C4 8E420014 */ lw $v0, 0x14($s2) -/* 8EBFE8 802401C8 3C05FE36 */ lui $a1, 0xfe36 -/* 8EBFEC 802401CC 02028021 */ addu $s0, $s0, $v0 -/* 8EBFF0 802401D0 C600000C */ lwc1 $f0, 0xc($s0) -/* 8EBFF4 802401D4 4600008D */ trunc.w.s $f2, $f0 -/* 8EBFF8 802401D8 44061000 */ mfc1 $a2, $f2 -/* 8EBFFC 802401DC 0C0B2026 */ jal set_variable -/* 8EC000 802401E0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8EC004 802401E4 8FBF001C */ lw $ra, 0x1c($sp) -/* 8EC008 802401E8 8FB20018 */ lw $s2, 0x18($sp) -/* 8EC00C 802401EC 8FB10014 */ lw $s1, 0x14($sp) -/* 8EC010 802401F0 8FB00010 */ lw $s0, 0x10($sp) -/* 8EC014 802401F4 24020002 */ addiu $v0, $zero, 2 -/* 8EC018 802401F8 03E00008 */ jr $ra -/* 8EC01C 802401FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241870_8ED690.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241870_8ED690.s deleted file mode 100644 index 27f610e135..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241870_8ED690.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241870_8ED690 -/* 8ED690 80241870 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8ED694 80241874 AFB10014 */ sw $s1, 0x14($sp) -/* 8ED698 80241878 0080882D */ daddu $s1, $a0, $zero -/* 8ED69C 8024187C AFBF001C */ sw $ra, 0x1c($sp) -/* 8ED6A0 80241880 AFB20018 */ sw $s2, 0x18($sp) -/* 8ED6A4 80241884 0C016AFA */ jal get_current_map_header -/* 8ED6A8 80241888 AFB00010 */ sw $s0, 0x10($sp) -/* 8ED6AC 8024188C 0220202D */ daddu $a0, $s1, $zero -/* 8ED6B0 80241890 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED6B4 80241894 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8ED6B8 80241898 0C0B1EAF */ jal get_variable -/* 8ED6BC 8024189C 0040902D */ daddu $s2, $v0, $zero -/* 8ED6C0 802418A0 0220202D */ daddu $a0, $s1, $zero -/* 8ED6C4 802418A4 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED6C8 802418A8 8E430014 */ lw $v1, 0x14($s2) -/* 8ED6CC 802418AC 00028100 */ sll $s0, $v0, 4 -/* 8ED6D0 802418B0 02031821 */ addu $v1, $s0, $v1 -/* 8ED6D4 802418B4 C4600000 */ lwc1 $f0, ($v1) -/* 8ED6D8 802418B8 4600008D */ trunc.w.s $f2, $f0 -/* 8ED6DC 802418BC 44061000 */ mfc1 $a2, $f2 -/* 8ED6E0 802418C0 0C0B2026 */ jal set_variable -/* 8ED6E4 802418C4 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8ED6E8 802418C8 0220202D */ daddu $a0, $s1, $zero -/* 8ED6EC 802418CC 8E420014 */ lw $v0, 0x14($s2) -/* 8ED6F0 802418D0 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED6F4 802418D4 02021021 */ addu $v0, $s0, $v0 -/* 8ED6F8 802418D8 C4400004 */ lwc1 $f0, 4($v0) -/* 8ED6FC 802418DC 4600008D */ trunc.w.s $f2, $f0 -/* 8ED700 802418E0 44061000 */ mfc1 $a2, $f2 -/* 8ED704 802418E4 0C0B2026 */ jal set_variable -/* 8ED708 802418E8 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8ED70C 802418EC 0220202D */ daddu $a0, $s1, $zero -/* 8ED710 802418F0 8E420014 */ lw $v0, 0x14($s2) -/* 8ED714 802418F4 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED718 802418F8 02021021 */ addu $v0, $s0, $v0 -/* 8ED71C 802418FC C4400008 */ lwc1 $f0, 8($v0) -/* 8ED720 80241900 4600008D */ trunc.w.s $f2, $f0 -/* 8ED724 80241904 44061000 */ mfc1 $a2, $f2 -/* 8ED728 80241908 0C0B2026 */ jal set_variable -/* 8ED72C 8024190C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8ED730 80241910 0220202D */ daddu $a0, $s1, $zero -/* 8ED734 80241914 8E420014 */ lw $v0, 0x14($s2) -/* 8ED738 80241918 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED73C 8024191C 02028021 */ addu $s0, $s0, $v0 -/* 8ED740 80241920 C600000C */ lwc1 $f0, 0xc($s0) -/* 8ED744 80241924 4600008D */ trunc.w.s $f2, $f0 -/* 8ED748 80241928 44061000 */ mfc1 $a2, $f2 -/* 8ED74C 8024192C 0C0B2026 */ jal set_variable -/* 8ED750 80241930 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8ED754 80241934 8FBF001C */ lw $ra, 0x1c($sp) -/* 8ED758 80241938 8FB20018 */ lw $s2, 0x18($sp) -/* 8ED75C 8024193C 8FB10014 */ lw $s1, 0x14($sp) -/* 8ED760 80241940 8FB00010 */ lw $s0, 0x10($sp) -/* 8ED764 80241944 24020002 */ addiu $v0, $zero, 2 -/* 8ED768 80241948 03E00008 */ jr $ra -/* 8ED76C 8024194C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241E40_8EDC60.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241E40_8EDC60.s deleted file mode 100644 index 5eaeeac063..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241E40_8EDC60.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E40_8EDC60 -/* 8EDC60 80241E40 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8EDC64 80241E44 AFB10014 */ sw $s1, 0x14($sp) -/* 8EDC68 80241E48 0080882D */ daddu $s1, $a0, $zero -/* 8EDC6C 80241E4C AFBF001C */ sw $ra, 0x1c($sp) -/* 8EDC70 80241E50 AFB20018 */ sw $s2, 0x18($sp) -/* 8EDC74 80241E54 0C016AFA */ jal get_current_map_header -/* 8EDC78 80241E58 AFB00010 */ sw $s0, 0x10($sp) -/* 8EDC7C 80241E5C 0220202D */ daddu $a0, $s1, $zero -/* 8EDC80 80241E60 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDC84 80241E64 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8EDC88 80241E68 0C0B1EAF */ jal get_variable -/* 8EDC8C 80241E6C 0040902D */ daddu $s2, $v0, $zero -/* 8EDC90 80241E70 0220202D */ daddu $a0, $s1, $zero -/* 8EDC94 80241E74 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDC98 80241E78 8E430014 */ lw $v1, 0x14($s2) -/* 8EDC9C 80241E7C 00028100 */ sll $s0, $v0, 4 -/* 8EDCA0 80241E80 02031821 */ addu $v1, $s0, $v1 -/* 8EDCA4 80241E84 C4600000 */ lwc1 $f0, ($v1) -/* 8EDCA8 80241E88 4600008D */ trunc.w.s $f2, $f0 -/* 8EDCAC 80241E8C 44061000 */ mfc1 $a2, $f2 -/* 8EDCB0 80241E90 0C0B2026 */ jal set_variable -/* 8EDCB4 80241E94 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8EDCB8 80241E98 0220202D */ daddu $a0, $s1, $zero -/* 8EDCBC 80241E9C 8E420014 */ lw $v0, 0x14($s2) -/* 8EDCC0 80241EA0 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDCC4 80241EA4 02021021 */ addu $v0, $s0, $v0 -/* 8EDCC8 80241EA8 C4400004 */ lwc1 $f0, 4($v0) -/* 8EDCCC 80241EAC 4600008D */ trunc.w.s $f2, $f0 -/* 8EDCD0 80241EB0 44061000 */ mfc1 $a2, $f2 -/* 8EDCD4 80241EB4 0C0B2026 */ jal set_variable -/* 8EDCD8 80241EB8 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8EDCDC 80241EBC 0220202D */ daddu $a0, $s1, $zero -/* 8EDCE0 80241EC0 8E420014 */ lw $v0, 0x14($s2) -/* 8EDCE4 80241EC4 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDCE8 80241EC8 02021021 */ addu $v0, $s0, $v0 -/* 8EDCEC 80241ECC C4400008 */ lwc1 $f0, 8($v0) -/* 8EDCF0 80241ED0 4600008D */ trunc.w.s $f2, $f0 -/* 8EDCF4 80241ED4 44061000 */ mfc1 $a2, $f2 -/* 8EDCF8 80241ED8 0C0B2026 */ jal set_variable -/* 8EDCFC 80241EDC 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8EDD00 80241EE0 0220202D */ daddu $a0, $s1, $zero -/* 8EDD04 80241EE4 8E420014 */ lw $v0, 0x14($s2) -/* 8EDD08 80241EE8 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDD0C 80241EEC 02028021 */ addu $s0, $s0, $v0 -/* 8EDD10 80241EF0 C600000C */ lwc1 $f0, 0xc($s0) -/* 8EDD14 80241EF4 4600008D */ trunc.w.s $f2, $f0 -/* 8EDD18 80241EF8 44061000 */ mfc1 $a2, $f2 -/* 8EDD1C 80241EFC 0C0B2026 */ jal set_variable -/* 8EDD20 80241F00 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8EDD24 80241F04 8FBF001C */ lw $ra, 0x1c($sp) -/* 8EDD28 80241F08 8FB20018 */ lw $s2, 0x18($sp) -/* 8EDD2C 80241F0C 8FB10014 */ lw $s1, 0x14($sp) -/* 8EDD30 80241F10 8FB00010 */ lw $s0, 0x10($sp) -/* 8EDD34 80241F14 24020002 */ addiu $v0, $zero, 2 -/* 8EDD38 80241F18 03E00008 */ jr $ra -/* 8EDD3C 80241F1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802400F0_7EAE00.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802400F0_7EAE00.s deleted file mode 100644 index 4b63ee8ecc..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802400F0_7EAE00.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_7EAE00 -/* 7EAE00 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EAE04 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 7EAE08 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 7EAE0C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 7EAE10 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 7EAE14 80240104 0C016AFA */ jal get_current_map_header -/* 7EAE18 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 7EAE1C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 7EAE20 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAE24 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 7EAE28 80240118 0C0B1EAF */ jal get_variable -/* 7EAE2C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 7EAE30 80240120 0220202D */ daddu $a0, $s1, $zero -/* 7EAE34 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAE38 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 7EAE3C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 7EAE40 80240130 02031821 */ addu $v1, $s0, $v1 -/* 7EAE44 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 7EAE48 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 7EAE4C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 7EAE50 80240140 0C0B2026 */ jal set_variable -/* 7EAE54 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 7EAE58 80240148 0220202D */ daddu $a0, $s1, $zero -/* 7EAE5C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 7EAE60 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAE64 80240154 02021021 */ addu $v0, $s0, $v0 -/* 7EAE68 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 7EAE6C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 7EAE70 80240160 44061000 */ mfc1 $a2, $f2 -/* 7EAE74 80240164 0C0B2026 */ jal set_variable -/* 7EAE78 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 7EAE7C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 7EAE80 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 7EAE84 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAE88 80240178 02021021 */ addu $v0, $s0, $v0 -/* 7EAE8C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 7EAE90 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 7EAE94 80240184 44061000 */ mfc1 $a2, $f2 -/* 7EAE98 80240188 0C0B2026 */ jal set_variable -/* 7EAE9C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 7EAEA0 80240190 0220202D */ daddu $a0, $s1, $zero -/* 7EAEA4 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 7EAEA8 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAEAC 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 7EAEB0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 7EAEB4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 7EAEB8 802401A8 44061000 */ mfc1 $a2, $f2 -/* 7EAEBC 802401AC 0C0B2026 */ jal set_variable -/* 7EAEC0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 7EAEC4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 7EAEC8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 7EAECC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 7EAED0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 7EAED4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 7EAED8 802401C8 03E00008 */ jr $ra -/* 7EAEDC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_802400F0_8233B0.s b/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_802400F0_8233B0.s deleted file mode 100644 index c39f666487..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_802400F0_8233B0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_8233B0 -/* 8233B0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8233B4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 8233B8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 8233BC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 8233C0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 8233C4 80240104 0C016AFA */ jal get_current_map_header -/* 8233C8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 8233CC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 8233D0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 8233D4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8233D8 80240118 0C0B1EAF */ jal get_variable -/* 8233DC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 8233E0 80240120 0220202D */ daddu $a0, $s1, $zero -/* 8233E4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 8233E8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 8233EC 8024012C 00028100 */ sll $s0, $v0, 4 -/* 8233F0 80240130 02031821 */ addu $v1, $s0, $v1 -/* 8233F4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 8233F8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 8233FC 8024013C 44061000 */ mfc1 $a2, $f2 -/* 823400 80240140 0C0B2026 */ jal set_variable -/* 823404 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 823408 80240148 0220202D */ daddu $a0, $s1, $zero -/* 82340C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 823410 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 823414 80240154 02021021 */ addu $v0, $s0, $v0 -/* 823418 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 82341C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 823420 80240160 44061000 */ mfc1 $a2, $f2 -/* 823424 80240164 0C0B2026 */ jal set_variable -/* 823428 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 82342C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 823430 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 823434 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 823438 80240178 02021021 */ addu $v0, $s0, $v0 -/* 82343C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 823440 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 823444 80240184 44061000 */ mfc1 $a2, $f2 -/* 823448 80240188 0C0B2026 */ jal set_variable -/* 82344C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 823450 80240190 0220202D */ daddu $a0, $s1, $zero -/* 823454 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 823458 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 82345C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 823460 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 823464 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 823468 802401A8 44061000 */ mfc1 $a2, $f2 -/* 82346C 802401AC 0C0B2026 */ jal set_variable -/* 823470 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 823474 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 823478 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 82347C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 823480 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 823484 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 823488 802401C8 03E00008 */ jr $ra -/* 82348C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831800/func_802400F0_8318F0.s b/asm/nonmatchings/world/area_mac/mac_03/831800/func_802400F0_8318F0.s deleted file mode 100644 index 2c1f4cda97..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831800/func_802400F0_8318F0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_8318F0 -/* 8318F0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8318F4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 8318F8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 8318FC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 831900 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 831904 80240104 0C016AFA */ jal get_current_map_header -/* 831908 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 83190C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 831910 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 831914 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 831918 80240118 0C0B1EAF */ jal get_variable -/* 83191C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 831920 80240120 0220202D */ daddu $a0, $s1, $zero -/* 831924 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 831928 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 83192C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 831930 80240130 02031821 */ addu $v1, $s0, $v1 -/* 831934 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 831938 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 83193C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 831940 80240140 0C0B2026 */ jal set_variable -/* 831944 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 831948 80240148 0220202D */ daddu $a0, $s1, $zero -/* 83194C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 831950 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 831954 80240154 02021021 */ addu $v0, $s0, $v0 -/* 831958 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 83195C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 831960 80240160 44061000 */ mfc1 $a2, $f2 -/* 831964 80240164 0C0B2026 */ jal set_variable -/* 831968 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 83196C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 831970 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 831974 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 831978 80240178 02021021 */ addu $v0, $s0, $v0 -/* 83197C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 831980 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 831984 80240184 44061000 */ mfc1 $a2, $f2 -/* 831988 80240188 0C0B2026 */ jal set_variable -/* 83198C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 831990 80240190 0220202D */ daddu $a0, $s1, $zero -/* 831994 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 831998 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 83199C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 8319A0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 8319A4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 8319A8 802401A8 44061000 */ mfc1 $a2, $f2 -/* 8319AC 802401AC 0C0B2026 */ jal set_variable -/* 8319B0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8319B4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 8319B8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 8319BC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 8319C0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 8319C4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 8319C8 802401C8 03E00008 */ jr $ra -/* 8319CC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802400F0_E0E890.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802400F0_E0E890.s deleted file mode 100644 index d508313413..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802400F0_E0E890.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_E0E890 -/* E0E890 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E0E894 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* E0E898 802400F8 0080882D */ daddu $s1, $a0, $zero -/* E0E89C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* E0E8A0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* E0E8A4 80240104 0C016AFA */ jal get_current_map_header -/* E0E8A8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* E0E8AC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* E0E8B0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* E0E8B4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* E0E8B8 80240118 0C0B1EAF */ jal get_variable -/* E0E8BC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* E0E8C0 80240120 0220202D */ daddu $a0, $s1, $zero -/* E0E8C4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* E0E8C8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* E0E8CC 8024012C 00028100 */ sll $s0, $v0, 4 -/* E0E8D0 80240130 02031821 */ addu $v1, $s0, $v1 -/* E0E8D4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* E0E8D8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* E0E8DC 8024013C 44061000 */ mfc1 $a2, $f2 -/* E0E8E0 80240140 0C0B2026 */ jal set_variable -/* E0E8E4 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* E0E8E8 80240148 0220202D */ daddu $a0, $s1, $zero -/* E0E8EC 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* E0E8F0 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* E0E8F4 80240154 02021021 */ addu $v0, $s0, $v0 -/* E0E8F8 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* E0E8FC 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* E0E900 80240160 44061000 */ mfc1 $a2, $f2 -/* E0E904 80240164 0C0B2026 */ jal set_variable -/* E0E908 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* E0E90C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* E0E910 80240170 8E420014 */ lw $v0, 0x14($s2) -/* E0E914 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* E0E918 80240178 02021021 */ addu $v0, $s0, $v0 -/* E0E91C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* E0E920 80240180 4600008D */ trunc.w.s $f2, $f0 -/* E0E924 80240184 44061000 */ mfc1 $a2, $f2 -/* E0E928 80240188 0C0B2026 */ jal set_variable -/* E0E92C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E0E930 80240190 0220202D */ daddu $a0, $s1, $zero -/* E0E934 80240194 8E420014 */ lw $v0, 0x14($s2) -/* E0E938 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* E0E93C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* E0E940 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* E0E944 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* E0E948 802401A8 44061000 */ mfc1 $a2, $f2 -/* E0E94C 802401AC 0C0B2026 */ jal set_variable -/* E0E950 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* E0E954 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* E0E958 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* E0E95C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* E0E960 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* E0E964 802401C4 24020002 */ addiu $v0, $zero, 2 -/* E0E968 802401C8 03E00008 */ jr $ra -/* E0E96C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802400F0_BB7160.s b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802400F0_BB7160.s deleted file mode 100644 index bff89e4906..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802400F0_BB7160.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_BB7160 -/* BB7160 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BB7164 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* BB7168 802400F8 0080882D */ daddu $s1, $a0, $zero -/* BB716C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* BB7170 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* BB7174 80240104 0C016AFA */ jal get_current_map_header -/* BB7178 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* BB717C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* BB7180 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* BB7184 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BB7188 80240118 0C0B1EAF */ jal get_variable -/* BB718C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* BB7190 80240120 0220202D */ daddu $a0, $s1, $zero -/* BB7194 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* BB7198 80240128 8E430014 */ lw $v1, 0x14($s2) -/* BB719C 8024012C 00028100 */ sll $s0, $v0, 4 -/* BB71A0 80240130 02031821 */ addu $v1, $s0, $v1 -/* BB71A4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* BB71A8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* BB71AC 8024013C 44061000 */ mfc1 $a2, $f2 -/* BB71B0 80240140 0C0B2026 */ jal set_variable -/* BB71B4 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* BB71B8 80240148 0220202D */ daddu $a0, $s1, $zero -/* BB71BC 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* BB71C0 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* BB71C4 80240154 02021021 */ addu $v0, $s0, $v0 -/* BB71C8 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* BB71CC 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* BB71D0 80240160 44061000 */ mfc1 $a2, $f2 -/* BB71D4 80240164 0C0B2026 */ jal set_variable -/* BB71D8 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* BB71DC 8024016C 0220202D */ daddu $a0, $s1, $zero -/* BB71E0 80240170 8E420014 */ lw $v0, 0x14($s2) -/* BB71E4 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* BB71E8 80240178 02021021 */ addu $v0, $s0, $v0 -/* BB71EC 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* BB71F0 80240180 4600008D */ trunc.w.s $f2, $f0 -/* BB71F4 80240184 44061000 */ mfc1 $a2, $f2 -/* BB71F8 80240188 0C0B2026 */ jal set_variable -/* BB71FC 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* BB7200 80240190 0220202D */ daddu $a0, $s1, $zero -/* BB7204 80240194 8E420014 */ lw $v0, 0x14($s2) -/* BB7208 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* BB720C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* BB7210 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* BB7214 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* BB7218 802401A8 44061000 */ mfc1 $a2, $f2 -/* BB721C 802401AC 0C0B2026 */ jal set_variable -/* BB7220 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* BB7224 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* BB7228 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* BB722C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* BB7230 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* BB7234 802401C4 24020002 */ addiu $v0, $zero, 2 -/* BB7238 802401C8 03E00008 */ jr $ra -/* BB723C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802400F0_9D7110.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802400F0_9D7110.s deleted file mode 100644 index 73eeb8eb4f..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802400F0_9D7110.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_9D7110 -/* 9D7110 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D7114 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 9D7118 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 9D711C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 9D7120 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 9D7124 80240104 0C016AFA */ jal get_current_map_header -/* 9D7128 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 9D712C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 9D7130 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 9D7134 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 9D7138 80240118 0C0B1EAF */ jal get_variable -/* 9D713C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 9D7140 80240120 0220202D */ daddu $a0, $s1, $zero -/* 9D7144 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 9D7148 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 9D714C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 9D7150 80240130 02031821 */ addu $v1, $s0, $v1 -/* 9D7154 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 9D7158 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 9D715C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 9D7160 80240140 0C0B2026 */ jal set_variable -/* 9D7164 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 9D7168 80240148 0220202D */ daddu $a0, $s1, $zero -/* 9D716C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 9D7170 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 9D7174 80240154 02021021 */ addu $v0, $s0, $v0 -/* 9D7178 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 9D717C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 9D7180 80240160 44061000 */ mfc1 $a2, $f2 -/* 9D7184 80240164 0C0B2026 */ jal set_variable -/* 9D7188 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 9D718C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 9D7190 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 9D7194 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 9D7198 80240178 02021021 */ addu $v0, $s0, $v0 -/* 9D719C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 9D71A0 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 9D71A4 80240184 44061000 */ mfc1 $a2, $f2 -/* 9D71A8 80240188 0C0B2026 */ jal set_variable -/* 9D71AC 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 9D71B0 80240190 0220202D */ daddu $a0, $s1, $zero -/* 9D71B4 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 9D71B8 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 9D71BC 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 9D71C0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 9D71C4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 9D71C8 802401A8 44061000 */ mfc1 $a2, $f2 -/* 9D71CC 802401AC 0C0B2026 */ jal set_variable -/* 9D71D0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 9D71D4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 9D71D8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 9D71DC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 9D71E0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 9D71E4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 9D71E8 802401C8 03E00008 */ jr $ra -/* 9D71EC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802400F0_A06FF0.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802400F0_A06FF0.s deleted file mode 100644 index de618075e6..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802400F0_A06FF0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_A06FF0 -/* A06FF0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A06FF4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* A06FF8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* A06FFC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* A07000 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* A07004 80240104 0C016AFA */ jal get_current_map_header -/* A07008 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* A0700C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* A07010 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* A07014 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A07018 80240118 0C0B1EAF */ jal get_variable -/* A0701C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* A07020 80240120 0220202D */ daddu $a0, $s1, $zero -/* A07024 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* A07028 80240128 8E430014 */ lw $v1, 0x14($s2) -/* A0702C 8024012C 00028100 */ sll $s0, $v0, 4 -/* A07030 80240130 02031821 */ addu $v1, $s0, $v1 -/* A07034 80240134 C4600000 */ lwc1 $f0, ($v1) -/* A07038 80240138 4600008D */ trunc.w.s $f2, $f0 -/* A0703C 8024013C 44061000 */ mfc1 $a2, $f2 -/* A07040 80240140 0C0B2026 */ jal set_variable -/* A07044 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* A07048 80240148 0220202D */ daddu $a0, $s1, $zero -/* A0704C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* A07050 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* A07054 80240154 02021021 */ addu $v0, $s0, $v0 -/* A07058 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* A0705C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* A07060 80240160 44061000 */ mfc1 $a2, $f2 -/* A07064 80240164 0C0B2026 */ jal set_variable -/* A07068 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* A0706C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* A07070 80240170 8E420014 */ lw $v0, 0x14($s2) -/* A07074 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* A07078 80240178 02021021 */ addu $v0, $s0, $v0 -/* A0707C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* A07080 80240180 4600008D */ trunc.w.s $f2, $f0 -/* A07084 80240184 44061000 */ mfc1 $a2, $f2 -/* A07088 80240188 0C0B2026 */ jal set_variable -/* A0708C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* A07090 80240190 0220202D */ daddu $a0, $s1, $zero -/* A07094 80240194 8E420014 */ lw $v0, 0x14($s2) -/* A07098 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* A0709C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* A070A0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* A070A4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* A070A8 802401A8 44061000 */ mfc1 $a2, $f2 -/* A070AC 802401AC 0C0B2026 */ jal set_variable -/* A070B0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* A070B4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* A070B8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* A070BC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* A070C0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* A070C4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* A070C8 802401C8 03E00008 */ jr $ra -/* A070CC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_802400F0_D05820.s b/asm/nonmatchings/world/area_sam/sam_02/D05730/func_802400F0_D05820.s deleted file mode 100644 index ad8e0b2f91..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_802400F0_D05820.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_D05820 -/* D05820 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D05824 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* D05828 802400F8 0080882D */ daddu $s1, $a0, $zero -/* D0582C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* D05830 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* D05834 80240104 0C016AFA */ jal get_current_map_header -/* D05838 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* D0583C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* D05840 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* D05844 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D05848 80240118 0C0B1EAF */ jal get_variable -/* D0584C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* D05850 80240120 0220202D */ daddu $a0, $s1, $zero -/* D05854 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* D05858 80240128 8E430014 */ lw $v1, 0x14($s2) -/* D0585C 8024012C 00028100 */ sll $s0, $v0, 4 -/* D05860 80240130 02031821 */ addu $v1, $s0, $v1 -/* D05864 80240134 C4600000 */ lwc1 $f0, ($v1) -/* D05868 80240138 4600008D */ trunc.w.s $f2, $f0 -/* D0586C 8024013C 44061000 */ mfc1 $a2, $f2 -/* D05870 80240140 0C0B2026 */ jal set_variable -/* D05874 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* D05878 80240148 0220202D */ daddu $a0, $s1, $zero -/* D0587C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* D05880 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* D05884 80240154 02021021 */ addu $v0, $s0, $v0 -/* D05888 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* D0588C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* D05890 80240160 44061000 */ mfc1 $a2, $f2 -/* D05894 80240164 0C0B2026 */ jal set_variable -/* D05898 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* D0589C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* D058A0 80240170 8E420014 */ lw $v0, 0x14($s2) -/* D058A4 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* D058A8 80240178 02021021 */ addu $v0, $s0, $v0 -/* D058AC 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* D058B0 80240180 4600008D */ trunc.w.s $f2, $f0 -/* D058B4 80240184 44061000 */ mfc1 $a2, $f2 -/* D058B8 80240188 0C0B2026 */ jal set_variable -/* D058BC 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* D058C0 80240190 0220202D */ daddu $a0, $s1, $zero -/* D058C4 80240194 8E420014 */ lw $v0, 0x14($s2) -/* D058C8 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* D058CC 8024019C 02028021 */ addu $s0, $s0, $v0 -/* D058D0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* D058D4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* D058D8 802401A8 44061000 */ mfc1 $a2, $f2 -/* D058DC 802401AC 0C0B2026 */ jal set_variable -/* D058E0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* D058E4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* D058E8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* D058EC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* D058F0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* D058F4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* D058F8 802401C8 03E00008 */ jr $ra -/* D058FC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802403FC_8698AC.s b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802403FC_8698AC.s deleted file mode 100644 index 92056e71fc..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802403FC_8698AC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403FC_8698AC -/* 8698AC 802403FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8698B0 80240400 AFB10014 */ sw $s1, 0x14($sp) -/* 8698B4 80240404 0080882D */ daddu $s1, $a0, $zero -/* 8698B8 80240408 AFBF001C */ sw $ra, 0x1c($sp) -/* 8698BC 8024040C AFB20018 */ sw $s2, 0x18($sp) -/* 8698C0 80240410 0C016AFA */ jal get_current_map_header -/* 8698C4 80240414 AFB00010 */ sw $s0, 0x10($sp) -/* 8698C8 80240418 0220202D */ daddu $a0, $s1, $zero -/* 8698CC 8024041C 3C05FE36 */ lui $a1, 0xfe36 -/* 8698D0 80240420 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8698D4 80240424 0C0B1EAF */ jal get_variable -/* 8698D8 80240428 0040902D */ daddu $s2, $v0, $zero -/* 8698DC 8024042C 0220202D */ daddu $a0, $s1, $zero -/* 8698E0 80240430 3C05FE36 */ lui $a1, 0xfe36 -/* 8698E4 80240434 8E430014 */ lw $v1, 0x14($s2) -/* 8698E8 80240438 00028100 */ sll $s0, $v0, 4 -/* 8698EC 8024043C 02031821 */ addu $v1, $s0, $v1 -/* 8698F0 80240440 C4600000 */ lwc1 $f0, ($v1) -/* 8698F4 80240444 4600008D */ trunc.w.s $f2, $f0 -/* 8698F8 80240448 44061000 */ mfc1 $a2, $f2 -/* 8698FC 8024044C 0C0B2026 */ jal set_variable -/* 869900 80240450 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 869904 80240454 0220202D */ daddu $a0, $s1, $zero -/* 869908 80240458 8E420014 */ lw $v0, 0x14($s2) -/* 86990C 8024045C 3C05FE36 */ lui $a1, 0xfe36 -/* 869910 80240460 02021021 */ addu $v0, $s0, $v0 -/* 869914 80240464 C4400004 */ lwc1 $f0, 4($v0) -/* 869918 80240468 4600008D */ trunc.w.s $f2, $f0 -/* 86991C 8024046C 44061000 */ mfc1 $a2, $f2 -/* 869920 80240470 0C0B2026 */ jal set_variable -/* 869924 80240474 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 869928 80240478 0220202D */ daddu $a0, $s1, $zero -/* 86992C 8024047C 8E420014 */ lw $v0, 0x14($s2) -/* 869930 80240480 3C05FE36 */ lui $a1, 0xfe36 -/* 869934 80240484 02021021 */ addu $v0, $s0, $v0 -/* 869938 80240488 C4400008 */ lwc1 $f0, 8($v0) -/* 86993C 8024048C 4600008D */ trunc.w.s $f2, $f0 -/* 869940 80240490 44061000 */ mfc1 $a2, $f2 -/* 869944 80240494 0C0B2026 */ jal set_variable -/* 869948 80240498 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 86994C 8024049C 0220202D */ daddu $a0, $s1, $zero -/* 869950 802404A0 8E420014 */ lw $v0, 0x14($s2) -/* 869954 802404A4 3C05FE36 */ lui $a1, 0xfe36 -/* 869958 802404A8 02028021 */ addu $s0, $s0, $v0 -/* 86995C 802404AC C600000C */ lwc1 $f0, 0xc($s0) -/* 869960 802404B0 4600008D */ trunc.w.s $f2, $f0 -/* 869964 802404B4 44061000 */ mfc1 $a2, $f2 -/* 869968 802404B8 0C0B2026 */ jal set_variable -/* 86996C 802404BC 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 869970 802404C0 8FBF001C */ lw $ra, 0x1c($sp) -/* 869974 802404C4 8FB20018 */ lw $s2, 0x18($sp) -/* 869978 802404C8 8FB10014 */ lw $s1, 0x14($sp) -/* 86997C 802404CC 8FB00010 */ lw $s0, 0x10($sp) -/* 869980 802404D0 24020002 */ addiu $v0, $zero, 2 -/* 869984 802404D4 03E00008 */ jr $ra -/* 869988 802404D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_802400F0_86EBF0.s b/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_802400F0_86EBF0.s deleted file mode 100644 index 7eb8c52cff..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_802400F0_86EBF0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_86EBF0 -/* 86EBF0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 86EBF4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 86EBF8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 86EBFC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 86EC00 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 86EC04 80240104 0C016AFA */ jal get_current_map_header -/* 86EC08 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 86EC0C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 86EC10 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 86EC14 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 86EC18 80240118 0C0B1EAF */ jal get_variable -/* 86EC1C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 86EC20 80240120 0220202D */ daddu $a0, $s1, $zero -/* 86EC24 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 86EC28 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 86EC2C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 86EC30 80240130 02031821 */ addu $v1, $s0, $v1 -/* 86EC34 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 86EC38 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 86EC3C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 86EC40 80240140 0C0B2026 */ jal set_variable -/* 86EC44 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 86EC48 80240148 0220202D */ daddu $a0, $s1, $zero -/* 86EC4C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 86EC50 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 86EC54 80240154 02021021 */ addu $v0, $s0, $v0 -/* 86EC58 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 86EC5C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 86EC60 80240160 44061000 */ mfc1 $a2, $f2 -/* 86EC64 80240164 0C0B2026 */ jal set_variable -/* 86EC68 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 86EC6C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 86EC70 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 86EC74 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 86EC78 80240178 02021021 */ addu $v0, $s0, $v0 -/* 86EC7C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 86EC80 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 86EC84 80240184 44061000 */ mfc1 $a2, $f2 -/* 86EC88 80240188 0C0B2026 */ jal set_variable -/* 86EC8C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 86EC90 80240190 0220202D */ daddu $a0, $s1, $zero -/* 86EC94 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 86EC98 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 86EC9C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 86ECA0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 86ECA4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 86ECA8 802401A8 44061000 */ mfc1 $a2, $f2 -/* 86ECAC 802401AC 0C0B2026 */ jal set_variable -/* 86ECB0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 86ECB4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 86ECB8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 86ECBC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 86ECC0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 86ECC4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 86ECC8 802401C8 03E00008 */ jr $ra -/* 86ECCC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_04/871A30/func_802403FC_871E2C.s b/asm/nonmatchings/world/area_tik/tik_04/871A30/func_802403FC_871E2C.s deleted file mode 100644 index ce3b692138..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_04/871A30/func_802403FC_871E2C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403FC_871E2C -/* 871E2C 802403FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 871E30 80240400 AFB10014 */ sw $s1, 0x14($sp) -/* 871E34 80240404 0080882D */ daddu $s1, $a0, $zero -/* 871E38 80240408 AFBF001C */ sw $ra, 0x1c($sp) -/* 871E3C 8024040C AFB20018 */ sw $s2, 0x18($sp) -/* 871E40 80240410 0C016AFA */ jal get_current_map_header -/* 871E44 80240414 AFB00010 */ sw $s0, 0x10($sp) -/* 871E48 80240418 0220202D */ daddu $a0, $s1, $zero -/* 871E4C 8024041C 3C05FE36 */ lui $a1, 0xfe36 -/* 871E50 80240420 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 871E54 80240424 0C0B1EAF */ jal get_variable -/* 871E58 80240428 0040902D */ daddu $s2, $v0, $zero -/* 871E5C 8024042C 0220202D */ daddu $a0, $s1, $zero -/* 871E60 80240430 3C05FE36 */ lui $a1, 0xfe36 -/* 871E64 80240434 8E430014 */ lw $v1, 0x14($s2) -/* 871E68 80240438 00028100 */ sll $s0, $v0, 4 -/* 871E6C 8024043C 02031821 */ addu $v1, $s0, $v1 -/* 871E70 80240440 C4600000 */ lwc1 $f0, ($v1) -/* 871E74 80240444 4600008D */ trunc.w.s $f2, $f0 -/* 871E78 80240448 44061000 */ mfc1 $a2, $f2 -/* 871E7C 8024044C 0C0B2026 */ jal set_variable -/* 871E80 80240450 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 871E84 80240454 0220202D */ daddu $a0, $s1, $zero -/* 871E88 80240458 8E420014 */ lw $v0, 0x14($s2) -/* 871E8C 8024045C 3C05FE36 */ lui $a1, 0xfe36 -/* 871E90 80240460 02021021 */ addu $v0, $s0, $v0 -/* 871E94 80240464 C4400004 */ lwc1 $f0, 4($v0) -/* 871E98 80240468 4600008D */ trunc.w.s $f2, $f0 -/* 871E9C 8024046C 44061000 */ mfc1 $a2, $f2 -/* 871EA0 80240470 0C0B2026 */ jal set_variable -/* 871EA4 80240474 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 871EA8 80240478 0220202D */ daddu $a0, $s1, $zero -/* 871EAC 8024047C 8E420014 */ lw $v0, 0x14($s2) -/* 871EB0 80240480 3C05FE36 */ lui $a1, 0xfe36 -/* 871EB4 80240484 02021021 */ addu $v0, $s0, $v0 -/* 871EB8 80240488 C4400008 */ lwc1 $f0, 8($v0) -/* 871EBC 8024048C 4600008D */ trunc.w.s $f2, $f0 -/* 871EC0 80240490 44061000 */ mfc1 $a2, $f2 -/* 871EC4 80240494 0C0B2026 */ jal set_variable -/* 871EC8 80240498 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 871ECC 8024049C 0220202D */ daddu $a0, $s1, $zero -/* 871ED0 802404A0 8E420014 */ lw $v0, 0x14($s2) -/* 871ED4 802404A4 3C05FE36 */ lui $a1, 0xfe36 -/* 871ED8 802404A8 02028021 */ addu $s0, $s0, $v0 -/* 871EDC 802404AC C600000C */ lwc1 $f0, 0xc($s0) -/* 871EE0 802404B0 4600008D */ trunc.w.s $f2, $f0 -/* 871EE4 802404B4 44061000 */ mfc1 $a2, $f2 -/* 871EE8 802404B8 0C0B2026 */ jal set_variable -/* 871EEC 802404BC 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 871EF0 802404C0 8FBF001C */ lw $ra, 0x1c($sp) -/* 871EF4 802404C4 8FB20018 */ lw $s2, 0x18($sp) -/* 871EF8 802404C8 8FB10014 */ lw $s1, 0x14($sp) -/* 871EFC 802404CC 8FB00010 */ lw $s0, 0x10($sp) -/* 871F00 802404D0 24020002 */ addiu $v0, $zero, 2 -/* 871F04 802404D4 03E00008 */ jr $ra -/* 871F08 802404D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_802400F0_876FD0.s b/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_802400F0_876FD0.s deleted file mode 100644 index b750bf151a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_802400F0_876FD0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_876FD0 -/* 876FD0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 876FD4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 876FD8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 876FDC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 876FE0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 876FE4 80240104 0C016AFA */ jal get_current_map_header -/* 876FE8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 876FEC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 876FF0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 876FF4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 876FF8 80240118 0C0B1EAF */ jal get_variable -/* 876FFC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 877000 80240120 0220202D */ daddu $a0, $s1, $zero -/* 877004 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 877008 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 87700C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 877010 80240130 02031821 */ addu $v1, $s0, $v1 -/* 877014 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 877018 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 87701C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 877020 80240140 0C0B2026 */ jal set_variable -/* 877024 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 877028 80240148 0220202D */ daddu $a0, $s1, $zero -/* 87702C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 877030 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 877034 80240154 02021021 */ addu $v0, $s0, $v0 -/* 877038 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 87703C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 877040 80240160 44061000 */ mfc1 $a2, $f2 -/* 877044 80240164 0C0B2026 */ jal set_variable -/* 877048 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 87704C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 877050 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 877054 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 877058 80240178 02021021 */ addu $v0, $s0, $v0 -/* 87705C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 877060 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 877064 80240184 44061000 */ mfc1 $a2, $f2 -/* 877068 80240188 0C0B2026 */ jal set_variable -/* 87706C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 877070 80240190 0220202D */ daddu $a0, $s1, $zero -/* 877074 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 877078 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 87707C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 877080 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 877084 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 877088 802401A8 44061000 */ mfc1 $a2, $f2 -/* 87708C 802401AC 0C0B2026 */ jal set_variable -/* 877090 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 877094 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 877098 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 87709C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 8770A0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 8770A4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 8770A8 802401C8 03E00008 */ jr $ra -/* 8770AC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802400F0_879CD0.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802400F0_879CD0.s deleted file mode 100644 index aad002a080..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802400F0_879CD0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_879CD0 -/* 879CD0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 879CD4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 879CD8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 879CDC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 879CE0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 879CE4 80240104 0C016AFA */ jal get_current_map_header -/* 879CE8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 879CEC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 879CF0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 879CF4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 879CF8 80240118 0C0B1EAF */ jal get_variable -/* 879CFC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 879D00 80240120 0220202D */ daddu $a0, $s1, $zero -/* 879D04 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 879D08 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 879D0C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 879D10 80240130 02031821 */ addu $v1, $s0, $v1 -/* 879D14 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 879D18 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 879D1C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 879D20 80240140 0C0B2026 */ jal set_variable -/* 879D24 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 879D28 80240148 0220202D */ daddu $a0, $s1, $zero -/* 879D2C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 879D30 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 879D34 80240154 02021021 */ addu $v0, $s0, $v0 -/* 879D38 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 879D3C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 879D40 80240160 44061000 */ mfc1 $a2, $f2 -/* 879D44 80240164 0C0B2026 */ jal set_variable -/* 879D48 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 879D4C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 879D50 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 879D54 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 879D58 80240178 02021021 */ addu $v0, $s0, $v0 -/* 879D5C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 879D60 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 879D64 80240184 44061000 */ mfc1 $a2, $f2 -/* 879D68 80240188 0C0B2026 */ jal set_variable -/* 879D6C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 879D70 80240190 0220202D */ daddu $a0, $s1, $zero -/* 879D74 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 879D78 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 879D7C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 879D80 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 879D84 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 879D88 802401A8 44061000 */ mfc1 $a2, $f2 -/* 879D8C 802401AC 0C0B2026 */ jal set_variable -/* 879D90 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 879D94 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 879D98 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 879D9C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 879DA0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 879DA4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 879DA8 802401C8 03E00008 */ jr $ra -/* 879DAC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_802400F0_87EEE0.s b/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_802400F0_87EEE0.s deleted file mode 100644 index 8bf9df37bf..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_802400F0_87EEE0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_87EEE0 -/* 87EEE0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 87EEE4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 87EEE8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 87EEEC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 87EEF0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 87EEF4 80240104 0C016AFA */ jal get_current_map_header -/* 87EEF8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 87EEFC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 87EF00 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 87EF04 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 87EF08 80240118 0C0B1EAF */ jal get_variable -/* 87EF0C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 87EF10 80240120 0220202D */ daddu $a0, $s1, $zero -/* 87EF14 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 87EF18 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 87EF1C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 87EF20 80240130 02031821 */ addu $v1, $s0, $v1 -/* 87EF24 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 87EF28 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 87EF2C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 87EF30 80240140 0C0B2026 */ jal set_variable -/* 87EF34 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 87EF38 80240148 0220202D */ daddu $a0, $s1, $zero -/* 87EF3C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 87EF40 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 87EF44 80240154 02021021 */ addu $v0, $s0, $v0 -/* 87EF48 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 87EF4C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 87EF50 80240160 44061000 */ mfc1 $a2, $f2 -/* 87EF54 80240164 0C0B2026 */ jal set_variable -/* 87EF58 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 87EF5C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 87EF60 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 87EF64 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 87EF68 80240178 02021021 */ addu $v0, $s0, $v0 -/* 87EF6C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 87EF70 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 87EF74 80240184 44061000 */ mfc1 $a2, $f2 -/* 87EF78 80240188 0C0B2026 */ jal set_variable -/* 87EF7C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 87EF80 80240190 0220202D */ daddu $a0, $s1, $zero -/* 87EF84 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 87EF88 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 87EF8C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 87EF90 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 87EF94 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 87EF98 802401A8 44061000 */ mfc1 $a2, $f2 -/* 87EF9C 802401AC 0C0B2026 */ jal set_variable -/* 87EFA0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 87EFA4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 87EFA8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 87EFAC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 87EFB0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 87EFB4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 87EFB8 802401C8 03E00008 */ jr $ra -/* 87EFBC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_802400F0_8822B0.s b/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_802400F0_8822B0.s deleted file mode 100644 index fab3814c01..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_802400F0_8822B0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_8822B0 -/* 8822B0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8822B4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 8822B8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 8822BC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 8822C0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 8822C4 80240104 0C016AFA */ jal get_current_map_header -/* 8822C8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 8822CC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 8822D0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 8822D4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8822D8 80240118 0C0B1EAF */ jal get_variable -/* 8822DC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 8822E0 80240120 0220202D */ daddu $a0, $s1, $zero -/* 8822E4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 8822E8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 8822EC 8024012C 00028100 */ sll $s0, $v0, 4 -/* 8822F0 80240130 02031821 */ addu $v1, $s0, $v1 -/* 8822F4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 8822F8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 8822FC 8024013C 44061000 */ mfc1 $a2, $f2 -/* 882300 80240140 0C0B2026 */ jal set_variable -/* 882304 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 882308 80240148 0220202D */ daddu $a0, $s1, $zero -/* 88230C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 882310 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 882314 80240154 02021021 */ addu $v0, $s0, $v0 -/* 882318 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 88231C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 882320 80240160 44061000 */ mfc1 $a2, $f2 -/* 882324 80240164 0C0B2026 */ jal set_variable -/* 882328 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 88232C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 882330 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 882334 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 882338 80240178 02021021 */ addu $v0, $s0, $v0 -/* 88233C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 882340 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 882344 80240184 44061000 */ mfc1 $a2, $f2 -/* 882348 80240188 0C0B2026 */ jal set_variable -/* 88234C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 882350 80240190 0220202D */ daddu $a0, $s1, $zero -/* 882354 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 882358 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 88235C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 882360 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 882364 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 882368 802401A8 44061000 */ mfc1 $a2, $f2 -/* 88236C 802401AC 0C0B2026 */ jal set_variable -/* 882370 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 882374 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 882378 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 88237C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 882380 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 882384 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 882388 802401C8 03E00008 */ jr $ra -/* 88238C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_802400F0_888CC0.s b/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_802400F0_888CC0.s deleted file mode 100644 index 30d7ff4e4c..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_802400F0_888CC0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_888CC0 -/* 888CC0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 888CC4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 888CC8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 888CCC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 888CD0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 888CD4 80240104 0C016AFA */ jal get_current_map_header -/* 888CD8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 888CDC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 888CE0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 888CE4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 888CE8 80240118 0C0B1EAF */ jal get_variable -/* 888CEC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 888CF0 80240120 0220202D */ daddu $a0, $s1, $zero -/* 888CF4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 888CF8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 888CFC 8024012C 00028100 */ sll $s0, $v0, 4 -/* 888D00 80240130 02031821 */ addu $v1, $s0, $v1 -/* 888D04 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 888D08 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 888D0C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 888D10 80240140 0C0B2026 */ jal set_variable -/* 888D14 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 888D18 80240148 0220202D */ daddu $a0, $s1, $zero -/* 888D1C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 888D20 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 888D24 80240154 02021021 */ addu $v0, $s0, $v0 -/* 888D28 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 888D2C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 888D30 80240160 44061000 */ mfc1 $a2, $f2 -/* 888D34 80240164 0C0B2026 */ jal set_variable -/* 888D38 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 888D3C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 888D40 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 888D44 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 888D48 80240178 02021021 */ addu $v0, $s0, $v0 -/* 888D4C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 888D50 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 888D54 80240184 44061000 */ mfc1 $a2, $f2 -/* 888D58 80240188 0C0B2026 */ jal set_variable -/* 888D5C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 888D60 80240190 0220202D */ daddu $a0, $s1, $zero -/* 888D64 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 888D68 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 888D6C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 888D70 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 888D74 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 888D78 802401A8 44061000 */ mfc1 $a2, $f2 -/* 888D7C 802401AC 0C0B2026 */ jal set_variable -/* 888D80 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 888D84 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 888D88 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 888D8C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 888D90 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 888D94 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 888D98 802401C8 03E00008 */ jr $ra -/* 888D9C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_14/88D600/func_802400F0_88D6F0.s b/asm/nonmatchings/world/area_tik/tik_14/88D600/func_802400F0_88D6F0.s deleted file mode 100644 index f50d0544a3..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_14/88D600/func_802400F0_88D6F0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_88D6F0 -/* 88D6F0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88D6F4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 88D6F8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 88D6FC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 88D700 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 88D704 80240104 0C016AFA */ jal get_current_map_header -/* 88D708 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 88D70C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 88D710 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 88D714 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 88D718 80240118 0C0B1EAF */ jal get_variable -/* 88D71C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 88D720 80240120 0220202D */ daddu $a0, $s1, $zero -/* 88D724 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 88D728 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 88D72C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 88D730 80240130 02031821 */ addu $v1, $s0, $v1 -/* 88D734 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 88D738 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 88D73C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 88D740 80240140 0C0B2026 */ jal set_variable -/* 88D744 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 88D748 80240148 0220202D */ daddu $a0, $s1, $zero -/* 88D74C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 88D750 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 88D754 80240154 02021021 */ addu $v0, $s0, $v0 -/* 88D758 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 88D75C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 88D760 80240160 44061000 */ mfc1 $a2, $f2 -/* 88D764 80240164 0C0B2026 */ jal set_variable -/* 88D768 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 88D76C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 88D770 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 88D774 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 88D778 80240178 02021021 */ addu $v0, $s0, $v0 -/* 88D77C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 88D780 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 88D784 80240184 44061000 */ mfc1 $a2, $f2 -/* 88D788 80240188 0C0B2026 */ jal set_variable -/* 88D78C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 88D790 80240190 0220202D */ daddu $a0, $s1, $zero -/* 88D794 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 88D798 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 88D79C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 88D7A0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 88D7A4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 88D7A8 802401A8 44061000 */ mfc1 $a2, $f2 -/* 88D7AC 802401AC 0C0B2026 */ jal set_variable -/* 88D7B0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 88D7B4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 88D7B8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 88D7BC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 88D7C0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 88D7C4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 88D7C8 802401C8 03E00008 */ jr $ra -/* 88D7CC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_802400F0_88FC90.s b/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_802400F0_88FC90.s deleted file mode 100644 index 3aeced87b8..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_802400F0_88FC90.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_88FC90 -/* 88FC90 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88FC94 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 88FC98 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 88FC9C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 88FCA0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 88FCA4 80240104 0C016AFA */ jal get_current_map_header -/* 88FCA8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 88FCAC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 88FCB0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 88FCB4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 88FCB8 80240118 0C0B1EAF */ jal get_variable -/* 88FCBC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 88FCC0 80240120 0220202D */ daddu $a0, $s1, $zero -/* 88FCC4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 88FCC8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 88FCCC 8024012C 00028100 */ sll $s0, $v0, 4 -/* 88FCD0 80240130 02031821 */ addu $v1, $s0, $v1 -/* 88FCD4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 88FCD8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 88FCDC 8024013C 44061000 */ mfc1 $a2, $f2 -/* 88FCE0 80240140 0C0B2026 */ jal set_variable -/* 88FCE4 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 88FCE8 80240148 0220202D */ daddu $a0, $s1, $zero -/* 88FCEC 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 88FCF0 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 88FCF4 80240154 02021021 */ addu $v0, $s0, $v0 -/* 88FCF8 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 88FCFC 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 88FD00 80240160 44061000 */ mfc1 $a2, $f2 -/* 88FD04 80240164 0C0B2026 */ jal set_variable -/* 88FD08 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 88FD0C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 88FD10 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 88FD14 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 88FD18 80240178 02021021 */ addu $v0, $s0, $v0 -/* 88FD1C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 88FD20 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 88FD24 80240184 44061000 */ mfc1 $a2, $f2 -/* 88FD28 80240188 0C0B2026 */ jal set_variable -/* 88FD2C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 88FD30 80240190 0220202D */ daddu $a0, $s1, $zero -/* 88FD34 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 88FD38 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 88FD3C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 88FD40 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 88FD44 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 88FD48 802401A8 44061000 */ mfc1 $a2, $f2 -/* 88FD4C 802401AC 0C0B2026 */ jal set_variable -/* 88FD50 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 88FD54 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 88FD58 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 88FD5C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 88FD60 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 88FD64 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 88FD68 802401C8 03E00008 */ jr $ra -/* 88FD6C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240E60_893880.s b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240E60_893880.s deleted file mode 100644 index b58b05c106..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240E60_893880.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E60_893880 -/* 893880 80240E60 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 893884 80240E64 AFB10014 */ sw $s1, 0x14($sp) -/* 893888 80240E68 0080882D */ daddu $s1, $a0, $zero -/* 89388C 80240E6C AFBF001C */ sw $ra, 0x1c($sp) -/* 893890 80240E70 AFB20018 */ sw $s2, 0x18($sp) -/* 893894 80240E74 0C016AFA */ jal get_current_map_header -/* 893898 80240E78 AFB00010 */ sw $s0, 0x10($sp) -/* 89389C 80240E7C 0220202D */ daddu $a0, $s1, $zero -/* 8938A0 80240E80 3C05FE36 */ lui $a1, 0xfe36 -/* 8938A4 80240E84 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8938A8 80240E88 0C0B1EAF */ jal get_variable -/* 8938AC 80240E8C 0040902D */ daddu $s2, $v0, $zero -/* 8938B0 80240E90 0220202D */ daddu $a0, $s1, $zero -/* 8938B4 80240E94 3C05FE36 */ lui $a1, 0xfe36 -/* 8938B8 80240E98 8E430014 */ lw $v1, 0x14($s2) -/* 8938BC 80240E9C 00028100 */ sll $s0, $v0, 4 -/* 8938C0 80240EA0 02031821 */ addu $v1, $s0, $v1 -/* 8938C4 80240EA4 C4600000 */ lwc1 $f0, ($v1) -/* 8938C8 80240EA8 4600008D */ trunc.w.s $f2, $f0 -/* 8938CC 80240EAC 44061000 */ mfc1 $a2, $f2 -/* 8938D0 80240EB0 0C0B2026 */ jal set_variable -/* 8938D4 80240EB4 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8938D8 80240EB8 0220202D */ daddu $a0, $s1, $zero -/* 8938DC 80240EBC 8E420014 */ lw $v0, 0x14($s2) -/* 8938E0 80240EC0 3C05FE36 */ lui $a1, 0xfe36 -/* 8938E4 80240EC4 02021021 */ addu $v0, $s0, $v0 -/* 8938E8 80240EC8 C4400004 */ lwc1 $f0, 4($v0) -/* 8938EC 80240ECC 4600008D */ trunc.w.s $f2, $f0 -/* 8938F0 80240ED0 44061000 */ mfc1 $a2, $f2 -/* 8938F4 80240ED4 0C0B2026 */ jal set_variable -/* 8938F8 80240ED8 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8938FC 80240EDC 0220202D */ daddu $a0, $s1, $zero -/* 893900 80240EE0 8E420014 */ lw $v0, 0x14($s2) -/* 893904 80240EE4 3C05FE36 */ lui $a1, 0xfe36 -/* 893908 80240EE8 02021021 */ addu $v0, $s0, $v0 -/* 89390C 80240EEC C4400008 */ lwc1 $f0, 8($v0) -/* 893910 80240EF0 4600008D */ trunc.w.s $f2, $f0 -/* 893914 80240EF4 44061000 */ mfc1 $a2, $f2 -/* 893918 80240EF8 0C0B2026 */ jal set_variable -/* 89391C 80240EFC 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 893920 80240F00 0220202D */ daddu $a0, $s1, $zero -/* 893924 80240F04 8E420014 */ lw $v0, 0x14($s2) -/* 893928 80240F08 3C05FE36 */ lui $a1, 0xfe36 -/* 89392C 80240F0C 02028021 */ addu $s0, $s0, $v0 -/* 893930 80240F10 C600000C */ lwc1 $f0, 0xc($s0) -/* 893934 80240F14 4600008D */ trunc.w.s $f2, $f0 -/* 893938 80240F18 44061000 */ mfc1 $a2, $f2 -/* 89393C 80240F1C 0C0B2026 */ jal set_variable -/* 893940 80240F20 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 893944 80240F24 8FBF001C */ lw $ra, 0x1c($sp) -/* 893948 80240F28 8FB20018 */ lw $s2, 0x18($sp) -/* 89394C 80240F2C 8FB10014 */ lw $s1, 0x14($sp) -/* 893950 80240F30 8FB00010 */ lw $s0, 0x10($sp) -/* 893954 80240F34 24020002 */ addiu $v0, $zero, 2 -/* 893958 80240F38 03E00008 */ jr $ra -/* 89395C 80240F3C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_802400F0_8976D0.s b/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_802400F0_8976D0.s deleted file mode 100644 index 9e98bed448..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_802400F0_8976D0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_8976D0 -/* 8976D0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8976D4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 8976D8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 8976DC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 8976E0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 8976E4 80240104 0C016AFA */ jal get_current_map_header -/* 8976E8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 8976EC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 8976F0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 8976F4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8976F8 80240118 0C0B1EAF */ jal get_variable -/* 8976FC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 897700 80240120 0220202D */ daddu $a0, $s1, $zero -/* 897704 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 897708 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 89770C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 897710 80240130 02031821 */ addu $v1, $s0, $v1 -/* 897714 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 897718 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 89771C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 897720 80240140 0C0B2026 */ jal set_variable -/* 897724 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 897728 80240148 0220202D */ daddu $a0, $s1, $zero -/* 89772C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 897730 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 897734 80240154 02021021 */ addu $v0, $s0, $v0 -/* 897738 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 89773C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 897740 80240160 44061000 */ mfc1 $a2, $f2 -/* 897744 80240164 0C0B2026 */ jal set_variable -/* 897748 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 89774C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 897750 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 897754 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 897758 80240178 02021021 */ addu $v0, $s0, $v0 -/* 89775C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 897760 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 897764 80240184 44061000 */ mfc1 $a2, $f2 -/* 897768 80240188 0C0B2026 */ jal set_variable -/* 89776C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 897770 80240190 0220202D */ daddu $a0, $s1, $zero -/* 897774 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 897778 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 89777C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 897780 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 897784 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 897788 802401A8 44061000 */ mfc1 $a2, $f2 -/* 89778C 802401AC 0C0B2026 */ jal set_variable -/* 897790 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 897794 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 897798 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 89779C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 8977A0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 8977A4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 8977A8 802401C8 03E00008 */ jr $ra -/* 8977AC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_20/89A350/func_802403FC_89A74C.s b/asm/nonmatchings/world/area_tik/tik_20/89A350/func_802403FC_89A74C.s deleted file mode 100644 index 11337ea3fd..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/89A350/func_802403FC_89A74C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403FC_89A74C -/* 89A74C 802403FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 89A750 80240400 AFB10014 */ sw $s1, 0x14($sp) -/* 89A754 80240404 0080882D */ daddu $s1, $a0, $zero -/* 89A758 80240408 AFBF001C */ sw $ra, 0x1c($sp) -/* 89A75C 8024040C AFB20018 */ sw $s2, 0x18($sp) -/* 89A760 80240410 0C016AFA */ jal get_current_map_header -/* 89A764 80240414 AFB00010 */ sw $s0, 0x10($sp) -/* 89A768 80240418 0220202D */ daddu $a0, $s1, $zero -/* 89A76C 8024041C 3C05FE36 */ lui $a1, 0xfe36 -/* 89A770 80240420 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 89A774 80240424 0C0B1EAF */ jal get_variable -/* 89A778 80240428 0040902D */ daddu $s2, $v0, $zero -/* 89A77C 8024042C 0220202D */ daddu $a0, $s1, $zero -/* 89A780 80240430 3C05FE36 */ lui $a1, 0xfe36 -/* 89A784 80240434 8E430014 */ lw $v1, 0x14($s2) -/* 89A788 80240438 00028100 */ sll $s0, $v0, 4 -/* 89A78C 8024043C 02031821 */ addu $v1, $s0, $v1 -/* 89A790 80240440 C4600000 */ lwc1 $f0, ($v1) -/* 89A794 80240444 4600008D */ trunc.w.s $f2, $f0 -/* 89A798 80240448 44061000 */ mfc1 $a2, $f2 -/* 89A79C 8024044C 0C0B2026 */ jal set_variable -/* 89A7A0 80240450 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 89A7A4 80240454 0220202D */ daddu $a0, $s1, $zero -/* 89A7A8 80240458 8E420014 */ lw $v0, 0x14($s2) -/* 89A7AC 8024045C 3C05FE36 */ lui $a1, 0xfe36 -/* 89A7B0 80240460 02021021 */ addu $v0, $s0, $v0 -/* 89A7B4 80240464 C4400004 */ lwc1 $f0, 4($v0) -/* 89A7B8 80240468 4600008D */ trunc.w.s $f2, $f0 -/* 89A7BC 8024046C 44061000 */ mfc1 $a2, $f2 -/* 89A7C0 80240470 0C0B2026 */ jal set_variable -/* 89A7C4 80240474 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 89A7C8 80240478 0220202D */ daddu $a0, $s1, $zero -/* 89A7CC 8024047C 8E420014 */ lw $v0, 0x14($s2) -/* 89A7D0 80240480 3C05FE36 */ lui $a1, 0xfe36 -/* 89A7D4 80240484 02021021 */ addu $v0, $s0, $v0 -/* 89A7D8 80240488 C4400008 */ lwc1 $f0, 8($v0) -/* 89A7DC 8024048C 4600008D */ trunc.w.s $f2, $f0 -/* 89A7E0 80240490 44061000 */ mfc1 $a2, $f2 -/* 89A7E4 80240494 0C0B2026 */ jal set_variable -/* 89A7E8 80240498 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 89A7EC 8024049C 0220202D */ daddu $a0, $s1, $zero -/* 89A7F0 802404A0 8E420014 */ lw $v0, 0x14($s2) -/* 89A7F4 802404A4 3C05FE36 */ lui $a1, 0xfe36 -/* 89A7F8 802404A8 02028021 */ addu $s0, $s0, $v0 -/* 89A7FC 802404AC C600000C */ lwc1 $f0, 0xc($s0) -/* 89A800 802404B0 4600008D */ trunc.w.s $f2, $f0 -/* 89A804 802404B4 44061000 */ mfc1 $a2, $f2 -/* 89A808 802404B8 0C0B2026 */ jal set_variable -/* 89A80C 802404BC 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 89A810 802404C0 8FBF001C */ lw $ra, 0x1c($sp) -/* 89A814 802404C4 8FB20018 */ lw $s2, 0x18($sp) -/* 89A818 802404C8 8FB10014 */ lw $s1, 0x14($sp) -/* 89A81C 802404CC 8FB00010 */ lw $s0, 0x10($sp) -/* 89A820 802404D0 24020002 */ addiu $v0, $zero, 2 -/* 89A824 802404D4 03E00008 */ jr $ra -/* 89A828 802404D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_802403FC_89DB9C.s b/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_802403FC_89DB9C.s deleted file mode 100644 index 3342921e2a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_802403FC_89DB9C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403FC_89DB9C -/* 89DB9C 802403FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 89DBA0 80240400 AFB10014 */ sw $s1, 0x14($sp) -/* 89DBA4 80240404 0080882D */ daddu $s1, $a0, $zero -/* 89DBA8 80240408 AFBF001C */ sw $ra, 0x1c($sp) -/* 89DBAC 8024040C AFB20018 */ sw $s2, 0x18($sp) -/* 89DBB0 80240410 0C016AFA */ jal get_current_map_header -/* 89DBB4 80240414 AFB00010 */ sw $s0, 0x10($sp) -/* 89DBB8 80240418 0220202D */ daddu $a0, $s1, $zero -/* 89DBBC 8024041C 3C05FE36 */ lui $a1, 0xfe36 -/* 89DBC0 80240420 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 89DBC4 80240424 0C0B1EAF */ jal get_variable -/* 89DBC8 80240428 0040902D */ daddu $s2, $v0, $zero -/* 89DBCC 8024042C 0220202D */ daddu $a0, $s1, $zero -/* 89DBD0 80240430 3C05FE36 */ lui $a1, 0xfe36 -/* 89DBD4 80240434 8E430014 */ lw $v1, 0x14($s2) -/* 89DBD8 80240438 00028100 */ sll $s0, $v0, 4 -/* 89DBDC 8024043C 02031821 */ addu $v1, $s0, $v1 -/* 89DBE0 80240440 C4600000 */ lwc1 $f0, ($v1) -/* 89DBE4 80240444 4600008D */ trunc.w.s $f2, $f0 -/* 89DBE8 80240448 44061000 */ mfc1 $a2, $f2 -/* 89DBEC 8024044C 0C0B2026 */ jal set_variable -/* 89DBF0 80240450 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 89DBF4 80240454 0220202D */ daddu $a0, $s1, $zero -/* 89DBF8 80240458 8E420014 */ lw $v0, 0x14($s2) -/* 89DBFC 8024045C 3C05FE36 */ lui $a1, 0xfe36 -/* 89DC00 80240460 02021021 */ addu $v0, $s0, $v0 -/* 89DC04 80240464 C4400004 */ lwc1 $f0, 4($v0) -/* 89DC08 80240468 4600008D */ trunc.w.s $f2, $f0 -/* 89DC0C 8024046C 44061000 */ mfc1 $a2, $f2 -/* 89DC10 80240470 0C0B2026 */ jal set_variable -/* 89DC14 80240474 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 89DC18 80240478 0220202D */ daddu $a0, $s1, $zero -/* 89DC1C 8024047C 8E420014 */ lw $v0, 0x14($s2) -/* 89DC20 80240480 3C05FE36 */ lui $a1, 0xfe36 -/* 89DC24 80240484 02021021 */ addu $v0, $s0, $v0 -/* 89DC28 80240488 C4400008 */ lwc1 $f0, 8($v0) -/* 89DC2C 8024048C 4600008D */ trunc.w.s $f2, $f0 -/* 89DC30 80240490 44061000 */ mfc1 $a2, $f2 -/* 89DC34 80240494 0C0B2026 */ jal set_variable -/* 89DC38 80240498 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 89DC3C 8024049C 0220202D */ daddu $a0, $s1, $zero -/* 89DC40 802404A0 8E420014 */ lw $v0, 0x14($s2) -/* 89DC44 802404A4 3C05FE36 */ lui $a1, 0xfe36 -/* 89DC48 802404A8 02028021 */ addu $s0, $s0, $v0 -/* 89DC4C 802404AC C600000C */ lwc1 $f0, 0xc($s0) -/* 89DC50 802404B0 4600008D */ trunc.w.s $f2, $f0 -/* 89DC54 802404B4 44061000 */ mfc1 $a2, $f2 -/* 89DC58 802404B8 0C0B2026 */ jal set_variable -/* 89DC5C 802404BC 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 89DC60 802404C0 8FBF001C */ lw $ra, 0x1c($sp) -/* 89DC64 802404C4 8FB20018 */ lw $s2, 0x18($sp) -/* 89DC68 802404C8 8FB10014 */ lw $s1, 0x14($sp) -/* 89DC6C 802404CC 8FB00010 */ lw $s0, 0x10($sp) -/* 89DC70 802404D0 24020002 */ addiu $v0, $zero, 2 -/* 89DC74 802404D4 03E00008 */ jr $ra -/* 89DC78 802404D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024042C_8A02EC.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024042C_8A02EC.s deleted file mode 100644 index 29d794bc93..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024042C_8A02EC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024042C_8A02EC -/* 8A02EC 8024042C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8A02F0 80240430 AFB10014 */ sw $s1, 0x14($sp) -/* 8A02F4 80240434 0080882D */ daddu $s1, $a0, $zero -/* 8A02F8 80240438 AFBF001C */ sw $ra, 0x1c($sp) -/* 8A02FC 8024043C AFB20018 */ sw $s2, 0x18($sp) -/* 8A0300 80240440 0C016AFA */ jal get_current_map_header -/* 8A0304 80240444 AFB00010 */ sw $s0, 0x10($sp) -/* 8A0308 80240448 0220202D */ daddu $a0, $s1, $zero -/* 8A030C 8024044C 3C05FE36 */ lui $a1, 0xfe36 -/* 8A0310 80240450 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8A0314 80240454 0C0B1EAF */ jal get_variable -/* 8A0318 80240458 0040902D */ daddu $s2, $v0, $zero -/* 8A031C 8024045C 0220202D */ daddu $a0, $s1, $zero -/* 8A0320 80240460 3C05FE36 */ lui $a1, 0xfe36 -/* 8A0324 80240464 8E430014 */ lw $v1, 0x14($s2) -/* 8A0328 80240468 00028100 */ sll $s0, $v0, 4 -/* 8A032C 8024046C 02031821 */ addu $v1, $s0, $v1 -/* 8A0330 80240470 C4600000 */ lwc1 $f0, ($v1) -/* 8A0334 80240474 4600008D */ trunc.w.s $f2, $f0 -/* 8A0338 80240478 44061000 */ mfc1 $a2, $f2 -/* 8A033C 8024047C 0C0B2026 */ jal set_variable -/* 8A0340 80240480 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8A0344 80240484 0220202D */ daddu $a0, $s1, $zero -/* 8A0348 80240488 8E420014 */ lw $v0, 0x14($s2) -/* 8A034C 8024048C 3C05FE36 */ lui $a1, 0xfe36 -/* 8A0350 80240490 02021021 */ addu $v0, $s0, $v0 -/* 8A0354 80240494 C4400004 */ lwc1 $f0, 4($v0) -/* 8A0358 80240498 4600008D */ trunc.w.s $f2, $f0 -/* 8A035C 8024049C 44061000 */ mfc1 $a2, $f2 -/* 8A0360 802404A0 0C0B2026 */ jal set_variable -/* 8A0364 802404A4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8A0368 802404A8 0220202D */ daddu $a0, $s1, $zero -/* 8A036C 802404AC 8E420014 */ lw $v0, 0x14($s2) -/* 8A0370 802404B0 3C05FE36 */ lui $a1, 0xfe36 -/* 8A0374 802404B4 02021021 */ addu $v0, $s0, $v0 -/* 8A0378 802404B8 C4400008 */ lwc1 $f0, 8($v0) -/* 8A037C 802404BC 4600008D */ trunc.w.s $f2, $f0 -/* 8A0380 802404C0 44061000 */ mfc1 $a2, $f2 -/* 8A0384 802404C4 0C0B2026 */ jal set_variable -/* 8A0388 802404C8 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8A038C 802404CC 0220202D */ daddu $a0, $s1, $zero -/* 8A0390 802404D0 8E420014 */ lw $v0, 0x14($s2) -/* 8A0394 802404D4 3C05FE36 */ lui $a1, 0xfe36 -/* 8A0398 802404D8 02028021 */ addu $s0, $s0, $v0 -/* 8A039C 802404DC C600000C */ lwc1 $f0, 0xc($s0) -/* 8A03A0 802404E0 4600008D */ trunc.w.s $f2, $f0 -/* 8A03A4 802404E4 44061000 */ mfc1 $a2, $f2 -/* 8A03A8 802404E8 0C0B2026 */ jal set_variable -/* 8A03AC 802404EC 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8A03B0 802404F0 8FBF001C */ lw $ra, 0x1c($sp) -/* 8A03B4 802404F4 8FB20018 */ lw $s2, 0x18($sp) -/* 8A03B8 802404F8 8FB10014 */ lw $s1, 0x14($sp) -/* 8A03BC 802404FC 8FB00010 */ lw $s0, 0x10($sp) -/* 8A03C0 80240500 24020002 */ addiu $v0, $zero, 2 -/* 8A03C4 80240504 03E00008 */ jr $ra -/* 8A03C8 80240508 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802400F0_8A24C0.s b/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802400F0_8A24C0.s deleted file mode 100644 index f1ca9eeccc..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802400F0_8A24C0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_8A24C0 -/* 8A24C0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8A24C4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 8A24C8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 8A24CC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 8A24D0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 8A24D4 80240104 0C016AFA */ jal get_current_map_header -/* 8A24D8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 8A24DC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 8A24E0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 8A24E4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8A24E8 80240118 0C0B1EAF */ jal get_variable -/* 8A24EC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 8A24F0 80240120 0220202D */ daddu $a0, $s1, $zero -/* 8A24F4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 8A24F8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 8A24FC 8024012C 00028100 */ sll $s0, $v0, 4 -/* 8A2500 80240130 02031821 */ addu $v1, $s0, $v1 -/* 8A2504 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 8A2508 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 8A250C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 8A2510 80240140 0C0B2026 */ jal set_variable -/* 8A2514 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8A2518 80240148 0220202D */ daddu $a0, $s1, $zero -/* 8A251C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 8A2520 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 8A2524 80240154 02021021 */ addu $v0, $s0, $v0 -/* 8A2528 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 8A252C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 8A2530 80240160 44061000 */ mfc1 $a2, $f2 -/* 8A2534 80240164 0C0B2026 */ jal set_variable -/* 8A2538 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8A253C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 8A2540 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 8A2544 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 8A2548 80240178 02021021 */ addu $v0, $s0, $v0 -/* 8A254C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 8A2550 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 8A2554 80240184 44061000 */ mfc1 $a2, $f2 -/* 8A2558 80240188 0C0B2026 */ jal set_variable -/* 8A255C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8A2560 80240190 0220202D */ daddu $a0, $s1, $zero -/* 8A2564 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 8A2568 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 8A256C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 8A2570 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 8A2574 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 8A2578 802401A8 44061000 */ mfc1 $a2, $f2 -/* 8A257C 802401AC 0C0B2026 */ jal set_variable -/* 8A2580 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8A2584 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 8A2588 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 8A258C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 8A2590 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 8A2594 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 8A2598 802401C8 03E00008 */ jr $ra -/* 8A259C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/include/map.h b/include/map.h index 04a57dc333..d2345082fd 100644 --- a/include/map.h +++ b/include/map.h @@ -11,7 +11,7 @@ #define ENTRY_COUNT(entryList) (sizeof(entryList) / sizeof(Vec4f)) -typedef Vec4f EntryList[]; +typedef Vec4f EntryList[0]; /// Fields other than main, entryList, entryCount, background, and tattle are initialised when the map loads. typedef struct MapConfig { @@ -249,6 +249,7 @@ typedef struct { #define NPC_GROUP_LIST_END() { 0, 0, 0 } Enemy* get_enemy(NpcId npcId); +MapConfig* get_current_map_header(void); /// Zero-terminated. Area gAreas[29]; diff --git a/src/world/area_dro/dro_01/95B200.c b/src/world/area_dro/dro_01/95B200.c index 43bcd80ce1..5bfe4a002d 100644 --- a/src/world/area_dro/dro_01/95B200.c +++ b/src/world/area_dro/dro_01/95B200.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_80240034_95B234); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_802400F0_95B2F0); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_dro/dro_01/95E7A0.c b/src/world/area_dro/dro_01/95E7A0.c index b187a40480..f23fa6d35b 100644 --- a/src/world/area_dro/dro_01/95E7A0.c +++ b/src/world/area_dro/dro_01/95E7A0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802435D4_95E7D4); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_80243690_95E890); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_flo/flo_11/CBDCD0.c b/src/world/area_flo/flo_11/CBDCD0.c index 333b32557a..ce0756f03f 100644 --- a/src/world/area_flo/flo_11/CBDCD0.c +++ b/src/world/area_flo/flo_11/CBDCD0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_11/CBDCD0", func_80240034_CBDD04); -INCLUDE_ASM(s32, "world/area_flo/flo_11/CBDCD0", func_802400F0_CBDDC0); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_gv/gv_01/E1E460.c b/src/world/area_gv/gv_01/E1E460.c index 4f18eece47..e67e5fead3 100644 --- a/src/world/area_gv/gv_01/E1E460.c +++ b/src/world/area_gv/gv_01/E1E460.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_80240034_E1E494); -INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_802400F0_E1E550); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index a7a8c07b19..66cea20d54 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240034_B34C04); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802400F0_B34CC0); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_jan/jan_09/B65AB0.c b/src/world/area_jan/jan_09/B65AB0.c index 5cbdc00066..6ffcd6e156 100644 --- a/src/world/area_jan/jan_09/B65AB0.c +++ b/src/world/area_jan/jan_09/B65AB0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_80240034_B65AE4); -INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_802400F0_B65BA0); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_jan/jan_11/B70860.c b/src/world/area_jan/jan_11/B70860.c index 814cb0b8a4..96f691268a 100644 --- a/src/world/area_jan/jan_11/B70860.c +++ b/src/world/area_jan/jan_11/B70860.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240000_B70860); INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_8024018C_B709EC); -INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240248_B70AA8); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 31bb487694..372573d996 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240034_8B00A4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802400F0_8B0160); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c index c3221df9b2..bdae212f4d 100644 --- a/src/world/area_kmr/kmr_03/8C7F90.c +++ b/src/world/area_kmr/kmr_03/8C7F90.c @@ -50,7 +50,7 @@ ApiStatus func_80240000_8C7F90(ScriptInstance* script, s32 isInitialCall) { #include "world/common/CheckPartnerFlags1000.inc.c" // 8C85E0 -EntryList M(entryList) = { +Vec4f M(entryList)[] = { { -340.0f, 0.0f, 348.0f, 48.0f }, { 480.0f, 0.0f, 0.0f, 270.0f }, { -310.0f, 20.0f, -80.0f, 135.0f }, diff --git a/src/world/area_kmr/kmr_12/header.c b/src/world/area_kmr/kmr_12/header.c index 7541f47bc7..80225997b7 100644 --- a/src/world/area_kmr/kmr_12/header.c +++ b/src/world/area_kmr/kmr_12/header.c @@ -1,6 +1,6 @@ #include "kmr_12.h" -EntryList M(entryList) = { +Vec4f M(entryList)[] = { { -126.0f, 0.0f, 12.0f, 90.0f }, // west, towards Red/Blue Goomba miniboss room { 471.0f, 0.0f, 12.0f, 270.0f }, // east, towards Goomba King's Fortress }; diff --git a/src/world/area_kmr/kmr_20/8EBE50.c b/src/world/area_kmr/kmr_20/8EBE50.c index 529a6a9d91..80a17dd16d 100644 --- a/src/world/area_kmr/kmr_20/8EBE50.c +++ b/src/world/area_kmr/kmr_20/8EBE50.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240064_8EBE84); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240120_8EBF40); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_kmr/kmr_20/8ED5A0.c b/src/world/area_kmr/kmr_20/8ED5A0.c index c6c87bc9ef..f3563a283c 100644 --- a/src/world/area_kmr/kmr_20/8ED5A0.c +++ b/src/world/area_kmr/kmr_20/8ED5A0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802417B4_8ED5D4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241870_8ED690); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_kmr/kmr_20/8EDB70.c b/src/world/area_kmr/kmr_20/8EDB70.c index 03e2896383..00b372f568 100644 --- a/src/world/area_kmr/kmr_20/8EDB70.c +++ b/src/world/area_kmr/kmr_20/8EDB70.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241D84_8EDBA4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241E40_8EDC60); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_mac/mac_00/7EAD10.c b/src/world/area_mac/mac_00/7EAD10.c index fe29e1f8c2..6f2f087176 100644 --- a/src/world/area_mac/mac_00/7EAD10.c +++ b/src/world/area_mac/mac_00/7EAD10.c @@ -33,7 +33,7 @@ ApiStatus func_80240034_7EAD44(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240034_7EAD44); #endif -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_802400F0_7EAE00); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_mac/mac_02/8232C0.c b/src/world/area_mac/mac_02/8232C0.c index 6fe7b55d27..ff2f0e06cf 100644 --- a/src/world/area_mac/mac_02/8232C0.c +++ b/src/world/area_mac/mac_02/8232C0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_80240034_8232F4); -INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_802400F0_8233B0); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_mac/mac_03/831800.c b/src/world/area_mac/mac_03/831800.c index 42efeae09a..78569879dc 100644 --- a/src/world/area_mac/mac_03/831800.c +++ b/src/world/area_mac/mac_03/831800.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831800", func_80240034_831834); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831800", func_802400F0_8318F0); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index aef1ea698c..af00f71f07 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240034_E0E7D4); -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_802400F0_E0E890); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_mim/mim_11/BB7070.c b/src/world/area_mim/mim_11/BB7070.c index 7d33c7573e..a90f1164ac 100644 --- a/src/world/area_mim/mim_11/BB7070.c +++ b/src/world/area_mim/mim_11/BB7070.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_80240034_BB70A4); -INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_802400F0_BB7160); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c index 0f83e42093..204f21765d 100644 --- a/src/world/area_nok/nok_02/9D7020.c +++ b/src/world/area_nok/nok_02/9D7020.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240034_9D7054); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_802400F0_9D7110); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 7d3ad7e37d..20fc844f2d 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240034_A06F34); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802400F0_A06FF0); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_sam/sam_02/D05730.c b/src/world/area_sam/sam_02/D05730.c index 9216288636..b43a8c4430 100644 --- a/src/world/area_sam/sam_02/D05730.c +++ b/src/world/area_sam/sam_02/D05730.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_80240034_D05764); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_802400F0_D05820); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_sbk/sbk_00/929270.c b/src/world/area_sbk/sbk_00/929270.c index 57540c174e..e3b3f8a9cc 100644 --- a/src/world/area_sbk/sbk_00/929270.c +++ b/src/world/area_sbk/sbk_00/929270.c @@ -5,7 +5,7 @@ Script M(Main); s32 M(npcGroupList_80240768)[]; -EntryList M(entryList) = { +Vec4f M(entryList)[] = { { -475.0f, 0.0f, 0.0f, 90.0f }, { 475.0f, 0.0f, 0.0f, 270.0f }, { 0.0f, 0.0f, -475.0f, 180.0f }, diff --git a/src/world/area_sbk/sbk_01/929A90.c b/src/world/area_sbk/sbk_01/929A90.c index ebc318b699..c98a622f48 100644 --- a/src/world/area_sbk/sbk_01/929A90.c +++ b/src/world/area_sbk/sbk_01/929A90.c @@ -5,7 +5,7 @@ Script M(Main); s32 M(npcGroupList_802407D8)[]; -EntryList M(entryList) = { +Vec4f M(entryList)[] = { { -475.0f, 0.0f, 0.0f, 90.0f }, { 475.0f, 0.0f, 0.0f, 270.0f }, { 0.0f, 0.0f, -475.0f, 180.0f }, diff --git a/src/world/area_tik/tik_01/8694B0.c b/src/world/area_tik/tik_01/8694B0.c index 96c02509bd..ceaba9f648 100644 --- a/src/world/area_tik/tik_01/8694B0.c +++ b/src/world/area_tik/tik_01/8694B0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240124_8695D4); INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240340_8697F0); -INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_802403FC_8698AC); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_03/86EB00.c b/src/world/area_tik/tik_03/86EB00.c index 205ef113f8..ee2e8c1442 100644 --- a/src/world/area_tik/tik_03/86EB00.c +++ b/src/world/area_tik/tik_03/86EB00.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_80240034_86EB34); -INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_802400F0_86EBF0); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_04/871A30.c b/src/world/area_tik/tik_04/871A30.c index 7a0c93147e..0f5abf8aaa 100644 --- a/src/world/area_tik/tik_04/871A30.c +++ b/src/world/area_tik/tik_04/871A30.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_80240124_871B54); INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_80240340_871D70); -INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_802403FC_871E2C); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_06/876EE0.c b/src/world/area_tik/tik_06/876EE0.c index 4f1f3584c1..4404c60aae 100644 --- a/src/world/area_tik/tik_06/876EE0.c +++ b/src/world/area_tik/tik_06/876EE0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_80240034_876F14); -INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_802400F0_876FD0); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_07/879BE0.c b/src/world/area_tik/tik_07/879BE0.c index 2213a8a68a..95b98da098 100644 --- a/src/world/area_tik/tik_07/879BE0.c +++ b/src/world/area_tik/tik_07/879BE0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240034_879C14); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802400F0_879CD0); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_08/87EDF0.c b/src/world/area_tik/tik_08/87EDF0.c index 5a10e210ed..2c1727443b 100644 --- a/src/world/area_tik/tik_08/87EDF0.c +++ b/src/world/area_tik/tik_08/87EDF0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_80240034_87EE24); -INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_802400F0_87EEE0); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_09/8821C0.c b/src/world/area_tik/tik_09/8821C0.c index 3553a495f5..2880ac298a 100644 --- a/src/world/area_tik/tik_09/8821C0.c +++ b/src/world/area_tik/tik_09/8821C0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_80240034_8821F4); -INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_802400F0_8822B0); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_12/888BD0.c b/src/world/area_tik/tik_12/888BD0.c index d89cd2b932..732f6ca0b3 100644 --- a/src/world/area_tik/tik_12/888BD0.c +++ b/src/world/area_tik/tik_12/888BD0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_80240034_888C04); -INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_802400F0_888CC0); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_14/88D600.c b/src/world/area_tik/tik_14/88D600.c index 2aff140a12..1205d32945 100644 --- a/src/world/area_tik/tik_14/88D600.c +++ b/src/world/area_tik/tik_14/88D600.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_80240034_88D634); -INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_802400F0_88D6F0); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_15/88FBA0.c b/src/world/area_tik/tik_15/88FBA0.c index e58d14fc85..fd103e056e 100644 --- a/src/world/area_tik/tik_15/88FBA0.c +++ b/src/world/area_tik/tik_15/88FBA0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_80240034_88FBD4); -INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_802400F0_88FC90); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_17/893790.c b/src/world/area_tik/tik_17/893790.c index 3dbc3c5fab..6305b2254a 100644 --- a/src/world/area_tik/tik_17/893790.c +++ b/src/world/area_tik/tik_17/893790.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240DA4_8937C4); -INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240E60_893880); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_19/8975E0.c b/src/world/area_tik/tik_19/8975E0.c index a8bc848a61..f8c8b26de8 100644 --- a/src/world/area_tik/tik_19/8975E0.c +++ b/src/world/area_tik/tik_19/8975E0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_80240034_897614); -INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_802400F0_8976D0); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_20/89A350.c b/src/world/area_tik/tik_20/89A350.c index 12990743cc..942ab4a0e8 100644 --- a/src/world/area_tik/tik_20/89A350.c +++ b/src/world/area_tik/tik_20/89A350.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_80240124_89A474); INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_80240340_89A690); -INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_802403FC_89A74C); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_21/89D7A0.c b/src/world/area_tik/tik_21/89D7A0.c index 5ac10aa0d1..45589ee433 100644 --- a/src/world/area_tik/tik_21/89D7A0.c +++ b/src/world/area_tik/tik_21/89D7A0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_80240124_89D8C4); INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_80240340_89DAE0); -INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_802403FC_89DB9C); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_22/89FEF0.c b/src/world/area_tik/tik_22/89FEF0.c index 613c422b84..46cdd187c2 100644 --- a/src/world/area_tik/tik_22/89FEF0.c +++ b/src/world/area_tik/tik_22/89FEF0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240154_8A0014); INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240370_8A0230); -INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024042C_8A02EC); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_23/8A23D0.c b/src/world/area_tik/tik_23/8A23D0.c index d268f206bb..f45c92b886 100644 --- a/src/world/area_tik/tik_23/8A23D0.c +++ b/src/world/area_tik/tik_23/8A23D0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_80240034_8A2404); -INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_802400F0_8A24C0); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/common/GetEntryPos.inc.c b/src/world/common/GetEntryPos.inc.c new file mode 100644 index 0000000000..8989d090c0 --- /dev/null +++ b/src/world/common/GetEntryPos.inc.c @@ -0,0 +1,13 @@ +#include "common.h" +#include "map.h" + +static ApiStatus GetEntryPos(ScriptInstance* script, s32 isInitialCall) { + MapConfig* mapConfig = get_current_map_header(); + s32 index = get_variable(script, SI_VAR(0)); + + set_variable(script, SI_VAR(1), ((Vec4f*)*mapConfig->entryList)[index].x); + set_variable(script, SI_VAR(2), ((Vec4f*)*mapConfig->entryList)[index].y); + set_variable(script, SI_VAR(3), ((Vec4f*)*mapConfig->entryList)[index].z); + set_variable(script, SI_VAR(4), ((Vec4f*)*mapConfig->entryList)[index].yaw); + return ApiStatus_DONE2; +} diff --git a/src/world/world.c b/src/world/world.c index 01a8eb0eff..1c00349aad 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -68,7 +68,7 @@ INCLUDE_ASM(s32, "world/world", load_map_by_IDs); INCLUDE_ASM(s32, "world/world", get_current_map_config); -INCLUDE_ASM(s32, "world/world", get_current_map_header); +INCLUDE_ASM(MapConfig*, "world/world", get_current_map_header); INCLUDE_ASM(s32, "world/world", get_map_IDs_by_name); From 26299a4a517e1b4d8490ab852de51464758972e1 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 21 Nov 2020 20:45:02 -0500 Subject: [PATCH 14/38] UnkNpcAIFunc2 --- .../arn_04/BE37B0/func_80241A6C_BE521C.s | 34 ------------------- .../arn_04/BE37B0/func_8024219C_BE594C.s | 2 +- .../arn_07/BED740/func_8024152C_BEE31C.s | 34 ------------------- .../arn_07/BED740/func_80241C5C_BEEA4C.s | 2 +- .../dgb_01/BFD9A0/func_80240CFC_BFE57C.s | 34 ------------------- .../dgb_01/BFD9A0/func_8024142C_BFECAC.s | 2 +- .../dgb_04/C36530/func_80240BDC_C3710C.s | 34 ------------------- .../dgb_04/C36530/func_8024130C_C3783C.s | 2 +- .../dgb_08/C3FDB0/func_8024233C_C420EC.s | 34 ------------------- .../dgb_08/C3FDB0/func_80242A6C_C4281C.s | 2 +- .../dgb_09/C46BE0/func_80242000_C48BE0.s | 34 ------------------- .../dgb_09/C46BE0/func_80242730_C49310.s | 2 +- .../flo_09/CB5320/func_80240EFC_CB5EFC.s | 34 ------------------- .../flo_09/CB5320/func_8024162C_CB662C.s | 2 +- .../flo_13/CC3850/func_80240DA0_CC45B0.s | 34 ------------------- .../flo_13/CC3850/func_802414D0_CC4CE0.s | 2 +- .../flo_14/CCBE20/func_802416EC_CCC9FC.s | 34 ------------------- .../flo_14/CCBE20/func_80241E1C_CCD12C.s | 2 +- .../flo_16/CD2C80/func_80241A2C_CD385C.s | 34 ------------------- .../flo_16/CD2C80/func_8024215C_CD3F8C.s | 2 +- .../flo_16/CD2C80/func_80242754_CD4584.s | 2 +- .../flo_17/CD7350/func_80240C4C_CD7F2C.s | 34 ------------------- .../flo_17/CD7350/func_8024137C_CD865C.s | 2 +- .../flo_25/CF2C10/func_80240C1C_CF37EC.s | 34 ------------------- .../flo_25/CF2C10/func_8024134C_CF3F1C.s | 2 +- .../flo_25/CF2C10/func_80241944_CF4514.s | 2 +- .../hos_02/A17210/func_80241BCC_A17DEC.s | 34 ------------------- .../hos_02/A17210/func_802422FC_A1851C.s | 2 +- .../hos_02/A17210/func_802428F4_A18B14.s | 2 +- .../hos_03/A1BDB0/func_8024188C_A1C98C.s | 34 ------------------- .../hos_03/A1BDB0/func_80241FBC_A1D0BC.s | 2 +- .../kmr_05/8CE070/func_80240BDC_8CEC4C.s | 34 ------------------- .../kmr_05/8CE070/func_8024130C_8CF37C.s | 2 +- .../kmr_06/8D1510/func_80240BDC_8D20EC.s | 34 ------------------- .../kmr_06/8D1510/func_8024130C_8D281C.s | 2 +- .../kmr_09/8D5E00/func_80240BDC_8D69DC.s | 34 ------------------- .../kmr_09/8D5E00/func_8024130C_8D710C.s | 2 +- .../kzn_02/C5AC20/func_802410BC_C5B7FC.s | 34 ------------------- .../kzn_02/C5AC20/func_802417EC_C5BF2C.s | 2 +- .../kzn_02/C5AC20/func_80241DE4_C5C524.s | 2 +- .../kzn_07/C6EA50/func_802413FC_C6F72C.s | 34 ------------------- .../kzn_07/C6EA50/func_80241B2C_C6FE5C.s | 2 +- .../kzn_07/C6EA50/func_80242124_C70454.s | 2 +- .../kzn_08/C71ED0/func_8024162C_C72AAC.s | 34 ------------------- .../kzn_08/C71ED0/func_80241D5C_C731DC.s | 2 +- .../kzn_08/C71ED0/func_80242354_C737D4.s | 2 +- .../kzn_11/C80600/func_8024103C_C811DC.s | 34 ------------------- .../kzn_11/C80600/func_8024176C_C8190C.s | 2 +- .../kzn_11/C80600/func_80241D64_C81F04.s | 2 +- .../mim_08/BAD940/func_80240C7C_BAE5BC.s | 34 ------------------- .../mim_08/BAD940/func_802413AC_BAECEC.s | 2 +- .../nok_11/9F4A40/func_802413B0_9F5DF0.s | 34 ------------------- .../nok_11/9F4A40/func_80241AE0_9F6520.s | 2 +- .../nok_14/A02A00/func_80241570_A03DB0.s | 34 ------------------- .../nok_14/A02A00/func_80241CA0_A044E0.s | 2 +- .../nok_14/A02A00/func_802421CC_A04A0C.s | 2 +- .../nok_15/A06F00/func_80241690_A08590.s | 34 ------------------- .../nok_15/A06F00/func_80241DC0_A08CC0.s | 2 +- .../nok_15/A06F00/func_802422EC_A091EC.s | 2 +- .../omo_04/DAD400/func_80240F7C_DAE37C.s | 34 ------------------- .../omo_04/DAD400/func_802416AC_DAEAAC.s | 2 +- .../omo_05/DB22C0/func_80241630_DB38F0.s | 34 ------------------- .../omo_05/DB22C0/func_80241D60_DB4020.s | 2 +- .../omo_07/DBD2B0/func_80242554_DBF804.s | 34 ------------------- .../omo_07/DBD2B0/func_80242C84_DBFF34.s | 2 +- .../omo_17/DEF400/func_80241B90_DF0A30.s | 34 ------------------- .../omo_17/DEF400/func_802422C0_DF1160.s | 2 +- .../sam_06/D203E0/func_8024112C_D20FBC.s | 34 ------------------- .../sam_06/D203E0/func_8024185C_D216EC.s | 2 +- .../tik_07/87AC00/func_80241FCC_87BBAC.s | 34 ------------------- .../tik_07/87AC00/func_802426FC_87C2DC.s | 10 +++--- .../trd_04/9A88A0/func_802429F4_9AADE4.s | 34 ------------------- .../trd_04/9A88A0/func_80243124_9AB514.s | 2 +- .../trd_04/9A88A0/func_80243650_9ABA40.s | 2 +- .../trd_07/9B6C90/func_802416C0_9B8040.s | 34 ------------------- .../trd_07/9B6C90/func_80241DF0_9B8770.s | 2 +- .../trd_07/9B6C90/func_8024231C_9B8C9C.s | 2 +- src/code_20ec0_len_5040.c | 2 +- src/world/area_arn/arn_04/BE37B0.c | 2 +- src/world/area_arn/arn_07/BED740.c | 2 +- src/world/area_dgb/dgb_01/BFD9A0.c | 2 +- src/world/area_dgb/dgb_04/C36530.c | 2 +- src/world/area_dgb/dgb_08/C3FDB0.c | 2 +- src/world/area_dgb/dgb_09/C46BE0.c | 2 +- src/world/area_flo/flo_09/CB5320.c | 2 +- src/world/area_flo/flo_13/CC3850.c | 2 +- src/world/area_flo/flo_14/CCBE20.c | 2 +- src/world/area_flo/flo_16/CD2C80.c | 2 +- src/world/area_flo/flo_17/CD7350.c | 2 +- src/world/area_flo/flo_25/CF2C10.c | 2 +- src/world/area_hos/hos_02/A17210.c | 2 +- src/world/area_hos/hos_03/A1BDB0.c | 2 +- src/world/area_kmr/kmr_05/8CE070.c | 2 +- src/world/area_kmr/kmr_06/8D1510.c | 2 +- src/world/area_kmr/kmr_09/8D5E00.c | 2 +- src/world/area_kzn/kzn_02/C5AC20.c | 2 +- src/world/area_kzn/kzn_07/C6EA50.c | 2 +- src/world/area_kzn/kzn_08/C71ED0.c | 2 +- src/world/area_kzn/kzn_11/C80600.c | 2 +- src/world/area_mim/mim_08/BAD940.c | 2 +- src/world/area_nok/nok_11/9F4A40.c | 2 +- src/world/area_nok/nok_14/A02A00.c | 2 +- src/world/area_nok/nok_15/A06F00.c | 2 +- src/world/area_omo/omo_04/DAD400.c | 2 +- src/world/area_omo/omo_05/DB22C0.c | 2 +- src/world/area_omo/omo_07/DBD2B0.c | 2 +- src/world/area_omo/omo_17/DEF400.c | 2 +- src/world/area_sam/sam_06/D203E0.c | 2 +- src/world/area_tik/tik_07/87AC00.c | 2 +- src/world/area_trd/trd_04/9A88A0.c | 2 +- src/world/area_trd/trd_07/9B6C90.c | 2 +- src/world/common/NpcJumpFunc.inc.c | 2 +- src/world/common/UnkNpcAIFunc1.inc.c | 2 +- src/world/common/UnkNpcAIFunc2.inc.c | 13 +++++++ 114 files changed, 97 insertions(+), 1206 deletions(-) delete mode 100644 asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241A6C_BE521C.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_07/BED740/func_8024152C_BEE31C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240CFC_BFE57C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240BDC_C3710C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024233C_C420EC.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242000_C48BE0.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240EFC_CB5EFC.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240DA0_CC45B0.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802416EC_CCC9FC.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241A2C_CD385C.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240C4C_CD7F2C.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240C1C_CF37EC.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241BCC_A17DEC.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024188C_A1C98C.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240BDC_8CEC4C.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240BDC_8D20EC.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240BDC_8D69DC.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802410BC_C5B7FC.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802413FC_C6F72C.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_8024162C_C72AAC.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024103C_C811DC.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240C7C_BAE5BC.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802413B0_9F5DF0.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241570_A03DB0.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241690_A08590.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240F7C_DAE37C.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241630_DB38F0.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242554_DBF804.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241B90_DF0A30.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024112C_D20FBC.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241FCC_87BBAC.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802429F4_9AADE4.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802416C0_9B8040.s create mode 100644 src/world/common/UnkNpcAIFunc2.inc.c diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241A6C_BE521C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241A6C_BE521C.s deleted file mode 100644 index ada6b40866..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241A6C_BE521C.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A6C_BE521C -/* BE521C 80241A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE5220 80241A70 AFB20018 */ sw $s2, 0x18($sp) -/* BE5224 80241A74 0080902D */ daddu $s2, $a0, $zero -/* BE5228 80241A78 AFBF001C */ sw $ra, 0x1c($sp) -/* BE522C 80241A7C AFB10014 */ sw $s1, 0x14($sp) -/* BE5230 80241A80 AFB00010 */ sw $s0, 0x10($sp) -/* BE5234 80241A84 8E510148 */ lw $s1, 0x148($s2) -/* BE5238 80241A88 0C00EABB */ jal get_npc_unsafe -/* BE523C 80241A8C 86240008 */ lh $a0, 8($s1) -/* BE5240 80241A90 0040802D */ daddu $s0, $v0, $zero -/* BE5244 80241A94 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BE5248 80241A98 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BE524C 80241A9C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE5250 80241AA0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE5254 80241AA4 A600008E */ sh $zero, 0x8e($s0) -/* BE5258 80241AA8 8C460028 */ lw $a2, 0x28($v0) -/* BE525C 80241AAC 0C00A720 */ jal atan2 -/* BE5260 80241AB0 8C470030 */ lw $a3, 0x30($v0) -/* BE5264 80241AB4 E600000C */ swc1 $f0, 0xc($s0) -/* BE5268 80241AB8 8E2200CC */ lw $v0, 0xcc($s1) -/* BE526C 80241ABC 8C420020 */ lw $v0, 0x20($v0) -/* BE5270 80241AC0 AE020028 */ sw $v0, 0x28($s0) -/* BE5274 80241AC4 2402000B */ addiu $v0, $zero, 0xb -/* BE5278 80241AC8 AE420070 */ sw $v0, 0x70($s2) -/* BE527C 80241ACC 8FBF001C */ lw $ra, 0x1c($sp) -/* BE5280 80241AD0 8FB20018 */ lw $s2, 0x18($sp) -/* BE5284 80241AD4 8FB10014 */ lw $s1, 0x14($sp) -/* BE5288 80241AD8 8FB00010 */ lw $s0, 0x10($sp) -/* BE528C 80241ADC 03E00008 */ jr $ra -/* BE5290 80241AE0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s index 1b867e8922..8ce09a1b30 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s @@ -93,7 +93,7 @@ glabel func_8024219C_BE594C /* BE5AA4 802422F4 0000102D */ daddu $v0, $zero, $zero /* BE5AA8 802422F8 0280202D */ daddu $a0, $s4, $zero /* BE5AAC 802422FC 0200282D */ daddu $a1, $s0, $zero -/* BE5AB0 80242300 0C09069B */ jal func_80241A6C_BE521C +/* BE5AB0 80242300 0C09069B */ jal UnkNpcAIFunc2 /* BE5AB4 80242304 0260302D */ daddu $a2, $s3, $zero /* BE5AB8 80242308 0280202D */ daddu $a0, $s4, $zero /* BE5ABC 8024230C 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_8024152C_BEE31C.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_8024152C_BEE31C.s deleted file mode 100644 index 19e5dba3a4..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_8024152C_BEE31C.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024152C_BEE31C -/* BEE31C 8024152C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BEE320 80241530 AFB20018 */ sw $s2, 0x18($sp) -/* BEE324 80241534 0080902D */ daddu $s2, $a0, $zero -/* BEE328 80241538 AFBF001C */ sw $ra, 0x1c($sp) -/* BEE32C 8024153C AFB10014 */ sw $s1, 0x14($sp) -/* BEE330 80241540 AFB00010 */ sw $s0, 0x10($sp) -/* BEE334 80241544 8E510148 */ lw $s1, 0x148($s2) -/* BEE338 80241548 0C00EABB */ jal get_npc_unsafe -/* BEE33C 8024154C 86240008 */ lh $a0, 8($s1) -/* BEE340 80241550 0040802D */ daddu $s0, $v0, $zero -/* BEE344 80241554 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BEE348 80241558 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BEE34C 8024155C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BEE350 80241560 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BEE354 80241564 A600008E */ sh $zero, 0x8e($s0) -/* BEE358 80241568 8C460028 */ lw $a2, 0x28($v0) -/* BEE35C 8024156C 0C00A720 */ jal atan2 -/* BEE360 80241570 8C470030 */ lw $a3, 0x30($v0) -/* BEE364 80241574 E600000C */ swc1 $f0, 0xc($s0) -/* BEE368 80241578 8E2200CC */ lw $v0, 0xcc($s1) -/* BEE36C 8024157C 8C420020 */ lw $v0, 0x20($v0) -/* BEE370 80241580 AE020028 */ sw $v0, 0x28($s0) -/* BEE374 80241584 2402000B */ addiu $v0, $zero, 0xb -/* BEE378 80241588 AE420070 */ sw $v0, 0x70($s2) -/* BEE37C 8024158C 8FBF001C */ lw $ra, 0x1c($sp) -/* BEE380 80241590 8FB20018 */ lw $s2, 0x18($sp) -/* BEE384 80241594 8FB10014 */ lw $s1, 0x14($sp) -/* BEE388 80241598 8FB00010 */ lw $s0, 0x10($sp) -/* BEE38C 8024159C 03E00008 */ jr $ra -/* BEE390 802415A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s index 39f944220f..4fea933a15 100644 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s +++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s @@ -93,7 +93,7 @@ glabel func_80241C5C_BEEA4C /* BEEBA4 80241DB4 0000102D */ daddu $v0, $zero, $zero /* BEEBA8 80241DB8 0280202D */ daddu $a0, $s4, $zero /* BEEBAC 80241DBC 0200282D */ daddu $a1, $s0, $zero -/* BEEBB0 80241DC0 0C09054B */ jal func_8024152C_BEE31C +/* BEEBB0 80241DC0 0C09054B */ jal UnkNpcAIFunc2 /* BEEBB4 80241DC4 0260302D */ daddu $a2, $s3, $zero /* BEEBB8 80241DC8 0280202D */ daddu $a0, $s4, $zero /* BEEBBC 80241DCC 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240CFC_BFE57C.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240CFC_BFE57C.s deleted file mode 100644 index aa45b2ea69..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240CFC_BFE57C.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CFC_BFE57C -/* BFE57C 80240CFC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BFE580 80240D00 AFB20018 */ sw $s2, 0x18($sp) -/* BFE584 80240D04 0080902D */ daddu $s2, $a0, $zero -/* BFE588 80240D08 AFBF001C */ sw $ra, 0x1c($sp) -/* BFE58C 80240D0C AFB10014 */ sw $s1, 0x14($sp) -/* BFE590 80240D10 AFB00010 */ sw $s0, 0x10($sp) -/* BFE594 80240D14 8E510148 */ lw $s1, 0x148($s2) -/* BFE598 80240D18 0C00EABB */ jal get_npc_unsafe -/* BFE59C 80240D1C 86240008 */ lh $a0, 8($s1) -/* BFE5A0 80240D20 0040802D */ daddu $s0, $v0, $zero -/* BFE5A4 80240D24 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BFE5A8 80240D28 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BFE5AC 80240D2C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BFE5B0 80240D30 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BFE5B4 80240D34 A600008E */ sh $zero, 0x8e($s0) -/* BFE5B8 80240D38 8C460028 */ lw $a2, 0x28($v0) -/* BFE5BC 80240D3C 0C00A720 */ jal atan2 -/* BFE5C0 80240D40 8C470030 */ lw $a3, 0x30($v0) -/* BFE5C4 80240D44 E600000C */ swc1 $f0, 0xc($s0) -/* BFE5C8 80240D48 8E2200CC */ lw $v0, 0xcc($s1) -/* BFE5CC 80240D4C 8C420020 */ lw $v0, 0x20($v0) -/* BFE5D0 80240D50 AE020028 */ sw $v0, 0x28($s0) -/* BFE5D4 80240D54 2402000B */ addiu $v0, $zero, 0xb -/* BFE5D8 80240D58 AE420070 */ sw $v0, 0x70($s2) -/* BFE5DC 80240D5C 8FBF001C */ lw $ra, 0x1c($sp) -/* BFE5E0 80240D60 8FB20018 */ lw $s2, 0x18($sp) -/* BFE5E4 80240D64 8FB10014 */ lw $s1, 0x14($sp) -/* BFE5E8 80240D68 8FB00010 */ lw $s0, 0x10($sp) -/* BFE5EC 80240D6C 03E00008 */ jr $ra -/* BFE5F0 80240D70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s index e99604a777..115692bf36 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s @@ -93,7 +93,7 @@ glabel func_8024142C_BFECAC /* BFEE04 80241584 0000102D */ daddu $v0, $zero, $zero /* BFEE08 80241588 0280202D */ daddu $a0, $s4, $zero /* BFEE0C 8024158C 0200282D */ daddu $a1, $s0, $zero -/* BFEE10 80241590 0C09033F */ jal func_80240CFC_BFE57C +/* BFEE10 80241590 0C09033F */ jal UnkNpcAIFunc2 /* BFEE14 80241594 0260302D */ daddu $a2, $s3, $zero /* BFEE18 80241598 0280202D */ daddu $a0, $s4, $zero /* BFEE1C 8024159C 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240BDC_C3710C.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240BDC_C3710C.s deleted file mode 100644 index 1543aa3ea0..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240BDC_C3710C.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BDC_C3710C -/* C3710C 80240BDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C37110 80240BE0 AFB20018 */ sw $s2, 0x18($sp) -/* C37114 80240BE4 0080902D */ daddu $s2, $a0, $zero -/* C37118 80240BE8 AFBF001C */ sw $ra, 0x1c($sp) -/* C3711C 80240BEC AFB10014 */ sw $s1, 0x14($sp) -/* C37120 80240BF0 AFB00010 */ sw $s0, 0x10($sp) -/* C37124 80240BF4 8E510148 */ lw $s1, 0x148($s2) -/* C37128 80240BF8 0C00EABB */ jal get_npc_unsafe -/* C3712C 80240BFC 86240008 */ lh $a0, 8($s1) -/* C37130 80240C00 0040802D */ daddu $s0, $v0, $zero -/* C37134 80240C04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C37138 80240C08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3713C 80240C0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C37140 80240C10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C37144 80240C14 A600008E */ sh $zero, 0x8e($s0) -/* C37148 80240C18 8C460028 */ lw $a2, 0x28($v0) -/* C3714C 80240C1C 0C00A720 */ jal atan2 -/* C37150 80240C20 8C470030 */ lw $a3, 0x30($v0) -/* C37154 80240C24 E600000C */ swc1 $f0, 0xc($s0) -/* C37158 80240C28 8E2200CC */ lw $v0, 0xcc($s1) -/* C3715C 80240C2C 8C420020 */ lw $v0, 0x20($v0) -/* C37160 80240C30 AE020028 */ sw $v0, 0x28($s0) -/* C37164 80240C34 2402000B */ addiu $v0, $zero, 0xb -/* C37168 80240C38 AE420070 */ sw $v0, 0x70($s2) -/* C3716C 80240C3C 8FBF001C */ lw $ra, 0x1c($sp) -/* C37170 80240C40 8FB20018 */ lw $s2, 0x18($sp) -/* C37174 80240C44 8FB10014 */ lw $s1, 0x14($sp) -/* C37178 80240C48 8FB00010 */ lw $s0, 0x10($sp) -/* C3717C 80240C4C 03E00008 */ jr $ra -/* C37180 80240C50 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s index 33afb564f2..c3f7bfe8a8 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s @@ -93,7 +93,7 @@ glabel func_8024130C_C3783C /* C37994 80241464 0000102D */ daddu $v0, $zero, $zero /* C37998 80241468 0280202D */ daddu $a0, $s4, $zero /* C3799C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* C379A0 80241470 0C0902F7 */ jal func_80240BDC_C3710C +/* C379A0 80241470 0C0902F7 */ jal UnkNpcAIFunc2 /* C379A4 80241474 0260302D */ daddu $a2, $s3, $zero /* C379A8 80241478 0280202D */ daddu $a0, $s4, $zero /* C379AC 8024147C 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024233C_C420EC.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024233C_C420EC.s deleted file mode 100644 index 494dc33084..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024233C_C420EC.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024233C_C420EC -/* C420EC 8024233C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C420F0 80242340 AFB20018 */ sw $s2, 0x18($sp) -/* C420F4 80242344 0080902D */ daddu $s2, $a0, $zero -/* C420F8 80242348 AFBF001C */ sw $ra, 0x1c($sp) -/* C420FC 8024234C AFB10014 */ sw $s1, 0x14($sp) -/* C42100 80242350 AFB00010 */ sw $s0, 0x10($sp) -/* C42104 80242354 8E510148 */ lw $s1, 0x148($s2) -/* C42108 80242358 0C00EABB */ jal get_npc_unsafe -/* C4210C 8024235C 86240008 */ lh $a0, 8($s1) -/* C42110 80242360 0040802D */ daddu $s0, $v0, $zero -/* C42114 80242364 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C42118 80242368 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C4211C 8024236C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C42120 80242370 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C42124 80242374 A600008E */ sh $zero, 0x8e($s0) -/* C42128 80242378 8C460028 */ lw $a2, 0x28($v0) -/* C4212C 8024237C 0C00A720 */ jal atan2 -/* C42130 80242380 8C470030 */ lw $a3, 0x30($v0) -/* C42134 80242384 E600000C */ swc1 $f0, 0xc($s0) -/* C42138 80242388 8E2200CC */ lw $v0, 0xcc($s1) -/* C4213C 8024238C 8C420020 */ lw $v0, 0x20($v0) -/* C42140 80242390 AE020028 */ sw $v0, 0x28($s0) -/* C42144 80242394 2402000B */ addiu $v0, $zero, 0xb -/* C42148 80242398 AE420070 */ sw $v0, 0x70($s2) -/* C4214C 8024239C 8FBF001C */ lw $ra, 0x1c($sp) -/* C42150 802423A0 8FB20018 */ lw $s2, 0x18($sp) -/* C42154 802423A4 8FB10014 */ lw $s1, 0x14($sp) -/* C42158 802423A8 8FB00010 */ lw $s0, 0x10($sp) -/* C4215C 802423AC 03E00008 */ jr $ra -/* C42160 802423B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s index 567f46d189..26f9e61aba 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s @@ -93,7 +93,7 @@ glabel func_80242A6C_C4281C /* C42974 80242BC4 0000102D */ daddu $v0, $zero, $zero /* C42978 80242BC8 0280202D */ daddu $a0, $s4, $zero /* C4297C 80242BCC 0200282D */ daddu $a1, $s0, $zero -/* C42980 80242BD0 0C0908CF */ jal func_8024233C_C420EC +/* C42980 80242BD0 0C0908CF */ jal UnkNpcAIFunc2 /* C42984 80242BD4 0260302D */ daddu $a2, $s3, $zero /* C42988 80242BD8 0280202D */ daddu $a0, $s4, $zero /* C4298C 80242BDC 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242000_C48BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242000_C48BE0.s deleted file mode 100644 index 63c813b6ff..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242000_C48BE0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242000_C48BE0 -/* C48BE0 80242000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C48BE4 80242004 AFB20018 */ sw $s2, 0x18($sp) -/* C48BE8 80242008 0080902D */ daddu $s2, $a0, $zero -/* C48BEC 8024200C AFBF001C */ sw $ra, 0x1c($sp) -/* C48BF0 80242010 AFB10014 */ sw $s1, 0x14($sp) -/* C48BF4 80242014 AFB00010 */ sw $s0, 0x10($sp) -/* C48BF8 80242018 8E510148 */ lw $s1, 0x148($s2) -/* C48BFC 8024201C 0C00EABB */ jal get_npc_unsafe -/* C48C00 80242020 86240008 */ lh $a0, 8($s1) -/* C48C04 80242024 0040802D */ daddu $s0, $v0, $zero -/* C48C08 80242028 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C48C0C 8024202C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C48C10 80242030 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C48C14 80242034 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C48C18 80242038 A600008E */ sh $zero, 0x8e($s0) -/* C48C1C 8024203C 8C460028 */ lw $a2, 0x28($v0) -/* C48C20 80242040 0C00A720 */ jal atan2 -/* C48C24 80242044 8C470030 */ lw $a3, 0x30($v0) -/* C48C28 80242048 E600000C */ swc1 $f0, 0xc($s0) -/* C48C2C 8024204C 8E2200CC */ lw $v0, 0xcc($s1) -/* C48C30 80242050 8C420020 */ lw $v0, 0x20($v0) -/* C48C34 80242054 AE020028 */ sw $v0, 0x28($s0) -/* C48C38 80242058 2402000B */ addiu $v0, $zero, 0xb -/* C48C3C 8024205C AE420070 */ sw $v0, 0x70($s2) -/* C48C40 80242060 8FBF001C */ lw $ra, 0x1c($sp) -/* C48C44 80242064 8FB20018 */ lw $s2, 0x18($sp) -/* C48C48 80242068 8FB10014 */ lw $s1, 0x14($sp) -/* C48C4C 8024206C 8FB00010 */ lw $s0, 0x10($sp) -/* C48C50 80242070 03E00008 */ jr $ra -/* C48C54 80242074 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s index 3fcca2692b..0ab0a00af2 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s @@ -93,7 +93,7 @@ glabel func_80242730_C49310 /* C49468 80242888 0000102D */ daddu $v0, $zero, $zero /* C4946C 8024288C 0280202D */ daddu $a0, $s4, $zero /* C49470 80242890 0200282D */ daddu $a1, $s0, $zero -/* C49474 80242894 0C090800 */ jal func_80242000_C48BE0 +/* C49474 80242894 0C090800 */ jal UnkNpcAIFunc2 /* C49478 80242898 0260302D */ daddu $a2, $s3, $zero /* C4947C 8024289C 0280202D */ daddu $a0, $s4, $zero /* C49480 802428A0 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240EFC_CB5EFC.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240EFC_CB5EFC.s deleted file mode 100644 index d1850a6443..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240EFC_CB5EFC.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EFC_CB5EFC -/* CB5EFC 80240EFC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CB5F00 80240F00 AFB20018 */ sw $s2, 0x18($sp) -/* CB5F04 80240F04 0080902D */ daddu $s2, $a0, $zero -/* CB5F08 80240F08 AFBF001C */ sw $ra, 0x1c($sp) -/* CB5F0C 80240F0C AFB10014 */ sw $s1, 0x14($sp) -/* CB5F10 80240F10 AFB00010 */ sw $s0, 0x10($sp) -/* CB5F14 80240F14 8E510148 */ lw $s1, 0x148($s2) -/* CB5F18 80240F18 0C00EABB */ jal get_npc_unsafe -/* CB5F1C 80240F1C 86240008 */ lh $a0, 8($s1) -/* CB5F20 80240F20 0040802D */ daddu $s0, $v0, $zero -/* CB5F24 80240F24 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CB5F28 80240F28 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CB5F2C 80240F2C C60C0038 */ lwc1 $f12, 0x38($s0) -/* CB5F30 80240F30 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CB5F34 80240F34 A600008E */ sh $zero, 0x8e($s0) -/* CB5F38 80240F38 8C460028 */ lw $a2, 0x28($v0) -/* CB5F3C 80240F3C 0C00A720 */ jal atan2 -/* CB5F40 80240F40 8C470030 */ lw $a3, 0x30($v0) -/* CB5F44 80240F44 E600000C */ swc1 $f0, 0xc($s0) -/* CB5F48 80240F48 8E2200CC */ lw $v0, 0xcc($s1) -/* CB5F4C 80240F4C 8C420020 */ lw $v0, 0x20($v0) -/* CB5F50 80240F50 AE020028 */ sw $v0, 0x28($s0) -/* CB5F54 80240F54 2402000B */ addiu $v0, $zero, 0xb -/* CB5F58 80240F58 AE420070 */ sw $v0, 0x70($s2) -/* CB5F5C 80240F5C 8FBF001C */ lw $ra, 0x1c($sp) -/* CB5F60 80240F60 8FB20018 */ lw $s2, 0x18($sp) -/* CB5F64 80240F64 8FB10014 */ lw $s1, 0x14($sp) -/* CB5F68 80240F68 8FB00010 */ lw $s0, 0x10($sp) -/* CB5F6C 80240F6C 03E00008 */ jr $ra -/* CB5F70 80240F70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s index 1cd6689ef8..56186ee1eb 100644 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s @@ -93,7 +93,7 @@ glabel func_8024162C_CB662C /* CB6784 80241784 0000102D */ daddu $v0, $zero, $zero /* CB6788 80241788 0280202D */ daddu $a0, $s4, $zero /* CB678C 8024178C 0200282D */ daddu $a1, $s0, $zero -/* CB6790 80241790 0C0903BF */ jal func_80240EFC_CB5EFC +/* CB6790 80241790 0C0903BF */ jal UnkNpcAIFunc2 /* CB6794 80241794 0260302D */ daddu $a2, $s3, $zero /* CB6798 80241798 0280202D */ daddu $a0, $s4, $zero /* CB679C 8024179C 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240DA0_CC45B0.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240DA0_CC45B0.s deleted file mode 100644 index cab6bafc1a..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240DA0_CC45B0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DA0_CC45B0 -/* CC45B0 80240DA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CC45B4 80240DA4 AFB20018 */ sw $s2, 0x18($sp) -/* CC45B8 80240DA8 0080902D */ daddu $s2, $a0, $zero -/* CC45BC 80240DAC AFBF001C */ sw $ra, 0x1c($sp) -/* CC45C0 80240DB0 AFB10014 */ sw $s1, 0x14($sp) -/* CC45C4 80240DB4 AFB00010 */ sw $s0, 0x10($sp) -/* CC45C8 80240DB8 8E510148 */ lw $s1, 0x148($s2) -/* CC45CC 80240DBC 0C00EABB */ jal get_npc_unsafe -/* CC45D0 80240DC0 86240008 */ lh $a0, 8($s1) -/* CC45D4 80240DC4 0040802D */ daddu $s0, $v0, $zero -/* CC45D8 80240DC8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CC45DC 80240DCC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CC45E0 80240DD0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CC45E4 80240DD4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CC45E8 80240DD8 A600008E */ sh $zero, 0x8e($s0) -/* CC45EC 80240DDC 8C460028 */ lw $a2, 0x28($v0) -/* CC45F0 80240DE0 0C00A720 */ jal atan2 -/* CC45F4 80240DE4 8C470030 */ lw $a3, 0x30($v0) -/* CC45F8 80240DE8 E600000C */ swc1 $f0, 0xc($s0) -/* CC45FC 80240DEC 8E2200CC */ lw $v0, 0xcc($s1) -/* CC4600 80240DF0 8C420020 */ lw $v0, 0x20($v0) -/* CC4604 80240DF4 AE020028 */ sw $v0, 0x28($s0) -/* CC4608 80240DF8 2402000B */ addiu $v0, $zero, 0xb -/* CC460C 80240DFC AE420070 */ sw $v0, 0x70($s2) -/* CC4610 80240E00 8FBF001C */ lw $ra, 0x1c($sp) -/* CC4614 80240E04 8FB20018 */ lw $s2, 0x18($sp) -/* CC4618 80240E08 8FB10014 */ lw $s1, 0x14($sp) -/* CC461C 80240E0C 8FB00010 */ lw $s0, 0x10($sp) -/* CC4620 80240E10 03E00008 */ jr $ra -/* CC4624 80240E14 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s index 0279dfb3dd..2612d201ee 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s @@ -93,7 +93,7 @@ glabel func_802414D0_CC4CE0 /* CC4E38 80241628 0000102D */ daddu $v0, $zero, $zero /* CC4E3C 8024162C 0280202D */ daddu $a0, $s4, $zero /* CC4E40 80241630 0200282D */ daddu $a1, $s0, $zero -/* CC4E44 80241634 0C090368 */ jal func_80240DA0_CC45B0 +/* CC4E44 80241634 0C090368 */ jal UnkNpcAIFunc2 /* CC4E48 80241638 0260302D */ daddu $a2, $s3, $zero /* CC4E4C 8024163C 0280202D */ daddu $a0, $s4, $zero /* CC4E50 80241640 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802416EC_CCC9FC.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802416EC_CCC9FC.s deleted file mode 100644 index b102d88416..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802416EC_CCC9FC.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416EC_CCC9FC -/* CCC9FC 802416EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CCCA00 802416F0 AFB20018 */ sw $s2, 0x18($sp) -/* CCCA04 802416F4 0080902D */ daddu $s2, $a0, $zero -/* CCCA08 802416F8 AFBF001C */ sw $ra, 0x1c($sp) -/* CCCA0C 802416FC AFB10014 */ sw $s1, 0x14($sp) -/* CCCA10 80241700 AFB00010 */ sw $s0, 0x10($sp) -/* CCCA14 80241704 8E510148 */ lw $s1, 0x148($s2) -/* CCCA18 80241708 0C00EABB */ jal get_npc_unsafe -/* CCCA1C 8024170C 86240008 */ lh $a0, 8($s1) -/* CCCA20 80241710 0040802D */ daddu $s0, $v0, $zero -/* CCCA24 80241714 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CCCA28 80241718 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CCCA2C 8024171C C60C0038 */ lwc1 $f12, 0x38($s0) -/* CCCA30 80241720 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CCCA34 80241724 A600008E */ sh $zero, 0x8e($s0) -/* CCCA38 80241728 8C460028 */ lw $a2, 0x28($v0) -/* CCCA3C 8024172C 0C00A720 */ jal atan2 -/* CCCA40 80241730 8C470030 */ lw $a3, 0x30($v0) -/* CCCA44 80241734 E600000C */ swc1 $f0, 0xc($s0) -/* CCCA48 80241738 8E2200CC */ lw $v0, 0xcc($s1) -/* CCCA4C 8024173C 8C420020 */ lw $v0, 0x20($v0) -/* CCCA50 80241740 AE020028 */ sw $v0, 0x28($s0) -/* CCCA54 80241744 2402000B */ addiu $v0, $zero, 0xb -/* CCCA58 80241748 AE420070 */ sw $v0, 0x70($s2) -/* CCCA5C 8024174C 8FBF001C */ lw $ra, 0x1c($sp) -/* CCCA60 80241750 8FB20018 */ lw $s2, 0x18($sp) -/* CCCA64 80241754 8FB10014 */ lw $s1, 0x14($sp) -/* CCCA68 80241758 8FB00010 */ lw $s0, 0x10($sp) -/* CCCA6C 8024175C 03E00008 */ jr $ra -/* CCCA70 80241760 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s index 98cba12bb3..8187678829 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s @@ -93,7 +93,7 @@ glabel func_80241E1C_CCD12C /* CCD284 80241F74 0000102D */ daddu $v0, $zero, $zero /* CCD288 80241F78 0280202D */ daddu $a0, $s4, $zero /* CCD28C 80241F7C 0200282D */ daddu $a1, $s0, $zero -/* CCD290 80241F80 0C0905BB */ jal func_802416EC_CCC9FC +/* CCD290 80241F80 0C0905BB */ jal UnkNpcAIFunc2 /* CCD294 80241F84 0260302D */ daddu $a2, $s3, $zero /* CCD298 80241F88 0280202D */ daddu $a0, $s4, $zero /* CCD29C 80241F8C 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241A2C_CD385C.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241A2C_CD385C.s deleted file mode 100644 index 8a07fc3aa9..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241A2C_CD385C.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A2C_CD385C -/* CD385C 80241A2C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CD3860 80241A30 AFB20018 */ sw $s2, 0x18($sp) -/* CD3864 80241A34 0080902D */ daddu $s2, $a0, $zero -/* CD3868 80241A38 AFBF001C */ sw $ra, 0x1c($sp) -/* CD386C 80241A3C AFB10014 */ sw $s1, 0x14($sp) -/* CD3870 80241A40 AFB00010 */ sw $s0, 0x10($sp) -/* CD3874 80241A44 8E510148 */ lw $s1, 0x148($s2) -/* CD3878 80241A48 0C00EABB */ jal get_npc_unsafe -/* CD387C 80241A4C 86240008 */ lh $a0, 8($s1) -/* CD3880 80241A50 0040802D */ daddu $s0, $v0, $zero -/* CD3884 80241A54 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD3888 80241A58 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD388C 80241A5C C60C0038 */ lwc1 $f12, 0x38($s0) -/* CD3890 80241A60 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CD3894 80241A64 A600008E */ sh $zero, 0x8e($s0) -/* CD3898 80241A68 8C460028 */ lw $a2, 0x28($v0) -/* CD389C 80241A6C 0C00A720 */ jal atan2 -/* CD38A0 80241A70 8C470030 */ lw $a3, 0x30($v0) -/* CD38A4 80241A74 E600000C */ swc1 $f0, 0xc($s0) -/* CD38A8 80241A78 8E2200CC */ lw $v0, 0xcc($s1) -/* CD38AC 80241A7C 8C420020 */ lw $v0, 0x20($v0) -/* CD38B0 80241A80 AE020028 */ sw $v0, 0x28($s0) -/* CD38B4 80241A84 2402000B */ addiu $v0, $zero, 0xb -/* CD38B8 80241A88 AE420070 */ sw $v0, 0x70($s2) -/* CD38BC 80241A8C 8FBF001C */ lw $ra, 0x1c($sp) -/* CD38C0 80241A90 8FB20018 */ lw $s2, 0x18($sp) -/* CD38C4 80241A94 8FB10014 */ lw $s1, 0x14($sp) -/* CD38C8 80241A98 8FB00010 */ lw $s0, 0x10($sp) -/* CD38CC 80241A9C 03E00008 */ jr $ra -/* CD38D0 80241AA0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s index 0270f003b5..1022ef51c5 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s @@ -93,7 +93,7 @@ glabel func_8024215C_CD3F8C /* CD40E4 802422B4 0000102D */ daddu $v0, $zero, $zero /* CD40E8 802422B8 0280202D */ daddu $a0, $s4, $zero /* CD40EC 802422BC 0200282D */ daddu $a1, $s0, $zero -/* CD40F0 802422C0 0C09068B */ jal func_80241A2C_CD385C +/* CD40F0 802422C0 0C09068B */ jal UnkNpcAIFunc2 /* CD40F4 802422C4 0260302D */ daddu $a2, $s3, $zero /* CD40F8 802422C8 0280202D */ daddu $a0, $s4, $zero /* CD40FC 802422CC 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s index ecd9ac5a82..624bb7e93c 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s @@ -94,7 +94,7 @@ glabel func_80242754_CD4584 /* CD46E0 802428B0 0000102D */ daddu $v0, $zero, $zero /* CD46E4 802428B4 0280202D */ daddu $a0, $s4, $zero /* CD46E8 802428B8 0200282D */ daddu $a1, $s0, $zero -/* CD46EC 802428BC 0C09068B */ jal func_80241A2C_CD385C +/* CD46EC 802428BC 0C09068B */ jal UnkNpcAIFunc2 /* CD46F0 802428C0 0260302D */ daddu $a2, $s3, $zero /* CD46F4 802428C4 0280202D */ daddu $a0, $s4, $zero /* CD46F8 802428C8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240C4C_CD7F2C.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240C4C_CD7F2C.s deleted file mode 100644 index b962d08171..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240C4C_CD7F2C.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_CD7F2C -/* CD7F2C 80240C4C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CD7F30 80240C50 AFB20018 */ sw $s2, 0x18($sp) -/* CD7F34 80240C54 0080902D */ daddu $s2, $a0, $zero -/* CD7F38 80240C58 AFBF001C */ sw $ra, 0x1c($sp) -/* CD7F3C 80240C5C AFB10014 */ sw $s1, 0x14($sp) -/* CD7F40 80240C60 AFB00010 */ sw $s0, 0x10($sp) -/* CD7F44 80240C64 8E510148 */ lw $s1, 0x148($s2) -/* CD7F48 80240C68 0C00EABB */ jal get_npc_unsafe -/* CD7F4C 80240C6C 86240008 */ lh $a0, 8($s1) -/* CD7F50 80240C70 0040802D */ daddu $s0, $v0, $zero -/* CD7F54 80240C74 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD7F58 80240C78 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD7F5C 80240C7C C60C0038 */ lwc1 $f12, 0x38($s0) -/* CD7F60 80240C80 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CD7F64 80240C84 A600008E */ sh $zero, 0x8e($s0) -/* CD7F68 80240C88 8C460028 */ lw $a2, 0x28($v0) -/* CD7F6C 80240C8C 0C00A720 */ jal atan2 -/* CD7F70 80240C90 8C470030 */ lw $a3, 0x30($v0) -/* CD7F74 80240C94 E600000C */ swc1 $f0, 0xc($s0) -/* CD7F78 80240C98 8E2200CC */ lw $v0, 0xcc($s1) -/* CD7F7C 80240C9C 8C420020 */ lw $v0, 0x20($v0) -/* CD7F80 80240CA0 AE020028 */ sw $v0, 0x28($s0) -/* CD7F84 80240CA4 2402000B */ addiu $v0, $zero, 0xb -/* CD7F88 80240CA8 AE420070 */ sw $v0, 0x70($s2) -/* CD7F8C 80240CAC 8FBF001C */ lw $ra, 0x1c($sp) -/* CD7F90 80240CB0 8FB20018 */ lw $s2, 0x18($sp) -/* CD7F94 80240CB4 8FB10014 */ lw $s1, 0x14($sp) -/* CD7F98 80240CB8 8FB00010 */ lw $s0, 0x10($sp) -/* CD7F9C 80240CBC 03E00008 */ jr $ra -/* CD7FA0 80240CC0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s index e959138681..9209bca312 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s @@ -93,7 +93,7 @@ glabel func_8024137C_CD865C /* CD87B4 802414D4 0000102D */ daddu $v0, $zero, $zero /* CD87B8 802414D8 0280202D */ daddu $a0, $s4, $zero /* CD87BC 802414DC 0200282D */ daddu $a1, $s0, $zero -/* CD87C0 802414E0 0C090313 */ jal func_80240C4C_CD7F2C +/* CD87C0 802414E0 0C090313 */ jal UnkNpcAIFunc2 /* CD87C4 802414E4 0260302D */ daddu $a2, $s3, $zero /* CD87C8 802414E8 0280202D */ daddu $a0, $s4, $zero /* CD87CC 802414EC 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240C1C_CF37EC.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240C1C_CF37EC.s deleted file mode 100644 index 0450f09162..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240C1C_CF37EC.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C1C_CF37EC -/* CF37EC 80240C1C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF37F0 80240C20 AFB20018 */ sw $s2, 0x18($sp) -/* CF37F4 80240C24 0080902D */ daddu $s2, $a0, $zero -/* CF37F8 80240C28 AFBF001C */ sw $ra, 0x1c($sp) -/* CF37FC 80240C2C AFB10014 */ sw $s1, 0x14($sp) -/* CF3800 80240C30 AFB00010 */ sw $s0, 0x10($sp) -/* CF3804 80240C34 8E510148 */ lw $s1, 0x148($s2) -/* CF3808 80240C38 0C00EABB */ jal get_npc_unsafe -/* CF380C 80240C3C 86240008 */ lh $a0, 8($s1) -/* CF3810 80240C40 0040802D */ daddu $s0, $v0, $zero -/* CF3814 80240C44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CF3818 80240C48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CF381C 80240C4C C60C0038 */ lwc1 $f12, 0x38($s0) -/* CF3820 80240C50 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CF3824 80240C54 A600008E */ sh $zero, 0x8e($s0) -/* CF3828 80240C58 8C460028 */ lw $a2, 0x28($v0) -/* CF382C 80240C5C 0C00A720 */ jal atan2 -/* CF3830 80240C60 8C470030 */ lw $a3, 0x30($v0) -/* CF3834 80240C64 E600000C */ swc1 $f0, 0xc($s0) -/* CF3838 80240C68 8E2200CC */ lw $v0, 0xcc($s1) -/* CF383C 80240C6C 8C420020 */ lw $v0, 0x20($v0) -/* CF3840 80240C70 AE020028 */ sw $v0, 0x28($s0) -/* CF3844 80240C74 2402000B */ addiu $v0, $zero, 0xb -/* CF3848 80240C78 AE420070 */ sw $v0, 0x70($s2) -/* CF384C 80240C7C 8FBF001C */ lw $ra, 0x1c($sp) -/* CF3850 80240C80 8FB20018 */ lw $s2, 0x18($sp) -/* CF3854 80240C84 8FB10014 */ lw $s1, 0x14($sp) -/* CF3858 80240C88 8FB00010 */ lw $s0, 0x10($sp) -/* CF385C 80240C8C 03E00008 */ jr $ra -/* CF3860 80240C90 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s index d2189b66b3..f905e30eee 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s @@ -93,7 +93,7 @@ glabel func_8024134C_CF3F1C /* CF4074 802414A4 0000102D */ daddu $v0, $zero, $zero /* CF4078 802414A8 0280202D */ daddu $a0, $s4, $zero /* CF407C 802414AC 0200282D */ daddu $a1, $s0, $zero -/* CF4080 802414B0 0C090307 */ jal func_80240C1C_CF37EC +/* CF4080 802414B0 0C090307 */ jal UnkNpcAIFunc2 /* CF4084 802414B4 0260302D */ daddu $a2, $s3, $zero /* CF4088 802414B8 0280202D */ daddu $a0, $s4, $zero /* CF408C 802414BC 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s index 1d8f02e269..e01c9fa109 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s @@ -94,7 +94,7 @@ glabel func_80241944_CF4514 /* CF4670 80241AA0 0000102D */ daddu $v0, $zero, $zero /* CF4674 80241AA4 0280202D */ daddu $a0, $s4, $zero /* CF4678 80241AA8 0200282D */ daddu $a1, $s0, $zero -/* CF467C 80241AAC 0C090307 */ jal func_80240C1C_CF37EC +/* CF467C 80241AAC 0C090307 */ jal UnkNpcAIFunc2 /* CF4680 80241AB0 0260302D */ daddu $a2, $s3, $zero /* CF4684 80241AB4 0280202D */ daddu $a0, $s4, $zero /* CF4688 80241AB8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241BCC_A17DEC.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241BCC_A17DEC.s deleted file mode 100644 index 80c4ed72f9..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241BCC_A17DEC.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BCC_A17DEC -/* A17DEC 80241BCC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A17DF0 80241BD0 AFB20018 */ sw $s2, 0x18($sp) -/* A17DF4 80241BD4 0080902D */ daddu $s2, $a0, $zero -/* A17DF8 80241BD8 AFBF001C */ sw $ra, 0x1c($sp) -/* A17DFC 80241BDC AFB10014 */ sw $s1, 0x14($sp) -/* A17E00 80241BE0 AFB00010 */ sw $s0, 0x10($sp) -/* A17E04 80241BE4 8E510148 */ lw $s1, 0x148($s2) -/* A17E08 80241BE8 0C00EABB */ jal get_npc_unsafe -/* A17E0C 80241BEC 86240008 */ lh $a0, 8($s1) -/* A17E10 80241BF0 0040802D */ daddu $s0, $v0, $zero -/* A17E14 80241BF4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A17E18 80241BF8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A17E1C 80241BFC C60C0038 */ lwc1 $f12, 0x38($s0) -/* A17E20 80241C00 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A17E24 80241C04 A600008E */ sh $zero, 0x8e($s0) -/* A17E28 80241C08 8C460028 */ lw $a2, 0x28($v0) -/* A17E2C 80241C0C 0C00A720 */ jal atan2 -/* A17E30 80241C10 8C470030 */ lw $a3, 0x30($v0) -/* A17E34 80241C14 E600000C */ swc1 $f0, 0xc($s0) -/* A17E38 80241C18 8E2200CC */ lw $v0, 0xcc($s1) -/* A17E3C 80241C1C 8C420020 */ lw $v0, 0x20($v0) -/* A17E40 80241C20 AE020028 */ sw $v0, 0x28($s0) -/* A17E44 80241C24 2402000B */ addiu $v0, $zero, 0xb -/* A17E48 80241C28 AE420070 */ sw $v0, 0x70($s2) -/* A17E4C 80241C2C 8FBF001C */ lw $ra, 0x1c($sp) -/* A17E50 80241C30 8FB20018 */ lw $s2, 0x18($sp) -/* A17E54 80241C34 8FB10014 */ lw $s1, 0x14($sp) -/* A17E58 80241C38 8FB00010 */ lw $s0, 0x10($sp) -/* A17E5C 80241C3C 03E00008 */ jr $ra -/* A17E60 80241C40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s index cbae051cc5..29e6bc64fe 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s @@ -93,7 +93,7 @@ glabel func_802422FC_A1851C /* A18674 80242454 0000102D */ daddu $v0, $zero, $zero /* A18678 80242458 0280202D */ daddu $a0, $s4, $zero /* A1867C 8024245C 0200282D */ daddu $a1, $s0, $zero -/* A18680 80242460 0C0906F3 */ jal func_80241BCC_A17DEC +/* A18680 80242460 0C0906F3 */ jal UnkNpcAIFunc2 /* A18684 80242464 0260302D */ daddu $a2, $s3, $zero /* A18688 80242468 0280202D */ daddu $a0, $s4, $zero /* A1868C 8024246C 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s index 36f8571ae7..a3ba64d495 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s @@ -94,7 +94,7 @@ glabel func_802428F4_A18B14 /* A18C70 80242A50 0000102D */ daddu $v0, $zero, $zero /* A18C74 80242A54 0280202D */ daddu $a0, $s4, $zero /* A18C78 80242A58 0200282D */ daddu $a1, $s0, $zero -/* A18C7C 80242A5C 0C0906F3 */ jal func_80241BCC_A17DEC +/* A18C7C 80242A5C 0C0906F3 */ jal UnkNpcAIFunc2 /* A18C80 80242A60 0260302D */ daddu $a2, $s3, $zero /* A18C84 80242A64 0280202D */ daddu $a0, $s4, $zero /* A18C88 80242A68 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024188C_A1C98C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024188C_A1C98C.s deleted file mode 100644 index 48edbbc2bd..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024188C_A1C98C.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024188C_A1C98C -/* A1C98C 8024188C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A1C990 80241890 AFB20018 */ sw $s2, 0x18($sp) -/* A1C994 80241894 0080902D */ daddu $s2, $a0, $zero -/* A1C998 80241898 AFBF001C */ sw $ra, 0x1c($sp) -/* A1C99C 8024189C AFB10014 */ sw $s1, 0x14($sp) -/* A1C9A0 802418A0 AFB00010 */ sw $s0, 0x10($sp) -/* A1C9A4 802418A4 8E510148 */ lw $s1, 0x148($s2) -/* A1C9A8 802418A8 0C00EABB */ jal get_npc_unsafe -/* A1C9AC 802418AC 86240008 */ lh $a0, 8($s1) -/* A1C9B0 802418B0 0040802D */ daddu $s0, $v0, $zero -/* A1C9B4 802418B4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A1C9B8 802418B8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A1C9BC 802418BC C60C0038 */ lwc1 $f12, 0x38($s0) -/* A1C9C0 802418C0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A1C9C4 802418C4 A600008E */ sh $zero, 0x8e($s0) -/* A1C9C8 802418C8 8C460028 */ lw $a2, 0x28($v0) -/* A1C9CC 802418CC 0C00A720 */ jal atan2 -/* A1C9D0 802418D0 8C470030 */ lw $a3, 0x30($v0) -/* A1C9D4 802418D4 E600000C */ swc1 $f0, 0xc($s0) -/* A1C9D8 802418D8 8E2200CC */ lw $v0, 0xcc($s1) -/* A1C9DC 802418DC 8C420020 */ lw $v0, 0x20($v0) -/* A1C9E0 802418E0 AE020028 */ sw $v0, 0x28($s0) -/* A1C9E4 802418E4 2402000B */ addiu $v0, $zero, 0xb -/* A1C9E8 802418E8 AE420070 */ sw $v0, 0x70($s2) -/* A1C9EC 802418EC 8FBF001C */ lw $ra, 0x1c($sp) -/* A1C9F0 802418F0 8FB20018 */ lw $s2, 0x18($sp) -/* A1C9F4 802418F4 8FB10014 */ lw $s1, 0x14($sp) -/* A1C9F8 802418F8 8FB00010 */ lw $s0, 0x10($sp) -/* A1C9FC 802418FC 03E00008 */ jr $ra -/* A1CA00 80241900 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s index 26c553208f..b5a80164b5 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s @@ -93,7 +93,7 @@ glabel func_80241FBC_A1D0BC /* A1D214 80242114 0000102D */ daddu $v0, $zero, $zero /* A1D218 80242118 0280202D */ daddu $a0, $s4, $zero /* A1D21C 8024211C 0200282D */ daddu $a1, $s0, $zero -/* A1D220 80242120 0C090623 */ jal func_8024188C_A1C98C +/* A1D220 80242120 0C090623 */ jal UnkNpcAIFunc2 /* A1D224 80242124 0260302D */ daddu $a2, $s3, $zero /* A1D228 80242128 0280202D */ daddu $a0, $s4, $zero /* A1D22C 8024212C 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240BDC_8CEC4C.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240BDC_8CEC4C.s deleted file mode 100644 index d73fdd0d9e..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240BDC_8CEC4C.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BDC_8CEC4C -/* 8CEC4C 80240BDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8CEC50 80240BE0 AFB20018 */ sw $s2, 0x18($sp) -/* 8CEC54 80240BE4 0080902D */ daddu $s2, $a0, $zero -/* 8CEC58 80240BE8 AFBF001C */ sw $ra, 0x1c($sp) -/* 8CEC5C 80240BEC AFB10014 */ sw $s1, 0x14($sp) -/* 8CEC60 80240BF0 AFB00010 */ sw $s0, 0x10($sp) -/* 8CEC64 80240BF4 8E510148 */ lw $s1, 0x148($s2) -/* 8CEC68 80240BF8 0C00EABB */ jal get_npc_unsafe -/* 8CEC6C 80240BFC 86240008 */ lh $a0, 8($s1) -/* 8CEC70 80240C00 0040802D */ daddu $s0, $v0, $zero -/* 8CEC74 80240C04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8CEC78 80240C08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8CEC7C 80240C0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8CEC80 80240C10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8CEC84 80240C14 A600008E */ sh $zero, 0x8e($s0) -/* 8CEC88 80240C18 8C460028 */ lw $a2, 0x28($v0) -/* 8CEC8C 80240C1C 0C00A720 */ jal atan2 -/* 8CEC90 80240C20 8C470030 */ lw $a3, 0x30($v0) -/* 8CEC94 80240C24 E600000C */ swc1 $f0, 0xc($s0) -/* 8CEC98 80240C28 8E2200CC */ lw $v0, 0xcc($s1) -/* 8CEC9C 80240C2C 8C420020 */ lw $v0, 0x20($v0) -/* 8CECA0 80240C30 AE020028 */ sw $v0, 0x28($s0) -/* 8CECA4 80240C34 2402000B */ addiu $v0, $zero, 0xb -/* 8CECA8 80240C38 AE420070 */ sw $v0, 0x70($s2) -/* 8CECAC 80240C3C 8FBF001C */ lw $ra, 0x1c($sp) -/* 8CECB0 80240C40 8FB20018 */ lw $s2, 0x18($sp) -/* 8CECB4 80240C44 8FB10014 */ lw $s1, 0x14($sp) -/* 8CECB8 80240C48 8FB00010 */ lw $s0, 0x10($sp) -/* 8CECBC 80240C4C 03E00008 */ jr $ra -/* 8CECC0 80240C50 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s index 87d5ca00c4..03f9ccfca5 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s @@ -93,7 +93,7 @@ glabel func_8024130C_8CF37C /* 8CF4D4 80241464 0000102D */ daddu $v0, $zero, $zero /* 8CF4D8 80241468 0280202D */ daddu $a0, $s4, $zero /* 8CF4DC 8024146C 0200282D */ daddu $a1, $s0, $zero -/* 8CF4E0 80241470 0C0902F7 */ jal func_80240BDC_8CEC4C +/* 8CF4E0 80241470 0C0902F7 */ jal UnkNpcAIFunc2 /* 8CF4E4 80241474 0260302D */ daddu $a2, $s3, $zero /* 8CF4E8 80241478 0280202D */ daddu $a0, $s4, $zero /* 8CF4EC 8024147C 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240BDC_8D20EC.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240BDC_8D20EC.s deleted file mode 100644 index f6a7057ba1..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240BDC_8D20EC.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BDC_8D20EC -/* 8D20EC 80240BDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8D20F0 80240BE0 AFB20018 */ sw $s2, 0x18($sp) -/* 8D20F4 80240BE4 0080902D */ daddu $s2, $a0, $zero -/* 8D20F8 80240BE8 AFBF001C */ sw $ra, 0x1c($sp) -/* 8D20FC 80240BEC AFB10014 */ sw $s1, 0x14($sp) -/* 8D2100 80240BF0 AFB00010 */ sw $s0, 0x10($sp) -/* 8D2104 80240BF4 8E510148 */ lw $s1, 0x148($s2) -/* 8D2108 80240BF8 0C00EABB */ jal get_npc_unsafe -/* 8D210C 80240BFC 86240008 */ lh $a0, 8($s1) -/* 8D2110 80240C00 0040802D */ daddu $s0, $v0, $zero -/* 8D2114 80240C04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D2118 80240C08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D211C 80240C0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D2120 80240C10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D2124 80240C14 A600008E */ sh $zero, 0x8e($s0) -/* 8D2128 80240C18 8C460028 */ lw $a2, 0x28($v0) -/* 8D212C 80240C1C 0C00A720 */ jal atan2 -/* 8D2130 80240C20 8C470030 */ lw $a3, 0x30($v0) -/* 8D2134 80240C24 E600000C */ swc1 $f0, 0xc($s0) -/* 8D2138 80240C28 8E2200CC */ lw $v0, 0xcc($s1) -/* 8D213C 80240C2C 8C420020 */ lw $v0, 0x20($v0) -/* 8D2140 80240C30 AE020028 */ sw $v0, 0x28($s0) -/* 8D2144 80240C34 2402000B */ addiu $v0, $zero, 0xb -/* 8D2148 80240C38 AE420070 */ sw $v0, 0x70($s2) -/* 8D214C 80240C3C 8FBF001C */ lw $ra, 0x1c($sp) -/* 8D2150 80240C40 8FB20018 */ lw $s2, 0x18($sp) -/* 8D2154 80240C44 8FB10014 */ lw $s1, 0x14($sp) -/* 8D2158 80240C48 8FB00010 */ lw $s0, 0x10($sp) -/* 8D215C 80240C4C 03E00008 */ jr $ra -/* 8D2160 80240C50 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s index 4c7139ecdb..c797754db2 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s @@ -93,7 +93,7 @@ glabel func_8024130C_8D281C /* 8D2974 80241464 0000102D */ daddu $v0, $zero, $zero /* 8D2978 80241468 0280202D */ daddu $a0, $s4, $zero /* 8D297C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* 8D2980 80241470 0C0902F7 */ jal func_80240BDC_8D20EC +/* 8D2980 80241470 0C0902F7 */ jal UnkNpcAIFunc2 /* 8D2984 80241474 0260302D */ daddu $a2, $s3, $zero /* 8D2988 80241478 0280202D */ daddu $a0, $s4, $zero /* 8D298C 8024147C 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240BDC_8D69DC.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240BDC_8D69DC.s deleted file mode 100644 index 00d7a5ceae..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240BDC_8D69DC.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BDC_8D69DC -/* 8D69DC 80240BDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8D69E0 80240BE0 AFB20018 */ sw $s2, 0x18($sp) -/* 8D69E4 80240BE4 0080902D */ daddu $s2, $a0, $zero -/* 8D69E8 80240BE8 AFBF001C */ sw $ra, 0x1c($sp) -/* 8D69EC 80240BEC AFB10014 */ sw $s1, 0x14($sp) -/* 8D69F0 80240BF0 AFB00010 */ sw $s0, 0x10($sp) -/* 8D69F4 80240BF4 8E510148 */ lw $s1, 0x148($s2) -/* 8D69F8 80240BF8 0C00EABB */ jal get_npc_unsafe -/* 8D69FC 80240BFC 86240008 */ lh $a0, 8($s1) -/* 8D6A00 80240C00 0040802D */ daddu $s0, $v0, $zero -/* 8D6A04 80240C04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D6A08 80240C08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D6A0C 80240C0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D6A10 80240C10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D6A14 80240C14 A600008E */ sh $zero, 0x8e($s0) -/* 8D6A18 80240C18 8C460028 */ lw $a2, 0x28($v0) -/* 8D6A1C 80240C1C 0C00A720 */ jal atan2 -/* 8D6A20 80240C20 8C470030 */ lw $a3, 0x30($v0) -/* 8D6A24 80240C24 E600000C */ swc1 $f0, 0xc($s0) -/* 8D6A28 80240C28 8E2200CC */ lw $v0, 0xcc($s1) -/* 8D6A2C 80240C2C 8C420020 */ lw $v0, 0x20($v0) -/* 8D6A30 80240C30 AE020028 */ sw $v0, 0x28($s0) -/* 8D6A34 80240C34 2402000B */ addiu $v0, $zero, 0xb -/* 8D6A38 80240C38 AE420070 */ sw $v0, 0x70($s2) -/* 8D6A3C 80240C3C 8FBF001C */ lw $ra, 0x1c($sp) -/* 8D6A40 80240C40 8FB20018 */ lw $s2, 0x18($sp) -/* 8D6A44 80240C44 8FB10014 */ lw $s1, 0x14($sp) -/* 8D6A48 80240C48 8FB00010 */ lw $s0, 0x10($sp) -/* 8D6A4C 80240C4C 03E00008 */ jr $ra -/* 8D6A50 80240C50 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s index 28621b1f99..0cd893f4bc 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s @@ -93,7 +93,7 @@ glabel func_8024130C_8D710C /* 8D7264 80241464 0000102D */ daddu $v0, $zero, $zero /* 8D7268 80241468 0280202D */ daddu $a0, $s4, $zero /* 8D726C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* 8D7270 80241470 0C0902F7 */ jal func_80240BDC_8D69DC +/* 8D7270 80241470 0C0902F7 */ jal UnkNpcAIFunc2 /* 8D7274 80241474 0260302D */ daddu $a2, $s3, $zero /* 8D7278 80241478 0280202D */ daddu $a0, $s4, $zero /* 8D727C 8024147C 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802410BC_C5B7FC.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802410BC_C5B7FC.s deleted file mode 100644 index bb57c9f070..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802410BC_C5B7FC.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410BC_C5B7FC -/* C5B7FC 802410BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C5B800 802410C0 AFB20018 */ sw $s2, 0x18($sp) -/* C5B804 802410C4 0080902D */ daddu $s2, $a0, $zero -/* C5B808 802410C8 AFBF001C */ sw $ra, 0x1c($sp) -/* C5B80C 802410CC AFB10014 */ sw $s1, 0x14($sp) -/* C5B810 802410D0 AFB00010 */ sw $s0, 0x10($sp) -/* C5B814 802410D4 8E510148 */ lw $s1, 0x148($s2) -/* C5B818 802410D8 0C00EABB */ jal get_npc_unsafe -/* C5B81C 802410DC 86240008 */ lh $a0, 8($s1) -/* C5B820 802410E0 0040802D */ daddu $s0, $v0, $zero -/* C5B824 802410E4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C5B828 802410E8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C5B82C 802410EC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C5B830 802410F0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C5B834 802410F4 A600008E */ sh $zero, 0x8e($s0) -/* C5B838 802410F8 8C460028 */ lw $a2, 0x28($v0) -/* C5B83C 802410FC 0C00A720 */ jal atan2 -/* C5B840 80241100 8C470030 */ lw $a3, 0x30($v0) -/* C5B844 80241104 E600000C */ swc1 $f0, 0xc($s0) -/* C5B848 80241108 8E2200CC */ lw $v0, 0xcc($s1) -/* C5B84C 8024110C 8C420020 */ lw $v0, 0x20($v0) -/* C5B850 80241110 AE020028 */ sw $v0, 0x28($s0) -/* C5B854 80241114 2402000B */ addiu $v0, $zero, 0xb -/* C5B858 80241118 AE420070 */ sw $v0, 0x70($s2) -/* C5B85C 8024111C 8FBF001C */ lw $ra, 0x1c($sp) -/* C5B860 80241120 8FB20018 */ lw $s2, 0x18($sp) -/* C5B864 80241124 8FB10014 */ lw $s1, 0x14($sp) -/* C5B868 80241128 8FB00010 */ lw $s0, 0x10($sp) -/* C5B86C 8024112C 03E00008 */ jr $ra -/* C5B870 80241130 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s index 428a0a7d0e..146497178f 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s @@ -93,7 +93,7 @@ glabel func_802417EC_C5BF2C /* C5C084 80241944 0000102D */ daddu $v0, $zero, $zero /* C5C088 80241948 0280202D */ daddu $a0, $s4, $zero /* C5C08C 8024194C 0200282D */ daddu $a1, $s0, $zero -/* C5C090 80241950 0C09042F */ jal func_802410BC_C5B7FC +/* C5C090 80241950 0C09042F */ jal UnkNpcAIFunc2 /* C5C094 80241954 0260302D */ daddu $a2, $s3, $zero /* C5C098 80241958 0280202D */ daddu $a0, $s4, $zero /* C5C09C 8024195C 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s index 1807b929dd..b29db4a384 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s @@ -94,7 +94,7 @@ glabel func_80241DE4_C5C524 /* C5C680 80241F40 0000102D */ daddu $v0, $zero, $zero /* C5C684 80241F44 0280202D */ daddu $a0, $s4, $zero /* C5C688 80241F48 0200282D */ daddu $a1, $s0, $zero -/* C5C68C 80241F4C 0C09042F */ jal func_802410BC_C5B7FC +/* C5C68C 80241F4C 0C09042F */ jal UnkNpcAIFunc2 /* C5C690 80241F50 0260302D */ daddu $a2, $s3, $zero /* C5C694 80241F54 0280202D */ daddu $a0, $s4, $zero /* C5C698 80241F58 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802413FC_C6F72C.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802413FC_C6F72C.s deleted file mode 100644 index 540a338f1b..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802413FC_C6F72C.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413FC_C6F72C -/* C6F72C 802413FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C6F730 80241400 AFB20018 */ sw $s2, 0x18($sp) -/* C6F734 80241404 0080902D */ daddu $s2, $a0, $zero -/* C6F738 80241408 AFBF001C */ sw $ra, 0x1c($sp) -/* C6F73C 8024140C AFB10014 */ sw $s1, 0x14($sp) -/* C6F740 80241410 AFB00010 */ sw $s0, 0x10($sp) -/* C6F744 80241414 8E510148 */ lw $s1, 0x148($s2) -/* C6F748 80241418 0C00EABB */ jal get_npc_unsafe -/* C6F74C 8024141C 86240008 */ lh $a0, 8($s1) -/* C6F750 80241420 0040802D */ daddu $s0, $v0, $zero -/* C6F754 80241424 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C6F758 80241428 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C6F75C 8024142C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C6F760 80241430 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C6F764 80241434 A600008E */ sh $zero, 0x8e($s0) -/* C6F768 80241438 8C460028 */ lw $a2, 0x28($v0) -/* C6F76C 8024143C 0C00A720 */ jal atan2 -/* C6F770 80241440 8C470030 */ lw $a3, 0x30($v0) -/* C6F774 80241444 E600000C */ swc1 $f0, 0xc($s0) -/* C6F778 80241448 8E2200CC */ lw $v0, 0xcc($s1) -/* C6F77C 8024144C 8C420020 */ lw $v0, 0x20($v0) -/* C6F780 80241450 AE020028 */ sw $v0, 0x28($s0) -/* C6F784 80241454 2402000B */ addiu $v0, $zero, 0xb -/* C6F788 80241458 AE420070 */ sw $v0, 0x70($s2) -/* C6F78C 8024145C 8FBF001C */ lw $ra, 0x1c($sp) -/* C6F790 80241460 8FB20018 */ lw $s2, 0x18($sp) -/* C6F794 80241464 8FB10014 */ lw $s1, 0x14($sp) -/* C6F798 80241468 8FB00010 */ lw $s0, 0x10($sp) -/* C6F79C 8024146C 03E00008 */ jr $ra -/* C6F7A0 80241470 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s index 5ba60e5b5d..11d11c33bf 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s @@ -93,7 +93,7 @@ glabel func_80241B2C_C6FE5C /* C6FFB4 80241C84 0000102D */ daddu $v0, $zero, $zero /* C6FFB8 80241C88 0280202D */ daddu $a0, $s4, $zero /* C6FFBC 80241C8C 0200282D */ daddu $a1, $s0, $zero -/* C6FFC0 80241C90 0C0904FF */ jal func_802413FC_C6F72C +/* C6FFC0 80241C90 0C0904FF */ jal UnkNpcAIFunc2 /* C6FFC4 80241C94 0260302D */ daddu $a2, $s3, $zero /* C6FFC8 80241C98 0280202D */ daddu $a0, $s4, $zero /* C6FFCC 80241C9C 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s index e3592a5733..cf67ad9b02 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s @@ -94,7 +94,7 @@ glabel func_80242124_C70454 /* C705B0 80242280 0000102D */ daddu $v0, $zero, $zero /* C705B4 80242284 0280202D */ daddu $a0, $s4, $zero /* C705B8 80242288 0200282D */ daddu $a1, $s0, $zero -/* C705BC 8024228C 0C0904FF */ jal func_802413FC_C6F72C +/* C705BC 8024228C 0C0904FF */ jal UnkNpcAIFunc2 /* C705C0 80242290 0260302D */ daddu $a2, $s3, $zero /* C705C4 80242294 0280202D */ daddu $a0, $s4, $zero /* C705C8 80242298 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_8024162C_C72AAC.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_8024162C_C72AAC.s deleted file mode 100644 index 04dce5e146..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_8024162C_C72AAC.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024162C_C72AAC -/* C72AAC 8024162C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C72AB0 80241630 AFB20018 */ sw $s2, 0x18($sp) -/* C72AB4 80241634 0080902D */ daddu $s2, $a0, $zero -/* C72AB8 80241638 AFBF001C */ sw $ra, 0x1c($sp) -/* C72ABC 8024163C AFB10014 */ sw $s1, 0x14($sp) -/* C72AC0 80241640 AFB00010 */ sw $s0, 0x10($sp) -/* C72AC4 80241644 8E510148 */ lw $s1, 0x148($s2) -/* C72AC8 80241648 0C00EABB */ jal get_npc_unsafe -/* C72ACC 8024164C 86240008 */ lh $a0, 8($s1) -/* C72AD0 80241650 0040802D */ daddu $s0, $v0, $zero -/* C72AD4 80241654 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C72AD8 80241658 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C72ADC 8024165C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C72AE0 80241660 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C72AE4 80241664 A600008E */ sh $zero, 0x8e($s0) -/* C72AE8 80241668 8C460028 */ lw $a2, 0x28($v0) -/* C72AEC 8024166C 0C00A720 */ jal atan2 -/* C72AF0 80241670 8C470030 */ lw $a3, 0x30($v0) -/* C72AF4 80241674 E600000C */ swc1 $f0, 0xc($s0) -/* C72AF8 80241678 8E2200CC */ lw $v0, 0xcc($s1) -/* C72AFC 8024167C 8C420020 */ lw $v0, 0x20($v0) -/* C72B00 80241680 AE020028 */ sw $v0, 0x28($s0) -/* C72B04 80241684 2402000B */ addiu $v0, $zero, 0xb -/* C72B08 80241688 AE420070 */ sw $v0, 0x70($s2) -/* C72B0C 8024168C 8FBF001C */ lw $ra, 0x1c($sp) -/* C72B10 80241690 8FB20018 */ lw $s2, 0x18($sp) -/* C72B14 80241694 8FB10014 */ lw $s1, 0x14($sp) -/* C72B18 80241698 8FB00010 */ lw $s0, 0x10($sp) -/* C72B1C 8024169C 03E00008 */ jr $ra -/* C72B20 802416A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s index 5e4bac9545..1265b6893b 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s @@ -93,7 +93,7 @@ glabel func_80241D5C_C731DC /* C73334 80241EB4 0000102D */ daddu $v0, $zero, $zero /* C73338 80241EB8 0280202D */ daddu $a0, $s4, $zero /* C7333C 80241EBC 0200282D */ daddu $a1, $s0, $zero -/* C73340 80241EC0 0C09058B */ jal func_8024162C_C72AAC +/* C73340 80241EC0 0C09058B */ jal UnkNpcAIFunc2 /* C73344 80241EC4 0260302D */ daddu $a2, $s3, $zero /* C73348 80241EC8 0280202D */ daddu $a0, $s4, $zero /* C7334C 80241ECC 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s index e7eef8159c..d6f7fffcbe 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s @@ -94,7 +94,7 @@ glabel func_80242354_C737D4 /* C73930 802424B0 0000102D */ daddu $v0, $zero, $zero /* C73934 802424B4 0280202D */ daddu $a0, $s4, $zero /* C73938 802424B8 0200282D */ daddu $a1, $s0, $zero -/* C7393C 802424BC 0C09058B */ jal func_8024162C_C72AAC +/* C7393C 802424BC 0C09058B */ jal UnkNpcAIFunc2 /* C73940 802424C0 0260302D */ daddu $a2, $s3, $zero /* C73944 802424C4 0280202D */ daddu $a0, $s4, $zero /* C73948 802424C8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024103C_C811DC.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024103C_C811DC.s deleted file mode 100644 index 377a1fdfcf..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024103C_C811DC.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024103C_C811DC -/* C811DC 8024103C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C811E0 80241040 AFB20018 */ sw $s2, 0x18($sp) -/* C811E4 80241044 0080902D */ daddu $s2, $a0, $zero -/* C811E8 80241048 AFBF001C */ sw $ra, 0x1c($sp) -/* C811EC 8024104C AFB10014 */ sw $s1, 0x14($sp) -/* C811F0 80241050 AFB00010 */ sw $s0, 0x10($sp) -/* C811F4 80241054 8E510148 */ lw $s1, 0x148($s2) -/* C811F8 80241058 0C00EABB */ jal get_npc_unsafe -/* C811FC 8024105C 86240008 */ lh $a0, 8($s1) -/* C81200 80241060 0040802D */ daddu $s0, $v0, $zero -/* C81204 80241064 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C81208 80241068 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C8120C 8024106C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C81210 80241070 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C81214 80241074 A600008E */ sh $zero, 0x8e($s0) -/* C81218 80241078 8C460028 */ lw $a2, 0x28($v0) -/* C8121C 8024107C 0C00A720 */ jal atan2 -/* C81220 80241080 8C470030 */ lw $a3, 0x30($v0) -/* C81224 80241084 E600000C */ swc1 $f0, 0xc($s0) -/* C81228 80241088 8E2200CC */ lw $v0, 0xcc($s1) -/* C8122C 8024108C 8C420020 */ lw $v0, 0x20($v0) -/* C81230 80241090 AE020028 */ sw $v0, 0x28($s0) -/* C81234 80241094 2402000B */ addiu $v0, $zero, 0xb -/* C81238 80241098 AE420070 */ sw $v0, 0x70($s2) -/* C8123C 8024109C 8FBF001C */ lw $ra, 0x1c($sp) -/* C81240 802410A0 8FB20018 */ lw $s2, 0x18($sp) -/* C81244 802410A4 8FB10014 */ lw $s1, 0x14($sp) -/* C81248 802410A8 8FB00010 */ lw $s0, 0x10($sp) -/* C8124C 802410AC 03E00008 */ jr $ra -/* C81250 802410B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s index 2f6164f9a4..1403002f1c 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s @@ -93,7 +93,7 @@ glabel func_8024176C_C8190C /* C81A64 802418C4 0000102D */ daddu $v0, $zero, $zero /* C81A68 802418C8 0280202D */ daddu $a0, $s4, $zero /* C81A6C 802418CC 0200282D */ daddu $a1, $s0, $zero -/* C81A70 802418D0 0C09040F */ jal func_8024103C_C811DC +/* C81A70 802418D0 0C09040F */ jal UnkNpcAIFunc2 /* C81A74 802418D4 0260302D */ daddu $a2, $s3, $zero /* C81A78 802418D8 0280202D */ daddu $a0, $s4, $zero /* C81A7C 802418DC 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s index b6ad4c8516..b1d29b8393 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s @@ -94,7 +94,7 @@ glabel func_80241D64_C81F04 /* C82060 80241EC0 0000102D */ daddu $v0, $zero, $zero /* C82064 80241EC4 0280202D */ daddu $a0, $s4, $zero /* C82068 80241EC8 0200282D */ daddu $a1, $s0, $zero -/* C8206C 80241ECC 0C09040F */ jal func_8024103C_C811DC +/* C8206C 80241ECC 0C09040F */ jal UnkNpcAIFunc2 /* C82070 80241ED0 0260302D */ daddu $a2, $s3, $zero /* C82074 80241ED4 0280202D */ daddu $a0, $s4, $zero /* C82078 80241ED8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240C7C_BAE5BC.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240C7C_BAE5BC.s deleted file mode 100644 index 8ff53bec75..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240C7C_BAE5BC.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C7C_BAE5BC -/* BAE5BC 80240C7C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BAE5C0 80240C80 AFB20018 */ sw $s2, 0x18($sp) -/* BAE5C4 80240C84 0080902D */ daddu $s2, $a0, $zero -/* BAE5C8 80240C88 AFBF001C */ sw $ra, 0x1c($sp) -/* BAE5CC 80240C8C AFB10014 */ sw $s1, 0x14($sp) -/* BAE5D0 80240C90 AFB00010 */ sw $s0, 0x10($sp) -/* BAE5D4 80240C94 8E510148 */ lw $s1, 0x148($s2) -/* BAE5D8 80240C98 0C00EABB */ jal get_npc_unsafe -/* BAE5DC 80240C9C 86240008 */ lh $a0, 8($s1) -/* BAE5E0 80240CA0 0040802D */ daddu $s0, $v0, $zero -/* BAE5E4 80240CA4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BAE5E8 80240CA8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BAE5EC 80240CAC C60C0038 */ lwc1 $f12, 0x38($s0) -/* BAE5F0 80240CB0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BAE5F4 80240CB4 A600008E */ sh $zero, 0x8e($s0) -/* BAE5F8 80240CB8 8C460028 */ lw $a2, 0x28($v0) -/* BAE5FC 80240CBC 0C00A720 */ jal atan2 -/* BAE600 80240CC0 8C470030 */ lw $a3, 0x30($v0) -/* BAE604 80240CC4 E600000C */ swc1 $f0, 0xc($s0) -/* BAE608 80240CC8 8E2200CC */ lw $v0, 0xcc($s1) -/* BAE60C 80240CCC 8C420020 */ lw $v0, 0x20($v0) -/* BAE610 80240CD0 AE020028 */ sw $v0, 0x28($s0) -/* BAE614 80240CD4 2402000B */ addiu $v0, $zero, 0xb -/* BAE618 80240CD8 AE420070 */ sw $v0, 0x70($s2) -/* BAE61C 80240CDC 8FBF001C */ lw $ra, 0x1c($sp) -/* BAE620 80240CE0 8FB20018 */ lw $s2, 0x18($sp) -/* BAE624 80240CE4 8FB10014 */ lw $s1, 0x14($sp) -/* BAE628 80240CE8 8FB00010 */ lw $s0, 0x10($sp) -/* BAE62C 80240CEC 03E00008 */ jr $ra -/* BAE630 80240CF0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s index ae02b12f57..9b215b0a0c 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s @@ -93,7 +93,7 @@ glabel func_802413AC_BAECEC /* BAEE44 80241504 0000102D */ daddu $v0, $zero, $zero /* BAEE48 80241508 0280202D */ daddu $a0, $s4, $zero /* BAEE4C 8024150C 0200282D */ daddu $a1, $s0, $zero -/* BAEE50 80241510 0C09031F */ jal func_80240C7C_BAE5BC +/* BAEE50 80241510 0C09031F */ jal UnkNpcAIFunc2 /* BAEE54 80241514 0260302D */ daddu $a2, $s3, $zero /* BAEE58 80241518 0280202D */ daddu $a0, $s4, $zero /* BAEE5C 8024151C 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802413B0_9F5DF0.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802413B0_9F5DF0.s deleted file mode 100644 index d1834f31c6..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802413B0_9F5DF0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413B0_9F5DF0 -/* 9F5DF0 802413B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9F5DF4 802413B4 AFB20018 */ sw $s2, 0x18($sp) -/* 9F5DF8 802413B8 0080902D */ daddu $s2, $a0, $zero -/* 9F5DFC 802413BC AFBF001C */ sw $ra, 0x1c($sp) -/* 9F5E00 802413C0 AFB10014 */ sw $s1, 0x14($sp) -/* 9F5E04 802413C4 AFB00010 */ sw $s0, 0x10($sp) -/* 9F5E08 802413C8 8E510148 */ lw $s1, 0x148($s2) -/* 9F5E0C 802413CC 0C00EABB */ jal get_npc_unsafe -/* 9F5E10 802413D0 86240008 */ lh $a0, 8($s1) -/* 9F5E14 802413D4 0040802D */ daddu $s0, $v0, $zero -/* 9F5E18 802413D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9F5E1C 802413DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9F5E20 802413E0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9F5E24 802413E4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9F5E28 802413E8 A600008E */ sh $zero, 0x8e($s0) -/* 9F5E2C 802413EC 8C460028 */ lw $a2, 0x28($v0) -/* 9F5E30 802413F0 0C00A720 */ jal atan2 -/* 9F5E34 802413F4 8C470030 */ lw $a3, 0x30($v0) -/* 9F5E38 802413F8 E600000C */ swc1 $f0, 0xc($s0) -/* 9F5E3C 802413FC 8E2200CC */ lw $v0, 0xcc($s1) -/* 9F5E40 80241400 8C420020 */ lw $v0, 0x20($v0) -/* 9F5E44 80241404 AE020028 */ sw $v0, 0x28($s0) -/* 9F5E48 80241408 2402000B */ addiu $v0, $zero, 0xb -/* 9F5E4C 8024140C AE420070 */ sw $v0, 0x70($s2) -/* 9F5E50 80241410 8FBF001C */ lw $ra, 0x1c($sp) -/* 9F5E54 80241414 8FB20018 */ lw $s2, 0x18($sp) -/* 9F5E58 80241418 8FB10014 */ lw $s1, 0x14($sp) -/* 9F5E5C 8024141C 8FB00010 */ lw $s0, 0x10($sp) -/* 9F5E60 80241420 03E00008 */ jr $ra -/* 9F5E64 80241424 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s index d4194e3736..74447a238c 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s @@ -93,7 +93,7 @@ glabel func_80241AE0_9F6520 /* 9F6678 80241C38 0000102D */ daddu $v0, $zero, $zero /* 9F667C 80241C3C 0280202D */ daddu $a0, $s4, $zero /* 9F6680 80241C40 0200282D */ daddu $a1, $s0, $zero -/* 9F6684 80241C44 0C0904EC */ jal func_802413B0_9F5DF0 +/* 9F6684 80241C44 0C0904EC */ jal UnkNpcAIFunc2 /* 9F6688 80241C48 0260302D */ daddu $a2, $s3, $zero /* 9F668C 80241C4C 0280202D */ daddu $a0, $s4, $zero /* 9F6690 80241C50 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241570_A03DB0.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241570_A03DB0.s deleted file mode 100644 index c4f31f2462..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241570_A03DB0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241570_A03DB0 -/* A03DB0 80241570 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A03DB4 80241574 AFB20018 */ sw $s2, 0x18($sp) -/* A03DB8 80241578 0080902D */ daddu $s2, $a0, $zero -/* A03DBC 8024157C AFBF001C */ sw $ra, 0x1c($sp) -/* A03DC0 80241580 AFB10014 */ sw $s1, 0x14($sp) -/* A03DC4 80241584 AFB00010 */ sw $s0, 0x10($sp) -/* A03DC8 80241588 8E510148 */ lw $s1, 0x148($s2) -/* A03DCC 8024158C 0C00EABB */ jal get_npc_unsafe -/* A03DD0 80241590 86240008 */ lh $a0, 8($s1) -/* A03DD4 80241594 0040802D */ daddu $s0, $v0, $zero -/* A03DD8 80241598 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A03DDC 8024159C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A03DE0 802415A0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A03DE4 802415A4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A03DE8 802415A8 A600008E */ sh $zero, 0x8e($s0) -/* A03DEC 802415AC 8C460028 */ lw $a2, 0x28($v0) -/* A03DF0 802415B0 0C00A720 */ jal atan2 -/* A03DF4 802415B4 8C470030 */ lw $a3, 0x30($v0) -/* A03DF8 802415B8 E600000C */ swc1 $f0, 0xc($s0) -/* A03DFC 802415BC 8E2200CC */ lw $v0, 0xcc($s1) -/* A03E00 802415C0 8C420020 */ lw $v0, 0x20($v0) -/* A03E04 802415C4 AE020028 */ sw $v0, 0x28($s0) -/* A03E08 802415C8 2402000B */ addiu $v0, $zero, 0xb -/* A03E0C 802415CC AE420070 */ sw $v0, 0x70($s2) -/* A03E10 802415D0 8FBF001C */ lw $ra, 0x1c($sp) -/* A03E14 802415D4 8FB20018 */ lw $s2, 0x18($sp) -/* A03E18 802415D8 8FB10014 */ lw $s1, 0x14($sp) -/* A03E1C 802415DC 8FB00010 */ lw $s0, 0x10($sp) -/* A03E20 802415E0 03E00008 */ jr $ra -/* A03E24 802415E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s index 864bdd13ba..032e470d3a 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s @@ -93,7 +93,7 @@ glabel func_80241CA0_A044E0 /* A04638 80241DF8 0000102D */ daddu $v0, $zero, $zero /* A0463C 80241DFC 0280202D */ daddu $a0, $s4, $zero /* A04640 80241E00 0200282D */ daddu $a1, $s0, $zero -/* A04644 80241E04 0C09055C */ jal func_80241570_A03DB0 +/* A04644 80241E04 0C09055C */ jal UnkNpcAIFunc2 /* A04648 80241E08 0260302D */ daddu $a2, $s3, $zero /* A0464C 80241E0C 0280202D */ daddu $a0, $s4, $zero /* A04650 80241E10 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s index 6ca2e2867e..40d8f3b597 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s @@ -100,7 +100,7 @@ glabel func_802421CC_A04A0C /* A04B80 80242340 0000102D */ daddu $v0, $zero, $zero /* A04B84 80242344 0260202D */ daddu $a0, $s3, $zero /* A04B88 80242348 0200282D */ daddu $a1, $s0, $zero -/* A04B8C 8024234C 0C09055C */ jal func_80241570_A03DB0 +/* A04B8C 8024234C 0C09055C */ jal UnkNpcAIFunc2 /* A04B90 80242350 0280302D */ daddu $a2, $s4, $zero /* A04B94 80242354 8E630070 */ lw $v1, 0x70($s3) /* A04B98 80242358 2402000B */ addiu $v0, $zero, 0xb diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241690_A08590.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241690_A08590.s deleted file mode 100644 index 736cba68f3..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241690_A08590.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241690_A08590 -/* A08590 80241690 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A08594 80241694 AFB20018 */ sw $s2, 0x18($sp) -/* A08598 80241698 0080902D */ daddu $s2, $a0, $zero -/* A0859C 8024169C AFBF001C */ sw $ra, 0x1c($sp) -/* A085A0 802416A0 AFB10014 */ sw $s1, 0x14($sp) -/* A085A4 802416A4 AFB00010 */ sw $s0, 0x10($sp) -/* A085A8 802416A8 8E510148 */ lw $s1, 0x148($s2) -/* A085AC 802416AC 0C00EABB */ jal get_npc_unsafe -/* A085B0 802416B0 86240008 */ lh $a0, 8($s1) -/* A085B4 802416B4 0040802D */ daddu $s0, $v0, $zero -/* A085B8 802416B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A085BC 802416BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A085C0 802416C0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A085C4 802416C4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A085C8 802416C8 A600008E */ sh $zero, 0x8e($s0) -/* A085CC 802416CC 8C460028 */ lw $a2, 0x28($v0) -/* A085D0 802416D0 0C00A720 */ jal atan2 -/* A085D4 802416D4 8C470030 */ lw $a3, 0x30($v0) -/* A085D8 802416D8 E600000C */ swc1 $f0, 0xc($s0) -/* A085DC 802416DC 8E2200CC */ lw $v0, 0xcc($s1) -/* A085E0 802416E0 8C420020 */ lw $v0, 0x20($v0) -/* A085E4 802416E4 AE020028 */ sw $v0, 0x28($s0) -/* A085E8 802416E8 2402000B */ addiu $v0, $zero, 0xb -/* A085EC 802416EC AE420070 */ sw $v0, 0x70($s2) -/* A085F0 802416F0 8FBF001C */ lw $ra, 0x1c($sp) -/* A085F4 802416F4 8FB20018 */ lw $s2, 0x18($sp) -/* A085F8 802416F8 8FB10014 */ lw $s1, 0x14($sp) -/* A085FC 802416FC 8FB00010 */ lw $s0, 0x10($sp) -/* A08600 80241700 03E00008 */ jr $ra -/* A08604 80241704 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s index 6caa7d6db5..138b9e1687 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s @@ -93,7 +93,7 @@ glabel func_80241DC0_A08CC0 /* A08E18 80241F18 0000102D */ daddu $v0, $zero, $zero /* A08E1C 80241F1C 0280202D */ daddu $a0, $s4, $zero /* A08E20 80241F20 0200282D */ daddu $a1, $s0, $zero -/* A08E24 80241F24 0C0905A4 */ jal func_80241690_A08590 +/* A08E24 80241F24 0C0905A4 */ jal UnkNpcAIFunc2 /* A08E28 80241F28 0260302D */ daddu $a2, $s3, $zero /* A08E2C 80241F2C 0280202D */ daddu $a0, $s4, $zero /* A08E30 80241F30 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s index e9544fcee5..25d4fbbf9d 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s @@ -100,7 +100,7 @@ glabel func_802422EC_A091EC /* A09360 80242460 0000102D */ daddu $v0, $zero, $zero /* A09364 80242464 0260202D */ daddu $a0, $s3, $zero /* A09368 80242468 0200282D */ daddu $a1, $s0, $zero -/* A0936C 8024246C 0C0905A4 */ jal func_80241690_A08590 +/* A0936C 8024246C 0C0905A4 */ jal UnkNpcAIFunc2 /* A09370 80242470 0280302D */ daddu $a2, $s4, $zero /* A09374 80242474 8E630070 */ lw $v1, 0x70($s3) /* A09378 80242478 2402000B */ addiu $v0, $zero, 0xb diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240F7C_DAE37C.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240F7C_DAE37C.s deleted file mode 100644 index e0ca506950..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240F7C_DAE37C.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F7C_DAE37C -/* DAE37C 80240F7C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DAE380 80240F80 AFB20018 */ sw $s2, 0x18($sp) -/* DAE384 80240F84 0080902D */ daddu $s2, $a0, $zero -/* DAE388 80240F88 AFBF001C */ sw $ra, 0x1c($sp) -/* DAE38C 80240F8C AFB10014 */ sw $s1, 0x14($sp) -/* DAE390 80240F90 AFB00010 */ sw $s0, 0x10($sp) -/* DAE394 80240F94 8E510148 */ lw $s1, 0x148($s2) -/* DAE398 80240F98 0C00EABB */ jal get_npc_unsafe -/* DAE39C 80240F9C 86240008 */ lh $a0, 8($s1) -/* DAE3A0 80240FA0 0040802D */ daddu $s0, $v0, $zero -/* DAE3A4 80240FA4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DAE3A8 80240FA8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DAE3AC 80240FAC C60C0038 */ lwc1 $f12, 0x38($s0) -/* DAE3B0 80240FB0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DAE3B4 80240FB4 A600008E */ sh $zero, 0x8e($s0) -/* DAE3B8 80240FB8 8C460028 */ lw $a2, 0x28($v0) -/* DAE3BC 80240FBC 0C00A720 */ jal atan2 -/* DAE3C0 80240FC0 8C470030 */ lw $a3, 0x30($v0) -/* DAE3C4 80240FC4 E600000C */ swc1 $f0, 0xc($s0) -/* DAE3C8 80240FC8 8E2200CC */ lw $v0, 0xcc($s1) -/* DAE3CC 80240FCC 8C420020 */ lw $v0, 0x20($v0) -/* DAE3D0 80240FD0 AE020028 */ sw $v0, 0x28($s0) -/* DAE3D4 80240FD4 2402000B */ addiu $v0, $zero, 0xb -/* DAE3D8 80240FD8 AE420070 */ sw $v0, 0x70($s2) -/* DAE3DC 80240FDC 8FBF001C */ lw $ra, 0x1c($sp) -/* DAE3E0 80240FE0 8FB20018 */ lw $s2, 0x18($sp) -/* DAE3E4 80240FE4 8FB10014 */ lw $s1, 0x14($sp) -/* DAE3E8 80240FE8 8FB00010 */ lw $s0, 0x10($sp) -/* DAE3EC 80240FEC 03E00008 */ jr $ra -/* DAE3F0 80240FF0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s index ddf06ed8a0..a3eb473b1d 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s @@ -93,7 +93,7 @@ glabel func_802416AC_DAEAAC /* DAEC04 80241804 0000102D */ daddu $v0, $zero, $zero /* DAEC08 80241808 0280202D */ daddu $a0, $s4, $zero /* DAEC0C 8024180C 0200282D */ daddu $a1, $s0, $zero -/* DAEC10 80241810 0C0903DF */ jal func_80240F7C_DAE37C +/* DAEC10 80241810 0C0903DF */ jal UnkNpcAIFunc2 /* DAEC14 80241814 0260302D */ daddu $a2, $s3, $zero /* DAEC18 80241818 0280202D */ daddu $a0, $s4, $zero /* DAEC1C 8024181C 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241630_DB38F0.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241630_DB38F0.s deleted file mode 100644 index 88a042ca01..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241630_DB38F0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241630_DB38F0 -/* DB38F0 80241630 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB38F4 80241634 AFB20018 */ sw $s2, 0x18($sp) -/* DB38F8 80241638 0080902D */ daddu $s2, $a0, $zero -/* DB38FC 8024163C AFBF001C */ sw $ra, 0x1c($sp) -/* DB3900 80241640 AFB10014 */ sw $s1, 0x14($sp) -/* DB3904 80241644 AFB00010 */ sw $s0, 0x10($sp) -/* DB3908 80241648 8E510148 */ lw $s1, 0x148($s2) -/* DB390C 8024164C 0C00EABB */ jal get_npc_unsafe -/* DB3910 80241650 86240008 */ lh $a0, 8($s1) -/* DB3914 80241654 0040802D */ daddu $s0, $v0, $zero -/* DB3918 80241658 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DB391C 8024165C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DB3920 80241660 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DB3924 80241664 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DB3928 80241668 A600008E */ sh $zero, 0x8e($s0) -/* DB392C 8024166C 8C460028 */ lw $a2, 0x28($v0) -/* DB3930 80241670 0C00A720 */ jal atan2 -/* DB3934 80241674 8C470030 */ lw $a3, 0x30($v0) -/* DB3938 80241678 E600000C */ swc1 $f0, 0xc($s0) -/* DB393C 8024167C 8E2200CC */ lw $v0, 0xcc($s1) -/* DB3940 80241680 8C420020 */ lw $v0, 0x20($v0) -/* DB3944 80241684 AE020028 */ sw $v0, 0x28($s0) -/* DB3948 80241688 2402000B */ addiu $v0, $zero, 0xb -/* DB394C 8024168C AE420070 */ sw $v0, 0x70($s2) -/* DB3950 80241690 8FBF001C */ lw $ra, 0x1c($sp) -/* DB3954 80241694 8FB20018 */ lw $s2, 0x18($sp) -/* DB3958 80241698 8FB10014 */ lw $s1, 0x14($sp) -/* DB395C 8024169C 8FB00010 */ lw $s0, 0x10($sp) -/* DB3960 802416A0 03E00008 */ jr $ra -/* DB3964 802416A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s index 45d65e20dc..cd2a6b1d23 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s @@ -93,7 +93,7 @@ glabel func_80241D60_DB4020 /* DB4178 80241EB8 0000102D */ daddu $v0, $zero, $zero /* DB417C 80241EBC 0280202D */ daddu $a0, $s4, $zero /* DB4180 80241EC0 0200282D */ daddu $a1, $s0, $zero -/* DB4184 80241EC4 0C09058C */ jal func_80241630_DB38F0 +/* DB4184 80241EC4 0C09058C */ jal UnkNpcAIFunc2 /* DB4188 80241EC8 0260302D */ daddu $a2, $s3, $zero /* DB418C 80241ECC 0280202D */ daddu $a0, $s4, $zero /* DB4190 80241ED0 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242554_DBF804.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242554_DBF804.s deleted file mode 100644 index ac8ad9505e..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242554_DBF804.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242554_DBF804 -/* DBF804 80242554 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DBF808 80242558 AFB20018 */ sw $s2, 0x18($sp) -/* DBF80C 8024255C 0080902D */ daddu $s2, $a0, $zero -/* DBF810 80242560 AFBF001C */ sw $ra, 0x1c($sp) -/* DBF814 80242564 AFB10014 */ sw $s1, 0x14($sp) -/* DBF818 80242568 AFB00010 */ sw $s0, 0x10($sp) -/* DBF81C 8024256C 8E510148 */ lw $s1, 0x148($s2) -/* DBF820 80242570 0C00EABB */ jal get_npc_unsafe -/* DBF824 80242574 86240008 */ lh $a0, 8($s1) -/* DBF828 80242578 0040802D */ daddu $s0, $v0, $zero -/* DBF82C 8024257C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DBF830 80242580 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DBF834 80242584 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DBF838 80242588 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DBF83C 8024258C A600008E */ sh $zero, 0x8e($s0) -/* DBF840 80242590 8C460028 */ lw $a2, 0x28($v0) -/* DBF844 80242594 0C00A720 */ jal atan2 -/* DBF848 80242598 8C470030 */ lw $a3, 0x30($v0) -/* DBF84C 8024259C E600000C */ swc1 $f0, 0xc($s0) -/* DBF850 802425A0 8E2200CC */ lw $v0, 0xcc($s1) -/* DBF854 802425A4 8C420020 */ lw $v0, 0x20($v0) -/* DBF858 802425A8 AE020028 */ sw $v0, 0x28($s0) -/* DBF85C 802425AC 2402000B */ addiu $v0, $zero, 0xb -/* DBF860 802425B0 AE420070 */ sw $v0, 0x70($s2) -/* DBF864 802425B4 8FBF001C */ lw $ra, 0x1c($sp) -/* DBF868 802425B8 8FB20018 */ lw $s2, 0x18($sp) -/* DBF86C 802425BC 8FB10014 */ lw $s1, 0x14($sp) -/* DBF870 802425C0 8FB00010 */ lw $s0, 0x10($sp) -/* DBF874 802425C4 03E00008 */ jr $ra -/* DBF878 802425C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s index e5383c5b9f..4356034195 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s @@ -93,7 +93,7 @@ glabel func_80242C84_DBFF34 /* DC008C 80242DDC 0000102D */ daddu $v0, $zero, $zero /* DC0090 80242DE0 0280202D */ daddu $a0, $s4, $zero /* DC0094 80242DE4 0200282D */ daddu $a1, $s0, $zero -/* DC0098 80242DE8 0C090955 */ jal func_80242554_DBF804 +/* DC0098 80242DE8 0C090955 */ jal UnkNpcAIFunc2 /* DC009C 80242DEC 0260302D */ daddu $a2, $s3, $zero /* DC00A0 80242DF0 0280202D */ daddu $a0, $s4, $zero /* DC00A4 80242DF4 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241B90_DF0A30.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241B90_DF0A30.s deleted file mode 100644 index 914f2a3bf2..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241B90_DF0A30.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B90_DF0A30 -/* DF0A30 80241B90 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DF0A34 80241B94 AFB20018 */ sw $s2, 0x18($sp) -/* DF0A38 80241B98 0080902D */ daddu $s2, $a0, $zero -/* DF0A3C 80241B9C AFBF001C */ sw $ra, 0x1c($sp) -/* DF0A40 80241BA0 AFB10014 */ sw $s1, 0x14($sp) -/* DF0A44 80241BA4 AFB00010 */ sw $s0, 0x10($sp) -/* DF0A48 80241BA8 8E510148 */ lw $s1, 0x148($s2) -/* DF0A4C 80241BAC 0C00EABB */ jal get_npc_unsafe -/* DF0A50 80241BB0 86240008 */ lh $a0, 8($s1) -/* DF0A54 80241BB4 0040802D */ daddu $s0, $v0, $zero -/* DF0A58 80241BB8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DF0A5C 80241BBC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DF0A60 80241BC0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DF0A64 80241BC4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DF0A68 80241BC8 A600008E */ sh $zero, 0x8e($s0) -/* DF0A6C 80241BCC 8C460028 */ lw $a2, 0x28($v0) -/* DF0A70 80241BD0 0C00A720 */ jal atan2 -/* DF0A74 80241BD4 8C470030 */ lw $a3, 0x30($v0) -/* DF0A78 80241BD8 E600000C */ swc1 $f0, 0xc($s0) -/* DF0A7C 80241BDC 8E2200CC */ lw $v0, 0xcc($s1) -/* DF0A80 80241BE0 8C420020 */ lw $v0, 0x20($v0) -/* DF0A84 80241BE4 AE020028 */ sw $v0, 0x28($s0) -/* DF0A88 80241BE8 2402000B */ addiu $v0, $zero, 0xb -/* DF0A8C 80241BEC AE420070 */ sw $v0, 0x70($s2) -/* DF0A90 80241BF0 8FBF001C */ lw $ra, 0x1c($sp) -/* DF0A94 80241BF4 8FB20018 */ lw $s2, 0x18($sp) -/* DF0A98 80241BF8 8FB10014 */ lw $s1, 0x14($sp) -/* DF0A9C 80241BFC 8FB00010 */ lw $s0, 0x10($sp) -/* DF0AA0 80241C00 03E00008 */ jr $ra -/* DF0AA4 80241C04 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s index ddf803df36..e946771094 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s @@ -93,7 +93,7 @@ glabel func_802422C0_DF1160 /* DF12B8 80242418 0000102D */ daddu $v0, $zero, $zero /* DF12BC 8024241C 0280202D */ daddu $a0, $s4, $zero /* DF12C0 80242420 0200282D */ daddu $a1, $s0, $zero -/* DF12C4 80242424 0C0906E4 */ jal func_80241B90_DF0A30 +/* DF12C4 80242424 0C0906E4 */ jal UnkNpcAIFunc2 /* DF12C8 80242428 0260302D */ daddu $a2, $s3, $zero /* DF12CC 8024242C 0280202D */ daddu $a0, $s4, $zero /* DF12D0 80242430 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024112C_D20FBC.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024112C_D20FBC.s deleted file mode 100644 index 149ccd928d..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024112C_D20FBC.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024112C_D20FBC -/* D20FBC 8024112C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D20FC0 80241130 AFB20018 */ sw $s2, 0x18($sp) -/* D20FC4 80241134 0080902D */ daddu $s2, $a0, $zero -/* D20FC8 80241138 AFBF001C */ sw $ra, 0x1c($sp) -/* D20FCC 8024113C AFB10014 */ sw $s1, 0x14($sp) -/* D20FD0 80241140 AFB00010 */ sw $s0, 0x10($sp) -/* D20FD4 80241144 8E510148 */ lw $s1, 0x148($s2) -/* D20FD8 80241148 0C00EABB */ jal get_npc_unsafe -/* D20FDC 8024114C 86240008 */ lh $a0, 8($s1) -/* D20FE0 80241150 0040802D */ daddu $s0, $v0, $zero -/* D20FE4 80241154 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D20FE8 80241158 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D20FEC 8024115C C60C0038 */ lwc1 $f12, 0x38($s0) -/* D20FF0 80241160 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D20FF4 80241164 A600008E */ sh $zero, 0x8e($s0) -/* D20FF8 80241168 8C460028 */ lw $a2, 0x28($v0) -/* D20FFC 8024116C 0C00A720 */ jal atan2 -/* D21000 80241170 8C470030 */ lw $a3, 0x30($v0) -/* D21004 80241174 E600000C */ swc1 $f0, 0xc($s0) -/* D21008 80241178 8E2200CC */ lw $v0, 0xcc($s1) -/* D2100C 8024117C 8C420020 */ lw $v0, 0x20($v0) -/* D21010 80241180 AE020028 */ sw $v0, 0x28($s0) -/* D21014 80241184 2402000B */ addiu $v0, $zero, 0xb -/* D21018 80241188 AE420070 */ sw $v0, 0x70($s2) -/* D2101C 8024118C 8FBF001C */ lw $ra, 0x1c($sp) -/* D21020 80241190 8FB20018 */ lw $s2, 0x18($sp) -/* D21024 80241194 8FB10014 */ lw $s1, 0x14($sp) -/* D21028 80241198 8FB00010 */ lw $s0, 0x10($sp) -/* D2102C 8024119C 03E00008 */ jr $ra -/* D21030 802411A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s index 77844bca49..68dbae9e36 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s @@ -93,7 +93,7 @@ glabel func_8024185C_D216EC /* D21844 802419B4 0000102D */ daddu $v0, $zero, $zero /* D21848 802419B8 0280202D */ daddu $a0, $s4, $zero /* D2184C 802419BC 0200282D */ daddu $a1, $s0, $zero -/* D21850 802419C0 0C09044B */ jal func_8024112C_D20FBC +/* D21850 802419C0 0C09044B */ jal UnkNpcAIFunc2 /* D21854 802419C4 0260302D */ daddu $a2, $s3, $zero /* D21858 802419C8 0280202D */ daddu $a0, $s4, $zero /* D2185C 802419CC 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241FCC_87BBAC.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241FCC_87BBAC.s deleted file mode 100644 index 8bd4508177..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241FCC_87BBAC.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FCC_87BBAC -/* 87BBAC 80241FCC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 87BBB0 80241FD0 AFB20018 */ sw $s2, 0x18($sp) -/* 87BBB4 80241FD4 0080902D */ daddu $s2, $a0, $zero -/* 87BBB8 80241FD8 AFBF001C */ sw $ra, 0x1c($sp) -/* 87BBBC 80241FDC AFB10014 */ sw $s1, 0x14($sp) -/* 87BBC0 80241FE0 AFB00010 */ sw $s0, 0x10($sp) -/* 87BBC4 80241FE4 8E510148 */ lw $s1, 0x148($s2) -/* 87BBC8 80241FE8 0C00EABB */ jal get_npc_unsafe -/* 87BBCC 80241FEC 86240008 */ lh $a0, 8($s1) -/* 87BBD0 80241FF0 0040802D */ daddu $s0, $v0, $zero -/* 87BBD4 80241FF4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 87BBD8 80241FF8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 87BBDC 80241FFC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 87BBE0 80242000 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 87BBE4 80242004 A600008E */ sh $zero, 0x8e($s0) -/* 87BBE8 80242008 8C460028 */ lw $a2, 0x28($v0) -/* 87BBEC 8024200C 0C00A720 */ jal atan2 -/* 87BBF0 80242010 8C470030 */ lw $a3, 0x30($v0) -/* 87BBF4 80242014 E600000C */ swc1 $f0, 0xc($s0) -/* 87BBF8 80242018 8E2200CC */ lw $v0, 0xcc($s1) -/* 87BBFC 8024201C 8C420020 */ lw $v0, 0x20($v0) -/* 87BC00 80242020 AE020028 */ sw $v0, 0x28($s0) -/* 87BC04 80242024 2402000B */ addiu $v0, $zero, 0xb -/* 87BC08 80242028 AE420070 */ sw $v0, 0x70($s2) -/* 87BC0C 8024202C 8FBF001C */ lw $ra, 0x1c($sp) -/* 87BC10 80242030 8FB20018 */ lw $s2, 0x18($sp) -/* 87BC14 80242034 8FB10014 */ lw $s1, 0x14($sp) -/* 87BC18 80242038 8FB00010 */ lw $s0, 0x10($sp) -/* 87BC1C 8024203C 03E00008 */ jr $ra -/* 87BC20 80242040 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s index 95a22fd1f3..dcd010b25f 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s @@ -54,7 +54,7 @@ glabel func_802426FC_87C2DC /* 87C39C 802427BC 8E4300B0 */ lw $v1, 0xb0($s2) /* 87C3A0 802427C0 30620004 */ andi $v0, $v1, 4 /* 87C3A4 802427C4 10400007 */ beqz $v0, .L802427E4 -/* 87C3A8 802427C8 00000000 */ nop +/* 87C3A8 802427C8 00000000 */ nop /* 87C3AC 802427CC 824200B4 */ lb $v0, 0xb4($s2) /* 87C3B0 802427D0 1440003C */ bnez $v0, .L802428C4 /* 87C3B4 802427D4 0000102D */ daddu $v0, $zero, $zero @@ -70,7 +70,7 @@ glabel func_802426FC_87C2DC /* 87C3D8 802427F8 00220821 */ addu $at, $at, $v0 /* 87C3DC 802427FC 8C2251C8 */ lw $v0, 0x51c8($at) /* 87C3E0 80242800 00400008 */ jr $v0 -/* 87C3E4 80242804 00000000 */ nop +/* 87C3E4 80242804 00000000 */ nop /* 87C3E8 80242808 0280202D */ daddu $a0, $s4, $zero /* 87C3EC 8024280C 0200282D */ daddu $a1, $s0, $zero /* 87C3F0 80242810 0C0904FC */ jal func_802413F0_87AFD0 @@ -93,7 +93,7 @@ glabel func_802426FC_87C2DC /* 87C434 80242854 0000102D */ daddu $v0, $zero, $zero /* 87C438 80242858 0280202D */ daddu $a0, $s4, $zero /* 87C43C 8024285C 0200282D */ daddu $a1, $s0, $zero -/* 87C440 80242860 0C0907F3 */ jal func_80241FCC_87BBAC +/* 87C440 80242860 0C0907F3 */ jal UnkNpcAIFunc2 /* 87C444 80242864 0260302D */ daddu $a2, $s3, $zero /* 87C448 80242868 0280202D */ daddu $a0, $s4, $zero /* 87C44C 8024286C 0200282D */ daddu $a1, $s0, $zero @@ -129,5 +129,5 @@ glabel func_802426FC_87C2DC /* 87C4BC 802428DC 8FB00030 */ lw $s0, 0x30($sp) /* 87C4C0 802428E0 03E00008 */ jr $ra /* 87C4C4 802428E4 27BD0050 */ addiu $sp, $sp, 0x50 -/* 87C4C8 802428E8 00000000 */ nop -/* 87C4CC 802428EC 00000000 */ nop +/* 87C4C8 802428E8 00000000 */ nop +/* 87C4CC 802428EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802429F4_9AADE4.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802429F4_9AADE4.s deleted file mode 100644 index a63b881af7..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802429F4_9AADE4.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802429F4_9AADE4 -/* 9AADE4 802429F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9AADE8 802429F8 AFB20018 */ sw $s2, 0x18($sp) -/* 9AADEC 802429FC 0080902D */ daddu $s2, $a0, $zero -/* 9AADF0 80242A00 AFBF001C */ sw $ra, 0x1c($sp) -/* 9AADF4 80242A04 AFB10014 */ sw $s1, 0x14($sp) -/* 9AADF8 80242A08 AFB00010 */ sw $s0, 0x10($sp) -/* 9AADFC 80242A0C 8E510148 */ lw $s1, 0x148($s2) -/* 9AAE00 80242A10 0C00EABB */ jal get_npc_unsafe -/* 9AAE04 80242A14 86240008 */ lh $a0, 8($s1) -/* 9AAE08 80242A18 0040802D */ daddu $s0, $v0, $zero -/* 9AAE0C 80242A1C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9AAE10 80242A20 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9AAE14 80242A24 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9AAE18 80242A28 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9AAE1C 80242A2C A600008E */ sh $zero, 0x8e($s0) -/* 9AAE20 80242A30 8C460028 */ lw $a2, 0x28($v0) -/* 9AAE24 80242A34 0C00A720 */ jal atan2 -/* 9AAE28 80242A38 8C470030 */ lw $a3, 0x30($v0) -/* 9AAE2C 80242A3C E600000C */ swc1 $f0, 0xc($s0) -/* 9AAE30 80242A40 8E2200CC */ lw $v0, 0xcc($s1) -/* 9AAE34 80242A44 8C420020 */ lw $v0, 0x20($v0) -/* 9AAE38 80242A48 AE020028 */ sw $v0, 0x28($s0) -/* 9AAE3C 80242A4C 2402000B */ addiu $v0, $zero, 0xb -/* 9AAE40 80242A50 AE420070 */ sw $v0, 0x70($s2) -/* 9AAE44 80242A54 8FBF001C */ lw $ra, 0x1c($sp) -/* 9AAE48 80242A58 8FB20018 */ lw $s2, 0x18($sp) -/* 9AAE4C 80242A5C 8FB10014 */ lw $s1, 0x14($sp) -/* 9AAE50 80242A60 8FB00010 */ lw $s0, 0x10($sp) -/* 9AAE54 80242A64 03E00008 */ jr $ra -/* 9AAE58 80242A68 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s index 57f32dc4a2..fdb24ab773 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s @@ -93,7 +93,7 @@ glabel func_80243124_9AB514 /* 9AB66C 8024327C 0000102D */ daddu $v0, $zero, $zero /* 9AB670 80243280 0280202D */ daddu $a0, $s4, $zero /* 9AB674 80243284 0200282D */ daddu $a1, $s0, $zero -/* 9AB678 80243288 0C090A7D */ jal func_802429F4_9AADE4 +/* 9AB678 80243288 0C090A7D */ jal UnkNpcAIFunc2 /* 9AB67C 8024328C 0260302D */ daddu $a2, $s3, $zero /* 9AB680 80243290 0280202D */ daddu $a0, $s4, $zero /* 9AB684 80243294 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s index bf659cc3b8..919c2b6efd 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s @@ -100,7 +100,7 @@ glabel func_80243650_9ABA40 /* 9ABBB4 802437C4 0000102D */ daddu $v0, $zero, $zero /* 9ABBB8 802437C8 0260202D */ daddu $a0, $s3, $zero /* 9ABBBC 802437CC 0200282D */ daddu $a1, $s0, $zero -/* 9ABBC0 802437D0 0C090A7D */ jal func_802429F4_9AADE4 +/* 9ABBC0 802437D0 0C090A7D */ jal UnkNpcAIFunc2 /* 9ABBC4 802437D4 0280302D */ daddu $a2, $s4, $zero /* 9ABBC8 802437D8 8E630070 */ lw $v1, 0x70($s3) /* 9ABBCC 802437DC 2402000B */ addiu $v0, $zero, 0xb diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802416C0_9B8040.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802416C0_9B8040.s deleted file mode 100644 index fcb384516f..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802416C0_9B8040.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416C0_9B8040 -/* 9B8040 802416C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9B8044 802416C4 AFB20018 */ sw $s2, 0x18($sp) -/* 9B8048 802416C8 0080902D */ daddu $s2, $a0, $zero -/* 9B804C 802416CC AFBF001C */ sw $ra, 0x1c($sp) -/* 9B8050 802416D0 AFB10014 */ sw $s1, 0x14($sp) -/* 9B8054 802416D4 AFB00010 */ sw $s0, 0x10($sp) -/* 9B8058 802416D8 8E510148 */ lw $s1, 0x148($s2) -/* 9B805C 802416DC 0C00EABB */ jal get_npc_unsafe -/* 9B8060 802416E0 86240008 */ lh $a0, 8($s1) -/* 9B8064 802416E4 0040802D */ daddu $s0, $v0, $zero -/* 9B8068 802416E8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9B806C 802416EC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9B8070 802416F0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9B8074 802416F4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9B8078 802416F8 A600008E */ sh $zero, 0x8e($s0) -/* 9B807C 802416FC 8C460028 */ lw $a2, 0x28($v0) -/* 9B8080 80241700 0C00A720 */ jal atan2 -/* 9B8084 80241704 8C470030 */ lw $a3, 0x30($v0) -/* 9B8088 80241708 E600000C */ swc1 $f0, 0xc($s0) -/* 9B808C 8024170C 8E2200CC */ lw $v0, 0xcc($s1) -/* 9B8090 80241710 8C420020 */ lw $v0, 0x20($v0) -/* 9B8094 80241714 AE020028 */ sw $v0, 0x28($s0) -/* 9B8098 80241718 2402000B */ addiu $v0, $zero, 0xb -/* 9B809C 8024171C AE420070 */ sw $v0, 0x70($s2) -/* 9B80A0 80241720 8FBF001C */ lw $ra, 0x1c($sp) -/* 9B80A4 80241724 8FB20018 */ lw $s2, 0x18($sp) -/* 9B80A8 80241728 8FB10014 */ lw $s1, 0x14($sp) -/* 9B80AC 8024172C 8FB00010 */ lw $s0, 0x10($sp) -/* 9B80B0 80241730 03E00008 */ jr $ra -/* 9B80B4 80241734 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s index 0473b1caf0..cd9299bd8c 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s @@ -93,7 +93,7 @@ glabel func_80241DF0_9B8770 /* 9B88C8 80241F48 0000102D */ daddu $v0, $zero, $zero /* 9B88CC 80241F4C 0280202D */ daddu $a0, $s4, $zero /* 9B88D0 80241F50 0200282D */ daddu $a1, $s0, $zero -/* 9B88D4 80241F54 0C0905B0 */ jal func_802416C0_9B8040 +/* 9B88D4 80241F54 0C0905B0 */ jal UnkNpcAIFunc2 /* 9B88D8 80241F58 0260302D */ daddu $a2, $s3, $zero /* 9B88DC 80241F5C 0280202D */ daddu $a0, $s4, $zero /* 9B88E0 80241F60 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s index e01ba01128..da69bfdfe6 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s @@ -100,7 +100,7 @@ glabel func_8024231C_9B8C9C /* 9B8E10 80242490 0000102D */ daddu $v0, $zero, $zero /* 9B8E14 80242494 0260202D */ daddu $a0, $s3, $zero /* 9B8E18 80242498 0200282D */ daddu $a1, $s0, $zero -/* 9B8E1C 8024249C 0C0905B0 */ jal func_802416C0_9B8040 +/* 9B8E1C 8024249C 0C0905B0 */ jal UnkNpcAIFunc2 /* 9B8E20 802424A0 0280302D */ daddu $a2, $s4, $zero /* 9B8E24 802424A4 8E630070 */ lw $v1, 0x70($s3) /* 9B8E28 802424A8 2402000B */ addiu $v0, $zero, 0xb diff --git a/src/code_20ec0_len_5040.c b/src/code_20ec0_len_5040.c index acb39e02ba..1892b83b2f 100644 --- a/src/code_20ec0_len_5040.c +++ b/src/code_20ec0_len_5040.c @@ -197,7 +197,7 @@ INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800495A0); INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800496B8); // Same as UnkNpcAIFunc1 -void func_80049B44(ScriptInstance *script, NpcAISettings *aiSettings) { +void func_80049B44(ScriptInstance* script, NpcAISettings* aiSettings) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/area_arn/arn_04/BE37B0.c b/src/world/area_arn/arn_04/BE37B0.c index 6c66f39caf..25aec44bfb 100644 --- a/src/world/area_arn/arn_04/BE37B0.c +++ b/src/world/area_arn/arn_04/BE37B0.c @@ -33,7 +33,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241668_BE4E18); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241728_BE4ED8); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241A6C_BE521C); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241AE4_BE5294); diff --git a/src/world/area_arn/arn_07/BED740.c b/src/world/area_arn/arn_07/BED740.c index cf7f88b82f..15ee0aa405 100644 --- a/src/world/area_arn/arn_07/BED740.c +++ b/src/world/area_arn/arn_07/BED740.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80240B00_BED8F0); INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_802411E8_BEDFD8); -INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_8024152C_BEE31C); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_802415A4_BEE394); diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index 0e7b795655..5f52ca2914 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802402D0_BFDB50); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802409B8_BFE238); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240CFC_BFE57C); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240D74_BFE5F4); diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index a4f838f62d..d67f4be315 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802401B0_C366E0); INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240898_C36DC8); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240BDC_C3710C); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240C54_C37184); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 8f23033842..91a0211327 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -47,7 +47,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241F38_C41CE8); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241FF8_C41DA8); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_8024233C_C420EC); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802423B4_C42164); diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 74d05f6d7e..c3ee26d073 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802415D4_C481B4); INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80241CBC_C4889C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242000_C48BE0); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242078_C48C58); diff --git a/src/world/area_flo/flo_09/CB5320.c b/src/world/area_flo/flo_09/CB5320.c index 8a70afdbc0..f3770008f2 100644 --- a/src/world/area_flo/flo_09/CB5320.c +++ b/src/world/area_flo/flo_09/CB5320.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_802404D0_CB54D0); INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240BB8_CB5BB8); -INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240EFC_CB5EFC); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240F74_CB5F74); diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index 656ccc51a1..66b39ff220 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240374_CC3B84); INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240A5C_CC426C); -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240DA0_CC45B0); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240E18_CC4628); diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index 065b8f48a6..5a8839672b 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80240CC0_CCBFD0); INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_802413A8_CCC6B8); -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_802416EC_CCC9FC); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241764_CCCA74); diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c index e5bc36de86..80c656fabd 100644 --- a/src/world/area_flo/flo_16/CD2C80.c +++ b/src/world/area_flo/flo_16/CD2C80.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241000_CD2E30); INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_802416E8_CD3518); -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241A2C_CD385C); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241AA4_CD38D4); diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index 8fa99eec86..0c0e586bea 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240220_CD7500); INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240908_CD7BE8); -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240C4C_CD7F2C); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240CC4_CD7FA4); diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index 32e4b76ed9..391111f892 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_802401F0_CF2DC0); INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_802408D8_CF34A8); -INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240C1C_CF37EC); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240C94_CF3864); diff --git a/src/world/area_hos/hos_02/A17210.c b/src/world/area_hos/hos_02/A17210.c index 1cd982479c..f7ceb301b9 100644 --- a/src/world/area_hos/hos_02/A17210.c +++ b/src/world/area_hos/hos_02/A17210.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802411A0_A173C0); INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241888_A17AA8); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241BCC_A17DEC); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241C44_A17E64); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 6439922b9e..459737beee 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80240E60_A1BF60); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241548_A1C648); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024188C_A1C98C); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241904_A1CA04); diff --git a/src/world/area_kmr/kmr_05/8CE070.c b/src/world/area_kmr/kmr_05/8CE070.c index 237b557bdc..fca5d7eed9 100644 --- a/src/world/area_kmr/kmr_05/8CE070.c +++ b/src/world/area_kmr/kmr_05/8CE070.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_802401B0_8CE220); INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240898_8CE908); -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240BDC_8CEC4C); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240C54_8CECC4); diff --git a/src/world/area_kmr/kmr_06/8D1510.c b/src/world/area_kmr/kmr_06/8D1510.c index 669d49b006..3da8c35ffa 100644 --- a/src/world/area_kmr/kmr_06/8D1510.c +++ b/src/world/area_kmr/kmr_06/8D1510.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_802401B0_8D16C0); INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240898_8D1DA8); -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240BDC_8D20EC); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240C54_8D2164); diff --git a/src/world/area_kmr/kmr_09/8D5E00.c b/src/world/area_kmr/kmr_09/8D5E00.c index 8882471e2e..d9f63fa0f5 100644 --- a/src/world/area_kmr/kmr_09/8D5E00.c +++ b/src/world/area_kmr/kmr_09/8D5E00.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_802401B0_8D5FB0); INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240898_8D6698); -INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240BDC_8D69DC); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240C54_8D6A54); diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index 3e8d0ac22e..d2dd639b04 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80240690_C5ADD0); INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80240D78_C5B4B8); -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802410BC_C5B7FC); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241134_C5B874); diff --git a/src/world/area_kzn/kzn_07/C6EA50.c b/src/world/area_kzn/kzn_07/C6EA50.c index 4f77afb547..d7002da87c 100644 --- a/src/world/area_kzn/kzn_07/C6EA50.c +++ b/src/world/area_kzn/kzn_07/C6EA50.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802409D0_C6ED00); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802410B8_C6F3E8); -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802413FC_C6F72C); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241474_C6F7A4); diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index 32f8a80c5f..b784059611 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80240C00_C72080); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802412E8_C72768); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_8024162C_C72AAC); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802416A4_C72B24); diff --git a/src/world/area_kzn/kzn_11/C80600.c b/src/world/area_kzn/kzn_11/C80600.c index f53fdd04dc..9be2eab9cd 100644 --- a/src/world/area_kzn/kzn_11/C80600.c +++ b/src/world/area_kzn/kzn_11/C80600.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80240610_C807B0); INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80240CF8_C80E98); -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_8024103C_C811DC); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_802410B4_C81254); diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index e3951dd1df..587a1ca76f 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240250_BADB90); INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240938_BAE278); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240C7C_BAE5BC); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240CF4_BAE634); diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c index acc684c751..a56dcf1a9b 100644 --- a/src/world/area_nok/nok_11/9F4A40.c +++ b/src/world/area_nok/nok_11/9F4A40.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80240984_9F53C4); INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_8024106C_9F5AAC); -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_802413B0_9F5DF0); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241428_9F5E68); diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c index 23f833aec6..aee9d34941 100644 --- a/src/world/area_nok/nok_14/A02A00.c +++ b/src/world/area_nok/nok_14/A02A00.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240B44_A03384); INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_8024122C_A03A6C); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241570_A03DB0); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802415E8_A03E28); diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 20fc844f2d..ddca1215de 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240C64_A07B64); INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024134C_A0824C); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241690_A08590); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241708_A08608); diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index 942ff70697..e4ae976622 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240550_DAD950); INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240C38_DAE038); -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240F7C_DAE37C); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240FF4_DAE3F4); diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index b1f617f1b2..c868927300 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240C04_DB2EC4); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802412EC_DB35AC); -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241630_DB38F0); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802416A8_DB3968); diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index 229f38cf3d..2938a5db3f 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -53,7 +53,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242150_DBF400); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242210_DBF4C0); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242554_DBF804); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802425CC_DBF87C); diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index 534ddba058..a5519cb941 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241164_DF0004); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_8024184C_DF06EC); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241B90_DF0A30); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241C08_DF0AA8); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index ee279a4b20..57d4b88226 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240700_D20590); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240DE8_D20C78); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_8024112C_D20FBC); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802411A4_D21034); diff --git a/src/world/area_tik/tik_07/87AC00.c b/src/world/area_tik/tik_07/87AC00.c index 92432041bb..6111d31a35 100644 --- a/src/world/area_tik/tik_07/87AC00.c +++ b/src/world/area_tik/tik_07/87AC00.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802415A0_87B180); INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241C88_87B868); -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241FCC_87BBAC); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80242044_87BC24); diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index d25ce5a0c1..81226ad54e 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -45,7 +45,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802425F0_9AA9E0); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802426B0_9AAAA0); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802429F4_9AADE4); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242A6C_9AAE5C); diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c index 41ba0a6d25..9854d05329 100644 --- a/src/world/area_trd/trd_07/9B6C90.c +++ b/src/world/area_trd/trd_07/9B6C90.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80240C94_9B7614); INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024137C_9B7CFC); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802416C0_9B8040); +#include "world/common/UnkNpcAIFunc2.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80241738_9B80B8); diff --git a/src/world/common/NpcJumpFunc.inc.c b/src/world/common/NpcJumpFunc.inc.c index 3af3272483..0ad2b822f6 100644 --- a/src/world/common/NpcJumpFunc.inc.c +++ b/src/world/common/NpcJumpFunc.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void NpcJumpFunc(ScriptInstance *script) { +static void NpcJumpFunc(ScriptInstance* script) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); npc->pos.y += npc->jumpVelocity; diff --git a/src/world/common/UnkNpcAIFunc1.inc.c b/src/world/common/UnkNpcAIFunc1.inc.c index 8277c09c38..7d51db109e 100644 --- a/src/world/common/UnkNpcAIFunc1.inc.c +++ b/src/world/common/UnkNpcAIFunc1.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void UnkNpcAIFunc1(ScriptInstance *script, NpcAISettings *aiSettings) { +static void UnkNpcAIFunc1(ScriptInstance* script, NpcAISettings* aiSettings) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/UnkNpcAIFunc2.inc.c b/src/world/common/UnkNpcAIFunc2.inc.c new file mode 100644 index 0000000000..644b34e982 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc2.inc.c @@ -0,0 +1,13 @@ +#include "common.h" +#include "map.h" + +static void UnkNpcAIFunc2(ScriptInstance* script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + PlayerStatus* playerStatus = gPlayerStatusPtr; + + npc->duration = 0; + npc->yaw = atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z); + npc->currentAnim = enemy->animList[8]; + script->functionTemp[0].s = 11; +} From 931d3b358bc7c1221623a06124056a06001607b5 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 21 Nov 2020 20:54:57 -0500 Subject: [PATCH 15/38] UnkNpcAIFunc3 --- .../arn_04/BE37B0/func_80241C84_BE5434.s | 31 ------------------- .../arn_04/BE37B0/func_8024219C_BE594C.s | 2 +- .../arn_07/BED740/func_80241744_BEE534.s | 31 ------------------- .../arn_07/BED740/func_80241C5C_BEEA4C.s | 2 +- .../dgb_01/BFD9A0/func_80240F14_BFE794.s | 31 ------------------- .../dgb_01/BFD9A0/func_8024142C_BFECAC.s | 2 +- .../dgb_04/C36530/func_80240DF4_C37324.s | 31 ------------------- .../dgb_04/C36530/func_8024130C_C3783C.s | 2 +- .../dgb_08/C3FDB0/func_80242554_C42304.s | 31 ------------------- .../dgb_08/C3FDB0/func_80242A6C_C4281C.s | 2 +- .../dgb_09/C46BE0/func_80242218_C48DF8.s | 31 ------------------- .../dgb_09/C46BE0/func_80242730_C49310.s | 2 +- .../flo_09/CB5320/func_80241114_CB6114.s | 31 ------------------- .../flo_09/CB5320/func_8024162C_CB662C.s | 2 +- .../flo_13/CC3850/func_80240FB8_CC47C8.s | 31 ------------------- .../flo_13/CC3850/func_802414D0_CC4CE0.s | 2 +- .../flo_13/CC3850/func_80241DB8_CC55C8.s | 2 +- .../flo_14/CCBE20/func_80241904_CCCC14.s | 31 ------------------- .../flo_14/CCBE20/func_80241E1C_CCD12C.s | 2 +- .../flo_16/CD2C80/func_80241C44_CD3A74.s | 31 ------------------- .../flo_16/CD2C80/func_8024215C_CD3F8C.s | 2 +- .../flo_17/CD7350/func_80240E64_CD8144.s | 31 ------------------- .../flo_17/CD7350/func_8024137C_CD865C.s | 2 +- .../flo_17/CD7350/func_80241C64_CD8F44.s | 2 +- .../flo_25/CF2C10/func_80240E34_CF3A04.s | 31 ------------------- .../flo_25/CF2C10/func_8024134C_CF3F1C.s | 2 +- .../hos_02/A17210/func_80241DE4_A18004.s | 31 ------------------- .../hos_02/A17210/func_802422FC_A1851C.s | 2 +- .../hos_03/A1BDB0/func_80241AA4_A1CBA4.s | 31 ------------------- .../hos_03/A1BDB0/func_80241FBC_A1D0BC.s | 2 +- .../kmr_05/8CE070/func_80240DF4_8CEE64.s | 31 ------------------- .../kmr_05/8CE070/func_8024130C_8CF37C.s | 2 +- .../kmr_06/8D1510/func_80240DF4_8D2304.s | 31 ------------------- .../kmr_06/8D1510/func_8024130C_8D281C.s | 2 +- .../kmr_09/8D5E00/func_80240DF4_8D6BF4.s | 31 ------------------- .../kmr_09/8D5E00/func_8024130C_8D710C.s | 2 +- .../kzn_02/C5AC20/func_802412D4_C5BA14.s | 31 ------------------- .../kzn_02/C5AC20/func_802417EC_C5BF2C.s | 2 +- .../kzn_07/C6EA50/func_80241614_C6F944.s | 31 ------------------- .../kzn_07/C6EA50/func_80241B2C_C6FE5C.s | 2 +- .../kzn_08/C71ED0/func_80241844_C72CC4.s | 31 ------------------- .../kzn_08/C71ED0/func_80241D5C_C731DC.s | 2 +- .../kzn_11/C80600/func_80241254_C813F4.s | 31 ------------------- .../kzn_11/C80600/func_8024176C_C8190C.s | 2 +- .../mim_08/BAD940/func_80240E94_BAE7D4.s | 31 ------------------- .../mim_08/BAD940/func_802413AC_BAECEC.s | 2 +- .../nok_11/9F4A40/func_802415C8_9F6008.s | 31 ------------------- .../nok_11/9F4A40/func_80241AE0_9F6520.s | 2 +- .../nok_14/A02A00/func_80241788_A03FC8.s | 31 ------------------- .../nok_14/A02A00/func_80241CA0_A044E0.s | 2 +- .../nok_15/A06F00/func_802418A8_A087A8.s | 31 ------------------- .../nok_15/A06F00/func_80241DC0_A08CC0.s | 2 +- .../omo_04/DAD400/func_80241194_DAE594.s | 31 ------------------- .../omo_04/DAD400/func_802416AC_DAEAAC.s | 2 +- .../omo_05/DB22C0/func_80241848_DB3B08.s | 31 ------------------- .../omo_05/DB22C0/func_80241D60_DB4020.s | 2 +- .../omo_07/DBD2B0/func_8024276C_DBFA1C.s | 31 ------------------- .../omo_07/DBD2B0/func_80242C84_DBFF34.s | 2 +- .../omo_17/DEF400/func_80241DA8_DF0C48.s | 31 ------------------- .../omo_17/DEF400/func_802422C0_DF1160.s | 2 +- .../sam_06/D203E0/func_80241344_D211D4.s | 31 ------------------- .../sam_06/D203E0/func_8024185C_D216EC.s | 2 +- .../tik_07/87AC00/func_802421E4_87BDC4.s | 31 ------------------- .../tik_07/87AC00/func_802426FC_87C2DC.s | 2 +- .../trd_04/9A88A0/func_80242C0C_9AAFFC.s | 31 ------------------- .../trd_04/9A88A0/func_80243124_9AB514.s | 2 +- .../trd_07/9B6C90/func_802418D8_9B8258.s | 31 ------------------- .../trd_07/9B6C90/func_80241DF0_9B8770.s | 2 +- include/common_structs.h | 2 +- src/world/area_arn/arn_04/BE37B0.c | 2 +- src/world/area_arn/arn_07/BED740.c | 2 +- src/world/area_dgb/dgb_01/BFD9A0.c | 2 +- src/world/area_dgb/dgb_04/C36530.c | 2 +- src/world/area_dgb/dgb_08/C3FDB0.c | 2 +- src/world/area_dgb/dgb_09/C46BE0.c | 2 +- src/world/area_flo/flo_09/CB5320.c | 2 +- src/world/area_flo/flo_13/CC3850.c | 2 +- src/world/area_flo/flo_14/CCBE20.c | 2 +- src/world/area_flo/flo_16/CD2C80.c | 2 +- src/world/area_flo/flo_17/CD7350.c | 2 +- src/world/area_flo/flo_25/CF2C10.c | 2 +- src/world/area_hos/hos_02/A17210.c | 2 +- src/world/area_hos/hos_03/A1BDB0.c | 2 +- src/world/area_kmr/kmr_05/8CE070.c | 2 +- src/world/area_kmr/kmr_06/8D1510.c | 2 +- src/world/area_kmr/kmr_09/8D5E00.c | 2 +- src/world/area_kzn/kzn_02/C5AC20.c | 2 +- src/world/area_kzn/kzn_07/C6EA50.c | 2 +- src/world/area_kzn/kzn_08/C71ED0.c | 2 +- src/world/area_kzn/kzn_11/C80600.c | 2 +- src/world/area_mim/mim_08/BAD940.c | 2 +- src/world/area_nok/nok_11/9F4A40.c | 2 +- src/world/area_nok/nok_14/A02A00.c | 2 +- src/world/area_nok/nok_15/A06F00.c | 2 +- src/world/area_omo/omo_04/DAD400.c | 2 +- src/world/area_omo/omo_05/DB22C0.c | 2 +- src/world/area_omo/omo_07/DBD2B0.c | 2 +- src/world/area_omo/omo_17/DEF400.c | 2 +- src/world/area_sam/sam_06/D203E0.c | 2 +- src/world/area_tik/tik_07/87AC00.c | 2 +- src/world/area_trd/trd_04/9A88A0.c | 2 +- src/world/area_trd/trd_07/9B6C90.c | 2 +- src/world/common/UnkNpcAIFunc3.inc.c | 13 ++++++++ 103 files changed, 82 insertions(+), 1092 deletions(-) delete mode 100644 asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241C84_BE5434.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241744_BEE534.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F14_BFE794.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240DF4_C37324.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242554_C42304.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242218_C48DF8.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241114_CB6114.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240FB8_CC47C8.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241904_CCCC14.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241C44_CD3A74.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240E64_CD8144.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240E34_CF3A04.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241DE4_A18004.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241AA4_A1CBA4.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240DF4_8CEE64.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240DF4_8D2304.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240DF4_8D6BF4.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802412D4_C5BA14.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241614_C6F944.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241844_C72CC4.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241254_C813F4.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240E94_BAE7D4.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802415C8_9F6008.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241788_A03FC8.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802418A8_A087A8.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241194_DAE594.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241848_DB3B08.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024276C_DBFA1C.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241DA8_DF0C48.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241344_D211D4.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802421E4_87BDC4.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C0C_9AAFFC.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802418D8_9B8258.s create mode 100644 src/world/common/UnkNpcAIFunc3.inc.c diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241C84_BE5434.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241C84_BE5434.s deleted file mode 100644 index 108944b527..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241C84_BE5434.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C84_BE5434 -/* BE5434 80241C84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BE5438 80241C88 AFB00010 */ sw $s0, 0x10($sp) -/* BE543C 80241C8C 0080802D */ daddu $s0, $a0, $zero -/* BE5440 80241C90 AFBF0014 */ sw $ra, 0x14($sp) -/* BE5444 80241C94 8E020148 */ lw $v0, 0x148($s0) -/* BE5448 80241C98 0C00EABB */ jal get_npc_unsafe -/* BE544C 80241C9C 84440008 */ lh $a0, 8($v0) -/* BE5450 80241CA0 0040202D */ daddu $a0, $v0, $zero -/* BE5454 80241CA4 8482008E */ lh $v0, 0x8e($a0) -/* BE5458 80241CA8 9483008E */ lhu $v1, 0x8e($a0) -/* BE545C 80241CAC 18400005 */ blez $v0, .L80241CC4 -/* BE5460 80241CB0 2462FFFF */ addiu $v0, $v1, -1 -/* BE5464 80241CB4 A482008E */ sh $v0, 0x8e($a0) -/* BE5468 80241CB8 00021400 */ sll $v0, $v0, 0x10 -/* BE546C 80241CBC 1C400006 */ bgtz $v0, .L80241CD8 -/* BE5470 80241CC0 00000000 */ nop -.L80241CC4: -/* BE5474 80241CC4 8482008C */ lh $v0, 0x8c($a0) -/* BE5478 80241CC8 14400003 */ bnez $v0, .L80241CD8 -/* BE547C 80241CCC 2402000E */ addiu $v0, $zero, 0xe -/* BE5480 80241CD0 A480008E */ sh $zero, 0x8e($a0) -/* BE5484 80241CD4 AE020070 */ sw $v0, 0x70($s0) -.L80241CD8: -/* BE5488 80241CD8 8FBF0014 */ lw $ra, 0x14($sp) -/* BE548C 80241CDC 8FB00010 */ lw $s0, 0x10($sp) -/* BE5490 80241CE0 03E00008 */ jr $ra -/* BE5494 80241CE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s index 8ce09a1b30..596a05708a 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s @@ -109,7 +109,7 @@ glabel func_8024219C_BE594C /* BE5AE4 80242334 0000102D */ daddu $v0, $zero, $zero /* BE5AE8 80242338 0280202D */ daddu $a0, $s4, $zero /* BE5AEC 8024233C 0200282D */ daddu $a1, $s0, $zero -/* BE5AF0 80242340 0C090721 */ jal func_80241C84_BE5434 +/* BE5AF0 80242340 0C090721 */ jal UnkNpcAIFunc3 /* BE5AF4 80242344 0260302D */ daddu $a2, $s3, $zero /* BE5AF8 80242348 080908D9 */ j .L80242364 /* BE5AFC 8024234C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241744_BEE534.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241744_BEE534.s deleted file mode 100644 index 2a5c1285fc..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241744_BEE534.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241744_BEE534 -/* BEE534 80241744 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BEE538 80241748 AFB00010 */ sw $s0, 0x10($sp) -/* BEE53C 8024174C 0080802D */ daddu $s0, $a0, $zero -/* BEE540 80241750 AFBF0014 */ sw $ra, 0x14($sp) -/* BEE544 80241754 8E020148 */ lw $v0, 0x148($s0) -/* BEE548 80241758 0C00EABB */ jal get_npc_unsafe -/* BEE54C 8024175C 84440008 */ lh $a0, 8($v0) -/* BEE550 80241760 0040202D */ daddu $a0, $v0, $zero -/* BEE554 80241764 8482008E */ lh $v0, 0x8e($a0) -/* BEE558 80241768 9483008E */ lhu $v1, 0x8e($a0) -/* BEE55C 8024176C 18400005 */ blez $v0, .L80241784 -/* BEE560 80241770 2462FFFF */ addiu $v0, $v1, -1 -/* BEE564 80241774 A482008E */ sh $v0, 0x8e($a0) -/* BEE568 80241778 00021400 */ sll $v0, $v0, 0x10 -/* BEE56C 8024177C 1C400006 */ bgtz $v0, .L80241798 -/* BEE570 80241780 00000000 */ nop -.L80241784: -/* BEE574 80241784 8482008C */ lh $v0, 0x8c($a0) -/* BEE578 80241788 14400003 */ bnez $v0, .L80241798 -/* BEE57C 8024178C 2402000E */ addiu $v0, $zero, 0xe -/* BEE580 80241790 A480008E */ sh $zero, 0x8e($a0) -/* BEE584 80241794 AE020070 */ sw $v0, 0x70($s0) -.L80241798: -/* BEE588 80241798 8FBF0014 */ lw $ra, 0x14($sp) -/* BEE58C 8024179C 8FB00010 */ lw $s0, 0x10($sp) -/* BEE590 802417A0 03E00008 */ jr $ra -/* BEE594 802417A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s index 4fea933a15..7368a0f8b2 100644 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s +++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s @@ -109,7 +109,7 @@ glabel func_80241C5C_BEEA4C /* BEEBE4 80241DF4 0000102D */ daddu $v0, $zero, $zero /* BEEBE8 80241DF8 0280202D */ daddu $a0, $s4, $zero /* BEEBEC 80241DFC 0200282D */ daddu $a1, $s0, $zero -/* BEEBF0 80241E00 0C0905D1 */ jal func_80241744_BEE534 +/* BEEBF0 80241E00 0C0905D1 */ jal UnkNpcAIFunc3 /* BEEBF4 80241E04 0260302D */ daddu $a2, $s3, $zero /* BEEBF8 80241E08 08090789 */ j .L80241E24 /* BEEBFC 80241E0C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F14_BFE794.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F14_BFE794.s deleted file mode 100644 index e4afbbbb39..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F14_BFE794.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F14_BFE794 -/* BFE794 80240F14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BFE798 80240F18 AFB00010 */ sw $s0, 0x10($sp) -/* BFE79C 80240F1C 0080802D */ daddu $s0, $a0, $zero -/* BFE7A0 80240F20 AFBF0014 */ sw $ra, 0x14($sp) -/* BFE7A4 80240F24 8E020148 */ lw $v0, 0x148($s0) -/* BFE7A8 80240F28 0C00EABB */ jal get_npc_unsafe -/* BFE7AC 80240F2C 84440008 */ lh $a0, 8($v0) -/* BFE7B0 80240F30 0040202D */ daddu $a0, $v0, $zero -/* BFE7B4 80240F34 8482008E */ lh $v0, 0x8e($a0) -/* BFE7B8 80240F38 9483008E */ lhu $v1, 0x8e($a0) -/* BFE7BC 80240F3C 18400005 */ blez $v0, .L80240F54 -/* BFE7C0 80240F40 2462FFFF */ addiu $v0, $v1, -1 -/* BFE7C4 80240F44 A482008E */ sh $v0, 0x8e($a0) -/* BFE7C8 80240F48 00021400 */ sll $v0, $v0, 0x10 -/* BFE7CC 80240F4C 1C400006 */ bgtz $v0, .L80240F68 -/* BFE7D0 80240F50 00000000 */ nop -.L80240F54: -/* BFE7D4 80240F54 8482008C */ lh $v0, 0x8c($a0) -/* BFE7D8 80240F58 14400003 */ bnez $v0, .L80240F68 -/* BFE7DC 80240F5C 2402000E */ addiu $v0, $zero, 0xe -/* BFE7E0 80240F60 A480008E */ sh $zero, 0x8e($a0) -/* BFE7E4 80240F64 AE020070 */ sw $v0, 0x70($s0) -.L80240F68: -/* BFE7E8 80240F68 8FBF0014 */ lw $ra, 0x14($sp) -/* BFE7EC 80240F6C 8FB00010 */ lw $s0, 0x10($sp) -/* BFE7F0 80240F70 03E00008 */ jr $ra -/* BFE7F4 80240F74 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s index 115692bf36..bb1ea83b94 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s @@ -109,7 +109,7 @@ glabel func_8024142C_BFECAC /* BFEE44 802415C4 0000102D */ daddu $v0, $zero, $zero /* BFEE48 802415C8 0280202D */ daddu $a0, $s4, $zero /* BFEE4C 802415CC 0200282D */ daddu $a1, $s0, $zero -/* BFEE50 802415D0 0C0903C5 */ jal func_80240F14_BFE794 +/* BFEE50 802415D0 0C0903C5 */ jal UnkNpcAIFunc3 /* BFEE54 802415D4 0260302D */ daddu $a2, $s3, $zero /* BFEE58 802415D8 0809057D */ j .L802415F4 /* BFEE5C 802415DC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240DF4_C37324.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240DF4_C37324.s deleted file mode 100644 index 2648e7b444..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240DF4_C37324.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF4_C37324 -/* C37324 80240DF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C37328 80240DF8 AFB00010 */ sw $s0, 0x10($sp) -/* C3732C 80240DFC 0080802D */ daddu $s0, $a0, $zero -/* C37330 80240E00 AFBF0014 */ sw $ra, 0x14($sp) -/* C37334 80240E04 8E020148 */ lw $v0, 0x148($s0) -/* C37338 80240E08 0C00EABB */ jal get_npc_unsafe -/* C3733C 80240E0C 84440008 */ lh $a0, 8($v0) -/* C37340 80240E10 0040202D */ daddu $a0, $v0, $zero -/* C37344 80240E14 8482008E */ lh $v0, 0x8e($a0) -/* C37348 80240E18 9483008E */ lhu $v1, 0x8e($a0) -/* C3734C 80240E1C 18400005 */ blez $v0, .L80240E34 -/* C37350 80240E20 2462FFFF */ addiu $v0, $v1, -1 -/* C37354 80240E24 A482008E */ sh $v0, 0x8e($a0) -/* C37358 80240E28 00021400 */ sll $v0, $v0, 0x10 -/* C3735C 80240E2C 1C400006 */ bgtz $v0, .L80240E48 -/* C37360 80240E30 00000000 */ nop -.L80240E34: -/* C37364 80240E34 8482008C */ lh $v0, 0x8c($a0) -/* C37368 80240E38 14400003 */ bnez $v0, .L80240E48 -/* C3736C 80240E3C 2402000E */ addiu $v0, $zero, 0xe -/* C37370 80240E40 A480008E */ sh $zero, 0x8e($a0) -/* C37374 80240E44 AE020070 */ sw $v0, 0x70($s0) -.L80240E48: -/* C37378 80240E48 8FBF0014 */ lw $ra, 0x14($sp) -/* C3737C 80240E4C 8FB00010 */ lw $s0, 0x10($sp) -/* C37380 80240E50 03E00008 */ jr $ra -/* C37384 80240E54 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s index c3f7bfe8a8..8d55a1b440 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s @@ -109,7 +109,7 @@ glabel func_8024130C_C3783C /* C379D4 802414A4 0000102D */ daddu $v0, $zero, $zero /* C379D8 802414A8 0280202D */ daddu $a0, $s4, $zero /* C379DC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* C379E0 802414B0 0C09037D */ jal func_80240DF4_C37324 +/* C379E0 802414B0 0C09037D */ jal UnkNpcAIFunc3 /* C379E4 802414B4 0260302D */ daddu $a2, $s3, $zero /* C379E8 802414B8 08090535 */ j .L802414D4 /* C379EC 802414BC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242554_C42304.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242554_C42304.s deleted file mode 100644 index e40a0322b7..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242554_C42304.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242554_C42304 -/* C42304 80242554 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C42308 80242558 AFB00010 */ sw $s0, 0x10($sp) -/* C4230C 8024255C 0080802D */ daddu $s0, $a0, $zero -/* C42310 80242560 AFBF0014 */ sw $ra, 0x14($sp) -/* C42314 80242564 8E020148 */ lw $v0, 0x148($s0) -/* C42318 80242568 0C00EABB */ jal get_npc_unsafe -/* C4231C 8024256C 84440008 */ lh $a0, 8($v0) -/* C42320 80242570 0040202D */ daddu $a0, $v0, $zero -/* C42324 80242574 8482008E */ lh $v0, 0x8e($a0) -/* C42328 80242578 9483008E */ lhu $v1, 0x8e($a0) -/* C4232C 8024257C 18400005 */ blez $v0, .L80242594 -/* C42330 80242580 2462FFFF */ addiu $v0, $v1, -1 -/* C42334 80242584 A482008E */ sh $v0, 0x8e($a0) -/* C42338 80242588 00021400 */ sll $v0, $v0, 0x10 -/* C4233C 8024258C 1C400006 */ bgtz $v0, .L802425A8 -/* C42340 80242590 00000000 */ nop -.L80242594: -/* C42344 80242594 8482008C */ lh $v0, 0x8c($a0) -/* C42348 80242598 14400003 */ bnez $v0, .L802425A8 -/* C4234C 8024259C 2402000E */ addiu $v0, $zero, 0xe -/* C42350 802425A0 A480008E */ sh $zero, 0x8e($a0) -/* C42354 802425A4 AE020070 */ sw $v0, 0x70($s0) -.L802425A8: -/* C42358 802425A8 8FBF0014 */ lw $ra, 0x14($sp) -/* C4235C 802425AC 8FB00010 */ lw $s0, 0x10($sp) -/* C42360 802425B0 03E00008 */ jr $ra -/* C42364 802425B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s index 26f9e61aba..0614bf0d27 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s @@ -109,7 +109,7 @@ glabel func_80242A6C_C4281C /* C429B4 80242C04 0000102D */ daddu $v0, $zero, $zero /* C429B8 80242C08 0280202D */ daddu $a0, $s4, $zero /* C429BC 80242C0C 0200282D */ daddu $a1, $s0, $zero -/* C429C0 80242C10 0C090955 */ jal func_80242554_C42304 +/* C429C0 80242C10 0C090955 */ jal UnkNpcAIFunc3 /* C429C4 80242C14 0260302D */ daddu $a2, $s3, $zero /* C429C8 80242C18 08090B0D */ j .L80242C34 /* C429CC 80242C1C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242218_C48DF8.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242218_C48DF8.s deleted file mode 100644 index d60561be83..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242218_C48DF8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242218_C48DF8 -/* C48DF8 80242218 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C48DFC 8024221C AFB00010 */ sw $s0, 0x10($sp) -/* C48E00 80242220 0080802D */ daddu $s0, $a0, $zero -/* C48E04 80242224 AFBF0014 */ sw $ra, 0x14($sp) -/* C48E08 80242228 8E020148 */ lw $v0, 0x148($s0) -/* C48E0C 8024222C 0C00EABB */ jal get_npc_unsafe -/* C48E10 80242230 84440008 */ lh $a0, 8($v0) -/* C48E14 80242234 0040202D */ daddu $a0, $v0, $zero -/* C48E18 80242238 8482008E */ lh $v0, 0x8e($a0) -/* C48E1C 8024223C 9483008E */ lhu $v1, 0x8e($a0) -/* C48E20 80242240 18400005 */ blez $v0, .L80242258 -/* C48E24 80242244 2462FFFF */ addiu $v0, $v1, -1 -/* C48E28 80242248 A482008E */ sh $v0, 0x8e($a0) -/* C48E2C 8024224C 00021400 */ sll $v0, $v0, 0x10 -/* C48E30 80242250 1C400006 */ bgtz $v0, .L8024226C -/* C48E34 80242254 00000000 */ nop -.L80242258: -/* C48E38 80242258 8482008C */ lh $v0, 0x8c($a0) -/* C48E3C 8024225C 14400003 */ bnez $v0, .L8024226C -/* C48E40 80242260 2402000E */ addiu $v0, $zero, 0xe -/* C48E44 80242264 A480008E */ sh $zero, 0x8e($a0) -/* C48E48 80242268 AE020070 */ sw $v0, 0x70($s0) -.L8024226C: -/* C48E4C 8024226C 8FBF0014 */ lw $ra, 0x14($sp) -/* C48E50 80242270 8FB00010 */ lw $s0, 0x10($sp) -/* C48E54 80242274 03E00008 */ jr $ra -/* C48E58 80242278 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s index 0ab0a00af2..82c79f9539 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s @@ -109,7 +109,7 @@ glabel func_80242730_C49310 /* C494A8 802428C8 0000102D */ daddu $v0, $zero, $zero /* C494AC 802428CC 0280202D */ daddu $a0, $s4, $zero /* C494B0 802428D0 0200282D */ daddu $a1, $s0, $zero -/* C494B4 802428D4 0C090886 */ jal func_80242218_C48DF8 +/* C494B4 802428D4 0C090886 */ jal UnkNpcAIFunc3 /* C494B8 802428D8 0260302D */ daddu $a2, $s3, $zero /* C494BC 802428DC 08090A3E */ j .L802428F8 /* C494C0 802428E0 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241114_CB6114.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241114_CB6114.s deleted file mode 100644 index ae7d0908a3..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241114_CB6114.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241114_CB6114 -/* CB6114 80241114 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CB6118 80241118 AFB00010 */ sw $s0, 0x10($sp) -/* CB611C 8024111C 0080802D */ daddu $s0, $a0, $zero -/* CB6120 80241120 AFBF0014 */ sw $ra, 0x14($sp) -/* CB6124 80241124 8E020148 */ lw $v0, 0x148($s0) -/* CB6128 80241128 0C00EABB */ jal get_npc_unsafe -/* CB612C 8024112C 84440008 */ lh $a0, 8($v0) -/* CB6130 80241130 0040202D */ daddu $a0, $v0, $zero -/* CB6134 80241134 8482008E */ lh $v0, 0x8e($a0) -/* CB6138 80241138 9483008E */ lhu $v1, 0x8e($a0) -/* CB613C 8024113C 18400005 */ blez $v0, .L80241154 -/* CB6140 80241140 2462FFFF */ addiu $v0, $v1, -1 -/* CB6144 80241144 A482008E */ sh $v0, 0x8e($a0) -/* CB6148 80241148 00021400 */ sll $v0, $v0, 0x10 -/* CB614C 8024114C 1C400006 */ bgtz $v0, .L80241168 -/* CB6150 80241150 00000000 */ nop -.L80241154: -/* CB6154 80241154 8482008C */ lh $v0, 0x8c($a0) -/* CB6158 80241158 14400003 */ bnez $v0, .L80241168 -/* CB615C 8024115C 2402000E */ addiu $v0, $zero, 0xe -/* CB6160 80241160 A480008E */ sh $zero, 0x8e($a0) -/* CB6164 80241164 AE020070 */ sw $v0, 0x70($s0) -.L80241168: -/* CB6168 80241168 8FBF0014 */ lw $ra, 0x14($sp) -/* CB616C 8024116C 8FB00010 */ lw $s0, 0x10($sp) -/* CB6170 80241170 03E00008 */ jr $ra -/* CB6174 80241174 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s index 56186ee1eb..4eae08a448 100644 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s @@ -109,7 +109,7 @@ glabel func_8024162C_CB662C /* CB67C4 802417C4 0000102D */ daddu $v0, $zero, $zero /* CB67C8 802417C8 0280202D */ daddu $a0, $s4, $zero /* CB67CC 802417CC 0200282D */ daddu $a1, $s0, $zero -/* CB67D0 802417D0 0C090445 */ jal func_80241114_CB6114 +/* CB67D0 802417D0 0C090445 */ jal UnkNpcAIFunc3 /* CB67D4 802417D4 0260302D */ daddu $a2, $s3, $zero /* CB67D8 802417D8 080905FD */ j .L802417F4 /* CB67DC 802417DC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240FB8_CC47C8.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240FB8_CC47C8.s deleted file mode 100644 index 4e1db15cd2..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240FB8_CC47C8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FB8_CC47C8 -/* CC47C8 80240FB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CC47CC 80240FBC AFB00010 */ sw $s0, 0x10($sp) -/* CC47D0 80240FC0 0080802D */ daddu $s0, $a0, $zero -/* CC47D4 80240FC4 AFBF0014 */ sw $ra, 0x14($sp) -/* CC47D8 80240FC8 8E020148 */ lw $v0, 0x148($s0) -/* CC47DC 80240FCC 0C00EABB */ jal get_npc_unsafe -/* CC47E0 80240FD0 84440008 */ lh $a0, 8($v0) -/* CC47E4 80240FD4 0040202D */ daddu $a0, $v0, $zero -/* CC47E8 80240FD8 8482008E */ lh $v0, 0x8e($a0) -/* CC47EC 80240FDC 9483008E */ lhu $v1, 0x8e($a0) -/* CC47F0 80240FE0 18400005 */ blez $v0, .L80240FF8 -/* CC47F4 80240FE4 2462FFFF */ addiu $v0, $v1, -1 -/* CC47F8 80240FE8 A482008E */ sh $v0, 0x8e($a0) -/* CC47FC 80240FEC 00021400 */ sll $v0, $v0, 0x10 -/* CC4800 80240FF0 1C400006 */ bgtz $v0, .L8024100C -/* CC4804 80240FF4 00000000 */ nop -.L80240FF8: -/* CC4808 80240FF8 8482008C */ lh $v0, 0x8c($a0) -/* CC480C 80240FFC 14400003 */ bnez $v0, .L8024100C -/* CC4810 80241000 2402000E */ addiu $v0, $zero, 0xe -/* CC4814 80241004 A480008E */ sh $zero, 0x8e($a0) -/* CC4818 80241008 AE020070 */ sw $v0, 0x70($s0) -.L8024100C: -/* CC481C 8024100C 8FBF0014 */ lw $ra, 0x14($sp) -/* CC4820 80241010 8FB00010 */ lw $s0, 0x10($sp) -/* CC4824 80241014 03E00008 */ jr $ra -/* CC4828 80241018 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s index 2612d201ee..3ed6c211b6 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s @@ -109,7 +109,7 @@ glabel func_802414D0_CC4CE0 /* CC4E78 80241668 0000102D */ daddu $v0, $zero, $zero /* CC4E7C 8024166C 0280202D */ daddu $a0, $s4, $zero /* CC4E80 80241670 0200282D */ daddu $a1, $s0, $zero -/* CC4E84 80241674 0C0903EE */ jal func_80240FB8_CC47C8 +/* CC4E84 80241674 0C0903EE */ jal UnkNpcAIFunc3 /* CC4E88 80241678 0260302D */ daddu $a2, $s3, $zero /* CC4E8C 8024167C 080905A6 */ j .L80241698 /* CC4E90 80241680 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s index 6640612636..f8d9a70c60 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s @@ -160,7 +160,7 @@ glabel func_80241DB8_CC55C8 .L80241FF4: /* CC5804 80241FF4 0280202D */ daddu $a0, $s4, $zero /* CC5808 80241FF8 02C0282D */ daddu $a1, $s6, $zero -/* CC580C 80241FFC 0C0903EE */ jal func_80240FB8_CC47C8 +/* CC580C 80241FFC 0C0903EE */ jal UnkNpcAIFunc3 /* CC5810 80242000 02A0302D */ daddu $a2, $s5, $zero /* CC5814 80242004 08090806 */ j .L80242018 /* CC5818 80242008 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241904_CCCC14.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241904_CCCC14.s deleted file mode 100644 index 145ace4a68..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241904_CCCC14.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241904_CCCC14 -/* CCCC14 80241904 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CCCC18 80241908 AFB00010 */ sw $s0, 0x10($sp) -/* CCCC1C 8024190C 0080802D */ daddu $s0, $a0, $zero -/* CCCC20 80241910 AFBF0014 */ sw $ra, 0x14($sp) -/* CCCC24 80241914 8E020148 */ lw $v0, 0x148($s0) -/* CCCC28 80241918 0C00EABB */ jal get_npc_unsafe -/* CCCC2C 8024191C 84440008 */ lh $a0, 8($v0) -/* CCCC30 80241920 0040202D */ daddu $a0, $v0, $zero -/* CCCC34 80241924 8482008E */ lh $v0, 0x8e($a0) -/* CCCC38 80241928 9483008E */ lhu $v1, 0x8e($a0) -/* CCCC3C 8024192C 18400005 */ blez $v0, .L80241944 -/* CCCC40 80241930 2462FFFF */ addiu $v0, $v1, -1 -/* CCCC44 80241934 A482008E */ sh $v0, 0x8e($a0) -/* CCCC48 80241938 00021400 */ sll $v0, $v0, 0x10 -/* CCCC4C 8024193C 1C400006 */ bgtz $v0, .L80241958 -/* CCCC50 80241940 00000000 */ nop -.L80241944: -/* CCCC54 80241944 8482008C */ lh $v0, 0x8c($a0) -/* CCCC58 80241948 14400003 */ bnez $v0, .L80241958 -/* CCCC5C 8024194C 2402000E */ addiu $v0, $zero, 0xe -/* CCCC60 80241950 A480008E */ sh $zero, 0x8e($a0) -/* CCCC64 80241954 AE020070 */ sw $v0, 0x70($s0) -.L80241958: -/* CCCC68 80241958 8FBF0014 */ lw $ra, 0x14($sp) -/* CCCC6C 8024195C 8FB00010 */ lw $s0, 0x10($sp) -/* CCCC70 80241960 03E00008 */ jr $ra -/* CCCC74 80241964 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s index 8187678829..26e4ce4c21 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s @@ -109,7 +109,7 @@ glabel func_80241E1C_CCD12C /* CCD2C4 80241FB4 0000102D */ daddu $v0, $zero, $zero /* CCD2C8 80241FB8 0280202D */ daddu $a0, $s4, $zero /* CCD2CC 80241FBC 0200282D */ daddu $a1, $s0, $zero -/* CCD2D0 80241FC0 0C090641 */ jal func_80241904_CCCC14 +/* CCD2D0 80241FC0 0C090641 */ jal UnkNpcAIFunc3 /* CCD2D4 80241FC4 0260302D */ daddu $a2, $s3, $zero /* CCD2D8 80241FC8 080907F9 */ j .L80241FE4 /* CCD2DC 80241FCC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241C44_CD3A74.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241C44_CD3A74.s deleted file mode 100644 index 6454ec9f6d..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241C44_CD3A74.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C44_CD3A74 -/* CD3A74 80241C44 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CD3A78 80241C48 AFB00010 */ sw $s0, 0x10($sp) -/* CD3A7C 80241C4C 0080802D */ daddu $s0, $a0, $zero -/* CD3A80 80241C50 AFBF0014 */ sw $ra, 0x14($sp) -/* CD3A84 80241C54 8E020148 */ lw $v0, 0x148($s0) -/* CD3A88 80241C58 0C00EABB */ jal get_npc_unsafe -/* CD3A8C 80241C5C 84440008 */ lh $a0, 8($v0) -/* CD3A90 80241C60 0040202D */ daddu $a0, $v0, $zero -/* CD3A94 80241C64 8482008E */ lh $v0, 0x8e($a0) -/* CD3A98 80241C68 9483008E */ lhu $v1, 0x8e($a0) -/* CD3A9C 80241C6C 18400005 */ blez $v0, .L80241C84 -/* CD3AA0 80241C70 2462FFFF */ addiu $v0, $v1, -1 -/* CD3AA4 80241C74 A482008E */ sh $v0, 0x8e($a0) -/* CD3AA8 80241C78 00021400 */ sll $v0, $v0, 0x10 -/* CD3AAC 80241C7C 1C400006 */ bgtz $v0, .L80241C98 -/* CD3AB0 80241C80 00000000 */ nop -.L80241C84: -/* CD3AB4 80241C84 8482008C */ lh $v0, 0x8c($a0) -/* CD3AB8 80241C88 14400003 */ bnez $v0, .L80241C98 -/* CD3ABC 80241C8C 2402000E */ addiu $v0, $zero, 0xe -/* CD3AC0 80241C90 A480008E */ sh $zero, 0x8e($a0) -/* CD3AC4 80241C94 AE020070 */ sw $v0, 0x70($s0) -.L80241C98: -/* CD3AC8 80241C98 8FBF0014 */ lw $ra, 0x14($sp) -/* CD3ACC 80241C9C 8FB00010 */ lw $s0, 0x10($sp) -/* CD3AD0 80241CA0 03E00008 */ jr $ra -/* CD3AD4 80241CA4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s index 1022ef51c5..27f1a80f7d 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s @@ -109,7 +109,7 @@ glabel func_8024215C_CD3F8C /* CD4124 802422F4 0000102D */ daddu $v0, $zero, $zero /* CD4128 802422F8 0280202D */ daddu $a0, $s4, $zero /* CD412C 802422FC 0200282D */ daddu $a1, $s0, $zero -/* CD4130 80242300 0C090711 */ jal func_80241C44_CD3A74 +/* CD4130 80242300 0C090711 */ jal UnkNpcAIFunc3 /* CD4134 80242304 0260302D */ daddu $a2, $s3, $zero /* CD4138 80242308 080908C9 */ j .L80242324 /* CD413C 8024230C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240E64_CD8144.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240E64_CD8144.s deleted file mode 100644 index d1e55e52fd..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240E64_CD8144.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E64_CD8144 -/* CD8144 80240E64 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CD8148 80240E68 AFB00010 */ sw $s0, 0x10($sp) -/* CD814C 80240E6C 0080802D */ daddu $s0, $a0, $zero -/* CD8150 80240E70 AFBF0014 */ sw $ra, 0x14($sp) -/* CD8154 80240E74 8E020148 */ lw $v0, 0x148($s0) -/* CD8158 80240E78 0C00EABB */ jal get_npc_unsafe -/* CD815C 80240E7C 84440008 */ lh $a0, 8($v0) -/* CD8160 80240E80 0040202D */ daddu $a0, $v0, $zero -/* CD8164 80240E84 8482008E */ lh $v0, 0x8e($a0) -/* CD8168 80240E88 9483008E */ lhu $v1, 0x8e($a0) -/* CD816C 80240E8C 18400005 */ blez $v0, .L80240EA4 -/* CD8170 80240E90 2462FFFF */ addiu $v0, $v1, -1 -/* CD8174 80240E94 A482008E */ sh $v0, 0x8e($a0) -/* CD8178 80240E98 00021400 */ sll $v0, $v0, 0x10 -/* CD817C 80240E9C 1C400006 */ bgtz $v0, .L80240EB8 -/* CD8180 80240EA0 00000000 */ nop -.L80240EA4: -/* CD8184 80240EA4 8482008C */ lh $v0, 0x8c($a0) -/* CD8188 80240EA8 14400003 */ bnez $v0, .L80240EB8 -/* CD818C 80240EAC 2402000E */ addiu $v0, $zero, 0xe -/* CD8190 80240EB0 A480008E */ sh $zero, 0x8e($a0) -/* CD8194 80240EB4 AE020070 */ sw $v0, 0x70($s0) -.L80240EB8: -/* CD8198 80240EB8 8FBF0014 */ lw $ra, 0x14($sp) -/* CD819C 80240EBC 8FB00010 */ lw $s0, 0x10($sp) -/* CD81A0 80240EC0 03E00008 */ jr $ra -/* CD81A4 80240EC4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s index 9209bca312..17642be878 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s @@ -109,7 +109,7 @@ glabel func_8024137C_CD865C /* CD87F4 80241514 0000102D */ daddu $v0, $zero, $zero /* CD87F8 80241518 0280202D */ daddu $a0, $s4, $zero /* CD87FC 8024151C 0200282D */ daddu $a1, $s0, $zero -/* CD8800 80241520 0C090399 */ jal func_80240E64_CD8144 +/* CD8800 80241520 0C090399 */ jal UnkNpcAIFunc3 /* CD8804 80241524 0260302D */ daddu $a2, $s3, $zero /* CD8808 80241528 08090551 */ j .L80241544 /* CD880C 8024152C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s index a136362ea6..3cc236a0f1 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s @@ -160,7 +160,7 @@ glabel func_80241C64_CD8F44 .L80241EA0: /* CD9180 80241EA0 0280202D */ daddu $a0, $s4, $zero /* CD9184 80241EA4 02C0282D */ daddu $a1, $s6, $zero -/* CD9188 80241EA8 0C090399 */ jal func_80240E64_CD8144 +/* CD9188 80241EA8 0C090399 */ jal UnkNpcAIFunc3 /* CD918C 80241EAC 02A0302D */ daddu $a2, $s5, $zero /* CD9190 80241EB0 080907B1 */ j .L80241EC4 /* CD9194 80241EB4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240E34_CF3A04.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240E34_CF3A04.s deleted file mode 100644 index 31b08adfb8..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240E34_CF3A04.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E34_CF3A04 -/* CF3A04 80240E34 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF3A08 80240E38 AFB00010 */ sw $s0, 0x10($sp) -/* CF3A0C 80240E3C 0080802D */ daddu $s0, $a0, $zero -/* CF3A10 80240E40 AFBF0014 */ sw $ra, 0x14($sp) -/* CF3A14 80240E44 8E020148 */ lw $v0, 0x148($s0) -/* CF3A18 80240E48 0C00EABB */ jal get_npc_unsafe -/* CF3A1C 80240E4C 84440008 */ lh $a0, 8($v0) -/* CF3A20 80240E50 0040202D */ daddu $a0, $v0, $zero -/* CF3A24 80240E54 8482008E */ lh $v0, 0x8e($a0) -/* CF3A28 80240E58 9483008E */ lhu $v1, 0x8e($a0) -/* CF3A2C 80240E5C 18400005 */ blez $v0, .L80240E74 -/* CF3A30 80240E60 2462FFFF */ addiu $v0, $v1, -1 -/* CF3A34 80240E64 A482008E */ sh $v0, 0x8e($a0) -/* CF3A38 80240E68 00021400 */ sll $v0, $v0, 0x10 -/* CF3A3C 80240E6C 1C400006 */ bgtz $v0, .L80240E88 -/* CF3A40 80240E70 00000000 */ nop -.L80240E74: -/* CF3A44 80240E74 8482008C */ lh $v0, 0x8c($a0) -/* CF3A48 80240E78 14400003 */ bnez $v0, .L80240E88 -/* CF3A4C 80240E7C 2402000E */ addiu $v0, $zero, 0xe -/* CF3A50 80240E80 A480008E */ sh $zero, 0x8e($a0) -/* CF3A54 80240E84 AE020070 */ sw $v0, 0x70($s0) -.L80240E88: -/* CF3A58 80240E88 8FBF0014 */ lw $ra, 0x14($sp) -/* CF3A5C 80240E8C 8FB00010 */ lw $s0, 0x10($sp) -/* CF3A60 80240E90 03E00008 */ jr $ra -/* CF3A64 80240E94 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s index f905e30eee..e81b2388b2 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s @@ -109,7 +109,7 @@ glabel func_8024134C_CF3F1C /* CF40B4 802414E4 0000102D */ daddu $v0, $zero, $zero /* CF40B8 802414E8 0280202D */ daddu $a0, $s4, $zero /* CF40BC 802414EC 0200282D */ daddu $a1, $s0, $zero -/* CF40C0 802414F0 0C09038D */ jal func_80240E34_CF3A04 +/* CF40C0 802414F0 0C09038D */ jal UnkNpcAIFunc3 /* CF40C4 802414F4 0260302D */ daddu $a2, $s3, $zero /* CF40C8 802414F8 08090545 */ j .L80241514 /* CF40CC 802414FC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241DE4_A18004.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241DE4_A18004.s deleted file mode 100644 index e3dc839dec..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241DE4_A18004.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DE4_A18004 -/* A18004 80241DE4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A18008 80241DE8 AFB00010 */ sw $s0, 0x10($sp) -/* A1800C 80241DEC 0080802D */ daddu $s0, $a0, $zero -/* A18010 80241DF0 AFBF0014 */ sw $ra, 0x14($sp) -/* A18014 80241DF4 8E020148 */ lw $v0, 0x148($s0) -/* A18018 80241DF8 0C00EABB */ jal get_npc_unsafe -/* A1801C 80241DFC 84440008 */ lh $a0, 8($v0) -/* A18020 80241E00 0040202D */ daddu $a0, $v0, $zero -/* A18024 80241E04 8482008E */ lh $v0, 0x8e($a0) -/* A18028 80241E08 9483008E */ lhu $v1, 0x8e($a0) -/* A1802C 80241E0C 18400005 */ blez $v0, .L80241E24 -/* A18030 80241E10 2462FFFF */ addiu $v0, $v1, -1 -/* A18034 80241E14 A482008E */ sh $v0, 0x8e($a0) -/* A18038 80241E18 00021400 */ sll $v0, $v0, 0x10 -/* A1803C 80241E1C 1C400006 */ bgtz $v0, .L80241E38 -/* A18040 80241E20 00000000 */ nop -.L80241E24: -/* A18044 80241E24 8482008C */ lh $v0, 0x8c($a0) -/* A18048 80241E28 14400003 */ bnez $v0, .L80241E38 -/* A1804C 80241E2C 2402000E */ addiu $v0, $zero, 0xe -/* A18050 80241E30 A480008E */ sh $zero, 0x8e($a0) -/* A18054 80241E34 AE020070 */ sw $v0, 0x70($s0) -.L80241E38: -/* A18058 80241E38 8FBF0014 */ lw $ra, 0x14($sp) -/* A1805C 80241E3C 8FB00010 */ lw $s0, 0x10($sp) -/* A18060 80241E40 03E00008 */ jr $ra -/* A18064 80241E44 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s index 29e6bc64fe..686318e515 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s @@ -109,7 +109,7 @@ glabel func_802422FC_A1851C /* A186B4 80242494 0000102D */ daddu $v0, $zero, $zero /* A186B8 80242498 0280202D */ daddu $a0, $s4, $zero /* A186BC 8024249C 0200282D */ daddu $a1, $s0, $zero -/* A186C0 802424A0 0C090779 */ jal func_80241DE4_A18004 +/* A186C0 802424A0 0C090779 */ jal UnkNpcAIFunc3 /* A186C4 802424A4 0260302D */ daddu $a2, $s3, $zero /* A186C8 802424A8 08090931 */ j .L802424C4 /* A186CC 802424AC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241AA4_A1CBA4.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241AA4_A1CBA4.s deleted file mode 100644 index d91894f8dc..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241AA4_A1CBA4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AA4_A1CBA4 -/* A1CBA4 80241AA4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1CBA8 80241AA8 AFB00010 */ sw $s0, 0x10($sp) -/* A1CBAC 80241AAC 0080802D */ daddu $s0, $a0, $zero -/* A1CBB0 80241AB0 AFBF0014 */ sw $ra, 0x14($sp) -/* A1CBB4 80241AB4 8E020148 */ lw $v0, 0x148($s0) -/* A1CBB8 80241AB8 0C00EABB */ jal get_npc_unsafe -/* A1CBBC 80241ABC 84440008 */ lh $a0, 8($v0) -/* A1CBC0 80241AC0 0040202D */ daddu $a0, $v0, $zero -/* A1CBC4 80241AC4 8482008E */ lh $v0, 0x8e($a0) -/* A1CBC8 80241AC8 9483008E */ lhu $v1, 0x8e($a0) -/* A1CBCC 80241ACC 18400005 */ blez $v0, .L80241AE4 -/* A1CBD0 80241AD0 2462FFFF */ addiu $v0, $v1, -1 -/* A1CBD4 80241AD4 A482008E */ sh $v0, 0x8e($a0) -/* A1CBD8 80241AD8 00021400 */ sll $v0, $v0, 0x10 -/* A1CBDC 80241ADC 1C400006 */ bgtz $v0, .L80241AF8 -/* A1CBE0 80241AE0 00000000 */ nop -.L80241AE4: -/* A1CBE4 80241AE4 8482008C */ lh $v0, 0x8c($a0) -/* A1CBE8 80241AE8 14400003 */ bnez $v0, .L80241AF8 -/* A1CBEC 80241AEC 2402000E */ addiu $v0, $zero, 0xe -/* A1CBF0 80241AF0 A480008E */ sh $zero, 0x8e($a0) -/* A1CBF4 80241AF4 AE020070 */ sw $v0, 0x70($s0) -.L80241AF8: -/* A1CBF8 80241AF8 8FBF0014 */ lw $ra, 0x14($sp) -/* A1CBFC 80241AFC 8FB00010 */ lw $s0, 0x10($sp) -/* A1CC00 80241B00 03E00008 */ jr $ra -/* A1CC04 80241B04 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s index b5a80164b5..9735c6e736 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s @@ -109,7 +109,7 @@ glabel func_80241FBC_A1D0BC /* A1D254 80242154 0000102D */ daddu $v0, $zero, $zero /* A1D258 80242158 0280202D */ daddu $a0, $s4, $zero /* A1D25C 8024215C 0200282D */ daddu $a1, $s0, $zero -/* A1D260 80242160 0C0906A9 */ jal func_80241AA4_A1CBA4 +/* A1D260 80242160 0C0906A9 */ jal UnkNpcAIFunc3 /* A1D264 80242164 0260302D */ daddu $a2, $s3, $zero /* A1D268 80242168 08090861 */ j .L80242184 /* A1D26C 8024216C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240DF4_8CEE64.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240DF4_8CEE64.s deleted file mode 100644 index 0e1ef73a9e..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240DF4_8CEE64.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF4_8CEE64 -/* 8CEE64 80240DF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8CEE68 80240DF8 AFB00010 */ sw $s0, 0x10($sp) -/* 8CEE6C 80240DFC 0080802D */ daddu $s0, $a0, $zero -/* 8CEE70 80240E00 AFBF0014 */ sw $ra, 0x14($sp) -/* 8CEE74 80240E04 8E020148 */ lw $v0, 0x148($s0) -/* 8CEE78 80240E08 0C00EABB */ jal get_npc_unsafe -/* 8CEE7C 80240E0C 84440008 */ lh $a0, 8($v0) -/* 8CEE80 80240E10 0040202D */ daddu $a0, $v0, $zero -/* 8CEE84 80240E14 8482008E */ lh $v0, 0x8e($a0) -/* 8CEE88 80240E18 9483008E */ lhu $v1, 0x8e($a0) -/* 8CEE8C 80240E1C 18400005 */ blez $v0, .L80240E34 -/* 8CEE90 80240E20 2462FFFF */ addiu $v0, $v1, -1 -/* 8CEE94 80240E24 A482008E */ sh $v0, 0x8e($a0) -/* 8CEE98 80240E28 00021400 */ sll $v0, $v0, 0x10 -/* 8CEE9C 80240E2C 1C400006 */ bgtz $v0, .L80240E48 -/* 8CEEA0 80240E30 00000000 */ nop -.L80240E34: -/* 8CEEA4 80240E34 8482008C */ lh $v0, 0x8c($a0) -/* 8CEEA8 80240E38 14400003 */ bnez $v0, .L80240E48 -/* 8CEEAC 80240E3C 2402000E */ addiu $v0, $zero, 0xe -/* 8CEEB0 80240E40 A480008E */ sh $zero, 0x8e($a0) -/* 8CEEB4 80240E44 AE020070 */ sw $v0, 0x70($s0) -.L80240E48: -/* 8CEEB8 80240E48 8FBF0014 */ lw $ra, 0x14($sp) -/* 8CEEBC 80240E4C 8FB00010 */ lw $s0, 0x10($sp) -/* 8CEEC0 80240E50 03E00008 */ jr $ra -/* 8CEEC4 80240E54 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s index 03f9ccfca5..5a43cc4d2f 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s @@ -109,7 +109,7 @@ glabel func_8024130C_8CF37C /* 8CF514 802414A4 0000102D */ daddu $v0, $zero, $zero /* 8CF518 802414A8 0280202D */ daddu $a0, $s4, $zero /* 8CF51C 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8CF520 802414B0 0C09037D */ jal func_80240DF4_8CEE64 +/* 8CF520 802414B0 0C09037D */ jal UnkNpcAIFunc3 /* 8CF524 802414B4 0260302D */ daddu $a2, $s3, $zero /* 8CF528 802414B8 08090535 */ j .L802414D4 /* 8CF52C 802414BC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240DF4_8D2304.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240DF4_8D2304.s deleted file mode 100644 index cd01107e4a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240DF4_8D2304.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF4_8D2304 -/* 8D2304 80240DF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D2308 80240DF8 AFB00010 */ sw $s0, 0x10($sp) -/* 8D230C 80240DFC 0080802D */ daddu $s0, $a0, $zero -/* 8D2310 80240E00 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D2314 80240E04 8E020148 */ lw $v0, 0x148($s0) -/* 8D2318 80240E08 0C00EABB */ jal get_npc_unsafe -/* 8D231C 80240E0C 84440008 */ lh $a0, 8($v0) -/* 8D2320 80240E10 0040202D */ daddu $a0, $v0, $zero -/* 8D2324 80240E14 8482008E */ lh $v0, 0x8e($a0) -/* 8D2328 80240E18 9483008E */ lhu $v1, 0x8e($a0) -/* 8D232C 80240E1C 18400005 */ blez $v0, .L80240E34 -/* 8D2330 80240E20 2462FFFF */ addiu $v0, $v1, -1 -/* 8D2334 80240E24 A482008E */ sh $v0, 0x8e($a0) -/* 8D2338 80240E28 00021400 */ sll $v0, $v0, 0x10 -/* 8D233C 80240E2C 1C400006 */ bgtz $v0, .L80240E48 -/* 8D2340 80240E30 00000000 */ nop -.L80240E34: -/* 8D2344 80240E34 8482008C */ lh $v0, 0x8c($a0) -/* 8D2348 80240E38 14400003 */ bnez $v0, .L80240E48 -/* 8D234C 80240E3C 2402000E */ addiu $v0, $zero, 0xe -/* 8D2350 80240E40 A480008E */ sh $zero, 0x8e($a0) -/* 8D2354 80240E44 AE020070 */ sw $v0, 0x70($s0) -.L80240E48: -/* 8D2358 80240E48 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D235C 80240E4C 8FB00010 */ lw $s0, 0x10($sp) -/* 8D2360 80240E50 03E00008 */ jr $ra -/* 8D2364 80240E54 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s index c797754db2..1d1b2ac8cb 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s @@ -109,7 +109,7 @@ glabel func_8024130C_8D281C /* 8D29B4 802414A4 0000102D */ daddu $v0, $zero, $zero /* 8D29B8 802414A8 0280202D */ daddu $a0, $s4, $zero /* 8D29BC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8D29C0 802414B0 0C09037D */ jal func_80240DF4_8D2304 +/* 8D29C0 802414B0 0C09037D */ jal UnkNpcAIFunc3 /* 8D29C4 802414B4 0260302D */ daddu $a2, $s3, $zero /* 8D29C8 802414B8 08090535 */ j .L802414D4 /* 8D29CC 802414BC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240DF4_8D6BF4.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240DF4_8D6BF4.s deleted file mode 100644 index 1c8a174279..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240DF4_8D6BF4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF4_8D6BF4 -/* 8D6BF4 80240DF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D6BF8 80240DF8 AFB00010 */ sw $s0, 0x10($sp) -/* 8D6BFC 80240DFC 0080802D */ daddu $s0, $a0, $zero -/* 8D6C00 80240E00 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D6C04 80240E04 8E020148 */ lw $v0, 0x148($s0) -/* 8D6C08 80240E08 0C00EABB */ jal get_npc_unsafe -/* 8D6C0C 80240E0C 84440008 */ lh $a0, 8($v0) -/* 8D6C10 80240E10 0040202D */ daddu $a0, $v0, $zero -/* 8D6C14 80240E14 8482008E */ lh $v0, 0x8e($a0) -/* 8D6C18 80240E18 9483008E */ lhu $v1, 0x8e($a0) -/* 8D6C1C 80240E1C 18400005 */ blez $v0, .L80240E34 -/* 8D6C20 80240E20 2462FFFF */ addiu $v0, $v1, -1 -/* 8D6C24 80240E24 A482008E */ sh $v0, 0x8e($a0) -/* 8D6C28 80240E28 00021400 */ sll $v0, $v0, 0x10 -/* 8D6C2C 80240E2C 1C400006 */ bgtz $v0, .L80240E48 -/* 8D6C30 80240E30 00000000 */ nop -.L80240E34: -/* 8D6C34 80240E34 8482008C */ lh $v0, 0x8c($a0) -/* 8D6C38 80240E38 14400003 */ bnez $v0, .L80240E48 -/* 8D6C3C 80240E3C 2402000E */ addiu $v0, $zero, 0xe -/* 8D6C40 80240E40 A480008E */ sh $zero, 0x8e($a0) -/* 8D6C44 80240E44 AE020070 */ sw $v0, 0x70($s0) -.L80240E48: -/* 8D6C48 80240E48 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D6C4C 80240E4C 8FB00010 */ lw $s0, 0x10($sp) -/* 8D6C50 80240E50 03E00008 */ jr $ra -/* 8D6C54 80240E54 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s index 0cd893f4bc..334e3cda25 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s @@ -109,7 +109,7 @@ glabel func_8024130C_8D710C /* 8D72A4 802414A4 0000102D */ daddu $v0, $zero, $zero /* 8D72A8 802414A8 0280202D */ daddu $a0, $s4, $zero /* 8D72AC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8D72B0 802414B0 0C09037D */ jal func_80240DF4_8D6BF4 +/* 8D72B0 802414B0 0C09037D */ jal UnkNpcAIFunc3 /* 8D72B4 802414B4 0260302D */ daddu $a2, $s3, $zero /* 8D72B8 802414B8 08090535 */ j .L802414D4 /* 8D72BC 802414BC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802412D4_C5BA14.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802412D4_C5BA14.s deleted file mode 100644 index 42552e2471..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802412D4_C5BA14.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412D4_C5BA14 -/* C5BA14 802412D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5BA18 802412D8 AFB00010 */ sw $s0, 0x10($sp) -/* C5BA1C 802412DC 0080802D */ daddu $s0, $a0, $zero -/* C5BA20 802412E0 AFBF0014 */ sw $ra, 0x14($sp) -/* C5BA24 802412E4 8E020148 */ lw $v0, 0x148($s0) -/* C5BA28 802412E8 0C00EABB */ jal get_npc_unsafe -/* C5BA2C 802412EC 84440008 */ lh $a0, 8($v0) -/* C5BA30 802412F0 0040202D */ daddu $a0, $v0, $zero -/* C5BA34 802412F4 8482008E */ lh $v0, 0x8e($a0) -/* C5BA38 802412F8 9483008E */ lhu $v1, 0x8e($a0) -/* C5BA3C 802412FC 18400005 */ blez $v0, .L80241314 -/* C5BA40 80241300 2462FFFF */ addiu $v0, $v1, -1 -/* C5BA44 80241304 A482008E */ sh $v0, 0x8e($a0) -/* C5BA48 80241308 00021400 */ sll $v0, $v0, 0x10 -/* C5BA4C 8024130C 1C400006 */ bgtz $v0, .L80241328 -/* C5BA50 80241310 00000000 */ nop -.L80241314: -/* C5BA54 80241314 8482008C */ lh $v0, 0x8c($a0) -/* C5BA58 80241318 14400003 */ bnez $v0, .L80241328 -/* C5BA5C 8024131C 2402000E */ addiu $v0, $zero, 0xe -/* C5BA60 80241320 A480008E */ sh $zero, 0x8e($a0) -/* C5BA64 80241324 AE020070 */ sw $v0, 0x70($s0) -.L80241328: -/* C5BA68 80241328 8FBF0014 */ lw $ra, 0x14($sp) -/* C5BA6C 8024132C 8FB00010 */ lw $s0, 0x10($sp) -/* C5BA70 80241330 03E00008 */ jr $ra -/* C5BA74 80241334 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s index 146497178f..b61a2c2a90 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s @@ -109,7 +109,7 @@ glabel func_802417EC_C5BF2C /* C5C0C4 80241984 0000102D */ daddu $v0, $zero, $zero /* C5C0C8 80241988 0280202D */ daddu $a0, $s4, $zero /* C5C0CC 8024198C 0200282D */ daddu $a1, $s0, $zero -/* C5C0D0 80241990 0C0904B5 */ jal func_802412D4_C5BA14 +/* C5C0D0 80241990 0C0904B5 */ jal UnkNpcAIFunc3 /* C5C0D4 80241994 0260302D */ daddu $a2, $s3, $zero /* C5C0D8 80241998 0809066D */ j .L802419B4 /* C5C0DC 8024199C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241614_C6F944.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241614_C6F944.s deleted file mode 100644 index ec561c6ff6..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241614_C6F944.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241614_C6F944 -/* C6F944 80241614 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C6F948 80241618 AFB00010 */ sw $s0, 0x10($sp) -/* C6F94C 8024161C 0080802D */ daddu $s0, $a0, $zero -/* C6F950 80241620 AFBF0014 */ sw $ra, 0x14($sp) -/* C6F954 80241624 8E020148 */ lw $v0, 0x148($s0) -/* C6F958 80241628 0C00EABB */ jal get_npc_unsafe -/* C6F95C 8024162C 84440008 */ lh $a0, 8($v0) -/* C6F960 80241630 0040202D */ daddu $a0, $v0, $zero -/* C6F964 80241634 8482008E */ lh $v0, 0x8e($a0) -/* C6F968 80241638 9483008E */ lhu $v1, 0x8e($a0) -/* C6F96C 8024163C 18400005 */ blez $v0, .L80241654 -/* C6F970 80241640 2462FFFF */ addiu $v0, $v1, -1 -/* C6F974 80241644 A482008E */ sh $v0, 0x8e($a0) -/* C6F978 80241648 00021400 */ sll $v0, $v0, 0x10 -/* C6F97C 8024164C 1C400006 */ bgtz $v0, .L80241668 -/* C6F980 80241650 00000000 */ nop -.L80241654: -/* C6F984 80241654 8482008C */ lh $v0, 0x8c($a0) -/* C6F988 80241658 14400003 */ bnez $v0, .L80241668 -/* C6F98C 8024165C 2402000E */ addiu $v0, $zero, 0xe -/* C6F990 80241660 A480008E */ sh $zero, 0x8e($a0) -/* C6F994 80241664 AE020070 */ sw $v0, 0x70($s0) -.L80241668: -/* C6F998 80241668 8FBF0014 */ lw $ra, 0x14($sp) -/* C6F99C 8024166C 8FB00010 */ lw $s0, 0x10($sp) -/* C6F9A0 80241670 03E00008 */ jr $ra -/* C6F9A4 80241674 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s index 11d11c33bf..f872e97836 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s @@ -109,7 +109,7 @@ glabel func_80241B2C_C6FE5C /* C6FFF4 80241CC4 0000102D */ daddu $v0, $zero, $zero /* C6FFF8 80241CC8 0280202D */ daddu $a0, $s4, $zero /* C6FFFC 80241CCC 0200282D */ daddu $a1, $s0, $zero -/* C70000 80241CD0 0C090585 */ jal func_80241614_C6F944 +/* C70000 80241CD0 0C090585 */ jal UnkNpcAIFunc3 /* C70004 80241CD4 0260302D */ daddu $a2, $s3, $zero /* C70008 80241CD8 0809073D */ j .L80241CF4 /* C7000C 80241CDC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241844_C72CC4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241844_C72CC4.s deleted file mode 100644 index 3846362187..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241844_C72CC4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241844_C72CC4 -/* C72CC4 80241844 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C72CC8 80241848 AFB00010 */ sw $s0, 0x10($sp) -/* C72CCC 8024184C 0080802D */ daddu $s0, $a0, $zero -/* C72CD0 80241850 AFBF0014 */ sw $ra, 0x14($sp) -/* C72CD4 80241854 8E020148 */ lw $v0, 0x148($s0) -/* C72CD8 80241858 0C00EABB */ jal get_npc_unsafe -/* C72CDC 8024185C 84440008 */ lh $a0, 8($v0) -/* C72CE0 80241860 0040202D */ daddu $a0, $v0, $zero -/* C72CE4 80241864 8482008E */ lh $v0, 0x8e($a0) -/* C72CE8 80241868 9483008E */ lhu $v1, 0x8e($a0) -/* C72CEC 8024186C 18400005 */ blez $v0, .L80241884 -/* C72CF0 80241870 2462FFFF */ addiu $v0, $v1, -1 -/* C72CF4 80241874 A482008E */ sh $v0, 0x8e($a0) -/* C72CF8 80241878 00021400 */ sll $v0, $v0, 0x10 -/* C72CFC 8024187C 1C400006 */ bgtz $v0, .L80241898 -/* C72D00 80241880 00000000 */ nop -.L80241884: -/* C72D04 80241884 8482008C */ lh $v0, 0x8c($a0) -/* C72D08 80241888 14400003 */ bnez $v0, .L80241898 -/* C72D0C 8024188C 2402000E */ addiu $v0, $zero, 0xe -/* C72D10 80241890 A480008E */ sh $zero, 0x8e($a0) -/* C72D14 80241894 AE020070 */ sw $v0, 0x70($s0) -.L80241898: -/* C72D18 80241898 8FBF0014 */ lw $ra, 0x14($sp) -/* C72D1C 8024189C 8FB00010 */ lw $s0, 0x10($sp) -/* C72D20 802418A0 03E00008 */ jr $ra -/* C72D24 802418A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s index 1265b6893b..79b5cce549 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s @@ -109,7 +109,7 @@ glabel func_80241D5C_C731DC /* C73374 80241EF4 0000102D */ daddu $v0, $zero, $zero /* C73378 80241EF8 0280202D */ daddu $a0, $s4, $zero /* C7337C 80241EFC 0200282D */ daddu $a1, $s0, $zero -/* C73380 80241F00 0C090611 */ jal func_80241844_C72CC4 +/* C73380 80241F00 0C090611 */ jal UnkNpcAIFunc3 /* C73384 80241F04 0260302D */ daddu $a2, $s3, $zero /* C73388 80241F08 080907C9 */ j .L80241F24 /* C7338C 80241F0C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241254_C813F4.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241254_C813F4.s deleted file mode 100644 index 0f9bf167da..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241254_C813F4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241254_C813F4 -/* C813F4 80241254 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C813F8 80241258 AFB00010 */ sw $s0, 0x10($sp) -/* C813FC 8024125C 0080802D */ daddu $s0, $a0, $zero -/* C81400 80241260 AFBF0014 */ sw $ra, 0x14($sp) -/* C81404 80241264 8E020148 */ lw $v0, 0x148($s0) -/* C81408 80241268 0C00EABB */ jal get_npc_unsafe -/* C8140C 8024126C 84440008 */ lh $a0, 8($v0) -/* C81410 80241270 0040202D */ daddu $a0, $v0, $zero -/* C81414 80241274 8482008E */ lh $v0, 0x8e($a0) -/* C81418 80241278 9483008E */ lhu $v1, 0x8e($a0) -/* C8141C 8024127C 18400005 */ blez $v0, .L80241294 -/* C81420 80241280 2462FFFF */ addiu $v0, $v1, -1 -/* C81424 80241284 A482008E */ sh $v0, 0x8e($a0) -/* C81428 80241288 00021400 */ sll $v0, $v0, 0x10 -/* C8142C 8024128C 1C400006 */ bgtz $v0, .L802412A8 -/* C81430 80241290 00000000 */ nop -.L80241294: -/* C81434 80241294 8482008C */ lh $v0, 0x8c($a0) -/* C81438 80241298 14400003 */ bnez $v0, .L802412A8 -/* C8143C 8024129C 2402000E */ addiu $v0, $zero, 0xe -/* C81440 802412A0 A480008E */ sh $zero, 0x8e($a0) -/* C81444 802412A4 AE020070 */ sw $v0, 0x70($s0) -.L802412A8: -/* C81448 802412A8 8FBF0014 */ lw $ra, 0x14($sp) -/* C8144C 802412AC 8FB00010 */ lw $s0, 0x10($sp) -/* C81450 802412B0 03E00008 */ jr $ra -/* C81454 802412B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s index 1403002f1c..ba742d6018 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s @@ -109,7 +109,7 @@ glabel func_8024176C_C8190C /* C81AA4 80241904 0000102D */ daddu $v0, $zero, $zero /* C81AA8 80241908 0280202D */ daddu $a0, $s4, $zero /* C81AAC 8024190C 0200282D */ daddu $a1, $s0, $zero -/* C81AB0 80241910 0C090495 */ jal func_80241254_C813F4 +/* C81AB0 80241910 0C090495 */ jal UnkNpcAIFunc3 /* C81AB4 80241914 0260302D */ daddu $a2, $s3, $zero /* C81AB8 80241918 0809064D */ j .L80241934 /* C81ABC 8024191C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240E94_BAE7D4.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240E94_BAE7D4.s deleted file mode 100644 index a9726ca891..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240E94_BAE7D4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E94_BAE7D4 -/* BAE7D4 80240E94 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BAE7D8 80240E98 AFB00010 */ sw $s0, 0x10($sp) -/* BAE7DC 80240E9C 0080802D */ daddu $s0, $a0, $zero -/* BAE7E0 80240EA0 AFBF0014 */ sw $ra, 0x14($sp) -/* BAE7E4 80240EA4 8E020148 */ lw $v0, 0x148($s0) -/* BAE7E8 80240EA8 0C00EABB */ jal get_npc_unsafe -/* BAE7EC 80240EAC 84440008 */ lh $a0, 8($v0) -/* BAE7F0 80240EB0 0040202D */ daddu $a0, $v0, $zero -/* BAE7F4 80240EB4 8482008E */ lh $v0, 0x8e($a0) -/* BAE7F8 80240EB8 9483008E */ lhu $v1, 0x8e($a0) -/* BAE7FC 80240EBC 18400005 */ blez $v0, .L80240ED4 -/* BAE800 80240EC0 2462FFFF */ addiu $v0, $v1, -1 -/* BAE804 80240EC4 A482008E */ sh $v0, 0x8e($a0) -/* BAE808 80240EC8 00021400 */ sll $v0, $v0, 0x10 -/* BAE80C 80240ECC 1C400006 */ bgtz $v0, .L80240EE8 -/* BAE810 80240ED0 00000000 */ nop -.L80240ED4: -/* BAE814 80240ED4 8482008C */ lh $v0, 0x8c($a0) -/* BAE818 80240ED8 14400003 */ bnez $v0, .L80240EE8 -/* BAE81C 80240EDC 2402000E */ addiu $v0, $zero, 0xe -/* BAE820 80240EE0 A480008E */ sh $zero, 0x8e($a0) -/* BAE824 80240EE4 AE020070 */ sw $v0, 0x70($s0) -.L80240EE8: -/* BAE828 80240EE8 8FBF0014 */ lw $ra, 0x14($sp) -/* BAE82C 80240EEC 8FB00010 */ lw $s0, 0x10($sp) -/* BAE830 80240EF0 03E00008 */ jr $ra -/* BAE834 80240EF4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s index 9b215b0a0c..be5e0a69c4 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s @@ -109,7 +109,7 @@ glabel func_802413AC_BAECEC /* BAEE84 80241544 0000102D */ daddu $v0, $zero, $zero /* BAEE88 80241548 0280202D */ daddu $a0, $s4, $zero /* BAEE8C 8024154C 0200282D */ daddu $a1, $s0, $zero -/* BAEE90 80241550 0C0903A5 */ jal func_80240E94_BAE7D4 +/* BAEE90 80241550 0C0903A5 */ jal UnkNpcAIFunc3 /* BAEE94 80241554 0260302D */ daddu $a2, $s3, $zero /* BAEE98 80241558 0809055D */ j .L80241574 /* BAEE9C 8024155C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802415C8_9F6008.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802415C8_9F6008.s deleted file mode 100644 index c6e5de5891..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802415C8_9F6008.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415C8_9F6008 -/* 9F6008 802415C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9F600C 802415CC AFB00010 */ sw $s0, 0x10($sp) -/* 9F6010 802415D0 0080802D */ daddu $s0, $a0, $zero -/* 9F6014 802415D4 AFBF0014 */ sw $ra, 0x14($sp) -/* 9F6018 802415D8 8E020148 */ lw $v0, 0x148($s0) -/* 9F601C 802415DC 0C00EABB */ jal get_npc_unsafe -/* 9F6020 802415E0 84440008 */ lh $a0, 8($v0) -/* 9F6024 802415E4 0040202D */ daddu $a0, $v0, $zero -/* 9F6028 802415E8 8482008E */ lh $v0, 0x8e($a0) -/* 9F602C 802415EC 9483008E */ lhu $v1, 0x8e($a0) -/* 9F6030 802415F0 18400005 */ blez $v0, .L80241608 -/* 9F6034 802415F4 2462FFFF */ addiu $v0, $v1, -1 -/* 9F6038 802415F8 A482008E */ sh $v0, 0x8e($a0) -/* 9F603C 802415FC 00021400 */ sll $v0, $v0, 0x10 -/* 9F6040 80241600 1C400006 */ bgtz $v0, .L8024161C -/* 9F6044 80241604 00000000 */ nop -.L80241608: -/* 9F6048 80241608 8482008C */ lh $v0, 0x8c($a0) -/* 9F604C 8024160C 14400003 */ bnez $v0, .L8024161C -/* 9F6050 80241610 2402000E */ addiu $v0, $zero, 0xe -/* 9F6054 80241614 A480008E */ sh $zero, 0x8e($a0) -/* 9F6058 80241618 AE020070 */ sw $v0, 0x70($s0) -.L8024161C: -/* 9F605C 8024161C 8FBF0014 */ lw $ra, 0x14($sp) -/* 9F6060 80241620 8FB00010 */ lw $s0, 0x10($sp) -/* 9F6064 80241624 03E00008 */ jr $ra -/* 9F6068 80241628 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s index 74447a238c..ed8d84d103 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s @@ -109,7 +109,7 @@ glabel func_80241AE0_9F6520 /* 9F66B8 80241C78 0000102D */ daddu $v0, $zero, $zero /* 9F66BC 80241C7C 0280202D */ daddu $a0, $s4, $zero /* 9F66C0 80241C80 0200282D */ daddu $a1, $s0, $zero -/* 9F66C4 80241C84 0C090572 */ jal func_802415C8_9F6008 +/* 9F66C4 80241C84 0C090572 */ jal UnkNpcAIFunc3 /* 9F66C8 80241C88 0260302D */ daddu $a2, $s3, $zero /* 9F66CC 80241C8C 0809072A */ j .L80241CA8 /* 9F66D0 80241C90 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241788_A03FC8.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241788_A03FC8.s deleted file mode 100644 index 451585c88f..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241788_A03FC8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241788_A03FC8 -/* A03FC8 80241788 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A03FCC 8024178C AFB00010 */ sw $s0, 0x10($sp) -/* A03FD0 80241790 0080802D */ daddu $s0, $a0, $zero -/* A03FD4 80241794 AFBF0014 */ sw $ra, 0x14($sp) -/* A03FD8 80241798 8E020148 */ lw $v0, 0x148($s0) -/* A03FDC 8024179C 0C00EABB */ jal get_npc_unsafe -/* A03FE0 802417A0 84440008 */ lh $a0, 8($v0) -/* A03FE4 802417A4 0040202D */ daddu $a0, $v0, $zero -/* A03FE8 802417A8 8482008E */ lh $v0, 0x8e($a0) -/* A03FEC 802417AC 9483008E */ lhu $v1, 0x8e($a0) -/* A03FF0 802417B0 18400005 */ blez $v0, .L802417C8 -/* A03FF4 802417B4 2462FFFF */ addiu $v0, $v1, -1 -/* A03FF8 802417B8 A482008E */ sh $v0, 0x8e($a0) -/* A03FFC 802417BC 00021400 */ sll $v0, $v0, 0x10 -/* A04000 802417C0 1C400006 */ bgtz $v0, .L802417DC -/* A04004 802417C4 00000000 */ nop -.L802417C8: -/* A04008 802417C8 8482008C */ lh $v0, 0x8c($a0) -/* A0400C 802417CC 14400003 */ bnez $v0, .L802417DC -/* A04010 802417D0 2402000E */ addiu $v0, $zero, 0xe -/* A04014 802417D4 A480008E */ sh $zero, 0x8e($a0) -/* A04018 802417D8 AE020070 */ sw $v0, 0x70($s0) -.L802417DC: -/* A0401C 802417DC 8FBF0014 */ lw $ra, 0x14($sp) -/* A04020 802417E0 8FB00010 */ lw $s0, 0x10($sp) -/* A04024 802417E4 03E00008 */ jr $ra -/* A04028 802417E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s index 032e470d3a..12884a8ecc 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s @@ -109,7 +109,7 @@ glabel func_80241CA0_A044E0 /* A04678 80241E38 0000102D */ daddu $v0, $zero, $zero /* A0467C 80241E3C 0280202D */ daddu $a0, $s4, $zero /* A04680 80241E40 0200282D */ daddu $a1, $s0, $zero -/* A04684 80241E44 0C0905E2 */ jal func_80241788_A03FC8 +/* A04684 80241E44 0C0905E2 */ jal UnkNpcAIFunc3 /* A04688 80241E48 0260302D */ daddu $a2, $s3, $zero /* A0468C 80241E4C 0809079A */ j .L80241E68 /* A04690 80241E50 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802418A8_A087A8.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802418A8_A087A8.s deleted file mode 100644 index c34e8d666c..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802418A8_A087A8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418A8_A087A8 -/* A087A8 802418A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A087AC 802418AC AFB00010 */ sw $s0, 0x10($sp) -/* A087B0 802418B0 0080802D */ daddu $s0, $a0, $zero -/* A087B4 802418B4 AFBF0014 */ sw $ra, 0x14($sp) -/* A087B8 802418B8 8E020148 */ lw $v0, 0x148($s0) -/* A087BC 802418BC 0C00EABB */ jal get_npc_unsafe -/* A087C0 802418C0 84440008 */ lh $a0, 8($v0) -/* A087C4 802418C4 0040202D */ daddu $a0, $v0, $zero -/* A087C8 802418C8 8482008E */ lh $v0, 0x8e($a0) -/* A087CC 802418CC 9483008E */ lhu $v1, 0x8e($a0) -/* A087D0 802418D0 18400005 */ blez $v0, .L802418E8 -/* A087D4 802418D4 2462FFFF */ addiu $v0, $v1, -1 -/* A087D8 802418D8 A482008E */ sh $v0, 0x8e($a0) -/* A087DC 802418DC 00021400 */ sll $v0, $v0, 0x10 -/* A087E0 802418E0 1C400006 */ bgtz $v0, .L802418FC -/* A087E4 802418E4 00000000 */ nop -.L802418E8: -/* A087E8 802418E8 8482008C */ lh $v0, 0x8c($a0) -/* A087EC 802418EC 14400003 */ bnez $v0, .L802418FC -/* A087F0 802418F0 2402000E */ addiu $v0, $zero, 0xe -/* A087F4 802418F4 A480008E */ sh $zero, 0x8e($a0) -/* A087F8 802418F8 AE020070 */ sw $v0, 0x70($s0) -.L802418FC: -/* A087FC 802418FC 8FBF0014 */ lw $ra, 0x14($sp) -/* A08800 80241900 8FB00010 */ lw $s0, 0x10($sp) -/* A08804 80241904 03E00008 */ jr $ra -/* A08808 80241908 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s index 138b9e1687..bfa65b38a1 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s @@ -109,7 +109,7 @@ glabel func_80241DC0_A08CC0 /* A08E58 80241F58 0000102D */ daddu $v0, $zero, $zero /* A08E5C 80241F5C 0280202D */ daddu $a0, $s4, $zero /* A08E60 80241F60 0200282D */ daddu $a1, $s0, $zero -/* A08E64 80241F64 0C09062A */ jal func_802418A8_A087A8 +/* A08E64 80241F64 0C09062A */ jal UnkNpcAIFunc3 /* A08E68 80241F68 0260302D */ daddu $a2, $s3, $zero /* A08E6C 80241F6C 080907E2 */ j .L80241F88 /* A08E70 80241F70 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241194_DAE594.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241194_DAE594.s deleted file mode 100644 index d6c96ab42a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241194_DAE594.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241194_DAE594 -/* DAE594 80241194 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DAE598 80241198 AFB00010 */ sw $s0, 0x10($sp) -/* DAE59C 8024119C 0080802D */ daddu $s0, $a0, $zero -/* DAE5A0 802411A0 AFBF0014 */ sw $ra, 0x14($sp) -/* DAE5A4 802411A4 8E020148 */ lw $v0, 0x148($s0) -/* DAE5A8 802411A8 0C00EABB */ jal get_npc_unsafe -/* DAE5AC 802411AC 84440008 */ lh $a0, 8($v0) -/* DAE5B0 802411B0 0040202D */ daddu $a0, $v0, $zero -/* DAE5B4 802411B4 8482008E */ lh $v0, 0x8e($a0) -/* DAE5B8 802411B8 9483008E */ lhu $v1, 0x8e($a0) -/* DAE5BC 802411BC 18400005 */ blez $v0, .L802411D4 -/* DAE5C0 802411C0 2462FFFF */ addiu $v0, $v1, -1 -/* DAE5C4 802411C4 A482008E */ sh $v0, 0x8e($a0) -/* DAE5C8 802411C8 00021400 */ sll $v0, $v0, 0x10 -/* DAE5CC 802411CC 1C400006 */ bgtz $v0, .L802411E8 -/* DAE5D0 802411D0 00000000 */ nop -.L802411D4: -/* DAE5D4 802411D4 8482008C */ lh $v0, 0x8c($a0) -/* DAE5D8 802411D8 14400003 */ bnez $v0, .L802411E8 -/* DAE5DC 802411DC 2402000E */ addiu $v0, $zero, 0xe -/* DAE5E0 802411E0 A480008E */ sh $zero, 0x8e($a0) -/* DAE5E4 802411E4 AE020070 */ sw $v0, 0x70($s0) -.L802411E8: -/* DAE5E8 802411E8 8FBF0014 */ lw $ra, 0x14($sp) -/* DAE5EC 802411EC 8FB00010 */ lw $s0, 0x10($sp) -/* DAE5F0 802411F0 03E00008 */ jr $ra -/* DAE5F4 802411F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s index a3eb473b1d..426fe39fb6 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s @@ -109,7 +109,7 @@ glabel func_802416AC_DAEAAC /* DAEC44 80241844 0000102D */ daddu $v0, $zero, $zero /* DAEC48 80241848 0280202D */ daddu $a0, $s4, $zero /* DAEC4C 8024184C 0200282D */ daddu $a1, $s0, $zero -/* DAEC50 80241850 0C090465 */ jal func_80241194_DAE594 +/* DAEC50 80241850 0C090465 */ jal UnkNpcAIFunc3 /* DAEC54 80241854 0260302D */ daddu $a2, $s3, $zero /* DAEC58 80241858 0809061D */ j .L80241874 /* DAEC5C 8024185C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241848_DB3B08.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241848_DB3B08.s deleted file mode 100644 index fcd81f6694..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241848_DB3B08.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241848_DB3B08 -/* DB3B08 80241848 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DB3B0C 8024184C AFB00010 */ sw $s0, 0x10($sp) -/* DB3B10 80241850 0080802D */ daddu $s0, $a0, $zero -/* DB3B14 80241854 AFBF0014 */ sw $ra, 0x14($sp) -/* DB3B18 80241858 8E020148 */ lw $v0, 0x148($s0) -/* DB3B1C 8024185C 0C00EABB */ jal get_npc_unsafe -/* DB3B20 80241860 84440008 */ lh $a0, 8($v0) -/* DB3B24 80241864 0040202D */ daddu $a0, $v0, $zero -/* DB3B28 80241868 8482008E */ lh $v0, 0x8e($a0) -/* DB3B2C 8024186C 9483008E */ lhu $v1, 0x8e($a0) -/* DB3B30 80241870 18400005 */ blez $v0, .L80241888 -/* DB3B34 80241874 2462FFFF */ addiu $v0, $v1, -1 -/* DB3B38 80241878 A482008E */ sh $v0, 0x8e($a0) -/* DB3B3C 8024187C 00021400 */ sll $v0, $v0, 0x10 -/* DB3B40 80241880 1C400006 */ bgtz $v0, .L8024189C -/* DB3B44 80241884 00000000 */ nop -.L80241888: -/* DB3B48 80241888 8482008C */ lh $v0, 0x8c($a0) -/* DB3B4C 8024188C 14400003 */ bnez $v0, .L8024189C -/* DB3B50 80241890 2402000E */ addiu $v0, $zero, 0xe -/* DB3B54 80241894 A480008E */ sh $zero, 0x8e($a0) -/* DB3B58 80241898 AE020070 */ sw $v0, 0x70($s0) -.L8024189C: -/* DB3B5C 8024189C 8FBF0014 */ lw $ra, 0x14($sp) -/* DB3B60 802418A0 8FB00010 */ lw $s0, 0x10($sp) -/* DB3B64 802418A4 03E00008 */ jr $ra -/* DB3B68 802418A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s index cd2a6b1d23..42ce993af6 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s @@ -109,7 +109,7 @@ glabel func_80241D60_DB4020 /* DB41B8 80241EF8 0000102D */ daddu $v0, $zero, $zero /* DB41BC 80241EFC 0280202D */ daddu $a0, $s4, $zero /* DB41C0 80241F00 0200282D */ daddu $a1, $s0, $zero -/* DB41C4 80241F04 0C090612 */ jal func_80241848_DB3B08 +/* DB41C4 80241F04 0C090612 */ jal UnkNpcAIFunc3 /* DB41C8 80241F08 0260302D */ daddu $a2, $s3, $zero /* DB41CC 80241F0C 080907CA */ j .L80241F28 /* DB41D0 80241F10 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024276C_DBFA1C.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024276C_DBFA1C.s deleted file mode 100644 index 36cd8a2a95..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024276C_DBFA1C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024276C_DBFA1C -/* DBFA1C 8024276C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DBFA20 80242770 AFB00010 */ sw $s0, 0x10($sp) -/* DBFA24 80242774 0080802D */ daddu $s0, $a0, $zero -/* DBFA28 80242778 AFBF0014 */ sw $ra, 0x14($sp) -/* DBFA2C 8024277C 8E020148 */ lw $v0, 0x148($s0) -/* DBFA30 80242780 0C00EABB */ jal get_npc_unsafe -/* DBFA34 80242784 84440008 */ lh $a0, 8($v0) -/* DBFA38 80242788 0040202D */ daddu $a0, $v0, $zero -/* DBFA3C 8024278C 8482008E */ lh $v0, 0x8e($a0) -/* DBFA40 80242790 9483008E */ lhu $v1, 0x8e($a0) -/* DBFA44 80242794 18400005 */ blez $v0, .L802427AC -/* DBFA48 80242798 2462FFFF */ addiu $v0, $v1, -1 -/* DBFA4C 8024279C A482008E */ sh $v0, 0x8e($a0) -/* DBFA50 802427A0 00021400 */ sll $v0, $v0, 0x10 -/* DBFA54 802427A4 1C400006 */ bgtz $v0, .L802427C0 -/* DBFA58 802427A8 00000000 */ nop -.L802427AC: -/* DBFA5C 802427AC 8482008C */ lh $v0, 0x8c($a0) -/* DBFA60 802427B0 14400003 */ bnez $v0, .L802427C0 -/* DBFA64 802427B4 2402000E */ addiu $v0, $zero, 0xe -/* DBFA68 802427B8 A480008E */ sh $zero, 0x8e($a0) -/* DBFA6C 802427BC AE020070 */ sw $v0, 0x70($s0) -.L802427C0: -/* DBFA70 802427C0 8FBF0014 */ lw $ra, 0x14($sp) -/* DBFA74 802427C4 8FB00010 */ lw $s0, 0x10($sp) -/* DBFA78 802427C8 03E00008 */ jr $ra -/* DBFA7C 802427CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s index 4356034195..2b43bc919b 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s @@ -109,7 +109,7 @@ glabel func_80242C84_DBFF34 /* DC00CC 80242E1C 0000102D */ daddu $v0, $zero, $zero /* DC00D0 80242E20 0280202D */ daddu $a0, $s4, $zero /* DC00D4 80242E24 0200282D */ daddu $a1, $s0, $zero -/* DC00D8 80242E28 0C0909DB */ jal func_8024276C_DBFA1C +/* DC00D8 80242E28 0C0909DB */ jal UnkNpcAIFunc3 /* DC00DC 80242E2C 0260302D */ daddu $a2, $s3, $zero /* DC00E0 80242E30 08090B93 */ j .L80242E4C /* DC00E4 80242E34 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241DA8_DF0C48.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241DA8_DF0C48.s deleted file mode 100644 index df26fc4af7..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241DA8_DF0C48.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DA8_DF0C48 -/* DF0C48 80241DA8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DF0C4C 80241DAC AFB00010 */ sw $s0, 0x10($sp) -/* DF0C50 80241DB0 0080802D */ daddu $s0, $a0, $zero -/* DF0C54 80241DB4 AFBF0014 */ sw $ra, 0x14($sp) -/* DF0C58 80241DB8 8E020148 */ lw $v0, 0x148($s0) -/* DF0C5C 80241DBC 0C00EABB */ jal get_npc_unsafe -/* DF0C60 80241DC0 84440008 */ lh $a0, 8($v0) -/* DF0C64 80241DC4 0040202D */ daddu $a0, $v0, $zero -/* DF0C68 80241DC8 8482008E */ lh $v0, 0x8e($a0) -/* DF0C6C 80241DCC 9483008E */ lhu $v1, 0x8e($a0) -/* DF0C70 80241DD0 18400005 */ blez $v0, .L80241DE8 -/* DF0C74 80241DD4 2462FFFF */ addiu $v0, $v1, -1 -/* DF0C78 80241DD8 A482008E */ sh $v0, 0x8e($a0) -/* DF0C7C 80241DDC 00021400 */ sll $v0, $v0, 0x10 -/* DF0C80 80241DE0 1C400006 */ bgtz $v0, .L80241DFC -/* DF0C84 80241DE4 00000000 */ nop -.L80241DE8: -/* DF0C88 80241DE8 8482008C */ lh $v0, 0x8c($a0) -/* DF0C8C 80241DEC 14400003 */ bnez $v0, .L80241DFC -/* DF0C90 80241DF0 2402000E */ addiu $v0, $zero, 0xe -/* DF0C94 80241DF4 A480008E */ sh $zero, 0x8e($a0) -/* DF0C98 80241DF8 AE020070 */ sw $v0, 0x70($s0) -.L80241DFC: -/* DF0C9C 80241DFC 8FBF0014 */ lw $ra, 0x14($sp) -/* DF0CA0 80241E00 8FB00010 */ lw $s0, 0x10($sp) -/* DF0CA4 80241E04 03E00008 */ jr $ra -/* DF0CA8 80241E08 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s index e946771094..b238209bd1 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s @@ -109,7 +109,7 @@ glabel func_802422C0_DF1160 /* DF12F8 80242458 0000102D */ daddu $v0, $zero, $zero /* DF12FC 8024245C 0280202D */ daddu $a0, $s4, $zero /* DF1300 80242460 0200282D */ daddu $a1, $s0, $zero -/* DF1304 80242464 0C09076A */ jal func_80241DA8_DF0C48 +/* DF1304 80242464 0C09076A */ jal UnkNpcAIFunc3 /* DF1308 80242468 0260302D */ daddu $a2, $s3, $zero /* DF130C 8024246C 08090922 */ j .L80242488 /* DF1310 80242470 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241344_D211D4.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241344_D211D4.s deleted file mode 100644 index b7d170e5e2..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241344_D211D4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241344_D211D4 -/* D211D4 80241344 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D211D8 80241348 AFB00010 */ sw $s0, 0x10($sp) -/* D211DC 8024134C 0080802D */ daddu $s0, $a0, $zero -/* D211E0 80241350 AFBF0014 */ sw $ra, 0x14($sp) -/* D211E4 80241354 8E020148 */ lw $v0, 0x148($s0) -/* D211E8 80241358 0C00EABB */ jal get_npc_unsafe -/* D211EC 8024135C 84440008 */ lh $a0, 8($v0) -/* D211F0 80241360 0040202D */ daddu $a0, $v0, $zero -/* D211F4 80241364 8482008E */ lh $v0, 0x8e($a0) -/* D211F8 80241368 9483008E */ lhu $v1, 0x8e($a0) -/* D211FC 8024136C 18400005 */ blez $v0, .L80241384 -/* D21200 80241370 2462FFFF */ addiu $v0, $v1, -1 -/* D21204 80241374 A482008E */ sh $v0, 0x8e($a0) -/* D21208 80241378 00021400 */ sll $v0, $v0, 0x10 -/* D2120C 8024137C 1C400006 */ bgtz $v0, .L80241398 -/* D21210 80241380 00000000 */ nop -.L80241384: -/* D21214 80241384 8482008C */ lh $v0, 0x8c($a0) -/* D21218 80241388 14400003 */ bnez $v0, .L80241398 -/* D2121C 8024138C 2402000E */ addiu $v0, $zero, 0xe -/* D21220 80241390 A480008E */ sh $zero, 0x8e($a0) -/* D21224 80241394 AE020070 */ sw $v0, 0x70($s0) -.L80241398: -/* D21228 80241398 8FBF0014 */ lw $ra, 0x14($sp) -/* D2122C 8024139C 8FB00010 */ lw $s0, 0x10($sp) -/* D21230 802413A0 03E00008 */ jr $ra -/* D21234 802413A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s index 68dbae9e36..2718a6047a 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s @@ -109,7 +109,7 @@ glabel func_8024185C_D216EC /* D21884 802419F4 0000102D */ daddu $v0, $zero, $zero /* D21888 802419F8 0280202D */ daddu $a0, $s4, $zero /* D2188C 802419FC 0200282D */ daddu $a1, $s0, $zero -/* D21890 80241A00 0C0904D1 */ jal func_80241344_D211D4 +/* D21890 80241A00 0C0904D1 */ jal UnkNpcAIFunc3 /* D21894 80241A04 0260302D */ daddu $a2, $s3, $zero /* D21898 80241A08 08090689 */ j .L80241A24 /* D2189C 80241A0C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802421E4_87BDC4.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802421E4_87BDC4.s deleted file mode 100644 index 9773b38980..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802421E4_87BDC4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421E4_87BDC4 -/* 87BDC4 802421E4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 87BDC8 802421E8 AFB00010 */ sw $s0, 0x10($sp) -/* 87BDCC 802421EC 0080802D */ daddu $s0, $a0, $zero -/* 87BDD0 802421F0 AFBF0014 */ sw $ra, 0x14($sp) -/* 87BDD4 802421F4 8E020148 */ lw $v0, 0x148($s0) -/* 87BDD8 802421F8 0C00EABB */ jal get_npc_unsafe -/* 87BDDC 802421FC 84440008 */ lh $a0, 8($v0) -/* 87BDE0 80242200 0040202D */ daddu $a0, $v0, $zero -/* 87BDE4 80242204 8482008E */ lh $v0, 0x8e($a0) -/* 87BDE8 80242208 9483008E */ lhu $v1, 0x8e($a0) -/* 87BDEC 8024220C 18400005 */ blez $v0, .L80242224 -/* 87BDF0 80242210 2462FFFF */ addiu $v0, $v1, -1 -/* 87BDF4 80242214 A482008E */ sh $v0, 0x8e($a0) -/* 87BDF8 80242218 00021400 */ sll $v0, $v0, 0x10 -/* 87BDFC 8024221C 1C400006 */ bgtz $v0, .L80242238 -/* 87BE00 80242220 00000000 */ nop -.L80242224: -/* 87BE04 80242224 8482008C */ lh $v0, 0x8c($a0) -/* 87BE08 80242228 14400003 */ bnez $v0, .L80242238 -/* 87BE0C 8024222C 2402000E */ addiu $v0, $zero, 0xe -/* 87BE10 80242230 A480008E */ sh $zero, 0x8e($a0) -/* 87BE14 80242234 AE020070 */ sw $v0, 0x70($s0) -.L80242238: -/* 87BE18 80242238 8FBF0014 */ lw $ra, 0x14($sp) -/* 87BE1C 8024223C 8FB00010 */ lw $s0, 0x10($sp) -/* 87BE20 80242240 03E00008 */ jr $ra -/* 87BE24 80242244 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s index dcd010b25f..b7de9cd948 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s @@ -109,7 +109,7 @@ glabel func_802426FC_87C2DC /* 87C474 80242894 0000102D */ daddu $v0, $zero, $zero /* 87C478 80242898 0280202D */ daddu $a0, $s4, $zero /* 87C47C 8024289C 0200282D */ daddu $a1, $s0, $zero -/* 87C480 802428A0 0C090879 */ jal func_802421E4_87BDC4 +/* 87C480 802428A0 0C090879 */ jal UnkNpcAIFunc3 /* 87C484 802428A4 0260302D */ daddu $a2, $s3, $zero /* 87C488 802428A8 08090A31 */ j .L802428C4 /* 87C48C 802428AC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C0C_9AAFFC.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C0C_9AAFFC.s deleted file mode 100644 index 6fda49ee13..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C0C_9AAFFC.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C0C_9AAFFC -/* 9AAFFC 80242C0C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9AB000 80242C10 AFB00010 */ sw $s0, 0x10($sp) -/* 9AB004 80242C14 0080802D */ daddu $s0, $a0, $zero -/* 9AB008 80242C18 AFBF0014 */ sw $ra, 0x14($sp) -/* 9AB00C 80242C1C 8E020148 */ lw $v0, 0x148($s0) -/* 9AB010 80242C20 0C00EABB */ jal get_npc_unsafe -/* 9AB014 80242C24 84440008 */ lh $a0, 8($v0) -/* 9AB018 80242C28 0040202D */ daddu $a0, $v0, $zero -/* 9AB01C 80242C2C 8482008E */ lh $v0, 0x8e($a0) -/* 9AB020 80242C30 9483008E */ lhu $v1, 0x8e($a0) -/* 9AB024 80242C34 18400005 */ blez $v0, .L80242C4C -/* 9AB028 80242C38 2462FFFF */ addiu $v0, $v1, -1 -/* 9AB02C 80242C3C A482008E */ sh $v0, 0x8e($a0) -/* 9AB030 80242C40 00021400 */ sll $v0, $v0, 0x10 -/* 9AB034 80242C44 1C400006 */ bgtz $v0, .L80242C60 -/* 9AB038 80242C48 00000000 */ nop -.L80242C4C: -/* 9AB03C 80242C4C 8482008C */ lh $v0, 0x8c($a0) -/* 9AB040 80242C50 14400003 */ bnez $v0, .L80242C60 -/* 9AB044 80242C54 2402000E */ addiu $v0, $zero, 0xe -/* 9AB048 80242C58 A480008E */ sh $zero, 0x8e($a0) -/* 9AB04C 80242C5C AE020070 */ sw $v0, 0x70($s0) -.L80242C60: -/* 9AB050 80242C60 8FBF0014 */ lw $ra, 0x14($sp) -/* 9AB054 80242C64 8FB00010 */ lw $s0, 0x10($sp) -/* 9AB058 80242C68 03E00008 */ jr $ra -/* 9AB05C 80242C6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s index fdb24ab773..ac1d6b2baf 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s @@ -109,7 +109,7 @@ glabel func_80243124_9AB514 /* 9AB6AC 802432BC 0000102D */ daddu $v0, $zero, $zero /* 9AB6B0 802432C0 0280202D */ daddu $a0, $s4, $zero /* 9AB6B4 802432C4 0200282D */ daddu $a1, $s0, $zero -/* 9AB6B8 802432C8 0C090B03 */ jal func_80242C0C_9AAFFC +/* 9AB6B8 802432C8 0C090B03 */ jal UnkNpcAIFunc3 /* 9AB6BC 802432CC 0260302D */ daddu $a2, $s3, $zero /* 9AB6C0 802432D0 08090CBB */ j .L802432EC /* 9AB6C4 802432D4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802418D8_9B8258.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802418D8_9B8258.s deleted file mode 100644 index bf3cbc15f4..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802418D8_9B8258.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418D8_9B8258 -/* 9B8258 802418D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B825C 802418DC AFB00010 */ sw $s0, 0x10($sp) -/* 9B8260 802418E0 0080802D */ daddu $s0, $a0, $zero -/* 9B8264 802418E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 9B8268 802418E8 8E020148 */ lw $v0, 0x148($s0) -/* 9B826C 802418EC 0C00EABB */ jal get_npc_unsafe -/* 9B8270 802418F0 84440008 */ lh $a0, 8($v0) -/* 9B8274 802418F4 0040202D */ daddu $a0, $v0, $zero -/* 9B8278 802418F8 8482008E */ lh $v0, 0x8e($a0) -/* 9B827C 802418FC 9483008E */ lhu $v1, 0x8e($a0) -/* 9B8280 80241900 18400005 */ blez $v0, .L80241918 -/* 9B8284 80241904 2462FFFF */ addiu $v0, $v1, -1 -/* 9B8288 80241908 A482008E */ sh $v0, 0x8e($a0) -/* 9B828C 8024190C 00021400 */ sll $v0, $v0, 0x10 -/* 9B8290 80241910 1C400006 */ bgtz $v0, .L8024192C -/* 9B8294 80241914 00000000 */ nop -.L80241918: -/* 9B8298 80241918 8482008C */ lh $v0, 0x8c($a0) -/* 9B829C 8024191C 14400003 */ bnez $v0, .L8024192C -/* 9B82A0 80241920 2402000E */ addiu $v0, $zero, 0xe -/* 9B82A4 80241924 A480008E */ sh $zero, 0x8e($a0) -/* 9B82A8 80241928 AE020070 */ sw $v0, 0x70($s0) -.L8024192C: -/* 9B82AC 8024192C 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B82B0 80241930 8FB00010 */ lw $s0, 0x10($sp) -/* 9B82B4 80241934 03E00008 */ jr $ra -/* 9B82B8 80241938 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s index cd9299bd8c..74c471a25f 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s @@ -109,7 +109,7 @@ glabel func_80241DF0_9B8770 /* 9B8908 80241F88 0000102D */ daddu $v0, $zero, $zero /* 9B890C 80241F8C 0280202D */ daddu $a0, $s4, $zero /* 9B8910 80241F90 0200282D */ daddu $a1, $s0, $zero -/* 9B8914 80241F94 0C090636 */ jal func_802418D8_9B8258 +/* 9B8914 80241F94 0C090636 */ jal UnkNpcAIFunc3 /* 9B8918 80241F98 0260302D */ daddu $a2, $s3, $zero /* 9B891C 80241F9C 080907EE */ j .L80241FB8 /* 9B8920 80241FA0 0000102D */ daddu $v0, $zero, $zero diff --git a/include/common_structs.h b/include/common_structs.h index 859151d6cd..5bf772177e 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -102,7 +102,7 @@ typedef struct Npc { /* 0x084 */ char unk_84[4]; /* 0x088 */ s16 isFacingAway; /* 0x08A */ s16 yawCamOffset; - /* 0x08C */ char unk_8C[2]; + /* 0x08C */ s16 unk_8C; /* 0x08E */ s16 duration; /* formerly interp_counter */ /* 0x090 */ Vec3s homePos; /* 0x096 */ char unk_96[12]; diff --git a/src/world/area_arn/arn_04/BE37B0.c b/src/world/area_arn/arn_04/BE37B0.c index 25aec44bfb..2b2a996f15 100644 --- a/src/world/area_arn/arn_04/BE37B0.c +++ b/src/world/area_arn/arn_04/BE37B0.c @@ -39,7 +39,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241AE4_BE5294); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241B50_BE5300); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241C84_BE5434); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241CE8_BE5498); diff --git a/src/world/area_arn/arn_07/BED740.c b/src/world/area_arn/arn_07/BED740.c index 15ee0aa405..27e950cfed 100644 --- a/src/world/area_arn/arn_07/BED740.c +++ b/src/world/area_arn/arn_07/BED740.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_802415A4_BEE394); INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80241610_BEE400); -INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80241744_BEE534); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_802417A8_BEE598); diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index 5f52ca2914..fea0889e57 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240D74_BFE5F4); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240DE0_BFE660); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240F14_BFE794); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240F78_BFE7F8); diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index d67f4be315..4d325af878 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240C54_C37184); INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240CC0_C371F0); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240DF4_C37324); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240E58_C37388); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 91a0211327..ee565ac924 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -53,7 +53,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802423B4_C42164); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242420_C421D0); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242554_C42304); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802425B8_C42368); diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index c3ee26d073..5615d9b7f9 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242078_C48C58); INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802420E4_C48CC4); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242218_C48DF8); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_8024227C_C48E5C); diff --git a/src/world/area_flo/flo_09/CB5320.c b/src/world/area_flo/flo_09/CB5320.c index f3770008f2..d442067970 100644 --- a/src/world/area_flo/flo_09/CB5320.c +++ b/src/world/area_flo/flo_09/CB5320.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240F74_CB5F74); INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240FE0_CB5FE0); -INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80241114_CB6114); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80241178_CB6178); diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index 66b39ff220..06eda1bece 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240E18_CC4628); INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240E84_CC4694); -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240FB8_CC47C8); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_8024101C_CC482C); diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index 5a8839672b..c803d04f92 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241764_CCCA74); INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_802417D0_CCCAE0); -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241904_CCCC14); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241968_CCCC78); diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c index 80c656fabd..61e472d7ed 100644 --- a/src/world/area_flo/flo_16/CD2C80.c +++ b/src/world/area_flo/flo_16/CD2C80.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241AA4_CD38D4); INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241B10_CD3940); -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241C44_CD3A74); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241CA8_CD3AD8); diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index 0c0e586bea..24e69bda54 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240CC4_CD7FA4); INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240D30_CD8010); -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240E64_CD8144); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240EC8_CD81A8); diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index 391111f892..3cd801570c 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240C94_CF3864); INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240D00_CF38D0); -INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240E34_CF3A04); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240E98_CF3A68); diff --git a/src/world/area_hos/hos_02/A17210.c b/src/world/area_hos/hos_02/A17210.c index f7ceb301b9..6ad6124807 100644 --- a/src/world/area_hos/hos_02/A17210.c +++ b/src/world/area_hos/hos_02/A17210.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241C44_A17E64); INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241CB0_A17ED0); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241DE4_A18004); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241E48_A18068); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 459737beee..4a3b8eb3d3 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241904_A1CA04); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241970_A1CA70); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241AA4_A1CBA4); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241B08_A1CC08); diff --git a/src/world/area_kmr/kmr_05/8CE070.c b/src/world/area_kmr/kmr_05/8CE070.c index fca5d7eed9..d4f8c67856 100644 --- a/src/world/area_kmr/kmr_05/8CE070.c +++ b/src/world/area_kmr/kmr_05/8CE070.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240C54_8CECC4); INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240CC0_8CED30); -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240DF4_8CEE64); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240E58_8CEEC8); diff --git a/src/world/area_kmr/kmr_06/8D1510.c b/src/world/area_kmr/kmr_06/8D1510.c index 3da8c35ffa..a695f1fde8 100644 --- a/src/world/area_kmr/kmr_06/8D1510.c +++ b/src/world/area_kmr/kmr_06/8D1510.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240C54_8D2164); INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240CC0_8D21D0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240DF4_8D2304); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240E58_8D2368); diff --git a/src/world/area_kmr/kmr_09/8D5E00.c b/src/world/area_kmr/kmr_09/8D5E00.c index d9f63fa0f5..3ad9b8b8df 100644 --- a/src/world/area_kmr/kmr_09/8D5E00.c +++ b/src/world/area_kmr/kmr_09/8D5E00.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240C54_8D6A54); INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240CC0_8D6AC0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240DF4_8D6BF4); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240E58_8D6C58); diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index d2dd639b04..ba8680ebea 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241134_C5B874); INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802411A0_C5B8E0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802412D4_C5BA14); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241338_C5BA78); diff --git a/src/world/area_kzn/kzn_07/C6EA50.c b/src/world/area_kzn/kzn_07/C6EA50.c index d7002da87c..99eb861a79 100644 --- a/src/world/area_kzn/kzn_07/C6EA50.c +++ b/src/world/area_kzn/kzn_07/C6EA50.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241474_C6F7A4); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802414E0_C6F810); -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241614_C6F944); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241678_C6F9A8); diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index b784059611..4da8f413c2 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802416A4_C72B24); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80241710_C72B90); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80241844_C72CC4); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802418A8_C72D28); diff --git a/src/world/area_kzn/kzn_11/C80600.c b/src/world/area_kzn/kzn_11/C80600.c index 9be2eab9cd..3575cfc20d 100644 --- a/src/world/area_kzn/kzn_11/C80600.c +++ b/src/world/area_kzn/kzn_11/C80600.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_802410B4_C81254); INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241120_C812C0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241254_C813F4); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_802412B8_C81458); diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index 587a1ca76f..293d63460f 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240CF4_BAE634); INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240D60_BAE6A0); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240E94_BAE7D4); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240EF8_BAE838); diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c index a56dcf1a9b..5b95093f99 100644 --- a/src/world/area_nok/nok_11/9F4A40.c +++ b/src/world/area_nok/nok_11/9F4A40.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241428_9F5E68); INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241494_9F5ED4); -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_802415C8_9F6008); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_8024162C_9F606C); diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c index aee9d34941..3a3df924f5 100644 --- a/src/world/area_nok/nok_14/A02A00.c +++ b/src/world/area_nok/nok_14/A02A00.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802415E8_A03E28); INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241654_A03E94); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241788_A03FC8); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802417EC_A0402C); diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index ddca1215de..3285877b2d 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241708_A08608); INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241774_A08674); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802418A8_A087A8); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024190C_A0880C); diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index e4ae976622..4b88139136 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240FF4_DAE3F4); INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241060_DAE460); -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241194_DAE594); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802411F8_DAE5F8); diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index c868927300..4a4c969b73 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802416A8_DB3968); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241714_DB39D4); -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241848_DB3B08); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802418AC_DB3B6C); diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index 2938a5db3f..3cdc4fc031 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -59,7 +59,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802425CC_DBF87C); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242638_DBF8E8); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024276C_DBFA1C); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802427D0_DBFA80); diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index a5519cb941..48f20bcf4f 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241C08_DF0AA8); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241C74_DF0B14); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241DA8_DF0C48); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241E0C_DF0CAC); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index 57d4b88226..8819e388d9 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802411A4_D21034); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241210_D210A0); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241344_D211D4); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802413A8_D21238); diff --git a/src/world/area_tik/tik_07/87AC00.c b/src/world/area_tik/tik_07/87AC00.c index 6111d31a35..2dbf7e9baf 100644 --- a/src/world/area_tik/tik_07/87AC00.c +++ b/src/world/area_tik/tik_07/87AC00.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80242044_87BC24); INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802420B0_87BC90); -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802421E4_87BDC4); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80242248_87BE28); diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index 81226ad54e..edb3d35a87 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -51,7 +51,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242A6C_9AAE5C); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242AD8_9AAEC8); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242C0C_9AAFFC); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242C70_9AB060); diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c index 9854d05329..61c7efc71f 100644 --- a/src/world/area_trd/trd_07/9B6C90.c +++ b/src/world/area_trd/trd_07/9B6C90.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80241738_9B80B8); INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802417A4_9B8124); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802418D8_9B8258); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024193C_9B82BC); diff --git a/src/world/common/UnkNpcAIFunc3.inc.c b/src/world/common/UnkNpcAIFunc3.inc.c new file mode 100644 index 0000000000..96553e0c20 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc3.inc.c @@ -0,0 +1,13 @@ +#include "common.h" +#include "map.h" + +static void UnkNpcAIFunc3(ScriptInstance* script) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + if ((npc->duration <= 0) || ((--npc->duration << 0x10) <= 0)) { + if (npc->unk_8C == 0) { + npc->duration = 0; + script->functionTemp[0].s = 14; + } + } +} From a82d6893ed1df0a932a7a733fc5e6c5539b685a6 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 21 Nov 2020 23:25:13 -0500 Subject: [PATCH 16/38] UnkNpcAIFunc4 --- .../jan_05/B4B260/func_802416B8_B4C128.s | 24 ----------------- .../jan_05/B4B260/func_8024219C_B4CC0C.s | 26 +++++++++---------- .../jan_05/B4B260/func_8024268C_B4D0FC.s | 23 ---------------- .../jan_06/B52F70/func_80241608_B53E38.s | 24 ----------------- .../jan_06/B52F70/func_802420EC_B5491C.s | 2 +- .../jan_07/B59870/func_80240000_B59870.s | 24 ----------------- .../jan_07/B59870/func_80240AE4_B5A354.s | 2 +- .../jan_08/B5F650/func_80241454_B5F704.s | 24 ----------------- .../jan_08/B5F650/func_80241F38_B601E8.s | 2 +- .../jan_09/B663F0/func_80240940_B663F0.s | 24 ----------------- .../jan_09/B663F0/func_80241424_B66ED4.s | 2 +- .../jan_12/B73570/func_802404C0_B73570.s | 24 ----------------- .../jan_12/B73570/func_80240FA4_B74054.s | 2 +- .../omo_05/DB22C0/func_8024056C_DB282C.s | 24 ----------------- .../omo_05/DB22C0/func_80240780_DB2A40.s | 2 +- .../omo_13/DE2710/func_802407EC_DE2C7C.s | 24 ----------------- .../omo_13/DE2710/func_80240A00_DE2E90.s | 2 +- .../omo_17/DEF400/func_80240ACC_DEF96C.s | 24 ----------------- .../omo_17/DEF400/func_80240CE0_DEFB80.s | 2 +- src/world/area_jan/jan_05/B4B260.c | 12 ++++++--- src/world/area_jan/jan_06/B52F70.c | 2 +- src/world/area_jan/jan_07/B59870.c | 2 +- src/world/area_jan/jan_08/B5F650.c | 2 +- src/world/area_jan/jan_09/B663F0.c | 2 +- src/world/area_jan/jan_12/B73570.c | 2 +- src/world/area_omo/omo_05/DB22C0.c | 2 +- src/world/area_omo/omo_13/DE2710.c | 2 +- src/world/area_omo/omo_17/DEF400.c | 2 +- src/world/common/UnkNpcAIFunc4.inc.c | 12 +++++++++ tools/assist.py | 2 +- 30 files changed, 51 insertions(+), 272 deletions(-) delete mode 100644 asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802416B8_B4C128.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024268C_B4D0FC.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241608_B53E38.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240000_B59870.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241454_B5F704.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240940_B663F0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_12/B73570/func_802404C0_B73570.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_8024056C_DB282C.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802407EC_DE2C7C.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240ACC_DEF96C.s create mode 100644 src/world/common/UnkNpcAIFunc4.inc.c diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802416B8_B4C128.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802416B8_B4C128.s deleted file mode 100644 index 8a8bc80583..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802416B8_B4C128.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416B8_B4C128 -/* B4C128 802416B8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B4C12C 802416BC AFB10014 */ sw $s1, 0x14($sp) -/* B4C130 802416C0 0080882D */ daddu $s1, $a0, $zero -/* B4C134 802416C4 AFBF0018 */ sw $ra, 0x18($sp) -/* B4C138 802416C8 AFB00010 */ sw $s0, 0x10($sp) -/* B4C13C 802416CC 8E300148 */ lw $s0, 0x148($s1) -/* B4C140 802416D0 0C00EABB */ jal get_npc_unsafe -/* B4C144 802416D4 86040008 */ lh $a0, 8($s0) -/* B4C148 802416D8 3C054387 */ lui $a1, 0x4387 -/* B4C14C 802416DC 0040202D */ daddu $a0, $v0, $zero -/* B4C150 802416E0 0C00ECD0 */ jal set_npc_yaw -/* B4C154 802416E4 A480008E */ sh $zero, 0x8e($a0) -/* B4C158 802416E8 24020003 */ addiu $v0, $zero, 3 -/* B4C15C 802416EC AE00006C */ sw $zero, 0x6c($s0) -/* B4C160 802416F0 AE220070 */ sw $v0, 0x70($s1) -/* B4C164 802416F4 8FBF0018 */ lw $ra, 0x18($sp) -/* B4C168 802416F8 8FB10014 */ lw $s1, 0x14($sp) -/* B4C16C 802416FC 8FB00010 */ lw $s0, 0x10($sp) -/* B4C170 80241700 03E00008 */ jr $ra -/* B4C174 80241704 27BD0020 */ addiu $sp, $sp, 0x20 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 1754a26317..abe37428d1 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s @@ -46,7 +46,7 @@ glabel func_8024219C_B4CC0C /* B4CCB0 80242240 8E2200B0 */ lw $v0, 0xb0($s1) /* B4CCB4 80242244 30420004 */ andi $v0, $v0, 4 /* B4CCB8 80242248 10400020 */ beqz $v0, .L802422CC -/* B4CCBC 8024224C 00000000 */ nop +/* B4CCBC 8024224C 00000000 */ nop .L80242250: /* B4CCC0 80242250 2404F7FF */ addiu $a0, $zero, -0x801 /* B4CCC4 80242254 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024219C_B4CC0C /* B4CD3C 802422CC 8E420070 */ lw $v0, 0x70($s2) /* B4CD40 802422D0 2842001E */ slti $v0, $v0, 0x1e /* B4CD44 802422D4 10400009 */ beqz $v0, .L802422FC -/* B4CD48 802422D8 00000000 */ nop +/* B4CD48 802422D8 00000000 */ nop /* B4CD4C 802422DC 8E22006C */ lw $v0, 0x6c($s1) /* B4CD50 802422E0 14400006 */ bnez $v0, .L802422FC -/* B4CD54 802422E4 00000000 */ nop +/* B4CD54 802422E4 00000000 */ nop /* B4CD58 802422E8 0C0906B5 */ jal func_80241AD4_B4C544 /* B4CD5C 802422EC 0240202D */ daddu $a0, $s2, $zero /* B4CD60 802422F0 10400002 */ beqz $v0, .L802422FC @@ -104,7 +104,7 @@ glabel func_8024219C_B4CC0C /* B4CD80 80242310 00220821 */ addu $at, $at, $v0 /* B4CD84 80242314 8C227C28 */ lw $v0, 0x7c28($at) /* B4CD88 80242318 00400008 */ jr $v0 -/* B4CD8C 8024231C 00000000 */ nop +/* B4CD8C 8024231C 00000000 */ nop /* B4CD90 80242320 0240202D */ daddu $a0, $s2, $zero /* B4CD94 80242324 0260282D */ daddu $a1, $s3, $zero /* B4CD98 80242328 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_8024219C_B4CC0C /* B4CDA8 80242338 0C0125AE */ jal func_800496B8 /* B4CDAC 8024233C 0280302D */ daddu $a2, $s4, $zero /* B4CDB0 80242340 0809090A */ j .L80242428 -/* B4CDB4 80242344 00000000 */ nop +/* B4CDB4 80242344 00000000 */ nop /* B4CDB8 80242348 0240202D */ daddu $a0, $s2, $zero /* B4CDBC 8024234C 0260282D */ daddu $a1, $s3, $zero -/* B4CDC0 80242350 0C0905AE */ jal func_802416B8_B4C128 +/* B4CDC0 80242350 0C0905AE */ jal UnkNpcAIFunc4 /* B4CDC4 80242354 0280302D */ daddu $a2, $s4, $zero /* B4CDC8 80242358 0240202D */ daddu $a0, $s2, $zero /* B4CDCC 8024235C 0260282D */ daddu $a1, $s3, $zero /* B4CDD0 80242360 0C0905C2 */ jal func_80241708_B4C178 /* B4CDD4 80242364 0280302D */ daddu $a2, $s4, $zero /* B4CDD8 80242368 0809090A */ j .L80242428 -/* B4CDDC 8024236C 00000000 */ nop +/* B4CDDC 8024236C 00000000 */ nop /* B4CDE0 80242370 0240202D */ daddu $a0, $s2, $zero /* B4CDE4 80242374 0260282D */ daddu $a1, $s3, $zero /* B4CDE8 80242378 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024219C_B4CC0C /* B4CDF8 80242388 0C0127B3 */ jal func_80049ECC /* B4CDFC 8024238C 0280302D */ daddu $a2, $s4, $zero /* B4CE00 80242390 0809090A */ j .L80242428 -/* B4CE04 80242394 00000000 */ nop +/* B4CE04 80242394 00000000 */ nop /* B4CE08 80242398 0240202D */ daddu $a0, $s2, $zero /* B4CE0C 8024239C 0260282D */ daddu $a1, $s3, $zero /* B4CE10 802423A0 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_8024219C_B4CC0C /* B4CE20 802423B0 0C012849 */ jal func_8004A124 /* B4CE24 802423B4 0280302D */ daddu $a2, $s4, $zero /* B4CE28 802423B8 0809090A */ j .L80242428 -/* B4CE2C 802423BC 00000000 */ nop +/* B4CE2C 802423BC 00000000 */ nop /* B4CE30 802423C0 0240202D */ daddu $a0, $s2, $zero /* B4CE34 802423C4 0260282D */ daddu $a1, $s3, $zero /* B4CE38 802423C8 0C0128FA */ jal func_8004A3E8 /* B4CE3C 802423CC 0280302D */ daddu $a2, $s4, $zero /* B4CE40 802423D0 0809090A */ j .L80242428 -/* B4CE44 802423D4 00000000 */ nop +/* B4CE44 802423D4 00000000 */ nop /* B4CE48 802423D8 0C090633 */ jal func_802418CC_B4C33C /* B4CE4C 802423DC 0240202D */ daddu $a0, $s2, $zero /* B4CE50 802423E0 0C09064E */ jal func_80241938_B4C3A8 @@ -158,17 +158,17 @@ glabel func_8024219C_B4CC0C /* B4CE58 802423E8 8E430070 */ lw $v1, 0x70($s2) /* B4CE5C 802423EC 24020020 */ addiu $v0, $zero, 0x20 /* B4CE60 802423F0 1462000D */ bne $v1, $v0, .L80242428 -/* B4CE64 802423F4 00000000 */ nop +/* B4CE64 802423F4 00000000 */ nop /* B4CE68 802423F8 0C09066A */ jal func_802419A8_B4C418 /* B4CE6C 802423FC 0240202D */ daddu $a0, $s2, $zero /* B4CE70 80242400 8E430070 */ lw $v1, 0x70($s2) /* B4CE74 80242404 24020021 */ addiu $v0, $zero, 0x21 /* B4CE78 80242408 14620007 */ bne $v1, $v0, .L80242428 -/* B4CE7C 8024240C 00000000 */ nop +/* B4CE7C 8024240C 00000000 */ nop /* B4CE80 80242410 0C0906A0 */ jal func_80241A80_B4C4F0 /* B4CE84 80242414 0240202D */ daddu $a0, $s2, $zero /* B4CE88 80242418 0809090A */ j .L80242428 -/* B4CE8C 8024241C 00000000 */ nop +/* B4CE8C 8024241C 00000000 */ nop /* B4CE90 80242420 0C0129CF */ jal func_8004A73C /* B4CE94 80242424 0240202D */ daddu $a0, $s2, $zero .L80242428: diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024268C_B4D0FC.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024268C_B4D0FC.s deleted file mode 100644 index d15cd96c72..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024268C_B4D0FC.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024268C_B4D0FC -/* B4D0FC 8024268C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B4D100 80242690 AFB00010 */ sw $s0, 0x10($sp) -/* B4D104 80242694 0080802D */ daddu $s0, $a0, $zero -/* B4D108 80242698 AFBF0014 */ sw $ra, 0x14($sp) -/* B4D10C 8024269C 0C00FB5A */ jal get_enemy_safe -/* B4D110 802426A0 0000202D */ daddu $a0, $zero, $zero -/* B4D114 802426A4 14400003 */ bnez $v0, .L802426B4 -/* B4D118 802426A8 24020001 */ addiu $v0, $zero, 1 -/* B4D11C 802426AC 080909AE */ j .L802426B8 -/* B4D120 802426B0 AE000084 */ sw $zero, 0x84($s0) -.L802426B4: -/* B4D124 802426B4 AE020084 */ sw $v0, 0x84($s0) -.L802426B8: -/* B4D128 802426B8 8FBF0014 */ lw $ra, 0x14($sp) -/* B4D12C 802426BC 8FB00010 */ lw $s0, 0x10($sp) -/* B4D130 802426C0 24020002 */ addiu $v0, $zero, 2 -/* B4D134 802426C4 03E00008 */ jr $ra -/* B4D138 802426C8 27BD0018 */ addiu $sp, $sp, 0x18 -/* B4D13C 802426CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241608_B53E38.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241608_B53E38.s deleted file mode 100644 index 8a374ca252..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241608_B53E38.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241608_B53E38 -/* B53E38 80241608 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B53E3C 8024160C AFB10014 */ sw $s1, 0x14($sp) -/* B53E40 80241610 0080882D */ daddu $s1, $a0, $zero -/* B53E44 80241614 AFBF0018 */ sw $ra, 0x18($sp) -/* B53E48 80241618 AFB00010 */ sw $s0, 0x10($sp) -/* B53E4C 8024161C 8E300148 */ lw $s0, 0x148($s1) -/* B53E50 80241620 0C00EABB */ jal get_npc_unsafe -/* B53E54 80241624 86040008 */ lh $a0, 8($s0) -/* B53E58 80241628 3C054387 */ lui $a1, 0x4387 -/* B53E5C 8024162C 0040202D */ daddu $a0, $v0, $zero -/* B53E60 80241630 0C00ECD0 */ jal set_npc_yaw -/* B53E64 80241634 A480008E */ sh $zero, 0x8e($a0) -/* B53E68 80241638 24020003 */ addiu $v0, $zero, 3 -/* B53E6C 8024163C AE00006C */ sw $zero, 0x6c($s0) -/* B53E70 80241640 AE220070 */ sw $v0, 0x70($s1) -/* B53E74 80241644 8FBF0018 */ lw $ra, 0x18($sp) -/* B53E78 80241648 8FB10014 */ lw $s1, 0x14($sp) -/* B53E7C 8024164C 8FB00010 */ lw $s0, 0x10($sp) -/* B53E80 80241650 03E00008 */ jr $ra -/* B53E84 80241654 27BD0020 */ addiu $sp, $sp, 0x20 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 72ef3bb20e..1498791c51 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s @@ -117,7 +117,7 @@ glabel func_802420EC_B5491C /* B54AC4 80242294 00000000 */ nop /* B54AC8 80242298 0240202D */ daddu $a0, $s2, $zero /* B54ACC 8024229C 0260282D */ daddu $a1, $s3, $zero -/* B54AD0 802422A0 0C090582 */ jal func_80241608_B53E38 +/* B54AD0 802422A0 0C090582 */ jal UnkNpcAIFunc4 /* B54AD4 802422A4 0280302D */ daddu $a2, $s4, $zero /* B54AD8 802422A8 0240202D */ daddu $a0, $s2, $zero /* B54ADC 802422AC 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240000_B59870.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240000_B59870.s deleted file mode 100644 index 06517e968c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240000_B59870.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_B59870 -/* B59870 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B59874 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* B59878 80240008 0080882D */ daddu $s1, $a0, $zero -/* B5987C 8024000C AFBF0018 */ sw $ra, 0x18($sp) -/* B59880 80240010 AFB00010 */ sw $s0, 0x10($sp) -/* B59884 80240014 8E300148 */ lw $s0, 0x148($s1) -/* B59888 80240018 0C00EABB */ jal get_npc_unsafe -/* B5988C 8024001C 86040008 */ lh $a0, 8($s0) -/* B59890 80240020 3C054387 */ lui $a1, 0x4387 -/* B59894 80240024 0040202D */ daddu $a0, $v0, $zero -/* B59898 80240028 0C00ECD0 */ jal set_npc_yaw -/* B5989C 8024002C A480008E */ sh $zero, 0x8e($a0) -/* B598A0 80240030 24020003 */ addiu $v0, $zero, 3 -/* B598A4 80240034 AE00006C */ sw $zero, 0x6c($s0) -/* B598A8 80240038 AE220070 */ sw $v0, 0x70($s1) -/* B598AC 8024003C 8FBF0018 */ lw $ra, 0x18($sp) -/* B598B0 80240040 8FB10014 */ lw $s1, 0x14($sp) -/* B598B4 80240044 8FB00010 */ lw $s0, 0x10($sp) -/* B598B8 80240048 03E00008 */ jr $ra -/* B598BC 8024004C 27BD0020 */ addiu $sp, $sp, 0x20 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 6ab5c14ae2..5b63fe8fcb 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s @@ -117,7 +117,7 @@ glabel func_80240AE4_B5A354 /* B5A4FC 80240C8C 00000000 */ nop /* B5A500 80240C90 0240202D */ daddu $a0, $s2, $zero /* B5A504 80240C94 0260282D */ daddu $a1, $s3, $zero -/* B5A508 80240C98 0C090000 */ jal func_80240000_B59870 +/* B5A508 80240C98 0C090000 */ jal UnkNpcAIFunc4 /* B5A50C 80240C9C 0280302D */ daddu $a2, $s4, $zero /* B5A510 80240CA0 0240202D */ daddu $a0, $s2, $zero /* B5A514 80240CA4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241454_B5F704.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241454_B5F704.s deleted file mode 100644 index 75e5be0dc9..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241454_B5F704.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241454_B5F704 -/* B5F704 80241454 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5F708 80241458 AFB10014 */ sw $s1, 0x14($sp) -/* B5F70C 8024145C 0080882D */ daddu $s1, $a0, $zero -/* B5F710 80241460 AFBF0018 */ sw $ra, 0x18($sp) -/* B5F714 80241464 AFB00010 */ sw $s0, 0x10($sp) -/* B5F718 80241468 8E300148 */ lw $s0, 0x148($s1) -/* B5F71C 8024146C 0C00EABB */ jal get_npc_unsafe -/* B5F720 80241470 86040008 */ lh $a0, 8($s0) -/* B5F724 80241474 3C054387 */ lui $a1, 0x4387 -/* B5F728 80241478 0040202D */ daddu $a0, $v0, $zero -/* B5F72C 8024147C 0C00ECD0 */ jal set_npc_yaw -/* B5F730 80241480 A480008E */ sh $zero, 0x8e($a0) -/* B5F734 80241484 24020003 */ addiu $v0, $zero, 3 -/* B5F738 80241488 AE00006C */ sw $zero, 0x6c($s0) -/* B5F73C 8024148C AE220070 */ sw $v0, 0x70($s1) -/* B5F740 80241490 8FBF0018 */ lw $ra, 0x18($sp) -/* B5F744 80241494 8FB10014 */ lw $s1, 0x14($sp) -/* B5F748 80241498 8FB00010 */ lw $s0, 0x10($sp) -/* B5F74C 8024149C 03E00008 */ jr $ra -/* B5F750 802414A0 27BD0020 */ addiu $sp, $sp, 0x20 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 33826a01c1..2acb07157c 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s @@ -117,7 +117,7 @@ glabel func_80241F38_B601E8 /* B60390 802420E0 00000000 */ nop /* B60394 802420E4 0240202D */ daddu $a0, $s2, $zero /* B60398 802420E8 0260282D */ daddu $a1, $s3, $zero -/* B6039C 802420EC 0C090515 */ jal func_80241454_B5F704 +/* B6039C 802420EC 0C090515 */ jal UnkNpcAIFunc4 /* B603A0 802420F0 0280302D */ daddu $a2, $s4, $zero /* B603A4 802420F4 0240202D */ daddu $a0, $s2, $zero /* B603A8 802420F8 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240940_B663F0.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240940_B663F0.s deleted file mode 100644 index cbb606d9a5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240940_B663F0.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240940_B663F0 -/* B663F0 80240940 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B663F4 80240944 AFB10014 */ sw $s1, 0x14($sp) -/* B663F8 80240948 0080882D */ daddu $s1, $a0, $zero -/* B663FC 8024094C AFBF0018 */ sw $ra, 0x18($sp) -/* B66400 80240950 AFB00010 */ sw $s0, 0x10($sp) -/* B66404 80240954 8E300148 */ lw $s0, 0x148($s1) -/* B66408 80240958 0C00EABB */ jal get_npc_unsafe -/* B6640C 8024095C 86040008 */ lh $a0, 8($s0) -/* B66410 80240960 3C054387 */ lui $a1, 0x4387 -/* B66414 80240964 0040202D */ daddu $a0, $v0, $zero -/* B66418 80240968 0C00ECD0 */ jal set_npc_yaw -/* B6641C 8024096C A480008E */ sh $zero, 0x8e($a0) -/* B66420 80240970 24020003 */ addiu $v0, $zero, 3 -/* B66424 80240974 AE00006C */ sw $zero, 0x6c($s0) -/* B66428 80240978 AE220070 */ sw $v0, 0x70($s1) -/* B6642C 8024097C 8FBF0018 */ lw $ra, 0x18($sp) -/* B66430 80240980 8FB10014 */ lw $s1, 0x14($sp) -/* B66434 80240984 8FB00010 */ lw $s0, 0x10($sp) -/* B66438 80240988 03E00008 */ jr $ra -/* B6643C 8024098C 27BD0020 */ addiu $sp, $sp, 0x20 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 9541807d90..3c1809054c 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s @@ -117,7 +117,7 @@ glabel func_80241424_B66ED4 /* B6707C 802415CC 00000000 */ nop /* B67080 802415D0 0240202D */ daddu $a0, $s2, $zero /* B67084 802415D4 0260282D */ daddu $a1, $s3, $zero -/* B67088 802415D8 0C090250 */ jal func_80240940_B663F0 +/* B67088 802415D8 0C090250 */ jal UnkNpcAIFunc4 /* B6708C 802415DC 0280302D */ daddu $a2, $s4, $zero /* B67090 802415E0 0240202D */ daddu $a0, $s2, $zero /* B67094 802415E4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802404C0_B73570.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802404C0_B73570.s deleted file mode 100644 index 0a5af6835d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802404C0_B73570.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_B73570 -/* B73570 802404C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B73574 802404C4 AFB10014 */ sw $s1, 0x14($sp) -/* B73578 802404C8 0080882D */ daddu $s1, $a0, $zero -/* B7357C 802404CC AFBF0018 */ sw $ra, 0x18($sp) -/* B73580 802404D0 AFB00010 */ sw $s0, 0x10($sp) -/* B73584 802404D4 8E300148 */ lw $s0, 0x148($s1) -/* B73588 802404D8 0C00EABB */ jal get_npc_unsafe -/* B7358C 802404DC 86040008 */ lh $a0, 8($s0) -/* B73590 802404E0 3C054387 */ lui $a1, 0x4387 -/* B73594 802404E4 0040202D */ daddu $a0, $v0, $zero -/* B73598 802404E8 0C00ECD0 */ jal set_npc_yaw -/* B7359C 802404EC A480008E */ sh $zero, 0x8e($a0) -/* B735A0 802404F0 24020003 */ addiu $v0, $zero, 3 -/* B735A4 802404F4 AE00006C */ sw $zero, 0x6c($s0) -/* B735A8 802404F8 AE220070 */ sw $v0, 0x70($s1) -/* B735AC 802404FC 8FBF0018 */ lw $ra, 0x18($sp) -/* B735B0 80240500 8FB10014 */ lw $s1, 0x14($sp) -/* B735B4 80240504 8FB00010 */ lw $s0, 0x10($sp) -/* B735B8 80240508 03E00008 */ jr $ra -/* B735BC 8024050C 27BD0020 */ addiu $sp, $sp, 0x20 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 e5b4c42817..bc089714be 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s @@ -117,7 +117,7 @@ glabel func_80240FA4_B74054 /* B741FC 8024114C 00000000 */ nop /* B74200 80241150 0240202D */ daddu $a0, $s2, $zero /* B74204 80241154 0260282D */ daddu $a1, $s3, $zero -/* B74208 80241158 0C090130 */ jal func_802404C0_B73570 +/* B74208 80241158 0C090130 */ jal UnkNpcAIFunc4 /* B7420C 8024115C 0280302D */ daddu $a2, $s4, $zero /* B74210 80241160 0240202D */ daddu $a0, $s2, $zero /* B74214 80241164 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_8024056C_DB282C.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_8024056C_DB282C.s deleted file mode 100644 index b78041d0b6..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_8024056C_DB282C.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024056C_DB282C -/* DB282C 8024056C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB2830 80240570 AFB10014 */ sw $s1, 0x14($sp) -/* DB2834 80240574 0080882D */ daddu $s1, $a0, $zero -/* DB2838 80240578 AFBF0018 */ sw $ra, 0x18($sp) -/* DB283C 8024057C AFB00010 */ sw $s0, 0x10($sp) -/* DB2840 80240580 8E300148 */ lw $s0, 0x148($s1) -/* DB2844 80240584 0C00EABB */ jal get_npc_unsafe -/* DB2848 80240588 86040008 */ lh $a0, 8($s0) -/* DB284C 8024058C 3C054387 */ lui $a1, 0x4387 -/* DB2850 80240590 0040202D */ daddu $a0, $v0, $zero -/* DB2854 80240594 0C00ECD0 */ jal set_npc_yaw -/* DB2858 80240598 A480008E */ sh $zero, 0x8e($a0) -/* DB285C 8024059C 24020003 */ addiu $v0, $zero, 3 -/* DB2860 802405A0 AE00006C */ sw $zero, 0x6c($s0) -/* DB2864 802405A4 AE220070 */ sw $v0, 0x70($s1) -/* DB2868 802405A8 8FBF0018 */ lw $ra, 0x18($sp) -/* DB286C 802405AC 8FB10014 */ lw $s1, 0x14($sp) -/* DB2870 802405B0 8FB00010 */ lw $s0, 0x10($sp) -/* DB2874 802405B4 03E00008 */ jr $ra -/* DB2878 802405B8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s index d411002bde..83321b551c 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s @@ -141,7 +141,7 @@ glabel func_80240780_DB2A40 /* DB2C48 80240988 00000000 */ nop /* DB2C4C 8024098C 0260202D */ daddu $a0, $s3, $zero /* DB2C50 80240990 0280282D */ daddu $a1, $s4, $zero -/* DB2C54 80240994 0C09015B */ jal func_8024056C_DB282C +/* DB2C54 80240994 0C09015B */ jal UnkNpcAIFunc4 /* DB2C58 80240998 02A0302D */ daddu $a2, $s5, $zero /* DB2C5C 8024099C 0260202D */ daddu $a0, $s3, $zero /* DB2C60 802409A0 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802407EC_DE2C7C.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802407EC_DE2C7C.s deleted file mode 100644 index 218372290f..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802407EC_DE2C7C.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407EC_DE2C7C -/* DE2C7C 802407EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DE2C80 802407F0 AFB10014 */ sw $s1, 0x14($sp) -/* DE2C84 802407F4 0080882D */ daddu $s1, $a0, $zero -/* DE2C88 802407F8 AFBF0018 */ sw $ra, 0x18($sp) -/* DE2C8C 802407FC AFB00010 */ sw $s0, 0x10($sp) -/* DE2C90 80240800 8E300148 */ lw $s0, 0x148($s1) -/* DE2C94 80240804 0C00EABB */ jal get_npc_unsafe -/* DE2C98 80240808 86040008 */ lh $a0, 8($s0) -/* DE2C9C 8024080C 3C054387 */ lui $a1, 0x4387 -/* DE2CA0 80240810 0040202D */ daddu $a0, $v0, $zero -/* DE2CA4 80240814 0C00ECD0 */ jal set_npc_yaw -/* DE2CA8 80240818 A480008E */ sh $zero, 0x8e($a0) -/* DE2CAC 8024081C 24020003 */ addiu $v0, $zero, 3 -/* DE2CB0 80240820 AE00006C */ sw $zero, 0x6c($s0) -/* DE2CB4 80240824 AE220070 */ sw $v0, 0x70($s1) -/* DE2CB8 80240828 8FBF0018 */ lw $ra, 0x18($sp) -/* DE2CBC 8024082C 8FB10014 */ lw $s1, 0x14($sp) -/* DE2CC0 80240830 8FB00010 */ lw $s0, 0x10($sp) -/* DE2CC4 80240834 03E00008 */ jr $ra -/* DE2CC8 80240838 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s index fbb7b9f23d..e7664647dc 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s @@ -141,7 +141,7 @@ glabel func_80240A00_DE2E90 /* DE3098 80240C08 00000000 */ nop /* DE309C 80240C0C 0260202D */ daddu $a0, $s3, $zero /* DE30A0 80240C10 0280282D */ daddu $a1, $s4, $zero -/* DE30A4 80240C14 0C0901FB */ jal func_802407EC_DE2C7C +/* DE30A4 80240C14 0C0901FB */ jal UnkNpcAIFunc4 /* DE30A8 80240C18 02A0302D */ daddu $a2, $s5, $zero /* DE30AC 80240C1C 0260202D */ daddu $a0, $s3, $zero /* DE30B0 80240C20 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240ACC_DEF96C.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240ACC_DEF96C.s deleted file mode 100644 index 883d515bca..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240ACC_DEF96C.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240ACC_DEF96C -/* DEF96C 80240ACC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DEF970 80240AD0 AFB10014 */ sw $s1, 0x14($sp) -/* DEF974 80240AD4 0080882D */ daddu $s1, $a0, $zero -/* DEF978 80240AD8 AFBF0018 */ sw $ra, 0x18($sp) -/* DEF97C 80240ADC AFB00010 */ sw $s0, 0x10($sp) -/* DEF980 80240AE0 8E300148 */ lw $s0, 0x148($s1) -/* DEF984 80240AE4 0C00EABB */ jal get_npc_unsafe -/* DEF988 80240AE8 86040008 */ lh $a0, 8($s0) -/* DEF98C 80240AEC 3C054387 */ lui $a1, 0x4387 -/* DEF990 80240AF0 0040202D */ daddu $a0, $v0, $zero -/* DEF994 80240AF4 0C00ECD0 */ jal set_npc_yaw -/* DEF998 80240AF8 A480008E */ sh $zero, 0x8e($a0) -/* DEF99C 80240AFC 24020003 */ addiu $v0, $zero, 3 -/* DEF9A0 80240B00 AE00006C */ sw $zero, 0x6c($s0) -/* DEF9A4 80240B04 AE220070 */ sw $v0, 0x70($s1) -/* DEF9A8 80240B08 8FBF0018 */ lw $ra, 0x18($sp) -/* DEF9AC 80240B0C 8FB10014 */ lw $s1, 0x14($sp) -/* DEF9B0 80240B10 8FB00010 */ lw $s0, 0x10($sp) -/* DEF9B4 80240B14 03E00008 */ jr $ra -/* DEF9B8 80240B18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s index 2fde5e8de0..08d7cc2607 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s @@ -141,7 +141,7 @@ glabel func_80240CE0_DEFB80 /* DEFD88 80240EE8 00000000 */ nop /* DEFD8C 80240EEC 0260202D */ daddu $a0, $s3, $zero /* DEFD90 80240EF0 0280282D */ daddu $a1, $s4, $zero -/* DEFD94 80240EF4 0C0902B3 */ jal func_80240ACC_DEF96C +/* DEFD94 80240EF4 0C0902B3 */ jal UnkNpcAIFunc4 /* DEFD98 80240EF8 02A0302D */ daddu $a2, $s5, $zero /* DEFD9C 80240EFC 0260202D */ daddu $a0, $s3, $zero /* DEFDA0 80240F00 0280282D */ daddu $a1, $s4, $zero diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index 9d70f9dab5..1c9d2cbf9b 100644 --- a/src/world/area_jan/jan_05/B4B260.c +++ b/src/world/area_jan/jan_05/B4B260.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241150_B4BBC0); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241494_B4BF04); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802416B8_B4C128); +#include "world/common/UnkNpcAIFunc4.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241708_B4C178); @@ -40,5 +40,11 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_8024219C_B4CC0C); #include "world/common/SomeMatrixOperations.inc.c" - -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_8024268C_B4D0FC); +ApiStatus func_8024268C_B4D0FC(ScriptInstance* script) { + if (get_enemy_safe(0) == NULL) { + script->varTable[0] = FALSE; + } else { + script->varTable[0] = TRUE; + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index 8c2f650b3f..83d5459a3c 100644 --- a/src/world/area_jan/jan_06/B52F70.c +++ b/src/world/area_jan/jan_06/B52F70.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241330_B53B60); INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241554_B53D84); -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241608_B53E38); +#include "world/common/UnkNpcAIFunc4.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241658_B53E88); diff --git a/src/world/area_jan/jan_07/B59870.c b/src/world/area_jan/jan_07/B59870.c index 9cfadccbeb..4d560d5953 100644 --- a/src/world/area_jan/jan_07/B59870.c +++ b/src/world/area_jan/jan_07/B59870.c @@ -1,6 +1,6 @@ #include "jan_07.h" -INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240000_B59870); +#include "world/common/UnkNpcAIFunc4.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240050_B598C0); diff --git a/src/world/area_jan/jan_08/B5F650.c b/src/world/area_jan/jan_08/B5F650.c index 64c7cf60d4..e033a7283e 100644 --- a/src/world/area_jan/jan_08/B5F650.c +++ b/src/world/area_jan/jan_08/B5F650.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802413A0_B5F650); -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241454_B5F704); +#include "world/common/UnkNpcAIFunc4.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802414A4_B5F754); diff --git a/src/world/area_jan/jan_09/B663F0.c b/src/world/area_jan/jan_09/B663F0.c index 65df2dd7bf..cbc265bd39 100644 --- a/src/world/area_jan/jan_09/B663F0.c +++ b/src/world/area_jan/jan_09/B663F0.c @@ -1,6 +1,6 @@ #include "jan_09.h" -INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240940_B663F0); +#include "world/common/UnkNpcAIFunc4.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240990_B66440); diff --git a/src/world/area_jan/jan_12/B73570.c b/src/world/area_jan/jan_12/B73570.c index 7f92b49684..3d19edcc5d 100644 --- a/src/world/area_jan/jan_12/B73570.c +++ b/src/world/area_jan/jan_12/B73570.c @@ -1,6 +1,6 @@ #include "jan_12.h" -INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_802404C0_B73570); +#include "world/common/UnkNpcAIFunc4.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240510_B735C0); diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index 4a4c969b73..990af5ff60 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802401D8_DB2498); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240238_DB24F8); -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_8024056C_DB282C); +#include "world/common/UnkNpcAIFunc4.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802405BC_DB287C); diff --git a/src/world/area_omo/omo_13/DE2710.c b/src/world/area_omo/omo_13/DE2710.c index a3aac803fd..071468f7d7 100644 --- a/src/world/area_omo/omo_13/DE2710.c +++ b/src/world/area_omo/omo_13/DE2710.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240458_DE28E8); INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_802404B8_DE2948); -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_802407EC_DE2C7C); +#include "world/common/UnkNpcAIFunc4.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_8024083C_DE2CCC); diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index 48f20bcf4f..099e5fbaaa 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240738_DEF5D8); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240798_DEF638); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240ACC_DEF96C); +#include "world/common/UnkNpcAIFunc4.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240B1C_DEF9BC); diff --git a/src/world/common/UnkNpcAIFunc4.inc.c b/src/world/common/UnkNpcAIFunc4.inc.c new file mode 100644 index 0000000000..5e55c72097 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc4.inc.c @@ -0,0 +1,12 @@ +#include "common.h" +#include "map.h" + +static void UnkNpcAIFunc4(ScriptInstance* script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration = 0; + set_npc_yaw(npc, 270.0f); + enemy->varTable[0] = 0; + script->functionTemp[0].s = 3; +} diff --git a/tools/assist.py b/tools/assist.py index 74ed5c7d81..3d6a06813a 100755 --- a/tools/assist.py +++ b/tools/assist.py @@ -192,7 +192,7 @@ def do_cross_query(): for sym_name in map_syms: if not sym_name.startswith("_binary"): sym = map_syms[sym_name] - if get_symbol_length(sym_name) > 8: + if get_symbol_length(sym_name) > 16: query_bytes = get_symbol_bytes(map_offsets, sym_name) cluster_match = False for cluster in clusters: From 36e421710d91f21d38ae514d0c98d3192b85c68d Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 21 Nov 2020 23:32:54 -0500 Subject: [PATCH 17/38] UnkNpcAIFunc5 --- .../dgb_02/C2EBA0/func_802401B4_C2ED54.s | 26 ------------ .../dgb_02/C2EBA0/func_8024061C_C2F1BC.s | 2 +- .../dgb_02/C2EBA0/func_802410D4_C2FC74.s | 2 +- .../dgb_03/C31730/func_80240404_C318E4.s | 26 ------------ .../dgb_03/C31730/func_8024086C_C31D4C.s | 2 +- .../dgb_03/C31730/func_802419B0_C32E90.s | 2 +- .../dgb_03/C31730/func_80242480_C33960.s | 2 +- .../dgb_05/C3AA10/func_80240214_C3AC24.s | 26 ------------ .../dgb_05/C3AA10/func_80240E80_C3B890.s | 2 +- .../dgb_05/C3AA10/func_802411D0_C3BBE0.s | 2 +- .../dgb_07/C3DBF0/func_802401B4_C3DDA4.s | 26 ------------ .../dgb_07/C3DBF0/func_80240E20_C3EA10.s | 2 +- .../dgb_07/C3DBF0/func_80241170_C3ED60.s | 2 +- .../dgb_08/C3FDB0/func_80241044_C40DF4.s | 26 ------------ .../dgb_08/C3FDB0/func_802414AC_C4125C.s | 2 +- .../dgb_09/C46BE0/func_802401B4_C46D94.s | 26 ------------ .../dgb_09/C46BE0/func_8024061C_C471FC.s | 2 +- .../dgb_09/C46BE0/func_802410D4_C47CB4.s | 2 +- .../dgb_15/C4F510/func_802401B4_C4F6C4.s | 26 ------------ .../dgb_15/C4F510/func_8024061C_C4FB2C.s | 2 +- .../dgb_16/C52540/func_802401B4_C526F4.s | 26 ------------ .../dgb_16/C52540/func_80240E20_C53360.s | 2 +- .../dgb_16/C52540/func_80241170_C536B0.s | 2 +- .../jan_05/B4B260/func_80241A80_B4C4F0.s | 26 ------------ .../jan_05/B4B260/func_80241EE8_B4C958.s | 26 ++++++------ .../jan_05/B4B260/func_8024219C_B4CC0C.s | 2 +- .../jan_06/B52F70/func_802419D0_B54200.s | 26 ------------ .../jan_06/B52F70/func_80241E38_B54668.s | 2 +- .../jan_06/B52F70/func_802420EC_B5491C.s | 2 +- .../jan_07/B59870/func_802403C8_B59C38.s | 26 ------------ .../jan_07/B59870/func_80240830_B5A0A0.s | 2 +- .../jan_07/B59870/func_80240AE4_B5A354.s | 2 +- .../jan_08/B5F650/func_8024181C_B5FACC.s | 26 ------------ .../jan_08/B5F650/func_80241C84_B5FF34.s | 2 +- .../jan_08/B5F650/func_80241F38_B601E8.s | 2 +- .../jan_09/B663F0/func_80240D08_B667B8.s | 26 ------------ .../jan_09/B663F0/func_80241170_B66C20.s | 2 +- .../jan_09/B663F0/func_80241424_B66ED4.s | 2 +- .../jan_12/B73570/func_80240888_B73938.s | 26 ------------ .../jan_12/B73570/func_80240CF0_B73DA0.s | 2 +- .../jan_12/B73570/func_80240FA4_B74054.s | 2 +- .../kzn_03/C61020/func_80240DAC_C61ABC.s | 26 ------------ .../kzn_03/C61020/func_80241214_C61F24.s | 2 +- .../kzn_08/C71ED0/func_802426F0_C73B70.s | 26 ------------ .../kzn_08/C71ED0/func_80242B58_C73FD8.s | 2 +- .../kzn_09/C77D00/func_802411D4_C77EB4.s | 26 ------------ .../kzn_09/C77D00/func_8024163C_C7831C.s | 2 +- .../kzn_17/C85DC0/func_802404C4_C85F74.s | 26 ------------ .../kzn_17/C85DC0/func_8024092C_C863DC.s | 2 +- .../mim_01/B93940/func_802406B4_B93AF4.s | 26 ------------ .../mim_01/B93940/func_80240B1C_B93F5C.s | 2 +- .../mim_05/BA07A0/func_80240224_BA0954.s | 26 ------------ .../mim_05/BA07A0/func_8024068C_BA0DBC.s | 2 +- .../mim_06/BA4CF0/func_80240724_BA4EA4.s | 26 ------------ .../mim_06/BA4CF0/func_80240B8C_BA530C.s | 2 +- .../mim_08/BAD940/func_8024174C_BAF08C.s | 26 ------------ .../mim_08/BAD940/func_80241BB4_BAF4F4.s | 2 +- .../pra_35/D8D270/func_80241F64_D8F1B4.s | 26 ------------ .../pra_35/D8D270/func_802423CC_D8F61C.s | 2 +- .../pra_35/D8D270/func_80242698_D8F8E8.s | 2 +- .../pra_37/D92F40/func_80241104_D94044.s | 26 ------------ .../pra_37/D92F40/func_8024156C_D944AC.s | 2 +- .../sam_03/D110C0/func_80240204_D112C4.s | 26 ------------ .../sam_03/D110C0/func_8024066C_D1172C.s | 2 +- .../sam_05/D187E0/func_802401B4_D18994.s | 26 ------------ .../sam_05/D187E0/func_8024061C_D18DFC.s | 2 +- .../sam_07/D2BD30/func_80240804_D2C534.s | 26 ------------ .../sam_07/D2BD30/func_80240C6C_D2C99C.s | 2 +- .../sam_08/D309C0/func_80240EF4_D30B74.s | 26 ------------ .../sam_08/D309C0/func_8024135C_D30FDC.s | 2 +- .../sam_10/D37BD0/func_80240584_D37D84.s | 26 ------------ .../sam_10/D37BD0/func_802409EC_D381EC.s | 2 +- src/world/area_dgb/dgb_02/C2EBA0.c | 2 +- src/world/area_dgb/dgb_03/C31730.c | 2 +- src/world/area_dgb/dgb_05/C3AA10.c | 2 +- src/world/area_dgb/dgb_07/C3DBF0.c | 2 +- src/world/area_dgb/dgb_08/C3FDB0.c | 2 +- src/world/area_dgb/dgb_09/C46BE0.c | 2 +- src/world/area_dgb/dgb_15/C4F510.c | 2 +- src/world/area_dgb/dgb_16/C52540.c | 2 +- src/world/area_jan/jan_05/B4B260.c | 2 +- src/world/area_jan/jan_06/B52F70.c | 2 +- src/world/area_jan/jan_07/B59870.c | 2 +- src/world/area_jan/jan_08/B5F650.c | 2 +- src/world/area_jan/jan_09/B663F0.c | 2 +- src/world/area_jan/jan_12/B73570.c | 2 +- src/world/area_kzn/kzn_03/C61020.c | 2 +- src/world/area_kzn/kzn_08/C71ED0.c | 2 +- src/world/area_kzn/kzn_09/C77D00.c | 2 +- src/world/area_kzn/kzn_17/C85DC0.c | 2 +- src/world/area_mim/mim_01/B93940.c | 2 +- src/world/area_mim/mim_05/BA07A0.c | 2 +- src/world/area_mim/mim_06/BA4CF0.c | 2 +- src/world/area_mim/mim_08/BAD940.c | 2 +- src/world/area_pra/pra_35/D8D270.c | 2 +- src/world/area_pra/pra_37/D92F40.c | 2 +- src/world/area_sam/sam_03/D110C0.c | 2 +- src/world/area_sam/sam_05/D187E0.c | 2 +- src/world/area_sam/sam_07/D2BD30.c | 2 +- src/world/area_sam/sam_08/D309C0.c | 2 +- src/world/area_sam/sam_10/D37BD0.c | 2 +- src/world/common/UnkNpcAIFunc5.inc.c | 13 ++++++ tools/substitute.py | 16 +++++++- tools/substitute_asm.py | 41 ------------------- 104 files changed, 112 insertions(+), 880 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802401B4_C2ED54.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240404_C318E4.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240214_C3AC24.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802401B4_C3DDA4.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241044_C40DF4.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802401B4_C46D94.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802401B4_C4F6C4.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802401B4_C526F4.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241A80_B4C4F0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802419D0_B54200.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_07/B59870/func_802403C8_B59C38.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_08/B5F650/func_8024181C_B5FACC.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D08_B667B8.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240888_B73938.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240DAC_C61ABC.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802426F0_C73B70.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802411D4_C77EB4.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802404C4_C85F74.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_01/B93940/func_802406B4_B93AF4.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240224_BA0954.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240724_BA4EA4.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_08/BAD940/func_8024174C_BAF08C.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241F64_D8F1B4.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241104_D94044.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240204_D112C4.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802401B4_D18994.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240804_D2C534.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240EF4_D30B74.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_80240584_D37D84.s create mode 100644 src/world/common/UnkNpcAIFunc5.inc.c delete mode 100755 tools/substitute_asm.py diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802401B4_C2ED54.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802401B4_C2ED54.s deleted file mode 100644 index 79f2a03695..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802401B4_C2ED54.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4_C2ED54 -/* C2ED54 802401B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C2ED58 802401B8 AFB10014 */ sw $s1, 0x14($sp) -/* C2ED5C 802401BC 0080882D */ daddu $s1, $a0, $zero -/* C2ED60 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C2ED64 802401C4 AFB00010 */ sw $s0, 0x10($sp) -/* C2ED68 802401C8 8E300148 */ lw $s0, 0x148($s1) -/* C2ED6C 802401CC 0C00EABB */ jal get_npc_unsafe -/* C2ED70 802401D0 86040008 */ lh $a0, 8($s0) -/* C2ED74 802401D4 9443008E */ lhu $v1, 0x8e($v0) -/* C2ED78 802401D8 2463FFFF */ addiu $v1, $v1, -1 -/* C2ED7C 802401DC A443008E */ sh $v1, 0x8e($v0) -/* C2ED80 802401E0 00031C00 */ sll $v1, $v1, 0x10 -/* C2ED84 802401E4 1C600003 */ bgtz $v1, .L802401F4 -/* C2ED88 802401E8 2402000C */ addiu $v0, $zero, 0xc -/* C2ED8C 802401EC AE00006C */ sw $zero, 0x6c($s0) -/* C2ED90 802401F0 AE220070 */ sw $v0, 0x70($s1) -.L802401F4: -/* C2ED94 802401F4 8FBF0018 */ lw $ra, 0x18($sp) -/* C2ED98 802401F8 8FB10014 */ lw $s1, 0x14($sp) -/* C2ED9C 802401FC 8FB00010 */ lw $s0, 0x10($sp) -/* C2EDA0 80240200 03E00008 */ jr $ra -/* C2EDA4 80240204 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 697dfafd87..e7deb82d00 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 @@ -165,7 +165,7 @@ glabel func_8024061C_C2F1BC /* C2F424 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C2F428 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* C2F42C 8024088C 00000000 */ nop -/* C2F430 80240890 0C09006D */ jal func_802401B4_C2ED54 +/* C2F430 80240890 0C09006D */ jal UnkNpcAIFunc5 /* C2F434 80240894 0240202D */ daddu $a0, $s2, $zero /* C2F438 80240898 0809022A */ j .L802408A8 /* C2F43C 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s index f77e0dccbb..e1f54665f9 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 @@ -184,7 +184,7 @@ glabel func_802410D4_C2FC74 /* C2FF28 80241388 0240202D */ daddu $a0, $s2, $zero /* C2FF2C 8024138C 080904FF */ j .L802413FC /* C2FF30 80241390 00000000 */ nop -/* C2FF34 80241394 0C09006D */ jal func_802401B4_C2ED54 +/* C2FF34 80241394 0C09006D */ jal UnkNpcAIFunc5 /* C2FF38 80241398 0240202D */ daddu $a0, $s2, $zero /* C2FF3C 8024139C 080904FF */ j .L802413FC /* C2FF40 802413A0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240404_C318E4.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240404_C318E4.s deleted file mode 100644 index e8d0309eeb..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240404_C318E4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_C318E4 -/* C318E4 80240404 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C318E8 80240408 AFB10014 */ sw $s1, 0x14($sp) -/* C318EC 8024040C 0080882D */ daddu $s1, $a0, $zero -/* C318F0 80240410 AFBF0018 */ sw $ra, 0x18($sp) -/* C318F4 80240414 AFB00010 */ sw $s0, 0x10($sp) -/* C318F8 80240418 8E300148 */ lw $s0, 0x148($s1) -/* C318FC 8024041C 0C00EABB */ jal get_npc_unsafe -/* C31900 80240420 86040008 */ lh $a0, 8($s0) -/* C31904 80240424 9443008E */ lhu $v1, 0x8e($v0) -/* C31908 80240428 2463FFFF */ addiu $v1, $v1, -1 -/* C3190C 8024042C A443008E */ sh $v1, 0x8e($v0) -/* C31910 80240430 00031C00 */ sll $v1, $v1, 0x10 -/* C31914 80240434 1C600003 */ bgtz $v1, .L80240444 -/* C31918 80240438 2402000C */ addiu $v0, $zero, 0xc -/* C3191C 8024043C AE00006C */ sw $zero, 0x6c($s0) -/* C31920 80240440 AE220070 */ sw $v0, 0x70($s1) -.L80240444: -/* C31924 80240444 8FBF0018 */ lw $ra, 0x18($sp) -/* C31928 80240448 8FB10014 */ lw $s1, 0x14($sp) -/* C3192C 8024044C 8FB00010 */ lw $s0, 0x10($sp) -/* C31930 80240450 03E00008 */ jr $ra -/* C31934 80240454 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 9f1cdfa6cd..947fed2c57 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 @@ -165,7 +165,7 @@ glabel func_8024086C_C31D4C /* C31FB4 80240AD4 24020021 */ addiu $v0, $zero, 0x21 /* C31FB8 80240AD8 14620007 */ bne $v1, $v0, .L80240AF8 /* C31FBC 80240ADC 00000000 */ nop -/* C31FC0 80240AE0 0C090101 */ jal func_80240404_C318E4 +/* C31FC0 80240AE0 0C090101 */ jal UnkNpcAIFunc5 /* C31FC4 80240AE4 0240202D */ daddu $a0, $s2, $zero /* C31FC8 80240AE8 080902BE */ j .L80240AF8 /* C31FCC 80240AEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s index 0f3cd0b104..40db3157f5 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 @@ -171,7 +171,7 @@ glabel func_802419B0_C32E90 /* C33110 80241C30 24020021 */ addiu $v0, $zero, 0x21 /* C33114 80241C34 14620007 */ bne $v1, $v0, .L80241C54 /* C33118 80241C38 00000000 */ nop -/* C3311C 80241C3C 0C090101 */ jal func_80240404_C318E4 +/* C3311C 80241C3C 0C090101 */ jal UnkNpcAIFunc5 /* C33120 80241C40 0240202D */ daddu $a0, $s2, $zero /* C33124 80241C44 08090715 */ j .L80241C54 /* C33128 80241C48 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s index 7272e21a5c..92cb47a6c7 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 @@ -184,7 +184,7 @@ glabel func_80242480_C33960 /* C33C14 80242734 0240202D */ daddu $a0, $s2, $zero /* C33C18 80242738 080909EA */ j .L802427A8 /* C33C1C 8024273C 00000000 */ nop -/* C33C20 80242740 0C090101 */ jal func_80240404_C318E4 +/* C33C20 80242740 0C090101 */ jal UnkNpcAIFunc5 /* C33C24 80242744 0240202D */ daddu $a0, $s2, $zero /* C33C28 80242748 080909EA */ j .L802427A8 /* C33C2C 8024274C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240214_C3AC24.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240214_C3AC24.s deleted file mode 100644 index c54b59dcea..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240214_C3AC24.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240214_C3AC24 -/* C3AC24 80240214 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3AC28 80240218 AFB10014 */ sw $s1, 0x14($sp) -/* C3AC2C 8024021C 0080882D */ daddu $s1, $a0, $zero -/* C3AC30 80240220 AFBF0018 */ sw $ra, 0x18($sp) -/* C3AC34 80240224 AFB00010 */ sw $s0, 0x10($sp) -/* C3AC38 80240228 8E300148 */ lw $s0, 0x148($s1) -/* C3AC3C 8024022C 0C00EABB */ jal get_npc_unsafe -/* C3AC40 80240230 86040008 */ lh $a0, 8($s0) -/* C3AC44 80240234 9443008E */ lhu $v1, 0x8e($v0) -/* C3AC48 80240238 2463FFFF */ addiu $v1, $v1, -1 -/* C3AC4C 8024023C A443008E */ sh $v1, 0x8e($v0) -/* C3AC50 80240240 00031C00 */ sll $v1, $v1, 0x10 -/* C3AC54 80240244 1C600003 */ bgtz $v1, .L80240254 -/* C3AC58 80240248 2402000C */ addiu $v0, $zero, 0xc -/* C3AC5C 8024024C AE00006C */ sw $zero, 0x6c($s0) -/* C3AC60 80240250 AE220070 */ sw $v0, 0x70($s1) -.L80240254: -/* C3AC64 80240254 8FBF0018 */ lw $ra, 0x18($sp) -/* C3AC68 80240258 8FB10014 */ lw $s1, 0x14($sp) -/* C3AC6C 8024025C 8FB00010 */ lw $s0, 0x10($sp) -/* C3AC70 80240260 03E00008 */ jr $ra -/* C3AC74 80240264 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 c62da08fb5..75fe2504f8 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 @@ -184,7 +184,7 @@ glabel func_80240E80_C3B890 /* C3BB44 80241134 0240202D */ daddu $a0, $s2, $zero /* C3BB48 80241138 0809046A */ j .L802411A8 /* C3BB4C 8024113C 00000000 */ nop -/* C3BB50 80241140 0C090085 */ jal func_80240214_C3AC24 +/* C3BB50 80241140 0C090085 */ jal UnkNpcAIFunc5 /* C3BB54 80241144 0240202D */ daddu $a0, $s2, $zero /* C3BB58 80241148 0809046A */ j .L802411A8 /* C3BB5C 8024114C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s index 07ec16da1e..a412714dee 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 @@ -165,7 +165,7 @@ glabel func_802411D0_C3BBE0 /* C3BE48 80241438 24020021 */ addiu $v0, $zero, 0x21 /* C3BE4C 8024143C 14620007 */ bne $v1, $v0, .L8024145C /* C3BE50 80241440 00000000 */ nop -/* C3BE54 80241444 0C090085 */ jal func_80240214_C3AC24 +/* C3BE54 80241444 0C090085 */ jal UnkNpcAIFunc5 /* C3BE58 80241448 0240202D */ daddu $a0, $s2, $zero /* C3BE5C 8024144C 08090517 */ j .L8024145C /* C3BE60 80241450 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802401B4_C3DDA4.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802401B4_C3DDA4.s deleted file mode 100644 index 5cb8eba7b9..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802401B4_C3DDA4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4_C3DDA4 -/* C3DDA4 802401B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3DDA8 802401B8 AFB10014 */ sw $s1, 0x14($sp) -/* C3DDAC 802401BC 0080882D */ daddu $s1, $a0, $zero -/* C3DDB0 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C3DDB4 802401C4 AFB00010 */ sw $s0, 0x10($sp) -/* C3DDB8 802401C8 8E300148 */ lw $s0, 0x148($s1) -/* C3DDBC 802401CC 0C00EABB */ jal get_npc_unsafe -/* C3DDC0 802401D0 86040008 */ lh $a0, 8($s0) -/* C3DDC4 802401D4 9443008E */ lhu $v1, 0x8e($v0) -/* C3DDC8 802401D8 2463FFFF */ addiu $v1, $v1, -1 -/* C3DDCC 802401DC A443008E */ sh $v1, 0x8e($v0) -/* C3DDD0 802401E0 00031C00 */ sll $v1, $v1, 0x10 -/* C3DDD4 802401E4 1C600003 */ bgtz $v1, .L802401F4 -/* C3DDD8 802401E8 2402000C */ addiu $v0, $zero, 0xc -/* C3DDDC 802401EC AE00006C */ sw $zero, 0x6c($s0) -/* C3DDE0 802401F0 AE220070 */ sw $v0, 0x70($s1) -.L802401F4: -/* C3DDE4 802401F4 8FBF0018 */ lw $ra, 0x18($sp) -/* C3DDE8 802401F8 8FB10014 */ lw $s1, 0x14($sp) -/* C3DDEC 802401FC 8FB00010 */ lw $s0, 0x10($sp) -/* C3DDF0 80240200 03E00008 */ jr $ra -/* C3DDF4 80240204 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 60d329d6ec..9985eecc7d 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 @@ -184,7 +184,7 @@ glabel func_80240E20_C3EA10 /* C3ECC4 802410D4 0240202D */ daddu $a0, $s2, $zero /* C3ECC8 802410D8 08090452 */ j .L80241148 /* C3ECCC 802410DC 00000000 */ nop -/* C3ECD0 802410E0 0C09006D */ jal func_802401B4_C3DDA4 +/* C3ECD0 802410E0 0C09006D */ jal UnkNpcAIFunc5 /* C3ECD4 802410E4 0240202D */ daddu $a0, $s2, $zero /* C3ECD8 802410E8 08090452 */ j .L80241148 /* C3ECDC 802410EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s index 7aa824b3e9..9b3864f9eb 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 @@ -165,7 +165,7 @@ glabel func_80241170_C3ED60 /* C3EFC8 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* C3EFCC 802413DC 14620007 */ bne $v1, $v0, .L802413FC /* C3EFD0 802413E0 00000000 */ nop -/* C3EFD4 802413E4 0C09006D */ jal func_802401B4_C3DDA4 +/* C3EFD4 802413E4 0C09006D */ jal UnkNpcAIFunc5 /* C3EFD8 802413E8 0240202D */ daddu $a0, $s2, $zero /* C3EFDC 802413EC 080904FF */ j .L802413FC /* C3EFE0 802413F0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241044_C40DF4.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241044_C40DF4.s deleted file mode 100644 index f412817d3e..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241044_C40DF4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241044_C40DF4 -/* C40DF4 80241044 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C40DF8 80241048 AFB10014 */ sw $s1, 0x14($sp) -/* C40DFC 8024104C 0080882D */ daddu $s1, $a0, $zero -/* C40E00 80241050 AFBF0018 */ sw $ra, 0x18($sp) -/* C40E04 80241054 AFB00010 */ sw $s0, 0x10($sp) -/* C40E08 80241058 8E300148 */ lw $s0, 0x148($s1) -/* C40E0C 8024105C 0C00EABB */ jal get_npc_unsafe -/* C40E10 80241060 86040008 */ lh $a0, 8($s0) -/* C40E14 80241064 9443008E */ lhu $v1, 0x8e($v0) -/* C40E18 80241068 2463FFFF */ addiu $v1, $v1, -1 -/* C40E1C 8024106C A443008E */ sh $v1, 0x8e($v0) -/* C40E20 80241070 00031C00 */ sll $v1, $v1, 0x10 -/* C40E24 80241074 1C600003 */ bgtz $v1, .L80241084 -/* C40E28 80241078 2402000C */ addiu $v0, $zero, 0xc -/* C40E2C 8024107C AE00006C */ sw $zero, 0x6c($s0) -/* C40E30 80241080 AE220070 */ sw $v0, 0x70($s1) -.L80241084: -/* C40E34 80241084 8FBF0018 */ lw $ra, 0x18($sp) -/* C40E38 80241088 8FB10014 */ lw $s1, 0x14($sp) -/* C40E3C 8024108C 8FB00010 */ lw $s0, 0x10($sp) -/* C40E40 80241090 03E00008 */ jr $ra -/* C40E44 80241094 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 3da4d63fa5..612a7b0d7f 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 @@ -165,7 +165,7 @@ glabel func_802414AC_C4125C /* C414C4 80241714 24020021 */ addiu $v0, $zero, 0x21 /* C414C8 80241718 14620007 */ bne $v1, $v0, .L80241738 /* C414CC 8024171C 00000000 */ nop -/* C414D0 80241720 0C090411 */ jal func_80241044_C40DF4 +/* C414D0 80241720 0C090411 */ jal UnkNpcAIFunc5 /* C414D4 80241724 0240202D */ daddu $a0, $s2, $zero /* C414D8 80241728 080905CE */ j .L80241738 /* C414DC 8024172C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802401B4_C46D94.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802401B4_C46D94.s deleted file mode 100644 index 83cfef7113..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802401B4_C46D94.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4_C46D94 -/* C46D94 802401B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C46D98 802401B8 AFB10014 */ sw $s1, 0x14($sp) -/* C46D9C 802401BC 0080882D */ daddu $s1, $a0, $zero -/* C46DA0 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C46DA4 802401C4 AFB00010 */ sw $s0, 0x10($sp) -/* C46DA8 802401C8 8E300148 */ lw $s0, 0x148($s1) -/* C46DAC 802401CC 0C00EABB */ jal get_npc_unsafe -/* C46DB0 802401D0 86040008 */ lh $a0, 8($s0) -/* C46DB4 802401D4 9443008E */ lhu $v1, 0x8e($v0) -/* C46DB8 802401D8 2463FFFF */ addiu $v1, $v1, -1 -/* C46DBC 802401DC A443008E */ sh $v1, 0x8e($v0) -/* C46DC0 802401E0 00031C00 */ sll $v1, $v1, 0x10 -/* C46DC4 802401E4 1C600003 */ bgtz $v1, .L802401F4 -/* C46DC8 802401E8 2402000C */ addiu $v0, $zero, 0xc -/* C46DCC 802401EC AE00006C */ sw $zero, 0x6c($s0) -/* C46DD0 802401F0 AE220070 */ sw $v0, 0x70($s1) -.L802401F4: -/* C46DD4 802401F4 8FBF0018 */ lw $ra, 0x18($sp) -/* C46DD8 802401F8 8FB10014 */ lw $s1, 0x14($sp) -/* C46DDC 802401FC 8FB00010 */ lw $s0, 0x10($sp) -/* C46DE0 80240200 03E00008 */ jr $ra -/* C46DE4 80240204 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 7536f8c48f..53a65c58c6 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 @@ -165,7 +165,7 @@ glabel func_8024061C_C471FC /* C47464 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C47468 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* C4746C 8024088C 00000000 */ nop -/* C47470 80240890 0C09006D */ jal func_802401B4_C46D94 +/* C47470 80240890 0C09006D */ jal UnkNpcAIFunc5 /* C47474 80240894 0240202D */ daddu $a0, $s2, $zero /* C47478 80240898 0809022A */ j .L802408A8 /* C4747C 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s index 23fb572850..34ac4e6eb1 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 @@ -184,7 +184,7 @@ glabel func_802410D4_C47CB4 /* C47F68 80241388 0240202D */ daddu $a0, $s2, $zero /* C47F6C 8024138C 080904FF */ j .L802413FC /* C47F70 80241390 00000000 */ nop -/* C47F74 80241394 0C09006D */ jal func_802401B4_C46D94 +/* C47F74 80241394 0C09006D */ jal UnkNpcAIFunc5 /* C47F78 80241398 0240202D */ daddu $a0, $s2, $zero /* C47F7C 8024139C 080904FF */ j .L802413FC /* C47F80 802413A0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802401B4_C4F6C4.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802401B4_C4F6C4.s deleted file mode 100644 index f9e025df1f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802401B4_C4F6C4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4_C4F6C4 -/* C4F6C4 802401B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C4F6C8 802401B8 AFB10014 */ sw $s1, 0x14($sp) -/* C4F6CC 802401BC 0080882D */ daddu $s1, $a0, $zero -/* C4F6D0 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C4F6D4 802401C4 AFB00010 */ sw $s0, 0x10($sp) -/* C4F6D8 802401C8 8E300148 */ lw $s0, 0x148($s1) -/* C4F6DC 802401CC 0C00EABB */ jal get_npc_unsafe -/* C4F6E0 802401D0 86040008 */ lh $a0, 8($s0) -/* C4F6E4 802401D4 9443008E */ lhu $v1, 0x8e($v0) -/* C4F6E8 802401D8 2463FFFF */ addiu $v1, $v1, -1 -/* C4F6EC 802401DC A443008E */ sh $v1, 0x8e($v0) -/* C4F6F0 802401E0 00031C00 */ sll $v1, $v1, 0x10 -/* C4F6F4 802401E4 1C600003 */ bgtz $v1, .L802401F4 -/* C4F6F8 802401E8 2402000C */ addiu $v0, $zero, 0xc -/* C4F6FC 802401EC AE00006C */ sw $zero, 0x6c($s0) -/* C4F700 802401F0 AE220070 */ sw $v0, 0x70($s1) -.L802401F4: -/* C4F704 802401F4 8FBF0018 */ lw $ra, 0x18($sp) -/* C4F708 802401F8 8FB10014 */ lw $s1, 0x14($sp) -/* C4F70C 802401FC 8FB00010 */ lw $s0, 0x10($sp) -/* C4F710 80240200 03E00008 */ jr $ra -/* C4F714 80240204 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 7bed712921..059e3ba6ba 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 @@ -165,7 +165,7 @@ glabel func_8024061C_C4FB2C /* C4FD94 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C4FD98 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* C4FD9C 8024088C 00000000 */ nop -/* C4FDA0 80240890 0C09006D */ jal func_802401B4_C4F6C4 +/* C4FDA0 80240890 0C09006D */ jal UnkNpcAIFunc5 /* C4FDA4 80240894 0240202D */ daddu $a0, $s2, $zero /* C4FDA8 80240898 0809022A */ j .L802408A8 /* C4FDAC 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802401B4_C526F4.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802401B4_C526F4.s deleted file mode 100644 index d5532ce774..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802401B4_C526F4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4_C526F4 -/* C526F4 802401B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C526F8 802401B8 AFB10014 */ sw $s1, 0x14($sp) -/* C526FC 802401BC 0080882D */ daddu $s1, $a0, $zero -/* C52700 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C52704 802401C4 AFB00010 */ sw $s0, 0x10($sp) -/* C52708 802401C8 8E300148 */ lw $s0, 0x148($s1) -/* C5270C 802401CC 0C00EABB */ jal get_npc_unsafe -/* C52710 802401D0 86040008 */ lh $a0, 8($s0) -/* C52714 802401D4 9443008E */ lhu $v1, 0x8e($v0) -/* C52718 802401D8 2463FFFF */ addiu $v1, $v1, -1 -/* C5271C 802401DC A443008E */ sh $v1, 0x8e($v0) -/* C52720 802401E0 00031C00 */ sll $v1, $v1, 0x10 -/* C52724 802401E4 1C600003 */ bgtz $v1, .L802401F4 -/* C52728 802401E8 2402000C */ addiu $v0, $zero, 0xc -/* C5272C 802401EC AE00006C */ sw $zero, 0x6c($s0) -/* C52730 802401F0 AE220070 */ sw $v0, 0x70($s1) -.L802401F4: -/* C52734 802401F4 8FBF0018 */ lw $ra, 0x18($sp) -/* C52738 802401F8 8FB10014 */ lw $s1, 0x14($sp) -/* C5273C 802401FC 8FB00010 */ lw $s0, 0x10($sp) -/* C52740 80240200 03E00008 */ jr $ra -/* C52744 80240204 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 aa30c8fc83..d0b180e6c3 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 @@ -184,7 +184,7 @@ glabel func_80240E20_C53360 /* C53614 802410D4 0240202D */ daddu $a0, $s2, $zero /* C53618 802410D8 08090452 */ j .L80241148 /* C5361C 802410DC 00000000 */ nop -/* C53620 802410E0 0C09006D */ jal func_802401B4_C526F4 +/* C53620 802410E0 0C09006D */ jal UnkNpcAIFunc5 /* C53624 802410E4 0240202D */ daddu $a0, $s2, $zero /* C53628 802410E8 08090452 */ j .L80241148 /* C5362C 802410EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s index 84cf07b92c..e34b5e340b 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 @@ -165,7 +165,7 @@ glabel func_80241170_C536B0 /* C53918 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* C5391C 802413DC 14620007 */ bne $v1, $v0, .L802413FC /* C53920 802413E0 00000000 */ nop -/* C53924 802413E4 0C09006D */ jal func_802401B4_C526F4 +/* C53924 802413E4 0C09006D */ jal UnkNpcAIFunc5 /* C53928 802413E8 0240202D */ daddu $a0, $s2, $zero /* C5392C 802413EC 080904FF */ j .L802413FC /* C53930 802413F0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241A80_B4C4F0.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241A80_B4C4F0.s deleted file mode 100644 index 8d02b52beb..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241A80_B4C4F0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A80_B4C4F0 -/* B4C4F0 80241A80 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B4C4F4 80241A84 AFB10014 */ sw $s1, 0x14($sp) -/* B4C4F8 80241A88 0080882D */ daddu $s1, $a0, $zero -/* B4C4FC 80241A8C AFBF0018 */ sw $ra, 0x18($sp) -/* B4C500 80241A90 AFB00010 */ sw $s0, 0x10($sp) -/* B4C504 80241A94 8E300148 */ lw $s0, 0x148($s1) -/* B4C508 80241A98 0C00EABB */ jal get_npc_unsafe -/* B4C50C 80241A9C 86040008 */ lh $a0, 8($s0) -/* B4C510 80241AA0 9443008E */ lhu $v1, 0x8e($v0) -/* B4C514 80241AA4 2463FFFF */ addiu $v1, $v1, -1 -/* B4C518 80241AA8 A443008E */ sh $v1, 0x8e($v0) -/* B4C51C 80241AAC 00031C00 */ sll $v1, $v1, 0x10 -/* B4C520 80241AB0 1C600003 */ bgtz $v1, .L80241AC0 -/* B4C524 80241AB4 2402000C */ addiu $v0, $zero, 0xc -/* B4C528 80241AB8 AE00006C */ sw $zero, 0x6c($s0) -/* B4C52C 80241ABC AE220070 */ sw $v0, 0x70($s1) -.L80241AC0: -/* B4C530 80241AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* B4C534 80241AC4 8FB10014 */ lw $s1, 0x14($sp) -/* B4C538 80241AC8 8FB00010 */ lw $s0, 0x10($sp) -/* B4C53C 80241ACC 03E00008 */ jr $ra -/* B4C540 80241AD0 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 bf4a112d03..7bc4a21c26 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s @@ -46,7 +46,7 @@ glabel func_80241EE8_B4C958 /* B4C9FC 80241F8C 8E2200B0 */ lw $v0, 0xb0($s1) /* B4CA00 80241F90 30420004 */ andi $v0, $v0, 4 /* B4CA04 80241F94 10400020 */ beqz $v0, .L80242018 -/* B4CA08 80241F98 00000000 */ nop +/* B4CA08 80241F98 00000000 */ nop .L80241F9C: /* B4CA0C 80241F9C 2404F7FF */ addiu $a0, $zero, -0x801 /* B4CA10 80241FA0 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241EE8_B4C958 /* B4CA88 80242018 8E420070 */ lw $v0, 0x70($s2) /* B4CA8C 8024201C 2842001E */ slti $v0, $v0, 0x1e /* B4CA90 80242020 10400009 */ beqz $v0, .L80242048 -/* B4CA94 80242024 00000000 */ nop +/* B4CA94 80242024 00000000 */ nop /* B4CA98 80242028 8E22006C */ lw $v0, 0x6c($s1) /* B4CA9C 8024202C 14400006 */ bnez $v0, .L80242048 -/* B4CAA0 80242030 00000000 */ nop +/* B4CAA0 80242030 00000000 */ nop /* B4CAA4 80242034 0C0906B5 */ jal func_80241AD4_B4C544 /* B4CAA8 80242038 0240202D */ daddu $a0, $s2, $zero /* B4CAAC 8024203C 10400002 */ beqz $v0, .L80242048 @@ -104,7 +104,7 @@ glabel func_80241EE8_B4C958 /* B4CACC 8024205C 00220821 */ addu $at, $at, $v0 /* B4CAD0 80242060 8C227A98 */ lw $v0, 0x7a98($at) /* B4CAD4 80242064 00400008 */ jr $v0 -/* B4CAD8 80242068 00000000 */ nop +/* B4CAD8 80242068 00000000 */ nop /* B4CADC 8024206C 0240202D */ daddu $a0, $s2, $zero /* B4CAE0 80242070 0260282D */ daddu $a1, $s3, $zero /* B4CAE4 80242074 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80241EE8_B4C958 /* B4CAF4 80242084 0C0125AE */ jal func_800496B8 /* B4CAF8 80242088 0280302D */ daddu $a2, $s4, $zero /* B4CAFC 8024208C 0809085D */ j .L80242174 -/* B4CB00 80242090 00000000 */ nop +/* B4CB00 80242090 00000000 */ nop /* B4CB04 80242094 0240202D */ daddu $a0, $s2, $zero /* B4CB08 80242098 0260282D */ daddu $a1, $s3, $zero /* B4CB0C 8024209C 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_80241EE8_B4C958 /* B4CB1C 802420AC 0C012701 */ jal func_80049C04 /* B4CB20 802420B0 0280302D */ daddu $a2, $s4, $zero /* B4CB24 802420B4 0809085D */ j .L80242174 -/* B4CB28 802420B8 00000000 */ nop +/* B4CB28 802420B8 00000000 */ nop /* B4CB2C 802420BC 0240202D */ daddu $a0, $s2, $zero /* B4CB30 802420C0 0260282D */ daddu $a1, $s3, $zero /* B4CB34 802420C4 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241EE8_B4C958 /* B4CB44 802420D4 0C0127B3 */ jal func_80049ECC /* B4CB48 802420D8 0280302D */ daddu $a2, $s4, $zero /* B4CB4C 802420DC 0809085D */ j .L80242174 -/* B4CB50 802420E0 00000000 */ nop +/* B4CB50 802420E0 00000000 */ nop /* B4CB54 802420E4 0240202D */ daddu $a0, $s2, $zero /* B4CB58 802420E8 0260282D */ daddu $a1, $s3, $zero /* B4CB5C 802420EC 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80241EE8_B4C958 /* B4CB6C 802420FC 0C012849 */ jal func_8004A124 /* B4CB70 80242100 0280302D */ daddu $a2, $s4, $zero /* B4CB74 80242104 0809085D */ j .L80242174 -/* B4CB78 80242108 00000000 */ nop +/* B4CB78 80242108 00000000 */ nop /* B4CB7C 8024210C 0240202D */ daddu $a0, $s2, $zero /* B4CB80 80242110 0260282D */ daddu $a1, $s3, $zero /* B4CB84 80242114 0C0128FA */ jal func_8004A3E8 /* B4CB88 80242118 0280302D */ daddu $a2, $s4, $zero /* B4CB8C 8024211C 0809085D */ j .L80242174 -/* B4CB90 80242120 00000000 */ nop +/* B4CB90 80242120 00000000 */ nop /* B4CB94 80242124 0C090633 */ jal func_802418CC_B4C33C /* B4CB98 80242128 0240202D */ daddu $a0, $s2, $zero /* B4CB9C 8024212C 0C09064E */ jal func_80241938_B4C3A8 @@ -158,17 +158,17 @@ glabel func_80241EE8_B4C958 /* B4CBA4 80242134 8E430070 */ lw $v1, 0x70($s2) /* B4CBA8 80242138 24020020 */ addiu $v0, $zero, 0x20 /* B4CBAC 8024213C 1462000D */ bne $v1, $v0, .L80242174 -/* B4CBB0 80242140 00000000 */ nop +/* B4CBB0 80242140 00000000 */ nop /* B4CBB4 80242144 0C09066A */ jal func_802419A8_B4C418 /* B4CBB8 80242148 0240202D */ daddu $a0, $s2, $zero /* B4CBBC 8024214C 8E430070 */ lw $v1, 0x70($s2) /* B4CBC0 80242150 24020021 */ addiu $v0, $zero, 0x21 /* B4CBC4 80242154 14620007 */ bne $v1, $v0, .L80242174 -/* B4CBC8 80242158 00000000 */ nop -/* B4CBCC 8024215C 0C0906A0 */ jal func_80241A80_B4C4F0 +/* B4CBC8 80242158 00000000 */ nop +/* B4CBCC 8024215C 0C0906A0 */ jal UnkNpcAIFunc5 /* B4CBD0 80242160 0240202D */ daddu $a0, $s2, $zero /* B4CBD4 80242164 0809085D */ j .L80242174 -/* B4CBD8 80242168 00000000 */ nop +/* B4CBD8 80242168 00000000 */ nop /* B4CBDC 8024216C 0C0129CF */ jal func_8004A73C /* B4CBE0 80242170 0240202D */ daddu $a0, $s2, $zero .L80242174: diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s index abe37428d1..295fc2a014 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 @@ -165,7 +165,7 @@ glabel func_8024219C_B4CC0C /* B4CE74 80242404 24020021 */ addiu $v0, $zero, 0x21 /* B4CE78 80242408 14620007 */ bne $v1, $v0, .L80242428 /* B4CE7C 8024240C 00000000 */ nop -/* B4CE80 80242410 0C0906A0 */ jal func_80241A80_B4C4F0 +/* B4CE80 80242410 0C0906A0 */ jal UnkNpcAIFunc5 /* B4CE84 80242414 0240202D */ daddu $a0, $s2, $zero /* B4CE88 80242418 0809090A */ j .L80242428 /* B4CE8C 8024241C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802419D0_B54200.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802419D0_B54200.s deleted file mode 100644 index d83ba7654d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802419D0_B54200.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419D0_B54200 -/* B54200 802419D0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B54204 802419D4 AFB10014 */ sw $s1, 0x14($sp) -/* B54208 802419D8 0080882D */ daddu $s1, $a0, $zero -/* B5420C 802419DC AFBF0018 */ sw $ra, 0x18($sp) -/* B54210 802419E0 AFB00010 */ sw $s0, 0x10($sp) -/* B54214 802419E4 8E300148 */ lw $s0, 0x148($s1) -/* B54218 802419E8 0C00EABB */ jal get_npc_unsafe -/* B5421C 802419EC 86040008 */ lh $a0, 8($s0) -/* B54220 802419F0 9443008E */ lhu $v1, 0x8e($v0) -/* B54224 802419F4 2463FFFF */ addiu $v1, $v1, -1 -/* B54228 802419F8 A443008E */ sh $v1, 0x8e($v0) -/* B5422C 802419FC 00031C00 */ sll $v1, $v1, 0x10 -/* B54230 80241A00 1C600003 */ bgtz $v1, .L80241A10 -/* B54234 80241A04 2402000C */ addiu $v0, $zero, 0xc -/* B54238 80241A08 AE00006C */ sw $zero, 0x6c($s0) -/* B5423C 80241A0C AE220070 */ sw $v0, 0x70($s1) -.L80241A10: -/* B54240 80241A10 8FBF0018 */ lw $ra, 0x18($sp) -/* B54244 80241A14 8FB10014 */ lw $s1, 0x14($sp) -/* B54248 80241A18 8FB00010 */ lw $s0, 0x10($sp) -/* B5424C 80241A1C 03E00008 */ jr $ra -/* B54250 80241A20 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 420b160750..c75b1fdcd5 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 @@ -165,7 +165,7 @@ glabel func_80241E38_B54668 /* B548D0 802420A0 24020021 */ addiu $v0, $zero, 0x21 /* B548D4 802420A4 14620007 */ bne $v1, $v0, .L802420C4 /* B548D8 802420A8 00000000 */ nop -/* B548DC 802420AC 0C090674 */ jal func_802419D0_B54200 +/* B548DC 802420AC 0C090674 */ jal UnkNpcAIFunc5 /* B548E0 802420B0 0240202D */ daddu $a0, $s2, $zero /* B548E4 802420B4 08090831 */ j .L802420C4 /* B548E8 802420B8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s index 1498791c51..7fbf535203 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 @@ -165,7 +165,7 @@ glabel func_802420EC_B5491C /* B54B84 80242354 24020021 */ addiu $v0, $zero, 0x21 /* B54B88 80242358 14620007 */ bne $v1, $v0, .L80242378 /* B54B8C 8024235C 00000000 */ nop -/* B54B90 80242360 0C090674 */ jal func_802419D0_B54200 +/* B54B90 80242360 0C090674 */ jal UnkNpcAIFunc5 /* B54B94 80242364 0240202D */ daddu $a0, $s2, $zero /* B54B98 80242368 080908DE */ j .L80242378 /* B54B9C 8024236C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802403C8_B59C38.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802403C8_B59C38.s deleted file mode 100644 index 0adff3f220..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802403C8_B59C38.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C8_B59C38 -/* B59C38 802403C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B59C3C 802403CC AFB10014 */ sw $s1, 0x14($sp) -/* B59C40 802403D0 0080882D */ daddu $s1, $a0, $zero -/* B59C44 802403D4 AFBF0018 */ sw $ra, 0x18($sp) -/* B59C48 802403D8 AFB00010 */ sw $s0, 0x10($sp) -/* B59C4C 802403DC 8E300148 */ lw $s0, 0x148($s1) -/* B59C50 802403E0 0C00EABB */ jal get_npc_unsafe -/* B59C54 802403E4 86040008 */ lh $a0, 8($s0) -/* B59C58 802403E8 9443008E */ lhu $v1, 0x8e($v0) -/* B59C5C 802403EC 2463FFFF */ addiu $v1, $v1, -1 -/* B59C60 802403F0 A443008E */ sh $v1, 0x8e($v0) -/* B59C64 802403F4 00031C00 */ sll $v1, $v1, 0x10 -/* B59C68 802403F8 1C600003 */ bgtz $v1, .L80240408 -/* B59C6C 802403FC 2402000C */ addiu $v0, $zero, 0xc -/* B59C70 80240400 AE00006C */ sw $zero, 0x6c($s0) -/* B59C74 80240404 AE220070 */ sw $v0, 0x70($s1) -.L80240408: -/* B59C78 80240408 8FBF0018 */ lw $ra, 0x18($sp) -/* B59C7C 8024040C 8FB10014 */ lw $s1, 0x14($sp) -/* B59C80 80240410 8FB00010 */ lw $s0, 0x10($sp) -/* B59C84 80240414 03E00008 */ jr $ra -/* B59C88 80240418 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 85bc1407bf..80cb8b5602 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 @@ -165,7 +165,7 @@ glabel func_80240830_B5A0A0 /* B5A308 80240A98 24020021 */ addiu $v0, $zero, 0x21 /* B5A30C 80240A9C 14620007 */ bne $v1, $v0, .L80240ABC /* B5A310 80240AA0 00000000 */ nop -/* B5A314 80240AA4 0C0900F2 */ jal func_802403C8_B59C38 +/* B5A314 80240AA4 0C0900F2 */ jal UnkNpcAIFunc5 /* B5A318 80240AA8 0240202D */ daddu $a0, $s2, $zero /* B5A31C 80240AAC 080902AF */ j .L80240ABC /* B5A320 80240AB0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s index 5b63fe8fcb..9023d3a207 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 @@ -165,7 +165,7 @@ glabel func_80240AE4_B5A354 /* B5A5BC 80240D4C 24020021 */ addiu $v0, $zero, 0x21 /* B5A5C0 80240D50 14620007 */ bne $v1, $v0, .L80240D70 /* B5A5C4 80240D54 00000000 */ nop -/* B5A5C8 80240D58 0C0900F2 */ jal func_802403C8_B59C38 +/* B5A5C8 80240D58 0C0900F2 */ jal UnkNpcAIFunc5 /* B5A5CC 80240D5C 0240202D */ daddu $a0, $s2, $zero /* B5A5D0 80240D60 0809035C */ j .L80240D70 /* B5A5D4 80240D64 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_8024181C_B5FACC.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_8024181C_B5FACC.s deleted file mode 100644 index e8f17bafb9..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_8024181C_B5FACC.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024181C_B5FACC -/* B5FACC 8024181C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5FAD0 80241820 AFB10014 */ sw $s1, 0x14($sp) -/* B5FAD4 80241824 0080882D */ daddu $s1, $a0, $zero -/* B5FAD8 80241828 AFBF0018 */ sw $ra, 0x18($sp) -/* B5FADC 8024182C AFB00010 */ sw $s0, 0x10($sp) -/* B5FAE0 80241830 8E300148 */ lw $s0, 0x148($s1) -/* B5FAE4 80241834 0C00EABB */ jal get_npc_unsafe -/* B5FAE8 80241838 86040008 */ lh $a0, 8($s0) -/* B5FAEC 8024183C 9443008E */ lhu $v1, 0x8e($v0) -/* B5FAF0 80241840 2463FFFF */ addiu $v1, $v1, -1 -/* B5FAF4 80241844 A443008E */ sh $v1, 0x8e($v0) -/* B5FAF8 80241848 00031C00 */ sll $v1, $v1, 0x10 -/* B5FAFC 8024184C 1C600003 */ bgtz $v1, .L8024185C -/* B5FB00 80241850 2402000C */ addiu $v0, $zero, 0xc -/* B5FB04 80241854 AE00006C */ sw $zero, 0x6c($s0) -/* B5FB08 80241858 AE220070 */ sw $v0, 0x70($s1) -.L8024185C: -/* B5FB0C 8024185C 8FBF0018 */ lw $ra, 0x18($sp) -/* B5FB10 80241860 8FB10014 */ lw $s1, 0x14($sp) -/* B5FB14 80241864 8FB00010 */ lw $s0, 0x10($sp) -/* B5FB18 80241868 03E00008 */ jr $ra -/* B5FB1C 8024186C 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 c14fef9937..9adba311c5 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 @@ -165,7 +165,7 @@ glabel func_80241C84_B5FF34 /* B6019C 80241EEC 24020021 */ addiu $v0, $zero, 0x21 /* B601A0 80241EF0 14620007 */ bne $v1, $v0, .L80241F10 /* B601A4 80241EF4 00000000 */ nop -/* B601A8 80241EF8 0C090607 */ jal func_8024181C_B5FACC +/* B601A8 80241EF8 0C090607 */ jal UnkNpcAIFunc5 /* B601AC 80241EFC 0240202D */ daddu $a0, $s2, $zero /* B601B0 80241F00 080907C4 */ j .L80241F10 /* B601B4 80241F04 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s index 2acb07157c..bc8179a187 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 @@ -165,7 +165,7 @@ glabel func_80241F38_B601E8 /* B60450 802421A0 24020021 */ addiu $v0, $zero, 0x21 /* B60454 802421A4 14620007 */ bne $v1, $v0, .L802421C4 /* B60458 802421A8 00000000 */ nop -/* B6045C 802421AC 0C090607 */ jal func_8024181C_B5FACC +/* B6045C 802421AC 0C090607 */ jal UnkNpcAIFunc5 /* B60460 802421B0 0240202D */ daddu $a0, $s2, $zero /* B60464 802421B4 08090871 */ j .L802421C4 /* B60468 802421B8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D08_B667B8.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D08_B667B8.s deleted file mode 100644 index fdfdb00000..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D08_B667B8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D08_B667B8 -/* B667B8 80240D08 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B667BC 80240D0C AFB10014 */ sw $s1, 0x14($sp) -/* B667C0 80240D10 0080882D */ daddu $s1, $a0, $zero -/* B667C4 80240D14 AFBF0018 */ sw $ra, 0x18($sp) -/* B667C8 80240D18 AFB00010 */ sw $s0, 0x10($sp) -/* B667CC 80240D1C 8E300148 */ lw $s0, 0x148($s1) -/* B667D0 80240D20 0C00EABB */ jal get_npc_unsafe -/* B667D4 80240D24 86040008 */ lh $a0, 8($s0) -/* B667D8 80240D28 9443008E */ lhu $v1, 0x8e($v0) -/* B667DC 80240D2C 2463FFFF */ addiu $v1, $v1, -1 -/* B667E0 80240D30 A443008E */ sh $v1, 0x8e($v0) -/* B667E4 80240D34 00031C00 */ sll $v1, $v1, 0x10 -/* B667E8 80240D38 1C600003 */ bgtz $v1, .L80240D48 -/* B667EC 80240D3C 2402000C */ addiu $v0, $zero, 0xc -/* B667F0 80240D40 AE00006C */ sw $zero, 0x6c($s0) -/* B667F4 80240D44 AE220070 */ sw $v0, 0x70($s1) -.L80240D48: -/* B667F8 80240D48 8FBF0018 */ lw $ra, 0x18($sp) -/* B667FC 80240D4C 8FB10014 */ lw $s1, 0x14($sp) -/* B66800 80240D50 8FB00010 */ lw $s0, 0x10($sp) -/* B66804 80240D54 03E00008 */ jr $ra -/* B66808 80240D58 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 c0d261ee1a..c310966b23 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 @@ -165,7 +165,7 @@ glabel func_80241170_B66C20 /* B66E88 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* B66E8C 802413DC 14620007 */ bne $v1, $v0, .L802413FC /* B66E90 802413E0 00000000 */ nop -/* B66E94 802413E4 0C090342 */ jal func_80240D08_B667B8 +/* B66E94 802413E4 0C090342 */ jal UnkNpcAIFunc5 /* B66E98 802413E8 0240202D */ daddu $a0, $s2, $zero /* B66E9C 802413EC 080904FF */ j .L802413FC /* B66EA0 802413F0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s index 3c1809054c..3fc1a090b0 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 @@ -165,7 +165,7 @@ glabel func_80241424_B66ED4 /* B6713C 8024168C 24020021 */ addiu $v0, $zero, 0x21 /* B67140 80241690 14620007 */ bne $v1, $v0, .L802416B0 /* B67144 80241694 00000000 */ nop -/* B67148 80241698 0C090342 */ jal func_80240D08_B667B8 +/* B67148 80241698 0C090342 */ jal UnkNpcAIFunc5 /* B6714C 8024169C 0240202D */ daddu $a0, $s2, $zero /* B67150 802416A0 080905AC */ j .L802416B0 /* B67154 802416A4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240888_B73938.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240888_B73938.s deleted file mode 100644 index 9318f47da5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240888_B73938.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240888_B73938 -/* B73938 80240888 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B7393C 8024088C AFB10014 */ sw $s1, 0x14($sp) -/* B73940 80240890 0080882D */ daddu $s1, $a0, $zero -/* B73944 80240894 AFBF0018 */ sw $ra, 0x18($sp) -/* B73948 80240898 AFB00010 */ sw $s0, 0x10($sp) -/* B7394C 8024089C 8E300148 */ lw $s0, 0x148($s1) -/* B73950 802408A0 0C00EABB */ jal get_npc_unsafe -/* B73954 802408A4 86040008 */ lh $a0, 8($s0) -/* B73958 802408A8 9443008E */ lhu $v1, 0x8e($v0) -/* B7395C 802408AC 2463FFFF */ addiu $v1, $v1, -1 -/* B73960 802408B0 A443008E */ sh $v1, 0x8e($v0) -/* B73964 802408B4 00031C00 */ sll $v1, $v1, 0x10 -/* B73968 802408B8 1C600003 */ bgtz $v1, .L802408C8 -/* B7396C 802408BC 2402000C */ addiu $v0, $zero, 0xc -/* B73970 802408C0 AE00006C */ sw $zero, 0x6c($s0) -/* B73974 802408C4 AE220070 */ sw $v0, 0x70($s1) -.L802408C8: -/* B73978 802408C8 8FBF0018 */ lw $ra, 0x18($sp) -/* B7397C 802408CC 8FB10014 */ lw $s1, 0x14($sp) -/* B73980 802408D0 8FB00010 */ lw $s0, 0x10($sp) -/* B73984 802408D4 03E00008 */ jr $ra -/* B73988 802408D8 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 c54db8822d..5d057b6a4a 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 @@ -165,7 +165,7 @@ glabel func_80240CF0_B73DA0 /* B74008 80240F58 24020021 */ addiu $v0, $zero, 0x21 /* B7400C 80240F5C 14620007 */ bne $v1, $v0, .L80240F7C /* B74010 80240F60 00000000 */ nop -/* B74014 80240F64 0C090222 */ jal func_80240888_B73938 +/* B74014 80240F64 0C090222 */ jal UnkNpcAIFunc5 /* B74018 80240F68 0240202D */ daddu $a0, $s2, $zero /* B7401C 80240F6C 080903DF */ j .L80240F7C /* B74020 80240F70 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s index bc089714be..84fc139f6c 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 @@ -165,7 +165,7 @@ glabel func_80240FA4_B74054 /* B742BC 8024120C 24020021 */ addiu $v0, $zero, 0x21 /* B742C0 80241210 14620007 */ bne $v1, $v0, .L80241230 /* B742C4 80241214 00000000 */ nop -/* B742C8 80241218 0C090222 */ jal func_80240888_B73938 +/* B742C8 80241218 0C090222 */ jal UnkNpcAIFunc5 /* B742CC 8024121C 0240202D */ daddu $a0, $s2, $zero /* B742D0 80241220 0809048C */ j .L80241230 /* B742D4 80241224 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240DAC_C61ABC.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240DAC_C61ABC.s deleted file mode 100644 index 93149d1051..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240DAC_C61ABC.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DAC_C61ABC -/* C61ABC 80240DAC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C61AC0 80240DB0 AFB10014 */ sw $s1, 0x14($sp) -/* C61AC4 80240DB4 0080882D */ daddu $s1, $a0, $zero -/* C61AC8 80240DB8 AFBF0018 */ sw $ra, 0x18($sp) -/* C61ACC 80240DBC AFB00010 */ sw $s0, 0x10($sp) -/* C61AD0 80240DC0 8E300148 */ lw $s0, 0x148($s1) -/* C61AD4 80240DC4 0C00EABB */ jal get_npc_unsafe -/* C61AD8 80240DC8 86040008 */ lh $a0, 8($s0) -/* C61ADC 80240DCC 9443008E */ lhu $v1, 0x8e($v0) -/* C61AE0 80240DD0 2463FFFF */ addiu $v1, $v1, -1 -/* C61AE4 80240DD4 A443008E */ sh $v1, 0x8e($v0) -/* C61AE8 80240DD8 00031C00 */ sll $v1, $v1, 0x10 -/* C61AEC 80240DDC 1C600003 */ bgtz $v1, .L80240DEC -/* C61AF0 80240DE0 2402000C */ addiu $v0, $zero, 0xc -/* C61AF4 80240DE4 AE00006C */ sw $zero, 0x6c($s0) -/* C61AF8 80240DE8 AE220070 */ sw $v0, 0x70($s1) -.L80240DEC: -/* C61AFC 80240DEC 8FBF0018 */ lw $ra, 0x18($sp) -/* C61B00 80240DF0 8FB10014 */ lw $s1, 0x14($sp) -/* C61B04 80240DF4 8FB00010 */ lw $s0, 0x10($sp) -/* C61B08 80240DF8 03E00008 */ jr $ra -/* C61B0C 80240DFC 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 2531131767..69e8987245 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 @@ -165,7 +165,7 @@ glabel func_80241214_C61F24 /* C6218C 8024147C 24020021 */ addiu $v0, $zero, 0x21 /* C62190 80241480 14620007 */ bne $v1, $v0, .L802414A0 /* C62194 80241484 00000000 */ nop -/* C62198 80241488 0C09036B */ jal func_80240DAC_C61ABC +/* C62198 80241488 0C09036B */ jal UnkNpcAIFunc5 /* C6219C 8024148C 0240202D */ daddu $a0, $s2, $zero /* C621A0 80241490 08090528 */ j .L802414A0 /* C621A4 80241494 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802426F0_C73B70.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802426F0_C73B70.s deleted file mode 100644 index e2e9095e46..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802426F0_C73B70.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426F0_C73B70 -/* C73B70 802426F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C73B74 802426F4 AFB10014 */ sw $s1, 0x14($sp) -/* C73B78 802426F8 0080882D */ daddu $s1, $a0, $zero -/* C73B7C 802426FC AFBF0018 */ sw $ra, 0x18($sp) -/* C73B80 80242700 AFB00010 */ sw $s0, 0x10($sp) -/* C73B84 80242704 8E300148 */ lw $s0, 0x148($s1) -/* C73B88 80242708 0C00EABB */ jal get_npc_unsafe -/* C73B8C 8024270C 86040008 */ lh $a0, 8($s0) -/* C73B90 80242710 9443008E */ lhu $v1, 0x8e($v0) -/* C73B94 80242714 2463FFFF */ addiu $v1, $v1, -1 -/* C73B98 80242718 A443008E */ sh $v1, 0x8e($v0) -/* C73B9C 8024271C 00031C00 */ sll $v1, $v1, 0x10 -/* C73BA0 80242720 1C600003 */ bgtz $v1, .L80242730 -/* C73BA4 80242724 2402000C */ addiu $v0, $zero, 0xc -/* C73BA8 80242728 AE00006C */ sw $zero, 0x6c($s0) -/* C73BAC 8024272C AE220070 */ sw $v0, 0x70($s1) -.L80242730: -/* C73BB0 80242730 8FBF0018 */ lw $ra, 0x18($sp) -/* C73BB4 80242734 8FB10014 */ lw $s1, 0x14($sp) -/* C73BB8 80242738 8FB00010 */ lw $s0, 0x10($sp) -/* C73BBC 8024273C 03E00008 */ jr $ra -/* C73BC0 80242740 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 2668f3505f..ab3961af7c 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 @@ -165,7 +165,7 @@ glabel func_80242B58_C73FD8 /* C74240 80242DC0 24020021 */ addiu $v0, $zero, 0x21 /* C74244 80242DC4 14620007 */ bne $v1, $v0, .L80242DE4 /* C74248 80242DC8 00000000 */ nop -/* C7424C 80242DCC 0C0909BC */ jal func_802426F0_C73B70 +/* C7424C 80242DCC 0C0909BC */ jal UnkNpcAIFunc5 /* C74250 80242DD0 0240202D */ daddu $a0, $s2, $zero /* C74254 80242DD4 08090B79 */ j .L80242DE4 /* C74258 80242DD8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802411D4_C77EB4.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802411D4_C77EB4.s deleted file mode 100644 index 1ef9b9cc8d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802411D4_C77EB4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411D4_C77EB4 -/* C77EB4 802411D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C77EB8 802411D8 AFB10014 */ sw $s1, 0x14($sp) -/* C77EBC 802411DC 0080882D */ daddu $s1, $a0, $zero -/* C77EC0 802411E0 AFBF0018 */ sw $ra, 0x18($sp) -/* C77EC4 802411E4 AFB00010 */ sw $s0, 0x10($sp) -/* C77EC8 802411E8 8E300148 */ lw $s0, 0x148($s1) -/* C77ECC 802411EC 0C00EABB */ jal get_npc_unsafe -/* C77ED0 802411F0 86040008 */ lh $a0, 8($s0) -/* C77ED4 802411F4 9443008E */ lhu $v1, 0x8e($v0) -/* C77ED8 802411F8 2463FFFF */ addiu $v1, $v1, -1 -/* C77EDC 802411FC A443008E */ sh $v1, 0x8e($v0) -/* C77EE0 80241200 00031C00 */ sll $v1, $v1, 0x10 -/* C77EE4 80241204 1C600003 */ bgtz $v1, .L80241214 -/* C77EE8 80241208 2402000C */ addiu $v0, $zero, 0xc -/* C77EEC 8024120C AE00006C */ sw $zero, 0x6c($s0) -/* C77EF0 80241210 AE220070 */ sw $v0, 0x70($s1) -.L80241214: -/* C77EF4 80241214 8FBF0018 */ lw $ra, 0x18($sp) -/* C77EF8 80241218 8FB10014 */ lw $s1, 0x14($sp) -/* C77EFC 8024121C 8FB00010 */ lw $s0, 0x10($sp) -/* C77F00 80241220 03E00008 */ jr $ra -/* C77F04 80241224 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 af9d09b936..a2f2f575d2 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 @@ -165,7 +165,7 @@ glabel func_8024163C_C7831C /* C78584 802418A4 24020021 */ addiu $v0, $zero, 0x21 /* C78588 802418A8 14620007 */ bne $v1, $v0, .L802418C8 /* C7858C 802418AC 00000000 */ nop -/* C78590 802418B0 0C090475 */ jal func_802411D4_C77EB4 +/* C78590 802418B0 0C090475 */ jal UnkNpcAIFunc5 /* C78594 802418B4 0240202D */ daddu $a0, $s2, $zero /* C78598 802418B8 08090632 */ j .L802418C8 /* C7859C 802418BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802404C4_C85F74.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802404C4_C85F74.s deleted file mode 100644 index 128a6e6715..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802404C4_C85F74.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C4_C85F74 -/* C85F74 802404C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C85F78 802404C8 AFB10014 */ sw $s1, 0x14($sp) -/* C85F7C 802404CC 0080882D */ daddu $s1, $a0, $zero -/* C85F80 802404D0 AFBF0018 */ sw $ra, 0x18($sp) -/* C85F84 802404D4 AFB00010 */ sw $s0, 0x10($sp) -/* C85F88 802404D8 8E300148 */ lw $s0, 0x148($s1) -/* C85F8C 802404DC 0C00EABB */ jal get_npc_unsafe -/* C85F90 802404E0 86040008 */ lh $a0, 8($s0) -/* C85F94 802404E4 9443008E */ lhu $v1, 0x8e($v0) -/* C85F98 802404E8 2463FFFF */ addiu $v1, $v1, -1 -/* C85F9C 802404EC A443008E */ sh $v1, 0x8e($v0) -/* C85FA0 802404F0 00031C00 */ sll $v1, $v1, 0x10 -/* C85FA4 802404F4 1C600003 */ bgtz $v1, .L80240504 -/* C85FA8 802404F8 2402000C */ addiu $v0, $zero, 0xc -/* C85FAC 802404FC AE00006C */ sw $zero, 0x6c($s0) -/* C85FB0 80240500 AE220070 */ sw $v0, 0x70($s1) -.L80240504: -/* C85FB4 80240504 8FBF0018 */ lw $ra, 0x18($sp) -/* C85FB8 80240508 8FB10014 */ lw $s1, 0x14($sp) -/* C85FBC 8024050C 8FB00010 */ lw $s0, 0x10($sp) -/* C85FC0 80240510 03E00008 */ jr $ra -/* C85FC4 80240514 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 fc31e9207a..448eb3224f 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 @@ -165,7 +165,7 @@ glabel func_8024092C_C863DC /* C86644 80240B94 24020021 */ addiu $v0, $zero, 0x21 /* C86648 80240B98 14620007 */ bne $v1, $v0, .L80240BB8 /* C8664C 80240B9C 00000000 */ nop -/* C86650 80240BA0 0C090131 */ jal func_802404C4_C85F74 +/* C86650 80240BA0 0C090131 */ jal UnkNpcAIFunc5 /* C86654 80240BA4 0240202D */ daddu $a0, $s2, $zero /* C86658 80240BA8 080902EE */ j .L80240BB8 /* C8665C 80240BAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802406B4_B93AF4.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802406B4_B93AF4.s deleted file mode 100644 index 6481a00699..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802406B4_B93AF4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406B4_B93AF4 -/* B93AF4 802406B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B93AF8 802406B8 AFB10014 */ sw $s1, 0x14($sp) -/* B93AFC 802406BC 0080882D */ daddu $s1, $a0, $zero -/* B93B00 802406C0 AFBF0018 */ sw $ra, 0x18($sp) -/* B93B04 802406C4 AFB00010 */ sw $s0, 0x10($sp) -/* B93B08 802406C8 8E300148 */ lw $s0, 0x148($s1) -/* B93B0C 802406CC 0C00EABB */ jal get_npc_unsafe -/* B93B10 802406D0 86040008 */ lh $a0, 8($s0) -/* B93B14 802406D4 9443008E */ lhu $v1, 0x8e($v0) -/* B93B18 802406D8 2463FFFF */ addiu $v1, $v1, -1 -/* B93B1C 802406DC A443008E */ sh $v1, 0x8e($v0) -/* B93B20 802406E0 00031C00 */ sll $v1, $v1, 0x10 -/* B93B24 802406E4 1C600003 */ bgtz $v1, .L802406F4 -/* B93B28 802406E8 2402000C */ addiu $v0, $zero, 0xc -/* B93B2C 802406EC AE00006C */ sw $zero, 0x6c($s0) -/* B93B30 802406F0 AE220070 */ sw $v0, 0x70($s1) -.L802406F4: -/* B93B34 802406F4 8FBF0018 */ lw $ra, 0x18($sp) -/* B93B38 802406F8 8FB10014 */ lw $s1, 0x14($sp) -/* B93B3C 802406FC 8FB00010 */ lw $s0, 0x10($sp) -/* B93B40 80240700 03E00008 */ jr $ra -/* B93B44 80240704 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 6d69c0ae69..818be9aeb5 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 @@ -165,7 +165,7 @@ glabel func_80240B1C_B93F5C /* B941C4 80240D84 24020021 */ addiu $v0, $zero, 0x21 /* B941C8 80240D88 14620007 */ bne $v1, $v0, .L80240DA8 /* B941CC 80240D8C 00000000 */ nop -/* B941D0 80240D90 0C0901AD */ jal func_802406B4_B93AF4 +/* B941D0 80240D90 0C0901AD */ jal UnkNpcAIFunc5 /* B941D4 80240D94 0240202D */ daddu $a0, $s2, $zero /* B941D8 80240D98 0809036A */ j .L80240DA8 /* B941DC 80240D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240224_BA0954.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240224_BA0954.s deleted file mode 100644 index fea4dc339e..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240224_BA0954.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240224_BA0954 -/* BA0954 80240224 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA0958 80240228 AFB10014 */ sw $s1, 0x14($sp) -/* BA095C 8024022C 0080882D */ daddu $s1, $a0, $zero -/* BA0960 80240230 AFBF0018 */ sw $ra, 0x18($sp) -/* BA0964 80240234 AFB00010 */ sw $s0, 0x10($sp) -/* BA0968 80240238 8E300148 */ lw $s0, 0x148($s1) -/* BA096C 8024023C 0C00EABB */ jal get_npc_unsafe -/* BA0970 80240240 86040008 */ lh $a0, 8($s0) -/* BA0974 80240244 9443008E */ lhu $v1, 0x8e($v0) -/* BA0978 80240248 2463FFFF */ addiu $v1, $v1, -1 -/* BA097C 8024024C A443008E */ sh $v1, 0x8e($v0) -/* BA0980 80240250 00031C00 */ sll $v1, $v1, 0x10 -/* BA0984 80240254 1C600003 */ bgtz $v1, .L80240264 -/* BA0988 80240258 2402000C */ addiu $v0, $zero, 0xc -/* BA098C 8024025C AE00006C */ sw $zero, 0x6c($s0) -/* BA0990 80240260 AE220070 */ sw $v0, 0x70($s1) -.L80240264: -/* BA0994 80240264 8FBF0018 */ lw $ra, 0x18($sp) -/* BA0998 80240268 8FB10014 */ lw $s1, 0x14($sp) -/* BA099C 8024026C 8FB00010 */ lw $s0, 0x10($sp) -/* BA09A0 80240270 03E00008 */ jr $ra -/* BA09A4 80240274 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 47a2a87ea0..8ccc24131e 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 @@ -165,7 +165,7 @@ glabel func_8024068C_BA0DBC /* BA1024 802408F4 24020021 */ addiu $v0, $zero, 0x21 /* BA1028 802408F8 14620007 */ bne $v1, $v0, .L80240918 /* BA102C 802408FC 00000000 */ nop -/* BA1030 80240900 0C090089 */ jal func_80240224_BA0954 +/* BA1030 80240900 0C090089 */ jal UnkNpcAIFunc5 /* BA1034 80240904 0240202D */ daddu $a0, $s2, $zero /* BA1038 80240908 08090246 */ j .L80240918 /* BA103C 8024090C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240724_BA4EA4.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240724_BA4EA4.s deleted file mode 100644 index f3443534e9..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240724_BA4EA4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240724_BA4EA4 -/* BA4EA4 80240724 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA4EA8 80240728 AFB10014 */ sw $s1, 0x14($sp) -/* BA4EAC 8024072C 0080882D */ daddu $s1, $a0, $zero -/* BA4EB0 80240730 AFBF0018 */ sw $ra, 0x18($sp) -/* BA4EB4 80240734 AFB00010 */ sw $s0, 0x10($sp) -/* BA4EB8 80240738 8E300148 */ lw $s0, 0x148($s1) -/* BA4EBC 8024073C 0C00EABB */ jal get_npc_unsafe -/* BA4EC0 80240740 86040008 */ lh $a0, 8($s0) -/* BA4EC4 80240744 9443008E */ lhu $v1, 0x8e($v0) -/* BA4EC8 80240748 2463FFFF */ addiu $v1, $v1, -1 -/* BA4ECC 8024074C A443008E */ sh $v1, 0x8e($v0) -/* BA4ED0 80240750 00031C00 */ sll $v1, $v1, 0x10 -/* BA4ED4 80240754 1C600003 */ bgtz $v1, .L80240764 -/* BA4ED8 80240758 2402000C */ addiu $v0, $zero, 0xc -/* BA4EDC 8024075C AE00006C */ sw $zero, 0x6c($s0) -/* BA4EE0 80240760 AE220070 */ sw $v0, 0x70($s1) -.L80240764: -/* BA4EE4 80240764 8FBF0018 */ lw $ra, 0x18($sp) -/* BA4EE8 80240768 8FB10014 */ lw $s1, 0x14($sp) -/* BA4EEC 8024076C 8FB00010 */ lw $s0, 0x10($sp) -/* BA4EF0 80240770 03E00008 */ jr $ra -/* BA4EF4 80240774 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 22d95163bb..83f37f8b8e 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 @@ -165,7 +165,7 @@ glabel func_80240B8C_BA530C /* BA5574 80240DF4 24020021 */ addiu $v0, $zero, 0x21 /* BA5578 80240DF8 14620007 */ bne $v1, $v0, .L80240E18 /* BA557C 80240DFC 00000000 */ nop -/* BA5580 80240E00 0C0901C9 */ jal func_80240724_BA4EA4 +/* BA5580 80240E00 0C0901C9 */ jal UnkNpcAIFunc5 /* BA5584 80240E04 0240202D */ daddu $a0, $s2, $zero /* BA5588 80240E08 08090386 */ j .L80240E18 /* BA558C 80240E0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_8024174C_BAF08C.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_8024174C_BAF08C.s deleted file mode 100644 index 63d23c353d..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_8024174C_BAF08C.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024174C_BAF08C -/* BAF08C 8024174C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BAF090 80241750 AFB10014 */ sw $s1, 0x14($sp) -/* BAF094 80241754 0080882D */ daddu $s1, $a0, $zero -/* BAF098 80241758 AFBF0018 */ sw $ra, 0x18($sp) -/* BAF09C 8024175C AFB00010 */ sw $s0, 0x10($sp) -/* BAF0A0 80241760 8E300148 */ lw $s0, 0x148($s1) -/* BAF0A4 80241764 0C00EABB */ jal get_npc_unsafe -/* BAF0A8 80241768 86040008 */ lh $a0, 8($s0) -/* BAF0AC 8024176C 9443008E */ lhu $v1, 0x8e($v0) -/* BAF0B0 80241770 2463FFFF */ addiu $v1, $v1, -1 -/* BAF0B4 80241774 A443008E */ sh $v1, 0x8e($v0) -/* BAF0B8 80241778 00031C00 */ sll $v1, $v1, 0x10 -/* BAF0BC 8024177C 1C600003 */ bgtz $v1, .L8024178C -/* BAF0C0 80241780 2402000C */ addiu $v0, $zero, 0xc -/* BAF0C4 80241784 AE00006C */ sw $zero, 0x6c($s0) -/* BAF0C8 80241788 AE220070 */ sw $v0, 0x70($s1) -.L8024178C: -/* BAF0CC 8024178C 8FBF0018 */ lw $ra, 0x18($sp) -/* BAF0D0 80241790 8FB10014 */ lw $s1, 0x14($sp) -/* BAF0D4 80241794 8FB00010 */ lw $s0, 0x10($sp) -/* BAF0D8 80241798 03E00008 */ jr $ra -/* BAF0DC 8024179C 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 dc42dc41ab..826891bada 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 @@ -165,7 +165,7 @@ glabel func_80241BB4_BAF4F4 /* BAF75C 80241E1C 24020021 */ addiu $v0, $zero, 0x21 /* BAF760 80241E20 14620007 */ bne $v1, $v0, .L80241E40 /* BAF764 80241E24 00000000 */ nop -/* BAF768 80241E28 0C0905D3 */ jal func_8024174C_BAF08C +/* BAF768 80241E28 0C0905D3 */ jal UnkNpcAIFunc5 /* BAF76C 80241E2C 0240202D */ daddu $a0, $s2, $zero /* BAF770 80241E30 08090790 */ j .L80241E40 /* BAF774 80241E34 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241F64_D8F1B4.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241F64_D8F1B4.s deleted file mode 100644 index be2e74f077..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241F64_D8F1B4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F64_D8F1B4 -/* D8F1B4 80241F64 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8F1B8 80241F68 AFB10014 */ sw $s1, 0x14($sp) -/* D8F1BC 80241F6C 0080882D */ daddu $s1, $a0, $zero -/* D8F1C0 80241F70 AFBF0018 */ sw $ra, 0x18($sp) -/* D8F1C4 80241F74 AFB00010 */ sw $s0, 0x10($sp) -/* D8F1C8 80241F78 8E300148 */ lw $s0, 0x148($s1) -/* D8F1CC 80241F7C 0C00EABB */ jal get_npc_unsafe -/* D8F1D0 80241F80 86040008 */ lh $a0, 8($s0) -/* D8F1D4 80241F84 9443008E */ lhu $v1, 0x8e($v0) -/* D8F1D8 80241F88 2463FFFF */ addiu $v1, $v1, -1 -/* D8F1DC 80241F8C A443008E */ sh $v1, 0x8e($v0) -/* D8F1E0 80241F90 00031C00 */ sll $v1, $v1, 0x10 -/* D8F1E4 80241F94 1C600003 */ bgtz $v1, .L80241FA4 -/* D8F1E8 80241F98 2402000C */ addiu $v0, $zero, 0xc -/* D8F1EC 80241F9C AE00006C */ sw $zero, 0x6c($s0) -/* D8F1F0 80241FA0 AE220070 */ sw $v0, 0x70($s1) -.L80241FA4: -/* D8F1F4 80241FA4 8FBF0018 */ lw $ra, 0x18($sp) -/* D8F1F8 80241FA8 8FB10014 */ lw $s1, 0x14($sp) -/* D8F1FC 80241FAC 8FB00010 */ lw $s0, 0x10($sp) -/* D8F200 80241FB0 03E00008 */ jr $ra -/* D8F204 80241FB4 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 ffd9eba4fa..885eea49f5 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 @@ -171,7 +171,7 @@ glabel func_802423CC_D8F61C /* D8F89C 8024264C 24020021 */ addiu $v0, $zero, 0x21 /* D8F8A0 80242650 14620007 */ bne $v1, $v0, .L80242670 /* D8F8A4 80242654 00000000 */ nop -/* D8F8A8 80242658 0C0907D9 */ jal func_80241F64_D8F1B4 +/* D8F8A8 80242658 0C0907D9 */ jal UnkNpcAIFunc5 /* D8F8AC 8024265C 0240202D */ daddu $a0, $s2, $zero /* D8F8B0 80242660 0809099C */ j .L80242670 /* D8F8B4 80242664 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s index 8295349d85..e7dd488247 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 @@ -165,7 +165,7 @@ glabel func_80242698_D8F8E8 /* D8FB50 80242900 24020021 */ addiu $v0, $zero, 0x21 /* D8FB54 80242904 14620007 */ bne $v1, $v0, .L80242924 /* D8FB58 80242908 00000000 */ nop -/* D8FB5C 8024290C 0C0907D9 */ jal func_80241F64_D8F1B4 +/* D8FB5C 8024290C 0C0907D9 */ jal UnkNpcAIFunc5 /* D8FB60 80242910 0240202D */ daddu $a0, $s2, $zero /* D8FB64 80242914 08090A49 */ j .L80242924 /* D8FB68 80242918 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241104_D94044.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241104_D94044.s deleted file mode 100644 index b8631d76cc..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241104_D94044.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241104_D94044 -/* D94044 80241104 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D94048 80241108 AFB10014 */ sw $s1, 0x14($sp) -/* D9404C 8024110C 0080882D */ daddu $s1, $a0, $zero -/* D94050 80241110 AFBF0018 */ sw $ra, 0x18($sp) -/* D94054 80241114 AFB00010 */ sw $s0, 0x10($sp) -/* D94058 80241118 8E300148 */ lw $s0, 0x148($s1) -/* D9405C 8024111C 0C00EABB */ jal get_npc_unsafe -/* D94060 80241120 86040008 */ lh $a0, 8($s0) -/* D94064 80241124 9443008E */ lhu $v1, 0x8e($v0) -/* D94068 80241128 2463FFFF */ addiu $v1, $v1, -1 -/* D9406C 8024112C A443008E */ sh $v1, 0x8e($v0) -/* D94070 80241130 00031C00 */ sll $v1, $v1, 0x10 -/* D94074 80241134 1C600003 */ bgtz $v1, .L80241144 -/* D94078 80241138 2402000C */ addiu $v0, $zero, 0xc -/* D9407C 8024113C AE00006C */ sw $zero, 0x6c($s0) -/* D94080 80241140 AE220070 */ sw $v0, 0x70($s1) -.L80241144: -/* D94084 80241144 8FBF0018 */ lw $ra, 0x18($sp) -/* D94088 80241148 8FB10014 */ lw $s1, 0x14($sp) -/* D9408C 8024114C 8FB00010 */ lw $s0, 0x10($sp) -/* D94090 80241150 03E00008 */ jr $ra -/* D94094 80241154 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 2fb7575cf5..ec36b69d7f 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 @@ -165,7 +165,7 @@ glabel func_8024156C_D944AC /* D94714 802417D4 24020021 */ addiu $v0, $zero, 0x21 /* D94718 802417D8 14620007 */ bne $v1, $v0, .L802417F8 /* D9471C 802417DC 00000000 */ nop -/* D94720 802417E0 0C090441 */ jal func_80241104_D94044 +/* D94720 802417E0 0C090441 */ jal UnkNpcAIFunc5 /* D94724 802417E4 0240202D */ daddu $a0, $s2, $zero /* D94728 802417E8 080905FE */ j .L802417F8 /* D9472C 802417EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240204_D112C4.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240204_D112C4.s deleted file mode 100644 index 610e5cb35c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240204_D112C4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240204_D112C4 -/* D112C4 80240204 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D112C8 80240208 AFB10014 */ sw $s1, 0x14($sp) -/* D112CC 8024020C 0080882D */ daddu $s1, $a0, $zero -/* D112D0 80240210 AFBF0018 */ sw $ra, 0x18($sp) -/* D112D4 80240214 AFB00010 */ sw $s0, 0x10($sp) -/* D112D8 80240218 8E300148 */ lw $s0, 0x148($s1) -/* D112DC 8024021C 0C00EABB */ jal get_npc_unsafe -/* D112E0 80240220 86040008 */ lh $a0, 8($s0) -/* D112E4 80240224 9443008E */ lhu $v1, 0x8e($v0) -/* D112E8 80240228 2463FFFF */ addiu $v1, $v1, -1 -/* D112EC 8024022C A443008E */ sh $v1, 0x8e($v0) -/* D112F0 80240230 00031C00 */ sll $v1, $v1, 0x10 -/* D112F4 80240234 1C600003 */ bgtz $v1, .L80240244 -/* D112F8 80240238 2402000C */ addiu $v0, $zero, 0xc -/* D112FC 8024023C AE00006C */ sw $zero, 0x6c($s0) -/* D11300 80240240 AE220070 */ sw $v0, 0x70($s1) -.L80240244: -/* D11304 80240244 8FBF0018 */ lw $ra, 0x18($sp) -/* D11308 80240248 8FB10014 */ lw $s1, 0x14($sp) -/* D1130C 8024024C 8FB00010 */ lw $s0, 0x10($sp) -/* D11310 80240250 03E00008 */ jr $ra -/* D11314 80240254 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 d6751735ee..00c96795ce 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 @@ -165,7 +165,7 @@ glabel func_8024066C_D1172C /* D11994 802408D4 24020021 */ addiu $v0, $zero, 0x21 /* D11998 802408D8 14620007 */ bne $v1, $v0, .L802408F8 /* D1199C 802408DC 00000000 */ nop -/* D119A0 802408E0 0C090081 */ jal func_80240204_D112C4 +/* D119A0 802408E0 0C090081 */ jal UnkNpcAIFunc5 /* D119A4 802408E4 0240202D */ daddu $a0, $s2, $zero /* D119A8 802408E8 0809023E */ j .L802408F8 /* D119AC 802408EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802401B4_D18994.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802401B4_D18994.s deleted file mode 100644 index 4489c865bb..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802401B4_D18994.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4_D18994 -/* D18994 802401B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D18998 802401B8 AFB10014 */ sw $s1, 0x14($sp) -/* D1899C 802401BC 0080882D */ daddu $s1, $a0, $zero -/* D189A0 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* D189A4 802401C4 AFB00010 */ sw $s0, 0x10($sp) -/* D189A8 802401C8 8E300148 */ lw $s0, 0x148($s1) -/* D189AC 802401CC 0C00EABB */ jal get_npc_unsafe -/* D189B0 802401D0 86040008 */ lh $a0, 8($s0) -/* D189B4 802401D4 9443008E */ lhu $v1, 0x8e($v0) -/* D189B8 802401D8 2463FFFF */ addiu $v1, $v1, -1 -/* D189BC 802401DC A443008E */ sh $v1, 0x8e($v0) -/* D189C0 802401E0 00031C00 */ sll $v1, $v1, 0x10 -/* D189C4 802401E4 1C600003 */ bgtz $v1, .L802401F4 -/* D189C8 802401E8 2402000C */ addiu $v0, $zero, 0xc -/* D189CC 802401EC AE00006C */ sw $zero, 0x6c($s0) -/* D189D0 802401F0 AE220070 */ sw $v0, 0x70($s1) -.L802401F4: -/* D189D4 802401F4 8FBF0018 */ lw $ra, 0x18($sp) -/* D189D8 802401F8 8FB10014 */ lw $s1, 0x14($sp) -/* D189DC 802401FC 8FB00010 */ lw $s0, 0x10($sp) -/* D189E0 80240200 03E00008 */ jr $ra -/* D189E4 80240204 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 231b0e26b4..16354ea822 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 @@ -165,7 +165,7 @@ glabel func_8024061C_D18DFC /* D19064 80240884 24020021 */ addiu $v0, $zero, 0x21 /* D19068 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* D1906C 8024088C 00000000 */ nop -/* D19070 80240890 0C09006D */ jal func_802401B4_D18994 +/* D19070 80240890 0C09006D */ jal UnkNpcAIFunc5 /* D19074 80240894 0240202D */ daddu $a0, $s2, $zero /* D19078 80240898 0809022A */ j .L802408A8 /* D1907C 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240804_D2C534.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240804_D2C534.s deleted file mode 100644 index 1bcfe1428d..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240804_D2C534.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240804_D2C534 -/* D2C534 80240804 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D2C538 80240808 AFB10014 */ sw $s1, 0x14($sp) -/* D2C53C 8024080C 0080882D */ daddu $s1, $a0, $zero -/* D2C540 80240810 AFBF0018 */ sw $ra, 0x18($sp) -/* D2C544 80240814 AFB00010 */ sw $s0, 0x10($sp) -/* D2C548 80240818 8E300148 */ lw $s0, 0x148($s1) -/* D2C54C 8024081C 0C00EABB */ jal get_npc_unsafe -/* D2C550 80240820 86040008 */ lh $a0, 8($s0) -/* D2C554 80240824 9443008E */ lhu $v1, 0x8e($v0) -/* D2C558 80240828 2463FFFF */ addiu $v1, $v1, -1 -/* D2C55C 8024082C A443008E */ sh $v1, 0x8e($v0) -/* D2C560 80240830 00031C00 */ sll $v1, $v1, 0x10 -/* D2C564 80240834 1C600003 */ bgtz $v1, .L80240844 -/* D2C568 80240838 2402000C */ addiu $v0, $zero, 0xc -/* D2C56C 8024083C AE00006C */ sw $zero, 0x6c($s0) -/* D2C570 80240840 AE220070 */ sw $v0, 0x70($s1) -.L80240844: -/* D2C574 80240844 8FBF0018 */ lw $ra, 0x18($sp) -/* D2C578 80240848 8FB10014 */ lw $s1, 0x14($sp) -/* D2C57C 8024084C 8FB00010 */ lw $s0, 0x10($sp) -/* D2C580 80240850 03E00008 */ jr $ra -/* D2C584 80240854 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 64be16f42f..1c7e4df73c 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 @@ -165,7 +165,7 @@ glabel func_80240C6C_D2C99C /* D2CC04 80240ED4 24020021 */ addiu $v0, $zero, 0x21 /* D2CC08 80240ED8 14620007 */ bne $v1, $v0, .L80240EF8 /* D2CC0C 80240EDC 00000000 */ nop -/* D2CC10 80240EE0 0C090201 */ jal func_80240804_D2C534 +/* D2CC10 80240EE0 0C090201 */ jal UnkNpcAIFunc5 /* D2CC14 80240EE4 0240202D */ daddu $a0, $s2, $zero /* D2CC18 80240EE8 080903BE */ j .L80240EF8 /* D2CC1C 80240EEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240EF4_D30B74.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240EF4_D30B74.s deleted file mode 100644 index 62c3f256c6..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240EF4_D30B74.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EF4_D30B74 -/* D30B74 80240EF4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D30B78 80240EF8 AFB10014 */ sw $s1, 0x14($sp) -/* D30B7C 80240EFC 0080882D */ daddu $s1, $a0, $zero -/* D30B80 80240F00 AFBF0018 */ sw $ra, 0x18($sp) -/* D30B84 80240F04 AFB00010 */ sw $s0, 0x10($sp) -/* D30B88 80240F08 8E300148 */ lw $s0, 0x148($s1) -/* D30B8C 80240F0C 0C00EABB */ jal get_npc_unsafe -/* D30B90 80240F10 86040008 */ lh $a0, 8($s0) -/* D30B94 80240F14 9443008E */ lhu $v1, 0x8e($v0) -/* D30B98 80240F18 2463FFFF */ addiu $v1, $v1, -1 -/* D30B9C 80240F1C A443008E */ sh $v1, 0x8e($v0) -/* D30BA0 80240F20 00031C00 */ sll $v1, $v1, 0x10 -/* D30BA4 80240F24 1C600003 */ bgtz $v1, .L80240F34 -/* D30BA8 80240F28 2402000C */ addiu $v0, $zero, 0xc -/* D30BAC 80240F2C AE00006C */ sw $zero, 0x6c($s0) -/* D30BB0 80240F30 AE220070 */ sw $v0, 0x70($s1) -.L80240F34: -/* D30BB4 80240F34 8FBF0018 */ lw $ra, 0x18($sp) -/* D30BB8 80240F38 8FB10014 */ lw $s1, 0x14($sp) -/* D30BBC 80240F3C 8FB00010 */ lw $s0, 0x10($sp) -/* D30BC0 80240F40 03E00008 */ jr $ra -/* D30BC4 80240F44 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 a0cb09f033..7720168fea 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 @@ -165,7 +165,7 @@ glabel func_8024135C_D30FDC /* D31244 802415C4 24020021 */ addiu $v0, $zero, 0x21 /* D31248 802415C8 14620007 */ bne $v1, $v0, .L802415E8 /* D3124C 802415CC 00000000 */ nop -/* D31250 802415D0 0C0903BD */ jal func_80240EF4_D30B74 +/* D31250 802415D0 0C0903BD */ jal UnkNpcAIFunc5 /* D31254 802415D4 0240202D */ daddu $a0, $s2, $zero /* D31258 802415D8 0809057A */ j .L802415E8 /* D3125C 802415DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_80240584_D37D84.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_80240584_D37D84.s deleted file mode 100644 index f46cf2deef..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_80240584_D37D84.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240584_D37D84 -/* D37D84 80240584 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D37D88 80240588 AFB10014 */ sw $s1, 0x14($sp) -/* D37D8C 8024058C 0080882D */ daddu $s1, $a0, $zero -/* D37D90 80240590 AFBF0018 */ sw $ra, 0x18($sp) -/* D37D94 80240594 AFB00010 */ sw $s0, 0x10($sp) -/* D37D98 80240598 8E300148 */ lw $s0, 0x148($s1) -/* D37D9C 8024059C 0C00EABB */ jal get_npc_unsafe -/* D37DA0 802405A0 86040008 */ lh $a0, 8($s0) -/* D37DA4 802405A4 9443008E */ lhu $v1, 0x8e($v0) -/* D37DA8 802405A8 2463FFFF */ addiu $v1, $v1, -1 -/* D37DAC 802405AC A443008E */ sh $v1, 0x8e($v0) -/* D37DB0 802405B0 00031C00 */ sll $v1, $v1, 0x10 -/* D37DB4 802405B4 1C600003 */ bgtz $v1, .L802405C4 -/* D37DB8 802405B8 2402000C */ addiu $v0, $zero, 0xc -/* D37DBC 802405BC AE00006C */ sw $zero, 0x6c($s0) -/* D37DC0 802405C0 AE220070 */ sw $v0, 0x70($s1) -.L802405C4: -/* D37DC4 802405C4 8FBF0018 */ lw $ra, 0x18($sp) -/* D37DC8 802405C8 8FB10014 */ lw $s1, 0x14($sp) -/* D37DCC 802405CC 8FB00010 */ lw $s0, 0x10($sp) -/* D37DD0 802405D0 03E00008 */ jr $ra -/* D37DD4 802405D4 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 ccb86f4505..6fd10aedb5 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 @@ -165,7 +165,7 @@ glabel func_802409EC_D381EC /* D38454 80240C54 24020021 */ addiu $v0, $zero, 0x21 /* D38458 80240C58 14620007 */ bne $v1, $v0, .L80240C78 /* D3845C 80240C5C 00000000 */ nop -/* D38460 80240C60 0C090161 */ jal func_80240584_D37D84 +/* D38460 80240C60 0C090161 */ jal UnkNpcAIFunc5 /* D38464 80240C64 0240202D */ daddu $a0, $s2, $zero /* D38468 80240C68 0809031E */ j .L80240C78 /* D3846C 80240C6C 00000000 */ nop diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c index 1d3edc48ab..a08623e691 100644 --- a/src/world/area_dgb/dgb_02/C2EBA0.c +++ b/src/world/area_dgb/dgb_02/C2EBA0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_8024006C_C2EC0C); INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_802400DC_C2EC7C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_802401B4_C2ED54); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_80240208_C2EDA8); diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index eb8f5fcd1e..983b14c6b4 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802402BC_C3179C); INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024032C_C3180C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240404_C318E4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240458_C31938); diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index 1e15f895b6..668c9de1a7 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_802400CC_C3AADC); INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_8024013C_C3AB4C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240214_C3AC24); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240268_C3AC78); diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index 03a487d6eb..26eb3437fc 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_8024006C_C3DC5C); INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_802400DC_C3DCCC); -INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_802401B4_C3DDA4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_80240208_C3DDF8); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index ee565ac924..614acf7ef7 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240EFC_C40CAC); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240F6C_C40D1C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241044_C40DF4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241098_C40E48); diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 5615d9b7f9..d15fce289d 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_8024006C_C46C4C); INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802400DC_C46CBC); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802401B4_C46D94); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80240208_C46DE8); diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index b0d742db14..69b3f5c6b7 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_8024006C_C4F57C); INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802400DC_C4F5EC); -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802401B4_C4F6C4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240208_C4F718); diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c index ab78e0ba16..1a2eb4195b 100644 --- a/src/world/area_dgb/dgb_16/C52540.c +++ b/src/world/area_dgb/dgb_16/C52540.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_8024006C_C525AC); INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_802400DC_C5261C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_802401B4_C526F4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_80240208_C52748); diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index 1c9d2cbf9b..eb5767928f 100644 --- a/src/world/area_jan/jan_05/B4B260.c +++ b/src/world/area_jan/jan_05/B4B260.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241938_B4C3A8); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802419A8_B4C418); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241A80_B4C4F0); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241AD4_B4C544); diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index 83d5459a3c..00fc85d828 100644 --- a/src/world/area_jan/jan_06/B52F70.c +++ b/src/world/area_jan/jan_06/B52F70.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241888_B540B8); INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802418F8_B54128); -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802419D0_B54200); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241A24_B54254); diff --git a/src/world/area_jan/jan_07/B59870.c b/src/world/area_jan/jan_07/B59870.c index 4d560d5953..df0250c8f0 100644 --- a/src/world/area_jan/jan_07/B59870.c +++ b/src/world/area_jan/jan_07/B59870.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240280_B59AF0); INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_802402F0_B59B60); -INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_802403C8_B59C38); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_8024041C_B59C8C); diff --git a/src/world/area_jan/jan_08/B5F650.c b/src/world/area_jan/jan_08/B5F650.c index e033a7283e..d14dd6f9d4 100644 --- a/src/world/area_jan/jan_08/B5F650.c +++ b/src/world/area_jan/jan_08/B5F650.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802416D4_B5F984); INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241744_B5F9F4); -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_8024181C_B5FACC); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241870_B5FB20); diff --git a/src/world/area_jan/jan_09/B663F0.c b/src/world/area_jan/jan_09/B663F0.c index cbc265bd39..be1026a5f6 100644 --- a/src/world/area_jan/jan_09/B663F0.c +++ b/src/world/area_jan/jan_09/B663F0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240BC0_B66670); INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240C30_B666E0); -INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240D08_B667B8); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240D5C_B6680C); diff --git a/src/world/area_jan/jan_12/B73570.c b/src/world/area_jan/jan_12/B73570.c index 3d19edcc5d..5ba99dea1b 100644 --- a/src/world/area_jan/jan_12/B73570.c +++ b/src/world/area_jan/jan_12/B73570.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240740_B737F0); INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_802407B0_B73860); -INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240888_B73938); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_802408DC_B7398C); diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index b2cb5277dd..f77197123e 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240C64_C61974); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240CD4_C619E4); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240DAC_C61ABC); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240E00_C61B10); diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index 4da8f413c2..5c79eb3c55 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802425A8_C73A28); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242618_C73A98); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802426F0_C73B70); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242744_C73BC4); diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index 164f44ffc3..8d6d718e93 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024108C_C77D6C); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802410FC_C77DDC); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802411D4_C77EB4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80241228_C77F08); diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index e68df3323c..99b5634407 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_8024037C_C85E2C); INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_802403EC_C85E9C); -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_802404C4_C85F74); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80240518_C85FC8); diff --git a/src/world/area_mim/mim_01/B93940.c b/src/world/area_mim/mim_01/B93940.c index 6447c82950..735176cdfb 100644 --- a/src/world/area_mim/mim_01/B93940.c +++ b/src/world/area_mim/mim_01/B93940.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_8024056C_B939AC); INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_802405DC_B93A1C); -INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_802406B4_B93AF4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80240708_B93B48); diff --git a/src/world/area_mim/mim_05/BA07A0.c b/src/world/area_mim/mim_05/BA07A0.c index a9d4037fc1..a8025dc999 100644 --- a/src/world/area_mim/mim_05/BA07A0.c +++ b/src/world/area_mim/mim_05/BA07A0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_802400DC_BA080C); INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_8024014C_BA087C); -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80240224_BA0954); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80240278_BA09A8); diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c index 51e18ba938..bbb60332fa 100644 --- a/src/world/area_mim/mim_06/BA4CF0.c +++ b/src/world/area_mim/mim_06/BA4CF0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_802405DC_BA4D5C); INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_8024064C_BA4DCC); -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240724_BA4EA4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240778_BA4EF8); diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index 293d63460f..4fdfaa6c43 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241604_BAEF44); INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241674_BAEFB4); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_8024174C_BAF08C); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_802417A0_BAF0E0); diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index 9f767698dc..f8a23c4850 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -56,7 +56,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241E1C_D8F06C); INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241E8C_D8F0DC); -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241F64_D8F1B4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241FB8_D8F208); diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c index 420e7260ef..0d5cbab7c6 100644 --- a/src/world/area_pra/pra_37/D92F40.c +++ b/src/world/area_pra/pra_37/D92F40.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240FBC_D93EFC); INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_8024102C_D93F6C); -INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80241104_D94044); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80241158_D94098); diff --git a/src/world/area_sam/sam_03/D110C0.c b/src/world/area_sam/sam_03/D110C0.c index a57a0b0626..bed6b4f078 100644 --- a/src/world/area_sam/sam_03/D110C0.c +++ b/src/world/area_sam/sam_03/D110C0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_802400BC_D1117C); INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_8024012C_D111EC); -INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_80240204_D112C4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_80240258_D11318); diff --git a/src/world/area_sam/sam_05/D187E0.c b/src/world/area_sam/sam_05/D187E0.c index 5203915cb8..056cb987a7 100644 --- a/src/world/area_sam/sam_05/D187E0.c +++ b/src/world/area_sam/sam_05/D187E0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_8024006C_D1884C); INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_802400DC_D188BC); -INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_802401B4_D18994); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80240208_D189E8); diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c index 4a0ca9b280..5536895428 100644 --- a/src/world/area_sam/sam_07/D2BD30.c +++ b/src/world/area_sam/sam_07/D2BD30.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802406BC_D2C3EC); INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_8024072C_D2C45C); -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240804_D2C534); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240858_D2C588); diff --git a/src/world/area_sam/sam_08/D309C0.c b/src/world/area_sam/sam_08/D309C0.c index 4da62fb126..c66feacfa4 100644 --- a/src/world/area_sam/sam_08/D309C0.c +++ b/src/world/area_sam/sam_08/D309C0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240DAC_D30A2C); INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240E1C_D30A9C); -INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240EF4_D30B74); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240F48_D30BC8); diff --git a/src/world/area_sam/sam_10/D37BD0.c b/src/world/area_sam/sam_10/D37BD0.c index b023063615..135aa563ef 100644 --- a/src/world/area_sam/sam_10/D37BD0.c +++ b/src/world/area_sam/sam_10/D37BD0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_10/D37BD0", func_8024043C_D37C3C); INCLUDE_ASM(s32, "world/area_sam/sam_10/D37BD0", func_802404AC_D37CAC); -INCLUDE_ASM(s32, "world/area_sam/sam_10/D37BD0", func_80240584_D37D84); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_10/D37BD0", func_802405D8_D37DD8); diff --git a/src/world/common/UnkNpcAIFunc5.inc.c b/src/world/common/UnkNpcAIFunc5.inc.c new file mode 100644 index 0000000000..b4c508ec8d --- /dev/null +++ b/src/world/common/UnkNpcAIFunc5.inc.c @@ -0,0 +1,13 @@ +#include "common.h" +#include "map.h" + +static void UnkNpcAIFunc5(ScriptInstance* script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if ((npc->duration << 0x10) <= 0) { + enemy->varTable[0] = 0; + script->functionTemp[0].s = 12; + } +} diff --git a/tools/substitute.py b/tools/substitute.py index 07bdc0eaea..2cc8af2a1d 100755 --- a/tools/substitute.py +++ b/tools/substitute.py @@ -7,7 +7,7 @@ import re script_dir = os.path.dirname(os.path.realpath(__file__)) root_dir = script_dir + "/../" src_dir = root_dir + "src/" - +asm_dir = root_dir + "asm/" parser = argparse.ArgumentParser(description="Replace many functions with one") parser.add_argument("from_list", help="path to line-separated file of functions to be replaced. first line is the string to replace them with") @@ -20,6 +20,7 @@ with open(args.from_list) as f: from_text = f.readlines() to_line = from_text[0].strip() +func_name = to_line[to_line.rfind("/") + 1:to_line.find(".")] for from_line in from_text[1:]: if len(from_line.strip()) > 0: @@ -40,3 +41,16 @@ for root, dirs, files in os.walk(src_dir): with open(f_path, "w", newline="\n") as f: f.write(f_text) +for root, dirs, files in os.walk(asm_dir): + for f_name in files: + if f_name.endswith(".s"): + f_path = os.path.join(root, f_name) + with open(f_path) as f: + f_text_orig = f.read() + + f_text = f_text_orig + for func in from_funcs: + f_text = f_text.replace(func, func_name) + if f_text != f_text_orig: + with open(f_path, "w", newline="\n") as f: + f.write(f_text) diff --git a/tools/substitute_asm.py b/tools/substitute_asm.py deleted file mode 100755 index 9f92ce2cb5..0000000000 --- a/tools/substitute_asm.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/python3 - -import argparse -import os -import re - -script_dir = os.path.dirname(os.path.realpath(__file__)) -root_dir = script_dir + "/../" -asm_dir = root_dir + "asm/" - - -parser = argparse.ArgumentParser(description="Replace many functions with one") -parser.add_argument("from_list", help="path to line-separated file of functions to be replaced. first line is the string to replace them with") - -args = parser.parse_args() - -from_funcs = [] - -with open(args.from_list) as f: - from_text = f.readlines() - -to_line = from_text[0].strip() - -for from_line in from_text[1:]: - if len(from_line.strip()) > 0: - from_funcs.append(from_line.rstrip().split(" ")[-1]) - -for root, dirs, files in os.walk(asm_dir): - for f_name in files: - if f_name.endswith(".s"): - f_path = os.path.join(root, f_name) - with open(f_path) as f: - f_text_orig = f.read() - - f_text = f_text_orig - for func in from_funcs: - f_text = f_text.replace(func, to_line) - if f_text != f_text_orig: - with open(f_path, "w", newline="\n") as f: - f.write(f_text) - From 1cdf9d7c7cdd67e4271b66c61aa4761ddcb87baf Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 21 Nov 2020 23:41:28 -0500 Subject: [PATCH 18/38] UnkNpcAIFunc6 --- .../dgb_02/C2EBA0/func_80240000_C2EBA0.s | 32 ------------------- .../dgb_02/C2EBA0/func_8024061C_C2F1BC.s | 2 +- .../dgb_02/C2EBA0/func_802410D4_C2FC74.s | 2 +- .../dgb_03/C31730/func_80240250_C31730.s | 32 ------------------- .../dgb_03/C31730/func_8024086C_C31D4C.s | 2 +- .../dgb_03/C31730/func_802419B0_C32E90.s | 2 +- .../dgb_03/C31730/func_80242480_C33960.s | 2 +- .../dgb_05/C3AA10/func_80240060_C3AA70.s | 32 ------------------- .../dgb_05/C3AA10/func_80240E80_C3B890.s | 2 +- .../dgb_05/C3AA10/func_802411D0_C3BBE0.s | 2 +- .../dgb_07/C3DBF0/func_80240000_C3DBF0.s | 32 ------------------- .../dgb_07/C3DBF0/func_80240E20_C3EA10.s | 2 +- .../dgb_07/C3DBF0/func_80241170_C3ED60.s | 2 +- .../dgb_08/C3FDB0/func_80240E90_C40C40.s | 32 ------------------- .../dgb_08/C3FDB0/func_802414AC_C4125C.s | 2 +- .../dgb_09/C46BE0/func_80240000_C46BE0.s | 32 ------------------- .../dgb_09/C46BE0/func_8024061C_C471FC.s | 2 +- .../dgb_09/C46BE0/func_802410D4_C47CB4.s | 2 +- .../dgb_15/C4F510/func_80240000_C4F510.s | 32 ------------------- .../dgb_15/C4F510/func_8024061C_C4FB2C.s | 2 +- .../dgb_16/C52540/func_80240000_C52540.s | 32 ------------------- .../dgb_16/C52540/func_80240E20_C53360.s | 2 +- .../dgb_16/C52540/func_80241170_C536B0.s | 2 +- .../jan_05/B4B260/func_802418CC_B4C33C.s | 32 ------------------- .../jan_05/B4B260/func_80241EE8_B4C958.s | 2 +- .../jan_05/B4B260/func_8024219C_B4CC0C.s | 2 +- .../jan_06/B52F70/func_8024181C_B5404C.s | 32 ------------------- .../jan_06/B52F70/func_80241E38_B54668.s | 2 +- .../jan_06/B52F70/func_802420EC_B5491C.s | 2 +- .../jan_07/B59870/func_80240214_B59A84.s | 32 ------------------- .../jan_07/B59870/func_80240830_B5A0A0.s | 2 +- .../jan_07/B59870/func_80240AE4_B5A354.s | 2 +- .../jan_08/B5F650/func_80241668_B5F918.s | 32 ------------------- .../jan_08/B5F650/func_80241C84_B5FF34.s | 2 +- .../jan_08/B5F650/func_80241F38_B601E8.s | 2 +- .../jan_09/B663F0/func_80240B54_B66604.s | 32 ------------------- .../jan_09/B663F0/func_80241170_B66C20.s | 2 +- .../jan_09/B663F0/func_80241424_B66ED4.s | 2 +- .../jan_12/B73570/func_802406D4_B73784.s | 32 ------------------- .../jan_12/B73570/func_80240CF0_B73DA0.s | 2 +- .../jan_12/B73570/func_80240FA4_B74054.s | 2 +- .../kzn_03/C61020/func_80240BF8_C61908.s | 32 ------------------- .../kzn_03/C61020/func_80241214_C61F24.s | 2 +- .../kzn_08/C71ED0/func_8024253C_C739BC.s | 32 ------------------- .../kzn_08/C71ED0/func_80242B58_C73FD8.s | 2 +- .../kzn_09/C77D00/func_80241020_C77D00.s | 32 ------------------- .../kzn_09/C77D00/func_8024163C_C7831C.s | 2 +- .../kzn_17/C85DC0/func_80240310_C85DC0.s | 32 ------------------- .../kzn_17/C85DC0/func_8024092C_C863DC.s | 2 +- .../mim_01/B93940/func_80240500_B93940.s | 32 ------------------- .../mim_01/B93940/func_80240B1C_B93F5C.s | 2 +- .../mim_05/BA07A0/func_80240070_BA07A0.s | 32 ------------------- .../mim_05/BA07A0/func_8024068C_BA0DBC.s | 2 +- .../mim_06/BA4CF0/func_80240570_BA4CF0.s | 32 ------------------- .../mim_06/BA4CF0/func_80240B8C_BA530C.s | 2 +- .../mim_08/BAD940/func_80241598_BAEED8.s | 32 ------------------- .../mim_08/BAD940/func_80241BB4_BAF4F4.s | 2 +- .../pra_35/D8D270/func_80241DB0_D8F000.s | 32 ------------------- .../pra_35/D8D270/func_802423CC_D8F61C.s | 2 +- .../pra_35/D8D270/func_80242698_D8F8E8.s | 2 +- .../pra_37/D92F40/func_80240F50_D93E90.s | 32 ------------------- .../pra_37/D92F40/func_8024156C_D944AC.s | 2 +- .../sam_03/D110C0/func_80240050_D11110.s | 32 ------------------- .../sam_03/D110C0/func_8024066C_D1172C.s | 2 +- .../sam_05/D187E0/func_80240000_D187E0.s | 32 ------------------- .../sam_05/D187E0/func_8024061C_D18DFC.s | 2 +- .../sam_07/D2BD30/func_80240650_D2C380.s | 32 ------------------- .../sam_07/D2BD30/func_80240C6C_D2C99C.s | 2 +- .../sam_08/D309C0/func_80240D40_D309C0.s | 32 ------------------- .../sam_08/D309C0/func_8024135C_D30FDC.s | 2 +- .../sam_10/D37BD0/func_802403D0_D37BD0.s | 32 ------------------- .../sam_10/D37BD0/func_802409EC_D381EC.s | 2 +- src/world/area_dgb/dgb_02/C2EBA0.c | 2 +- src/world/area_dgb/dgb_03/C31730.c | 2 +- src/world/area_dgb/dgb_05/C3AA10.c | 2 +- src/world/area_dgb/dgb_07/C3DBF0.c | 2 +- src/world/area_dgb/dgb_08/C3FDB0.c | 2 +- src/world/area_dgb/dgb_09/C46BE0.c | 2 +- src/world/area_dgb/dgb_15/C4F510.c | 2 +- src/world/area_dgb/dgb_16/C52540.c | 2 +- src/world/area_jan/jan_05/B4B260.c | 2 +- src/world/area_jan/jan_06/B52F70.c | 2 +- src/world/area_jan/jan_07/B59870.c | 2 +- src/world/area_jan/jan_08/B5F650.c | 2 +- src/world/area_jan/jan_09/B663F0.c | 2 +- src/world/area_jan/jan_12/B73570.c | 2 +- src/world/area_kzn/kzn_03/C61020.c | 2 +- src/world/area_kzn/kzn_08/C71ED0.c | 2 +- src/world/area_kzn/kzn_09/C77D00.c | 2 +- src/world/area_kzn/kzn_17/C85DC0.c | 2 +- src/world/area_mim/mim_01/B93940.c | 2 +- src/world/area_mim/mim_05/BA07A0.c | 2 +- src/world/area_mim/mim_06/BA4CF0.c | 2 +- src/world/area_mim/mim_08/BAD940.c | 2 +- src/world/area_pra/pra_35/D8D270.c | 2 +- src/world/area_pra/pra_37/D92F40.c | 2 +- src/world/area_sam/sam_03/D110C0.c | 2 +- src/world/area_sam/sam_05/D187E0.c | 2 +- src/world/area_sam/sam_07/D2BD30.c | 2 +- src/world/area_sam/sam_08/D309C0.c | 2 +- src/world/area_sam/sam_10/D37BD0.c | 2 +- src/world/common/UnkNpcAIFunc6.inc.c | 15 +++++++++ 102 files changed, 87 insertions(+), 1000 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240000_C2EBA0.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240250_C31730.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240060_C3AA70.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240000_C3DBF0.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240E90_C40C40.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240000_C46BE0.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240000_C4F510.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240000_C52540.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802418CC_B4C33C.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_06/B52F70/func_8024181C_B5404C.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240214_B59A84.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241668_B5F918.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240B54_B66604.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_12/B73570/func_802406D4_B73784.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240BF8_C61908.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_8024253C_C739BC.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241020_C77D00.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240310_C85DC0.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240500_B93940.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240070_BA07A0.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240570_BA4CF0.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241598_BAEED8.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241DB0_D8F000.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240F50_D93E90.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240050_D11110.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240000_D187E0.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240650_D2C380.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240D40_D309C0.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802403D0_D37BD0.s create mode 100644 src/world/common/UnkNpcAIFunc6.inc.c 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; + } +} From d801c72075ce73897e744dc242def797e4c1335b Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 21 Nov 2020 23:47:41 -0500 Subject: [PATCH 19/38] UnkNpcAIFunc7 --- .../area_dgb/dgb_02/C2EBA0/func_8024006C_C2EC0C.s | 2 +- .../area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s | 2 +- .../area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s | 2 +- .../area_dgb/dgb_03/C31730/func_802402BC_C3179C.s | 2 +- .../area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s | 2 +- .../area_dgb/dgb_03/C31730/func_802419B0_C32E90.s | 2 +- .../area_dgb/dgb_03/C31730/func_80242480_C33960.s | 2 +- .../area_dgb/dgb_05/C3AA10/func_802400CC_C3AADC.s | 2 +- .../area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s | 2 +- .../area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s | 2 +- .../area_dgb/dgb_07/C3DBF0/func_8024006C_C3DC5C.s | 2 +- .../area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s | 2 +- .../area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s | 2 +- .../area_dgb/dgb_08/C3FDB0/func_80240EFC_C40CAC.s | 2 +- .../area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s | 2 +- .../area_dgb/dgb_09/C46BE0/func_8024006C_C46C4C.s | 2 +- .../area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s | 2 +- .../area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s | 2 +- .../area_dgb/dgb_15/C4F510/func_8024006C_C4F57C.s | 2 +- .../area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s | 2 +- .../area_dgb/dgb_16/C52540/func_8024006C_C525AC.s | 2 +- .../area_dgb/dgb_16/C52540/func_80240E20_C53360.s | 2 +- .../area_dgb/dgb_16/C52540/func_80241170_C536B0.s | 2 +- .../area_jan/jan_05/B4B260/func_80241EE8_B4C958.s | 2 +- .../area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s | 2 +- .../area_jan/jan_06/B52F70/func_80241888_B540B8.s | 2 +- .../area_jan/jan_06/B52F70/func_80241E38_B54668.s | 2 +- .../area_jan/jan_06/B52F70/func_802420EC_B5491C.s | 2 +- .../area_jan/jan_07/B59870/func_80240280_B59AF0.s | 2 +- .../area_jan/jan_07/B59870/func_80240830_B5A0A0.s | 2 +- .../area_jan/jan_07/B59870/func_80240AE4_B5A354.s | 2 +- .../area_jan/jan_08/B5F650/func_802416D4_B5F984.s | 2 +- .../area_jan/jan_08/B5F650/func_80241C84_B5FF34.s | 2 +- .../area_jan/jan_08/B5F650/func_80241F38_B601E8.s | 2 +- .../area_jan/jan_09/B663F0/func_80240BC0_B66670.s | 2 +- .../area_jan/jan_09/B663F0/func_80241170_B66C20.s | 2 +- .../area_jan/jan_09/B663F0/func_80241424_B66ED4.s | 2 +- .../area_jan/jan_12/B73570/func_80240740_B737F0.s | 2 +- .../area_jan/jan_12/B73570/func_80240CF0_B73DA0.s | 2 +- .../area_jan/jan_12/B73570/func_80240FA4_B74054.s | 2 +- .../area_kzn/kzn_03/C61020/func_80240C64_C61974.s | 2 +- .../area_kzn/kzn_03/C61020/func_80241214_C61F24.s | 2 +- .../area_kzn/kzn_08/C71ED0/func_802425A8_C73A28.s | 2 +- .../area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s | 2 +- .../area_kzn/kzn_09/C77D00/func_8024108C_C77D6C.s | 2 +- .../area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s | 2 +- .../area_kzn/kzn_17/C85DC0/func_8024037C_C85E2C.s | 2 +- .../area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s | 2 +- .../area_mim/mim_01/B93940/func_8024056C_B939AC.s | 2 +- .../area_mim/mim_01/B93940/func_80240B1C_B93F5C.s | 2 +- .../area_mim/mim_05/BA07A0/func_802400DC_BA080C.s | 2 +- .../area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s | 2 +- .../area_mim/mim_06/BA4CF0/func_802405DC_BA4D5C.s | 2 +- .../area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s | 2 +- .../area_mim/mim_08/BAD940/func_80241604_BAEF44.s | 2 +- .../area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s | 2 +- .../area_pra/pra_35/D8D270/func_80241E1C_D8F06C.s | 2 +- .../area_pra/pra_35/D8D270/func_802423CC_D8F61C.s | 2 +- .../area_pra/pra_35/D8D270/func_80242698_D8F8E8.s | 2 +- .../area_pra/pra_37/D92F40/func_80240FBC_D93EFC.s | 2 +- .../area_pra/pra_37/D92F40/func_8024156C_D944AC.s | 2 +- .../area_sam/sam_03/D110C0/func_802400BC_D1117C.s | 2 +- .../area_sam/sam_03/D110C0/func_8024066C_D1172C.s | 2 +- .../area_sam/sam_05/D187E0/func_8024006C_D1884C.s | 2 +- .../area_sam/sam_05/D187E0/func_8024061C_D18DFC.s | 2 +- .../area_sam/sam_07/D2BD30/func_802406BC_D2C3EC.s | 2 +- .../area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s | 2 +- .../area_sam/sam_08/D309C0/func_80240DAC_D30A2C.s | 2 +- .../area_sam/sam_08/D309C0/func_8024135C_D30FDC.s | 2 +- .../area_sam/sam_10/D37BD0/func_8024043C_D37C3C.s | 2 +- .../area_sam/sam_10/D37BD0/func_802409EC_D381EC.s | 2 +- src/world/area_dgb/dgb_02/C2EBA0.c | 2 +- src/world/area_dgb/dgb_03/C31730.c | 2 +- src/world/area_dgb/dgb_05/C3AA10.c | 2 +- src/world/area_dgb/dgb_07/C3DBF0.c | 2 +- src/world/area_dgb/dgb_08/C3FDB0.c | 2 +- src/world/area_dgb/dgb_09/C46BE0.c | 2 +- src/world/area_dgb/dgb_15/C4F510.c | 2 +- src/world/area_dgb/dgb_16/C52540.c | 2 +- src/world/area_jan/jan_05/B4B260.c | 2 +- src/world/area_jan/jan_06/B52F70.c | 2 +- src/world/area_jan/jan_07/B59870.c | 2 +- src/world/area_jan/jan_08/B5F650.c | 2 +- src/world/area_jan/jan_09/B663F0.c | 2 +- src/world/area_jan/jan_12/B73570.c | 2 +- src/world/area_kzn/kzn_03/C61020.c | 2 +- src/world/area_kzn/kzn_08/C71ED0.c | 2 +- src/world/area_kzn/kzn_09/C77D00.c | 2 +- src/world/area_kzn/kzn_17/C85DC0.c | 2 +- src/world/area_mim/mim_01/B93940.c | 2 +- src/world/area_mim/mim_05/BA07A0.c | 2 +- src/world/area_mim/mim_06/BA4CF0.c | 2 +- src/world/area_mim/mim_08/BAD940.c | 2 +- src/world/area_pra/pra_35/D8D270.c | 2 +- src/world/area_pra/pra_37/D92F40.c | 2 +- src/world/area_sam/sam_03/D110C0.c | 2 +- src/world/area_sam/sam_05/D187E0.c | 2 +- src/world/area_sam/sam_07/D2BD30.c | 2 +- src/world/area_sam/sam_08/D309C0.c | 2 +- src/world/area_sam/sam_10/D37BD0.c | 2 +- src/world/common/UnkNpcAIFunc7.inc.c | 15 +++++++++++++++ 101 files changed, 115 insertions(+), 100 deletions(-) create mode 100644 src/world/common/UnkNpcAIFunc7.inc.c diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024006C_C2EC0C.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024006C_C2EC0C.s index df3db0ebc5..a30f1edbdd 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024006C_C2EC0C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024006C_C2EC0C.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8024006C_C2EC0C +glabel UnkNpcAIFunc7 /* C2EC0C 8024006C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* C2EC10 80240070 AFB10014 */ sw $s1, 0x14($sp) /* C2EC14 80240074 0080882D */ daddu $s1, $a0, $zero 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 2c39e35e7a..75f8c30d2e 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 @@ -153,7 +153,7 @@ glabel func_8024061C_C2F1BC /* C2F3F4 80240854 00000000 */ nop /* C2F3F8 80240858 0C090000 */ jal UnkNpcAIFunc6 /* C2F3FC 8024085C 0240202D */ daddu $a0, $s2, $zero -/* C2F400 80240860 0C09001B */ jal func_8024006C_C2EC0C +/* C2F400 80240860 0C09001B */ jal UnkNpcAIFunc7 /* C2F404 80240864 0240202D */ daddu $a0, $s2, $zero /* C2F408 80240868 8E430070 */ lw $v1, 0x70($s2) /* C2F40C 8024086C 24020020 */ addiu $v0, $zero, 0x20 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 16b0a036e7..d9febe053a 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 @@ -174,7 +174,7 @@ glabel func_802410D4_C2FC74 /* C2FF00 80241360 2402001F */ addiu $v0, $zero, 0x1f /* C2FF04 80241364 14620025 */ bne $v1, $v0, .L802413FC /* C2FF08 80241368 00000000 */ nop -/* C2FF0C 8024136C 0C09001B */ jal func_8024006C_C2EC0C +/* C2FF0C 8024136C 0C09001B */ jal UnkNpcAIFunc7 /* C2FF10 80241370 0240202D */ daddu $a0, $s2, $zero /* C2FF14 80241374 8E430070 */ lw $v1, 0x70($s2) /* C2FF18 80241378 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802402BC_C3179C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802402BC_C3179C.s index c609d5bb5b..e5f1fd1252 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802402BC_C3179C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802402BC_C3179C.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802402BC_C3179C +glabel UnkNpcAIFunc7 /* C3179C 802402BC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* C317A0 802402C0 AFB10014 */ sw $s1, 0x14($sp) /* C317A4 802402C4 0080882D */ daddu $s1, $a0, $zero 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 faf1d5ee0e..a54d76ea41 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 @@ -153,7 +153,7 @@ glabel func_8024086C_C31D4C /* C31F84 80240AA4 00000000 */ nop /* C31F88 80240AA8 0C090094 */ jal UnkNpcAIFunc6 /* C31F8C 80240AAC 0240202D */ daddu $a0, $s2, $zero -/* C31F90 80240AB0 0C0900AF */ jal func_802402BC_C3179C +/* C31F90 80240AB0 0C0900AF */ jal UnkNpcAIFunc7 /* C31F94 80240AB4 0240202D */ daddu $a0, $s2, $zero /* C31F98 80240AB8 8E430070 */ lw $v1, 0x70($s2) /* C31F9C 80240ABC 24020020 */ addiu $v0, $zero, 0x20 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 0bbf765455..ad994a9d19 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 @@ -159,7 +159,7 @@ glabel func_802419B0_C32E90 /* C330E0 80241C00 00000000 */ nop /* C330E4 80241C04 0C090094 */ jal UnkNpcAIFunc6 /* C330E8 80241C08 0240202D */ daddu $a0, $s2, $zero -/* C330EC 80241C0C 0C0900AF */ jal func_802402BC_C3179C +/* C330EC 80241C0C 0C0900AF */ jal UnkNpcAIFunc7 /* C330F0 80241C10 0240202D */ daddu $a0, $s2, $zero /* C330F4 80241C14 8E430070 */ lw $v1, 0x70($s2) /* C330F8 80241C18 24020020 */ addiu $v0, $zero, 0x20 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 f9768a170d..fc99bca25f 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 @@ -174,7 +174,7 @@ glabel func_80242480_C33960 /* C33BEC 8024270C 2402001F */ addiu $v0, $zero, 0x1f /* C33BF0 80242710 14620025 */ bne $v1, $v0, .L802427A8 /* C33BF4 80242714 00000000 */ nop -/* C33BF8 80242718 0C0900AF */ jal func_802402BC_C3179C +/* C33BF8 80242718 0C0900AF */ jal UnkNpcAIFunc7 /* C33BFC 8024271C 0240202D */ daddu $a0, $s2, $zero /* C33C00 80242720 8E430070 */ lw $v1, 0x70($s2) /* C33C04 80242724 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802400CC_C3AADC.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802400CC_C3AADC.s index 17ad61f51f..fa0126ed39 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802400CC_C3AADC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802400CC_C3AADC.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802400CC_C3AADC +glabel UnkNpcAIFunc7 /* C3AADC 802400CC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* C3AAE0 802400D0 AFB10014 */ sw $s1, 0x14($sp) /* C3AAE4 802400D4 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s index 3525206df6..1db7e8175f 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 @@ -174,7 +174,7 @@ glabel func_80240E80_C3B890 /* C3BB1C 8024110C 2402001F */ addiu $v0, $zero, 0x1f /* C3BB20 80241110 14620025 */ bne $v1, $v0, .L802411A8 /* C3BB24 80241114 00000000 */ nop -/* C3BB28 80241118 0C090033 */ jal func_802400CC_C3AADC +/* C3BB28 80241118 0C090033 */ jal UnkNpcAIFunc7 /* C3BB2C 8024111C 0240202D */ daddu $a0, $s2, $zero /* C3BB30 80241120 8E430070 */ lw $v1, 0x70($s2) /* C3BB34 80241124 24020020 */ addiu $v0, $zero, 0x20 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 78d68309cf..5fc7efcb05 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 @@ -153,7 +153,7 @@ glabel func_802411D0_C3BBE0 /* C3BE18 80241408 00000000 */ nop /* C3BE1C 8024140C 0C090018 */ jal UnkNpcAIFunc6 /* C3BE20 80241410 0240202D */ daddu $a0, $s2, $zero -/* C3BE24 80241414 0C090033 */ jal func_802400CC_C3AADC +/* C3BE24 80241414 0C090033 */ jal UnkNpcAIFunc7 /* C3BE28 80241418 0240202D */ daddu $a0, $s2, $zero /* C3BE2C 8024141C 8E430070 */ lw $v1, 0x70($s2) /* C3BE30 80241420 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024006C_C3DC5C.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024006C_C3DC5C.s index 650d2d48f1..2b4d2174ef 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024006C_C3DC5C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024006C_C3DC5C.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8024006C_C3DC5C +glabel UnkNpcAIFunc7 /* C3DC5C 8024006C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* C3DC60 80240070 AFB10014 */ sw $s1, 0x14($sp) /* C3DC64 80240074 0080882D */ daddu $s1, $a0, $zero 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 92b1aed05f..1337142ed0 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 @@ -174,7 +174,7 @@ glabel func_80240E20_C3EA10 /* C3EC9C 802410AC 2402001F */ addiu $v0, $zero, 0x1f /* C3ECA0 802410B0 14620025 */ bne $v1, $v0, .L80241148 /* C3ECA4 802410B4 00000000 */ nop -/* C3ECA8 802410B8 0C09001B */ jal func_8024006C_C3DC5C +/* C3ECA8 802410B8 0C09001B */ jal UnkNpcAIFunc7 /* C3ECAC 802410BC 0240202D */ daddu $a0, $s2, $zero /* C3ECB0 802410C0 8E430070 */ lw $v1, 0x70($s2) /* C3ECB4 802410C4 24020020 */ addiu $v0, $zero, 0x20 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 8ca442ef6f..ec40049435 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 @@ -153,7 +153,7 @@ glabel func_80241170_C3ED60 /* C3EF98 802413A8 00000000 */ nop /* C3EF9C 802413AC 0C090000 */ jal UnkNpcAIFunc6 /* C3EFA0 802413B0 0240202D */ daddu $a0, $s2, $zero -/* C3EFA4 802413B4 0C09001B */ jal func_8024006C_C3DC5C +/* C3EFA4 802413B4 0C09001B */ jal UnkNpcAIFunc7 /* C3EFA8 802413B8 0240202D */ daddu $a0, $s2, $zero /* C3EFAC 802413BC 8E430070 */ lw $v1, 0x70($s2) /* C3EFB0 802413C0 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240EFC_C40CAC.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240EFC_C40CAC.s index 99f70ce678..314a07dfae 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240EFC_C40CAC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240EFC_C40CAC.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80240EFC_C40CAC +glabel UnkNpcAIFunc7 /* C40CAC 80240EFC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* C40CB0 80240F00 AFB10014 */ sw $s1, 0x14($sp) /* C40CB4 80240F04 0080882D */ daddu $s1, $a0, $zero 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 1c7db9b124..b8bcbec829 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 @@ -153,7 +153,7 @@ glabel func_802414AC_C4125C /* C41494 802416E4 00000000 */ nop /* C41498 802416E8 0C0903A4 */ jal UnkNpcAIFunc6 /* C4149C 802416EC 0240202D */ daddu $a0, $s2, $zero -/* C414A0 802416F0 0C0903BF */ jal func_80240EFC_C40CAC +/* C414A0 802416F0 0C0903BF */ jal UnkNpcAIFunc7 /* C414A4 802416F4 0240202D */ daddu $a0, $s2, $zero /* C414A8 802416F8 8E430070 */ lw $v1, 0x70($s2) /* C414AC 802416FC 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024006C_C46C4C.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024006C_C46C4C.s index 3e6e856ef3..d3ba5c5e07 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024006C_C46C4C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024006C_C46C4C.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8024006C_C46C4C +glabel UnkNpcAIFunc7 /* C46C4C 8024006C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* C46C50 80240070 AFB10014 */ sw $s1, 0x14($sp) /* C46C54 80240074 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s index 82ff184cce..1427006391 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 @@ -153,7 +153,7 @@ glabel func_8024061C_C471FC /* C47434 80240854 00000000 */ nop /* C47438 80240858 0C090000 */ jal UnkNpcAIFunc6 /* C4743C 8024085C 0240202D */ daddu $a0, $s2, $zero -/* C47440 80240860 0C09001B */ jal func_8024006C_C46C4C +/* C47440 80240860 0C09001B */ jal UnkNpcAIFunc7 /* C47444 80240864 0240202D */ daddu $a0, $s2, $zero /* C47448 80240868 8E430070 */ lw $v1, 0x70($s2) /* C4744C 8024086C 24020020 */ addiu $v0, $zero, 0x20 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 87736fe262..e072022b19 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 @@ -174,7 +174,7 @@ glabel func_802410D4_C47CB4 /* C47F40 80241360 2402001F */ addiu $v0, $zero, 0x1f /* C47F44 80241364 14620025 */ bne $v1, $v0, .L802413FC /* C47F48 80241368 00000000 */ nop -/* C47F4C 8024136C 0C09001B */ jal func_8024006C_C46C4C +/* C47F4C 8024136C 0C09001B */ jal UnkNpcAIFunc7 /* C47F50 80241370 0240202D */ daddu $a0, $s2, $zero /* C47F54 80241374 8E430070 */ lw $v1, 0x70($s2) /* C47F58 80241378 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024006C_C4F57C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024006C_C4F57C.s index e6ea1103f7..a685eb64fc 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024006C_C4F57C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024006C_C4F57C.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8024006C_C4F57C +glabel UnkNpcAIFunc7 /* C4F57C 8024006C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* C4F580 80240070 AFB10014 */ sw $s1, 0x14($sp) /* C4F584 80240074 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s index 98950f3736..47f6286eb9 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 @@ -153,7 +153,7 @@ glabel func_8024061C_C4FB2C /* C4FD64 80240854 00000000 */ nop /* C4FD68 80240858 0C090000 */ jal UnkNpcAIFunc6 /* C4FD6C 8024085C 0240202D */ daddu $a0, $s2, $zero -/* C4FD70 80240860 0C09001B */ jal func_8024006C_C4F57C +/* C4FD70 80240860 0C09001B */ jal UnkNpcAIFunc7 /* C4FD74 80240864 0240202D */ daddu $a0, $s2, $zero /* C4FD78 80240868 8E430070 */ lw $v1, 0x70($s2) /* C4FD7C 8024086C 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024006C_C525AC.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024006C_C525AC.s index 839fd0407b..4787e4b4d3 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024006C_C525AC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024006C_C525AC.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8024006C_C525AC +glabel UnkNpcAIFunc7 /* C525AC 8024006C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* C525B0 80240070 AFB10014 */ sw $s1, 0x14($sp) /* C525B4 80240074 0080882D */ daddu $s1, $a0, $zero 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 60a5de8a98..29e77b515c 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 @@ -174,7 +174,7 @@ glabel func_80240E20_C53360 /* C535EC 802410AC 2402001F */ addiu $v0, $zero, 0x1f /* C535F0 802410B0 14620025 */ bne $v1, $v0, .L80241148 /* C535F4 802410B4 00000000 */ nop -/* C535F8 802410B8 0C09001B */ jal func_8024006C_C525AC +/* C535F8 802410B8 0C09001B */ jal UnkNpcAIFunc7 /* C535FC 802410BC 0240202D */ daddu $a0, $s2, $zero /* C53600 802410C0 8E430070 */ lw $v1, 0x70($s2) /* C53604 802410C4 24020020 */ addiu $v0, $zero, 0x20 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 c51f138d10..2028a09131 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 @@ -153,7 +153,7 @@ glabel func_80241170_C536B0 /* C538E8 802413A8 00000000 */ nop /* C538EC 802413AC 0C090000 */ jal UnkNpcAIFunc6 /* C538F0 802413B0 0240202D */ daddu $a0, $s2, $zero -/* C538F4 802413B4 0C09001B */ jal func_8024006C_C525AC +/* C538F4 802413B4 0C09001B */ jal UnkNpcAIFunc7 /* C538F8 802413B8 0240202D */ daddu $a0, $s2, $zero /* C538FC 802413BC 8E430070 */ lw $v1, 0x70($s2) /* C53900 802413C0 24020020 */ addiu $v0, $zero, 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 326900dabf..e25bbcec13 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 @@ -153,7 +153,7 @@ glabel func_80241EE8_B4C958 /* B4CB90 80242120 00000000 */ nop /* B4CB94 80242124 0C090633 */ jal UnkNpcAIFunc6 /* B4CB98 80242128 0240202D */ daddu $a0, $s2, $zero -/* B4CB9C 8024212C 0C09064E */ jal func_80241938_B4C3A8 +/* B4CB9C 8024212C 0C09064E */ jal UnkNpcAIFunc7 /* B4CBA0 80242130 0240202D */ daddu $a0, $s2, $zero /* B4CBA4 80242134 8E430070 */ lw $v1, 0x70($s2) /* B4CBA8 80242138 24020020 */ addiu $v0, $zero, 0x20 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 fdd5eb82f4..16e42eee11 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 @@ -153,7 +153,7 @@ glabel func_8024219C_B4CC0C /* B4CE44 802423D4 00000000 */ nop /* B4CE48 802423D8 0C090633 */ jal UnkNpcAIFunc6 /* B4CE4C 802423DC 0240202D */ daddu $a0, $s2, $zero -/* B4CE50 802423E0 0C09064E */ jal func_80241938_B4C3A8 +/* B4CE50 802423E0 0C09064E */ jal UnkNpcAIFunc7 /* B4CE54 802423E4 0240202D */ daddu $a0, $s2, $zero /* B4CE58 802423E8 8E430070 */ lw $v1, 0x70($s2) /* B4CE5C 802423EC 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241888_B540B8.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241888_B540B8.s index 3a56e24358..ceb4518f66 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241888_B540B8.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241888_B540B8.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80241888_B540B8 +glabel UnkNpcAIFunc7 /* B540B8 80241888 27BDFFE0 */ addiu $sp, $sp, -0x20 /* B540BC 8024188C AFB10014 */ sw $s1, 0x14($sp) /* B540C0 80241890 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s index ebcc620dfa..2dce097fa3 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 @@ -153,7 +153,7 @@ glabel func_80241E38_B54668 /* B548A0 80242070 00000000 */ nop /* B548A4 80242074 0C090607 */ jal UnkNpcAIFunc6 /* B548A8 80242078 0240202D */ daddu $a0, $s2, $zero -/* B548AC 8024207C 0C090622 */ jal func_80241888_B540B8 +/* B548AC 8024207C 0C090622 */ jal UnkNpcAIFunc7 /* B548B0 80242080 0240202D */ daddu $a0, $s2, $zero /* B548B4 80242084 8E430070 */ lw $v1, 0x70($s2) /* B548B8 80242088 24020020 */ addiu $v0, $zero, 0x20 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 31dba0a4f0..e84d161a0c 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 @@ -153,7 +153,7 @@ glabel func_802420EC_B5491C /* B54B54 80242324 00000000 */ nop /* B54B58 80242328 0C090607 */ jal UnkNpcAIFunc6 /* B54B5C 8024232C 0240202D */ daddu $a0, $s2, $zero -/* B54B60 80242330 0C090622 */ jal func_80241888_B540B8 +/* B54B60 80242330 0C090622 */ jal UnkNpcAIFunc7 /* B54B64 80242334 0240202D */ daddu $a0, $s2, $zero /* B54B68 80242338 8E430070 */ lw $v1, 0x70($s2) /* B54B6C 8024233C 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240280_B59AF0.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240280_B59AF0.s index 1073480651..fd3ba15f05 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240280_B59AF0.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240280_B59AF0.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80240280_B59AF0 +glabel UnkNpcAIFunc7 /* B59AF0 80240280 27BDFFE0 */ addiu $sp, $sp, -0x20 /* B59AF4 80240284 AFB10014 */ sw $s1, 0x14($sp) /* B59AF8 80240288 0080882D */ daddu $s1, $a0, $zero 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 4c75987dff..79ecb0888a 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 @@ -153,7 +153,7 @@ glabel func_80240830_B5A0A0 /* B5A2D8 80240A68 00000000 */ nop /* B5A2DC 80240A6C 0C090085 */ jal UnkNpcAIFunc6 /* B5A2E0 80240A70 0240202D */ daddu $a0, $s2, $zero -/* B5A2E4 80240A74 0C0900A0 */ jal func_80240280_B59AF0 +/* B5A2E4 80240A74 0C0900A0 */ jal UnkNpcAIFunc7 /* B5A2E8 80240A78 0240202D */ daddu $a0, $s2, $zero /* B5A2EC 80240A7C 8E430070 */ lw $v1, 0x70($s2) /* B5A2F0 80240A80 24020020 */ addiu $v0, $zero, 0x20 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 7c63600649..083b58525a 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 @@ -153,7 +153,7 @@ glabel func_80240AE4_B5A354 /* B5A58C 80240D1C 00000000 */ nop /* B5A590 80240D20 0C090085 */ jal UnkNpcAIFunc6 /* B5A594 80240D24 0240202D */ daddu $a0, $s2, $zero -/* B5A598 80240D28 0C0900A0 */ jal func_80240280_B59AF0 +/* B5A598 80240D28 0C0900A0 */ jal UnkNpcAIFunc7 /* B5A59C 80240D2C 0240202D */ daddu $a0, $s2, $zero /* B5A5A0 80240D30 8E430070 */ lw $v1, 0x70($s2) /* B5A5A4 80240D34 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802416D4_B5F984.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802416D4_B5F984.s index ff1e37b259..0007e403f9 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802416D4_B5F984.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802416D4_B5F984.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802416D4_B5F984 +glabel UnkNpcAIFunc7 /* B5F984 802416D4 27BDFFE0 */ addiu $sp, $sp, -0x20 /* B5F988 802416D8 AFB10014 */ sw $s1, 0x14($sp) /* B5F98C 802416DC 0080882D */ daddu $s1, $a0, $zero 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 4bf34d2055..67913b5ec9 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 @@ -153,7 +153,7 @@ glabel func_80241C84_B5FF34 /* B6016C 80241EBC 00000000 */ nop /* B60170 80241EC0 0C09059A */ jal UnkNpcAIFunc6 /* B60174 80241EC4 0240202D */ daddu $a0, $s2, $zero -/* B60178 80241EC8 0C0905B5 */ jal func_802416D4_B5F984 +/* B60178 80241EC8 0C0905B5 */ jal UnkNpcAIFunc7 /* B6017C 80241ECC 0240202D */ daddu $a0, $s2, $zero /* B60180 80241ED0 8E430070 */ lw $v1, 0x70($s2) /* B60184 80241ED4 24020020 */ addiu $v0, $zero, 0x20 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 eff32b0c5d..ea57464184 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 @@ -153,7 +153,7 @@ glabel func_80241F38_B601E8 /* B60420 80242170 00000000 */ nop /* B60424 80242174 0C09059A */ jal UnkNpcAIFunc6 /* B60428 80242178 0240202D */ daddu $a0, $s2, $zero -/* B6042C 8024217C 0C0905B5 */ jal func_802416D4_B5F984 +/* B6042C 8024217C 0C0905B5 */ jal UnkNpcAIFunc7 /* B60430 80242180 0240202D */ daddu $a0, $s2, $zero /* B60434 80242184 8E430070 */ lw $v1, 0x70($s2) /* B60438 80242188 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240BC0_B66670.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240BC0_B66670.s index 162bde7b22..63fdc7fb28 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240BC0_B66670.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240BC0_B66670.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80240BC0_B66670 +glabel UnkNpcAIFunc7 /* B66670 80240BC0 27BDFFE0 */ addiu $sp, $sp, -0x20 /* B66674 80240BC4 AFB10014 */ sw $s1, 0x14($sp) /* B66678 80240BC8 0080882D */ daddu $s1, $a0, $zero 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 0311bcca9f..01457a320a 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 @@ -153,7 +153,7 @@ glabel func_80241170_B66C20 /* B66E58 802413A8 00000000 */ nop /* B66E5C 802413AC 0C0902D5 */ jal UnkNpcAIFunc6 /* B66E60 802413B0 0240202D */ daddu $a0, $s2, $zero -/* B66E64 802413B4 0C0902F0 */ jal func_80240BC0_B66670 +/* B66E64 802413B4 0C0902F0 */ jal UnkNpcAIFunc7 /* B66E68 802413B8 0240202D */ daddu $a0, $s2, $zero /* B66E6C 802413BC 8E430070 */ lw $v1, 0x70($s2) /* B66E70 802413C0 24020020 */ addiu $v0, $zero, 0x20 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 6f125ec16c..e06f59cba5 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 @@ -153,7 +153,7 @@ glabel func_80241424_B66ED4 /* B6710C 8024165C 00000000 */ nop /* B67110 80241660 0C0902D5 */ jal UnkNpcAIFunc6 /* B67114 80241664 0240202D */ daddu $a0, $s2, $zero -/* B67118 80241668 0C0902F0 */ jal func_80240BC0_B66670 +/* B67118 80241668 0C0902F0 */ jal UnkNpcAIFunc7 /* B6711C 8024166C 0240202D */ daddu $a0, $s2, $zero /* B67120 80241670 8E430070 */ lw $v1, 0x70($s2) /* B67124 80241674 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240740_B737F0.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240740_B737F0.s index 63a4ff8f2d..604576092c 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240740_B737F0.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240740_B737F0.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80240740_B737F0 +glabel UnkNpcAIFunc7 /* B737F0 80240740 27BDFFE0 */ addiu $sp, $sp, -0x20 /* B737F4 80240744 AFB10014 */ sw $s1, 0x14($sp) /* B737F8 80240748 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s index c72711f5e9..fa57b8e92b 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 @@ -153,7 +153,7 @@ glabel func_80240CF0_B73DA0 /* B73FD8 80240F28 00000000 */ nop /* B73FDC 80240F2C 0C0901B5 */ jal UnkNpcAIFunc6 /* B73FE0 80240F30 0240202D */ daddu $a0, $s2, $zero -/* B73FE4 80240F34 0C0901D0 */ jal func_80240740_B737F0 +/* B73FE4 80240F34 0C0901D0 */ jal UnkNpcAIFunc7 /* B73FE8 80240F38 0240202D */ daddu $a0, $s2, $zero /* B73FEC 80240F3C 8E430070 */ lw $v1, 0x70($s2) /* B73FF0 80240F40 24020020 */ addiu $v0, $zero, 0x20 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 88a14684b0..8b875d39e8 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 @@ -153,7 +153,7 @@ glabel func_80240FA4_B74054 /* B7428C 802411DC 00000000 */ nop /* B74290 802411E0 0C0901B5 */ jal UnkNpcAIFunc6 /* B74294 802411E4 0240202D */ daddu $a0, $s2, $zero -/* B74298 802411E8 0C0901D0 */ jal func_80240740_B737F0 +/* B74298 802411E8 0C0901D0 */ jal UnkNpcAIFunc7 /* B7429C 802411EC 0240202D */ daddu $a0, $s2, $zero /* B742A0 802411F0 8E430070 */ lw $v1, 0x70($s2) /* B742A4 802411F4 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240C64_C61974.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240C64_C61974.s index e9406010e5..b36c547974 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240C64_C61974.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240C64_C61974.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80240C64_C61974 +glabel UnkNpcAIFunc7 /* C61974 80240C64 27BDFFE0 */ addiu $sp, $sp, -0x20 /* C61978 80240C68 AFB10014 */ sw $s1, 0x14($sp) /* C6197C 80240C6C 0080882D */ daddu $s1, $a0, $zero 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 3775e0ea4d..41251c6067 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 @@ -153,7 +153,7 @@ glabel func_80241214_C61F24 /* C6215C 8024144C 00000000 */ nop /* C62160 80241450 0C0902FE */ jal UnkNpcAIFunc6 /* C62164 80241454 0240202D */ daddu $a0, $s2, $zero -/* C62168 80241458 0C090319 */ jal func_80240C64_C61974 +/* C62168 80241458 0C090319 */ jal UnkNpcAIFunc7 /* C6216C 8024145C 0240202D */ daddu $a0, $s2, $zero /* C62170 80241460 8E430070 */ lw $v1, 0x70($s2) /* C62174 80241464 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802425A8_C73A28.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802425A8_C73A28.s index 5dd365e38d..f31beb78bd 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802425A8_C73A28.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802425A8_C73A28.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802425A8_C73A28 +glabel UnkNpcAIFunc7 /* C73A28 802425A8 27BDFFE0 */ addiu $sp, $sp, -0x20 /* C73A2C 802425AC AFB10014 */ sw $s1, 0x14($sp) /* C73A30 802425B0 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s index b33ee8ad2a..372306fe5e 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 @@ -153,7 +153,7 @@ glabel func_80242B58_C73FD8 /* C74210 80242D90 00000000 */ nop /* C74214 80242D94 0C09094F */ jal UnkNpcAIFunc6 /* C74218 80242D98 0240202D */ daddu $a0, $s2, $zero -/* C7421C 80242D9C 0C09096A */ jal func_802425A8_C73A28 +/* C7421C 80242D9C 0C09096A */ jal UnkNpcAIFunc7 /* C74220 80242DA0 0240202D */ daddu $a0, $s2, $zero /* C74224 80242DA4 8E430070 */ lw $v1, 0x70($s2) /* C74228 80242DA8 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024108C_C77D6C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024108C_C77D6C.s index 62a8f3ea01..94262e2ad8 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024108C_C77D6C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024108C_C77D6C.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8024108C_C77D6C +glabel UnkNpcAIFunc7 /* C77D6C 8024108C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* C77D70 80241090 AFB10014 */ sw $s1, 0x14($sp) /* C77D74 80241094 0080882D */ daddu $s1, $a0, $zero 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 cb00d57462..f034be043e 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 @@ -153,7 +153,7 @@ glabel func_8024163C_C7831C /* C78554 80241874 00000000 */ nop /* C78558 80241878 0C090408 */ jal UnkNpcAIFunc6 /* C7855C 8024187C 0240202D */ daddu $a0, $s2, $zero -/* C78560 80241880 0C090423 */ jal func_8024108C_C77D6C +/* C78560 80241880 0C090423 */ jal UnkNpcAIFunc7 /* C78564 80241884 0240202D */ daddu $a0, $s2, $zero /* C78568 80241888 8E430070 */ lw $v1, 0x70($s2) /* C7856C 8024188C 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024037C_C85E2C.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024037C_C85E2C.s index 24b9be23a5..782b732eb0 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024037C_C85E2C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024037C_C85E2C.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8024037C_C85E2C +glabel UnkNpcAIFunc7 /* C85E2C 8024037C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* C85E30 80240380 AFB10014 */ sw $s1, 0x14($sp) /* C85E34 80240384 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s index 2abc561033..7831214053 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 @@ -153,7 +153,7 @@ glabel func_8024092C_C863DC /* C86614 80240B64 00000000 */ nop /* C86618 80240B68 0C0900C4 */ jal UnkNpcAIFunc6 /* C8661C 80240B6C 0240202D */ daddu $a0, $s2, $zero -/* C86620 80240B70 0C0900DF */ jal func_8024037C_C85E2C +/* C86620 80240B70 0C0900DF */ jal UnkNpcAIFunc7 /* C86624 80240B74 0240202D */ daddu $a0, $s2, $zero /* C86628 80240B78 8E430070 */ lw $v1, 0x70($s2) /* C8662C 80240B7C 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_8024056C_B939AC.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_8024056C_B939AC.s index b20e906739..4f83127125 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_8024056C_B939AC.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_8024056C_B939AC.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8024056C_B939AC +glabel UnkNpcAIFunc7 /* B939AC 8024056C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* B939B0 80240570 AFB10014 */ sw $s1, 0x14($sp) /* B939B4 80240574 0080882D */ daddu $s1, $a0, $zero 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 9b0e5bee87..0b92792a16 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 @@ -153,7 +153,7 @@ glabel func_80240B1C_B93F5C /* B94194 80240D54 00000000 */ nop /* B94198 80240D58 0C090140 */ jal UnkNpcAIFunc6 /* B9419C 80240D5C 0240202D */ daddu $a0, $s2, $zero -/* B941A0 80240D60 0C09015B */ jal func_8024056C_B939AC +/* B941A0 80240D60 0C09015B */ jal UnkNpcAIFunc7 /* B941A4 80240D64 0240202D */ daddu $a0, $s2, $zero /* B941A8 80240D68 8E430070 */ lw $v1, 0x70($s2) /* B941AC 80240D6C 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802400DC_BA080C.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802400DC_BA080C.s index 199e967854..828f343631 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802400DC_BA080C.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802400DC_BA080C.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802400DC_BA080C +glabel UnkNpcAIFunc7 /* BA080C 802400DC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* BA0810 802400E0 AFB10014 */ sw $s1, 0x14($sp) /* BA0814 802400E4 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s index 63dac87992..2aff10a52f 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 @@ -153,7 +153,7 @@ glabel func_8024068C_BA0DBC /* BA0FF4 802408C4 00000000 */ nop /* BA0FF8 802408C8 0C09001C */ jal UnkNpcAIFunc6 /* BA0FFC 802408CC 0240202D */ daddu $a0, $s2, $zero -/* BA1000 802408D0 0C090037 */ jal func_802400DC_BA080C +/* BA1000 802408D0 0C090037 */ jal UnkNpcAIFunc7 /* BA1004 802408D4 0240202D */ daddu $a0, $s2, $zero /* BA1008 802408D8 8E430070 */ lw $v1, 0x70($s2) /* BA100C 802408DC 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802405DC_BA4D5C.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802405DC_BA4D5C.s index 93bea96856..65435e5b32 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802405DC_BA4D5C.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802405DC_BA4D5C.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802405DC_BA4D5C +glabel UnkNpcAIFunc7 /* BA4D5C 802405DC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* BA4D60 802405E0 AFB10014 */ sw $s1, 0x14($sp) /* BA4D64 802405E4 0080882D */ daddu $s1, $a0, $zero 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 09fe56d0f2..02467f718c 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 @@ -153,7 +153,7 @@ glabel func_80240B8C_BA530C /* BA5544 80240DC4 00000000 */ nop /* BA5548 80240DC8 0C09015C */ jal UnkNpcAIFunc6 /* BA554C 80240DCC 0240202D */ daddu $a0, $s2, $zero -/* BA5550 80240DD0 0C090177 */ jal func_802405DC_BA4D5C +/* BA5550 80240DD0 0C090177 */ jal UnkNpcAIFunc7 /* BA5554 80240DD4 0240202D */ daddu $a0, $s2, $zero /* BA5558 80240DD8 8E430070 */ lw $v1, 0x70($s2) /* BA555C 80240DDC 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241604_BAEF44.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241604_BAEF44.s index 41adc3eca9..5965cf51bb 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241604_BAEF44.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241604_BAEF44.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80241604_BAEF44 +glabel UnkNpcAIFunc7 /* BAEF44 80241604 27BDFFE0 */ addiu $sp, $sp, -0x20 /* BAEF48 80241608 AFB10014 */ sw $s1, 0x14($sp) /* BAEF4C 8024160C 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s index 3055110ce8..6232661d79 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 @@ -153,7 +153,7 @@ glabel func_80241BB4_BAF4F4 /* BAF72C 80241DEC 00000000 */ nop /* BAF730 80241DF0 0C090566 */ jal UnkNpcAIFunc6 /* BAF734 80241DF4 0240202D */ daddu $a0, $s2, $zero -/* BAF738 80241DF8 0C090581 */ jal func_80241604_BAEF44 +/* BAF738 80241DF8 0C090581 */ jal UnkNpcAIFunc7 /* BAF73C 80241DFC 0240202D */ daddu $a0, $s2, $zero /* BAF740 80241E00 8E430070 */ lw $v1, 0x70($s2) /* BAF744 80241E04 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241E1C_D8F06C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241E1C_D8F06C.s index 130c95ae9e..8d15a8ac12 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241E1C_D8F06C.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241E1C_D8F06C.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80241E1C_D8F06C +glabel UnkNpcAIFunc7 /* D8F06C 80241E1C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* D8F070 80241E20 AFB10014 */ sw $s1, 0x14($sp) /* D8F074 80241E24 0080882D */ daddu $s1, $a0, $zero 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 166fb8c810..b8bf60cd99 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 @@ -159,7 +159,7 @@ glabel func_802423CC_D8F61C /* D8F86C 8024261C 00000000 */ nop /* D8F870 80242620 0C09076C */ jal UnkNpcAIFunc6 /* D8F874 80242624 0240202D */ daddu $a0, $s2, $zero -/* D8F878 80242628 0C090787 */ jal func_80241E1C_D8F06C +/* D8F878 80242628 0C090787 */ jal UnkNpcAIFunc7 /* D8F87C 8024262C 0240202D */ daddu $a0, $s2, $zero /* D8F880 80242630 8E430070 */ lw $v1, 0x70($s2) /* D8F884 80242634 24020020 */ addiu $v0, $zero, 0x20 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 5e6a098fc4..967992e351 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 @@ -153,7 +153,7 @@ glabel func_80242698_D8F8E8 /* D8FB20 802428D0 00000000 */ nop /* D8FB24 802428D4 0C09076C */ jal UnkNpcAIFunc6 /* D8FB28 802428D8 0240202D */ daddu $a0, $s2, $zero -/* D8FB2C 802428DC 0C090787 */ jal func_80241E1C_D8F06C +/* D8FB2C 802428DC 0C090787 */ jal UnkNpcAIFunc7 /* D8FB30 802428E0 0240202D */ daddu $a0, $s2, $zero /* D8FB34 802428E4 8E430070 */ lw $v1, 0x70($s2) /* D8FB38 802428E8 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240FBC_D93EFC.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240FBC_D93EFC.s index 6e196424e2..cbc46863c6 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240FBC_D93EFC.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240FBC_D93EFC.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80240FBC_D93EFC +glabel UnkNpcAIFunc7 /* D93EFC 80240FBC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* D93F00 80240FC0 AFB10014 */ sw $s1, 0x14($sp) /* D93F04 80240FC4 0080882D */ daddu $s1, $a0, $zero 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 e69c4c29a6..6db0643e2c 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 @@ -153,7 +153,7 @@ glabel func_8024156C_D944AC /* D946E4 802417A4 00000000 */ nop /* D946E8 802417A8 0C0903D4 */ jal UnkNpcAIFunc6 /* D946EC 802417AC 0240202D */ daddu $a0, $s2, $zero -/* D946F0 802417B0 0C0903EF */ jal func_80240FBC_D93EFC +/* D946F0 802417B0 0C0903EF */ jal UnkNpcAIFunc7 /* D946F4 802417B4 0240202D */ daddu $a0, $s2, $zero /* D946F8 802417B8 8E430070 */ lw $v1, 0x70($s2) /* D946FC 802417BC 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_802400BC_D1117C.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_802400BC_D1117C.s index 3ebdb78f6a..8712b610f1 100644 --- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_802400BC_D1117C.s +++ b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_802400BC_D1117C.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802400BC_D1117C +glabel UnkNpcAIFunc7 /* D1117C 802400BC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* D11180 802400C0 AFB10014 */ sw $s1, 0x14($sp) /* D11184 802400C4 0080882D */ daddu $s1, $a0, $zero 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 8a81e2ee5e..f29746705a 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 @@ -153,7 +153,7 @@ glabel func_8024066C_D1172C /* D11964 802408A4 00000000 */ nop /* D11968 802408A8 0C090014 */ jal UnkNpcAIFunc6 /* D1196C 802408AC 0240202D */ daddu $a0, $s2, $zero -/* D11970 802408B0 0C09002F */ jal func_802400BC_D1117C +/* D11970 802408B0 0C09002F */ jal UnkNpcAIFunc7 /* D11974 802408B4 0240202D */ daddu $a0, $s2, $zero /* D11978 802408B8 8E430070 */ lw $v1, 0x70($s2) /* D1197C 802408BC 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024006C_D1884C.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024006C_D1884C.s index 742e943ad5..db90faad74 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024006C_D1884C.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024006C_D1884C.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8024006C_D1884C +glabel UnkNpcAIFunc7 /* D1884C 8024006C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* D18850 80240070 AFB10014 */ sw $s1, 0x14($sp) /* D18854 80240074 0080882D */ daddu $s1, $a0, $zero 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 fe3cfbb475..94dbde66d3 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 @@ -153,7 +153,7 @@ glabel func_8024061C_D18DFC /* D19034 80240854 00000000 */ nop /* D19038 80240858 0C090000 */ jal UnkNpcAIFunc6 /* D1903C 8024085C 0240202D */ daddu $a0, $s2, $zero -/* D19040 80240860 0C09001B */ jal func_8024006C_D1884C +/* D19040 80240860 0C09001B */ jal UnkNpcAIFunc7 /* D19044 80240864 0240202D */ daddu $a0, $s2, $zero /* D19048 80240868 8E430070 */ lw $v1, 0x70($s2) /* D1904C 8024086C 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_802406BC_D2C3EC.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_802406BC_D2C3EC.s index 77af27fa6b..ecff8c9213 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_802406BC_D2C3EC.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_802406BC_D2C3EC.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802406BC_D2C3EC +glabel UnkNpcAIFunc7 /* D2C3EC 802406BC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* D2C3F0 802406C0 AFB10014 */ sw $s1, 0x14($sp) /* D2C3F4 802406C4 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s index 5382e80464..8e74ee8648 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 @@ -153,7 +153,7 @@ glabel func_80240C6C_D2C99C /* D2CBD4 80240EA4 00000000 */ nop /* D2CBD8 80240EA8 0C090194 */ jal UnkNpcAIFunc6 /* D2CBDC 80240EAC 0240202D */ daddu $a0, $s2, $zero -/* D2CBE0 80240EB0 0C0901AF */ jal func_802406BC_D2C3EC +/* D2CBE0 80240EB0 0C0901AF */ jal UnkNpcAIFunc7 /* D2CBE4 80240EB4 0240202D */ daddu $a0, $s2, $zero /* D2CBE8 80240EB8 8E430070 */ lw $v1, 0x70($s2) /* D2CBEC 80240EBC 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240DAC_D30A2C.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240DAC_D30A2C.s index 8a249da4c0..273cc72c92 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240DAC_D30A2C.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240DAC_D30A2C.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80240DAC_D30A2C +glabel UnkNpcAIFunc7 /* D30A2C 80240DAC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* D30A30 80240DB0 AFB10014 */ sw $s1, 0x14($sp) /* D30A34 80240DB4 0080882D */ daddu $s1, $a0, $zero 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 f7f28b1553..1db942b2d5 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 @@ -153,7 +153,7 @@ glabel func_8024135C_D30FDC /* D31214 80241594 00000000 */ nop /* D31218 80241598 0C090350 */ jal UnkNpcAIFunc6 /* D3121C 8024159C 0240202D */ daddu $a0, $s2, $zero -/* D31220 802415A0 0C09036B */ jal func_80240DAC_D30A2C +/* D31220 802415A0 0C09036B */ jal UnkNpcAIFunc7 /* D31224 802415A4 0240202D */ daddu $a0, $s2, $zero /* D31228 802415A8 8E430070 */ lw $v1, 0x70($s2) /* D3122C 802415AC 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024043C_D37C3C.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024043C_D37C3C.s index 778a400932..5f8b7fa77c 100644 --- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024043C_D37C3C.s +++ b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024043C_D37C3C.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8024043C_D37C3C +glabel UnkNpcAIFunc7 /* D37C3C 8024043C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* D37C40 80240440 AFB10014 */ sw $s1, 0x14($sp) /* D37C44 80240444 0080882D */ daddu $s1, $a0, $zero 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 8f32456dbb..7a9f078264 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 @@ -153,7 +153,7 @@ glabel func_802409EC_D381EC /* D38424 80240C24 00000000 */ nop /* D38428 80240C28 0C0900F4 */ jal UnkNpcAIFunc6 /* D3842C 80240C2C 0240202D */ daddu $a0, $s2, $zero -/* D38430 80240C30 0C09010F */ jal func_8024043C_D37C3C +/* D38430 80240C30 0C09010F */ jal UnkNpcAIFunc7 /* D38434 80240C34 0240202D */ daddu $a0, $s2, $zero /* D38438 80240C38 8E430070 */ lw $v1, 0x70($s2) /* D3843C 80240C3C 24020020 */ addiu $v0, $zero, 0x20 diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c index 22a3f119ef..4d79036c51 100644 --- a/src/world/area_dgb/dgb_02/C2EBA0.c +++ b/src/world/area_dgb/dgb_02/C2EBA0.c @@ -2,7 +2,7 @@ #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_8024006C_C2EC0C); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_802400DC_C2EC7C); diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index 3248c90a14..b1bec91aff 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -2,7 +2,7 @@ #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802402BC_C3179C); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024032C_C3180C); diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index 5e1fd0f66d..f3f3702e93 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240030_C3AA40); #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_802400CC_C3AADC); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_8024013C_C3AB4C); diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index d8b50b42ea..a9170c50fe 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -2,7 +2,7 @@ #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_8024006C_C3DC5C); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_802400DC_C3DCCC); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 6ecd5cb56d..e2b5397d81 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240B94_C40944); #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240EFC_C40CAC); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240F6C_C40D1C); diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 5e190b98d6..edcd0c2093 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -2,7 +2,7 @@ #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_8024006C_C46C4C); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802400DC_C46CBC); diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 6df27a965b..75e2647972 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -2,7 +2,7 @@ #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_8024006C_C4F57C); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802400DC_C4F5EC); diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c index 17e9bbdc41..ee13e88388 100644 --- a/src/world/area_dgb/dgb_16/C52540.c +++ b/src/world/area_dgb/dgb_16/C52540.c @@ -2,7 +2,7 @@ #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_8024006C_C525AC); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_802400DC_C5261C); diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index 26eaa10f61..a52c4fd795 100644 --- a/src/world/area_jan/jan_05/B4B260.c +++ b/src/world/area_jan/jan_05/B4B260.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241708_B4C178); #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241938_B4C3A8); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802419A8_B4C418); diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index 71e182fc51..c546006e2c 100644 --- a/src/world/area_jan/jan_06/B52F70.c +++ b/src/world/area_jan/jan_06/B52F70.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241658_B53E88); #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241888_B540B8); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802418F8_B54128); diff --git a/src/world/area_jan/jan_07/B59870.c b/src/world/area_jan/jan_07/B59870.c index 8417f5d846..12f4a0c23c 100644 --- a/src/world/area_jan/jan_07/B59870.c +++ b/src/world/area_jan/jan_07/B59870.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240050_B598C0); #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240280_B59AF0); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_802402F0_B59B60); diff --git a/src/world/area_jan/jan_08/B5F650.c b/src/world/area_jan/jan_08/B5F650.c index d99635437c..8677371132 100644 --- a/src/world/area_jan/jan_08/B5F650.c +++ b/src/world/area_jan/jan_08/B5F650.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802414A4_B5F754); #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802416D4_B5F984); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241744_B5F9F4); diff --git a/src/world/area_jan/jan_09/B663F0.c b/src/world/area_jan/jan_09/B663F0.c index 541053c2cd..3d5e9348a8 100644 --- a/src/world/area_jan/jan_09/B663F0.c +++ b/src/world/area_jan/jan_09/B663F0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240990_B66440); #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240BC0_B66670); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240C30_B666E0); diff --git a/src/world/area_jan/jan_12/B73570.c b/src/world/area_jan/jan_12/B73570.c index bb8646ef22..f12208dae0 100644 --- a/src/world/area_jan/jan_12/B73570.c +++ b/src/world/area_jan/jan_12/B73570.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240510_B735C0); #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240740_B737F0); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_802407B0_B73860); diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index 06f20dbfbe..622b21ef17 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_802406A4_C613B4); #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240C64_C61974); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240CD4_C619E4); diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index b31469d7ca..3acdf579eb 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242354_C737D4); #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802425A8_C73A28); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242618_C73A98); diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index 25d74dabf6..d52e02d926 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -2,7 +2,7 @@ #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024108C_C77D6C); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802410FC_C77DDC); diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index 5a90774c31..dda486d710 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -2,7 +2,7 @@ #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_8024037C_C85E2C); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_802403EC_C85E9C); diff --git a/src/world/area_mim/mim_01/B93940.c b/src/world/area_mim/mim_01/B93940.c index 58a5b6b409..c68c3aea47 100644 --- a/src/world/area_mim/mim_01/B93940.c +++ b/src/world/area_mim/mim_01/B93940.c @@ -2,7 +2,7 @@ #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_8024056C_B939AC); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_802405DC_B93A1C); diff --git a/src/world/area_mim/mim_05/BA07A0.c b/src/world/area_mim/mim_05/BA07A0.c index 43ba5c2cc6..f2240f894d 100644 --- a/src/world/area_mim/mim_05/BA07A0.c +++ b/src/world/area_mim/mim_05/BA07A0.c @@ -2,7 +2,7 @@ #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_802400DC_BA080C); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_8024014C_BA087C); diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c index 332952c3e1..5bd34de39b 100644 --- a/src/world/area_mim/mim_06/BA4CF0.c +++ b/src/world/area_mim/mim_06/BA4CF0.c @@ -2,7 +2,7 @@ #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_802405DC_BA4D5C); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_8024064C_BA4DCC); diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index 0927c51018..62edd0f24b 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_802413AC_BAECEC); #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241604_BAEF44); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241674_BAEFB4); diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index fb445ee7db..4b2306afd9 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -52,7 +52,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241AB4_D8ED04); #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241E1C_D8F06C); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241E8C_D8F0DC); diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c index ec7d43d634..f9203e82b3 100644 --- a/src/world/area_pra/pra_37/D92F40.c +++ b/src/world/area_pra/pra_37/D92F40.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240F1C_D93E5C); #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240FBC_D93EFC); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_8024102C_D93F6C); diff --git a/src/world/area_sam/sam_03/D110C0.c b/src/world/area_sam/sam_03/D110C0.c index 4cc3ba79d1..44e3c3855e 100644 --- a/src/world/area_sam/sam_03/D110C0.c +++ b/src/world/area_sam/sam_03/D110C0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_80240000_D110C0); #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_802400BC_D1117C); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_8024012C_D111EC); diff --git a/src/world/area_sam/sam_05/D187E0.c b/src/world/area_sam/sam_05/D187E0.c index fd6b86d027..2cfaf70d64 100644 --- a/src/world/area_sam/sam_05/D187E0.c +++ b/src/world/area_sam/sam_05/D187E0.c @@ -2,7 +2,7 @@ #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_8024006C_D1884C); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_802400DC_D188BC); diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c index 1e3020356f..95801c8019 100644 --- a/src/world/area_sam/sam_07/D2BD30.c +++ b/src/world/area_sam/sam_07/D2BD30.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802405B0_D2C2E0); #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802406BC_D2C3EC); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_8024072C_D2C45C); diff --git a/src/world/area_sam/sam_08/D309C0.c b/src/world/area_sam/sam_08/D309C0.c index ff84c9033b..ddc4be40af 100644 --- a/src/world/area_sam/sam_08/D309C0.c +++ b/src/world/area_sam/sam_08/D309C0.c @@ -2,7 +2,7 @@ #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240DAC_D30A2C); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240E1C_D30A9C); diff --git a/src/world/area_sam/sam_10/D37BD0.c b/src/world/area_sam/sam_10/D37BD0.c index ace3aae127..cf9e60dea6 100644 --- a/src/world/area_sam/sam_10/D37BD0.c +++ b/src/world/area_sam/sam_10/D37BD0.c @@ -2,7 +2,7 @@ #include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_10/D37BD0", func_8024043C_D37C3C); +#include "world/common/UnkNpcAIFunc7.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_10/D37BD0", func_802404AC_D37CAC); diff --git a/src/world/common/UnkNpcAIFunc7.inc.c b/src/world/common/UnkNpcAIFunc7.inc.c new file mode 100644 index 0000000000..b343138841 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc7.inc.c @@ -0,0 +1,15 @@ +#include "common.h" +#include "map.h" + +static void UnkNpcAIFunc7(ScriptInstance* script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if ((npc->duration << 0x10) <= 0) { + enemy->varTable[0] = 3; + npc->duration = enemy->varTable[2]; + npc->currentAnim = enemy->animList[9]; + script->functionTemp[0].s = 32; + } +} From be827722944d3b6c2d31ac33fadb7123771f6b4d Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 21 Nov 2020 23:48:21 -0500 Subject: [PATCH 20/38] deleting asm --- .../dgb_02/C2EBA0/func_8024006C_C2EC0C.s | 33 ------------------- .../dgb_03/C31730/func_802402BC_C3179C.s | 33 ------------------- .../dgb_05/C3AA10/func_802400CC_C3AADC.s | 33 ------------------- .../dgb_07/C3DBF0/func_8024006C_C3DC5C.s | 33 ------------------- .../dgb_08/C3FDB0/func_80240EFC_C40CAC.s | 33 ------------------- .../dgb_09/C46BE0/func_8024006C_C46C4C.s | 33 ------------------- .../dgb_15/C4F510/func_8024006C_C4F57C.s | 33 ------------------- .../dgb_16/C52540/func_8024006C_C525AC.s | 33 ------------------- .../jan_05/B4B260/func_80241938_B4C3A8.s | 33 ------------------- .../jan_06/B52F70/func_80241888_B540B8.s | 33 ------------------- .../jan_07/B59870/func_80240280_B59AF0.s | 33 ------------------- .../jan_08/B5F650/func_802416D4_B5F984.s | 33 ------------------- .../jan_09/B663F0/func_80240BC0_B66670.s | 33 ------------------- .../jan_12/B73570/func_80240740_B737F0.s | 33 ------------------- .../kzn_03/C61020/func_80240C64_C61974.s | 33 ------------------- .../kzn_08/C71ED0/func_802425A8_C73A28.s | 33 ------------------- .../kzn_09/C77D00/func_8024108C_C77D6C.s | 33 ------------------- .../kzn_17/C85DC0/func_8024037C_C85E2C.s | 33 ------------------- .../mim_01/B93940/func_8024056C_B939AC.s | 33 ------------------- .../mim_05/BA07A0/func_802400DC_BA080C.s | 33 ------------------- .../mim_06/BA4CF0/func_802405DC_BA4D5C.s | 33 ------------------- .../mim_08/BAD940/func_80241604_BAEF44.s | 33 ------------------- .../pra_35/D8D270/func_80241E1C_D8F06C.s | 33 ------------------- .../pra_37/D92F40/func_80240FBC_D93EFC.s | 33 ------------------- .../sam_03/D110C0/func_802400BC_D1117C.s | 33 ------------------- .../sam_05/D187E0/func_8024006C_D1884C.s | 33 ------------------- .../sam_07/D2BD30/func_802406BC_D2C3EC.s | 33 ------------------- .../sam_08/D309C0/func_80240DAC_D30A2C.s | 33 ------------------- .../sam_10/D37BD0/func_8024043C_D37C3C.s | 33 ------------------- 29 files changed, 957 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024006C_C2EC0C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802402BC_C3179C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802400CC_C3AADC.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024006C_C3DC5C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240EFC_C40CAC.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024006C_C46C4C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024006C_C4F57C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024006C_C525AC.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241938_B4C3A8.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241888_B540B8.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240280_B59AF0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802416D4_B5F984.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240BC0_B66670.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240740_B737F0.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240C64_C61974.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802425A8_C73A28.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024108C_C77D6C.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024037C_C85E2C.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_01/B93940/func_8024056C_B939AC.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802400DC_BA080C.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802405DC_BA4D5C.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241604_BAEF44.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241E1C_D8F06C.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240FBC_D93EFC.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_03/D110C0/func_802400BC_D1117C.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024006C_D1884C.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_802406BC_D2C3EC.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240DAC_D30A2C.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024043C_D37C3C.s diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024006C_C2EC0C.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024006C_C2EC0C.s deleted file mode 100644 index a30f1edbdd..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024006C_C2EC0C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* C2EC0C 8024006C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C2EC10 80240070 AFB10014 */ sw $s1, 0x14($sp) -/* C2EC14 80240074 0080882D */ daddu $s1, $a0, $zero -/* C2EC18 80240078 AFBF0018 */ sw $ra, 0x18($sp) -/* C2EC1C 8024007C AFB00010 */ sw $s0, 0x10($sp) -/* C2EC20 80240080 8E300148 */ lw $s0, 0x148($s1) -/* C2EC24 80240084 0C00EABB */ jal get_npc_unsafe -/* C2EC28 80240088 86040008 */ lh $a0, 8($s0) -/* C2EC2C 8024008C 0040202D */ daddu $a0, $v0, $zero -/* C2EC30 80240090 9482008E */ lhu $v0, 0x8e($a0) -/* C2EC34 80240094 2442FFFF */ addiu $v0, $v0, -1 -/* C2EC38 80240098 A482008E */ sh $v0, 0x8e($a0) -/* C2EC3C 8024009C 00021400 */ sll $v0, $v0, 0x10 -/* C2EC40 802400A0 1C400009 */ bgtz $v0, .L802400C8 -/* C2EC44 802400A4 24020003 */ addiu $v0, $zero, 3 -/* C2EC48 802400A8 96030076 */ lhu $v1, 0x76($s0) -/* C2EC4C 802400AC AE02006C */ sw $v0, 0x6c($s0) -/* C2EC50 802400B0 A483008E */ sh $v1, 0x8e($a0) -/* C2EC54 802400B4 8E0200CC */ lw $v0, 0xcc($s0) -/* C2EC58 802400B8 8C420024 */ lw $v0, 0x24($v0) -/* C2EC5C 802400BC AC820028 */ sw $v0, 0x28($a0) -/* C2EC60 802400C0 24020020 */ addiu $v0, $zero, 0x20 -/* C2EC64 802400C4 AE220070 */ sw $v0, 0x70($s1) -.L802400C8: -/* C2EC68 802400C8 8FBF0018 */ lw $ra, 0x18($sp) -/* C2EC6C 802400CC 8FB10014 */ lw $s1, 0x14($sp) -/* C2EC70 802400D0 8FB00010 */ lw $s0, 0x10($sp) -/* C2EC74 802400D4 03E00008 */ jr $ra -/* C2EC78 802400D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802402BC_C3179C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802402BC_C3179C.s deleted file mode 100644 index e5f1fd1252..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802402BC_C3179C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* C3179C 802402BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C317A0 802402C0 AFB10014 */ sw $s1, 0x14($sp) -/* C317A4 802402C4 0080882D */ daddu $s1, $a0, $zero -/* C317A8 802402C8 AFBF0018 */ sw $ra, 0x18($sp) -/* C317AC 802402CC AFB00010 */ sw $s0, 0x10($sp) -/* C317B0 802402D0 8E300148 */ lw $s0, 0x148($s1) -/* C317B4 802402D4 0C00EABB */ jal get_npc_unsafe -/* C317B8 802402D8 86040008 */ lh $a0, 8($s0) -/* C317BC 802402DC 0040202D */ daddu $a0, $v0, $zero -/* C317C0 802402E0 9482008E */ lhu $v0, 0x8e($a0) -/* C317C4 802402E4 2442FFFF */ addiu $v0, $v0, -1 -/* C317C8 802402E8 A482008E */ sh $v0, 0x8e($a0) -/* C317CC 802402EC 00021400 */ sll $v0, $v0, 0x10 -/* C317D0 802402F0 1C400009 */ bgtz $v0, .L80240318 -/* C317D4 802402F4 24020003 */ addiu $v0, $zero, 3 -/* C317D8 802402F8 96030076 */ lhu $v1, 0x76($s0) -/* C317DC 802402FC AE02006C */ sw $v0, 0x6c($s0) -/* C317E0 80240300 A483008E */ sh $v1, 0x8e($a0) -/* C317E4 80240304 8E0200CC */ lw $v0, 0xcc($s0) -/* C317E8 80240308 8C420024 */ lw $v0, 0x24($v0) -/* C317EC 8024030C AC820028 */ sw $v0, 0x28($a0) -/* C317F0 80240310 24020020 */ addiu $v0, $zero, 0x20 -/* C317F4 80240314 AE220070 */ sw $v0, 0x70($s1) -.L80240318: -/* C317F8 80240318 8FBF0018 */ lw $ra, 0x18($sp) -/* C317FC 8024031C 8FB10014 */ lw $s1, 0x14($sp) -/* C31800 80240320 8FB00010 */ lw $s0, 0x10($sp) -/* C31804 80240324 03E00008 */ jr $ra -/* C31808 80240328 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802400CC_C3AADC.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802400CC_C3AADC.s deleted file mode 100644 index fa0126ed39..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802400CC_C3AADC.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* C3AADC 802400CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3AAE0 802400D0 AFB10014 */ sw $s1, 0x14($sp) -/* C3AAE4 802400D4 0080882D */ daddu $s1, $a0, $zero -/* C3AAE8 802400D8 AFBF0018 */ sw $ra, 0x18($sp) -/* C3AAEC 802400DC AFB00010 */ sw $s0, 0x10($sp) -/* C3AAF0 802400E0 8E300148 */ lw $s0, 0x148($s1) -/* C3AAF4 802400E4 0C00EABB */ jal get_npc_unsafe -/* C3AAF8 802400E8 86040008 */ lh $a0, 8($s0) -/* C3AAFC 802400EC 0040202D */ daddu $a0, $v0, $zero -/* C3AB00 802400F0 9482008E */ lhu $v0, 0x8e($a0) -/* C3AB04 802400F4 2442FFFF */ addiu $v0, $v0, -1 -/* C3AB08 802400F8 A482008E */ sh $v0, 0x8e($a0) -/* C3AB0C 802400FC 00021400 */ sll $v0, $v0, 0x10 -/* C3AB10 80240100 1C400009 */ bgtz $v0, .L80240128 -/* C3AB14 80240104 24020003 */ addiu $v0, $zero, 3 -/* C3AB18 80240108 96030076 */ lhu $v1, 0x76($s0) -/* C3AB1C 8024010C AE02006C */ sw $v0, 0x6c($s0) -/* C3AB20 80240110 A483008E */ sh $v1, 0x8e($a0) -/* C3AB24 80240114 8E0200CC */ lw $v0, 0xcc($s0) -/* C3AB28 80240118 8C420024 */ lw $v0, 0x24($v0) -/* C3AB2C 8024011C AC820028 */ sw $v0, 0x28($a0) -/* C3AB30 80240120 24020020 */ addiu $v0, $zero, 0x20 -/* C3AB34 80240124 AE220070 */ sw $v0, 0x70($s1) -.L80240128: -/* C3AB38 80240128 8FBF0018 */ lw $ra, 0x18($sp) -/* C3AB3C 8024012C 8FB10014 */ lw $s1, 0x14($sp) -/* C3AB40 80240130 8FB00010 */ lw $s0, 0x10($sp) -/* C3AB44 80240134 03E00008 */ jr $ra -/* C3AB48 80240138 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024006C_C3DC5C.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024006C_C3DC5C.s deleted file mode 100644 index 2b4d2174ef..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024006C_C3DC5C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* C3DC5C 8024006C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3DC60 80240070 AFB10014 */ sw $s1, 0x14($sp) -/* C3DC64 80240074 0080882D */ daddu $s1, $a0, $zero -/* C3DC68 80240078 AFBF0018 */ sw $ra, 0x18($sp) -/* C3DC6C 8024007C AFB00010 */ sw $s0, 0x10($sp) -/* C3DC70 80240080 8E300148 */ lw $s0, 0x148($s1) -/* C3DC74 80240084 0C00EABB */ jal get_npc_unsafe -/* C3DC78 80240088 86040008 */ lh $a0, 8($s0) -/* C3DC7C 8024008C 0040202D */ daddu $a0, $v0, $zero -/* C3DC80 80240090 9482008E */ lhu $v0, 0x8e($a0) -/* C3DC84 80240094 2442FFFF */ addiu $v0, $v0, -1 -/* C3DC88 80240098 A482008E */ sh $v0, 0x8e($a0) -/* C3DC8C 8024009C 00021400 */ sll $v0, $v0, 0x10 -/* C3DC90 802400A0 1C400009 */ bgtz $v0, .L802400C8 -/* C3DC94 802400A4 24020003 */ addiu $v0, $zero, 3 -/* C3DC98 802400A8 96030076 */ lhu $v1, 0x76($s0) -/* C3DC9C 802400AC AE02006C */ sw $v0, 0x6c($s0) -/* C3DCA0 802400B0 A483008E */ sh $v1, 0x8e($a0) -/* C3DCA4 802400B4 8E0200CC */ lw $v0, 0xcc($s0) -/* C3DCA8 802400B8 8C420024 */ lw $v0, 0x24($v0) -/* C3DCAC 802400BC AC820028 */ sw $v0, 0x28($a0) -/* C3DCB0 802400C0 24020020 */ addiu $v0, $zero, 0x20 -/* C3DCB4 802400C4 AE220070 */ sw $v0, 0x70($s1) -.L802400C8: -/* C3DCB8 802400C8 8FBF0018 */ lw $ra, 0x18($sp) -/* C3DCBC 802400CC 8FB10014 */ lw $s1, 0x14($sp) -/* C3DCC0 802400D0 8FB00010 */ lw $s0, 0x10($sp) -/* C3DCC4 802400D4 03E00008 */ jr $ra -/* C3DCC8 802400D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240EFC_C40CAC.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240EFC_C40CAC.s deleted file mode 100644 index 314a07dfae..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240EFC_C40CAC.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* C40CAC 80240EFC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C40CB0 80240F00 AFB10014 */ sw $s1, 0x14($sp) -/* C40CB4 80240F04 0080882D */ daddu $s1, $a0, $zero -/* C40CB8 80240F08 AFBF0018 */ sw $ra, 0x18($sp) -/* C40CBC 80240F0C AFB00010 */ sw $s0, 0x10($sp) -/* C40CC0 80240F10 8E300148 */ lw $s0, 0x148($s1) -/* C40CC4 80240F14 0C00EABB */ jal get_npc_unsafe -/* C40CC8 80240F18 86040008 */ lh $a0, 8($s0) -/* C40CCC 80240F1C 0040202D */ daddu $a0, $v0, $zero -/* C40CD0 80240F20 9482008E */ lhu $v0, 0x8e($a0) -/* C40CD4 80240F24 2442FFFF */ addiu $v0, $v0, -1 -/* C40CD8 80240F28 A482008E */ sh $v0, 0x8e($a0) -/* C40CDC 80240F2C 00021400 */ sll $v0, $v0, 0x10 -/* C40CE0 80240F30 1C400009 */ bgtz $v0, .L80240F58 -/* C40CE4 80240F34 24020003 */ addiu $v0, $zero, 3 -/* C40CE8 80240F38 96030076 */ lhu $v1, 0x76($s0) -/* C40CEC 80240F3C AE02006C */ sw $v0, 0x6c($s0) -/* C40CF0 80240F40 A483008E */ sh $v1, 0x8e($a0) -/* C40CF4 80240F44 8E0200CC */ lw $v0, 0xcc($s0) -/* C40CF8 80240F48 8C420024 */ lw $v0, 0x24($v0) -/* C40CFC 80240F4C AC820028 */ sw $v0, 0x28($a0) -/* C40D00 80240F50 24020020 */ addiu $v0, $zero, 0x20 -/* C40D04 80240F54 AE220070 */ sw $v0, 0x70($s1) -.L80240F58: -/* C40D08 80240F58 8FBF0018 */ lw $ra, 0x18($sp) -/* C40D0C 80240F5C 8FB10014 */ lw $s1, 0x14($sp) -/* C40D10 80240F60 8FB00010 */ lw $s0, 0x10($sp) -/* C40D14 80240F64 03E00008 */ jr $ra -/* C40D18 80240F68 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024006C_C46C4C.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024006C_C46C4C.s deleted file mode 100644 index d3ba5c5e07..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024006C_C46C4C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* C46C4C 8024006C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C46C50 80240070 AFB10014 */ sw $s1, 0x14($sp) -/* C46C54 80240074 0080882D */ daddu $s1, $a0, $zero -/* C46C58 80240078 AFBF0018 */ sw $ra, 0x18($sp) -/* C46C5C 8024007C AFB00010 */ sw $s0, 0x10($sp) -/* C46C60 80240080 8E300148 */ lw $s0, 0x148($s1) -/* C46C64 80240084 0C00EABB */ jal get_npc_unsafe -/* C46C68 80240088 86040008 */ lh $a0, 8($s0) -/* C46C6C 8024008C 0040202D */ daddu $a0, $v0, $zero -/* C46C70 80240090 9482008E */ lhu $v0, 0x8e($a0) -/* C46C74 80240094 2442FFFF */ addiu $v0, $v0, -1 -/* C46C78 80240098 A482008E */ sh $v0, 0x8e($a0) -/* C46C7C 8024009C 00021400 */ sll $v0, $v0, 0x10 -/* C46C80 802400A0 1C400009 */ bgtz $v0, .L802400C8 -/* C46C84 802400A4 24020003 */ addiu $v0, $zero, 3 -/* C46C88 802400A8 96030076 */ lhu $v1, 0x76($s0) -/* C46C8C 802400AC AE02006C */ sw $v0, 0x6c($s0) -/* C46C90 802400B0 A483008E */ sh $v1, 0x8e($a0) -/* C46C94 802400B4 8E0200CC */ lw $v0, 0xcc($s0) -/* C46C98 802400B8 8C420024 */ lw $v0, 0x24($v0) -/* C46C9C 802400BC AC820028 */ sw $v0, 0x28($a0) -/* C46CA0 802400C0 24020020 */ addiu $v0, $zero, 0x20 -/* C46CA4 802400C4 AE220070 */ sw $v0, 0x70($s1) -.L802400C8: -/* C46CA8 802400C8 8FBF0018 */ lw $ra, 0x18($sp) -/* C46CAC 802400CC 8FB10014 */ lw $s1, 0x14($sp) -/* C46CB0 802400D0 8FB00010 */ lw $s0, 0x10($sp) -/* C46CB4 802400D4 03E00008 */ jr $ra -/* C46CB8 802400D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024006C_C4F57C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024006C_C4F57C.s deleted file mode 100644 index a685eb64fc..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024006C_C4F57C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* C4F57C 8024006C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C4F580 80240070 AFB10014 */ sw $s1, 0x14($sp) -/* C4F584 80240074 0080882D */ daddu $s1, $a0, $zero -/* C4F588 80240078 AFBF0018 */ sw $ra, 0x18($sp) -/* C4F58C 8024007C AFB00010 */ sw $s0, 0x10($sp) -/* C4F590 80240080 8E300148 */ lw $s0, 0x148($s1) -/* C4F594 80240084 0C00EABB */ jal get_npc_unsafe -/* C4F598 80240088 86040008 */ lh $a0, 8($s0) -/* C4F59C 8024008C 0040202D */ daddu $a0, $v0, $zero -/* C4F5A0 80240090 9482008E */ lhu $v0, 0x8e($a0) -/* C4F5A4 80240094 2442FFFF */ addiu $v0, $v0, -1 -/* C4F5A8 80240098 A482008E */ sh $v0, 0x8e($a0) -/* C4F5AC 8024009C 00021400 */ sll $v0, $v0, 0x10 -/* C4F5B0 802400A0 1C400009 */ bgtz $v0, .L802400C8 -/* C4F5B4 802400A4 24020003 */ addiu $v0, $zero, 3 -/* C4F5B8 802400A8 96030076 */ lhu $v1, 0x76($s0) -/* C4F5BC 802400AC AE02006C */ sw $v0, 0x6c($s0) -/* C4F5C0 802400B0 A483008E */ sh $v1, 0x8e($a0) -/* C4F5C4 802400B4 8E0200CC */ lw $v0, 0xcc($s0) -/* C4F5C8 802400B8 8C420024 */ lw $v0, 0x24($v0) -/* C4F5CC 802400BC AC820028 */ sw $v0, 0x28($a0) -/* C4F5D0 802400C0 24020020 */ addiu $v0, $zero, 0x20 -/* C4F5D4 802400C4 AE220070 */ sw $v0, 0x70($s1) -.L802400C8: -/* C4F5D8 802400C8 8FBF0018 */ lw $ra, 0x18($sp) -/* C4F5DC 802400CC 8FB10014 */ lw $s1, 0x14($sp) -/* C4F5E0 802400D0 8FB00010 */ lw $s0, 0x10($sp) -/* C4F5E4 802400D4 03E00008 */ jr $ra -/* C4F5E8 802400D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024006C_C525AC.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024006C_C525AC.s deleted file mode 100644 index 4787e4b4d3..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024006C_C525AC.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* C525AC 8024006C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C525B0 80240070 AFB10014 */ sw $s1, 0x14($sp) -/* C525B4 80240074 0080882D */ daddu $s1, $a0, $zero -/* C525B8 80240078 AFBF0018 */ sw $ra, 0x18($sp) -/* C525BC 8024007C AFB00010 */ sw $s0, 0x10($sp) -/* C525C0 80240080 8E300148 */ lw $s0, 0x148($s1) -/* C525C4 80240084 0C00EABB */ jal get_npc_unsafe -/* C525C8 80240088 86040008 */ lh $a0, 8($s0) -/* C525CC 8024008C 0040202D */ daddu $a0, $v0, $zero -/* C525D0 80240090 9482008E */ lhu $v0, 0x8e($a0) -/* C525D4 80240094 2442FFFF */ addiu $v0, $v0, -1 -/* C525D8 80240098 A482008E */ sh $v0, 0x8e($a0) -/* C525DC 8024009C 00021400 */ sll $v0, $v0, 0x10 -/* C525E0 802400A0 1C400009 */ bgtz $v0, .L802400C8 -/* C525E4 802400A4 24020003 */ addiu $v0, $zero, 3 -/* C525E8 802400A8 96030076 */ lhu $v1, 0x76($s0) -/* C525EC 802400AC AE02006C */ sw $v0, 0x6c($s0) -/* C525F0 802400B0 A483008E */ sh $v1, 0x8e($a0) -/* C525F4 802400B4 8E0200CC */ lw $v0, 0xcc($s0) -/* C525F8 802400B8 8C420024 */ lw $v0, 0x24($v0) -/* C525FC 802400BC AC820028 */ sw $v0, 0x28($a0) -/* C52600 802400C0 24020020 */ addiu $v0, $zero, 0x20 -/* C52604 802400C4 AE220070 */ sw $v0, 0x70($s1) -.L802400C8: -/* C52608 802400C8 8FBF0018 */ lw $ra, 0x18($sp) -/* C5260C 802400CC 8FB10014 */ lw $s1, 0x14($sp) -/* C52610 802400D0 8FB00010 */ lw $s0, 0x10($sp) -/* C52614 802400D4 03E00008 */ jr $ra -/* C52618 802400D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241938_B4C3A8.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241938_B4C3A8.s deleted file mode 100644 index 0bad0bbdfe..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241938_B4C3A8.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241938_B4C3A8 -/* B4C3A8 80241938 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B4C3AC 8024193C AFB10014 */ sw $s1, 0x14($sp) -/* B4C3B0 80241940 0080882D */ daddu $s1, $a0, $zero -/* B4C3B4 80241944 AFBF0018 */ sw $ra, 0x18($sp) -/* B4C3B8 80241948 AFB00010 */ sw $s0, 0x10($sp) -/* B4C3BC 8024194C 8E300148 */ lw $s0, 0x148($s1) -/* B4C3C0 80241950 0C00EABB */ jal get_npc_unsafe -/* B4C3C4 80241954 86040008 */ lh $a0, 8($s0) -/* B4C3C8 80241958 0040202D */ daddu $a0, $v0, $zero -/* B4C3CC 8024195C 9482008E */ lhu $v0, 0x8e($a0) -/* B4C3D0 80241960 2442FFFF */ addiu $v0, $v0, -1 -/* B4C3D4 80241964 A482008E */ sh $v0, 0x8e($a0) -/* B4C3D8 80241968 00021400 */ sll $v0, $v0, 0x10 -/* B4C3DC 8024196C 1C400009 */ bgtz $v0, .L80241994 -/* B4C3E0 80241970 24020003 */ addiu $v0, $zero, 3 -/* B4C3E4 80241974 96030076 */ lhu $v1, 0x76($s0) -/* B4C3E8 80241978 AE02006C */ sw $v0, 0x6c($s0) -/* B4C3EC 8024197C A483008E */ sh $v1, 0x8e($a0) -/* B4C3F0 80241980 8E0200CC */ lw $v0, 0xcc($s0) -/* B4C3F4 80241984 8C420024 */ lw $v0, 0x24($v0) -/* B4C3F8 80241988 AC820028 */ sw $v0, 0x28($a0) -/* B4C3FC 8024198C 24020020 */ addiu $v0, $zero, 0x20 -/* B4C400 80241990 AE220070 */ sw $v0, 0x70($s1) -.L80241994: -/* B4C404 80241994 8FBF0018 */ lw $ra, 0x18($sp) -/* B4C408 80241998 8FB10014 */ lw $s1, 0x14($sp) -/* B4C40C 8024199C 8FB00010 */ lw $s0, 0x10($sp) -/* B4C410 802419A0 03E00008 */ jr $ra -/* B4C414 802419A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241888_B540B8.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241888_B540B8.s deleted file mode 100644 index ceb4518f66..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241888_B540B8.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* B540B8 80241888 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B540BC 8024188C AFB10014 */ sw $s1, 0x14($sp) -/* B540C0 80241890 0080882D */ daddu $s1, $a0, $zero -/* B540C4 80241894 AFBF0018 */ sw $ra, 0x18($sp) -/* B540C8 80241898 AFB00010 */ sw $s0, 0x10($sp) -/* B540CC 8024189C 8E300148 */ lw $s0, 0x148($s1) -/* B540D0 802418A0 0C00EABB */ jal get_npc_unsafe -/* B540D4 802418A4 86040008 */ lh $a0, 8($s0) -/* B540D8 802418A8 0040202D */ daddu $a0, $v0, $zero -/* B540DC 802418AC 9482008E */ lhu $v0, 0x8e($a0) -/* B540E0 802418B0 2442FFFF */ addiu $v0, $v0, -1 -/* B540E4 802418B4 A482008E */ sh $v0, 0x8e($a0) -/* B540E8 802418B8 00021400 */ sll $v0, $v0, 0x10 -/* B540EC 802418BC 1C400009 */ bgtz $v0, .L802418E4 -/* B540F0 802418C0 24020003 */ addiu $v0, $zero, 3 -/* B540F4 802418C4 96030076 */ lhu $v1, 0x76($s0) -/* B540F8 802418C8 AE02006C */ sw $v0, 0x6c($s0) -/* B540FC 802418CC A483008E */ sh $v1, 0x8e($a0) -/* B54100 802418D0 8E0200CC */ lw $v0, 0xcc($s0) -/* B54104 802418D4 8C420024 */ lw $v0, 0x24($v0) -/* B54108 802418D8 AC820028 */ sw $v0, 0x28($a0) -/* B5410C 802418DC 24020020 */ addiu $v0, $zero, 0x20 -/* B54110 802418E0 AE220070 */ sw $v0, 0x70($s1) -.L802418E4: -/* B54114 802418E4 8FBF0018 */ lw $ra, 0x18($sp) -/* B54118 802418E8 8FB10014 */ lw $s1, 0x14($sp) -/* B5411C 802418EC 8FB00010 */ lw $s0, 0x10($sp) -/* B54120 802418F0 03E00008 */ jr $ra -/* B54124 802418F4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240280_B59AF0.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240280_B59AF0.s deleted file mode 100644 index fd3ba15f05..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240280_B59AF0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* B59AF0 80240280 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B59AF4 80240284 AFB10014 */ sw $s1, 0x14($sp) -/* B59AF8 80240288 0080882D */ daddu $s1, $a0, $zero -/* B59AFC 8024028C AFBF0018 */ sw $ra, 0x18($sp) -/* B59B00 80240290 AFB00010 */ sw $s0, 0x10($sp) -/* B59B04 80240294 8E300148 */ lw $s0, 0x148($s1) -/* B59B08 80240298 0C00EABB */ jal get_npc_unsafe -/* B59B0C 8024029C 86040008 */ lh $a0, 8($s0) -/* B59B10 802402A0 0040202D */ daddu $a0, $v0, $zero -/* B59B14 802402A4 9482008E */ lhu $v0, 0x8e($a0) -/* B59B18 802402A8 2442FFFF */ addiu $v0, $v0, -1 -/* B59B1C 802402AC A482008E */ sh $v0, 0x8e($a0) -/* B59B20 802402B0 00021400 */ sll $v0, $v0, 0x10 -/* B59B24 802402B4 1C400009 */ bgtz $v0, .L802402DC -/* B59B28 802402B8 24020003 */ addiu $v0, $zero, 3 -/* B59B2C 802402BC 96030076 */ lhu $v1, 0x76($s0) -/* B59B30 802402C0 AE02006C */ sw $v0, 0x6c($s0) -/* B59B34 802402C4 A483008E */ sh $v1, 0x8e($a0) -/* B59B38 802402C8 8E0200CC */ lw $v0, 0xcc($s0) -/* B59B3C 802402CC 8C420024 */ lw $v0, 0x24($v0) -/* B59B40 802402D0 AC820028 */ sw $v0, 0x28($a0) -/* B59B44 802402D4 24020020 */ addiu $v0, $zero, 0x20 -/* B59B48 802402D8 AE220070 */ sw $v0, 0x70($s1) -.L802402DC: -/* B59B4C 802402DC 8FBF0018 */ lw $ra, 0x18($sp) -/* B59B50 802402E0 8FB10014 */ lw $s1, 0x14($sp) -/* B59B54 802402E4 8FB00010 */ lw $s0, 0x10($sp) -/* B59B58 802402E8 03E00008 */ jr $ra -/* B59B5C 802402EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802416D4_B5F984.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802416D4_B5F984.s deleted file mode 100644 index 0007e403f9..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802416D4_B5F984.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* B5F984 802416D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5F988 802416D8 AFB10014 */ sw $s1, 0x14($sp) -/* B5F98C 802416DC 0080882D */ daddu $s1, $a0, $zero -/* B5F990 802416E0 AFBF0018 */ sw $ra, 0x18($sp) -/* B5F994 802416E4 AFB00010 */ sw $s0, 0x10($sp) -/* B5F998 802416E8 8E300148 */ lw $s0, 0x148($s1) -/* B5F99C 802416EC 0C00EABB */ jal get_npc_unsafe -/* B5F9A0 802416F0 86040008 */ lh $a0, 8($s0) -/* B5F9A4 802416F4 0040202D */ daddu $a0, $v0, $zero -/* B5F9A8 802416F8 9482008E */ lhu $v0, 0x8e($a0) -/* B5F9AC 802416FC 2442FFFF */ addiu $v0, $v0, -1 -/* B5F9B0 80241700 A482008E */ sh $v0, 0x8e($a0) -/* B5F9B4 80241704 00021400 */ sll $v0, $v0, 0x10 -/* B5F9B8 80241708 1C400009 */ bgtz $v0, .L80241730 -/* B5F9BC 8024170C 24020003 */ addiu $v0, $zero, 3 -/* B5F9C0 80241710 96030076 */ lhu $v1, 0x76($s0) -/* B5F9C4 80241714 AE02006C */ sw $v0, 0x6c($s0) -/* B5F9C8 80241718 A483008E */ sh $v1, 0x8e($a0) -/* B5F9CC 8024171C 8E0200CC */ lw $v0, 0xcc($s0) -/* B5F9D0 80241720 8C420024 */ lw $v0, 0x24($v0) -/* B5F9D4 80241724 AC820028 */ sw $v0, 0x28($a0) -/* B5F9D8 80241728 24020020 */ addiu $v0, $zero, 0x20 -/* B5F9DC 8024172C AE220070 */ sw $v0, 0x70($s1) -.L80241730: -/* B5F9E0 80241730 8FBF0018 */ lw $ra, 0x18($sp) -/* B5F9E4 80241734 8FB10014 */ lw $s1, 0x14($sp) -/* B5F9E8 80241738 8FB00010 */ lw $s0, 0x10($sp) -/* B5F9EC 8024173C 03E00008 */ jr $ra -/* B5F9F0 80241740 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240BC0_B66670.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240BC0_B66670.s deleted file mode 100644 index 63fdc7fb28..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240BC0_B66670.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* B66670 80240BC0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B66674 80240BC4 AFB10014 */ sw $s1, 0x14($sp) -/* B66678 80240BC8 0080882D */ daddu $s1, $a0, $zero -/* B6667C 80240BCC AFBF0018 */ sw $ra, 0x18($sp) -/* B66680 80240BD0 AFB00010 */ sw $s0, 0x10($sp) -/* B66684 80240BD4 8E300148 */ lw $s0, 0x148($s1) -/* B66688 80240BD8 0C00EABB */ jal get_npc_unsafe -/* B6668C 80240BDC 86040008 */ lh $a0, 8($s0) -/* B66690 80240BE0 0040202D */ daddu $a0, $v0, $zero -/* B66694 80240BE4 9482008E */ lhu $v0, 0x8e($a0) -/* B66698 80240BE8 2442FFFF */ addiu $v0, $v0, -1 -/* B6669C 80240BEC A482008E */ sh $v0, 0x8e($a0) -/* B666A0 80240BF0 00021400 */ sll $v0, $v0, 0x10 -/* B666A4 80240BF4 1C400009 */ bgtz $v0, .L80240C1C -/* B666A8 80240BF8 24020003 */ addiu $v0, $zero, 3 -/* B666AC 80240BFC 96030076 */ lhu $v1, 0x76($s0) -/* B666B0 80240C00 AE02006C */ sw $v0, 0x6c($s0) -/* B666B4 80240C04 A483008E */ sh $v1, 0x8e($a0) -/* B666B8 80240C08 8E0200CC */ lw $v0, 0xcc($s0) -/* B666BC 80240C0C 8C420024 */ lw $v0, 0x24($v0) -/* B666C0 80240C10 AC820028 */ sw $v0, 0x28($a0) -/* B666C4 80240C14 24020020 */ addiu $v0, $zero, 0x20 -/* B666C8 80240C18 AE220070 */ sw $v0, 0x70($s1) -.L80240C1C: -/* B666CC 80240C1C 8FBF0018 */ lw $ra, 0x18($sp) -/* B666D0 80240C20 8FB10014 */ lw $s1, 0x14($sp) -/* B666D4 80240C24 8FB00010 */ lw $s0, 0x10($sp) -/* B666D8 80240C28 03E00008 */ jr $ra -/* B666DC 80240C2C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240740_B737F0.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240740_B737F0.s deleted file mode 100644 index 604576092c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240740_B737F0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* B737F0 80240740 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B737F4 80240744 AFB10014 */ sw $s1, 0x14($sp) -/* B737F8 80240748 0080882D */ daddu $s1, $a0, $zero -/* B737FC 8024074C AFBF0018 */ sw $ra, 0x18($sp) -/* B73800 80240750 AFB00010 */ sw $s0, 0x10($sp) -/* B73804 80240754 8E300148 */ lw $s0, 0x148($s1) -/* B73808 80240758 0C00EABB */ jal get_npc_unsafe -/* B7380C 8024075C 86040008 */ lh $a0, 8($s0) -/* B73810 80240760 0040202D */ daddu $a0, $v0, $zero -/* B73814 80240764 9482008E */ lhu $v0, 0x8e($a0) -/* B73818 80240768 2442FFFF */ addiu $v0, $v0, -1 -/* B7381C 8024076C A482008E */ sh $v0, 0x8e($a0) -/* B73820 80240770 00021400 */ sll $v0, $v0, 0x10 -/* B73824 80240774 1C400009 */ bgtz $v0, .L8024079C -/* B73828 80240778 24020003 */ addiu $v0, $zero, 3 -/* B7382C 8024077C 96030076 */ lhu $v1, 0x76($s0) -/* B73830 80240780 AE02006C */ sw $v0, 0x6c($s0) -/* B73834 80240784 A483008E */ sh $v1, 0x8e($a0) -/* B73838 80240788 8E0200CC */ lw $v0, 0xcc($s0) -/* B7383C 8024078C 8C420024 */ lw $v0, 0x24($v0) -/* B73840 80240790 AC820028 */ sw $v0, 0x28($a0) -/* B73844 80240794 24020020 */ addiu $v0, $zero, 0x20 -/* B73848 80240798 AE220070 */ sw $v0, 0x70($s1) -.L8024079C: -/* B7384C 8024079C 8FBF0018 */ lw $ra, 0x18($sp) -/* B73850 802407A0 8FB10014 */ lw $s1, 0x14($sp) -/* B73854 802407A4 8FB00010 */ lw $s0, 0x10($sp) -/* B73858 802407A8 03E00008 */ jr $ra -/* B7385C 802407AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240C64_C61974.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240C64_C61974.s deleted file mode 100644 index b36c547974..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240C64_C61974.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* C61974 80240C64 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C61978 80240C68 AFB10014 */ sw $s1, 0x14($sp) -/* C6197C 80240C6C 0080882D */ daddu $s1, $a0, $zero -/* C61980 80240C70 AFBF0018 */ sw $ra, 0x18($sp) -/* C61984 80240C74 AFB00010 */ sw $s0, 0x10($sp) -/* C61988 80240C78 8E300148 */ lw $s0, 0x148($s1) -/* C6198C 80240C7C 0C00EABB */ jal get_npc_unsafe -/* C61990 80240C80 86040008 */ lh $a0, 8($s0) -/* C61994 80240C84 0040202D */ daddu $a0, $v0, $zero -/* C61998 80240C88 9482008E */ lhu $v0, 0x8e($a0) -/* C6199C 80240C8C 2442FFFF */ addiu $v0, $v0, -1 -/* C619A0 80240C90 A482008E */ sh $v0, 0x8e($a0) -/* C619A4 80240C94 00021400 */ sll $v0, $v0, 0x10 -/* C619A8 80240C98 1C400009 */ bgtz $v0, .L80240CC0 -/* C619AC 80240C9C 24020003 */ addiu $v0, $zero, 3 -/* C619B0 80240CA0 96030076 */ lhu $v1, 0x76($s0) -/* C619B4 80240CA4 AE02006C */ sw $v0, 0x6c($s0) -/* C619B8 80240CA8 A483008E */ sh $v1, 0x8e($a0) -/* C619BC 80240CAC 8E0200CC */ lw $v0, 0xcc($s0) -/* C619C0 80240CB0 8C420024 */ lw $v0, 0x24($v0) -/* C619C4 80240CB4 AC820028 */ sw $v0, 0x28($a0) -/* C619C8 80240CB8 24020020 */ addiu $v0, $zero, 0x20 -/* C619CC 80240CBC AE220070 */ sw $v0, 0x70($s1) -.L80240CC0: -/* C619D0 80240CC0 8FBF0018 */ lw $ra, 0x18($sp) -/* C619D4 80240CC4 8FB10014 */ lw $s1, 0x14($sp) -/* C619D8 80240CC8 8FB00010 */ lw $s0, 0x10($sp) -/* C619DC 80240CCC 03E00008 */ jr $ra -/* C619E0 80240CD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802425A8_C73A28.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802425A8_C73A28.s deleted file mode 100644 index f31beb78bd..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802425A8_C73A28.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* C73A28 802425A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C73A2C 802425AC AFB10014 */ sw $s1, 0x14($sp) -/* C73A30 802425B0 0080882D */ daddu $s1, $a0, $zero -/* C73A34 802425B4 AFBF0018 */ sw $ra, 0x18($sp) -/* C73A38 802425B8 AFB00010 */ sw $s0, 0x10($sp) -/* C73A3C 802425BC 8E300148 */ lw $s0, 0x148($s1) -/* C73A40 802425C0 0C00EABB */ jal get_npc_unsafe -/* C73A44 802425C4 86040008 */ lh $a0, 8($s0) -/* C73A48 802425C8 0040202D */ daddu $a0, $v0, $zero -/* C73A4C 802425CC 9482008E */ lhu $v0, 0x8e($a0) -/* C73A50 802425D0 2442FFFF */ addiu $v0, $v0, -1 -/* C73A54 802425D4 A482008E */ sh $v0, 0x8e($a0) -/* C73A58 802425D8 00021400 */ sll $v0, $v0, 0x10 -/* C73A5C 802425DC 1C400009 */ bgtz $v0, .L80242604 -/* C73A60 802425E0 24020003 */ addiu $v0, $zero, 3 -/* C73A64 802425E4 96030076 */ lhu $v1, 0x76($s0) -/* C73A68 802425E8 AE02006C */ sw $v0, 0x6c($s0) -/* C73A6C 802425EC A483008E */ sh $v1, 0x8e($a0) -/* C73A70 802425F0 8E0200CC */ lw $v0, 0xcc($s0) -/* C73A74 802425F4 8C420024 */ lw $v0, 0x24($v0) -/* C73A78 802425F8 AC820028 */ sw $v0, 0x28($a0) -/* C73A7C 802425FC 24020020 */ addiu $v0, $zero, 0x20 -/* C73A80 80242600 AE220070 */ sw $v0, 0x70($s1) -.L80242604: -/* C73A84 80242604 8FBF0018 */ lw $ra, 0x18($sp) -/* C73A88 80242608 8FB10014 */ lw $s1, 0x14($sp) -/* C73A8C 8024260C 8FB00010 */ lw $s0, 0x10($sp) -/* C73A90 80242610 03E00008 */ jr $ra -/* C73A94 80242614 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024108C_C77D6C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024108C_C77D6C.s deleted file mode 100644 index 94262e2ad8..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024108C_C77D6C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* C77D6C 8024108C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C77D70 80241090 AFB10014 */ sw $s1, 0x14($sp) -/* C77D74 80241094 0080882D */ daddu $s1, $a0, $zero -/* C77D78 80241098 AFBF0018 */ sw $ra, 0x18($sp) -/* C77D7C 8024109C AFB00010 */ sw $s0, 0x10($sp) -/* C77D80 802410A0 8E300148 */ lw $s0, 0x148($s1) -/* C77D84 802410A4 0C00EABB */ jal get_npc_unsafe -/* C77D88 802410A8 86040008 */ lh $a0, 8($s0) -/* C77D8C 802410AC 0040202D */ daddu $a0, $v0, $zero -/* C77D90 802410B0 9482008E */ lhu $v0, 0x8e($a0) -/* C77D94 802410B4 2442FFFF */ addiu $v0, $v0, -1 -/* C77D98 802410B8 A482008E */ sh $v0, 0x8e($a0) -/* C77D9C 802410BC 00021400 */ sll $v0, $v0, 0x10 -/* C77DA0 802410C0 1C400009 */ bgtz $v0, .L802410E8 -/* C77DA4 802410C4 24020003 */ addiu $v0, $zero, 3 -/* C77DA8 802410C8 96030076 */ lhu $v1, 0x76($s0) -/* C77DAC 802410CC AE02006C */ sw $v0, 0x6c($s0) -/* C77DB0 802410D0 A483008E */ sh $v1, 0x8e($a0) -/* C77DB4 802410D4 8E0200CC */ lw $v0, 0xcc($s0) -/* C77DB8 802410D8 8C420024 */ lw $v0, 0x24($v0) -/* C77DBC 802410DC AC820028 */ sw $v0, 0x28($a0) -/* C77DC0 802410E0 24020020 */ addiu $v0, $zero, 0x20 -/* C77DC4 802410E4 AE220070 */ sw $v0, 0x70($s1) -.L802410E8: -/* C77DC8 802410E8 8FBF0018 */ lw $ra, 0x18($sp) -/* C77DCC 802410EC 8FB10014 */ lw $s1, 0x14($sp) -/* C77DD0 802410F0 8FB00010 */ lw $s0, 0x10($sp) -/* C77DD4 802410F4 03E00008 */ jr $ra -/* C77DD8 802410F8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024037C_C85E2C.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024037C_C85E2C.s deleted file mode 100644 index 782b732eb0..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024037C_C85E2C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* C85E2C 8024037C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C85E30 80240380 AFB10014 */ sw $s1, 0x14($sp) -/* C85E34 80240384 0080882D */ daddu $s1, $a0, $zero -/* C85E38 80240388 AFBF0018 */ sw $ra, 0x18($sp) -/* C85E3C 8024038C AFB00010 */ sw $s0, 0x10($sp) -/* C85E40 80240390 8E300148 */ lw $s0, 0x148($s1) -/* C85E44 80240394 0C00EABB */ jal get_npc_unsafe -/* C85E48 80240398 86040008 */ lh $a0, 8($s0) -/* C85E4C 8024039C 0040202D */ daddu $a0, $v0, $zero -/* C85E50 802403A0 9482008E */ lhu $v0, 0x8e($a0) -/* C85E54 802403A4 2442FFFF */ addiu $v0, $v0, -1 -/* C85E58 802403A8 A482008E */ sh $v0, 0x8e($a0) -/* C85E5C 802403AC 00021400 */ sll $v0, $v0, 0x10 -/* C85E60 802403B0 1C400009 */ bgtz $v0, .L802403D8 -/* C85E64 802403B4 24020003 */ addiu $v0, $zero, 3 -/* C85E68 802403B8 96030076 */ lhu $v1, 0x76($s0) -/* C85E6C 802403BC AE02006C */ sw $v0, 0x6c($s0) -/* C85E70 802403C0 A483008E */ sh $v1, 0x8e($a0) -/* C85E74 802403C4 8E0200CC */ lw $v0, 0xcc($s0) -/* C85E78 802403C8 8C420024 */ lw $v0, 0x24($v0) -/* C85E7C 802403CC AC820028 */ sw $v0, 0x28($a0) -/* C85E80 802403D0 24020020 */ addiu $v0, $zero, 0x20 -/* C85E84 802403D4 AE220070 */ sw $v0, 0x70($s1) -.L802403D8: -/* C85E88 802403D8 8FBF0018 */ lw $ra, 0x18($sp) -/* C85E8C 802403DC 8FB10014 */ lw $s1, 0x14($sp) -/* C85E90 802403E0 8FB00010 */ lw $s0, 0x10($sp) -/* C85E94 802403E4 03E00008 */ jr $ra -/* C85E98 802403E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_8024056C_B939AC.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_8024056C_B939AC.s deleted file mode 100644 index 4f83127125..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_8024056C_B939AC.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* B939AC 8024056C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B939B0 80240570 AFB10014 */ sw $s1, 0x14($sp) -/* B939B4 80240574 0080882D */ daddu $s1, $a0, $zero -/* B939B8 80240578 AFBF0018 */ sw $ra, 0x18($sp) -/* B939BC 8024057C AFB00010 */ sw $s0, 0x10($sp) -/* B939C0 80240580 8E300148 */ lw $s0, 0x148($s1) -/* B939C4 80240584 0C00EABB */ jal get_npc_unsafe -/* B939C8 80240588 86040008 */ lh $a0, 8($s0) -/* B939CC 8024058C 0040202D */ daddu $a0, $v0, $zero -/* B939D0 80240590 9482008E */ lhu $v0, 0x8e($a0) -/* B939D4 80240594 2442FFFF */ addiu $v0, $v0, -1 -/* B939D8 80240598 A482008E */ sh $v0, 0x8e($a0) -/* B939DC 8024059C 00021400 */ sll $v0, $v0, 0x10 -/* B939E0 802405A0 1C400009 */ bgtz $v0, .L802405C8 -/* B939E4 802405A4 24020003 */ addiu $v0, $zero, 3 -/* B939E8 802405A8 96030076 */ lhu $v1, 0x76($s0) -/* B939EC 802405AC AE02006C */ sw $v0, 0x6c($s0) -/* B939F0 802405B0 A483008E */ sh $v1, 0x8e($a0) -/* B939F4 802405B4 8E0200CC */ lw $v0, 0xcc($s0) -/* B939F8 802405B8 8C420024 */ lw $v0, 0x24($v0) -/* B939FC 802405BC AC820028 */ sw $v0, 0x28($a0) -/* B93A00 802405C0 24020020 */ addiu $v0, $zero, 0x20 -/* B93A04 802405C4 AE220070 */ sw $v0, 0x70($s1) -.L802405C8: -/* B93A08 802405C8 8FBF0018 */ lw $ra, 0x18($sp) -/* B93A0C 802405CC 8FB10014 */ lw $s1, 0x14($sp) -/* B93A10 802405D0 8FB00010 */ lw $s0, 0x10($sp) -/* B93A14 802405D4 03E00008 */ jr $ra -/* B93A18 802405D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802400DC_BA080C.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802400DC_BA080C.s deleted file mode 100644 index 828f343631..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802400DC_BA080C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* BA080C 802400DC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA0810 802400E0 AFB10014 */ sw $s1, 0x14($sp) -/* BA0814 802400E4 0080882D */ daddu $s1, $a0, $zero -/* BA0818 802400E8 AFBF0018 */ sw $ra, 0x18($sp) -/* BA081C 802400EC AFB00010 */ sw $s0, 0x10($sp) -/* BA0820 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* BA0824 802400F4 0C00EABB */ jal get_npc_unsafe -/* BA0828 802400F8 86040008 */ lh $a0, 8($s0) -/* BA082C 802400FC 0040202D */ daddu $a0, $v0, $zero -/* BA0830 80240100 9482008E */ lhu $v0, 0x8e($a0) -/* BA0834 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* BA0838 80240108 A482008E */ sh $v0, 0x8e($a0) -/* BA083C 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* BA0840 80240110 1C400009 */ bgtz $v0, .L80240138 -/* BA0844 80240114 24020003 */ addiu $v0, $zero, 3 -/* BA0848 80240118 96030076 */ lhu $v1, 0x76($s0) -/* BA084C 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* BA0850 80240120 A483008E */ sh $v1, 0x8e($a0) -/* BA0854 80240124 8E0200CC */ lw $v0, 0xcc($s0) -/* BA0858 80240128 8C420024 */ lw $v0, 0x24($v0) -/* BA085C 8024012C AC820028 */ sw $v0, 0x28($a0) -/* BA0860 80240130 24020020 */ addiu $v0, $zero, 0x20 -/* BA0864 80240134 AE220070 */ sw $v0, 0x70($s1) -.L80240138: -/* BA0868 80240138 8FBF0018 */ lw $ra, 0x18($sp) -/* BA086C 8024013C 8FB10014 */ lw $s1, 0x14($sp) -/* BA0870 80240140 8FB00010 */ lw $s0, 0x10($sp) -/* BA0874 80240144 03E00008 */ jr $ra -/* BA0878 80240148 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802405DC_BA4D5C.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802405DC_BA4D5C.s deleted file mode 100644 index 65435e5b32..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802405DC_BA4D5C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* BA4D5C 802405DC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA4D60 802405E0 AFB10014 */ sw $s1, 0x14($sp) -/* BA4D64 802405E4 0080882D */ daddu $s1, $a0, $zero -/* BA4D68 802405E8 AFBF0018 */ sw $ra, 0x18($sp) -/* BA4D6C 802405EC AFB00010 */ sw $s0, 0x10($sp) -/* BA4D70 802405F0 8E300148 */ lw $s0, 0x148($s1) -/* BA4D74 802405F4 0C00EABB */ jal get_npc_unsafe -/* BA4D78 802405F8 86040008 */ lh $a0, 8($s0) -/* BA4D7C 802405FC 0040202D */ daddu $a0, $v0, $zero -/* BA4D80 80240600 9482008E */ lhu $v0, 0x8e($a0) -/* BA4D84 80240604 2442FFFF */ addiu $v0, $v0, -1 -/* BA4D88 80240608 A482008E */ sh $v0, 0x8e($a0) -/* BA4D8C 8024060C 00021400 */ sll $v0, $v0, 0x10 -/* BA4D90 80240610 1C400009 */ bgtz $v0, .L80240638 -/* BA4D94 80240614 24020003 */ addiu $v0, $zero, 3 -/* BA4D98 80240618 96030076 */ lhu $v1, 0x76($s0) -/* BA4D9C 8024061C AE02006C */ sw $v0, 0x6c($s0) -/* BA4DA0 80240620 A483008E */ sh $v1, 0x8e($a0) -/* BA4DA4 80240624 8E0200CC */ lw $v0, 0xcc($s0) -/* BA4DA8 80240628 8C420024 */ lw $v0, 0x24($v0) -/* BA4DAC 8024062C AC820028 */ sw $v0, 0x28($a0) -/* BA4DB0 80240630 24020020 */ addiu $v0, $zero, 0x20 -/* BA4DB4 80240634 AE220070 */ sw $v0, 0x70($s1) -.L80240638: -/* BA4DB8 80240638 8FBF0018 */ lw $ra, 0x18($sp) -/* BA4DBC 8024063C 8FB10014 */ lw $s1, 0x14($sp) -/* BA4DC0 80240640 8FB00010 */ lw $s0, 0x10($sp) -/* BA4DC4 80240644 03E00008 */ jr $ra -/* BA4DC8 80240648 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241604_BAEF44.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241604_BAEF44.s deleted file mode 100644 index 5965cf51bb..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241604_BAEF44.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* BAEF44 80241604 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BAEF48 80241608 AFB10014 */ sw $s1, 0x14($sp) -/* BAEF4C 8024160C 0080882D */ daddu $s1, $a0, $zero -/* BAEF50 80241610 AFBF0018 */ sw $ra, 0x18($sp) -/* BAEF54 80241614 AFB00010 */ sw $s0, 0x10($sp) -/* BAEF58 80241618 8E300148 */ lw $s0, 0x148($s1) -/* BAEF5C 8024161C 0C00EABB */ jal get_npc_unsafe -/* BAEF60 80241620 86040008 */ lh $a0, 8($s0) -/* BAEF64 80241624 0040202D */ daddu $a0, $v0, $zero -/* BAEF68 80241628 9482008E */ lhu $v0, 0x8e($a0) -/* BAEF6C 8024162C 2442FFFF */ addiu $v0, $v0, -1 -/* BAEF70 80241630 A482008E */ sh $v0, 0x8e($a0) -/* BAEF74 80241634 00021400 */ sll $v0, $v0, 0x10 -/* BAEF78 80241638 1C400009 */ bgtz $v0, .L80241660 -/* BAEF7C 8024163C 24020003 */ addiu $v0, $zero, 3 -/* BAEF80 80241640 96030076 */ lhu $v1, 0x76($s0) -/* BAEF84 80241644 AE02006C */ sw $v0, 0x6c($s0) -/* BAEF88 80241648 A483008E */ sh $v1, 0x8e($a0) -/* BAEF8C 8024164C 8E0200CC */ lw $v0, 0xcc($s0) -/* BAEF90 80241650 8C420024 */ lw $v0, 0x24($v0) -/* BAEF94 80241654 AC820028 */ sw $v0, 0x28($a0) -/* BAEF98 80241658 24020020 */ addiu $v0, $zero, 0x20 -/* BAEF9C 8024165C AE220070 */ sw $v0, 0x70($s1) -.L80241660: -/* BAEFA0 80241660 8FBF0018 */ lw $ra, 0x18($sp) -/* BAEFA4 80241664 8FB10014 */ lw $s1, 0x14($sp) -/* BAEFA8 80241668 8FB00010 */ lw $s0, 0x10($sp) -/* BAEFAC 8024166C 03E00008 */ jr $ra -/* BAEFB0 80241670 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241E1C_D8F06C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241E1C_D8F06C.s deleted file mode 100644 index 8d15a8ac12..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241E1C_D8F06C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* D8F06C 80241E1C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8F070 80241E20 AFB10014 */ sw $s1, 0x14($sp) -/* D8F074 80241E24 0080882D */ daddu $s1, $a0, $zero -/* D8F078 80241E28 AFBF0018 */ sw $ra, 0x18($sp) -/* D8F07C 80241E2C AFB00010 */ sw $s0, 0x10($sp) -/* D8F080 80241E30 8E300148 */ lw $s0, 0x148($s1) -/* D8F084 80241E34 0C00EABB */ jal get_npc_unsafe -/* D8F088 80241E38 86040008 */ lh $a0, 8($s0) -/* D8F08C 80241E3C 0040202D */ daddu $a0, $v0, $zero -/* D8F090 80241E40 9482008E */ lhu $v0, 0x8e($a0) -/* D8F094 80241E44 2442FFFF */ addiu $v0, $v0, -1 -/* D8F098 80241E48 A482008E */ sh $v0, 0x8e($a0) -/* D8F09C 80241E4C 00021400 */ sll $v0, $v0, 0x10 -/* D8F0A0 80241E50 1C400009 */ bgtz $v0, .L80241E78 -/* D8F0A4 80241E54 24020003 */ addiu $v0, $zero, 3 -/* D8F0A8 80241E58 96030076 */ lhu $v1, 0x76($s0) -/* D8F0AC 80241E5C AE02006C */ sw $v0, 0x6c($s0) -/* D8F0B0 80241E60 A483008E */ sh $v1, 0x8e($a0) -/* D8F0B4 80241E64 8E0200CC */ lw $v0, 0xcc($s0) -/* D8F0B8 80241E68 8C420024 */ lw $v0, 0x24($v0) -/* D8F0BC 80241E6C AC820028 */ sw $v0, 0x28($a0) -/* D8F0C0 80241E70 24020020 */ addiu $v0, $zero, 0x20 -/* D8F0C4 80241E74 AE220070 */ sw $v0, 0x70($s1) -.L80241E78: -/* D8F0C8 80241E78 8FBF0018 */ lw $ra, 0x18($sp) -/* D8F0CC 80241E7C 8FB10014 */ lw $s1, 0x14($sp) -/* D8F0D0 80241E80 8FB00010 */ lw $s0, 0x10($sp) -/* D8F0D4 80241E84 03E00008 */ jr $ra -/* D8F0D8 80241E88 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240FBC_D93EFC.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240FBC_D93EFC.s deleted file mode 100644 index cbc46863c6..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240FBC_D93EFC.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* D93EFC 80240FBC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D93F00 80240FC0 AFB10014 */ sw $s1, 0x14($sp) -/* D93F04 80240FC4 0080882D */ daddu $s1, $a0, $zero -/* D93F08 80240FC8 AFBF0018 */ sw $ra, 0x18($sp) -/* D93F0C 80240FCC AFB00010 */ sw $s0, 0x10($sp) -/* D93F10 80240FD0 8E300148 */ lw $s0, 0x148($s1) -/* D93F14 80240FD4 0C00EABB */ jal get_npc_unsafe -/* D93F18 80240FD8 86040008 */ lh $a0, 8($s0) -/* D93F1C 80240FDC 0040202D */ daddu $a0, $v0, $zero -/* D93F20 80240FE0 9482008E */ lhu $v0, 0x8e($a0) -/* D93F24 80240FE4 2442FFFF */ addiu $v0, $v0, -1 -/* D93F28 80240FE8 A482008E */ sh $v0, 0x8e($a0) -/* D93F2C 80240FEC 00021400 */ sll $v0, $v0, 0x10 -/* D93F30 80240FF0 1C400009 */ bgtz $v0, .L80241018 -/* D93F34 80240FF4 24020003 */ addiu $v0, $zero, 3 -/* D93F38 80240FF8 96030076 */ lhu $v1, 0x76($s0) -/* D93F3C 80240FFC AE02006C */ sw $v0, 0x6c($s0) -/* D93F40 80241000 A483008E */ sh $v1, 0x8e($a0) -/* D93F44 80241004 8E0200CC */ lw $v0, 0xcc($s0) -/* D93F48 80241008 8C420024 */ lw $v0, 0x24($v0) -/* D93F4C 8024100C AC820028 */ sw $v0, 0x28($a0) -/* D93F50 80241010 24020020 */ addiu $v0, $zero, 0x20 -/* D93F54 80241014 AE220070 */ sw $v0, 0x70($s1) -.L80241018: -/* D93F58 80241018 8FBF0018 */ lw $ra, 0x18($sp) -/* D93F5C 8024101C 8FB10014 */ lw $s1, 0x14($sp) -/* D93F60 80241020 8FB00010 */ lw $s0, 0x10($sp) -/* D93F64 80241024 03E00008 */ jr $ra -/* D93F68 80241028 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_802400BC_D1117C.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_802400BC_D1117C.s deleted file mode 100644 index 8712b610f1..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_802400BC_D1117C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* D1117C 802400BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D11180 802400C0 AFB10014 */ sw $s1, 0x14($sp) -/* D11184 802400C4 0080882D */ daddu $s1, $a0, $zero -/* D11188 802400C8 AFBF0018 */ sw $ra, 0x18($sp) -/* D1118C 802400CC AFB00010 */ sw $s0, 0x10($sp) -/* D11190 802400D0 8E300148 */ lw $s0, 0x148($s1) -/* D11194 802400D4 0C00EABB */ jal get_npc_unsafe -/* D11198 802400D8 86040008 */ lh $a0, 8($s0) -/* D1119C 802400DC 0040202D */ daddu $a0, $v0, $zero -/* D111A0 802400E0 9482008E */ lhu $v0, 0x8e($a0) -/* D111A4 802400E4 2442FFFF */ addiu $v0, $v0, -1 -/* D111A8 802400E8 A482008E */ sh $v0, 0x8e($a0) -/* D111AC 802400EC 00021400 */ sll $v0, $v0, 0x10 -/* D111B0 802400F0 1C400009 */ bgtz $v0, .L80240118 -/* D111B4 802400F4 24020003 */ addiu $v0, $zero, 3 -/* D111B8 802400F8 96030076 */ lhu $v1, 0x76($s0) -/* D111BC 802400FC AE02006C */ sw $v0, 0x6c($s0) -/* D111C0 80240100 A483008E */ sh $v1, 0x8e($a0) -/* D111C4 80240104 8E0200CC */ lw $v0, 0xcc($s0) -/* D111C8 80240108 8C420024 */ lw $v0, 0x24($v0) -/* D111CC 8024010C AC820028 */ sw $v0, 0x28($a0) -/* D111D0 80240110 24020020 */ addiu $v0, $zero, 0x20 -/* D111D4 80240114 AE220070 */ sw $v0, 0x70($s1) -.L80240118: -/* D111D8 80240118 8FBF0018 */ lw $ra, 0x18($sp) -/* D111DC 8024011C 8FB10014 */ lw $s1, 0x14($sp) -/* D111E0 80240120 8FB00010 */ lw $s0, 0x10($sp) -/* D111E4 80240124 03E00008 */ jr $ra -/* D111E8 80240128 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024006C_D1884C.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024006C_D1884C.s deleted file mode 100644 index db90faad74..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024006C_D1884C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* D1884C 8024006C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D18850 80240070 AFB10014 */ sw $s1, 0x14($sp) -/* D18854 80240074 0080882D */ daddu $s1, $a0, $zero -/* D18858 80240078 AFBF0018 */ sw $ra, 0x18($sp) -/* D1885C 8024007C AFB00010 */ sw $s0, 0x10($sp) -/* D18860 80240080 8E300148 */ lw $s0, 0x148($s1) -/* D18864 80240084 0C00EABB */ jal get_npc_unsafe -/* D18868 80240088 86040008 */ lh $a0, 8($s0) -/* D1886C 8024008C 0040202D */ daddu $a0, $v0, $zero -/* D18870 80240090 9482008E */ lhu $v0, 0x8e($a0) -/* D18874 80240094 2442FFFF */ addiu $v0, $v0, -1 -/* D18878 80240098 A482008E */ sh $v0, 0x8e($a0) -/* D1887C 8024009C 00021400 */ sll $v0, $v0, 0x10 -/* D18880 802400A0 1C400009 */ bgtz $v0, .L802400C8 -/* D18884 802400A4 24020003 */ addiu $v0, $zero, 3 -/* D18888 802400A8 96030076 */ lhu $v1, 0x76($s0) -/* D1888C 802400AC AE02006C */ sw $v0, 0x6c($s0) -/* D18890 802400B0 A483008E */ sh $v1, 0x8e($a0) -/* D18894 802400B4 8E0200CC */ lw $v0, 0xcc($s0) -/* D18898 802400B8 8C420024 */ lw $v0, 0x24($v0) -/* D1889C 802400BC AC820028 */ sw $v0, 0x28($a0) -/* D188A0 802400C0 24020020 */ addiu $v0, $zero, 0x20 -/* D188A4 802400C4 AE220070 */ sw $v0, 0x70($s1) -.L802400C8: -/* D188A8 802400C8 8FBF0018 */ lw $ra, 0x18($sp) -/* D188AC 802400CC 8FB10014 */ lw $s1, 0x14($sp) -/* D188B0 802400D0 8FB00010 */ lw $s0, 0x10($sp) -/* D188B4 802400D4 03E00008 */ jr $ra -/* D188B8 802400D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_802406BC_D2C3EC.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_802406BC_D2C3EC.s deleted file mode 100644 index ecff8c9213..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_802406BC_D2C3EC.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* D2C3EC 802406BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D2C3F0 802406C0 AFB10014 */ sw $s1, 0x14($sp) -/* D2C3F4 802406C4 0080882D */ daddu $s1, $a0, $zero -/* D2C3F8 802406C8 AFBF0018 */ sw $ra, 0x18($sp) -/* D2C3FC 802406CC AFB00010 */ sw $s0, 0x10($sp) -/* D2C400 802406D0 8E300148 */ lw $s0, 0x148($s1) -/* D2C404 802406D4 0C00EABB */ jal get_npc_unsafe -/* D2C408 802406D8 86040008 */ lh $a0, 8($s0) -/* D2C40C 802406DC 0040202D */ daddu $a0, $v0, $zero -/* D2C410 802406E0 9482008E */ lhu $v0, 0x8e($a0) -/* D2C414 802406E4 2442FFFF */ addiu $v0, $v0, -1 -/* D2C418 802406E8 A482008E */ sh $v0, 0x8e($a0) -/* D2C41C 802406EC 00021400 */ sll $v0, $v0, 0x10 -/* D2C420 802406F0 1C400009 */ bgtz $v0, .L80240718 -/* D2C424 802406F4 24020003 */ addiu $v0, $zero, 3 -/* D2C428 802406F8 96030076 */ lhu $v1, 0x76($s0) -/* D2C42C 802406FC AE02006C */ sw $v0, 0x6c($s0) -/* D2C430 80240700 A483008E */ sh $v1, 0x8e($a0) -/* D2C434 80240704 8E0200CC */ lw $v0, 0xcc($s0) -/* D2C438 80240708 8C420024 */ lw $v0, 0x24($v0) -/* D2C43C 8024070C AC820028 */ sw $v0, 0x28($a0) -/* D2C440 80240710 24020020 */ addiu $v0, $zero, 0x20 -/* D2C444 80240714 AE220070 */ sw $v0, 0x70($s1) -.L80240718: -/* D2C448 80240718 8FBF0018 */ lw $ra, 0x18($sp) -/* D2C44C 8024071C 8FB10014 */ lw $s1, 0x14($sp) -/* D2C450 80240720 8FB00010 */ lw $s0, 0x10($sp) -/* D2C454 80240724 03E00008 */ jr $ra -/* D2C458 80240728 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240DAC_D30A2C.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240DAC_D30A2C.s deleted file mode 100644 index 273cc72c92..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240DAC_D30A2C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* D30A2C 80240DAC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D30A30 80240DB0 AFB10014 */ sw $s1, 0x14($sp) -/* D30A34 80240DB4 0080882D */ daddu $s1, $a0, $zero -/* D30A38 80240DB8 AFBF0018 */ sw $ra, 0x18($sp) -/* D30A3C 80240DBC AFB00010 */ sw $s0, 0x10($sp) -/* D30A40 80240DC0 8E300148 */ lw $s0, 0x148($s1) -/* D30A44 80240DC4 0C00EABB */ jal get_npc_unsafe -/* D30A48 80240DC8 86040008 */ lh $a0, 8($s0) -/* D30A4C 80240DCC 0040202D */ daddu $a0, $v0, $zero -/* D30A50 80240DD0 9482008E */ lhu $v0, 0x8e($a0) -/* D30A54 80240DD4 2442FFFF */ addiu $v0, $v0, -1 -/* D30A58 80240DD8 A482008E */ sh $v0, 0x8e($a0) -/* D30A5C 80240DDC 00021400 */ sll $v0, $v0, 0x10 -/* D30A60 80240DE0 1C400009 */ bgtz $v0, .L80240E08 -/* D30A64 80240DE4 24020003 */ addiu $v0, $zero, 3 -/* D30A68 80240DE8 96030076 */ lhu $v1, 0x76($s0) -/* D30A6C 80240DEC AE02006C */ sw $v0, 0x6c($s0) -/* D30A70 80240DF0 A483008E */ sh $v1, 0x8e($a0) -/* D30A74 80240DF4 8E0200CC */ lw $v0, 0xcc($s0) -/* D30A78 80240DF8 8C420024 */ lw $v0, 0x24($v0) -/* D30A7C 80240DFC AC820028 */ sw $v0, 0x28($a0) -/* D30A80 80240E00 24020020 */ addiu $v0, $zero, 0x20 -/* D30A84 80240E04 AE220070 */ sw $v0, 0x70($s1) -.L80240E08: -/* D30A88 80240E08 8FBF0018 */ lw $ra, 0x18($sp) -/* D30A8C 80240E0C 8FB10014 */ lw $s1, 0x14($sp) -/* D30A90 80240E10 8FB00010 */ lw $s0, 0x10($sp) -/* D30A94 80240E14 03E00008 */ jr $ra -/* D30A98 80240E18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024043C_D37C3C.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024043C_D37C3C.s deleted file mode 100644 index 5f8b7fa77c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024043C_D37C3C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkNpcAIFunc7 -/* D37C3C 8024043C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D37C40 80240440 AFB10014 */ sw $s1, 0x14($sp) -/* D37C44 80240444 0080882D */ daddu $s1, $a0, $zero -/* D37C48 80240448 AFBF0018 */ sw $ra, 0x18($sp) -/* D37C4C 8024044C AFB00010 */ sw $s0, 0x10($sp) -/* D37C50 80240450 8E300148 */ lw $s0, 0x148($s1) -/* D37C54 80240454 0C00EABB */ jal get_npc_unsafe -/* D37C58 80240458 86040008 */ lh $a0, 8($s0) -/* D37C5C 8024045C 0040202D */ daddu $a0, $v0, $zero -/* D37C60 80240460 9482008E */ lhu $v0, 0x8e($a0) -/* D37C64 80240464 2442FFFF */ addiu $v0, $v0, -1 -/* D37C68 80240468 A482008E */ sh $v0, 0x8e($a0) -/* D37C6C 8024046C 00021400 */ sll $v0, $v0, 0x10 -/* D37C70 80240470 1C400009 */ bgtz $v0, .L80240498 -/* D37C74 80240474 24020003 */ addiu $v0, $zero, 3 -/* D37C78 80240478 96030076 */ lhu $v1, 0x76($s0) -/* D37C7C 8024047C AE02006C */ sw $v0, 0x6c($s0) -/* D37C80 80240480 A483008E */ sh $v1, 0x8e($a0) -/* D37C84 80240484 8E0200CC */ lw $v0, 0xcc($s0) -/* D37C88 80240488 8C420024 */ lw $v0, 0x24($v0) -/* D37C8C 8024048C AC820028 */ sw $v0, 0x28($a0) -/* D37C90 80240490 24020020 */ addiu $v0, $zero, 0x20 -/* D37C94 80240494 AE220070 */ sw $v0, 0x70($s1) -.L80240498: -/* D37C98 80240498 8FBF0018 */ lw $ra, 0x18($sp) -/* D37C9C 8024049C 8FB10014 */ lw $s1, 0x14($sp) -/* D37CA0 802404A0 8FB00010 */ lw $s0, 0x10($sp) -/* D37CA4 802404A4 03E00008 */ jr $ra -/* D37CA8 802404A8 27BD0020 */ addiu $sp, $sp, 0x20 From a2f84553ed5dfe6c3e1b746f56a4aadfb03577d9 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 22 Nov 2020 10:27:43 -0500 Subject: [PATCH 21/38] UnkNpcAIFunc8 --- .../dgb_02/C2EBA0/func_802400DC_C2EC7C.s | 60 ------------------- .../dgb_02/C2EBA0/func_8024061C_C2F1BC.s | 2 +- .../dgb_02/C2EBA0/func_802410D4_C2FC74.s | 2 +- .../dgb_03/C31730/func_8024032C_C3180C.s | 60 ------------------- .../dgb_03/C31730/func_8024086C_C31D4C.s | 2 +- .../dgb_03/C31730/func_802419B0_C32E90.s | 2 +- .../dgb_03/C31730/func_80242480_C33960.s | 2 +- .../dgb_05/C3AA10/func_8024013C_C3AB4C.s | 60 ------------------- .../dgb_05/C3AA10/func_80240E80_C3B890.s | 2 +- .../dgb_05/C3AA10/func_802411D0_C3BBE0.s | 2 +- .../dgb_07/C3DBF0/func_802400DC_C3DCCC.s | 60 ------------------- .../dgb_07/C3DBF0/func_80240E20_C3EA10.s | 2 +- .../dgb_07/C3DBF0/func_80241170_C3ED60.s | 2 +- .../dgb_08/C3FDB0/func_80240F6C_C40D1C.s | 60 ------------------- .../dgb_08/C3FDB0/func_802414AC_C4125C.s | 2 +- .../dgb_09/C46BE0/func_802400DC_C46CBC.s | 60 ------------------- .../dgb_09/C46BE0/func_8024061C_C471FC.s | 2 +- .../dgb_09/C46BE0/func_802410D4_C47CB4.s | 2 +- .../dgb_15/C4F510/func_802400DC_C4F5EC.s | 60 ------------------- .../dgb_15/C4F510/func_8024061C_C4FB2C.s | 2 +- .../dgb_16/C52540/func_802400DC_C5261C.s | 60 ------------------- .../dgb_16/C52540/func_80240E20_C53360.s | 2 +- .../dgb_16/C52540/func_80241170_C536B0.s | 2 +- .../jan_05/B4B260/func_802419A8_B4C418.s | 60 ------------------- .../jan_05/B4B260/func_80241EE8_B4C958.s | 2 +- .../jan_05/B4B260/func_8024219C_B4CC0C.s | 2 +- .../jan_06/B52F70/func_802418F8_B54128.s | 60 ------------------- .../jan_06/B52F70/func_80241E38_B54668.s | 2 +- .../jan_06/B52F70/func_802420EC_B5491C.s | 2 +- .../jan_07/B59870/func_802402F0_B59B60.s | 60 ------------------- .../jan_07/B59870/func_80240830_B5A0A0.s | 2 +- .../jan_07/B59870/func_80240AE4_B5A354.s | 2 +- .../jan_08/B5F650/func_80241744_B5F9F4.s | 60 ------------------- .../jan_08/B5F650/func_80241C84_B5FF34.s | 2 +- .../jan_08/B5F650/func_80241F38_B601E8.s | 2 +- .../jan_09/B663F0/func_80240C30_B666E0.s | 60 ------------------- .../jan_09/B663F0/func_80241170_B66C20.s | 2 +- .../jan_09/B663F0/func_80241424_B66ED4.s | 2 +- .../jan_12/B73570/func_802407B0_B73860.s | 60 ------------------- .../jan_12/B73570/func_80240CF0_B73DA0.s | 2 +- .../jan_12/B73570/func_80240FA4_B74054.s | 2 +- .../kzn_03/C61020/func_80240CD4_C619E4.s | 60 ------------------- .../kzn_03/C61020/func_80241214_C61F24.s | 2 +- .../kzn_08/C71ED0/func_80242618_C73A98.s | 60 ------------------- .../kzn_08/C71ED0/func_80242B58_C73FD8.s | 2 +- .../kzn_09/C77D00/func_802410FC_C77DDC.s | 60 ------------------- .../kzn_09/C77D00/func_8024163C_C7831C.s | 2 +- .../kzn_17/C85DC0/func_802403EC_C85E9C.s | 60 ------------------- .../kzn_17/C85DC0/func_8024092C_C863DC.s | 2 +- .../mim_01/B93940/func_802405DC_B93A1C.s | 60 ------------------- .../mim_01/B93940/func_80240B1C_B93F5C.s | 2 +- .../mim_05/BA07A0/func_8024014C_BA087C.s | 60 ------------------- .../mim_05/BA07A0/func_8024068C_BA0DBC.s | 2 +- .../mim_06/BA4CF0/func_8024064C_BA4DCC.s | 60 ------------------- .../mim_06/BA4CF0/func_80240B8C_BA530C.s | 2 +- .../mim_08/BAD940/func_80241674_BAEFB4.s | 60 ------------------- .../mim_08/BAD940/func_80241BB4_BAF4F4.s | 2 +- .../pra_35/D8D270/func_80241E8C_D8F0DC.s | 60 ------------------- .../pra_35/D8D270/func_802423CC_D8F61C.s | 2 +- .../pra_35/D8D270/func_80242698_D8F8E8.s | 2 +- .../pra_37/D92F40/func_8024102C_D93F6C.s | 60 ------------------- .../pra_37/D92F40/func_8024156C_D944AC.s | 2 +- .../sam_03/D110C0/func_8024012C_D111EC.s | 60 ------------------- .../sam_03/D110C0/func_8024066C_D1172C.s | 2 +- .../sam_05/D187E0/func_802400DC_D188BC.s | 60 ------------------- .../sam_05/D187E0/func_8024061C_D18DFC.s | 2 +- .../sam_07/D2BD30/func_8024072C_D2C45C.s | 60 ------------------- .../sam_07/D2BD30/func_80240C6C_D2C99C.s | 2 +- .../sam_08/D309C0/func_80240E1C_D30A9C.s | 60 ------------------- .../sam_08/D309C0/func_8024135C_D30FDC.s | 2 +- .../sam_10/D37BD0/func_802404AC_D37CAC.s | 60 ------------------- .../sam_10/D37BD0/func_802409EC_D381EC.s | 2 +- include/functions.h | 1 + src/os/code_4ac90_len_3910.c | 2 +- src/world/area_dgb/dgb_02/C2EBA0.c | 2 +- src/world/area_dgb/dgb_03/C31730.c | 2 +- src/world/area_dgb/dgb_05/C3AA10.c | 2 +- src/world/area_dgb/dgb_07/C3DBF0.c | 2 +- src/world/area_dgb/dgb_08/C3FDB0.c | 2 +- src/world/area_dgb/dgb_09/C46BE0.c | 2 +- src/world/area_dgb/dgb_15/C4F510.c | 2 +- src/world/area_dgb/dgb_16/C52540.c | 2 +- src/world/area_jan/jan_05/B4B260.c | 2 +- src/world/area_jan/jan_06/B52F70.c | 2 +- src/world/area_jan/jan_07/B59870.c | 2 +- src/world/area_jan/jan_08/B5F650.c | 2 +- src/world/area_jan/jan_09/B663F0.c | 2 +- src/world/area_jan/jan_12/B73570.c | 2 +- src/world/area_kzn/kzn_03/C61020.c | 2 +- src/world/area_kzn/kzn_08/C71ED0.c | 2 +- src/world/area_kzn/kzn_09/C77D00.c | 2 +- src/world/area_kzn/kzn_17/C85DC0.c | 2 +- src/world/area_mim/mim_01/B93940.c | 2 +- src/world/area_mim/mim_05/BA07A0.c | 2 +- src/world/area_mim/mim_06/BA4CF0.c | 2 +- src/world/area_mim/mim_08/BAD940.c | 2 +- src/world/area_pra/pra_35/D8D270.c | 2 +- src/world/area_pra/pra_37/D92F40.c | 2 +- src/world/area_sam/sam_03/D110C0.c | 2 +- src/world/area_sam/sam_05/D187E0.c | 2 +- src/world/area_sam/sam_07/D2BD30.c | 2 +- src/world/area_sam/sam_08/D309C0.c | 2 +- src/world/area_sam/sam_10/D37BD0.c | 2 +- src/world/common/UnkNpcAIFunc8.inc.c | 20 +++++++ 104 files changed, 94 insertions(+), 1813 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802400DC_C2EC7C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024032C_C3180C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024013C_C3AB4C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802400DC_C3DCCC.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240F6C_C40D1C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802400DC_C46CBC.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802400DC_C4F5EC.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802400DC_C5261C.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802419A8_B4C418.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802418F8_B54128.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_07/B59870/func_802402F0_B59B60.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241744_B5F9F4.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240C30_B666E0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_12/B73570/func_802407B0_B73860.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240CD4_C619E4.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242618_C73A98.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802410FC_C77DDC.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802403EC_C85E9C.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_01/B93940/func_802405DC_B93A1C.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024014C_BA087C.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024064C_BA4DCC.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241674_BAEFB4.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241E8C_D8F0DC.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024102C_D93F6C.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024012C_D111EC.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802400DC_D188BC.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_8024072C_D2C45C.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240E1C_D30A9C.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802404AC_D37CAC.s create mode 100644 src/world/common/UnkNpcAIFunc8.inc.c diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802400DC_C2EC7C.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802400DC_C2EC7C.s deleted file mode 100644 index 1886764ebc..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802400DC_C2EC7C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC_C2EC7C -/* C2EC7C 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C2EC80 802400E0 AFB10034 */ sw $s1, 0x34($sp) -/* C2EC84 802400E4 0080882D */ daddu $s1, $a0, $zero -/* C2EC88 802400E8 AFBF0038 */ sw $ra, 0x38($sp) -/* C2EC8C 802400EC AFB00030 */ sw $s0, 0x30($sp) -/* C2EC90 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* C2EC94 802400F4 0C00EABB */ jal get_npc_unsafe -/* C2EC98 802400F8 86040008 */ lh $a0, 8($s0) -/* C2EC9C 802400FC 0040282D */ daddu $a1, $v0, $zero -/* C2ECA0 80240100 94A2008E */ lhu $v0, 0x8e($a1) -/* C2ECA4 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* C2ECA8 80240108 A4A2008E */ sh $v0, 0x8e($a1) -/* C2ECAC 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* C2ECB0 80240110 1C400023 */ bgtz $v0, .L802401A0 -/* C2ECB4 80240114 24020004 */ addiu $v0, $zero, 4 -/* C2ECB8 80240118 8E0300CC */ lw $v1, 0xcc($s0) -/* C2ECBC 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* C2ECC0 80240120 8C620000 */ lw $v0, ($v1) -/* C2ECC4 80240124 ACA20028 */ sw $v0, 0x28($a1) -/* C2ECC8 80240128 9602007A */ lhu $v0, 0x7a($s0) -/* C2ECCC 8024012C A4A2008E */ sh $v0, 0x8e($a1) -/* C2ECD0 80240130 8E020078 */ lw $v0, 0x78($s0) -/* C2ECD4 80240134 28420008 */ slti $v0, $v0, 8 -/* C2ECD8 80240138 14400018 */ bnez $v0, .L8024019C -/* C2ECDC 8024013C 24020021 */ addiu $v0, $zero, 0x21 -/* C2ECE0 80240140 24040003 */ addiu $a0, $zero, 3 -/* C2ECE4 80240144 27A30028 */ addiu $v1, $sp, 0x28 -/* C2ECE8 80240148 84A700A8 */ lh $a3, 0xa8($a1) -/* C2ECEC 8024014C 3C013F80 */ lui $at, 0x3f80 -/* C2ECF0 80240150 44810000 */ mtc1 $at, $f0 -/* C2ECF4 80240154 3C014000 */ lui $at, 0x4000 -/* C2ECF8 80240158 44811000 */ mtc1 $at, $f2 -/* C2ECFC 8024015C 3C01C1A0 */ lui $at, 0xc1a0 -/* C2ED00 80240160 44812000 */ mtc1 $at, $f4 -/* C2ED04 80240164 44873000 */ mtc1 $a3, $f6 -/* C2ED08 80240168 00000000 */ nop -/* C2ED0C 8024016C 468031A0 */ cvt.s.w $f6, $f6 -/* C2ED10 80240170 E7A00010 */ swc1 $f0, 0x10($sp) -/* C2ED14 80240174 E7A20014 */ swc1 $f2, 0x14($sp) -/* C2ED18 80240178 E7A40018 */ swc1 $f4, 0x18($sp) -/* C2ED1C 8024017C 8E020078 */ lw $v0, 0x78($s0) -/* C2ED20 80240180 44073000 */ mfc1 $a3, $f6 -/* C2ED24 80240184 0000302D */ daddu $a2, $zero, $zero -/* C2ED28 80240188 AFA30020 */ sw $v1, 0x20($sp) -/* C2ED2C 8024018C 2442FFFF */ addiu $v0, $v0, -1 -/* C2ED30 80240190 0C01BFA4 */ jal fx_emote -/* C2ED34 80240194 AFA2001C */ sw $v0, 0x1c($sp) -/* C2ED38 80240198 24020021 */ addiu $v0, $zero, 0x21 -.L8024019C: -/* C2ED3C 8024019C AE220070 */ sw $v0, 0x70($s1) -.L802401A0: -/* C2ED40 802401A0 8FBF0038 */ lw $ra, 0x38($sp) -/* C2ED44 802401A4 8FB10034 */ lw $s1, 0x34($sp) -/* C2ED48 802401A8 8FB00030 */ lw $s0, 0x30($sp) -/* C2ED4C 802401AC 03E00008 */ jr $ra -/* C2ED50 802401B0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s index 75f8c30d2e..bc27248672 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s @@ -159,7 +159,7 @@ glabel func_8024061C_C2F1BC /* C2F40C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* C2F410 80240870 1462000D */ bne $v1, $v0, .L802408A8 /* C2F414 80240874 00000000 */ nop -/* C2F418 80240878 0C090037 */ jal func_802400DC_C2EC7C +/* C2F418 80240878 0C090037 */ jal UnkNpcAIFunc8 /* C2F41C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C2F420 80240880 8E430070 */ lw $v1, 0x70($s2) /* C2F424 80240884 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s index d9febe053a..72449c522a 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s @@ -180,7 +180,7 @@ glabel func_802410D4_C2FC74 /* C2FF18 80241378 24020020 */ addiu $v0, $zero, 0x20 /* C2FF1C 8024137C 1462001F */ bne $v1, $v0, .L802413FC /* C2FF20 80241380 00000000 */ nop -/* C2FF24 80241384 0C090037 */ jal func_802400DC_C2EC7C +/* C2FF24 80241384 0C090037 */ jal UnkNpcAIFunc8 /* C2FF28 80241388 0240202D */ daddu $a0, $s2, $zero /* C2FF2C 8024138C 080904FF */ j .L802413FC /* C2FF30 80241390 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024032C_C3180C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024032C_C3180C.s deleted file mode 100644 index e7f99b4ff0..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024032C_C3180C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024032C_C3180C -/* C3180C 8024032C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C31810 80240330 AFB10034 */ sw $s1, 0x34($sp) -/* C31814 80240334 0080882D */ daddu $s1, $a0, $zero -/* C31818 80240338 AFBF0038 */ sw $ra, 0x38($sp) -/* C3181C 8024033C AFB00030 */ sw $s0, 0x30($sp) -/* C31820 80240340 8E300148 */ lw $s0, 0x148($s1) -/* C31824 80240344 0C00EABB */ jal get_npc_unsafe -/* C31828 80240348 86040008 */ lh $a0, 8($s0) -/* C3182C 8024034C 0040282D */ daddu $a1, $v0, $zero -/* C31830 80240350 94A2008E */ lhu $v0, 0x8e($a1) -/* C31834 80240354 2442FFFF */ addiu $v0, $v0, -1 -/* C31838 80240358 A4A2008E */ sh $v0, 0x8e($a1) -/* C3183C 8024035C 00021400 */ sll $v0, $v0, 0x10 -/* C31840 80240360 1C400023 */ bgtz $v0, .L802403F0 -/* C31844 80240364 24020004 */ addiu $v0, $zero, 4 -/* C31848 80240368 8E0300CC */ lw $v1, 0xcc($s0) -/* C3184C 8024036C AE02006C */ sw $v0, 0x6c($s0) -/* C31850 80240370 8C620000 */ lw $v0, ($v1) -/* C31854 80240374 ACA20028 */ sw $v0, 0x28($a1) -/* C31858 80240378 9602007A */ lhu $v0, 0x7a($s0) -/* C3185C 8024037C A4A2008E */ sh $v0, 0x8e($a1) -/* C31860 80240380 8E020078 */ lw $v0, 0x78($s0) -/* C31864 80240384 28420008 */ slti $v0, $v0, 8 -/* C31868 80240388 14400018 */ bnez $v0, .L802403EC -/* C3186C 8024038C 24020021 */ addiu $v0, $zero, 0x21 -/* C31870 80240390 24040003 */ addiu $a0, $zero, 3 -/* C31874 80240394 27A30028 */ addiu $v1, $sp, 0x28 -/* C31878 80240398 84A700A8 */ lh $a3, 0xa8($a1) -/* C3187C 8024039C 3C013F80 */ lui $at, 0x3f80 -/* C31880 802403A0 44810000 */ mtc1 $at, $f0 -/* C31884 802403A4 3C014000 */ lui $at, 0x4000 -/* C31888 802403A8 44811000 */ mtc1 $at, $f2 -/* C3188C 802403AC 3C01C1A0 */ lui $at, 0xc1a0 -/* C31890 802403B0 44812000 */ mtc1 $at, $f4 -/* C31894 802403B4 44873000 */ mtc1 $a3, $f6 -/* C31898 802403B8 00000000 */ nop -/* C3189C 802403BC 468031A0 */ cvt.s.w $f6, $f6 -/* C318A0 802403C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C318A4 802403C4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C318A8 802403C8 E7A40018 */ swc1 $f4, 0x18($sp) -/* C318AC 802403CC 8E020078 */ lw $v0, 0x78($s0) -/* C318B0 802403D0 44073000 */ mfc1 $a3, $f6 -/* C318B4 802403D4 0000302D */ daddu $a2, $zero, $zero -/* C318B8 802403D8 AFA30020 */ sw $v1, 0x20($sp) -/* C318BC 802403DC 2442FFFF */ addiu $v0, $v0, -1 -/* C318C0 802403E0 0C01BFA4 */ jal fx_emote -/* C318C4 802403E4 AFA2001C */ sw $v0, 0x1c($sp) -/* C318C8 802403E8 24020021 */ addiu $v0, $zero, 0x21 -.L802403EC: -/* C318CC 802403EC AE220070 */ sw $v0, 0x70($s1) -.L802403F0: -/* C318D0 802403F0 8FBF0038 */ lw $ra, 0x38($sp) -/* C318D4 802403F4 8FB10034 */ lw $s1, 0x34($sp) -/* C318D8 802403F8 8FB00030 */ lw $s0, 0x30($sp) -/* C318DC 802403FC 03E00008 */ jr $ra -/* C318E0 80240400 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s index a54d76ea41..f724777e58 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s @@ -159,7 +159,7 @@ glabel func_8024086C_C31D4C /* C31F9C 80240ABC 24020020 */ addiu $v0, $zero, 0x20 /* C31FA0 80240AC0 1462000D */ bne $v1, $v0, .L80240AF8 /* C31FA4 80240AC4 00000000 */ nop -/* C31FA8 80240AC8 0C0900CB */ jal func_8024032C_C3180C +/* C31FA8 80240AC8 0C0900CB */ jal UnkNpcAIFunc8 /* C31FAC 80240ACC 0240202D */ daddu $a0, $s2, $zero /* C31FB0 80240AD0 8E430070 */ lw $v1, 0x70($s2) /* C31FB4 80240AD4 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s index ad994a9d19..f1db6fa194 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s @@ -165,7 +165,7 @@ glabel func_802419B0_C32E90 /* C330F8 80241C18 24020020 */ addiu $v0, $zero, 0x20 /* C330FC 80241C1C 1462000D */ bne $v1, $v0, .L80241C54 /* C33100 80241C20 00000000 */ nop -/* C33104 80241C24 0C0900CB */ jal func_8024032C_C3180C +/* C33104 80241C24 0C0900CB */ jal UnkNpcAIFunc8 /* C33108 80241C28 0240202D */ daddu $a0, $s2, $zero /* C3310C 80241C2C 8E430070 */ lw $v1, 0x70($s2) /* C33110 80241C30 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s index fc99bca25f..c2cf9ec7ce 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s @@ -180,7 +180,7 @@ glabel func_80242480_C33960 /* C33C04 80242724 24020020 */ addiu $v0, $zero, 0x20 /* C33C08 80242728 1462001F */ bne $v1, $v0, .L802427A8 /* C33C0C 8024272C 00000000 */ nop -/* C33C10 80242730 0C0900CB */ jal func_8024032C_C3180C +/* C33C10 80242730 0C0900CB */ jal UnkNpcAIFunc8 /* C33C14 80242734 0240202D */ daddu $a0, $s2, $zero /* C33C18 80242738 080909EA */ j .L802427A8 /* C33C1C 8024273C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024013C_C3AB4C.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024013C_C3AB4C.s deleted file mode 100644 index 105d4af803..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024013C_C3AB4C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024013C_C3AB4C -/* C3AB4C 8024013C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C3AB50 80240140 AFB10034 */ sw $s1, 0x34($sp) -/* C3AB54 80240144 0080882D */ daddu $s1, $a0, $zero -/* C3AB58 80240148 AFBF0038 */ sw $ra, 0x38($sp) -/* C3AB5C 8024014C AFB00030 */ sw $s0, 0x30($sp) -/* C3AB60 80240150 8E300148 */ lw $s0, 0x148($s1) -/* C3AB64 80240154 0C00EABB */ jal get_npc_unsafe -/* C3AB68 80240158 86040008 */ lh $a0, 8($s0) -/* C3AB6C 8024015C 0040282D */ daddu $a1, $v0, $zero -/* C3AB70 80240160 94A2008E */ lhu $v0, 0x8e($a1) -/* C3AB74 80240164 2442FFFF */ addiu $v0, $v0, -1 -/* C3AB78 80240168 A4A2008E */ sh $v0, 0x8e($a1) -/* C3AB7C 8024016C 00021400 */ sll $v0, $v0, 0x10 -/* C3AB80 80240170 1C400023 */ bgtz $v0, .L80240200 -/* C3AB84 80240174 24020004 */ addiu $v0, $zero, 4 -/* C3AB88 80240178 8E0300CC */ lw $v1, 0xcc($s0) -/* C3AB8C 8024017C AE02006C */ sw $v0, 0x6c($s0) -/* C3AB90 80240180 8C620000 */ lw $v0, ($v1) -/* C3AB94 80240184 ACA20028 */ sw $v0, 0x28($a1) -/* C3AB98 80240188 9602007A */ lhu $v0, 0x7a($s0) -/* C3AB9C 8024018C A4A2008E */ sh $v0, 0x8e($a1) -/* C3ABA0 80240190 8E020078 */ lw $v0, 0x78($s0) -/* C3ABA4 80240194 28420008 */ slti $v0, $v0, 8 -/* C3ABA8 80240198 14400018 */ bnez $v0, .L802401FC -/* C3ABAC 8024019C 24020021 */ addiu $v0, $zero, 0x21 -/* C3ABB0 802401A0 24040003 */ addiu $a0, $zero, 3 -/* C3ABB4 802401A4 27A30028 */ addiu $v1, $sp, 0x28 -/* C3ABB8 802401A8 84A700A8 */ lh $a3, 0xa8($a1) -/* C3ABBC 802401AC 3C013F80 */ lui $at, 0x3f80 -/* C3ABC0 802401B0 44810000 */ mtc1 $at, $f0 -/* C3ABC4 802401B4 3C014000 */ lui $at, 0x4000 -/* C3ABC8 802401B8 44811000 */ mtc1 $at, $f2 -/* C3ABCC 802401BC 3C01C1A0 */ lui $at, 0xc1a0 -/* C3ABD0 802401C0 44812000 */ mtc1 $at, $f4 -/* C3ABD4 802401C4 44873000 */ mtc1 $a3, $f6 -/* C3ABD8 802401C8 00000000 */ nop -/* C3ABDC 802401CC 468031A0 */ cvt.s.w $f6, $f6 -/* C3ABE0 802401D0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C3ABE4 802401D4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C3ABE8 802401D8 E7A40018 */ swc1 $f4, 0x18($sp) -/* C3ABEC 802401DC 8E020078 */ lw $v0, 0x78($s0) -/* C3ABF0 802401E0 44073000 */ mfc1 $a3, $f6 -/* C3ABF4 802401E4 0000302D */ daddu $a2, $zero, $zero -/* C3ABF8 802401E8 AFA30020 */ sw $v1, 0x20($sp) -/* C3ABFC 802401EC 2442FFFF */ addiu $v0, $v0, -1 -/* C3AC00 802401F0 0C01BFA4 */ jal fx_emote -/* C3AC04 802401F4 AFA2001C */ sw $v0, 0x1c($sp) -/* C3AC08 802401F8 24020021 */ addiu $v0, $zero, 0x21 -.L802401FC: -/* C3AC0C 802401FC AE220070 */ sw $v0, 0x70($s1) -.L80240200: -/* C3AC10 80240200 8FBF0038 */ lw $ra, 0x38($sp) -/* C3AC14 80240204 8FB10034 */ lw $s1, 0x34($sp) -/* C3AC18 80240208 8FB00030 */ lw $s0, 0x30($sp) -/* C3AC1C 8024020C 03E00008 */ jr $ra -/* C3AC20 80240210 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s index 1db7e8175f..834c7140e6 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s @@ -180,7 +180,7 @@ glabel func_80240E80_C3B890 /* C3BB34 80241124 24020020 */ addiu $v0, $zero, 0x20 /* C3BB38 80241128 1462001F */ bne $v1, $v0, .L802411A8 /* C3BB3C 8024112C 00000000 */ nop -/* C3BB40 80241130 0C09004F */ jal func_8024013C_C3AB4C +/* C3BB40 80241130 0C09004F */ jal UnkNpcAIFunc8 /* C3BB44 80241134 0240202D */ daddu $a0, $s2, $zero /* C3BB48 80241138 0809046A */ j .L802411A8 /* C3BB4C 8024113C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s index 5fc7efcb05..7bfce9fb1e 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s @@ -159,7 +159,7 @@ glabel func_802411D0_C3BBE0 /* C3BE30 80241420 24020020 */ addiu $v0, $zero, 0x20 /* C3BE34 80241424 1462000D */ bne $v1, $v0, .L8024145C /* C3BE38 80241428 00000000 */ nop -/* C3BE3C 8024142C 0C09004F */ jal func_8024013C_C3AB4C +/* C3BE3C 8024142C 0C09004F */ jal UnkNpcAIFunc8 /* C3BE40 80241430 0240202D */ daddu $a0, $s2, $zero /* C3BE44 80241434 8E430070 */ lw $v1, 0x70($s2) /* C3BE48 80241438 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802400DC_C3DCCC.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802400DC_C3DCCC.s deleted file mode 100644 index c98de8fbf1..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802400DC_C3DCCC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC_C3DCCC -/* C3DCCC 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C3DCD0 802400E0 AFB10034 */ sw $s1, 0x34($sp) -/* C3DCD4 802400E4 0080882D */ daddu $s1, $a0, $zero -/* C3DCD8 802400E8 AFBF0038 */ sw $ra, 0x38($sp) -/* C3DCDC 802400EC AFB00030 */ sw $s0, 0x30($sp) -/* C3DCE0 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* C3DCE4 802400F4 0C00EABB */ jal get_npc_unsafe -/* C3DCE8 802400F8 86040008 */ lh $a0, 8($s0) -/* C3DCEC 802400FC 0040282D */ daddu $a1, $v0, $zero -/* C3DCF0 80240100 94A2008E */ lhu $v0, 0x8e($a1) -/* C3DCF4 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* C3DCF8 80240108 A4A2008E */ sh $v0, 0x8e($a1) -/* C3DCFC 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* C3DD00 80240110 1C400023 */ bgtz $v0, .L802401A0 -/* C3DD04 80240114 24020004 */ addiu $v0, $zero, 4 -/* C3DD08 80240118 8E0300CC */ lw $v1, 0xcc($s0) -/* C3DD0C 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* C3DD10 80240120 8C620000 */ lw $v0, ($v1) -/* C3DD14 80240124 ACA20028 */ sw $v0, 0x28($a1) -/* C3DD18 80240128 9602007A */ lhu $v0, 0x7a($s0) -/* C3DD1C 8024012C A4A2008E */ sh $v0, 0x8e($a1) -/* C3DD20 80240130 8E020078 */ lw $v0, 0x78($s0) -/* C3DD24 80240134 28420008 */ slti $v0, $v0, 8 -/* C3DD28 80240138 14400018 */ bnez $v0, .L8024019C -/* C3DD2C 8024013C 24020021 */ addiu $v0, $zero, 0x21 -/* C3DD30 80240140 24040003 */ addiu $a0, $zero, 3 -/* C3DD34 80240144 27A30028 */ addiu $v1, $sp, 0x28 -/* C3DD38 80240148 84A700A8 */ lh $a3, 0xa8($a1) -/* C3DD3C 8024014C 3C013F80 */ lui $at, 0x3f80 -/* C3DD40 80240150 44810000 */ mtc1 $at, $f0 -/* C3DD44 80240154 3C014000 */ lui $at, 0x4000 -/* C3DD48 80240158 44811000 */ mtc1 $at, $f2 -/* C3DD4C 8024015C 3C01C1A0 */ lui $at, 0xc1a0 -/* C3DD50 80240160 44812000 */ mtc1 $at, $f4 -/* C3DD54 80240164 44873000 */ mtc1 $a3, $f6 -/* C3DD58 80240168 00000000 */ nop -/* C3DD5C 8024016C 468031A0 */ cvt.s.w $f6, $f6 -/* C3DD60 80240170 E7A00010 */ swc1 $f0, 0x10($sp) -/* C3DD64 80240174 E7A20014 */ swc1 $f2, 0x14($sp) -/* C3DD68 80240178 E7A40018 */ swc1 $f4, 0x18($sp) -/* C3DD6C 8024017C 8E020078 */ lw $v0, 0x78($s0) -/* C3DD70 80240180 44073000 */ mfc1 $a3, $f6 -/* C3DD74 80240184 0000302D */ daddu $a2, $zero, $zero -/* C3DD78 80240188 AFA30020 */ sw $v1, 0x20($sp) -/* C3DD7C 8024018C 2442FFFF */ addiu $v0, $v0, -1 -/* C3DD80 80240190 0C01BFA4 */ jal fx_emote -/* C3DD84 80240194 AFA2001C */ sw $v0, 0x1c($sp) -/* C3DD88 80240198 24020021 */ addiu $v0, $zero, 0x21 -.L8024019C: -/* C3DD8C 8024019C AE220070 */ sw $v0, 0x70($s1) -.L802401A0: -/* C3DD90 802401A0 8FBF0038 */ lw $ra, 0x38($sp) -/* C3DD94 802401A4 8FB10034 */ lw $s1, 0x34($sp) -/* C3DD98 802401A8 8FB00030 */ lw $s0, 0x30($sp) -/* C3DD9C 802401AC 03E00008 */ jr $ra -/* C3DDA0 802401B0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s index 1337142ed0..2609eb775c 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s @@ -180,7 +180,7 @@ glabel func_80240E20_C3EA10 /* C3ECB4 802410C4 24020020 */ addiu $v0, $zero, 0x20 /* C3ECB8 802410C8 1462001F */ bne $v1, $v0, .L80241148 /* C3ECBC 802410CC 00000000 */ nop -/* C3ECC0 802410D0 0C090037 */ jal func_802400DC_C3DCCC +/* C3ECC0 802410D0 0C090037 */ jal UnkNpcAIFunc8 /* C3ECC4 802410D4 0240202D */ daddu $a0, $s2, $zero /* C3ECC8 802410D8 08090452 */ j .L80241148 /* C3ECCC 802410DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s index ec40049435..8ed02af49c 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s @@ -159,7 +159,7 @@ glabel func_80241170_C3ED60 /* C3EFB0 802413C0 24020020 */ addiu $v0, $zero, 0x20 /* C3EFB4 802413C4 1462000D */ bne $v1, $v0, .L802413FC /* C3EFB8 802413C8 00000000 */ nop -/* C3EFBC 802413CC 0C090037 */ jal func_802400DC_C3DCCC +/* C3EFBC 802413CC 0C090037 */ jal UnkNpcAIFunc8 /* C3EFC0 802413D0 0240202D */ daddu $a0, $s2, $zero /* C3EFC4 802413D4 8E430070 */ lw $v1, 0x70($s2) /* C3EFC8 802413D8 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240F6C_C40D1C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240F6C_C40D1C.s deleted file mode 100644 index 26a314b377..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240F6C_C40D1C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F6C_C40D1C -/* C40D1C 80240F6C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C40D20 80240F70 AFB10034 */ sw $s1, 0x34($sp) -/* C40D24 80240F74 0080882D */ daddu $s1, $a0, $zero -/* C40D28 80240F78 AFBF0038 */ sw $ra, 0x38($sp) -/* C40D2C 80240F7C AFB00030 */ sw $s0, 0x30($sp) -/* C40D30 80240F80 8E300148 */ lw $s0, 0x148($s1) -/* C40D34 80240F84 0C00EABB */ jal get_npc_unsafe -/* C40D38 80240F88 86040008 */ lh $a0, 8($s0) -/* C40D3C 80240F8C 0040282D */ daddu $a1, $v0, $zero -/* C40D40 80240F90 94A2008E */ lhu $v0, 0x8e($a1) -/* C40D44 80240F94 2442FFFF */ addiu $v0, $v0, -1 -/* C40D48 80240F98 A4A2008E */ sh $v0, 0x8e($a1) -/* C40D4C 80240F9C 00021400 */ sll $v0, $v0, 0x10 -/* C40D50 80240FA0 1C400023 */ bgtz $v0, .L80241030 -/* C40D54 80240FA4 24020004 */ addiu $v0, $zero, 4 -/* C40D58 80240FA8 8E0300CC */ lw $v1, 0xcc($s0) -/* C40D5C 80240FAC AE02006C */ sw $v0, 0x6c($s0) -/* C40D60 80240FB0 8C620000 */ lw $v0, ($v1) -/* C40D64 80240FB4 ACA20028 */ sw $v0, 0x28($a1) -/* C40D68 80240FB8 9602007A */ lhu $v0, 0x7a($s0) -/* C40D6C 80240FBC A4A2008E */ sh $v0, 0x8e($a1) -/* C40D70 80240FC0 8E020078 */ lw $v0, 0x78($s0) -/* C40D74 80240FC4 28420008 */ slti $v0, $v0, 8 -/* C40D78 80240FC8 14400018 */ bnez $v0, .L8024102C -/* C40D7C 80240FCC 24020021 */ addiu $v0, $zero, 0x21 -/* C40D80 80240FD0 24040003 */ addiu $a0, $zero, 3 -/* C40D84 80240FD4 27A30028 */ addiu $v1, $sp, 0x28 -/* C40D88 80240FD8 84A700A8 */ lh $a3, 0xa8($a1) -/* C40D8C 80240FDC 3C013F80 */ lui $at, 0x3f80 -/* C40D90 80240FE0 44810000 */ mtc1 $at, $f0 -/* C40D94 80240FE4 3C014000 */ lui $at, 0x4000 -/* C40D98 80240FE8 44811000 */ mtc1 $at, $f2 -/* C40D9C 80240FEC 3C01C1A0 */ lui $at, 0xc1a0 -/* C40DA0 80240FF0 44812000 */ mtc1 $at, $f4 -/* C40DA4 80240FF4 44873000 */ mtc1 $a3, $f6 -/* C40DA8 80240FF8 00000000 */ nop -/* C40DAC 80240FFC 468031A0 */ cvt.s.w $f6, $f6 -/* C40DB0 80241000 E7A00010 */ swc1 $f0, 0x10($sp) -/* C40DB4 80241004 E7A20014 */ swc1 $f2, 0x14($sp) -/* C40DB8 80241008 E7A40018 */ swc1 $f4, 0x18($sp) -/* C40DBC 8024100C 8E020078 */ lw $v0, 0x78($s0) -/* C40DC0 80241010 44073000 */ mfc1 $a3, $f6 -/* C40DC4 80241014 0000302D */ daddu $a2, $zero, $zero -/* C40DC8 80241018 AFA30020 */ sw $v1, 0x20($sp) -/* C40DCC 8024101C 2442FFFF */ addiu $v0, $v0, -1 -/* C40DD0 80241020 0C01BFA4 */ jal fx_emote -/* C40DD4 80241024 AFA2001C */ sw $v0, 0x1c($sp) -/* C40DD8 80241028 24020021 */ addiu $v0, $zero, 0x21 -.L8024102C: -/* C40DDC 8024102C AE220070 */ sw $v0, 0x70($s1) -.L80241030: -/* C40DE0 80241030 8FBF0038 */ lw $ra, 0x38($sp) -/* C40DE4 80241034 8FB10034 */ lw $s1, 0x34($sp) -/* C40DE8 80241038 8FB00030 */ lw $s0, 0x30($sp) -/* C40DEC 8024103C 03E00008 */ jr $ra -/* C40DF0 80241040 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s index b8bcbec829..039be36005 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s @@ -159,7 +159,7 @@ glabel func_802414AC_C4125C /* C414AC 802416FC 24020020 */ addiu $v0, $zero, 0x20 /* C414B0 80241700 1462000D */ bne $v1, $v0, .L80241738 /* C414B4 80241704 00000000 */ nop -/* C414B8 80241708 0C0903DB */ jal func_80240F6C_C40D1C +/* C414B8 80241708 0C0903DB */ jal UnkNpcAIFunc8 /* C414BC 8024170C 0240202D */ daddu $a0, $s2, $zero /* C414C0 80241710 8E430070 */ lw $v1, 0x70($s2) /* C414C4 80241714 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802400DC_C46CBC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802400DC_C46CBC.s deleted file mode 100644 index ac12ccfa3d..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802400DC_C46CBC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC_C46CBC -/* C46CBC 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C46CC0 802400E0 AFB10034 */ sw $s1, 0x34($sp) -/* C46CC4 802400E4 0080882D */ daddu $s1, $a0, $zero -/* C46CC8 802400E8 AFBF0038 */ sw $ra, 0x38($sp) -/* C46CCC 802400EC AFB00030 */ sw $s0, 0x30($sp) -/* C46CD0 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* C46CD4 802400F4 0C00EABB */ jal get_npc_unsafe -/* C46CD8 802400F8 86040008 */ lh $a0, 8($s0) -/* C46CDC 802400FC 0040282D */ daddu $a1, $v0, $zero -/* C46CE0 80240100 94A2008E */ lhu $v0, 0x8e($a1) -/* C46CE4 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* C46CE8 80240108 A4A2008E */ sh $v0, 0x8e($a1) -/* C46CEC 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* C46CF0 80240110 1C400023 */ bgtz $v0, .L802401A0 -/* C46CF4 80240114 24020004 */ addiu $v0, $zero, 4 -/* C46CF8 80240118 8E0300CC */ lw $v1, 0xcc($s0) -/* C46CFC 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* C46D00 80240120 8C620000 */ lw $v0, ($v1) -/* C46D04 80240124 ACA20028 */ sw $v0, 0x28($a1) -/* C46D08 80240128 9602007A */ lhu $v0, 0x7a($s0) -/* C46D0C 8024012C A4A2008E */ sh $v0, 0x8e($a1) -/* C46D10 80240130 8E020078 */ lw $v0, 0x78($s0) -/* C46D14 80240134 28420008 */ slti $v0, $v0, 8 -/* C46D18 80240138 14400018 */ bnez $v0, .L8024019C -/* C46D1C 8024013C 24020021 */ addiu $v0, $zero, 0x21 -/* C46D20 80240140 24040003 */ addiu $a0, $zero, 3 -/* C46D24 80240144 27A30028 */ addiu $v1, $sp, 0x28 -/* C46D28 80240148 84A700A8 */ lh $a3, 0xa8($a1) -/* C46D2C 8024014C 3C013F80 */ lui $at, 0x3f80 -/* C46D30 80240150 44810000 */ mtc1 $at, $f0 -/* C46D34 80240154 3C014000 */ lui $at, 0x4000 -/* C46D38 80240158 44811000 */ mtc1 $at, $f2 -/* C46D3C 8024015C 3C01C1A0 */ lui $at, 0xc1a0 -/* C46D40 80240160 44812000 */ mtc1 $at, $f4 -/* C46D44 80240164 44873000 */ mtc1 $a3, $f6 -/* C46D48 80240168 00000000 */ nop -/* C46D4C 8024016C 468031A0 */ cvt.s.w $f6, $f6 -/* C46D50 80240170 E7A00010 */ swc1 $f0, 0x10($sp) -/* C46D54 80240174 E7A20014 */ swc1 $f2, 0x14($sp) -/* C46D58 80240178 E7A40018 */ swc1 $f4, 0x18($sp) -/* C46D5C 8024017C 8E020078 */ lw $v0, 0x78($s0) -/* C46D60 80240180 44073000 */ mfc1 $a3, $f6 -/* C46D64 80240184 0000302D */ daddu $a2, $zero, $zero -/* C46D68 80240188 AFA30020 */ sw $v1, 0x20($sp) -/* C46D6C 8024018C 2442FFFF */ addiu $v0, $v0, -1 -/* C46D70 80240190 0C01BFA4 */ jal fx_emote -/* C46D74 80240194 AFA2001C */ sw $v0, 0x1c($sp) -/* C46D78 80240198 24020021 */ addiu $v0, $zero, 0x21 -.L8024019C: -/* C46D7C 8024019C AE220070 */ sw $v0, 0x70($s1) -.L802401A0: -/* C46D80 802401A0 8FBF0038 */ lw $ra, 0x38($sp) -/* C46D84 802401A4 8FB10034 */ lw $s1, 0x34($sp) -/* C46D88 802401A8 8FB00030 */ lw $s0, 0x30($sp) -/* C46D8C 802401AC 03E00008 */ jr $ra -/* C46D90 802401B0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s index 1427006391..0652ccff4e 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s @@ -159,7 +159,7 @@ glabel func_8024061C_C471FC /* C4744C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* C47450 80240870 1462000D */ bne $v1, $v0, .L802408A8 /* C47454 80240874 00000000 */ nop -/* C47458 80240878 0C090037 */ jal func_802400DC_C46CBC +/* C47458 80240878 0C090037 */ jal UnkNpcAIFunc8 /* C4745C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C47460 80240880 8E430070 */ lw $v1, 0x70($s2) /* C47464 80240884 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s index e072022b19..4fdbbc7520 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s @@ -180,7 +180,7 @@ glabel func_802410D4_C47CB4 /* C47F58 80241378 24020020 */ addiu $v0, $zero, 0x20 /* C47F5C 8024137C 1462001F */ bne $v1, $v0, .L802413FC /* C47F60 80241380 00000000 */ nop -/* C47F64 80241384 0C090037 */ jal func_802400DC_C46CBC +/* C47F64 80241384 0C090037 */ jal UnkNpcAIFunc8 /* C47F68 80241388 0240202D */ daddu $a0, $s2, $zero /* C47F6C 8024138C 080904FF */ j .L802413FC /* C47F70 80241390 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802400DC_C4F5EC.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802400DC_C4F5EC.s deleted file mode 100644 index 3e9ad94761..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802400DC_C4F5EC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC_C4F5EC -/* C4F5EC 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C4F5F0 802400E0 AFB10034 */ sw $s1, 0x34($sp) -/* C4F5F4 802400E4 0080882D */ daddu $s1, $a0, $zero -/* C4F5F8 802400E8 AFBF0038 */ sw $ra, 0x38($sp) -/* C4F5FC 802400EC AFB00030 */ sw $s0, 0x30($sp) -/* C4F600 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* C4F604 802400F4 0C00EABB */ jal get_npc_unsafe -/* C4F608 802400F8 86040008 */ lh $a0, 8($s0) -/* C4F60C 802400FC 0040282D */ daddu $a1, $v0, $zero -/* C4F610 80240100 94A2008E */ lhu $v0, 0x8e($a1) -/* C4F614 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* C4F618 80240108 A4A2008E */ sh $v0, 0x8e($a1) -/* C4F61C 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* C4F620 80240110 1C400023 */ bgtz $v0, .L802401A0 -/* C4F624 80240114 24020004 */ addiu $v0, $zero, 4 -/* C4F628 80240118 8E0300CC */ lw $v1, 0xcc($s0) -/* C4F62C 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* C4F630 80240120 8C620000 */ lw $v0, ($v1) -/* C4F634 80240124 ACA20028 */ sw $v0, 0x28($a1) -/* C4F638 80240128 9602007A */ lhu $v0, 0x7a($s0) -/* C4F63C 8024012C A4A2008E */ sh $v0, 0x8e($a1) -/* C4F640 80240130 8E020078 */ lw $v0, 0x78($s0) -/* C4F644 80240134 28420008 */ slti $v0, $v0, 8 -/* C4F648 80240138 14400018 */ bnez $v0, .L8024019C -/* C4F64C 8024013C 24020021 */ addiu $v0, $zero, 0x21 -/* C4F650 80240140 24040003 */ addiu $a0, $zero, 3 -/* C4F654 80240144 27A30028 */ addiu $v1, $sp, 0x28 -/* C4F658 80240148 84A700A8 */ lh $a3, 0xa8($a1) -/* C4F65C 8024014C 3C013F80 */ lui $at, 0x3f80 -/* C4F660 80240150 44810000 */ mtc1 $at, $f0 -/* C4F664 80240154 3C014000 */ lui $at, 0x4000 -/* C4F668 80240158 44811000 */ mtc1 $at, $f2 -/* C4F66C 8024015C 3C01C1A0 */ lui $at, 0xc1a0 -/* C4F670 80240160 44812000 */ mtc1 $at, $f4 -/* C4F674 80240164 44873000 */ mtc1 $a3, $f6 -/* C4F678 80240168 00000000 */ nop -/* C4F67C 8024016C 468031A0 */ cvt.s.w $f6, $f6 -/* C4F680 80240170 E7A00010 */ swc1 $f0, 0x10($sp) -/* C4F684 80240174 E7A20014 */ swc1 $f2, 0x14($sp) -/* C4F688 80240178 E7A40018 */ swc1 $f4, 0x18($sp) -/* C4F68C 8024017C 8E020078 */ lw $v0, 0x78($s0) -/* C4F690 80240180 44073000 */ mfc1 $a3, $f6 -/* C4F694 80240184 0000302D */ daddu $a2, $zero, $zero -/* C4F698 80240188 AFA30020 */ sw $v1, 0x20($sp) -/* C4F69C 8024018C 2442FFFF */ addiu $v0, $v0, -1 -/* C4F6A0 80240190 0C01BFA4 */ jal fx_emote -/* C4F6A4 80240194 AFA2001C */ sw $v0, 0x1c($sp) -/* C4F6A8 80240198 24020021 */ addiu $v0, $zero, 0x21 -.L8024019C: -/* C4F6AC 8024019C AE220070 */ sw $v0, 0x70($s1) -.L802401A0: -/* C4F6B0 802401A0 8FBF0038 */ lw $ra, 0x38($sp) -/* C4F6B4 802401A4 8FB10034 */ lw $s1, 0x34($sp) -/* C4F6B8 802401A8 8FB00030 */ lw $s0, 0x30($sp) -/* C4F6BC 802401AC 03E00008 */ jr $ra -/* C4F6C0 802401B0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s index 47f6286eb9..bc4ef18b33 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s @@ -159,7 +159,7 @@ glabel func_8024061C_C4FB2C /* C4FD7C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* C4FD80 80240870 1462000D */ bne $v1, $v0, .L802408A8 /* C4FD84 80240874 00000000 */ nop -/* C4FD88 80240878 0C090037 */ jal func_802400DC_C4F5EC +/* C4FD88 80240878 0C090037 */ jal UnkNpcAIFunc8 /* C4FD8C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C4FD90 80240880 8E430070 */ lw $v1, 0x70($s2) /* C4FD94 80240884 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802400DC_C5261C.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802400DC_C5261C.s deleted file mode 100644 index 998dd47300..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802400DC_C5261C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC_C5261C -/* C5261C 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C52620 802400E0 AFB10034 */ sw $s1, 0x34($sp) -/* C52624 802400E4 0080882D */ daddu $s1, $a0, $zero -/* C52628 802400E8 AFBF0038 */ sw $ra, 0x38($sp) -/* C5262C 802400EC AFB00030 */ sw $s0, 0x30($sp) -/* C52630 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* C52634 802400F4 0C00EABB */ jal get_npc_unsafe -/* C52638 802400F8 86040008 */ lh $a0, 8($s0) -/* C5263C 802400FC 0040282D */ daddu $a1, $v0, $zero -/* C52640 80240100 94A2008E */ lhu $v0, 0x8e($a1) -/* C52644 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* C52648 80240108 A4A2008E */ sh $v0, 0x8e($a1) -/* C5264C 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* C52650 80240110 1C400023 */ bgtz $v0, .L802401A0 -/* C52654 80240114 24020004 */ addiu $v0, $zero, 4 -/* C52658 80240118 8E0300CC */ lw $v1, 0xcc($s0) -/* C5265C 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* C52660 80240120 8C620000 */ lw $v0, ($v1) -/* C52664 80240124 ACA20028 */ sw $v0, 0x28($a1) -/* C52668 80240128 9602007A */ lhu $v0, 0x7a($s0) -/* C5266C 8024012C A4A2008E */ sh $v0, 0x8e($a1) -/* C52670 80240130 8E020078 */ lw $v0, 0x78($s0) -/* C52674 80240134 28420008 */ slti $v0, $v0, 8 -/* C52678 80240138 14400018 */ bnez $v0, .L8024019C -/* C5267C 8024013C 24020021 */ addiu $v0, $zero, 0x21 -/* C52680 80240140 24040003 */ addiu $a0, $zero, 3 -/* C52684 80240144 27A30028 */ addiu $v1, $sp, 0x28 -/* C52688 80240148 84A700A8 */ lh $a3, 0xa8($a1) -/* C5268C 8024014C 3C013F80 */ lui $at, 0x3f80 -/* C52690 80240150 44810000 */ mtc1 $at, $f0 -/* C52694 80240154 3C014000 */ lui $at, 0x4000 -/* C52698 80240158 44811000 */ mtc1 $at, $f2 -/* C5269C 8024015C 3C01C1A0 */ lui $at, 0xc1a0 -/* C526A0 80240160 44812000 */ mtc1 $at, $f4 -/* C526A4 80240164 44873000 */ mtc1 $a3, $f6 -/* C526A8 80240168 00000000 */ nop -/* C526AC 8024016C 468031A0 */ cvt.s.w $f6, $f6 -/* C526B0 80240170 E7A00010 */ swc1 $f0, 0x10($sp) -/* C526B4 80240174 E7A20014 */ swc1 $f2, 0x14($sp) -/* C526B8 80240178 E7A40018 */ swc1 $f4, 0x18($sp) -/* C526BC 8024017C 8E020078 */ lw $v0, 0x78($s0) -/* C526C0 80240180 44073000 */ mfc1 $a3, $f6 -/* C526C4 80240184 0000302D */ daddu $a2, $zero, $zero -/* C526C8 80240188 AFA30020 */ sw $v1, 0x20($sp) -/* C526CC 8024018C 2442FFFF */ addiu $v0, $v0, -1 -/* C526D0 80240190 0C01BFA4 */ jal fx_emote -/* C526D4 80240194 AFA2001C */ sw $v0, 0x1c($sp) -/* C526D8 80240198 24020021 */ addiu $v0, $zero, 0x21 -.L8024019C: -/* C526DC 8024019C AE220070 */ sw $v0, 0x70($s1) -.L802401A0: -/* C526E0 802401A0 8FBF0038 */ lw $ra, 0x38($sp) -/* C526E4 802401A4 8FB10034 */ lw $s1, 0x34($sp) -/* C526E8 802401A8 8FB00030 */ lw $s0, 0x30($sp) -/* C526EC 802401AC 03E00008 */ jr $ra -/* C526F0 802401B0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s index 29e77b515c..1213cd8c89 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s @@ -180,7 +180,7 @@ glabel func_80240E20_C53360 /* C53604 802410C4 24020020 */ addiu $v0, $zero, 0x20 /* C53608 802410C8 1462001F */ bne $v1, $v0, .L80241148 /* C5360C 802410CC 00000000 */ nop -/* C53610 802410D0 0C090037 */ jal func_802400DC_C5261C +/* C53610 802410D0 0C090037 */ jal UnkNpcAIFunc8 /* C53614 802410D4 0240202D */ daddu $a0, $s2, $zero /* C53618 802410D8 08090452 */ j .L80241148 /* C5361C 802410DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s index 2028a09131..693086c4f6 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s @@ -159,7 +159,7 @@ glabel func_80241170_C536B0 /* C53900 802413C0 24020020 */ addiu $v0, $zero, 0x20 /* C53904 802413C4 1462000D */ bne $v1, $v0, .L802413FC /* C53908 802413C8 00000000 */ nop -/* C5390C 802413CC 0C090037 */ jal func_802400DC_C5261C +/* C5390C 802413CC 0C090037 */ jal UnkNpcAIFunc8 /* C53910 802413D0 0240202D */ daddu $a0, $s2, $zero /* C53914 802413D4 8E430070 */ lw $v1, 0x70($s2) /* C53918 802413D8 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802419A8_B4C418.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802419A8_B4C418.s deleted file mode 100644 index 5a99769aa1..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802419A8_B4C418.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419A8_B4C418 -/* B4C418 802419A8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B4C41C 802419AC AFB10034 */ sw $s1, 0x34($sp) -/* B4C420 802419B0 0080882D */ daddu $s1, $a0, $zero -/* B4C424 802419B4 AFBF0038 */ sw $ra, 0x38($sp) -/* B4C428 802419B8 AFB00030 */ sw $s0, 0x30($sp) -/* B4C42C 802419BC 8E300148 */ lw $s0, 0x148($s1) -/* B4C430 802419C0 0C00EABB */ jal get_npc_unsafe -/* B4C434 802419C4 86040008 */ lh $a0, 8($s0) -/* B4C438 802419C8 0040282D */ daddu $a1, $v0, $zero -/* B4C43C 802419CC 94A2008E */ lhu $v0, 0x8e($a1) -/* B4C440 802419D0 2442FFFF */ addiu $v0, $v0, -1 -/* B4C444 802419D4 A4A2008E */ sh $v0, 0x8e($a1) -/* B4C448 802419D8 00021400 */ sll $v0, $v0, 0x10 -/* B4C44C 802419DC 1C400023 */ bgtz $v0, .L80241A6C -/* B4C450 802419E0 24020004 */ addiu $v0, $zero, 4 -/* B4C454 802419E4 8E0300CC */ lw $v1, 0xcc($s0) -/* B4C458 802419E8 AE02006C */ sw $v0, 0x6c($s0) -/* B4C45C 802419EC 8C620000 */ lw $v0, ($v1) -/* B4C460 802419F0 ACA20028 */ sw $v0, 0x28($a1) -/* B4C464 802419F4 9602007A */ lhu $v0, 0x7a($s0) -/* B4C468 802419F8 A4A2008E */ sh $v0, 0x8e($a1) -/* B4C46C 802419FC 8E020078 */ lw $v0, 0x78($s0) -/* B4C470 80241A00 28420008 */ slti $v0, $v0, 8 -/* B4C474 80241A04 14400018 */ bnez $v0, .L80241A68 -/* B4C478 80241A08 24020021 */ addiu $v0, $zero, 0x21 -/* B4C47C 80241A0C 24040003 */ addiu $a0, $zero, 3 -/* B4C480 80241A10 27A30028 */ addiu $v1, $sp, 0x28 -/* B4C484 80241A14 84A700A8 */ lh $a3, 0xa8($a1) -/* B4C488 80241A18 3C013F80 */ lui $at, 0x3f80 -/* B4C48C 80241A1C 44810000 */ mtc1 $at, $f0 -/* B4C490 80241A20 3C014000 */ lui $at, 0x4000 -/* B4C494 80241A24 44811000 */ mtc1 $at, $f2 -/* B4C498 80241A28 3C01C1A0 */ lui $at, 0xc1a0 -/* B4C49C 80241A2C 44812000 */ mtc1 $at, $f4 -/* B4C4A0 80241A30 44873000 */ mtc1 $a3, $f6 -/* B4C4A4 80241A34 00000000 */ nop -/* B4C4A8 80241A38 468031A0 */ cvt.s.w $f6, $f6 -/* B4C4AC 80241A3C E7A00010 */ swc1 $f0, 0x10($sp) -/* B4C4B0 80241A40 E7A20014 */ swc1 $f2, 0x14($sp) -/* B4C4B4 80241A44 E7A40018 */ swc1 $f4, 0x18($sp) -/* B4C4B8 80241A48 8E020078 */ lw $v0, 0x78($s0) -/* B4C4BC 80241A4C 44073000 */ mfc1 $a3, $f6 -/* B4C4C0 80241A50 0000302D */ daddu $a2, $zero, $zero -/* B4C4C4 80241A54 AFA30020 */ sw $v1, 0x20($sp) -/* B4C4C8 80241A58 2442FFFF */ addiu $v0, $v0, -1 -/* B4C4CC 80241A5C 0C01BFA4 */ jal fx_emote -/* B4C4D0 80241A60 AFA2001C */ sw $v0, 0x1c($sp) -/* B4C4D4 80241A64 24020021 */ addiu $v0, $zero, 0x21 -.L80241A68: -/* B4C4D8 80241A68 AE220070 */ sw $v0, 0x70($s1) -.L80241A6C: -/* B4C4DC 80241A6C 8FBF0038 */ lw $ra, 0x38($sp) -/* B4C4E0 80241A70 8FB10034 */ lw $s1, 0x34($sp) -/* B4C4E4 80241A74 8FB00030 */ lw $s0, 0x30($sp) -/* B4C4E8 80241A78 03E00008 */ jr $ra -/* B4C4EC 80241A7C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s index e25bbcec13..0768ffa975 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s @@ -159,7 +159,7 @@ glabel func_80241EE8_B4C958 /* B4CBA8 80242138 24020020 */ addiu $v0, $zero, 0x20 /* B4CBAC 8024213C 1462000D */ bne $v1, $v0, .L80242174 /* B4CBB0 80242140 00000000 */ nop -/* B4CBB4 80242144 0C09066A */ jal func_802419A8_B4C418 +/* B4CBB4 80242144 0C09066A */ jal UnkNpcAIFunc8 /* B4CBB8 80242148 0240202D */ daddu $a0, $s2, $zero /* B4CBBC 8024214C 8E430070 */ lw $v1, 0x70($s2) /* B4CBC0 80242150 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s index 16e42eee11..ddb0737e9d 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s @@ -159,7 +159,7 @@ glabel func_8024219C_B4CC0C /* B4CE5C 802423EC 24020020 */ addiu $v0, $zero, 0x20 /* B4CE60 802423F0 1462000D */ bne $v1, $v0, .L80242428 /* B4CE64 802423F4 00000000 */ nop -/* B4CE68 802423F8 0C09066A */ jal func_802419A8_B4C418 +/* B4CE68 802423F8 0C09066A */ jal UnkNpcAIFunc8 /* B4CE6C 802423FC 0240202D */ daddu $a0, $s2, $zero /* B4CE70 80242400 8E430070 */ lw $v1, 0x70($s2) /* B4CE74 80242404 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802418F8_B54128.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802418F8_B54128.s deleted file mode 100644 index 7a089b3bd7..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802418F8_B54128.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418F8_B54128 -/* B54128 802418F8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B5412C 802418FC AFB10034 */ sw $s1, 0x34($sp) -/* B54130 80241900 0080882D */ daddu $s1, $a0, $zero -/* B54134 80241904 AFBF0038 */ sw $ra, 0x38($sp) -/* B54138 80241908 AFB00030 */ sw $s0, 0x30($sp) -/* B5413C 8024190C 8E300148 */ lw $s0, 0x148($s1) -/* B54140 80241910 0C00EABB */ jal get_npc_unsafe -/* B54144 80241914 86040008 */ lh $a0, 8($s0) -/* B54148 80241918 0040282D */ daddu $a1, $v0, $zero -/* B5414C 8024191C 94A2008E */ lhu $v0, 0x8e($a1) -/* B54150 80241920 2442FFFF */ addiu $v0, $v0, -1 -/* B54154 80241924 A4A2008E */ sh $v0, 0x8e($a1) -/* B54158 80241928 00021400 */ sll $v0, $v0, 0x10 -/* B5415C 8024192C 1C400023 */ bgtz $v0, .L802419BC -/* B54160 80241930 24020004 */ addiu $v0, $zero, 4 -/* B54164 80241934 8E0300CC */ lw $v1, 0xcc($s0) -/* B54168 80241938 AE02006C */ sw $v0, 0x6c($s0) -/* B5416C 8024193C 8C620000 */ lw $v0, ($v1) -/* B54170 80241940 ACA20028 */ sw $v0, 0x28($a1) -/* B54174 80241944 9602007A */ lhu $v0, 0x7a($s0) -/* B54178 80241948 A4A2008E */ sh $v0, 0x8e($a1) -/* B5417C 8024194C 8E020078 */ lw $v0, 0x78($s0) -/* B54180 80241950 28420008 */ slti $v0, $v0, 8 -/* B54184 80241954 14400018 */ bnez $v0, .L802419B8 -/* B54188 80241958 24020021 */ addiu $v0, $zero, 0x21 -/* B5418C 8024195C 24040003 */ addiu $a0, $zero, 3 -/* B54190 80241960 27A30028 */ addiu $v1, $sp, 0x28 -/* B54194 80241964 84A700A8 */ lh $a3, 0xa8($a1) -/* B54198 80241968 3C013F80 */ lui $at, 0x3f80 -/* B5419C 8024196C 44810000 */ mtc1 $at, $f0 -/* B541A0 80241970 3C014000 */ lui $at, 0x4000 -/* B541A4 80241974 44811000 */ mtc1 $at, $f2 -/* B541A8 80241978 3C01C1A0 */ lui $at, 0xc1a0 -/* B541AC 8024197C 44812000 */ mtc1 $at, $f4 -/* B541B0 80241980 44873000 */ mtc1 $a3, $f6 -/* B541B4 80241984 00000000 */ nop -/* B541B8 80241988 468031A0 */ cvt.s.w $f6, $f6 -/* B541BC 8024198C E7A00010 */ swc1 $f0, 0x10($sp) -/* B541C0 80241990 E7A20014 */ swc1 $f2, 0x14($sp) -/* B541C4 80241994 E7A40018 */ swc1 $f4, 0x18($sp) -/* B541C8 80241998 8E020078 */ lw $v0, 0x78($s0) -/* B541CC 8024199C 44073000 */ mfc1 $a3, $f6 -/* B541D0 802419A0 0000302D */ daddu $a2, $zero, $zero -/* B541D4 802419A4 AFA30020 */ sw $v1, 0x20($sp) -/* B541D8 802419A8 2442FFFF */ addiu $v0, $v0, -1 -/* B541DC 802419AC 0C01BFA4 */ jal fx_emote -/* B541E0 802419B0 AFA2001C */ sw $v0, 0x1c($sp) -/* B541E4 802419B4 24020021 */ addiu $v0, $zero, 0x21 -.L802419B8: -/* B541E8 802419B8 AE220070 */ sw $v0, 0x70($s1) -.L802419BC: -/* B541EC 802419BC 8FBF0038 */ lw $ra, 0x38($sp) -/* B541F0 802419C0 8FB10034 */ lw $s1, 0x34($sp) -/* B541F4 802419C4 8FB00030 */ lw $s0, 0x30($sp) -/* B541F8 802419C8 03E00008 */ jr $ra -/* B541FC 802419CC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s index 2dce097fa3..1882ae2e5c 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s @@ -159,7 +159,7 @@ glabel func_80241E38_B54668 /* B548B8 80242088 24020020 */ addiu $v0, $zero, 0x20 /* B548BC 8024208C 1462000D */ bne $v1, $v0, .L802420C4 /* B548C0 80242090 00000000 */ nop -/* B548C4 80242094 0C09063E */ jal func_802418F8_B54128 +/* B548C4 80242094 0C09063E */ jal UnkNpcAIFunc8 /* B548C8 80242098 0240202D */ daddu $a0, $s2, $zero /* B548CC 8024209C 8E430070 */ lw $v1, 0x70($s2) /* B548D0 802420A0 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s index e84d161a0c..760bee367a 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s @@ -159,7 +159,7 @@ glabel func_802420EC_B5491C /* B54B6C 8024233C 24020020 */ addiu $v0, $zero, 0x20 /* B54B70 80242340 1462000D */ bne $v1, $v0, .L80242378 /* B54B74 80242344 00000000 */ nop -/* B54B78 80242348 0C09063E */ jal func_802418F8_B54128 +/* B54B78 80242348 0C09063E */ jal UnkNpcAIFunc8 /* B54B7C 8024234C 0240202D */ daddu $a0, $s2, $zero /* B54B80 80242350 8E430070 */ lw $v1, 0x70($s2) /* B54B84 80242354 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802402F0_B59B60.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802402F0_B59B60.s deleted file mode 100644 index 14435f1289..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802402F0_B59B60.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_B59B60 -/* B59B60 802402F0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B59B64 802402F4 AFB10034 */ sw $s1, 0x34($sp) -/* B59B68 802402F8 0080882D */ daddu $s1, $a0, $zero -/* B59B6C 802402FC AFBF0038 */ sw $ra, 0x38($sp) -/* B59B70 80240300 AFB00030 */ sw $s0, 0x30($sp) -/* B59B74 80240304 8E300148 */ lw $s0, 0x148($s1) -/* B59B78 80240308 0C00EABB */ jal get_npc_unsafe -/* B59B7C 8024030C 86040008 */ lh $a0, 8($s0) -/* B59B80 80240310 0040282D */ daddu $a1, $v0, $zero -/* B59B84 80240314 94A2008E */ lhu $v0, 0x8e($a1) -/* B59B88 80240318 2442FFFF */ addiu $v0, $v0, -1 -/* B59B8C 8024031C A4A2008E */ sh $v0, 0x8e($a1) -/* B59B90 80240320 00021400 */ sll $v0, $v0, 0x10 -/* B59B94 80240324 1C400023 */ bgtz $v0, .L802403B4 -/* B59B98 80240328 24020004 */ addiu $v0, $zero, 4 -/* B59B9C 8024032C 8E0300CC */ lw $v1, 0xcc($s0) -/* B59BA0 80240330 AE02006C */ sw $v0, 0x6c($s0) -/* B59BA4 80240334 8C620000 */ lw $v0, ($v1) -/* B59BA8 80240338 ACA20028 */ sw $v0, 0x28($a1) -/* B59BAC 8024033C 9602007A */ lhu $v0, 0x7a($s0) -/* B59BB0 80240340 A4A2008E */ sh $v0, 0x8e($a1) -/* B59BB4 80240344 8E020078 */ lw $v0, 0x78($s0) -/* B59BB8 80240348 28420008 */ slti $v0, $v0, 8 -/* B59BBC 8024034C 14400018 */ bnez $v0, .L802403B0 -/* B59BC0 80240350 24020021 */ addiu $v0, $zero, 0x21 -/* B59BC4 80240354 24040003 */ addiu $a0, $zero, 3 -/* B59BC8 80240358 27A30028 */ addiu $v1, $sp, 0x28 -/* B59BCC 8024035C 84A700A8 */ lh $a3, 0xa8($a1) -/* B59BD0 80240360 3C013F80 */ lui $at, 0x3f80 -/* B59BD4 80240364 44810000 */ mtc1 $at, $f0 -/* B59BD8 80240368 3C014000 */ lui $at, 0x4000 -/* B59BDC 8024036C 44811000 */ mtc1 $at, $f2 -/* B59BE0 80240370 3C01C1A0 */ lui $at, 0xc1a0 -/* B59BE4 80240374 44812000 */ mtc1 $at, $f4 -/* B59BE8 80240378 44873000 */ mtc1 $a3, $f6 -/* B59BEC 8024037C 00000000 */ nop -/* B59BF0 80240380 468031A0 */ cvt.s.w $f6, $f6 -/* B59BF4 80240384 E7A00010 */ swc1 $f0, 0x10($sp) -/* B59BF8 80240388 E7A20014 */ swc1 $f2, 0x14($sp) -/* B59BFC 8024038C E7A40018 */ swc1 $f4, 0x18($sp) -/* B59C00 80240390 8E020078 */ lw $v0, 0x78($s0) -/* B59C04 80240394 44073000 */ mfc1 $a3, $f6 -/* B59C08 80240398 0000302D */ daddu $a2, $zero, $zero -/* B59C0C 8024039C AFA30020 */ sw $v1, 0x20($sp) -/* B59C10 802403A0 2442FFFF */ addiu $v0, $v0, -1 -/* B59C14 802403A4 0C01BFA4 */ jal fx_emote -/* B59C18 802403A8 AFA2001C */ sw $v0, 0x1c($sp) -/* B59C1C 802403AC 24020021 */ addiu $v0, $zero, 0x21 -.L802403B0: -/* B59C20 802403B0 AE220070 */ sw $v0, 0x70($s1) -.L802403B4: -/* B59C24 802403B4 8FBF0038 */ lw $ra, 0x38($sp) -/* B59C28 802403B8 8FB10034 */ lw $s1, 0x34($sp) -/* B59C2C 802403BC 8FB00030 */ lw $s0, 0x30($sp) -/* B59C30 802403C0 03E00008 */ jr $ra -/* B59C34 802403C4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s index 79ecb0888a..5f08cc61b2 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s @@ -159,7 +159,7 @@ glabel func_80240830_B5A0A0 /* B5A2F0 80240A80 24020020 */ addiu $v0, $zero, 0x20 /* B5A2F4 80240A84 1462000D */ bne $v1, $v0, .L80240ABC /* B5A2F8 80240A88 00000000 */ nop -/* B5A2FC 80240A8C 0C0900BC */ jal func_802402F0_B59B60 +/* B5A2FC 80240A8C 0C0900BC */ jal UnkNpcAIFunc8 /* B5A300 80240A90 0240202D */ daddu $a0, $s2, $zero /* B5A304 80240A94 8E430070 */ lw $v1, 0x70($s2) /* B5A308 80240A98 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s index 083b58525a..99f5dd98ca 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s @@ -159,7 +159,7 @@ glabel func_80240AE4_B5A354 /* B5A5A4 80240D34 24020020 */ addiu $v0, $zero, 0x20 /* B5A5A8 80240D38 1462000D */ bne $v1, $v0, .L80240D70 /* B5A5AC 80240D3C 00000000 */ nop -/* B5A5B0 80240D40 0C0900BC */ jal func_802402F0_B59B60 +/* B5A5B0 80240D40 0C0900BC */ jal UnkNpcAIFunc8 /* B5A5B4 80240D44 0240202D */ daddu $a0, $s2, $zero /* B5A5B8 80240D48 8E430070 */ lw $v1, 0x70($s2) /* B5A5BC 80240D4C 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241744_B5F9F4.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241744_B5F9F4.s deleted file mode 100644 index 27ead89470..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241744_B5F9F4.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241744_B5F9F4 -/* B5F9F4 80241744 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B5F9F8 80241748 AFB10034 */ sw $s1, 0x34($sp) -/* B5F9FC 8024174C 0080882D */ daddu $s1, $a0, $zero -/* B5FA00 80241750 AFBF0038 */ sw $ra, 0x38($sp) -/* B5FA04 80241754 AFB00030 */ sw $s0, 0x30($sp) -/* B5FA08 80241758 8E300148 */ lw $s0, 0x148($s1) -/* B5FA0C 8024175C 0C00EABB */ jal get_npc_unsafe -/* B5FA10 80241760 86040008 */ lh $a0, 8($s0) -/* B5FA14 80241764 0040282D */ daddu $a1, $v0, $zero -/* B5FA18 80241768 94A2008E */ lhu $v0, 0x8e($a1) -/* B5FA1C 8024176C 2442FFFF */ addiu $v0, $v0, -1 -/* B5FA20 80241770 A4A2008E */ sh $v0, 0x8e($a1) -/* B5FA24 80241774 00021400 */ sll $v0, $v0, 0x10 -/* B5FA28 80241778 1C400023 */ bgtz $v0, .L80241808 -/* B5FA2C 8024177C 24020004 */ addiu $v0, $zero, 4 -/* B5FA30 80241780 8E0300CC */ lw $v1, 0xcc($s0) -/* B5FA34 80241784 AE02006C */ sw $v0, 0x6c($s0) -/* B5FA38 80241788 8C620000 */ lw $v0, ($v1) -/* B5FA3C 8024178C ACA20028 */ sw $v0, 0x28($a1) -/* B5FA40 80241790 9602007A */ lhu $v0, 0x7a($s0) -/* B5FA44 80241794 A4A2008E */ sh $v0, 0x8e($a1) -/* B5FA48 80241798 8E020078 */ lw $v0, 0x78($s0) -/* B5FA4C 8024179C 28420008 */ slti $v0, $v0, 8 -/* B5FA50 802417A0 14400018 */ bnez $v0, .L80241804 -/* B5FA54 802417A4 24020021 */ addiu $v0, $zero, 0x21 -/* B5FA58 802417A8 24040003 */ addiu $a0, $zero, 3 -/* B5FA5C 802417AC 27A30028 */ addiu $v1, $sp, 0x28 -/* B5FA60 802417B0 84A700A8 */ lh $a3, 0xa8($a1) -/* B5FA64 802417B4 3C013F80 */ lui $at, 0x3f80 -/* B5FA68 802417B8 44810000 */ mtc1 $at, $f0 -/* B5FA6C 802417BC 3C014000 */ lui $at, 0x4000 -/* B5FA70 802417C0 44811000 */ mtc1 $at, $f2 -/* B5FA74 802417C4 3C01C1A0 */ lui $at, 0xc1a0 -/* B5FA78 802417C8 44812000 */ mtc1 $at, $f4 -/* B5FA7C 802417CC 44873000 */ mtc1 $a3, $f6 -/* B5FA80 802417D0 00000000 */ nop -/* B5FA84 802417D4 468031A0 */ cvt.s.w $f6, $f6 -/* B5FA88 802417D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* B5FA8C 802417DC E7A20014 */ swc1 $f2, 0x14($sp) -/* B5FA90 802417E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* B5FA94 802417E4 8E020078 */ lw $v0, 0x78($s0) -/* B5FA98 802417E8 44073000 */ mfc1 $a3, $f6 -/* B5FA9C 802417EC 0000302D */ daddu $a2, $zero, $zero -/* B5FAA0 802417F0 AFA30020 */ sw $v1, 0x20($sp) -/* B5FAA4 802417F4 2442FFFF */ addiu $v0, $v0, -1 -/* B5FAA8 802417F8 0C01BFA4 */ jal fx_emote -/* B5FAAC 802417FC AFA2001C */ sw $v0, 0x1c($sp) -/* B5FAB0 80241800 24020021 */ addiu $v0, $zero, 0x21 -.L80241804: -/* B5FAB4 80241804 AE220070 */ sw $v0, 0x70($s1) -.L80241808: -/* B5FAB8 80241808 8FBF0038 */ lw $ra, 0x38($sp) -/* B5FABC 8024180C 8FB10034 */ lw $s1, 0x34($sp) -/* B5FAC0 80241810 8FB00030 */ lw $s0, 0x30($sp) -/* B5FAC4 80241814 03E00008 */ jr $ra -/* B5FAC8 80241818 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s index 67913b5ec9..1b2d044531 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s @@ -159,7 +159,7 @@ glabel func_80241C84_B5FF34 /* B60184 80241ED4 24020020 */ addiu $v0, $zero, 0x20 /* B60188 80241ED8 1462000D */ bne $v1, $v0, .L80241F10 /* B6018C 80241EDC 00000000 */ nop -/* B60190 80241EE0 0C0905D1 */ jal func_80241744_B5F9F4 +/* B60190 80241EE0 0C0905D1 */ jal UnkNpcAIFunc8 /* B60194 80241EE4 0240202D */ daddu $a0, $s2, $zero /* B60198 80241EE8 8E430070 */ lw $v1, 0x70($s2) /* B6019C 80241EEC 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s index ea57464184..23417e2a66 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s @@ -159,7 +159,7 @@ glabel func_80241F38_B601E8 /* B60438 80242188 24020020 */ addiu $v0, $zero, 0x20 /* B6043C 8024218C 1462000D */ bne $v1, $v0, .L802421C4 /* B60440 80242190 00000000 */ nop -/* B60444 80242194 0C0905D1 */ jal func_80241744_B5F9F4 +/* B60444 80242194 0C0905D1 */ jal UnkNpcAIFunc8 /* B60448 80242198 0240202D */ daddu $a0, $s2, $zero /* B6044C 8024219C 8E430070 */ lw $v1, 0x70($s2) /* B60450 802421A0 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240C30_B666E0.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240C30_B666E0.s deleted file mode 100644 index 6f0daeea78..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240C30_B666E0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C30_B666E0 -/* B666E0 80240C30 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B666E4 80240C34 AFB10034 */ sw $s1, 0x34($sp) -/* B666E8 80240C38 0080882D */ daddu $s1, $a0, $zero -/* B666EC 80240C3C AFBF0038 */ sw $ra, 0x38($sp) -/* B666F0 80240C40 AFB00030 */ sw $s0, 0x30($sp) -/* B666F4 80240C44 8E300148 */ lw $s0, 0x148($s1) -/* B666F8 80240C48 0C00EABB */ jal get_npc_unsafe -/* B666FC 80240C4C 86040008 */ lh $a0, 8($s0) -/* B66700 80240C50 0040282D */ daddu $a1, $v0, $zero -/* B66704 80240C54 94A2008E */ lhu $v0, 0x8e($a1) -/* B66708 80240C58 2442FFFF */ addiu $v0, $v0, -1 -/* B6670C 80240C5C A4A2008E */ sh $v0, 0x8e($a1) -/* B66710 80240C60 00021400 */ sll $v0, $v0, 0x10 -/* B66714 80240C64 1C400023 */ bgtz $v0, .L80240CF4 -/* B66718 80240C68 24020004 */ addiu $v0, $zero, 4 -/* B6671C 80240C6C 8E0300CC */ lw $v1, 0xcc($s0) -/* B66720 80240C70 AE02006C */ sw $v0, 0x6c($s0) -/* B66724 80240C74 8C620000 */ lw $v0, ($v1) -/* B66728 80240C78 ACA20028 */ sw $v0, 0x28($a1) -/* B6672C 80240C7C 9602007A */ lhu $v0, 0x7a($s0) -/* B66730 80240C80 A4A2008E */ sh $v0, 0x8e($a1) -/* B66734 80240C84 8E020078 */ lw $v0, 0x78($s0) -/* B66738 80240C88 28420008 */ slti $v0, $v0, 8 -/* B6673C 80240C8C 14400018 */ bnez $v0, .L80240CF0 -/* B66740 80240C90 24020021 */ addiu $v0, $zero, 0x21 -/* B66744 80240C94 24040003 */ addiu $a0, $zero, 3 -/* B66748 80240C98 27A30028 */ addiu $v1, $sp, 0x28 -/* B6674C 80240C9C 84A700A8 */ lh $a3, 0xa8($a1) -/* B66750 80240CA0 3C013F80 */ lui $at, 0x3f80 -/* B66754 80240CA4 44810000 */ mtc1 $at, $f0 -/* B66758 80240CA8 3C014000 */ lui $at, 0x4000 -/* B6675C 80240CAC 44811000 */ mtc1 $at, $f2 -/* B66760 80240CB0 3C01C1A0 */ lui $at, 0xc1a0 -/* B66764 80240CB4 44812000 */ mtc1 $at, $f4 -/* B66768 80240CB8 44873000 */ mtc1 $a3, $f6 -/* B6676C 80240CBC 00000000 */ nop -/* B66770 80240CC0 468031A0 */ cvt.s.w $f6, $f6 -/* B66774 80240CC4 E7A00010 */ swc1 $f0, 0x10($sp) -/* B66778 80240CC8 E7A20014 */ swc1 $f2, 0x14($sp) -/* B6677C 80240CCC E7A40018 */ swc1 $f4, 0x18($sp) -/* B66780 80240CD0 8E020078 */ lw $v0, 0x78($s0) -/* B66784 80240CD4 44073000 */ mfc1 $a3, $f6 -/* B66788 80240CD8 0000302D */ daddu $a2, $zero, $zero -/* B6678C 80240CDC AFA30020 */ sw $v1, 0x20($sp) -/* B66790 80240CE0 2442FFFF */ addiu $v0, $v0, -1 -/* B66794 80240CE4 0C01BFA4 */ jal fx_emote -/* B66798 80240CE8 AFA2001C */ sw $v0, 0x1c($sp) -/* B6679C 80240CEC 24020021 */ addiu $v0, $zero, 0x21 -.L80240CF0: -/* B667A0 80240CF0 AE220070 */ sw $v0, 0x70($s1) -.L80240CF4: -/* B667A4 80240CF4 8FBF0038 */ lw $ra, 0x38($sp) -/* B667A8 80240CF8 8FB10034 */ lw $s1, 0x34($sp) -/* B667AC 80240CFC 8FB00030 */ lw $s0, 0x30($sp) -/* B667B0 80240D00 03E00008 */ jr $ra -/* B667B4 80240D04 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s index 01457a320a..72e21d6375 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s @@ -159,7 +159,7 @@ glabel func_80241170_B66C20 /* B66E70 802413C0 24020020 */ addiu $v0, $zero, 0x20 /* B66E74 802413C4 1462000D */ bne $v1, $v0, .L802413FC /* B66E78 802413C8 00000000 */ nop -/* B66E7C 802413CC 0C09030C */ jal func_80240C30_B666E0 +/* B66E7C 802413CC 0C09030C */ jal UnkNpcAIFunc8 /* B66E80 802413D0 0240202D */ daddu $a0, $s2, $zero /* B66E84 802413D4 8E430070 */ lw $v1, 0x70($s2) /* B66E88 802413D8 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s index e06f59cba5..9c7e5d4905 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s @@ -159,7 +159,7 @@ glabel func_80241424_B66ED4 /* B67124 80241674 24020020 */ addiu $v0, $zero, 0x20 /* B67128 80241678 1462000D */ bne $v1, $v0, .L802416B0 /* B6712C 8024167C 00000000 */ nop -/* B67130 80241680 0C09030C */ jal func_80240C30_B666E0 +/* B67130 80241680 0C09030C */ jal UnkNpcAIFunc8 /* B67134 80241684 0240202D */ daddu $a0, $s2, $zero /* B67138 80241688 8E430070 */ lw $v1, 0x70($s2) /* B6713C 8024168C 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802407B0_B73860.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802407B0_B73860.s deleted file mode 100644 index baede32ccb..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802407B0_B73860.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407B0_B73860 -/* B73860 802407B0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B73864 802407B4 AFB10034 */ sw $s1, 0x34($sp) -/* B73868 802407B8 0080882D */ daddu $s1, $a0, $zero -/* B7386C 802407BC AFBF0038 */ sw $ra, 0x38($sp) -/* B73870 802407C0 AFB00030 */ sw $s0, 0x30($sp) -/* B73874 802407C4 8E300148 */ lw $s0, 0x148($s1) -/* B73878 802407C8 0C00EABB */ jal get_npc_unsafe -/* B7387C 802407CC 86040008 */ lh $a0, 8($s0) -/* B73880 802407D0 0040282D */ daddu $a1, $v0, $zero -/* B73884 802407D4 94A2008E */ lhu $v0, 0x8e($a1) -/* B73888 802407D8 2442FFFF */ addiu $v0, $v0, -1 -/* B7388C 802407DC A4A2008E */ sh $v0, 0x8e($a1) -/* B73890 802407E0 00021400 */ sll $v0, $v0, 0x10 -/* B73894 802407E4 1C400023 */ bgtz $v0, .L80240874 -/* B73898 802407E8 24020004 */ addiu $v0, $zero, 4 -/* B7389C 802407EC 8E0300CC */ lw $v1, 0xcc($s0) -/* B738A0 802407F0 AE02006C */ sw $v0, 0x6c($s0) -/* B738A4 802407F4 8C620000 */ lw $v0, ($v1) -/* B738A8 802407F8 ACA20028 */ sw $v0, 0x28($a1) -/* B738AC 802407FC 9602007A */ lhu $v0, 0x7a($s0) -/* B738B0 80240800 A4A2008E */ sh $v0, 0x8e($a1) -/* B738B4 80240804 8E020078 */ lw $v0, 0x78($s0) -/* B738B8 80240808 28420008 */ slti $v0, $v0, 8 -/* B738BC 8024080C 14400018 */ bnez $v0, .L80240870 -/* B738C0 80240810 24020021 */ addiu $v0, $zero, 0x21 -/* B738C4 80240814 24040003 */ addiu $a0, $zero, 3 -/* B738C8 80240818 27A30028 */ addiu $v1, $sp, 0x28 -/* B738CC 8024081C 84A700A8 */ lh $a3, 0xa8($a1) -/* B738D0 80240820 3C013F80 */ lui $at, 0x3f80 -/* B738D4 80240824 44810000 */ mtc1 $at, $f0 -/* B738D8 80240828 3C014000 */ lui $at, 0x4000 -/* B738DC 8024082C 44811000 */ mtc1 $at, $f2 -/* B738E0 80240830 3C01C1A0 */ lui $at, 0xc1a0 -/* B738E4 80240834 44812000 */ mtc1 $at, $f4 -/* B738E8 80240838 44873000 */ mtc1 $a3, $f6 -/* B738EC 8024083C 00000000 */ nop -/* B738F0 80240840 468031A0 */ cvt.s.w $f6, $f6 -/* B738F4 80240844 E7A00010 */ swc1 $f0, 0x10($sp) -/* B738F8 80240848 E7A20014 */ swc1 $f2, 0x14($sp) -/* B738FC 8024084C E7A40018 */ swc1 $f4, 0x18($sp) -/* B73900 80240850 8E020078 */ lw $v0, 0x78($s0) -/* B73904 80240854 44073000 */ mfc1 $a3, $f6 -/* B73908 80240858 0000302D */ daddu $a2, $zero, $zero -/* B7390C 8024085C AFA30020 */ sw $v1, 0x20($sp) -/* B73910 80240860 2442FFFF */ addiu $v0, $v0, -1 -/* B73914 80240864 0C01BFA4 */ jal fx_emote -/* B73918 80240868 AFA2001C */ sw $v0, 0x1c($sp) -/* B7391C 8024086C 24020021 */ addiu $v0, $zero, 0x21 -.L80240870: -/* B73920 80240870 AE220070 */ sw $v0, 0x70($s1) -.L80240874: -/* B73924 80240874 8FBF0038 */ lw $ra, 0x38($sp) -/* B73928 80240878 8FB10034 */ lw $s1, 0x34($sp) -/* B7392C 8024087C 8FB00030 */ lw $s0, 0x30($sp) -/* B73930 80240880 03E00008 */ jr $ra -/* B73934 80240884 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s index fa57b8e92b..6a9f16e404 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s @@ -159,7 +159,7 @@ glabel func_80240CF0_B73DA0 /* B73FF0 80240F40 24020020 */ addiu $v0, $zero, 0x20 /* B73FF4 80240F44 1462000D */ bne $v1, $v0, .L80240F7C /* B73FF8 80240F48 00000000 */ nop -/* B73FFC 80240F4C 0C0901EC */ jal func_802407B0_B73860 +/* B73FFC 80240F4C 0C0901EC */ jal UnkNpcAIFunc8 /* B74000 80240F50 0240202D */ daddu $a0, $s2, $zero /* B74004 80240F54 8E430070 */ lw $v1, 0x70($s2) /* B74008 80240F58 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s index 8b875d39e8..70520334ce 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s @@ -159,7 +159,7 @@ glabel func_80240FA4_B74054 /* B742A4 802411F4 24020020 */ addiu $v0, $zero, 0x20 /* B742A8 802411F8 1462000D */ bne $v1, $v0, .L80241230 /* B742AC 802411FC 00000000 */ nop -/* B742B0 80241200 0C0901EC */ jal func_802407B0_B73860 +/* B742B0 80241200 0C0901EC */ jal UnkNpcAIFunc8 /* B742B4 80241204 0240202D */ daddu $a0, $s2, $zero /* B742B8 80241208 8E430070 */ lw $v1, 0x70($s2) /* B742BC 8024120C 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240CD4_C619E4.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240CD4_C619E4.s deleted file mode 100644 index 1a57278ffe..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240CD4_C619E4.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CD4_C619E4 -/* C619E4 80240CD4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C619E8 80240CD8 AFB10034 */ sw $s1, 0x34($sp) -/* C619EC 80240CDC 0080882D */ daddu $s1, $a0, $zero -/* C619F0 80240CE0 AFBF0038 */ sw $ra, 0x38($sp) -/* C619F4 80240CE4 AFB00030 */ sw $s0, 0x30($sp) -/* C619F8 80240CE8 8E300148 */ lw $s0, 0x148($s1) -/* C619FC 80240CEC 0C00EABB */ jal get_npc_unsafe -/* C61A00 80240CF0 86040008 */ lh $a0, 8($s0) -/* C61A04 80240CF4 0040282D */ daddu $a1, $v0, $zero -/* C61A08 80240CF8 94A2008E */ lhu $v0, 0x8e($a1) -/* C61A0C 80240CFC 2442FFFF */ addiu $v0, $v0, -1 -/* C61A10 80240D00 A4A2008E */ sh $v0, 0x8e($a1) -/* C61A14 80240D04 00021400 */ sll $v0, $v0, 0x10 -/* C61A18 80240D08 1C400023 */ bgtz $v0, .L80240D98 -/* C61A1C 80240D0C 24020004 */ addiu $v0, $zero, 4 -/* C61A20 80240D10 8E0300CC */ lw $v1, 0xcc($s0) -/* C61A24 80240D14 AE02006C */ sw $v0, 0x6c($s0) -/* C61A28 80240D18 8C620000 */ lw $v0, ($v1) -/* C61A2C 80240D1C ACA20028 */ sw $v0, 0x28($a1) -/* C61A30 80240D20 9602007A */ lhu $v0, 0x7a($s0) -/* C61A34 80240D24 A4A2008E */ sh $v0, 0x8e($a1) -/* C61A38 80240D28 8E020078 */ lw $v0, 0x78($s0) -/* C61A3C 80240D2C 28420008 */ slti $v0, $v0, 8 -/* C61A40 80240D30 14400018 */ bnez $v0, .L80240D94 -/* C61A44 80240D34 24020021 */ addiu $v0, $zero, 0x21 -/* C61A48 80240D38 24040003 */ addiu $a0, $zero, 3 -/* C61A4C 80240D3C 27A30028 */ addiu $v1, $sp, 0x28 -/* C61A50 80240D40 84A700A8 */ lh $a3, 0xa8($a1) -/* C61A54 80240D44 3C013F80 */ lui $at, 0x3f80 -/* C61A58 80240D48 44810000 */ mtc1 $at, $f0 -/* C61A5C 80240D4C 3C014000 */ lui $at, 0x4000 -/* C61A60 80240D50 44811000 */ mtc1 $at, $f2 -/* C61A64 80240D54 3C01C1A0 */ lui $at, 0xc1a0 -/* C61A68 80240D58 44812000 */ mtc1 $at, $f4 -/* C61A6C 80240D5C 44873000 */ mtc1 $a3, $f6 -/* C61A70 80240D60 00000000 */ nop -/* C61A74 80240D64 468031A0 */ cvt.s.w $f6, $f6 -/* C61A78 80240D68 E7A00010 */ swc1 $f0, 0x10($sp) -/* C61A7C 80240D6C E7A20014 */ swc1 $f2, 0x14($sp) -/* C61A80 80240D70 E7A40018 */ swc1 $f4, 0x18($sp) -/* C61A84 80240D74 8E020078 */ lw $v0, 0x78($s0) -/* C61A88 80240D78 44073000 */ mfc1 $a3, $f6 -/* C61A8C 80240D7C 0000302D */ daddu $a2, $zero, $zero -/* C61A90 80240D80 AFA30020 */ sw $v1, 0x20($sp) -/* C61A94 80240D84 2442FFFF */ addiu $v0, $v0, -1 -/* C61A98 80240D88 0C01BFA4 */ jal fx_emote -/* C61A9C 80240D8C AFA2001C */ sw $v0, 0x1c($sp) -/* C61AA0 80240D90 24020021 */ addiu $v0, $zero, 0x21 -.L80240D94: -/* C61AA4 80240D94 AE220070 */ sw $v0, 0x70($s1) -.L80240D98: -/* C61AA8 80240D98 8FBF0038 */ lw $ra, 0x38($sp) -/* C61AAC 80240D9C 8FB10034 */ lw $s1, 0x34($sp) -/* C61AB0 80240DA0 8FB00030 */ lw $s0, 0x30($sp) -/* C61AB4 80240DA4 03E00008 */ jr $ra -/* C61AB8 80240DA8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s index 41251c6067..b672386072 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s @@ -159,7 +159,7 @@ glabel func_80241214_C61F24 /* C62174 80241464 24020020 */ addiu $v0, $zero, 0x20 /* C62178 80241468 1462000D */ bne $v1, $v0, .L802414A0 /* C6217C 8024146C 00000000 */ nop -/* C62180 80241470 0C090335 */ jal func_80240CD4_C619E4 +/* C62180 80241470 0C090335 */ jal UnkNpcAIFunc8 /* C62184 80241474 0240202D */ daddu $a0, $s2, $zero /* C62188 80241478 8E430070 */ lw $v1, 0x70($s2) /* C6218C 8024147C 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242618_C73A98.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242618_C73A98.s deleted file mode 100644 index 9369525250..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242618_C73A98.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242618_C73A98 -/* C73A98 80242618 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C73A9C 8024261C AFB10034 */ sw $s1, 0x34($sp) -/* C73AA0 80242620 0080882D */ daddu $s1, $a0, $zero -/* C73AA4 80242624 AFBF0038 */ sw $ra, 0x38($sp) -/* C73AA8 80242628 AFB00030 */ sw $s0, 0x30($sp) -/* C73AAC 8024262C 8E300148 */ lw $s0, 0x148($s1) -/* C73AB0 80242630 0C00EABB */ jal get_npc_unsafe -/* C73AB4 80242634 86040008 */ lh $a0, 8($s0) -/* C73AB8 80242638 0040282D */ daddu $a1, $v0, $zero -/* C73ABC 8024263C 94A2008E */ lhu $v0, 0x8e($a1) -/* C73AC0 80242640 2442FFFF */ addiu $v0, $v0, -1 -/* C73AC4 80242644 A4A2008E */ sh $v0, 0x8e($a1) -/* C73AC8 80242648 00021400 */ sll $v0, $v0, 0x10 -/* C73ACC 8024264C 1C400023 */ bgtz $v0, .L802426DC -/* C73AD0 80242650 24020004 */ addiu $v0, $zero, 4 -/* C73AD4 80242654 8E0300CC */ lw $v1, 0xcc($s0) -/* C73AD8 80242658 AE02006C */ sw $v0, 0x6c($s0) -/* C73ADC 8024265C 8C620000 */ lw $v0, ($v1) -/* C73AE0 80242660 ACA20028 */ sw $v0, 0x28($a1) -/* C73AE4 80242664 9602007A */ lhu $v0, 0x7a($s0) -/* C73AE8 80242668 A4A2008E */ sh $v0, 0x8e($a1) -/* C73AEC 8024266C 8E020078 */ lw $v0, 0x78($s0) -/* C73AF0 80242670 28420008 */ slti $v0, $v0, 8 -/* C73AF4 80242674 14400018 */ bnez $v0, .L802426D8 -/* C73AF8 80242678 24020021 */ addiu $v0, $zero, 0x21 -/* C73AFC 8024267C 24040003 */ addiu $a0, $zero, 3 -/* C73B00 80242680 27A30028 */ addiu $v1, $sp, 0x28 -/* C73B04 80242684 84A700A8 */ lh $a3, 0xa8($a1) -/* C73B08 80242688 3C013F80 */ lui $at, 0x3f80 -/* C73B0C 8024268C 44810000 */ mtc1 $at, $f0 -/* C73B10 80242690 3C014000 */ lui $at, 0x4000 -/* C73B14 80242694 44811000 */ mtc1 $at, $f2 -/* C73B18 80242698 3C01C1A0 */ lui $at, 0xc1a0 -/* C73B1C 8024269C 44812000 */ mtc1 $at, $f4 -/* C73B20 802426A0 44873000 */ mtc1 $a3, $f6 -/* C73B24 802426A4 00000000 */ nop -/* C73B28 802426A8 468031A0 */ cvt.s.w $f6, $f6 -/* C73B2C 802426AC E7A00010 */ swc1 $f0, 0x10($sp) -/* C73B30 802426B0 E7A20014 */ swc1 $f2, 0x14($sp) -/* C73B34 802426B4 E7A40018 */ swc1 $f4, 0x18($sp) -/* C73B38 802426B8 8E020078 */ lw $v0, 0x78($s0) -/* C73B3C 802426BC 44073000 */ mfc1 $a3, $f6 -/* C73B40 802426C0 0000302D */ daddu $a2, $zero, $zero -/* C73B44 802426C4 AFA30020 */ sw $v1, 0x20($sp) -/* C73B48 802426C8 2442FFFF */ addiu $v0, $v0, -1 -/* C73B4C 802426CC 0C01BFA4 */ jal fx_emote -/* C73B50 802426D0 AFA2001C */ sw $v0, 0x1c($sp) -/* C73B54 802426D4 24020021 */ addiu $v0, $zero, 0x21 -.L802426D8: -/* C73B58 802426D8 AE220070 */ sw $v0, 0x70($s1) -.L802426DC: -/* C73B5C 802426DC 8FBF0038 */ lw $ra, 0x38($sp) -/* C73B60 802426E0 8FB10034 */ lw $s1, 0x34($sp) -/* C73B64 802426E4 8FB00030 */ lw $s0, 0x30($sp) -/* C73B68 802426E8 03E00008 */ jr $ra -/* C73B6C 802426EC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s index 372306fe5e..e082250bc0 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s @@ -159,7 +159,7 @@ glabel func_80242B58_C73FD8 /* C74228 80242DA8 24020020 */ addiu $v0, $zero, 0x20 /* C7422C 80242DAC 1462000D */ bne $v1, $v0, .L80242DE4 /* C74230 80242DB0 00000000 */ nop -/* C74234 80242DB4 0C090986 */ jal func_80242618_C73A98 +/* C74234 80242DB4 0C090986 */ jal UnkNpcAIFunc8 /* C74238 80242DB8 0240202D */ daddu $a0, $s2, $zero /* C7423C 80242DBC 8E430070 */ lw $v1, 0x70($s2) /* C74240 80242DC0 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802410FC_C77DDC.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802410FC_C77DDC.s deleted file mode 100644 index 8be24ee035..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802410FC_C77DDC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410FC_C77DDC -/* C77DDC 802410FC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C77DE0 80241100 AFB10034 */ sw $s1, 0x34($sp) -/* C77DE4 80241104 0080882D */ daddu $s1, $a0, $zero -/* C77DE8 80241108 AFBF0038 */ sw $ra, 0x38($sp) -/* C77DEC 8024110C AFB00030 */ sw $s0, 0x30($sp) -/* C77DF0 80241110 8E300148 */ lw $s0, 0x148($s1) -/* C77DF4 80241114 0C00EABB */ jal get_npc_unsafe -/* C77DF8 80241118 86040008 */ lh $a0, 8($s0) -/* C77DFC 8024111C 0040282D */ daddu $a1, $v0, $zero -/* C77E00 80241120 94A2008E */ lhu $v0, 0x8e($a1) -/* C77E04 80241124 2442FFFF */ addiu $v0, $v0, -1 -/* C77E08 80241128 A4A2008E */ sh $v0, 0x8e($a1) -/* C77E0C 8024112C 00021400 */ sll $v0, $v0, 0x10 -/* C77E10 80241130 1C400023 */ bgtz $v0, .L802411C0 -/* C77E14 80241134 24020004 */ addiu $v0, $zero, 4 -/* C77E18 80241138 8E0300CC */ lw $v1, 0xcc($s0) -/* C77E1C 8024113C AE02006C */ sw $v0, 0x6c($s0) -/* C77E20 80241140 8C620000 */ lw $v0, ($v1) -/* C77E24 80241144 ACA20028 */ sw $v0, 0x28($a1) -/* C77E28 80241148 9602007A */ lhu $v0, 0x7a($s0) -/* C77E2C 8024114C A4A2008E */ sh $v0, 0x8e($a1) -/* C77E30 80241150 8E020078 */ lw $v0, 0x78($s0) -/* C77E34 80241154 28420008 */ slti $v0, $v0, 8 -/* C77E38 80241158 14400018 */ bnez $v0, .L802411BC -/* C77E3C 8024115C 24020021 */ addiu $v0, $zero, 0x21 -/* C77E40 80241160 24040003 */ addiu $a0, $zero, 3 -/* C77E44 80241164 27A30028 */ addiu $v1, $sp, 0x28 -/* C77E48 80241168 84A700A8 */ lh $a3, 0xa8($a1) -/* C77E4C 8024116C 3C013F80 */ lui $at, 0x3f80 -/* C77E50 80241170 44810000 */ mtc1 $at, $f0 -/* C77E54 80241174 3C014000 */ lui $at, 0x4000 -/* C77E58 80241178 44811000 */ mtc1 $at, $f2 -/* C77E5C 8024117C 3C01C1A0 */ lui $at, 0xc1a0 -/* C77E60 80241180 44812000 */ mtc1 $at, $f4 -/* C77E64 80241184 44873000 */ mtc1 $a3, $f6 -/* C77E68 80241188 00000000 */ nop -/* C77E6C 8024118C 468031A0 */ cvt.s.w $f6, $f6 -/* C77E70 80241190 E7A00010 */ swc1 $f0, 0x10($sp) -/* C77E74 80241194 E7A20014 */ swc1 $f2, 0x14($sp) -/* C77E78 80241198 E7A40018 */ swc1 $f4, 0x18($sp) -/* C77E7C 8024119C 8E020078 */ lw $v0, 0x78($s0) -/* C77E80 802411A0 44073000 */ mfc1 $a3, $f6 -/* C77E84 802411A4 0000302D */ daddu $a2, $zero, $zero -/* C77E88 802411A8 AFA30020 */ sw $v1, 0x20($sp) -/* C77E8C 802411AC 2442FFFF */ addiu $v0, $v0, -1 -/* C77E90 802411B0 0C01BFA4 */ jal fx_emote -/* C77E94 802411B4 AFA2001C */ sw $v0, 0x1c($sp) -/* C77E98 802411B8 24020021 */ addiu $v0, $zero, 0x21 -.L802411BC: -/* C77E9C 802411BC AE220070 */ sw $v0, 0x70($s1) -.L802411C0: -/* C77EA0 802411C0 8FBF0038 */ lw $ra, 0x38($sp) -/* C77EA4 802411C4 8FB10034 */ lw $s1, 0x34($sp) -/* C77EA8 802411C8 8FB00030 */ lw $s0, 0x30($sp) -/* C77EAC 802411CC 03E00008 */ jr $ra -/* C77EB0 802411D0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s index f034be043e..16c4e99e83 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s @@ -159,7 +159,7 @@ glabel func_8024163C_C7831C /* C7856C 8024188C 24020020 */ addiu $v0, $zero, 0x20 /* C78570 80241890 1462000D */ bne $v1, $v0, .L802418C8 /* C78574 80241894 00000000 */ nop -/* C78578 80241898 0C09043F */ jal func_802410FC_C77DDC +/* C78578 80241898 0C09043F */ jal UnkNpcAIFunc8 /* C7857C 8024189C 0240202D */ daddu $a0, $s2, $zero /* C78580 802418A0 8E430070 */ lw $v1, 0x70($s2) /* C78584 802418A4 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802403EC_C85E9C.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802403EC_C85E9C.s deleted file mode 100644 index b1d78022d8..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802403EC_C85E9C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403EC_C85E9C -/* C85E9C 802403EC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C85EA0 802403F0 AFB10034 */ sw $s1, 0x34($sp) -/* C85EA4 802403F4 0080882D */ daddu $s1, $a0, $zero -/* C85EA8 802403F8 AFBF0038 */ sw $ra, 0x38($sp) -/* C85EAC 802403FC AFB00030 */ sw $s0, 0x30($sp) -/* C85EB0 80240400 8E300148 */ lw $s0, 0x148($s1) -/* C85EB4 80240404 0C00EABB */ jal get_npc_unsafe -/* C85EB8 80240408 86040008 */ lh $a0, 8($s0) -/* C85EBC 8024040C 0040282D */ daddu $a1, $v0, $zero -/* C85EC0 80240410 94A2008E */ lhu $v0, 0x8e($a1) -/* C85EC4 80240414 2442FFFF */ addiu $v0, $v0, -1 -/* C85EC8 80240418 A4A2008E */ sh $v0, 0x8e($a1) -/* C85ECC 8024041C 00021400 */ sll $v0, $v0, 0x10 -/* C85ED0 80240420 1C400023 */ bgtz $v0, .L802404B0 -/* C85ED4 80240424 24020004 */ addiu $v0, $zero, 4 -/* C85ED8 80240428 8E0300CC */ lw $v1, 0xcc($s0) -/* C85EDC 8024042C AE02006C */ sw $v0, 0x6c($s0) -/* C85EE0 80240430 8C620000 */ lw $v0, ($v1) -/* C85EE4 80240434 ACA20028 */ sw $v0, 0x28($a1) -/* C85EE8 80240438 9602007A */ lhu $v0, 0x7a($s0) -/* C85EEC 8024043C A4A2008E */ sh $v0, 0x8e($a1) -/* C85EF0 80240440 8E020078 */ lw $v0, 0x78($s0) -/* C85EF4 80240444 28420008 */ slti $v0, $v0, 8 -/* C85EF8 80240448 14400018 */ bnez $v0, .L802404AC -/* C85EFC 8024044C 24020021 */ addiu $v0, $zero, 0x21 -/* C85F00 80240450 24040003 */ addiu $a0, $zero, 3 -/* C85F04 80240454 27A30028 */ addiu $v1, $sp, 0x28 -/* C85F08 80240458 84A700A8 */ lh $a3, 0xa8($a1) -/* C85F0C 8024045C 3C013F80 */ lui $at, 0x3f80 -/* C85F10 80240460 44810000 */ mtc1 $at, $f0 -/* C85F14 80240464 3C014000 */ lui $at, 0x4000 -/* C85F18 80240468 44811000 */ mtc1 $at, $f2 -/* C85F1C 8024046C 3C01C1A0 */ lui $at, 0xc1a0 -/* C85F20 80240470 44812000 */ mtc1 $at, $f4 -/* C85F24 80240474 44873000 */ mtc1 $a3, $f6 -/* C85F28 80240478 00000000 */ nop -/* C85F2C 8024047C 468031A0 */ cvt.s.w $f6, $f6 -/* C85F30 80240480 E7A00010 */ swc1 $f0, 0x10($sp) -/* C85F34 80240484 E7A20014 */ swc1 $f2, 0x14($sp) -/* C85F38 80240488 E7A40018 */ swc1 $f4, 0x18($sp) -/* C85F3C 8024048C 8E020078 */ lw $v0, 0x78($s0) -/* C85F40 80240490 44073000 */ mfc1 $a3, $f6 -/* C85F44 80240494 0000302D */ daddu $a2, $zero, $zero -/* C85F48 80240498 AFA30020 */ sw $v1, 0x20($sp) -/* C85F4C 8024049C 2442FFFF */ addiu $v0, $v0, -1 -/* C85F50 802404A0 0C01BFA4 */ jal fx_emote -/* C85F54 802404A4 AFA2001C */ sw $v0, 0x1c($sp) -/* C85F58 802404A8 24020021 */ addiu $v0, $zero, 0x21 -.L802404AC: -/* C85F5C 802404AC AE220070 */ sw $v0, 0x70($s1) -.L802404B0: -/* C85F60 802404B0 8FBF0038 */ lw $ra, 0x38($sp) -/* C85F64 802404B4 8FB10034 */ lw $s1, 0x34($sp) -/* C85F68 802404B8 8FB00030 */ lw $s0, 0x30($sp) -/* C85F6C 802404BC 03E00008 */ jr $ra -/* C85F70 802404C0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s index 7831214053..fbeb7bf8d0 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s @@ -159,7 +159,7 @@ glabel func_8024092C_C863DC /* C8662C 80240B7C 24020020 */ addiu $v0, $zero, 0x20 /* C86630 80240B80 1462000D */ bne $v1, $v0, .L80240BB8 /* C86634 80240B84 00000000 */ nop -/* C86638 80240B88 0C0900FB */ jal func_802403EC_C85E9C +/* C86638 80240B88 0C0900FB */ jal UnkNpcAIFunc8 /* C8663C 80240B8C 0240202D */ daddu $a0, $s2, $zero /* C86640 80240B90 8E430070 */ lw $v1, 0x70($s2) /* C86644 80240B94 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802405DC_B93A1C.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802405DC_B93A1C.s deleted file mode 100644 index 4cdfe2ee96..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802405DC_B93A1C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405DC_B93A1C -/* B93A1C 802405DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B93A20 802405E0 AFB10034 */ sw $s1, 0x34($sp) -/* B93A24 802405E4 0080882D */ daddu $s1, $a0, $zero -/* B93A28 802405E8 AFBF0038 */ sw $ra, 0x38($sp) -/* B93A2C 802405EC AFB00030 */ sw $s0, 0x30($sp) -/* B93A30 802405F0 8E300148 */ lw $s0, 0x148($s1) -/* B93A34 802405F4 0C00EABB */ jal get_npc_unsafe -/* B93A38 802405F8 86040008 */ lh $a0, 8($s0) -/* B93A3C 802405FC 0040282D */ daddu $a1, $v0, $zero -/* B93A40 80240600 94A2008E */ lhu $v0, 0x8e($a1) -/* B93A44 80240604 2442FFFF */ addiu $v0, $v0, -1 -/* B93A48 80240608 A4A2008E */ sh $v0, 0x8e($a1) -/* B93A4C 8024060C 00021400 */ sll $v0, $v0, 0x10 -/* B93A50 80240610 1C400023 */ bgtz $v0, .L802406A0 -/* B93A54 80240614 24020004 */ addiu $v0, $zero, 4 -/* B93A58 80240618 8E0300CC */ lw $v1, 0xcc($s0) -/* B93A5C 8024061C AE02006C */ sw $v0, 0x6c($s0) -/* B93A60 80240620 8C620000 */ lw $v0, ($v1) -/* B93A64 80240624 ACA20028 */ sw $v0, 0x28($a1) -/* B93A68 80240628 9602007A */ lhu $v0, 0x7a($s0) -/* B93A6C 8024062C A4A2008E */ sh $v0, 0x8e($a1) -/* B93A70 80240630 8E020078 */ lw $v0, 0x78($s0) -/* B93A74 80240634 28420008 */ slti $v0, $v0, 8 -/* B93A78 80240638 14400018 */ bnez $v0, .L8024069C -/* B93A7C 8024063C 24020021 */ addiu $v0, $zero, 0x21 -/* B93A80 80240640 24040003 */ addiu $a0, $zero, 3 -/* B93A84 80240644 27A30028 */ addiu $v1, $sp, 0x28 -/* B93A88 80240648 84A700A8 */ lh $a3, 0xa8($a1) -/* B93A8C 8024064C 3C013F80 */ lui $at, 0x3f80 -/* B93A90 80240650 44810000 */ mtc1 $at, $f0 -/* B93A94 80240654 3C014000 */ lui $at, 0x4000 -/* B93A98 80240658 44811000 */ mtc1 $at, $f2 -/* B93A9C 8024065C 3C01C1A0 */ lui $at, 0xc1a0 -/* B93AA0 80240660 44812000 */ mtc1 $at, $f4 -/* B93AA4 80240664 44873000 */ mtc1 $a3, $f6 -/* B93AA8 80240668 00000000 */ nop -/* B93AAC 8024066C 468031A0 */ cvt.s.w $f6, $f6 -/* B93AB0 80240670 E7A00010 */ swc1 $f0, 0x10($sp) -/* B93AB4 80240674 E7A20014 */ swc1 $f2, 0x14($sp) -/* B93AB8 80240678 E7A40018 */ swc1 $f4, 0x18($sp) -/* B93ABC 8024067C 8E020078 */ lw $v0, 0x78($s0) -/* B93AC0 80240680 44073000 */ mfc1 $a3, $f6 -/* B93AC4 80240684 0000302D */ daddu $a2, $zero, $zero -/* B93AC8 80240688 AFA30020 */ sw $v1, 0x20($sp) -/* B93ACC 8024068C 2442FFFF */ addiu $v0, $v0, -1 -/* B93AD0 80240690 0C01BFA4 */ jal fx_emote -/* B93AD4 80240694 AFA2001C */ sw $v0, 0x1c($sp) -/* B93AD8 80240698 24020021 */ addiu $v0, $zero, 0x21 -.L8024069C: -/* B93ADC 8024069C AE220070 */ sw $v0, 0x70($s1) -.L802406A0: -/* B93AE0 802406A0 8FBF0038 */ lw $ra, 0x38($sp) -/* B93AE4 802406A4 8FB10034 */ lw $s1, 0x34($sp) -/* B93AE8 802406A8 8FB00030 */ lw $s0, 0x30($sp) -/* B93AEC 802406AC 03E00008 */ jr $ra -/* B93AF0 802406B0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s index 0b92792a16..d7ebc9896d 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s @@ -159,7 +159,7 @@ glabel func_80240B1C_B93F5C /* B941AC 80240D6C 24020020 */ addiu $v0, $zero, 0x20 /* B941B0 80240D70 1462000D */ bne $v1, $v0, .L80240DA8 /* B941B4 80240D74 00000000 */ nop -/* B941B8 80240D78 0C090177 */ jal func_802405DC_B93A1C +/* B941B8 80240D78 0C090177 */ jal UnkNpcAIFunc8 /* B941BC 80240D7C 0240202D */ daddu $a0, $s2, $zero /* B941C0 80240D80 8E430070 */ lw $v1, 0x70($s2) /* B941C4 80240D84 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024014C_BA087C.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024014C_BA087C.s deleted file mode 100644 index 8eb72cd97d..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024014C_BA087C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024014C_BA087C -/* BA087C 8024014C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* BA0880 80240150 AFB10034 */ sw $s1, 0x34($sp) -/* BA0884 80240154 0080882D */ daddu $s1, $a0, $zero -/* BA0888 80240158 AFBF0038 */ sw $ra, 0x38($sp) -/* BA088C 8024015C AFB00030 */ sw $s0, 0x30($sp) -/* BA0890 80240160 8E300148 */ lw $s0, 0x148($s1) -/* BA0894 80240164 0C00EABB */ jal get_npc_unsafe -/* BA0898 80240168 86040008 */ lh $a0, 8($s0) -/* BA089C 8024016C 0040282D */ daddu $a1, $v0, $zero -/* BA08A0 80240170 94A2008E */ lhu $v0, 0x8e($a1) -/* BA08A4 80240174 2442FFFF */ addiu $v0, $v0, -1 -/* BA08A8 80240178 A4A2008E */ sh $v0, 0x8e($a1) -/* BA08AC 8024017C 00021400 */ sll $v0, $v0, 0x10 -/* BA08B0 80240180 1C400023 */ bgtz $v0, .L80240210 -/* BA08B4 80240184 24020004 */ addiu $v0, $zero, 4 -/* BA08B8 80240188 8E0300CC */ lw $v1, 0xcc($s0) -/* BA08BC 8024018C AE02006C */ sw $v0, 0x6c($s0) -/* BA08C0 80240190 8C620000 */ lw $v0, ($v1) -/* BA08C4 80240194 ACA20028 */ sw $v0, 0x28($a1) -/* BA08C8 80240198 9602007A */ lhu $v0, 0x7a($s0) -/* BA08CC 8024019C A4A2008E */ sh $v0, 0x8e($a1) -/* BA08D0 802401A0 8E020078 */ lw $v0, 0x78($s0) -/* BA08D4 802401A4 28420008 */ slti $v0, $v0, 8 -/* BA08D8 802401A8 14400018 */ bnez $v0, .L8024020C -/* BA08DC 802401AC 24020021 */ addiu $v0, $zero, 0x21 -/* BA08E0 802401B0 24040003 */ addiu $a0, $zero, 3 -/* BA08E4 802401B4 27A30028 */ addiu $v1, $sp, 0x28 -/* BA08E8 802401B8 84A700A8 */ lh $a3, 0xa8($a1) -/* BA08EC 802401BC 3C013F80 */ lui $at, 0x3f80 -/* BA08F0 802401C0 44810000 */ mtc1 $at, $f0 -/* BA08F4 802401C4 3C014000 */ lui $at, 0x4000 -/* BA08F8 802401C8 44811000 */ mtc1 $at, $f2 -/* BA08FC 802401CC 3C01C1A0 */ lui $at, 0xc1a0 -/* BA0900 802401D0 44812000 */ mtc1 $at, $f4 -/* BA0904 802401D4 44873000 */ mtc1 $a3, $f6 -/* BA0908 802401D8 00000000 */ nop -/* BA090C 802401DC 468031A0 */ cvt.s.w $f6, $f6 -/* BA0910 802401E0 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA0914 802401E4 E7A20014 */ swc1 $f2, 0x14($sp) -/* BA0918 802401E8 E7A40018 */ swc1 $f4, 0x18($sp) -/* BA091C 802401EC 8E020078 */ lw $v0, 0x78($s0) -/* BA0920 802401F0 44073000 */ mfc1 $a3, $f6 -/* BA0924 802401F4 0000302D */ daddu $a2, $zero, $zero -/* BA0928 802401F8 AFA30020 */ sw $v1, 0x20($sp) -/* BA092C 802401FC 2442FFFF */ addiu $v0, $v0, -1 -/* BA0930 80240200 0C01BFA4 */ jal fx_emote -/* BA0934 80240204 AFA2001C */ sw $v0, 0x1c($sp) -/* BA0938 80240208 24020021 */ addiu $v0, $zero, 0x21 -.L8024020C: -/* BA093C 8024020C AE220070 */ sw $v0, 0x70($s1) -.L80240210: -/* BA0940 80240210 8FBF0038 */ lw $ra, 0x38($sp) -/* BA0944 80240214 8FB10034 */ lw $s1, 0x34($sp) -/* BA0948 80240218 8FB00030 */ lw $s0, 0x30($sp) -/* BA094C 8024021C 03E00008 */ jr $ra -/* BA0950 80240220 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s index 2aff10a52f..dc3bbf7be9 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s @@ -159,7 +159,7 @@ glabel func_8024068C_BA0DBC /* BA100C 802408DC 24020020 */ addiu $v0, $zero, 0x20 /* BA1010 802408E0 1462000D */ bne $v1, $v0, .L80240918 /* BA1014 802408E4 00000000 */ nop -/* BA1018 802408E8 0C090053 */ jal func_8024014C_BA087C +/* BA1018 802408E8 0C090053 */ jal UnkNpcAIFunc8 /* BA101C 802408EC 0240202D */ daddu $a0, $s2, $zero /* BA1020 802408F0 8E430070 */ lw $v1, 0x70($s2) /* BA1024 802408F4 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024064C_BA4DCC.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024064C_BA4DCC.s deleted file mode 100644 index 5715c61ad6..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024064C_BA4DCC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024064C_BA4DCC -/* BA4DCC 8024064C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* BA4DD0 80240650 AFB10034 */ sw $s1, 0x34($sp) -/* BA4DD4 80240654 0080882D */ daddu $s1, $a0, $zero -/* BA4DD8 80240658 AFBF0038 */ sw $ra, 0x38($sp) -/* BA4DDC 8024065C AFB00030 */ sw $s0, 0x30($sp) -/* BA4DE0 80240660 8E300148 */ lw $s0, 0x148($s1) -/* BA4DE4 80240664 0C00EABB */ jal get_npc_unsafe -/* BA4DE8 80240668 86040008 */ lh $a0, 8($s0) -/* BA4DEC 8024066C 0040282D */ daddu $a1, $v0, $zero -/* BA4DF0 80240670 94A2008E */ lhu $v0, 0x8e($a1) -/* BA4DF4 80240674 2442FFFF */ addiu $v0, $v0, -1 -/* BA4DF8 80240678 A4A2008E */ sh $v0, 0x8e($a1) -/* BA4DFC 8024067C 00021400 */ sll $v0, $v0, 0x10 -/* BA4E00 80240680 1C400023 */ bgtz $v0, .L80240710 -/* BA4E04 80240684 24020004 */ addiu $v0, $zero, 4 -/* BA4E08 80240688 8E0300CC */ lw $v1, 0xcc($s0) -/* BA4E0C 8024068C AE02006C */ sw $v0, 0x6c($s0) -/* BA4E10 80240690 8C620000 */ lw $v0, ($v1) -/* BA4E14 80240694 ACA20028 */ sw $v0, 0x28($a1) -/* BA4E18 80240698 9602007A */ lhu $v0, 0x7a($s0) -/* BA4E1C 8024069C A4A2008E */ sh $v0, 0x8e($a1) -/* BA4E20 802406A0 8E020078 */ lw $v0, 0x78($s0) -/* BA4E24 802406A4 28420008 */ slti $v0, $v0, 8 -/* BA4E28 802406A8 14400018 */ bnez $v0, .L8024070C -/* BA4E2C 802406AC 24020021 */ addiu $v0, $zero, 0x21 -/* BA4E30 802406B0 24040003 */ addiu $a0, $zero, 3 -/* BA4E34 802406B4 27A30028 */ addiu $v1, $sp, 0x28 -/* BA4E38 802406B8 84A700A8 */ lh $a3, 0xa8($a1) -/* BA4E3C 802406BC 3C013F80 */ lui $at, 0x3f80 -/* BA4E40 802406C0 44810000 */ mtc1 $at, $f0 -/* BA4E44 802406C4 3C014000 */ lui $at, 0x4000 -/* BA4E48 802406C8 44811000 */ mtc1 $at, $f2 -/* BA4E4C 802406CC 3C01C1A0 */ lui $at, 0xc1a0 -/* BA4E50 802406D0 44812000 */ mtc1 $at, $f4 -/* BA4E54 802406D4 44873000 */ mtc1 $a3, $f6 -/* BA4E58 802406D8 00000000 */ nop -/* BA4E5C 802406DC 468031A0 */ cvt.s.w $f6, $f6 -/* BA4E60 802406E0 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA4E64 802406E4 E7A20014 */ swc1 $f2, 0x14($sp) -/* BA4E68 802406E8 E7A40018 */ swc1 $f4, 0x18($sp) -/* BA4E6C 802406EC 8E020078 */ lw $v0, 0x78($s0) -/* BA4E70 802406F0 44073000 */ mfc1 $a3, $f6 -/* BA4E74 802406F4 0000302D */ daddu $a2, $zero, $zero -/* BA4E78 802406F8 AFA30020 */ sw $v1, 0x20($sp) -/* BA4E7C 802406FC 2442FFFF */ addiu $v0, $v0, -1 -/* BA4E80 80240700 0C01BFA4 */ jal fx_emote -/* BA4E84 80240704 AFA2001C */ sw $v0, 0x1c($sp) -/* BA4E88 80240708 24020021 */ addiu $v0, $zero, 0x21 -.L8024070C: -/* BA4E8C 8024070C AE220070 */ sw $v0, 0x70($s1) -.L80240710: -/* BA4E90 80240710 8FBF0038 */ lw $ra, 0x38($sp) -/* BA4E94 80240714 8FB10034 */ lw $s1, 0x34($sp) -/* BA4E98 80240718 8FB00030 */ lw $s0, 0x30($sp) -/* BA4E9C 8024071C 03E00008 */ jr $ra -/* BA4EA0 80240720 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s index 02467f718c..f5ab104c5a 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s @@ -159,7 +159,7 @@ glabel func_80240B8C_BA530C /* BA555C 80240DDC 24020020 */ addiu $v0, $zero, 0x20 /* BA5560 80240DE0 1462000D */ bne $v1, $v0, .L80240E18 /* BA5564 80240DE4 00000000 */ nop -/* BA5568 80240DE8 0C090193 */ jal func_8024064C_BA4DCC +/* BA5568 80240DE8 0C090193 */ jal UnkNpcAIFunc8 /* BA556C 80240DEC 0240202D */ daddu $a0, $s2, $zero /* BA5570 80240DF0 8E430070 */ lw $v1, 0x70($s2) /* BA5574 80240DF4 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241674_BAEFB4.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241674_BAEFB4.s deleted file mode 100644 index fee0da3bf1..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241674_BAEFB4.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241674_BAEFB4 -/* BAEFB4 80241674 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* BAEFB8 80241678 AFB10034 */ sw $s1, 0x34($sp) -/* BAEFBC 8024167C 0080882D */ daddu $s1, $a0, $zero -/* BAEFC0 80241680 AFBF0038 */ sw $ra, 0x38($sp) -/* BAEFC4 80241684 AFB00030 */ sw $s0, 0x30($sp) -/* BAEFC8 80241688 8E300148 */ lw $s0, 0x148($s1) -/* BAEFCC 8024168C 0C00EABB */ jal get_npc_unsafe -/* BAEFD0 80241690 86040008 */ lh $a0, 8($s0) -/* BAEFD4 80241694 0040282D */ daddu $a1, $v0, $zero -/* BAEFD8 80241698 94A2008E */ lhu $v0, 0x8e($a1) -/* BAEFDC 8024169C 2442FFFF */ addiu $v0, $v0, -1 -/* BAEFE0 802416A0 A4A2008E */ sh $v0, 0x8e($a1) -/* BAEFE4 802416A4 00021400 */ sll $v0, $v0, 0x10 -/* BAEFE8 802416A8 1C400023 */ bgtz $v0, .L80241738 -/* BAEFEC 802416AC 24020004 */ addiu $v0, $zero, 4 -/* BAEFF0 802416B0 8E0300CC */ lw $v1, 0xcc($s0) -/* BAEFF4 802416B4 AE02006C */ sw $v0, 0x6c($s0) -/* BAEFF8 802416B8 8C620000 */ lw $v0, ($v1) -/* BAEFFC 802416BC ACA20028 */ sw $v0, 0x28($a1) -/* BAF000 802416C0 9602007A */ lhu $v0, 0x7a($s0) -/* BAF004 802416C4 A4A2008E */ sh $v0, 0x8e($a1) -/* BAF008 802416C8 8E020078 */ lw $v0, 0x78($s0) -/* BAF00C 802416CC 28420008 */ slti $v0, $v0, 8 -/* BAF010 802416D0 14400018 */ bnez $v0, .L80241734 -/* BAF014 802416D4 24020021 */ addiu $v0, $zero, 0x21 -/* BAF018 802416D8 24040003 */ addiu $a0, $zero, 3 -/* BAF01C 802416DC 27A30028 */ addiu $v1, $sp, 0x28 -/* BAF020 802416E0 84A700A8 */ lh $a3, 0xa8($a1) -/* BAF024 802416E4 3C013F80 */ lui $at, 0x3f80 -/* BAF028 802416E8 44810000 */ mtc1 $at, $f0 -/* BAF02C 802416EC 3C014000 */ lui $at, 0x4000 -/* BAF030 802416F0 44811000 */ mtc1 $at, $f2 -/* BAF034 802416F4 3C01C1A0 */ lui $at, 0xc1a0 -/* BAF038 802416F8 44812000 */ mtc1 $at, $f4 -/* BAF03C 802416FC 44873000 */ mtc1 $a3, $f6 -/* BAF040 80241700 00000000 */ nop -/* BAF044 80241704 468031A0 */ cvt.s.w $f6, $f6 -/* BAF048 80241708 E7A00010 */ swc1 $f0, 0x10($sp) -/* BAF04C 8024170C E7A20014 */ swc1 $f2, 0x14($sp) -/* BAF050 80241710 E7A40018 */ swc1 $f4, 0x18($sp) -/* BAF054 80241714 8E020078 */ lw $v0, 0x78($s0) -/* BAF058 80241718 44073000 */ mfc1 $a3, $f6 -/* BAF05C 8024171C 0000302D */ daddu $a2, $zero, $zero -/* BAF060 80241720 AFA30020 */ sw $v1, 0x20($sp) -/* BAF064 80241724 2442FFFF */ addiu $v0, $v0, -1 -/* BAF068 80241728 0C01BFA4 */ jal fx_emote -/* BAF06C 8024172C AFA2001C */ sw $v0, 0x1c($sp) -/* BAF070 80241730 24020021 */ addiu $v0, $zero, 0x21 -.L80241734: -/* BAF074 80241734 AE220070 */ sw $v0, 0x70($s1) -.L80241738: -/* BAF078 80241738 8FBF0038 */ lw $ra, 0x38($sp) -/* BAF07C 8024173C 8FB10034 */ lw $s1, 0x34($sp) -/* BAF080 80241740 8FB00030 */ lw $s0, 0x30($sp) -/* BAF084 80241744 03E00008 */ jr $ra -/* BAF088 80241748 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s index 6232661d79..96c9f8504d 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s @@ -159,7 +159,7 @@ glabel func_80241BB4_BAF4F4 /* BAF744 80241E04 24020020 */ addiu $v0, $zero, 0x20 /* BAF748 80241E08 1462000D */ bne $v1, $v0, .L80241E40 /* BAF74C 80241E0C 00000000 */ nop -/* BAF750 80241E10 0C09059D */ jal func_80241674_BAEFB4 +/* BAF750 80241E10 0C09059D */ jal UnkNpcAIFunc8 /* BAF754 80241E14 0240202D */ daddu $a0, $s2, $zero /* BAF758 80241E18 8E430070 */ lw $v1, 0x70($s2) /* BAF75C 80241E1C 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241E8C_D8F0DC.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241E8C_D8F0DC.s deleted file mode 100644 index 64766a8fe7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241E8C_D8F0DC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E8C_D8F0DC -/* D8F0DC 80241E8C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D8F0E0 80241E90 AFB10034 */ sw $s1, 0x34($sp) -/* D8F0E4 80241E94 0080882D */ daddu $s1, $a0, $zero -/* D8F0E8 80241E98 AFBF0038 */ sw $ra, 0x38($sp) -/* D8F0EC 80241E9C AFB00030 */ sw $s0, 0x30($sp) -/* D8F0F0 80241EA0 8E300148 */ lw $s0, 0x148($s1) -/* D8F0F4 80241EA4 0C00EABB */ jal get_npc_unsafe -/* D8F0F8 80241EA8 86040008 */ lh $a0, 8($s0) -/* D8F0FC 80241EAC 0040282D */ daddu $a1, $v0, $zero -/* D8F100 80241EB0 94A2008E */ lhu $v0, 0x8e($a1) -/* D8F104 80241EB4 2442FFFF */ addiu $v0, $v0, -1 -/* D8F108 80241EB8 A4A2008E */ sh $v0, 0x8e($a1) -/* D8F10C 80241EBC 00021400 */ sll $v0, $v0, 0x10 -/* D8F110 80241EC0 1C400023 */ bgtz $v0, .L80241F50 -/* D8F114 80241EC4 24020004 */ addiu $v0, $zero, 4 -/* D8F118 80241EC8 8E0300CC */ lw $v1, 0xcc($s0) -/* D8F11C 80241ECC AE02006C */ sw $v0, 0x6c($s0) -/* D8F120 80241ED0 8C620000 */ lw $v0, ($v1) -/* D8F124 80241ED4 ACA20028 */ sw $v0, 0x28($a1) -/* D8F128 80241ED8 9602007A */ lhu $v0, 0x7a($s0) -/* D8F12C 80241EDC A4A2008E */ sh $v0, 0x8e($a1) -/* D8F130 80241EE0 8E020078 */ lw $v0, 0x78($s0) -/* D8F134 80241EE4 28420008 */ slti $v0, $v0, 8 -/* D8F138 80241EE8 14400018 */ bnez $v0, .L80241F4C -/* D8F13C 80241EEC 24020021 */ addiu $v0, $zero, 0x21 -/* D8F140 80241EF0 24040003 */ addiu $a0, $zero, 3 -/* D8F144 80241EF4 27A30028 */ addiu $v1, $sp, 0x28 -/* D8F148 80241EF8 84A700A8 */ lh $a3, 0xa8($a1) -/* D8F14C 80241EFC 3C013F80 */ lui $at, 0x3f80 -/* D8F150 80241F00 44810000 */ mtc1 $at, $f0 -/* D8F154 80241F04 3C014000 */ lui $at, 0x4000 -/* D8F158 80241F08 44811000 */ mtc1 $at, $f2 -/* D8F15C 80241F0C 3C01C1A0 */ lui $at, 0xc1a0 -/* D8F160 80241F10 44812000 */ mtc1 $at, $f4 -/* D8F164 80241F14 44873000 */ mtc1 $a3, $f6 -/* D8F168 80241F18 00000000 */ nop -/* D8F16C 80241F1C 468031A0 */ cvt.s.w $f6, $f6 -/* D8F170 80241F20 E7A00010 */ swc1 $f0, 0x10($sp) -/* D8F174 80241F24 E7A20014 */ swc1 $f2, 0x14($sp) -/* D8F178 80241F28 E7A40018 */ swc1 $f4, 0x18($sp) -/* D8F17C 80241F2C 8E020078 */ lw $v0, 0x78($s0) -/* D8F180 80241F30 44073000 */ mfc1 $a3, $f6 -/* D8F184 80241F34 0000302D */ daddu $a2, $zero, $zero -/* D8F188 80241F38 AFA30020 */ sw $v1, 0x20($sp) -/* D8F18C 80241F3C 2442FFFF */ addiu $v0, $v0, -1 -/* D8F190 80241F40 0C01BFA4 */ jal fx_emote -/* D8F194 80241F44 AFA2001C */ sw $v0, 0x1c($sp) -/* D8F198 80241F48 24020021 */ addiu $v0, $zero, 0x21 -.L80241F4C: -/* D8F19C 80241F4C AE220070 */ sw $v0, 0x70($s1) -.L80241F50: -/* D8F1A0 80241F50 8FBF0038 */ lw $ra, 0x38($sp) -/* D8F1A4 80241F54 8FB10034 */ lw $s1, 0x34($sp) -/* D8F1A8 80241F58 8FB00030 */ lw $s0, 0x30($sp) -/* D8F1AC 80241F5C 03E00008 */ jr $ra -/* D8F1B0 80241F60 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s index b8bf60cd99..3cb37821b8 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s @@ -165,7 +165,7 @@ glabel func_802423CC_D8F61C /* D8F884 80242634 24020020 */ addiu $v0, $zero, 0x20 /* D8F888 80242638 1462000D */ bne $v1, $v0, .L80242670 /* D8F88C 8024263C 00000000 */ nop -/* D8F890 80242640 0C0907A3 */ jal func_80241E8C_D8F0DC +/* D8F890 80242640 0C0907A3 */ jal UnkNpcAIFunc8 /* D8F894 80242644 0240202D */ daddu $a0, $s2, $zero /* D8F898 80242648 8E430070 */ lw $v1, 0x70($s2) /* D8F89C 8024264C 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s index 967992e351..2bdff50278 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s @@ -159,7 +159,7 @@ glabel func_80242698_D8F8E8 /* D8FB38 802428E8 24020020 */ addiu $v0, $zero, 0x20 /* D8FB3C 802428EC 1462000D */ bne $v1, $v0, .L80242924 /* D8FB40 802428F0 00000000 */ nop -/* D8FB44 802428F4 0C0907A3 */ jal func_80241E8C_D8F0DC +/* D8FB44 802428F4 0C0907A3 */ jal UnkNpcAIFunc8 /* D8FB48 802428F8 0240202D */ daddu $a0, $s2, $zero /* D8FB4C 802428FC 8E430070 */ lw $v1, 0x70($s2) /* D8FB50 80242900 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024102C_D93F6C.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024102C_D93F6C.s deleted file mode 100644 index 6c0a9f40ec..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024102C_D93F6C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024102C_D93F6C -/* D93F6C 8024102C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D93F70 80241030 AFB10034 */ sw $s1, 0x34($sp) -/* D93F74 80241034 0080882D */ daddu $s1, $a0, $zero -/* D93F78 80241038 AFBF0038 */ sw $ra, 0x38($sp) -/* D93F7C 8024103C AFB00030 */ sw $s0, 0x30($sp) -/* D93F80 80241040 8E300148 */ lw $s0, 0x148($s1) -/* D93F84 80241044 0C00EABB */ jal get_npc_unsafe -/* D93F88 80241048 86040008 */ lh $a0, 8($s0) -/* D93F8C 8024104C 0040282D */ daddu $a1, $v0, $zero -/* D93F90 80241050 94A2008E */ lhu $v0, 0x8e($a1) -/* D93F94 80241054 2442FFFF */ addiu $v0, $v0, -1 -/* D93F98 80241058 A4A2008E */ sh $v0, 0x8e($a1) -/* D93F9C 8024105C 00021400 */ sll $v0, $v0, 0x10 -/* D93FA0 80241060 1C400023 */ bgtz $v0, .L802410F0 -/* D93FA4 80241064 24020004 */ addiu $v0, $zero, 4 -/* D93FA8 80241068 8E0300CC */ lw $v1, 0xcc($s0) -/* D93FAC 8024106C AE02006C */ sw $v0, 0x6c($s0) -/* D93FB0 80241070 8C620000 */ lw $v0, ($v1) -/* D93FB4 80241074 ACA20028 */ sw $v0, 0x28($a1) -/* D93FB8 80241078 9602007A */ lhu $v0, 0x7a($s0) -/* D93FBC 8024107C A4A2008E */ sh $v0, 0x8e($a1) -/* D93FC0 80241080 8E020078 */ lw $v0, 0x78($s0) -/* D93FC4 80241084 28420008 */ slti $v0, $v0, 8 -/* D93FC8 80241088 14400018 */ bnez $v0, .L802410EC -/* D93FCC 8024108C 24020021 */ addiu $v0, $zero, 0x21 -/* D93FD0 80241090 24040003 */ addiu $a0, $zero, 3 -/* D93FD4 80241094 27A30028 */ addiu $v1, $sp, 0x28 -/* D93FD8 80241098 84A700A8 */ lh $a3, 0xa8($a1) -/* D93FDC 8024109C 3C013F80 */ lui $at, 0x3f80 -/* D93FE0 802410A0 44810000 */ mtc1 $at, $f0 -/* D93FE4 802410A4 3C014000 */ lui $at, 0x4000 -/* D93FE8 802410A8 44811000 */ mtc1 $at, $f2 -/* D93FEC 802410AC 3C01C1A0 */ lui $at, 0xc1a0 -/* D93FF0 802410B0 44812000 */ mtc1 $at, $f4 -/* D93FF4 802410B4 44873000 */ mtc1 $a3, $f6 -/* D93FF8 802410B8 00000000 */ nop -/* D93FFC 802410BC 468031A0 */ cvt.s.w $f6, $f6 -/* D94000 802410C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* D94004 802410C4 E7A20014 */ swc1 $f2, 0x14($sp) -/* D94008 802410C8 E7A40018 */ swc1 $f4, 0x18($sp) -/* D9400C 802410CC 8E020078 */ lw $v0, 0x78($s0) -/* D94010 802410D0 44073000 */ mfc1 $a3, $f6 -/* D94014 802410D4 0000302D */ daddu $a2, $zero, $zero -/* D94018 802410D8 AFA30020 */ sw $v1, 0x20($sp) -/* D9401C 802410DC 2442FFFF */ addiu $v0, $v0, -1 -/* D94020 802410E0 0C01BFA4 */ jal fx_emote -/* D94024 802410E4 AFA2001C */ sw $v0, 0x1c($sp) -/* D94028 802410E8 24020021 */ addiu $v0, $zero, 0x21 -.L802410EC: -/* D9402C 802410EC AE220070 */ sw $v0, 0x70($s1) -.L802410F0: -/* D94030 802410F0 8FBF0038 */ lw $ra, 0x38($sp) -/* D94034 802410F4 8FB10034 */ lw $s1, 0x34($sp) -/* D94038 802410F8 8FB00030 */ lw $s0, 0x30($sp) -/* D9403C 802410FC 03E00008 */ jr $ra -/* D94040 80241100 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s index 6db0643e2c..7cd70069ec 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s @@ -159,7 +159,7 @@ glabel func_8024156C_D944AC /* D946FC 802417BC 24020020 */ addiu $v0, $zero, 0x20 /* D94700 802417C0 1462000D */ bne $v1, $v0, .L802417F8 /* D94704 802417C4 00000000 */ nop -/* D94708 802417C8 0C09040B */ jal func_8024102C_D93F6C +/* D94708 802417C8 0C09040B */ jal UnkNpcAIFunc8 /* D9470C 802417CC 0240202D */ daddu $a0, $s2, $zero /* D94710 802417D0 8E430070 */ lw $v1, 0x70($s2) /* D94714 802417D4 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024012C_D111EC.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024012C_D111EC.s deleted file mode 100644 index ccc5543baa..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024012C_D111EC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024012C_D111EC -/* D111EC 8024012C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D111F0 80240130 AFB10034 */ sw $s1, 0x34($sp) -/* D111F4 80240134 0080882D */ daddu $s1, $a0, $zero -/* D111F8 80240138 AFBF0038 */ sw $ra, 0x38($sp) -/* D111FC 8024013C AFB00030 */ sw $s0, 0x30($sp) -/* D11200 80240140 8E300148 */ lw $s0, 0x148($s1) -/* D11204 80240144 0C00EABB */ jal get_npc_unsafe -/* D11208 80240148 86040008 */ lh $a0, 8($s0) -/* D1120C 8024014C 0040282D */ daddu $a1, $v0, $zero -/* D11210 80240150 94A2008E */ lhu $v0, 0x8e($a1) -/* D11214 80240154 2442FFFF */ addiu $v0, $v0, -1 -/* D11218 80240158 A4A2008E */ sh $v0, 0x8e($a1) -/* D1121C 8024015C 00021400 */ sll $v0, $v0, 0x10 -/* D11220 80240160 1C400023 */ bgtz $v0, .L802401F0 -/* D11224 80240164 24020004 */ addiu $v0, $zero, 4 -/* D11228 80240168 8E0300CC */ lw $v1, 0xcc($s0) -/* D1122C 8024016C AE02006C */ sw $v0, 0x6c($s0) -/* D11230 80240170 8C620000 */ lw $v0, ($v1) -/* D11234 80240174 ACA20028 */ sw $v0, 0x28($a1) -/* D11238 80240178 9602007A */ lhu $v0, 0x7a($s0) -/* D1123C 8024017C A4A2008E */ sh $v0, 0x8e($a1) -/* D11240 80240180 8E020078 */ lw $v0, 0x78($s0) -/* D11244 80240184 28420008 */ slti $v0, $v0, 8 -/* D11248 80240188 14400018 */ bnez $v0, .L802401EC -/* D1124C 8024018C 24020021 */ addiu $v0, $zero, 0x21 -/* D11250 80240190 24040003 */ addiu $a0, $zero, 3 -/* D11254 80240194 27A30028 */ addiu $v1, $sp, 0x28 -/* D11258 80240198 84A700A8 */ lh $a3, 0xa8($a1) -/* D1125C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* D11260 802401A0 44810000 */ mtc1 $at, $f0 -/* D11264 802401A4 3C014000 */ lui $at, 0x4000 -/* D11268 802401A8 44811000 */ mtc1 $at, $f2 -/* D1126C 802401AC 3C01C1A0 */ lui $at, 0xc1a0 -/* D11270 802401B0 44812000 */ mtc1 $at, $f4 -/* D11274 802401B4 44873000 */ mtc1 $a3, $f6 -/* D11278 802401B8 00000000 */ nop -/* D1127C 802401BC 468031A0 */ cvt.s.w $f6, $f6 -/* D11280 802401C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* D11284 802401C4 E7A20014 */ swc1 $f2, 0x14($sp) -/* D11288 802401C8 E7A40018 */ swc1 $f4, 0x18($sp) -/* D1128C 802401CC 8E020078 */ lw $v0, 0x78($s0) -/* D11290 802401D0 44073000 */ mfc1 $a3, $f6 -/* D11294 802401D4 0000302D */ daddu $a2, $zero, $zero -/* D11298 802401D8 AFA30020 */ sw $v1, 0x20($sp) -/* D1129C 802401DC 2442FFFF */ addiu $v0, $v0, -1 -/* D112A0 802401E0 0C01BFA4 */ jal fx_emote -/* D112A4 802401E4 AFA2001C */ sw $v0, 0x1c($sp) -/* D112A8 802401E8 24020021 */ addiu $v0, $zero, 0x21 -.L802401EC: -/* D112AC 802401EC AE220070 */ sw $v0, 0x70($s1) -.L802401F0: -/* D112B0 802401F0 8FBF0038 */ lw $ra, 0x38($sp) -/* D112B4 802401F4 8FB10034 */ lw $s1, 0x34($sp) -/* D112B8 802401F8 8FB00030 */ lw $s0, 0x30($sp) -/* D112BC 802401FC 03E00008 */ jr $ra -/* D112C0 80240200 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s index f29746705a..58e63e9dfb 100644 --- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s +++ b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s @@ -159,7 +159,7 @@ glabel func_8024066C_D1172C /* D1197C 802408BC 24020020 */ addiu $v0, $zero, 0x20 /* D11980 802408C0 1462000D */ bne $v1, $v0, .L802408F8 /* D11984 802408C4 00000000 */ nop -/* D11988 802408C8 0C09004B */ jal func_8024012C_D111EC +/* D11988 802408C8 0C09004B */ jal UnkNpcAIFunc8 /* D1198C 802408CC 0240202D */ daddu $a0, $s2, $zero /* D11990 802408D0 8E430070 */ lw $v1, 0x70($s2) /* D11994 802408D4 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802400DC_D188BC.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802400DC_D188BC.s deleted file mode 100644 index 1deb32170c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802400DC_D188BC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC_D188BC -/* D188BC 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D188C0 802400E0 AFB10034 */ sw $s1, 0x34($sp) -/* D188C4 802400E4 0080882D */ daddu $s1, $a0, $zero -/* D188C8 802400E8 AFBF0038 */ sw $ra, 0x38($sp) -/* D188CC 802400EC AFB00030 */ sw $s0, 0x30($sp) -/* D188D0 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* D188D4 802400F4 0C00EABB */ jal get_npc_unsafe -/* D188D8 802400F8 86040008 */ lh $a0, 8($s0) -/* D188DC 802400FC 0040282D */ daddu $a1, $v0, $zero -/* D188E0 80240100 94A2008E */ lhu $v0, 0x8e($a1) -/* D188E4 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* D188E8 80240108 A4A2008E */ sh $v0, 0x8e($a1) -/* D188EC 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* D188F0 80240110 1C400023 */ bgtz $v0, .L802401A0 -/* D188F4 80240114 24020004 */ addiu $v0, $zero, 4 -/* D188F8 80240118 8E0300CC */ lw $v1, 0xcc($s0) -/* D188FC 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* D18900 80240120 8C620000 */ lw $v0, ($v1) -/* D18904 80240124 ACA20028 */ sw $v0, 0x28($a1) -/* D18908 80240128 9602007A */ lhu $v0, 0x7a($s0) -/* D1890C 8024012C A4A2008E */ sh $v0, 0x8e($a1) -/* D18910 80240130 8E020078 */ lw $v0, 0x78($s0) -/* D18914 80240134 28420008 */ slti $v0, $v0, 8 -/* D18918 80240138 14400018 */ bnez $v0, .L8024019C -/* D1891C 8024013C 24020021 */ addiu $v0, $zero, 0x21 -/* D18920 80240140 24040003 */ addiu $a0, $zero, 3 -/* D18924 80240144 27A30028 */ addiu $v1, $sp, 0x28 -/* D18928 80240148 84A700A8 */ lh $a3, 0xa8($a1) -/* D1892C 8024014C 3C013F80 */ lui $at, 0x3f80 -/* D18930 80240150 44810000 */ mtc1 $at, $f0 -/* D18934 80240154 3C014000 */ lui $at, 0x4000 -/* D18938 80240158 44811000 */ mtc1 $at, $f2 -/* D1893C 8024015C 3C01C1A0 */ lui $at, 0xc1a0 -/* D18940 80240160 44812000 */ mtc1 $at, $f4 -/* D18944 80240164 44873000 */ mtc1 $a3, $f6 -/* D18948 80240168 00000000 */ nop -/* D1894C 8024016C 468031A0 */ cvt.s.w $f6, $f6 -/* D18950 80240170 E7A00010 */ swc1 $f0, 0x10($sp) -/* D18954 80240174 E7A20014 */ swc1 $f2, 0x14($sp) -/* D18958 80240178 E7A40018 */ swc1 $f4, 0x18($sp) -/* D1895C 8024017C 8E020078 */ lw $v0, 0x78($s0) -/* D18960 80240180 44073000 */ mfc1 $a3, $f6 -/* D18964 80240184 0000302D */ daddu $a2, $zero, $zero -/* D18968 80240188 AFA30020 */ sw $v1, 0x20($sp) -/* D1896C 8024018C 2442FFFF */ addiu $v0, $v0, -1 -/* D18970 80240190 0C01BFA4 */ jal fx_emote -/* D18974 80240194 AFA2001C */ sw $v0, 0x1c($sp) -/* D18978 80240198 24020021 */ addiu $v0, $zero, 0x21 -.L8024019C: -/* D1897C 8024019C AE220070 */ sw $v0, 0x70($s1) -.L802401A0: -/* D18980 802401A0 8FBF0038 */ lw $ra, 0x38($sp) -/* D18984 802401A4 8FB10034 */ lw $s1, 0x34($sp) -/* D18988 802401A8 8FB00030 */ lw $s0, 0x30($sp) -/* D1898C 802401AC 03E00008 */ jr $ra -/* D18990 802401B0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s index 94dbde66d3..b74643b5eb 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s @@ -159,7 +159,7 @@ glabel func_8024061C_D18DFC /* D1904C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* D19050 80240870 1462000D */ bne $v1, $v0, .L802408A8 /* D19054 80240874 00000000 */ nop -/* D19058 80240878 0C090037 */ jal func_802400DC_D188BC +/* D19058 80240878 0C090037 */ jal UnkNpcAIFunc8 /* D1905C 8024087C 0240202D */ daddu $a0, $s2, $zero /* D19060 80240880 8E430070 */ lw $v1, 0x70($s2) /* D19064 80240884 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_8024072C_D2C45C.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_8024072C_D2C45C.s deleted file mode 100644 index 518539b4ab..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_8024072C_D2C45C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024072C_D2C45C -/* D2C45C 8024072C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D2C460 80240730 AFB10034 */ sw $s1, 0x34($sp) -/* D2C464 80240734 0080882D */ daddu $s1, $a0, $zero -/* D2C468 80240738 AFBF0038 */ sw $ra, 0x38($sp) -/* D2C46C 8024073C AFB00030 */ sw $s0, 0x30($sp) -/* D2C470 80240740 8E300148 */ lw $s0, 0x148($s1) -/* D2C474 80240744 0C00EABB */ jal get_npc_unsafe -/* D2C478 80240748 86040008 */ lh $a0, 8($s0) -/* D2C47C 8024074C 0040282D */ daddu $a1, $v0, $zero -/* D2C480 80240750 94A2008E */ lhu $v0, 0x8e($a1) -/* D2C484 80240754 2442FFFF */ addiu $v0, $v0, -1 -/* D2C488 80240758 A4A2008E */ sh $v0, 0x8e($a1) -/* D2C48C 8024075C 00021400 */ sll $v0, $v0, 0x10 -/* D2C490 80240760 1C400023 */ bgtz $v0, .L802407F0 -/* D2C494 80240764 24020004 */ addiu $v0, $zero, 4 -/* D2C498 80240768 8E0300CC */ lw $v1, 0xcc($s0) -/* D2C49C 8024076C AE02006C */ sw $v0, 0x6c($s0) -/* D2C4A0 80240770 8C620000 */ lw $v0, ($v1) -/* D2C4A4 80240774 ACA20028 */ sw $v0, 0x28($a1) -/* D2C4A8 80240778 9602007A */ lhu $v0, 0x7a($s0) -/* D2C4AC 8024077C A4A2008E */ sh $v0, 0x8e($a1) -/* D2C4B0 80240780 8E020078 */ lw $v0, 0x78($s0) -/* D2C4B4 80240784 28420008 */ slti $v0, $v0, 8 -/* D2C4B8 80240788 14400018 */ bnez $v0, .L802407EC -/* D2C4BC 8024078C 24020021 */ addiu $v0, $zero, 0x21 -/* D2C4C0 80240790 24040003 */ addiu $a0, $zero, 3 -/* D2C4C4 80240794 27A30028 */ addiu $v1, $sp, 0x28 -/* D2C4C8 80240798 84A700A8 */ lh $a3, 0xa8($a1) -/* D2C4CC 8024079C 3C013F80 */ lui $at, 0x3f80 -/* D2C4D0 802407A0 44810000 */ mtc1 $at, $f0 -/* D2C4D4 802407A4 3C014000 */ lui $at, 0x4000 -/* D2C4D8 802407A8 44811000 */ mtc1 $at, $f2 -/* D2C4DC 802407AC 3C01C1A0 */ lui $at, 0xc1a0 -/* D2C4E0 802407B0 44812000 */ mtc1 $at, $f4 -/* D2C4E4 802407B4 44873000 */ mtc1 $a3, $f6 -/* D2C4E8 802407B8 00000000 */ nop -/* D2C4EC 802407BC 468031A0 */ cvt.s.w $f6, $f6 -/* D2C4F0 802407C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* D2C4F4 802407C4 E7A20014 */ swc1 $f2, 0x14($sp) -/* D2C4F8 802407C8 E7A40018 */ swc1 $f4, 0x18($sp) -/* D2C4FC 802407CC 8E020078 */ lw $v0, 0x78($s0) -/* D2C500 802407D0 44073000 */ mfc1 $a3, $f6 -/* D2C504 802407D4 0000302D */ daddu $a2, $zero, $zero -/* D2C508 802407D8 AFA30020 */ sw $v1, 0x20($sp) -/* D2C50C 802407DC 2442FFFF */ addiu $v0, $v0, -1 -/* D2C510 802407E0 0C01BFA4 */ jal fx_emote -/* D2C514 802407E4 AFA2001C */ sw $v0, 0x1c($sp) -/* D2C518 802407E8 24020021 */ addiu $v0, $zero, 0x21 -.L802407EC: -/* D2C51C 802407EC AE220070 */ sw $v0, 0x70($s1) -.L802407F0: -/* D2C520 802407F0 8FBF0038 */ lw $ra, 0x38($sp) -/* D2C524 802407F4 8FB10034 */ lw $s1, 0x34($sp) -/* D2C528 802407F8 8FB00030 */ lw $s0, 0x30($sp) -/* D2C52C 802407FC 03E00008 */ jr $ra -/* D2C530 80240800 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s index 8e74ee8648..2c91055019 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s @@ -159,7 +159,7 @@ glabel func_80240C6C_D2C99C /* D2CBEC 80240EBC 24020020 */ addiu $v0, $zero, 0x20 /* D2CBF0 80240EC0 1462000D */ bne $v1, $v0, .L80240EF8 /* D2CBF4 80240EC4 00000000 */ nop -/* D2CBF8 80240EC8 0C0901CB */ jal func_8024072C_D2C45C +/* D2CBF8 80240EC8 0C0901CB */ jal UnkNpcAIFunc8 /* D2CBFC 80240ECC 0240202D */ daddu $a0, $s2, $zero /* D2CC00 80240ED0 8E430070 */ lw $v1, 0x70($s2) /* D2CC04 80240ED4 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240E1C_D30A9C.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240E1C_D30A9C.s deleted file mode 100644 index 91e641c58f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240E1C_D30A9C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E1C_D30A9C -/* D30A9C 80240E1C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D30AA0 80240E20 AFB10034 */ sw $s1, 0x34($sp) -/* D30AA4 80240E24 0080882D */ daddu $s1, $a0, $zero -/* D30AA8 80240E28 AFBF0038 */ sw $ra, 0x38($sp) -/* D30AAC 80240E2C AFB00030 */ sw $s0, 0x30($sp) -/* D30AB0 80240E30 8E300148 */ lw $s0, 0x148($s1) -/* D30AB4 80240E34 0C00EABB */ jal get_npc_unsafe -/* D30AB8 80240E38 86040008 */ lh $a0, 8($s0) -/* D30ABC 80240E3C 0040282D */ daddu $a1, $v0, $zero -/* D30AC0 80240E40 94A2008E */ lhu $v0, 0x8e($a1) -/* D30AC4 80240E44 2442FFFF */ addiu $v0, $v0, -1 -/* D30AC8 80240E48 A4A2008E */ sh $v0, 0x8e($a1) -/* D30ACC 80240E4C 00021400 */ sll $v0, $v0, 0x10 -/* D30AD0 80240E50 1C400023 */ bgtz $v0, .L80240EE0 -/* D30AD4 80240E54 24020004 */ addiu $v0, $zero, 4 -/* D30AD8 80240E58 8E0300CC */ lw $v1, 0xcc($s0) -/* D30ADC 80240E5C AE02006C */ sw $v0, 0x6c($s0) -/* D30AE0 80240E60 8C620000 */ lw $v0, ($v1) -/* D30AE4 80240E64 ACA20028 */ sw $v0, 0x28($a1) -/* D30AE8 80240E68 9602007A */ lhu $v0, 0x7a($s0) -/* D30AEC 80240E6C A4A2008E */ sh $v0, 0x8e($a1) -/* D30AF0 80240E70 8E020078 */ lw $v0, 0x78($s0) -/* D30AF4 80240E74 28420008 */ slti $v0, $v0, 8 -/* D30AF8 80240E78 14400018 */ bnez $v0, .L80240EDC -/* D30AFC 80240E7C 24020021 */ addiu $v0, $zero, 0x21 -/* D30B00 80240E80 24040003 */ addiu $a0, $zero, 3 -/* D30B04 80240E84 27A30028 */ addiu $v1, $sp, 0x28 -/* D30B08 80240E88 84A700A8 */ lh $a3, 0xa8($a1) -/* D30B0C 80240E8C 3C013F80 */ lui $at, 0x3f80 -/* D30B10 80240E90 44810000 */ mtc1 $at, $f0 -/* D30B14 80240E94 3C014000 */ lui $at, 0x4000 -/* D30B18 80240E98 44811000 */ mtc1 $at, $f2 -/* D30B1C 80240E9C 3C01C1A0 */ lui $at, 0xc1a0 -/* D30B20 80240EA0 44812000 */ mtc1 $at, $f4 -/* D30B24 80240EA4 44873000 */ mtc1 $a3, $f6 -/* D30B28 80240EA8 00000000 */ nop -/* D30B2C 80240EAC 468031A0 */ cvt.s.w $f6, $f6 -/* D30B30 80240EB0 E7A00010 */ swc1 $f0, 0x10($sp) -/* D30B34 80240EB4 E7A20014 */ swc1 $f2, 0x14($sp) -/* D30B38 80240EB8 E7A40018 */ swc1 $f4, 0x18($sp) -/* D30B3C 80240EBC 8E020078 */ lw $v0, 0x78($s0) -/* D30B40 80240EC0 44073000 */ mfc1 $a3, $f6 -/* D30B44 80240EC4 0000302D */ daddu $a2, $zero, $zero -/* D30B48 80240EC8 AFA30020 */ sw $v1, 0x20($sp) -/* D30B4C 80240ECC 2442FFFF */ addiu $v0, $v0, -1 -/* D30B50 80240ED0 0C01BFA4 */ jal fx_emote -/* D30B54 80240ED4 AFA2001C */ sw $v0, 0x1c($sp) -/* D30B58 80240ED8 24020021 */ addiu $v0, $zero, 0x21 -.L80240EDC: -/* D30B5C 80240EDC AE220070 */ sw $v0, 0x70($s1) -.L80240EE0: -/* D30B60 80240EE0 8FBF0038 */ lw $ra, 0x38($sp) -/* D30B64 80240EE4 8FB10034 */ lw $s1, 0x34($sp) -/* D30B68 80240EE8 8FB00030 */ lw $s0, 0x30($sp) -/* D30B6C 80240EEC 03E00008 */ jr $ra -/* D30B70 80240EF0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s index 1db942b2d5..a68b09443f 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s @@ -159,7 +159,7 @@ glabel func_8024135C_D30FDC /* D3122C 802415AC 24020020 */ addiu $v0, $zero, 0x20 /* D31230 802415B0 1462000D */ bne $v1, $v0, .L802415E8 /* D31234 802415B4 00000000 */ nop -/* D31238 802415B8 0C090387 */ jal func_80240E1C_D30A9C +/* D31238 802415B8 0C090387 */ jal UnkNpcAIFunc8 /* D3123C 802415BC 0240202D */ daddu $a0, $s2, $zero /* D31240 802415C0 8E430070 */ lw $v1, 0x70($s2) /* D31244 802415C4 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802404AC_D37CAC.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802404AC_D37CAC.s deleted file mode 100644 index b07c9f1d5f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802404AC_D37CAC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404AC_D37CAC -/* D37CAC 802404AC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D37CB0 802404B0 AFB10034 */ sw $s1, 0x34($sp) -/* D37CB4 802404B4 0080882D */ daddu $s1, $a0, $zero -/* D37CB8 802404B8 AFBF0038 */ sw $ra, 0x38($sp) -/* D37CBC 802404BC AFB00030 */ sw $s0, 0x30($sp) -/* D37CC0 802404C0 8E300148 */ lw $s0, 0x148($s1) -/* D37CC4 802404C4 0C00EABB */ jal get_npc_unsafe -/* D37CC8 802404C8 86040008 */ lh $a0, 8($s0) -/* D37CCC 802404CC 0040282D */ daddu $a1, $v0, $zero -/* D37CD0 802404D0 94A2008E */ lhu $v0, 0x8e($a1) -/* D37CD4 802404D4 2442FFFF */ addiu $v0, $v0, -1 -/* D37CD8 802404D8 A4A2008E */ sh $v0, 0x8e($a1) -/* D37CDC 802404DC 00021400 */ sll $v0, $v0, 0x10 -/* D37CE0 802404E0 1C400023 */ bgtz $v0, .L80240570 -/* D37CE4 802404E4 24020004 */ addiu $v0, $zero, 4 -/* D37CE8 802404E8 8E0300CC */ lw $v1, 0xcc($s0) -/* D37CEC 802404EC AE02006C */ sw $v0, 0x6c($s0) -/* D37CF0 802404F0 8C620000 */ lw $v0, ($v1) -/* D37CF4 802404F4 ACA20028 */ sw $v0, 0x28($a1) -/* D37CF8 802404F8 9602007A */ lhu $v0, 0x7a($s0) -/* D37CFC 802404FC A4A2008E */ sh $v0, 0x8e($a1) -/* D37D00 80240500 8E020078 */ lw $v0, 0x78($s0) -/* D37D04 80240504 28420008 */ slti $v0, $v0, 8 -/* D37D08 80240508 14400018 */ bnez $v0, .L8024056C -/* D37D0C 8024050C 24020021 */ addiu $v0, $zero, 0x21 -/* D37D10 80240510 24040003 */ addiu $a0, $zero, 3 -/* D37D14 80240514 27A30028 */ addiu $v1, $sp, 0x28 -/* D37D18 80240518 84A700A8 */ lh $a3, 0xa8($a1) -/* D37D1C 8024051C 3C013F80 */ lui $at, 0x3f80 -/* D37D20 80240520 44810000 */ mtc1 $at, $f0 -/* D37D24 80240524 3C014000 */ lui $at, 0x4000 -/* D37D28 80240528 44811000 */ mtc1 $at, $f2 -/* D37D2C 8024052C 3C01C1A0 */ lui $at, 0xc1a0 -/* D37D30 80240530 44812000 */ mtc1 $at, $f4 -/* D37D34 80240534 44873000 */ mtc1 $a3, $f6 -/* D37D38 80240538 00000000 */ nop -/* D37D3C 8024053C 468031A0 */ cvt.s.w $f6, $f6 -/* D37D40 80240540 E7A00010 */ swc1 $f0, 0x10($sp) -/* D37D44 80240544 E7A20014 */ swc1 $f2, 0x14($sp) -/* D37D48 80240548 E7A40018 */ swc1 $f4, 0x18($sp) -/* D37D4C 8024054C 8E020078 */ lw $v0, 0x78($s0) -/* D37D50 80240550 44073000 */ mfc1 $a3, $f6 -/* D37D54 80240554 0000302D */ daddu $a2, $zero, $zero -/* D37D58 80240558 AFA30020 */ sw $v1, 0x20($sp) -/* D37D5C 8024055C 2442FFFF */ addiu $v0, $v0, -1 -/* D37D60 80240560 0C01BFA4 */ jal fx_emote -/* D37D64 80240564 AFA2001C */ sw $v0, 0x1c($sp) -/* D37D68 80240568 24020021 */ addiu $v0, $zero, 0x21 -.L8024056C: -/* D37D6C 8024056C AE220070 */ sw $v0, 0x70($s1) -.L80240570: -/* D37D70 80240570 8FBF0038 */ lw $ra, 0x38($sp) -/* D37D74 80240574 8FB10034 */ lw $s1, 0x34($sp) -/* D37D78 80240578 8FB00030 */ lw $s0, 0x30($sp) -/* D37D7C 8024057C 03E00008 */ jr $ra -/* D37D80 80240580 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s index 7a9f078264..5f8dd0c10f 100644 --- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s +++ b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s @@ -159,7 +159,7 @@ glabel func_802409EC_D381EC /* D3843C 80240C3C 24020020 */ addiu $v0, $zero, 0x20 /* D38440 80240C40 1462000D */ bne $v1, $v0, .L80240C78 /* D38444 80240C44 00000000 */ nop -/* D38448 80240C48 0C09012B */ jal func_802404AC_D37CAC +/* D38448 80240C48 0C09012B */ jal UnkNpcAIFunc8 /* D3844C 80240C4C 0240202D */ daddu $a0, $s2, $zero /* D38450 80240C50 8E430070 */ lw $v1, 0x70($s2) /* D38454 80240C54 24020021 */ addiu $v0, $zero, 0x21 diff --git a/include/functions.h b/include/functions.h index e16cd9fdb9..aab81a1b7d 100644 --- a/include/functions.h +++ b/include/functions.h @@ -73,6 +73,7 @@ void set_curtain_scale_goal(f32 scale); void set_curtain_fade(f32 scale); void fx_walk_normal(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5); +void fx_emote(s32, Npc*, s32, f32, f32, f32, f32, s32, s32*); f32 func_800E0088(f32, f32); s32 func_800EB168(s32); diff --git a/src/os/code_4ac90_len_3910.c b/src/os/code_4ac90_len_3910.c index 0a8deb9f6d..d910db8e8b 100644 --- a/src/os/code_4ac90_len_3910.c +++ b/src/os/code_4ac90_len_3910.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FDD0); INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FE30); -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", fx_emote); +INCLUDE_ASM(void, "os/code_4ac90_len_3910", fx_emote, s32 arg0, Npc* arg1, s32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, s32 arg7, s32* arg8); INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_8006FEF0, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4); diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c index 4d79036c51..cd14f2a961 100644 --- a/src/world/area_dgb/dgb_02/C2EBA0.c +++ b/src/world/area_dgb/dgb_02/C2EBA0.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_802400DC_C2EC7C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index b1bec91aff..79b8dc1a4f 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024032C_C3180C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index f3f3702e93..054dc46d9a 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240030_C3AA40); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_8024013C_C3AB4C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index a9170c50fe..d33b120d5b 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_802400DC_C3DCCC); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index e2b5397d81..2629ca9cff 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240B94_C40944); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240F6C_C40D1C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index edcd0c2093..99f350ea84 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802400DC_C46CBC); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 75e2647972..0822e71ef1 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802400DC_C4F5EC); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c index ee13e88388..fd0a87b082 100644 --- a/src/world/area_dgb/dgb_16/C52540.c +++ b/src/world/area_dgb/dgb_16/C52540.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_802400DC_C5261C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index a52c4fd795..fbf6bf0904 100644 --- a/src/world/area_jan/jan_05/B4B260.c +++ b/src/world/area_jan/jan_05/B4B260.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241708_B4C178); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802419A8_B4C418); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index c546006e2c..9335839ccf 100644 --- a/src/world/area_jan/jan_06/B52F70.c +++ b/src/world/area_jan/jan_06/B52F70.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241658_B53E88); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802418F8_B54128); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_jan/jan_07/B59870.c b/src/world/area_jan/jan_07/B59870.c index 12f4a0c23c..e9d7b81929 100644 --- a/src/world/area_jan/jan_07/B59870.c +++ b/src/world/area_jan/jan_07/B59870.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240050_B598C0); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_802402F0_B59B60); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_jan/jan_08/B5F650.c b/src/world/area_jan/jan_08/B5F650.c index 8677371132..6694f19904 100644 --- a/src/world/area_jan/jan_08/B5F650.c +++ b/src/world/area_jan/jan_08/B5F650.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802414A4_B5F754); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241744_B5F9F4); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_jan/jan_09/B663F0.c b/src/world/area_jan/jan_09/B663F0.c index 3d5e9348a8..e32bb74b08 100644 --- a/src/world/area_jan/jan_09/B663F0.c +++ b/src/world/area_jan/jan_09/B663F0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240990_B66440); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240C30_B666E0); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_jan/jan_12/B73570.c b/src/world/area_jan/jan_12/B73570.c index f12208dae0..40567e195b 100644 --- a/src/world/area_jan/jan_12/B73570.c +++ b/src/world/area_jan/jan_12/B73570.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240510_B735C0); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_802407B0_B73860); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index 622b21ef17..b09ee695d4 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_802406A4_C613B4); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240CD4_C619E4); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index 3acdf579eb..cfa6255c64 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242354_C737D4); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242618_C73A98); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index d52e02d926..4097fa2a6e 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802410FC_C77DDC); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index dda486d710..9929ba5659 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_802403EC_C85E9C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_mim/mim_01/B93940.c b/src/world/area_mim/mim_01/B93940.c index c68c3aea47..1dbaffe4cc 100644 --- a/src/world/area_mim/mim_01/B93940.c +++ b/src/world/area_mim/mim_01/B93940.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_802405DC_B93A1C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_mim/mim_05/BA07A0.c b/src/world/area_mim/mim_05/BA07A0.c index f2240f894d..ff6eff63a5 100644 --- a/src/world/area_mim/mim_05/BA07A0.c +++ b/src/world/area_mim/mim_05/BA07A0.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_8024014C_BA087C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c index 5bd34de39b..989c849e0a 100644 --- a/src/world/area_mim/mim_06/BA4CF0.c +++ b/src/world/area_mim/mim_06/BA4CF0.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_8024064C_BA4DCC); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index 62edd0f24b..28455e9341 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_802413AC_BAECEC); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241674_BAEFB4); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index 4b2306afd9..e24510b74b 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -54,7 +54,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241AB4_D8ED04); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241E8C_D8F0DC); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c index f9203e82b3..1f08c6cf20 100644 --- a/src/world/area_pra/pra_37/D92F40.c +++ b/src/world/area_pra/pra_37/D92F40.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240F1C_D93E5C); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_8024102C_D93F6C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_sam/sam_03/D110C0.c b/src/world/area_sam/sam_03/D110C0.c index 44e3c3855e..55f5c0839c 100644 --- a/src/world/area_sam/sam_03/D110C0.c +++ b/src/world/area_sam/sam_03/D110C0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_80240000_D110C0); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_8024012C_D111EC); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_sam/sam_05/D187E0.c b/src/world/area_sam/sam_05/D187E0.c index 2cfaf70d64..abf49d8273 100644 --- a/src/world/area_sam/sam_05/D187E0.c +++ b/src/world/area_sam/sam_05/D187E0.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_802400DC_D188BC); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c index 95801c8019..18a97fdb71 100644 --- a/src/world/area_sam/sam_07/D2BD30.c +++ b/src/world/area_sam/sam_07/D2BD30.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802405B0_D2C2E0); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_8024072C_D2C45C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_sam/sam_08/D309C0.c b/src/world/area_sam/sam_08/D309C0.c index ddc4be40af..9b1b6566a5 100644 --- a/src/world/area_sam/sam_08/D309C0.c +++ b/src/world/area_sam/sam_08/D309C0.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240E1C_D30A9C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_sam/sam_10/D37BD0.c b/src/world/area_sam/sam_10/D37BD0.c index cf9e60dea6..f8582e2238 100644 --- a/src/world/area_sam/sam_10/D37BD0.c +++ b/src/world/area_sam/sam_10/D37BD0.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_10/D37BD0", func_802404AC_D37CAC); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/common/UnkNpcAIFunc8.inc.c b/src/world/common/UnkNpcAIFunc8.inc.c new file mode 100644 index 0000000000..33d133535a --- /dev/null +++ b/src/world/common/UnkNpcAIFunc8.inc.c @@ -0,0 +1,20 @@ +#include "common.h" +#include "map.h" + +static void UnkNpcAIFunc8(ScriptInstance* script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if ((npc->duration << 0x10) <= 0) { + enemy->varTable[0] = 4; + npc->currentAnim = enemy->animList[0]; + npc->duration = enemy->varTable[3]; + if (enemy->varTable[3] >= 8) { + s32 something; + + fx_emote(3, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, enemy->varTable[3] - 1, &something); + } + script->functionTemp[0].s = 33; + } +} From 41b7fd69a1e83d10fd76086e3598c29d0419959c Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 22 Nov 2020 10:46:50 -0500 Subject: [PATCH 22/38] UnkYawFunc --- .../dro_01/95B7E0/func_80242E88_95E088.s | 103 ------------------ .../dro_02/9694C0/func_80243870_96CA30.s | 103 ------------------ .../hos_06/A397F0/func_8024086C_A39D4C.s | 103 ------------------ .../jan_00/B20540/func_80240950_B20E90.s | 103 ------------------ .../jan_03/B34BD0/func_80242D20_B378F0.s | 103 ------------------ .../kmr_02/8B0070/func_80242514_8B2584.s | 103 ------------------ .../kzn_02/C5AC20/func_80242528_C5CC68.s | 103 ------------------ .../kzn_03/C61020/func_80242AF8_C63808.s | 103 ------------------ .../kzn_09/C77D00/func_80243808_C7A4E8.s | 103 ------------------ .../kzn_17/C85DC0/func_80242AF8_C885A8.s | 103 ------------------ .../kzn_19/C8DBB0/func_802419C4_C8F574.s | 103 ------------------ .../kzn_20/C96240/func_8024086C_C9679C.s | 103 ------------------ .../mac_00/7EB340/func_80241BA4_7EC8B4.s | 103 ------------------ .../mac_00/7ED280/func_8024395C_7EE66C.s | 103 ------------------ .../mac_01/8017D0/func_80243EEC_80476C.s | 103 ------------------ .../mac_02/823BF0/func_802431F4_8264B4.s | 103 ------------------ .../mac_03/831B20/func_80241988_833188.s | 103 ------------------ .../mac_05/852170/func_80242894_854A04.s | 103 ------------------ .../nok_01/9C53E0/func_80242240_9C7620.s | 103 ------------------ .../nok_02/9D7AA0/func_80242DE8_9D9E08.s | 103 ------------------ .../obk_01/BBD980/func_80240D3C_BBDEDC.s | 103 ------------------ .../obk_03/BC43F0/func_802406CC_BC494C.s | 103 ------------------ .../osr_01/AB0350/func_802408BC_AB08AC.s | 103 ------------------ .../sam_01/CF7E80/func_80241884_CF93F4.s | 103 ------------------ .../sam_06/D203E0/func_8024233C_D221CC.s | 103 ------------------ .../sbk_30/93F5B0/func_802413D4_940984.s | 103 ------------------ .../sbk_34/945F10/func_8024059C_94646C.s | 103 ------------------ src/world/area_dro/dro_01/95B7E0.c | 2 +- src/world/area_dro/dro_02/9694C0.c | 2 +- src/world/area_hos/hos_06/A397F0.c | 2 +- src/world/area_jan/jan_00/B20540.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_kmr/kmr_02/8B0070.c | 2 +- src/world/area_kzn/kzn_02/C5AC20.c | 2 +- src/world/area_kzn/kzn_03/C61020.c | 2 +- src/world/area_kzn/kzn_09/C77D00.c | 2 +- src/world/area_kzn/kzn_17/C85DC0.c | 2 +- src/world/area_kzn/kzn_19/C8DBB0.c | 2 +- src/world/area_kzn/kzn_20/C96240.c | 2 +- src/world/area_mac/mac_00/7EB340.c | 2 +- src/world/area_mac/mac_00/7ED280.c | 2 +- src/world/area_mac/mac_01/8017D0.c | 2 +- src/world/area_mac/mac_02/823BF0.c | 2 +- src/world/area_mac/mac_03/831B20.c | 2 +- src/world/area_mac/mac_05/852170.c | 2 +- src/world/area_nok/nok_01/9C53E0.c | 2 +- src/world/area_nok/nok_02/9D7AA0.c | 2 +- src/world/area_obk/obk_01/BBD980.c | 2 +- src/world/area_obk/obk_03/BC43F0.c | 2 +- src/world/area_osr/osr_01/AB0350.c | 2 +- src/world/area_sam/sam_01/CF7E80.c | 2 +- src/world/area_sam/sam_06/D203E0.c | 2 +- src/world/area_sbk/sbk_30/93F5B0.c | 2 +- src/world/area_sbk/sbk_34/945F10.c | 2 +- src/world/common/UnkYawFunc.inc.c | 22 ++++ 55 files changed, 49 insertions(+), 2808 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242E88_95E088.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243870_96CA30.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_06/A397F0/func_8024086C_A39D4C.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240950_B20E90.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242D20_B378F0.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242514_8B2584.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242528_C5CC68.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242AF8_C63808.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243808_C7A4E8.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242AF8_C885A8.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802419C4_C8F574.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_8024086C_C9679C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241BA4_7EC8B4.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7ED280/func_8024395C_7EE66C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243EEC_80476C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802431F4_8264B4.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241988_833188.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80242894_854A04.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242240_9C7620.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242DE8_9D9E08.s delete mode 100644 asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240D3C_BBDEDC.s delete mode 100644 asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802406CC_BC494C.s delete mode 100644 asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802408BC_AB08AC.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241884_CF93F4.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024233C_D221CC.s delete mode 100644 asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802413D4_940984.s delete mode 100644 asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_8024059C_94646C.s create mode 100644 src/world/common/UnkYawFunc.inc.c diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242E88_95E088.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242E88_95E088.s deleted file mode 100644 index ef354b58ee..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242E88_95E088.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E88_95E088 -/* 95E088 80242E88 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 95E08C 80242E8C AFB1001C */ sw $s1, 0x1c($sp) -/* 95E090 80242E90 0080882D */ daddu $s1, $a0, $zero -/* 95E094 80242E94 AFBF0034 */ sw $ra, 0x34($sp) -/* 95E098 80242E98 AFB60030 */ sw $s6, 0x30($sp) -/* 95E09C 80242E9C AFB5002C */ sw $s5, 0x2c($sp) -/* 95E0A0 80242EA0 AFB40028 */ sw $s4, 0x28($sp) -/* 95E0A4 80242EA4 AFB30024 */ sw $s3, 0x24($sp) -/* 95E0A8 80242EA8 AFB20020 */ sw $s2, 0x20($sp) -/* 95E0AC 80242EAC AFB00018 */ sw $s0, 0x18($sp) -/* 95E0B0 80242EB0 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 95E0B4 80242EB4 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 95E0B8 80242EB8 8E30000C */ lw $s0, 0xc($s1) -/* 95E0BC 80242EBC 8E160000 */ lw $s6, ($s0) -/* 95E0C0 80242EC0 26100004 */ addiu $s0, $s0, 4 -/* 95E0C4 80242EC4 0C0B1EAF */ jal get_variable -/* 95E0C8 80242EC8 02C0282D */ daddu $a1, $s6, $zero -/* 95E0CC 80242ECC 44820000 */ mtc1 $v0, $f0 -/* 95E0D0 80242ED0 00000000 */ nop -/* 95E0D4 80242ED4 46800020 */ cvt.s.w $f0, $f0 -/* 95E0D8 80242ED8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 95E0DC 80242EDC 8E140000 */ lw $s4, ($s0) -/* 95E0E0 80242EE0 26100004 */ addiu $s0, $s0, 4 -/* 95E0E4 80242EE4 0220202D */ daddu $a0, $s1, $zero -/* 95E0E8 80242EE8 0C0B1EAF */ jal get_variable -/* 95E0EC 80242EEC 0280282D */ daddu $a1, $s4, $zero -/* 95E0F0 80242EF0 0220202D */ daddu $a0, $s1, $zero -/* 95E0F4 80242EF4 8E150000 */ lw $s5, ($s0) -/* 95E0F8 80242EF8 4482B000 */ mtc1 $v0, $f22 -/* 95E0FC 80242EFC 00000000 */ nop -/* 95E100 80242F00 4680B5A0 */ cvt.s.w $f22, $f22 -/* 95E104 80242F04 0C0B1EAF */ jal get_variable -/* 95E108 80242F08 02A0282D */ daddu $a1, $s5, $zero -/* 95E10C 80242F0C 2404FFFC */ addiu $a0, $zero, -4 -/* 95E110 80242F10 44820000 */ mtc1 $v0, $f0 -/* 95E114 80242F14 00000000 */ nop -/* 95E118 80242F18 46800020 */ cvt.s.w $f0, $f0 -/* 95E11C 80242F1C 0C00EABB */ jal get_npc_unsafe -/* 95E120 80242F20 E7A00014 */ swc1 $f0, 0x14($sp) -/* 95E124 80242F24 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 95E128 80242F28 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 95E12C 80242F2C 3C014334 */ lui $at, 0x4334 -/* 95E130 80242F30 44816000 */ mtc1 $at, $f12 -/* 95E134 80242F34 00041880 */ sll $v1, $a0, 2 -/* 95E138 80242F38 00641821 */ addu $v1, $v1, $a0 -/* 95E13C 80242F3C 00031880 */ sll $v1, $v1, 2 -/* 95E140 80242F40 00641823 */ subu $v1, $v1, $a0 -/* 95E144 80242F44 000320C0 */ sll $a0, $v1, 3 -/* 95E148 80242F48 00641821 */ addu $v1, $v1, $a0 -/* 95E14C 80242F4C 000318C0 */ sll $v1, $v1, 3 -/* 95E150 80242F50 3C01800B */ lui $at, 0x800b -/* 95E154 80242F54 00230821 */ addu $at, $at, $v1 -/* 95E158 80242F58 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 95E15C 80242F5C 460C0300 */ add.s $f12, $f0, $f12 -/* 95E160 80242F60 0C00A6C9 */ jal clamp_angle -/* 95E164 80242F64 0040982D */ daddu $s3, $v0, $zero -/* 95E168 80242F68 27B00010 */ addiu $s0, $sp, 0x10 -/* 95E16C 80242F6C 0200202D */ daddu $a0, $s0, $zero -/* 95E170 80242F70 27B20014 */ addiu $s2, $sp, 0x14 -/* 95E174 80242F74 0240282D */ daddu $a1, $s2, $zero -/* 95E178 80242F78 3C064170 */ lui $a2, 0x4170 -/* 95E17C 80242F7C 8E67000C */ lw $a3, 0xc($s3) -/* 95E180 80242F80 0C00A7E7 */ jal add_vec2D_polar -/* 95E184 80242F84 46000506 */ mov.s $f20, $f0 -/* 95E188 80242F88 0200202D */ daddu $a0, $s0, $zero -/* 95E18C 80242F8C 3C064120 */ lui $a2, 0x4120 -/* 95E190 80242F90 4407A000 */ mfc1 $a3, $f20 -/* 95E194 80242F94 0C00A7E7 */ jal add_vec2D_polar -/* 95E198 80242F98 0240282D */ daddu $a1, $s2, $zero -/* 95E19C 80242F9C 0220202D */ daddu $a0, $s1, $zero -/* 95E1A0 80242FA0 C7A00010 */ lwc1 $f0, 0x10($sp) -/* 95E1A4 80242FA4 4600008D */ trunc.w.s $f2, $f0 -/* 95E1A8 80242FA8 44061000 */ mfc1 $a2, $f2 -/* 95E1AC 80242FAC 0C0B2026 */ jal set_variable -/* 95E1B0 80242FB0 02C0282D */ daddu $a1, $s6, $zero -/* 95E1B4 80242FB4 0220202D */ daddu $a0, $s1, $zero -/* 95E1B8 80242FB8 4600B08D */ trunc.w.s $f2, $f22 -/* 95E1BC 80242FBC 44061000 */ mfc1 $a2, $f2 -/* 95E1C0 80242FC0 0C0B2026 */ jal set_variable -/* 95E1C4 80242FC4 0280282D */ daddu $a1, $s4, $zero -/* 95E1C8 80242FC8 0220202D */ daddu $a0, $s1, $zero -/* 95E1CC 80242FCC C7A00014 */ lwc1 $f0, 0x14($sp) -/* 95E1D0 80242FD0 4600008D */ trunc.w.s $f2, $f0 -/* 95E1D4 80242FD4 44061000 */ mfc1 $a2, $f2 -/* 95E1D8 80242FD8 0C0B2026 */ jal set_variable -/* 95E1DC 80242FDC 02A0282D */ daddu $a1, $s5, $zero -/* 95E1E0 80242FE0 8FBF0034 */ lw $ra, 0x34($sp) -/* 95E1E4 80242FE4 8FB60030 */ lw $s6, 0x30($sp) -/* 95E1E8 80242FE8 8FB5002C */ lw $s5, 0x2c($sp) -/* 95E1EC 80242FEC 8FB40028 */ lw $s4, 0x28($sp) -/* 95E1F0 80242FF0 8FB30024 */ lw $s3, 0x24($sp) -/* 95E1F4 80242FF4 8FB20020 */ lw $s2, 0x20($sp) -/* 95E1F8 80242FF8 8FB1001C */ lw $s1, 0x1c($sp) -/* 95E1FC 80242FFC 8FB00018 */ lw $s0, 0x18($sp) -/* 95E200 80243000 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 95E204 80243004 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 95E208 80243008 24020002 */ addiu $v0, $zero, 2 -/* 95E20C 8024300C 03E00008 */ jr $ra -/* 95E210 80243010 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243870_96CA30.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243870_96CA30.s deleted file mode 100644 index dc7c48892b..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243870_96CA30.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243870_96CA30 -/* 96CA30 80243870 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 96CA34 80243874 AFB1001C */ sw $s1, 0x1c($sp) -/* 96CA38 80243878 0080882D */ daddu $s1, $a0, $zero -/* 96CA3C 8024387C AFBF0034 */ sw $ra, 0x34($sp) -/* 96CA40 80243880 AFB60030 */ sw $s6, 0x30($sp) -/* 96CA44 80243884 AFB5002C */ sw $s5, 0x2c($sp) -/* 96CA48 80243888 AFB40028 */ sw $s4, 0x28($sp) -/* 96CA4C 8024388C AFB30024 */ sw $s3, 0x24($sp) -/* 96CA50 80243890 AFB20020 */ sw $s2, 0x20($sp) -/* 96CA54 80243894 AFB00018 */ sw $s0, 0x18($sp) -/* 96CA58 80243898 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 96CA5C 8024389C F7B40038 */ sdc1 $f20, 0x38($sp) -/* 96CA60 802438A0 8E30000C */ lw $s0, 0xc($s1) -/* 96CA64 802438A4 8E160000 */ lw $s6, ($s0) -/* 96CA68 802438A8 26100004 */ addiu $s0, $s0, 4 -/* 96CA6C 802438AC 0C0B1EAF */ jal get_variable -/* 96CA70 802438B0 02C0282D */ daddu $a1, $s6, $zero -/* 96CA74 802438B4 44820000 */ mtc1 $v0, $f0 -/* 96CA78 802438B8 00000000 */ nop -/* 96CA7C 802438BC 46800020 */ cvt.s.w $f0, $f0 -/* 96CA80 802438C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 96CA84 802438C4 8E140000 */ lw $s4, ($s0) -/* 96CA88 802438C8 26100004 */ addiu $s0, $s0, 4 -/* 96CA8C 802438CC 0220202D */ daddu $a0, $s1, $zero -/* 96CA90 802438D0 0C0B1EAF */ jal get_variable -/* 96CA94 802438D4 0280282D */ daddu $a1, $s4, $zero -/* 96CA98 802438D8 0220202D */ daddu $a0, $s1, $zero -/* 96CA9C 802438DC 8E150000 */ lw $s5, ($s0) -/* 96CAA0 802438E0 4482B000 */ mtc1 $v0, $f22 -/* 96CAA4 802438E4 00000000 */ nop -/* 96CAA8 802438E8 4680B5A0 */ cvt.s.w $f22, $f22 -/* 96CAAC 802438EC 0C0B1EAF */ jal get_variable -/* 96CAB0 802438F0 02A0282D */ daddu $a1, $s5, $zero -/* 96CAB4 802438F4 2404FFFC */ addiu $a0, $zero, -4 -/* 96CAB8 802438F8 44820000 */ mtc1 $v0, $f0 -/* 96CABC 802438FC 00000000 */ nop -/* 96CAC0 80243900 46800020 */ cvt.s.w $f0, $f0 -/* 96CAC4 80243904 0C00EABB */ jal get_npc_unsafe -/* 96CAC8 80243908 E7A00014 */ swc1 $f0, 0x14($sp) -/* 96CACC 8024390C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 96CAD0 80243910 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 96CAD4 80243914 3C014334 */ lui $at, 0x4334 -/* 96CAD8 80243918 44816000 */ mtc1 $at, $f12 -/* 96CADC 8024391C 00041880 */ sll $v1, $a0, 2 -/* 96CAE0 80243920 00641821 */ addu $v1, $v1, $a0 -/* 96CAE4 80243924 00031880 */ sll $v1, $v1, 2 -/* 96CAE8 80243928 00641823 */ subu $v1, $v1, $a0 -/* 96CAEC 8024392C 000320C0 */ sll $a0, $v1, 3 -/* 96CAF0 80243930 00641821 */ addu $v1, $v1, $a0 -/* 96CAF4 80243934 000318C0 */ sll $v1, $v1, 3 -/* 96CAF8 80243938 3C01800B */ lui $at, 0x800b -/* 96CAFC 8024393C 00230821 */ addu $at, $at, $v1 -/* 96CB00 80243940 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 96CB04 80243944 460C0300 */ add.s $f12, $f0, $f12 -/* 96CB08 80243948 0C00A6C9 */ jal clamp_angle -/* 96CB0C 8024394C 0040982D */ daddu $s3, $v0, $zero -/* 96CB10 80243950 27B00010 */ addiu $s0, $sp, 0x10 -/* 96CB14 80243954 0200202D */ daddu $a0, $s0, $zero -/* 96CB18 80243958 27B20014 */ addiu $s2, $sp, 0x14 -/* 96CB1C 8024395C 0240282D */ daddu $a1, $s2, $zero -/* 96CB20 80243960 3C064170 */ lui $a2, 0x4170 -/* 96CB24 80243964 8E67000C */ lw $a3, 0xc($s3) -/* 96CB28 80243968 0C00A7E7 */ jal add_vec2D_polar -/* 96CB2C 8024396C 46000506 */ mov.s $f20, $f0 -/* 96CB30 80243970 0200202D */ daddu $a0, $s0, $zero -/* 96CB34 80243974 3C064120 */ lui $a2, 0x4120 -/* 96CB38 80243978 4407A000 */ mfc1 $a3, $f20 -/* 96CB3C 8024397C 0C00A7E7 */ jal add_vec2D_polar -/* 96CB40 80243980 0240282D */ daddu $a1, $s2, $zero -/* 96CB44 80243984 0220202D */ daddu $a0, $s1, $zero -/* 96CB48 80243988 C7A00010 */ lwc1 $f0, 0x10($sp) -/* 96CB4C 8024398C 4600008D */ trunc.w.s $f2, $f0 -/* 96CB50 80243990 44061000 */ mfc1 $a2, $f2 -/* 96CB54 80243994 0C0B2026 */ jal set_variable -/* 96CB58 80243998 02C0282D */ daddu $a1, $s6, $zero -/* 96CB5C 8024399C 0220202D */ daddu $a0, $s1, $zero -/* 96CB60 802439A0 4600B08D */ trunc.w.s $f2, $f22 -/* 96CB64 802439A4 44061000 */ mfc1 $a2, $f2 -/* 96CB68 802439A8 0C0B2026 */ jal set_variable -/* 96CB6C 802439AC 0280282D */ daddu $a1, $s4, $zero -/* 96CB70 802439B0 0220202D */ daddu $a0, $s1, $zero -/* 96CB74 802439B4 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 96CB78 802439B8 4600008D */ trunc.w.s $f2, $f0 -/* 96CB7C 802439BC 44061000 */ mfc1 $a2, $f2 -/* 96CB80 802439C0 0C0B2026 */ jal set_variable -/* 96CB84 802439C4 02A0282D */ daddu $a1, $s5, $zero -/* 96CB88 802439C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 96CB8C 802439CC 8FB60030 */ lw $s6, 0x30($sp) -/* 96CB90 802439D0 8FB5002C */ lw $s5, 0x2c($sp) -/* 96CB94 802439D4 8FB40028 */ lw $s4, 0x28($sp) -/* 96CB98 802439D8 8FB30024 */ lw $s3, 0x24($sp) -/* 96CB9C 802439DC 8FB20020 */ lw $s2, 0x20($sp) -/* 96CBA0 802439E0 8FB1001C */ lw $s1, 0x1c($sp) -/* 96CBA4 802439E4 8FB00018 */ lw $s0, 0x18($sp) -/* 96CBA8 802439E8 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 96CBAC 802439EC D7B40038 */ ldc1 $f20, 0x38($sp) -/* 96CBB0 802439F0 24020002 */ addiu $v0, $zero, 2 -/* 96CBB4 802439F4 03E00008 */ jr $ra -/* 96CBB8 802439F8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_8024086C_A39D4C.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_8024086C_A39D4C.s deleted file mode 100644 index 15efd455a9..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_8024086C_A39D4C.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024086C_A39D4C -/* A39D4C 8024086C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A39D50 80240870 AFB1001C */ sw $s1, 0x1c($sp) -/* A39D54 80240874 0080882D */ daddu $s1, $a0, $zero -/* A39D58 80240878 AFBF0034 */ sw $ra, 0x34($sp) -/* A39D5C 8024087C AFB60030 */ sw $s6, 0x30($sp) -/* A39D60 80240880 AFB5002C */ sw $s5, 0x2c($sp) -/* A39D64 80240884 AFB40028 */ sw $s4, 0x28($sp) -/* A39D68 80240888 AFB30024 */ sw $s3, 0x24($sp) -/* A39D6C 8024088C AFB20020 */ sw $s2, 0x20($sp) -/* A39D70 80240890 AFB00018 */ sw $s0, 0x18($sp) -/* A39D74 80240894 F7B60040 */ sdc1 $f22, 0x40($sp) -/* A39D78 80240898 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A39D7C 8024089C 8E30000C */ lw $s0, 0xc($s1) -/* A39D80 802408A0 8E160000 */ lw $s6, ($s0) -/* A39D84 802408A4 26100004 */ addiu $s0, $s0, 4 -/* A39D88 802408A8 0C0B1EAF */ jal get_variable -/* A39D8C 802408AC 02C0282D */ daddu $a1, $s6, $zero -/* A39D90 802408B0 44820000 */ mtc1 $v0, $f0 -/* A39D94 802408B4 00000000 */ nop -/* A39D98 802408B8 46800020 */ cvt.s.w $f0, $f0 -/* A39D9C 802408BC E7A00010 */ swc1 $f0, 0x10($sp) -/* A39DA0 802408C0 8E140000 */ lw $s4, ($s0) -/* A39DA4 802408C4 26100004 */ addiu $s0, $s0, 4 -/* A39DA8 802408C8 0220202D */ daddu $a0, $s1, $zero -/* A39DAC 802408CC 0C0B1EAF */ jal get_variable -/* A39DB0 802408D0 0280282D */ daddu $a1, $s4, $zero -/* A39DB4 802408D4 0220202D */ daddu $a0, $s1, $zero -/* A39DB8 802408D8 8E150000 */ lw $s5, ($s0) -/* A39DBC 802408DC 4482B000 */ mtc1 $v0, $f22 -/* A39DC0 802408E0 00000000 */ nop -/* A39DC4 802408E4 4680B5A0 */ cvt.s.w $f22, $f22 -/* A39DC8 802408E8 0C0B1EAF */ jal get_variable -/* A39DCC 802408EC 02A0282D */ daddu $a1, $s5, $zero -/* A39DD0 802408F0 2404FFFC */ addiu $a0, $zero, -4 -/* A39DD4 802408F4 44820000 */ mtc1 $v0, $f0 -/* A39DD8 802408F8 00000000 */ nop -/* A39DDC 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* A39DE0 80240900 0C00EABB */ jal get_npc_unsafe -/* A39DE4 80240904 E7A00014 */ swc1 $f0, 0x14($sp) -/* A39DE8 80240908 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* A39DEC 8024090C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* A39DF0 80240910 3C014334 */ lui $at, 0x4334 -/* A39DF4 80240914 44816000 */ mtc1 $at, $f12 -/* A39DF8 80240918 00041880 */ sll $v1, $a0, 2 -/* A39DFC 8024091C 00641821 */ addu $v1, $v1, $a0 -/* A39E00 80240920 00031880 */ sll $v1, $v1, 2 -/* A39E04 80240924 00641823 */ subu $v1, $v1, $a0 -/* A39E08 80240928 000320C0 */ sll $a0, $v1, 3 -/* A39E0C 8024092C 00641821 */ addu $v1, $v1, $a0 -/* A39E10 80240930 000318C0 */ sll $v1, $v1, 3 -/* A39E14 80240934 3C01800B */ lui $at, 0x800b -/* A39E18 80240938 00230821 */ addu $at, $at, $v1 -/* A39E1C 8024093C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* A39E20 80240940 460C0300 */ add.s $f12, $f0, $f12 -/* A39E24 80240944 0C00A6C9 */ jal clamp_angle -/* A39E28 80240948 0040982D */ daddu $s3, $v0, $zero -/* A39E2C 8024094C 27B00010 */ addiu $s0, $sp, 0x10 -/* A39E30 80240950 0200202D */ daddu $a0, $s0, $zero -/* A39E34 80240954 27B20014 */ addiu $s2, $sp, 0x14 -/* A39E38 80240958 0240282D */ daddu $a1, $s2, $zero -/* A39E3C 8024095C 3C064170 */ lui $a2, 0x4170 -/* A39E40 80240960 8E67000C */ lw $a3, 0xc($s3) -/* A39E44 80240964 0C00A7E7 */ jal add_vec2D_polar -/* A39E48 80240968 46000506 */ mov.s $f20, $f0 -/* A39E4C 8024096C 0200202D */ daddu $a0, $s0, $zero -/* A39E50 80240970 3C064120 */ lui $a2, 0x4120 -/* A39E54 80240974 4407A000 */ mfc1 $a3, $f20 -/* A39E58 80240978 0C00A7E7 */ jal add_vec2D_polar -/* A39E5C 8024097C 0240282D */ daddu $a1, $s2, $zero -/* A39E60 80240980 0220202D */ daddu $a0, $s1, $zero -/* A39E64 80240984 C7A00010 */ lwc1 $f0, 0x10($sp) -/* A39E68 80240988 4600008D */ trunc.w.s $f2, $f0 -/* A39E6C 8024098C 44061000 */ mfc1 $a2, $f2 -/* A39E70 80240990 0C0B2026 */ jal set_variable -/* A39E74 80240994 02C0282D */ daddu $a1, $s6, $zero -/* A39E78 80240998 0220202D */ daddu $a0, $s1, $zero -/* A39E7C 8024099C 4600B08D */ trunc.w.s $f2, $f22 -/* A39E80 802409A0 44061000 */ mfc1 $a2, $f2 -/* A39E84 802409A4 0C0B2026 */ jal set_variable -/* A39E88 802409A8 0280282D */ daddu $a1, $s4, $zero -/* A39E8C 802409AC 0220202D */ daddu $a0, $s1, $zero -/* A39E90 802409B0 C7A00014 */ lwc1 $f0, 0x14($sp) -/* A39E94 802409B4 4600008D */ trunc.w.s $f2, $f0 -/* A39E98 802409B8 44061000 */ mfc1 $a2, $f2 -/* A39E9C 802409BC 0C0B2026 */ jal set_variable -/* A39EA0 802409C0 02A0282D */ daddu $a1, $s5, $zero -/* A39EA4 802409C4 8FBF0034 */ lw $ra, 0x34($sp) -/* A39EA8 802409C8 8FB60030 */ lw $s6, 0x30($sp) -/* A39EAC 802409CC 8FB5002C */ lw $s5, 0x2c($sp) -/* A39EB0 802409D0 8FB40028 */ lw $s4, 0x28($sp) -/* A39EB4 802409D4 8FB30024 */ lw $s3, 0x24($sp) -/* A39EB8 802409D8 8FB20020 */ lw $s2, 0x20($sp) -/* A39EBC 802409DC 8FB1001C */ lw $s1, 0x1c($sp) -/* A39EC0 802409E0 8FB00018 */ lw $s0, 0x18($sp) -/* A39EC4 802409E4 D7B60040 */ ldc1 $f22, 0x40($sp) -/* A39EC8 802409E8 D7B40038 */ ldc1 $f20, 0x38($sp) -/* A39ECC 802409EC 24020002 */ addiu $v0, $zero, 2 -/* A39ED0 802409F0 03E00008 */ jr $ra -/* A39ED4 802409F4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240950_B20E90.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240950_B20E90.s deleted file mode 100644 index 0e32a5d1ff..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240950_B20E90.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240950_B20E90 -/* B20E90 80240950 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B20E94 80240954 AFB1001C */ sw $s1, 0x1c($sp) -/* B20E98 80240958 0080882D */ daddu $s1, $a0, $zero -/* B20E9C 8024095C AFBF0034 */ sw $ra, 0x34($sp) -/* B20EA0 80240960 AFB60030 */ sw $s6, 0x30($sp) -/* B20EA4 80240964 AFB5002C */ sw $s5, 0x2c($sp) -/* B20EA8 80240968 AFB40028 */ sw $s4, 0x28($sp) -/* B20EAC 8024096C AFB30024 */ sw $s3, 0x24($sp) -/* B20EB0 80240970 AFB20020 */ sw $s2, 0x20($sp) -/* B20EB4 80240974 AFB00018 */ sw $s0, 0x18($sp) -/* B20EB8 80240978 F7B60040 */ sdc1 $f22, 0x40($sp) -/* B20EBC 8024097C F7B40038 */ sdc1 $f20, 0x38($sp) -/* B20EC0 80240980 8E30000C */ lw $s0, 0xc($s1) -/* B20EC4 80240984 8E160000 */ lw $s6, ($s0) -/* B20EC8 80240988 26100004 */ addiu $s0, $s0, 4 -/* B20ECC 8024098C 0C0B1EAF */ jal get_variable -/* B20ED0 80240990 02C0282D */ daddu $a1, $s6, $zero -/* B20ED4 80240994 44820000 */ mtc1 $v0, $f0 -/* B20ED8 80240998 00000000 */ nop -/* B20EDC 8024099C 46800020 */ cvt.s.w $f0, $f0 -/* B20EE0 802409A0 E7A00010 */ swc1 $f0, 0x10($sp) -/* B20EE4 802409A4 8E140000 */ lw $s4, ($s0) -/* B20EE8 802409A8 26100004 */ addiu $s0, $s0, 4 -/* B20EEC 802409AC 0220202D */ daddu $a0, $s1, $zero -/* B20EF0 802409B0 0C0B1EAF */ jal get_variable -/* B20EF4 802409B4 0280282D */ daddu $a1, $s4, $zero -/* B20EF8 802409B8 0220202D */ daddu $a0, $s1, $zero -/* B20EFC 802409BC 8E150000 */ lw $s5, ($s0) -/* B20F00 802409C0 4482B000 */ mtc1 $v0, $f22 -/* B20F04 802409C4 00000000 */ nop -/* B20F08 802409C8 4680B5A0 */ cvt.s.w $f22, $f22 -/* B20F0C 802409CC 0C0B1EAF */ jal get_variable -/* B20F10 802409D0 02A0282D */ daddu $a1, $s5, $zero -/* B20F14 802409D4 2404FFFC */ addiu $a0, $zero, -4 -/* B20F18 802409D8 44820000 */ mtc1 $v0, $f0 -/* B20F1C 802409DC 00000000 */ nop -/* B20F20 802409E0 46800020 */ cvt.s.w $f0, $f0 -/* B20F24 802409E4 0C00EABB */ jal get_npc_unsafe -/* B20F28 802409E8 E7A00014 */ swc1 $f0, 0x14($sp) -/* B20F2C 802409EC 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* B20F30 802409F0 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* B20F34 802409F4 3C014334 */ lui $at, 0x4334 -/* B20F38 802409F8 44816000 */ mtc1 $at, $f12 -/* B20F3C 802409FC 00041880 */ sll $v1, $a0, 2 -/* B20F40 80240A00 00641821 */ addu $v1, $v1, $a0 -/* B20F44 80240A04 00031880 */ sll $v1, $v1, 2 -/* B20F48 80240A08 00641823 */ subu $v1, $v1, $a0 -/* B20F4C 80240A0C 000320C0 */ sll $a0, $v1, 3 -/* B20F50 80240A10 00641821 */ addu $v1, $v1, $a0 -/* B20F54 80240A14 000318C0 */ sll $v1, $v1, 3 -/* B20F58 80240A18 3C01800B */ lui $at, 0x800b -/* B20F5C 80240A1C 00230821 */ addu $at, $at, $v1 -/* B20F60 80240A20 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* B20F64 80240A24 460C0300 */ add.s $f12, $f0, $f12 -/* B20F68 80240A28 0C00A6C9 */ jal clamp_angle -/* B20F6C 80240A2C 0040982D */ daddu $s3, $v0, $zero -/* B20F70 80240A30 27B00010 */ addiu $s0, $sp, 0x10 -/* B20F74 80240A34 0200202D */ daddu $a0, $s0, $zero -/* B20F78 80240A38 27B20014 */ addiu $s2, $sp, 0x14 -/* B20F7C 80240A3C 0240282D */ daddu $a1, $s2, $zero -/* B20F80 80240A40 3C064170 */ lui $a2, 0x4170 -/* B20F84 80240A44 8E67000C */ lw $a3, 0xc($s3) -/* B20F88 80240A48 0C00A7E7 */ jal add_vec2D_polar -/* B20F8C 80240A4C 46000506 */ mov.s $f20, $f0 -/* B20F90 80240A50 0200202D */ daddu $a0, $s0, $zero -/* B20F94 80240A54 3C064120 */ lui $a2, 0x4120 -/* B20F98 80240A58 4407A000 */ mfc1 $a3, $f20 -/* B20F9C 80240A5C 0C00A7E7 */ jal add_vec2D_polar -/* B20FA0 80240A60 0240282D */ daddu $a1, $s2, $zero -/* B20FA4 80240A64 0220202D */ daddu $a0, $s1, $zero -/* B20FA8 80240A68 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B20FAC 80240A6C 4600008D */ trunc.w.s $f2, $f0 -/* B20FB0 80240A70 44061000 */ mfc1 $a2, $f2 -/* B20FB4 80240A74 0C0B2026 */ jal set_variable -/* B20FB8 80240A78 02C0282D */ daddu $a1, $s6, $zero -/* B20FBC 80240A7C 0220202D */ daddu $a0, $s1, $zero -/* B20FC0 80240A80 4600B08D */ trunc.w.s $f2, $f22 -/* B20FC4 80240A84 44061000 */ mfc1 $a2, $f2 -/* B20FC8 80240A88 0C0B2026 */ jal set_variable -/* B20FCC 80240A8C 0280282D */ daddu $a1, $s4, $zero -/* B20FD0 80240A90 0220202D */ daddu $a0, $s1, $zero -/* B20FD4 80240A94 C7A00014 */ lwc1 $f0, 0x14($sp) -/* B20FD8 80240A98 4600008D */ trunc.w.s $f2, $f0 -/* B20FDC 80240A9C 44061000 */ mfc1 $a2, $f2 -/* B20FE0 80240AA0 0C0B2026 */ jal set_variable -/* B20FE4 80240AA4 02A0282D */ daddu $a1, $s5, $zero -/* B20FE8 80240AA8 8FBF0034 */ lw $ra, 0x34($sp) -/* B20FEC 80240AAC 8FB60030 */ lw $s6, 0x30($sp) -/* B20FF0 80240AB0 8FB5002C */ lw $s5, 0x2c($sp) -/* B20FF4 80240AB4 8FB40028 */ lw $s4, 0x28($sp) -/* B20FF8 80240AB8 8FB30024 */ lw $s3, 0x24($sp) -/* B20FFC 80240ABC 8FB20020 */ lw $s2, 0x20($sp) -/* B21000 80240AC0 8FB1001C */ lw $s1, 0x1c($sp) -/* B21004 80240AC4 8FB00018 */ lw $s0, 0x18($sp) -/* B21008 80240AC8 D7B60040 */ ldc1 $f22, 0x40($sp) -/* B2100C 80240ACC D7B40038 */ ldc1 $f20, 0x38($sp) -/* B21010 80240AD0 24020002 */ addiu $v0, $zero, 2 -/* B21014 80240AD4 03E00008 */ jr $ra -/* B21018 80240AD8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242D20_B378F0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242D20_B378F0.s deleted file mode 100644 index db5df6068f..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242D20_B378F0.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D20_B378F0 -/* B378F0 80242D20 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B378F4 80242D24 AFB1001C */ sw $s1, 0x1c($sp) -/* B378F8 80242D28 0080882D */ daddu $s1, $a0, $zero -/* B378FC 80242D2C AFBF0034 */ sw $ra, 0x34($sp) -/* B37900 80242D30 AFB60030 */ sw $s6, 0x30($sp) -/* B37904 80242D34 AFB5002C */ sw $s5, 0x2c($sp) -/* B37908 80242D38 AFB40028 */ sw $s4, 0x28($sp) -/* B3790C 80242D3C AFB30024 */ sw $s3, 0x24($sp) -/* B37910 80242D40 AFB20020 */ sw $s2, 0x20($sp) -/* B37914 80242D44 AFB00018 */ sw $s0, 0x18($sp) -/* B37918 80242D48 F7B60040 */ sdc1 $f22, 0x40($sp) -/* B3791C 80242D4C F7B40038 */ sdc1 $f20, 0x38($sp) -/* B37920 80242D50 8E30000C */ lw $s0, 0xc($s1) -/* B37924 80242D54 8E160000 */ lw $s6, ($s0) -/* B37928 80242D58 26100004 */ addiu $s0, $s0, 4 -/* B3792C 80242D5C 0C0B1EAF */ jal get_variable -/* B37930 80242D60 02C0282D */ daddu $a1, $s6, $zero -/* B37934 80242D64 44820000 */ mtc1 $v0, $f0 -/* B37938 80242D68 00000000 */ nop -/* B3793C 80242D6C 46800020 */ cvt.s.w $f0, $f0 -/* B37940 80242D70 E7A00010 */ swc1 $f0, 0x10($sp) -/* B37944 80242D74 8E140000 */ lw $s4, ($s0) -/* B37948 80242D78 26100004 */ addiu $s0, $s0, 4 -/* B3794C 80242D7C 0220202D */ daddu $a0, $s1, $zero -/* B37950 80242D80 0C0B1EAF */ jal get_variable -/* B37954 80242D84 0280282D */ daddu $a1, $s4, $zero -/* B37958 80242D88 0220202D */ daddu $a0, $s1, $zero -/* B3795C 80242D8C 8E150000 */ lw $s5, ($s0) -/* B37960 80242D90 4482B000 */ mtc1 $v0, $f22 -/* B37964 80242D94 00000000 */ nop -/* B37968 80242D98 4680B5A0 */ cvt.s.w $f22, $f22 -/* B3796C 80242D9C 0C0B1EAF */ jal get_variable -/* B37970 80242DA0 02A0282D */ daddu $a1, $s5, $zero -/* B37974 80242DA4 2404FFFC */ addiu $a0, $zero, -4 -/* B37978 80242DA8 44820000 */ mtc1 $v0, $f0 -/* B3797C 80242DAC 00000000 */ nop -/* B37980 80242DB0 46800020 */ cvt.s.w $f0, $f0 -/* B37984 80242DB4 0C00EABB */ jal get_npc_unsafe -/* B37988 80242DB8 E7A00014 */ swc1 $f0, 0x14($sp) -/* B3798C 80242DBC 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* B37990 80242DC0 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* B37994 80242DC4 3C014334 */ lui $at, 0x4334 -/* B37998 80242DC8 44816000 */ mtc1 $at, $f12 -/* B3799C 80242DCC 00041880 */ sll $v1, $a0, 2 -/* B379A0 80242DD0 00641821 */ addu $v1, $v1, $a0 -/* B379A4 80242DD4 00031880 */ sll $v1, $v1, 2 -/* B379A8 80242DD8 00641823 */ subu $v1, $v1, $a0 -/* B379AC 80242DDC 000320C0 */ sll $a0, $v1, 3 -/* B379B0 80242DE0 00641821 */ addu $v1, $v1, $a0 -/* B379B4 80242DE4 000318C0 */ sll $v1, $v1, 3 -/* B379B8 80242DE8 3C01800B */ lui $at, 0x800b -/* B379BC 80242DEC 00230821 */ addu $at, $at, $v1 -/* B379C0 80242DF0 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* B379C4 80242DF4 460C0300 */ add.s $f12, $f0, $f12 -/* B379C8 80242DF8 0C00A6C9 */ jal clamp_angle -/* B379CC 80242DFC 0040982D */ daddu $s3, $v0, $zero -/* B379D0 80242E00 27B00010 */ addiu $s0, $sp, 0x10 -/* B379D4 80242E04 0200202D */ daddu $a0, $s0, $zero -/* B379D8 80242E08 27B20014 */ addiu $s2, $sp, 0x14 -/* B379DC 80242E0C 0240282D */ daddu $a1, $s2, $zero -/* B379E0 80242E10 3C064170 */ lui $a2, 0x4170 -/* B379E4 80242E14 8E67000C */ lw $a3, 0xc($s3) -/* B379E8 80242E18 0C00A7E7 */ jal add_vec2D_polar -/* B379EC 80242E1C 46000506 */ mov.s $f20, $f0 -/* B379F0 80242E20 0200202D */ daddu $a0, $s0, $zero -/* B379F4 80242E24 3C064120 */ lui $a2, 0x4120 -/* B379F8 80242E28 4407A000 */ mfc1 $a3, $f20 -/* B379FC 80242E2C 0C00A7E7 */ jal add_vec2D_polar -/* B37A00 80242E30 0240282D */ daddu $a1, $s2, $zero -/* B37A04 80242E34 0220202D */ daddu $a0, $s1, $zero -/* B37A08 80242E38 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B37A0C 80242E3C 4600008D */ trunc.w.s $f2, $f0 -/* B37A10 80242E40 44061000 */ mfc1 $a2, $f2 -/* B37A14 80242E44 0C0B2026 */ jal set_variable -/* B37A18 80242E48 02C0282D */ daddu $a1, $s6, $zero -/* B37A1C 80242E4C 0220202D */ daddu $a0, $s1, $zero -/* B37A20 80242E50 4600B08D */ trunc.w.s $f2, $f22 -/* B37A24 80242E54 44061000 */ mfc1 $a2, $f2 -/* B37A28 80242E58 0C0B2026 */ jal set_variable -/* B37A2C 80242E5C 0280282D */ daddu $a1, $s4, $zero -/* B37A30 80242E60 0220202D */ daddu $a0, $s1, $zero -/* B37A34 80242E64 C7A00014 */ lwc1 $f0, 0x14($sp) -/* B37A38 80242E68 4600008D */ trunc.w.s $f2, $f0 -/* B37A3C 80242E6C 44061000 */ mfc1 $a2, $f2 -/* B37A40 80242E70 0C0B2026 */ jal set_variable -/* B37A44 80242E74 02A0282D */ daddu $a1, $s5, $zero -/* B37A48 80242E78 8FBF0034 */ lw $ra, 0x34($sp) -/* B37A4C 80242E7C 8FB60030 */ lw $s6, 0x30($sp) -/* B37A50 80242E80 8FB5002C */ lw $s5, 0x2c($sp) -/* B37A54 80242E84 8FB40028 */ lw $s4, 0x28($sp) -/* B37A58 80242E88 8FB30024 */ lw $s3, 0x24($sp) -/* B37A5C 80242E8C 8FB20020 */ lw $s2, 0x20($sp) -/* B37A60 80242E90 8FB1001C */ lw $s1, 0x1c($sp) -/* B37A64 80242E94 8FB00018 */ lw $s0, 0x18($sp) -/* B37A68 80242E98 D7B60040 */ ldc1 $f22, 0x40($sp) -/* B37A6C 80242E9C D7B40038 */ ldc1 $f20, 0x38($sp) -/* B37A70 80242EA0 24020002 */ addiu $v0, $zero, 2 -/* B37A74 80242EA4 03E00008 */ jr $ra -/* B37A78 80242EA8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242514_8B2584.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242514_8B2584.s deleted file mode 100644 index d65b0dcdfd..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242514_8B2584.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242514_8B2584 -/* 8B2584 80242514 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8B2588 80242518 AFB1001C */ sw $s1, 0x1c($sp) -/* 8B258C 8024251C 0080882D */ daddu $s1, $a0, $zero -/* 8B2590 80242520 AFBF0034 */ sw $ra, 0x34($sp) -/* 8B2594 80242524 AFB60030 */ sw $s6, 0x30($sp) -/* 8B2598 80242528 AFB5002C */ sw $s5, 0x2c($sp) -/* 8B259C 8024252C AFB40028 */ sw $s4, 0x28($sp) -/* 8B25A0 80242530 AFB30024 */ sw $s3, 0x24($sp) -/* 8B25A4 80242534 AFB20020 */ sw $s2, 0x20($sp) -/* 8B25A8 80242538 AFB00018 */ sw $s0, 0x18($sp) -/* 8B25AC 8024253C F7B60040 */ sdc1 $f22, 0x40($sp) -/* 8B25B0 80242540 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 8B25B4 80242544 8E30000C */ lw $s0, 0xc($s1) -/* 8B25B8 80242548 8E160000 */ lw $s6, ($s0) -/* 8B25BC 8024254C 26100004 */ addiu $s0, $s0, 4 -/* 8B25C0 80242550 0C0B1EAF */ jal get_variable -/* 8B25C4 80242554 02C0282D */ daddu $a1, $s6, $zero -/* 8B25C8 80242558 44820000 */ mtc1 $v0, $f0 -/* 8B25CC 8024255C 00000000 */ nop -/* 8B25D0 80242560 46800020 */ cvt.s.w $f0, $f0 -/* 8B25D4 80242564 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8B25D8 80242568 8E140000 */ lw $s4, ($s0) -/* 8B25DC 8024256C 26100004 */ addiu $s0, $s0, 4 -/* 8B25E0 80242570 0220202D */ daddu $a0, $s1, $zero -/* 8B25E4 80242574 0C0B1EAF */ jal get_variable -/* 8B25E8 80242578 0280282D */ daddu $a1, $s4, $zero -/* 8B25EC 8024257C 0220202D */ daddu $a0, $s1, $zero -/* 8B25F0 80242580 8E150000 */ lw $s5, ($s0) -/* 8B25F4 80242584 4482B000 */ mtc1 $v0, $f22 -/* 8B25F8 80242588 00000000 */ nop -/* 8B25FC 8024258C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8B2600 80242590 0C0B1EAF */ jal get_variable -/* 8B2604 80242594 02A0282D */ daddu $a1, $s5, $zero -/* 8B2608 80242598 2404FFFC */ addiu $a0, $zero, -4 -/* 8B260C 8024259C 44820000 */ mtc1 $v0, $f0 -/* 8B2610 802425A0 00000000 */ nop -/* 8B2614 802425A4 46800020 */ cvt.s.w $f0, $f0 -/* 8B2618 802425A8 0C00EABB */ jal get_npc_unsafe -/* 8B261C 802425AC E7A00014 */ swc1 $f0, 0x14($sp) -/* 8B2620 802425B0 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 8B2624 802425B4 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 8B2628 802425B8 3C014334 */ lui $at, 0x4334 -/* 8B262C 802425BC 44816000 */ mtc1 $at, $f12 -/* 8B2630 802425C0 00041880 */ sll $v1, $a0, 2 -/* 8B2634 802425C4 00641821 */ addu $v1, $v1, $a0 -/* 8B2638 802425C8 00031880 */ sll $v1, $v1, 2 -/* 8B263C 802425CC 00641823 */ subu $v1, $v1, $a0 -/* 8B2640 802425D0 000320C0 */ sll $a0, $v1, 3 -/* 8B2644 802425D4 00641821 */ addu $v1, $v1, $a0 -/* 8B2648 802425D8 000318C0 */ sll $v1, $v1, 3 -/* 8B264C 802425DC 3C01800B */ lui $at, 0x800b -/* 8B2650 802425E0 00230821 */ addu $at, $at, $v1 -/* 8B2654 802425E4 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8B2658 802425E8 460C0300 */ add.s $f12, $f0, $f12 -/* 8B265C 802425EC 0C00A6C9 */ jal clamp_angle -/* 8B2660 802425F0 0040982D */ daddu $s3, $v0, $zero -/* 8B2664 802425F4 27B00010 */ addiu $s0, $sp, 0x10 -/* 8B2668 802425F8 0200202D */ daddu $a0, $s0, $zero -/* 8B266C 802425FC 27B20014 */ addiu $s2, $sp, 0x14 -/* 8B2670 80242600 0240282D */ daddu $a1, $s2, $zero -/* 8B2674 80242604 3C064170 */ lui $a2, 0x4170 -/* 8B2678 80242608 8E67000C */ lw $a3, 0xc($s3) -/* 8B267C 8024260C 0C00A7E7 */ jal add_vec2D_polar -/* 8B2680 80242610 46000506 */ mov.s $f20, $f0 -/* 8B2684 80242614 0200202D */ daddu $a0, $s0, $zero -/* 8B2688 80242618 3C064120 */ lui $a2, 0x4120 -/* 8B268C 8024261C 4407A000 */ mfc1 $a3, $f20 -/* 8B2690 80242620 0C00A7E7 */ jal add_vec2D_polar -/* 8B2694 80242624 0240282D */ daddu $a1, $s2, $zero -/* 8B2698 80242628 0220202D */ daddu $a0, $s1, $zero -/* 8B269C 8024262C C7A00010 */ lwc1 $f0, 0x10($sp) -/* 8B26A0 80242630 4600008D */ trunc.w.s $f2, $f0 -/* 8B26A4 80242634 44061000 */ mfc1 $a2, $f2 -/* 8B26A8 80242638 0C0B2026 */ jal set_variable -/* 8B26AC 8024263C 02C0282D */ daddu $a1, $s6, $zero -/* 8B26B0 80242640 0220202D */ daddu $a0, $s1, $zero -/* 8B26B4 80242644 4600B08D */ trunc.w.s $f2, $f22 -/* 8B26B8 80242648 44061000 */ mfc1 $a2, $f2 -/* 8B26BC 8024264C 0C0B2026 */ jal set_variable -/* 8B26C0 80242650 0280282D */ daddu $a1, $s4, $zero -/* 8B26C4 80242654 0220202D */ daddu $a0, $s1, $zero -/* 8B26C8 80242658 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 8B26CC 8024265C 4600008D */ trunc.w.s $f2, $f0 -/* 8B26D0 80242660 44061000 */ mfc1 $a2, $f2 -/* 8B26D4 80242664 0C0B2026 */ jal set_variable -/* 8B26D8 80242668 02A0282D */ daddu $a1, $s5, $zero -/* 8B26DC 8024266C 8FBF0034 */ lw $ra, 0x34($sp) -/* 8B26E0 80242670 8FB60030 */ lw $s6, 0x30($sp) -/* 8B26E4 80242674 8FB5002C */ lw $s5, 0x2c($sp) -/* 8B26E8 80242678 8FB40028 */ lw $s4, 0x28($sp) -/* 8B26EC 8024267C 8FB30024 */ lw $s3, 0x24($sp) -/* 8B26F0 80242680 8FB20020 */ lw $s2, 0x20($sp) -/* 8B26F4 80242684 8FB1001C */ lw $s1, 0x1c($sp) -/* 8B26F8 80242688 8FB00018 */ lw $s0, 0x18($sp) -/* 8B26FC 8024268C D7B60040 */ ldc1 $f22, 0x40($sp) -/* 8B2700 80242690 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 8B2704 80242694 24020002 */ addiu $v0, $zero, 2 -/* 8B2708 80242698 03E00008 */ jr $ra -/* 8B270C 8024269C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242528_C5CC68.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242528_C5CC68.s deleted file mode 100644 index 87c53dfa98..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242528_C5CC68.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242528_C5CC68 -/* C5CC68 80242528 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C5CC6C 8024252C AFB1001C */ sw $s1, 0x1c($sp) -/* C5CC70 80242530 0080882D */ daddu $s1, $a0, $zero -/* C5CC74 80242534 AFBF0034 */ sw $ra, 0x34($sp) -/* C5CC78 80242538 AFB60030 */ sw $s6, 0x30($sp) -/* C5CC7C 8024253C AFB5002C */ sw $s5, 0x2c($sp) -/* C5CC80 80242540 AFB40028 */ sw $s4, 0x28($sp) -/* C5CC84 80242544 AFB30024 */ sw $s3, 0x24($sp) -/* C5CC88 80242548 AFB20020 */ sw $s2, 0x20($sp) -/* C5CC8C 8024254C AFB00018 */ sw $s0, 0x18($sp) -/* C5CC90 80242550 F7B60040 */ sdc1 $f22, 0x40($sp) -/* C5CC94 80242554 F7B40038 */ sdc1 $f20, 0x38($sp) -/* C5CC98 80242558 8E30000C */ lw $s0, 0xc($s1) -/* C5CC9C 8024255C 8E160000 */ lw $s6, ($s0) -/* C5CCA0 80242560 26100004 */ addiu $s0, $s0, 4 -/* C5CCA4 80242564 0C0B1EAF */ jal get_variable -/* C5CCA8 80242568 02C0282D */ daddu $a1, $s6, $zero -/* C5CCAC 8024256C 44820000 */ mtc1 $v0, $f0 -/* C5CCB0 80242570 00000000 */ nop -/* C5CCB4 80242574 46800020 */ cvt.s.w $f0, $f0 -/* C5CCB8 80242578 E7A00010 */ swc1 $f0, 0x10($sp) -/* C5CCBC 8024257C 8E140000 */ lw $s4, ($s0) -/* C5CCC0 80242580 26100004 */ addiu $s0, $s0, 4 -/* C5CCC4 80242584 0220202D */ daddu $a0, $s1, $zero -/* C5CCC8 80242588 0C0B1EAF */ jal get_variable -/* C5CCCC 8024258C 0280282D */ daddu $a1, $s4, $zero -/* C5CCD0 80242590 0220202D */ daddu $a0, $s1, $zero -/* C5CCD4 80242594 8E150000 */ lw $s5, ($s0) -/* C5CCD8 80242598 4482B000 */ mtc1 $v0, $f22 -/* C5CCDC 8024259C 00000000 */ nop -/* C5CCE0 802425A0 4680B5A0 */ cvt.s.w $f22, $f22 -/* C5CCE4 802425A4 0C0B1EAF */ jal get_variable -/* C5CCE8 802425A8 02A0282D */ daddu $a1, $s5, $zero -/* C5CCEC 802425AC 2404FFFC */ addiu $a0, $zero, -4 -/* C5CCF0 802425B0 44820000 */ mtc1 $v0, $f0 -/* C5CCF4 802425B4 00000000 */ nop -/* C5CCF8 802425B8 46800020 */ cvt.s.w $f0, $f0 -/* C5CCFC 802425BC 0C00EABB */ jal get_npc_unsafe -/* C5CD00 802425C0 E7A00014 */ swc1 $f0, 0x14($sp) -/* C5CD04 802425C4 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* C5CD08 802425C8 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* C5CD0C 802425CC 3C014334 */ lui $at, 0x4334 -/* C5CD10 802425D0 44816000 */ mtc1 $at, $f12 -/* C5CD14 802425D4 00041880 */ sll $v1, $a0, 2 -/* C5CD18 802425D8 00641821 */ addu $v1, $v1, $a0 -/* C5CD1C 802425DC 00031880 */ sll $v1, $v1, 2 -/* C5CD20 802425E0 00641823 */ subu $v1, $v1, $a0 -/* C5CD24 802425E4 000320C0 */ sll $a0, $v1, 3 -/* C5CD28 802425E8 00641821 */ addu $v1, $v1, $a0 -/* C5CD2C 802425EC 000318C0 */ sll $v1, $v1, 3 -/* C5CD30 802425F0 3C01800B */ lui $at, 0x800b -/* C5CD34 802425F4 00230821 */ addu $at, $at, $v1 -/* C5CD38 802425F8 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C5CD3C 802425FC 460C0300 */ add.s $f12, $f0, $f12 -/* C5CD40 80242600 0C00A6C9 */ jal clamp_angle -/* C5CD44 80242604 0040982D */ daddu $s3, $v0, $zero -/* C5CD48 80242608 27B00010 */ addiu $s0, $sp, 0x10 -/* C5CD4C 8024260C 0200202D */ daddu $a0, $s0, $zero -/* C5CD50 80242610 27B20014 */ addiu $s2, $sp, 0x14 -/* C5CD54 80242614 0240282D */ daddu $a1, $s2, $zero -/* C5CD58 80242618 3C064170 */ lui $a2, 0x4170 -/* C5CD5C 8024261C 8E67000C */ lw $a3, 0xc($s3) -/* C5CD60 80242620 0C00A7E7 */ jal add_vec2D_polar -/* C5CD64 80242624 46000506 */ mov.s $f20, $f0 -/* C5CD68 80242628 0200202D */ daddu $a0, $s0, $zero -/* C5CD6C 8024262C 3C064120 */ lui $a2, 0x4120 -/* C5CD70 80242630 4407A000 */ mfc1 $a3, $f20 -/* C5CD74 80242634 0C00A7E7 */ jal add_vec2D_polar -/* C5CD78 80242638 0240282D */ daddu $a1, $s2, $zero -/* C5CD7C 8024263C 0220202D */ daddu $a0, $s1, $zero -/* C5CD80 80242640 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C5CD84 80242644 4600008D */ trunc.w.s $f2, $f0 -/* C5CD88 80242648 44061000 */ mfc1 $a2, $f2 -/* C5CD8C 8024264C 0C0B2026 */ jal set_variable -/* C5CD90 80242650 02C0282D */ daddu $a1, $s6, $zero -/* C5CD94 80242654 0220202D */ daddu $a0, $s1, $zero -/* C5CD98 80242658 4600B08D */ trunc.w.s $f2, $f22 -/* C5CD9C 8024265C 44061000 */ mfc1 $a2, $f2 -/* C5CDA0 80242660 0C0B2026 */ jal set_variable -/* C5CDA4 80242664 0280282D */ daddu $a1, $s4, $zero -/* C5CDA8 80242668 0220202D */ daddu $a0, $s1, $zero -/* C5CDAC 8024266C C7A00014 */ lwc1 $f0, 0x14($sp) -/* C5CDB0 80242670 4600008D */ trunc.w.s $f2, $f0 -/* C5CDB4 80242674 44061000 */ mfc1 $a2, $f2 -/* C5CDB8 80242678 0C0B2026 */ jal set_variable -/* C5CDBC 8024267C 02A0282D */ daddu $a1, $s5, $zero -/* C5CDC0 80242680 8FBF0034 */ lw $ra, 0x34($sp) -/* C5CDC4 80242684 8FB60030 */ lw $s6, 0x30($sp) -/* C5CDC8 80242688 8FB5002C */ lw $s5, 0x2c($sp) -/* C5CDCC 8024268C 8FB40028 */ lw $s4, 0x28($sp) -/* C5CDD0 80242690 8FB30024 */ lw $s3, 0x24($sp) -/* C5CDD4 80242694 8FB20020 */ lw $s2, 0x20($sp) -/* C5CDD8 80242698 8FB1001C */ lw $s1, 0x1c($sp) -/* C5CDDC 8024269C 8FB00018 */ lw $s0, 0x18($sp) -/* C5CDE0 802426A0 D7B60040 */ ldc1 $f22, 0x40($sp) -/* C5CDE4 802426A4 D7B40038 */ ldc1 $f20, 0x38($sp) -/* C5CDE8 802426A8 24020002 */ addiu $v0, $zero, 2 -/* C5CDEC 802426AC 03E00008 */ jr $ra -/* C5CDF0 802426B0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242AF8_C63808.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242AF8_C63808.s deleted file mode 100644 index 6a24ca7607..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242AF8_C63808.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AF8_C63808 -/* C63808 80242AF8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C6380C 80242AFC AFB1001C */ sw $s1, 0x1c($sp) -/* C63810 80242B00 0080882D */ daddu $s1, $a0, $zero -/* C63814 80242B04 AFBF0034 */ sw $ra, 0x34($sp) -/* C63818 80242B08 AFB60030 */ sw $s6, 0x30($sp) -/* C6381C 80242B0C AFB5002C */ sw $s5, 0x2c($sp) -/* C63820 80242B10 AFB40028 */ sw $s4, 0x28($sp) -/* C63824 80242B14 AFB30024 */ sw $s3, 0x24($sp) -/* C63828 80242B18 AFB20020 */ sw $s2, 0x20($sp) -/* C6382C 80242B1C AFB00018 */ sw $s0, 0x18($sp) -/* C63830 80242B20 F7B60040 */ sdc1 $f22, 0x40($sp) -/* C63834 80242B24 F7B40038 */ sdc1 $f20, 0x38($sp) -/* C63838 80242B28 8E30000C */ lw $s0, 0xc($s1) -/* C6383C 80242B2C 8E160000 */ lw $s6, ($s0) -/* C63840 80242B30 26100004 */ addiu $s0, $s0, 4 -/* C63844 80242B34 0C0B1EAF */ jal get_variable -/* C63848 80242B38 02C0282D */ daddu $a1, $s6, $zero -/* C6384C 80242B3C 44820000 */ mtc1 $v0, $f0 -/* C63850 80242B40 00000000 */ nop -/* C63854 80242B44 46800020 */ cvt.s.w $f0, $f0 -/* C63858 80242B48 E7A00010 */ swc1 $f0, 0x10($sp) -/* C6385C 80242B4C 8E140000 */ lw $s4, ($s0) -/* C63860 80242B50 26100004 */ addiu $s0, $s0, 4 -/* C63864 80242B54 0220202D */ daddu $a0, $s1, $zero -/* C63868 80242B58 0C0B1EAF */ jal get_variable -/* C6386C 80242B5C 0280282D */ daddu $a1, $s4, $zero -/* C63870 80242B60 0220202D */ daddu $a0, $s1, $zero -/* C63874 80242B64 8E150000 */ lw $s5, ($s0) -/* C63878 80242B68 4482B000 */ mtc1 $v0, $f22 -/* C6387C 80242B6C 00000000 */ nop -/* C63880 80242B70 4680B5A0 */ cvt.s.w $f22, $f22 -/* C63884 80242B74 0C0B1EAF */ jal get_variable -/* C63888 80242B78 02A0282D */ daddu $a1, $s5, $zero -/* C6388C 80242B7C 2404FFFC */ addiu $a0, $zero, -4 -/* C63890 80242B80 44820000 */ mtc1 $v0, $f0 -/* C63894 80242B84 00000000 */ nop -/* C63898 80242B88 46800020 */ cvt.s.w $f0, $f0 -/* C6389C 80242B8C 0C00EABB */ jal get_npc_unsafe -/* C638A0 80242B90 E7A00014 */ swc1 $f0, 0x14($sp) -/* C638A4 80242B94 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* C638A8 80242B98 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* C638AC 80242B9C 3C014334 */ lui $at, 0x4334 -/* C638B0 80242BA0 44816000 */ mtc1 $at, $f12 -/* C638B4 80242BA4 00041880 */ sll $v1, $a0, 2 -/* C638B8 80242BA8 00641821 */ addu $v1, $v1, $a0 -/* C638BC 80242BAC 00031880 */ sll $v1, $v1, 2 -/* C638C0 80242BB0 00641823 */ subu $v1, $v1, $a0 -/* C638C4 80242BB4 000320C0 */ sll $a0, $v1, 3 -/* C638C8 80242BB8 00641821 */ addu $v1, $v1, $a0 -/* C638CC 80242BBC 000318C0 */ sll $v1, $v1, 3 -/* C638D0 80242BC0 3C01800B */ lui $at, 0x800b -/* C638D4 80242BC4 00230821 */ addu $at, $at, $v1 -/* C638D8 80242BC8 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C638DC 80242BCC 460C0300 */ add.s $f12, $f0, $f12 -/* C638E0 80242BD0 0C00A6C9 */ jal clamp_angle -/* C638E4 80242BD4 0040982D */ daddu $s3, $v0, $zero -/* C638E8 80242BD8 27B00010 */ addiu $s0, $sp, 0x10 -/* C638EC 80242BDC 0200202D */ daddu $a0, $s0, $zero -/* C638F0 80242BE0 27B20014 */ addiu $s2, $sp, 0x14 -/* C638F4 80242BE4 0240282D */ daddu $a1, $s2, $zero -/* C638F8 80242BE8 3C064170 */ lui $a2, 0x4170 -/* C638FC 80242BEC 8E67000C */ lw $a3, 0xc($s3) -/* C63900 80242BF0 0C00A7E7 */ jal add_vec2D_polar -/* C63904 80242BF4 46000506 */ mov.s $f20, $f0 -/* C63908 80242BF8 0200202D */ daddu $a0, $s0, $zero -/* C6390C 80242BFC 3C064120 */ lui $a2, 0x4120 -/* C63910 80242C00 4407A000 */ mfc1 $a3, $f20 -/* C63914 80242C04 0C00A7E7 */ jal add_vec2D_polar -/* C63918 80242C08 0240282D */ daddu $a1, $s2, $zero -/* C6391C 80242C0C 0220202D */ daddu $a0, $s1, $zero -/* C63920 80242C10 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C63924 80242C14 4600008D */ trunc.w.s $f2, $f0 -/* C63928 80242C18 44061000 */ mfc1 $a2, $f2 -/* C6392C 80242C1C 0C0B2026 */ jal set_variable -/* C63930 80242C20 02C0282D */ daddu $a1, $s6, $zero -/* C63934 80242C24 0220202D */ daddu $a0, $s1, $zero -/* C63938 80242C28 4600B08D */ trunc.w.s $f2, $f22 -/* C6393C 80242C2C 44061000 */ mfc1 $a2, $f2 -/* C63940 80242C30 0C0B2026 */ jal set_variable -/* C63944 80242C34 0280282D */ daddu $a1, $s4, $zero -/* C63948 80242C38 0220202D */ daddu $a0, $s1, $zero -/* C6394C 80242C3C C7A00014 */ lwc1 $f0, 0x14($sp) -/* C63950 80242C40 4600008D */ trunc.w.s $f2, $f0 -/* C63954 80242C44 44061000 */ mfc1 $a2, $f2 -/* C63958 80242C48 0C0B2026 */ jal set_variable -/* C6395C 80242C4C 02A0282D */ daddu $a1, $s5, $zero -/* C63960 80242C50 8FBF0034 */ lw $ra, 0x34($sp) -/* C63964 80242C54 8FB60030 */ lw $s6, 0x30($sp) -/* C63968 80242C58 8FB5002C */ lw $s5, 0x2c($sp) -/* C6396C 80242C5C 8FB40028 */ lw $s4, 0x28($sp) -/* C63970 80242C60 8FB30024 */ lw $s3, 0x24($sp) -/* C63974 80242C64 8FB20020 */ lw $s2, 0x20($sp) -/* C63978 80242C68 8FB1001C */ lw $s1, 0x1c($sp) -/* C6397C 80242C6C 8FB00018 */ lw $s0, 0x18($sp) -/* C63980 80242C70 D7B60040 */ ldc1 $f22, 0x40($sp) -/* C63984 80242C74 D7B40038 */ ldc1 $f20, 0x38($sp) -/* C63988 80242C78 24020002 */ addiu $v0, $zero, 2 -/* C6398C 80242C7C 03E00008 */ jr $ra -/* C63990 80242C80 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243808_C7A4E8.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243808_C7A4E8.s deleted file mode 100644 index 077b45bf21..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243808_C7A4E8.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243808_C7A4E8 -/* C7A4E8 80243808 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C7A4EC 8024380C AFB1001C */ sw $s1, 0x1c($sp) -/* C7A4F0 80243810 0080882D */ daddu $s1, $a0, $zero -/* C7A4F4 80243814 AFBF0034 */ sw $ra, 0x34($sp) -/* C7A4F8 80243818 AFB60030 */ sw $s6, 0x30($sp) -/* C7A4FC 8024381C AFB5002C */ sw $s5, 0x2c($sp) -/* C7A500 80243820 AFB40028 */ sw $s4, 0x28($sp) -/* C7A504 80243824 AFB30024 */ sw $s3, 0x24($sp) -/* C7A508 80243828 AFB20020 */ sw $s2, 0x20($sp) -/* C7A50C 8024382C AFB00018 */ sw $s0, 0x18($sp) -/* C7A510 80243830 F7B60040 */ sdc1 $f22, 0x40($sp) -/* C7A514 80243834 F7B40038 */ sdc1 $f20, 0x38($sp) -/* C7A518 80243838 8E30000C */ lw $s0, 0xc($s1) -/* C7A51C 8024383C 8E160000 */ lw $s6, ($s0) -/* C7A520 80243840 26100004 */ addiu $s0, $s0, 4 -/* C7A524 80243844 0C0B1EAF */ jal get_variable -/* C7A528 80243848 02C0282D */ daddu $a1, $s6, $zero -/* C7A52C 8024384C 44820000 */ mtc1 $v0, $f0 -/* C7A530 80243850 00000000 */ nop -/* C7A534 80243854 46800020 */ cvt.s.w $f0, $f0 -/* C7A538 80243858 E7A00010 */ swc1 $f0, 0x10($sp) -/* C7A53C 8024385C 8E140000 */ lw $s4, ($s0) -/* C7A540 80243860 26100004 */ addiu $s0, $s0, 4 -/* C7A544 80243864 0220202D */ daddu $a0, $s1, $zero -/* C7A548 80243868 0C0B1EAF */ jal get_variable -/* C7A54C 8024386C 0280282D */ daddu $a1, $s4, $zero -/* C7A550 80243870 0220202D */ daddu $a0, $s1, $zero -/* C7A554 80243874 8E150000 */ lw $s5, ($s0) -/* C7A558 80243878 4482B000 */ mtc1 $v0, $f22 -/* C7A55C 8024387C 00000000 */ nop -/* C7A560 80243880 4680B5A0 */ cvt.s.w $f22, $f22 -/* C7A564 80243884 0C0B1EAF */ jal get_variable -/* C7A568 80243888 02A0282D */ daddu $a1, $s5, $zero -/* C7A56C 8024388C 2404FFFC */ addiu $a0, $zero, -4 -/* C7A570 80243890 44820000 */ mtc1 $v0, $f0 -/* C7A574 80243894 00000000 */ nop -/* C7A578 80243898 46800020 */ cvt.s.w $f0, $f0 -/* C7A57C 8024389C 0C00EABB */ jal get_npc_unsafe -/* C7A580 802438A0 E7A00014 */ swc1 $f0, 0x14($sp) -/* C7A584 802438A4 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* C7A588 802438A8 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* C7A58C 802438AC 3C014334 */ lui $at, 0x4334 -/* C7A590 802438B0 44816000 */ mtc1 $at, $f12 -/* C7A594 802438B4 00041880 */ sll $v1, $a0, 2 -/* C7A598 802438B8 00641821 */ addu $v1, $v1, $a0 -/* C7A59C 802438BC 00031880 */ sll $v1, $v1, 2 -/* C7A5A0 802438C0 00641823 */ subu $v1, $v1, $a0 -/* C7A5A4 802438C4 000320C0 */ sll $a0, $v1, 3 -/* C7A5A8 802438C8 00641821 */ addu $v1, $v1, $a0 -/* C7A5AC 802438CC 000318C0 */ sll $v1, $v1, 3 -/* C7A5B0 802438D0 3C01800B */ lui $at, 0x800b -/* C7A5B4 802438D4 00230821 */ addu $at, $at, $v1 -/* C7A5B8 802438D8 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C7A5BC 802438DC 460C0300 */ add.s $f12, $f0, $f12 -/* C7A5C0 802438E0 0C00A6C9 */ jal clamp_angle -/* C7A5C4 802438E4 0040982D */ daddu $s3, $v0, $zero -/* C7A5C8 802438E8 27B00010 */ addiu $s0, $sp, 0x10 -/* C7A5CC 802438EC 0200202D */ daddu $a0, $s0, $zero -/* C7A5D0 802438F0 27B20014 */ addiu $s2, $sp, 0x14 -/* C7A5D4 802438F4 0240282D */ daddu $a1, $s2, $zero -/* C7A5D8 802438F8 3C064170 */ lui $a2, 0x4170 -/* C7A5DC 802438FC 8E67000C */ lw $a3, 0xc($s3) -/* C7A5E0 80243900 0C00A7E7 */ jal add_vec2D_polar -/* C7A5E4 80243904 46000506 */ mov.s $f20, $f0 -/* C7A5E8 80243908 0200202D */ daddu $a0, $s0, $zero -/* C7A5EC 8024390C 3C064120 */ lui $a2, 0x4120 -/* C7A5F0 80243910 4407A000 */ mfc1 $a3, $f20 -/* C7A5F4 80243914 0C00A7E7 */ jal add_vec2D_polar -/* C7A5F8 80243918 0240282D */ daddu $a1, $s2, $zero -/* C7A5FC 8024391C 0220202D */ daddu $a0, $s1, $zero -/* C7A600 80243920 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C7A604 80243924 4600008D */ trunc.w.s $f2, $f0 -/* C7A608 80243928 44061000 */ mfc1 $a2, $f2 -/* C7A60C 8024392C 0C0B2026 */ jal set_variable -/* C7A610 80243930 02C0282D */ daddu $a1, $s6, $zero -/* C7A614 80243934 0220202D */ daddu $a0, $s1, $zero -/* C7A618 80243938 4600B08D */ trunc.w.s $f2, $f22 -/* C7A61C 8024393C 44061000 */ mfc1 $a2, $f2 -/* C7A620 80243940 0C0B2026 */ jal set_variable -/* C7A624 80243944 0280282D */ daddu $a1, $s4, $zero -/* C7A628 80243948 0220202D */ daddu $a0, $s1, $zero -/* C7A62C 8024394C C7A00014 */ lwc1 $f0, 0x14($sp) -/* C7A630 80243950 4600008D */ trunc.w.s $f2, $f0 -/* C7A634 80243954 44061000 */ mfc1 $a2, $f2 -/* C7A638 80243958 0C0B2026 */ jal set_variable -/* C7A63C 8024395C 02A0282D */ daddu $a1, $s5, $zero -/* C7A640 80243960 8FBF0034 */ lw $ra, 0x34($sp) -/* C7A644 80243964 8FB60030 */ lw $s6, 0x30($sp) -/* C7A648 80243968 8FB5002C */ lw $s5, 0x2c($sp) -/* C7A64C 8024396C 8FB40028 */ lw $s4, 0x28($sp) -/* C7A650 80243970 8FB30024 */ lw $s3, 0x24($sp) -/* C7A654 80243974 8FB20020 */ lw $s2, 0x20($sp) -/* C7A658 80243978 8FB1001C */ lw $s1, 0x1c($sp) -/* C7A65C 8024397C 8FB00018 */ lw $s0, 0x18($sp) -/* C7A660 80243980 D7B60040 */ ldc1 $f22, 0x40($sp) -/* C7A664 80243984 D7B40038 */ ldc1 $f20, 0x38($sp) -/* C7A668 80243988 24020002 */ addiu $v0, $zero, 2 -/* C7A66C 8024398C 03E00008 */ jr $ra -/* C7A670 80243990 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242AF8_C885A8.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242AF8_C885A8.s deleted file mode 100644 index 580fc25257..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242AF8_C885A8.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AF8_C885A8 -/* C885A8 80242AF8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C885AC 80242AFC AFB1001C */ sw $s1, 0x1c($sp) -/* C885B0 80242B00 0080882D */ daddu $s1, $a0, $zero -/* C885B4 80242B04 AFBF0034 */ sw $ra, 0x34($sp) -/* C885B8 80242B08 AFB60030 */ sw $s6, 0x30($sp) -/* C885BC 80242B0C AFB5002C */ sw $s5, 0x2c($sp) -/* C885C0 80242B10 AFB40028 */ sw $s4, 0x28($sp) -/* C885C4 80242B14 AFB30024 */ sw $s3, 0x24($sp) -/* C885C8 80242B18 AFB20020 */ sw $s2, 0x20($sp) -/* C885CC 80242B1C AFB00018 */ sw $s0, 0x18($sp) -/* C885D0 80242B20 F7B60040 */ sdc1 $f22, 0x40($sp) -/* C885D4 80242B24 F7B40038 */ sdc1 $f20, 0x38($sp) -/* C885D8 80242B28 8E30000C */ lw $s0, 0xc($s1) -/* C885DC 80242B2C 8E160000 */ lw $s6, ($s0) -/* C885E0 80242B30 26100004 */ addiu $s0, $s0, 4 -/* C885E4 80242B34 0C0B1EAF */ jal get_variable -/* C885E8 80242B38 02C0282D */ daddu $a1, $s6, $zero -/* C885EC 80242B3C 44820000 */ mtc1 $v0, $f0 -/* C885F0 80242B40 00000000 */ nop -/* C885F4 80242B44 46800020 */ cvt.s.w $f0, $f0 -/* C885F8 80242B48 E7A00010 */ swc1 $f0, 0x10($sp) -/* C885FC 80242B4C 8E140000 */ lw $s4, ($s0) -/* C88600 80242B50 26100004 */ addiu $s0, $s0, 4 -/* C88604 80242B54 0220202D */ daddu $a0, $s1, $zero -/* C88608 80242B58 0C0B1EAF */ jal get_variable -/* C8860C 80242B5C 0280282D */ daddu $a1, $s4, $zero -/* C88610 80242B60 0220202D */ daddu $a0, $s1, $zero -/* C88614 80242B64 8E150000 */ lw $s5, ($s0) -/* C88618 80242B68 4482B000 */ mtc1 $v0, $f22 -/* C8861C 80242B6C 00000000 */ nop -/* C88620 80242B70 4680B5A0 */ cvt.s.w $f22, $f22 -/* C88624 80242B74 0C0B1EAF */ jal get_variable -/* C88628 80242B78 02A0282D */ daddu $a1, $s5, $zero -/* C8862C 80242B7C 2404FFFC */ addiu $a0, $zero, -4 -/* C88630 80242B80 44820000 */ mtc1 $v0, $f0 -/* C88634 80242B84 00000000 */ nop -/* C88638 80242B88 46800020 */ cvt.s.w $f0, $f0 -/* C8863C 80242B8C 0C00EABB */ jal get_npc_unsafe -/* C88640 80242B90 E7A00014 */ swc1 $f0, 0x14($sp) -/* C88644 80242B94 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* C88648 80242B98 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* C8864C 80242B9C 3C014334 */ lui $at, 0x4334 -/* C88650 80242BA0 44816000 */ mtc1 $at, $f12 -/* C88654 80242BA4 00041880 */ sll $v1, $a0, 2 -/* C88658 80242BA8 00641821 */ addu $v1, $v1, $a0 -/* C8865C 80242BAC 00031880 */ sll $v1, $v1, 2 -/* C88660 80242BB0 00641823 */ subu $v1, $v1, $a0 -/* C88664 80242BB4 000320C0 */ sll $a0, $v1, 3 -/* C88668 80242BB8 00641821 */ addu $v1, $v1, $a0 -/* C8866C 80242BBC 000318C0 */ sll $v1, $v1, 3 -/* C88670 80242BC0 3C01800B */ lui $at, 0x800b -/* C88674 80242BC4 00230821 */ addu $at, $at, $v1 -/* C88678 80242BC8 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C8867C 80242BCC 460C0300 */ add.s $f12, $f0, $f12 -/* C88680 80242BD0 0C00A6C9 */ jal clamp_angle -/* C88684 80242BD4 0040982D */ daddu $s3, $v0, $zero -/* C88688 80242BD8 27B00010 */ addiu $s0, $sp, 0x10 -/* C8868C 80242BDC 0200202D */ daddu $a0, $s0, $zero -/* C88690 80242BE0 27B20014 */ addiu $s2, $sp, 0x14 -/* C88694 80242BE4 0240282D */ daddu $a1, $s2, $zero -/* C88698 80242BE8 3C064170 */ lui $a2, 0x4170 -/* C8869C 80242BEC 8E67000C */ lw $a3, 0xc($s3) -/* C886A0 80242BF0 0C00A7E7 */ jal add_vec2D_polar -/* C886A4 80242BF4 46000506 */ mov.s $f20, $f0 -/* C886A8 80242BF8 0200202D */ daddu $a0, $s0, $zero -/* C886AC 80242BFC 3C064120 */ lui $a2, 0x4120 -/* C886B0 80242C00 4407A000 */ mfc1 $a3, $f20 -/* C886B4 80242C04 0C00A7E7 */ jal add_vec2D_polar -/* C886B8 80242C08 0240282D */ daddu $a1, $s2, $zero -/* C886BC 80242C0C 0220202D */ daddu $a0, $s1, $zero -/* C886C0 80242C10 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C886C4 80242C14 4600008D */ trunc.w.s $f2, $f0 -/* C886C8 80242C18 44061000 */ mfc1 $a2, $f2 -/* C886CC 80242C1C 0C0B2026 */ jal set_variable -/* C886D0 80242C20 02C0282D */ daddu $a1, $s6, $zero -/* C886D4 80242C24 0220202D */ daddu $a0, $s1, $zero -/* C886D8 80242C28 4600B08D */ trunc.w.s $f2, $f22 -/* C886DC 80242C2C 44061000 */ mfc1 $a2, $f2 -/* C886E0 80242C30 0C0B2026 */ jal set_variable -/* C886E4 80242C34 0280282D */ daddu $a1, $s4, $zero -/* C886E8 80242C38 0220202D */ daddu $a0, $s1, $zero -/* C886EC 80242C3C C7A00014 */ lwc1 $f0, 0x14($sp) -/* C886F0 80242C40 4600008D */ trunc.w.s $f2, $f0 -/* C886F4 80242C44 44061000 */ mfc1 $a2, $f2 -/* C886F8 80242C48 0C0B2026 */ jal set_variable -/* C886FC 80242C4C 02A0282D */ daddu $a1, $s5, $zero -/* C88700 80242C50 8FBF0034 */ lw $ra, 0x34($sp) -/* C88704 80242C54 8FB60030 */ lw $s6, 0x30($sp) -/* C88708 80242C58 8FB5002C */ lw $s5, 0x2c($sp) -/* C8870C 80242C5C 8FB40028 */ lw $s4, 0x28($sp) -/* C88710 80242C60 8FB30024 */ lw $s3, 0x24($sp) -/* C88714 80242C64 8FB20020 */ lw $s2, 0x20($sp) -/* C88718 80242C68 8FB1001C */ lw $s1, 0x1c($sp) -/* C8871C 80242C6C 8FB00018 */ lw $s0, 0x18($sp) -/* C88720 80242C70 D7B60040 */ ldc1 $f22, 0x40($sp) -/* C88724 80242C74 D7B40038 */ ldc1 $f20, 0x38($sp) -/* C88728 80242C78 24020002 */ addiu $v0, $zero, 2 -/* C8872C 80242C7C 03E00008 */ jr $ra -/* C88730 80242C80 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802419C4_C8F574.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802419C4_C8F574.s deleted file mode 100644 index 0430f2e068..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802419C4_C8F574.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419C4_C8F574 -/* C8F574 802419C4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C8F578 802419C8 AFB1001C */ sw $s1, 0x1c($sp) -/* C8F57C 802419CC 0080882D */ daddu $s1, $a0, $zero -/* C8F580 802419D0 AFBF0034 */ sw $ra, 0x34($sp) -/* C8F584 802419D4 AFB60030 */ sw $s6, 0x30($sp) -/* C8F588 802419D8 AFB5002C */ sw $s5, 0x2c($sp) -/* C8F58C 802419DC AFB40028 */ sw $s4, 0x28($sp) -/* C8F590 802419E0 AFB30024 */ sw $s3, 0x24($sp) -/* C8F594 802419E4 AFB20020 */ sw $s2, 0x20($sp) -/* C8F598 802419E8 AFB00018 */ sw $s0, 0x18($sp) -/* C8F59C 802419EC F7B60040 */ sdc1 $f22, 0x40($sp) -/* C8F5A0 802419F0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* C8F5A4 802419F4 8E30000C */ lw $s0, 0xc($s1) -/* C8F5A8 802419F8 8E160000 */ lw $s6, ($s0) -/* C8F5AC 802419FC 26100004 */ addiu $s0, $s0, 4 -/* C8F5B0 80241A00 0C0B1EAF */ jal get_variable -/* C8F5B4 80241A04 02C0282D */ daddu $a1, $s6, $zero -/* C8F5B8 80241A08 44820000 */ mtc1 $v0, $f0 -/* C8F5BC 80241A0C 00000000 */ nop -/* C8F5C0 80241A10 46800020 */ cvt.s.w $f0, $f0 -/* C8F5C4 80241A14 E7A00010 */ swc1 $f0, 0x10($sp) -/* C8F5C8 80241A18 8E140000 */ lw $s4, ($s0) -/* C8F5CC 80241A1C 26100004 */ addiu $s0, $s0, 4 -/* C8F5D0 80241A20 0220202D */ daddu $a0, $s1, $zero -/* C8F5D4 80241A24 0C0B1EAF */ jal get_variable -/* C8F5D8 80241A28 0280282D */ daddu $a1, $s4, $zero -/* C8F5DC 80241A2C 0220202D */ daddu $a0, $s1, $zero -/* C8F5E0 80241A30 8E150000 */ lw $s5, ($s0) -/* C8F5E4 80241A34 4482B000 */ mtc1 $v0, $f22 -/* C8F5E8 80241A38 00000000 */ nop -/* C8F5EC 80241A3C 4680B5A0 */ cvt.s.w $f22, $f22 -/* C8F5F0 80241A40 0C0B1EAF */ jal get_variable -/* C8F5F4 80241A44 02A0282D */ daddu $a1, $s5, $zero -/* C8F5F8 80241A48 2404FFFC */ addiu $a0, $zero, -4 -/* C8F5FC 80241A4C 44820000 */ mtc1 $v0, $f0 -/* C8F600 80241A50 00000000 */ nop -/* C8F604 80241A54 46800020 */ cvt.s.w $f0, $f0 -/* C8F608 80241A58 0C00EABB */ jal get_npc_unsafe -/* C8F60C 80241A5C E7A00014 */ swc1 $f0, 0x14($sp) -/* C8F610 80241A60 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* C8F614 80241A64 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* C8F618 80241A68 3C014334 */ lui $at, 0x4334 -/* C8F61C 80241A6C 44816000 */ mtc1 $at, $f12 -/* C8F620 80241A70 00041880 */ sll $v1, $a0, 2 -/* C8F624 80241A74 00641821 */ addu $v1, $v1, $a0 -/* C8F628 80241A78 00031880 */ sll $v1, $v1, 2 -/* C8F62C 80241A7C 00641823 */ subu $v1, $v1, $a0 -/* C8F630 80241A80 000320C0 */ sll $a0, $v1, 3 -/* C8F634 80241A84 00641821 */ addu $v1, $v1, $a0 -/* C8F638 80241A88 000318C0 */ sll $v1, $v1, 3 -/* C8F63C 80241A8C 3C01800B */ lui $at, 0x800b -/* C8F640 80241A90 00230821 */ addu $at, $at, $v1 -/* C8F644 80241A94 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C8F648 80241A98 460C0300 */ add.s $f12, $f0, $f12 -/* C8F64C 80241A9C 0C00A6C9 */ jal clamp_angle -/* C8F650 80241AA0 0040982D */ daddu $s3, $v0, $zero -/* C8F654 80241AA4 27B00010 */ addiu $s0, $sp, 0x10 -/* C8F658 80241AA8 0200202D */ daddu $a0, $s0, $zero -/* C8F65C 80241AAC 27B20014 */ addiu $s2, $sp, 0x14 -/* C8F660 80241AB0 0240282D */ daddu $a1, $s2, $zero -/* C8F664 80241AB4 3C064170 */ lui $a2, 0x4170 -/* C8F668 80241AB8 8E67000C */ lw $a3, 0xc($s3) -/* C8F66C 80241ABC 0C00A7E7 */ jal add_vec2D_polar -/* C8F670 80241AC0 46000506 */ mov.s $f20, $f0 -/* C8F674 80241AC4 0200202D */ daddu $a0, $s0, $zero -/* C8F678 80241AC8 3C064120 */ lui $a2, 0x4120 -/* C8F67C 80241ACC 4407A000 */ mfc1 $a3, $f20 -/* C8F680 80241AD0 0C00A7E7 */ jal add_vec2D_polar -/* C8F684 80241AD4 0240282D */ daddu $a1, $s2, $zero -/* C8F688 80241AD8 0220202D */ daddu $a0, $s1, $zero -/* C8F68C 80241ADC C7A00010 */ lwc1 $f0, 0x10($sp) -/* C8F690 80241AE0 4600008D */ trunc.w.s $f2, $f0 -/* C8F694 80241AE4 44061000 */ mfc1 $a2, $f2 -/* C8F698 80241AE8 0C0B2026 */ jal set_variable -/* C8F69C 80241AEC 02C0282D */ daddu $a1, $s6, $zero -/* C8F6A0 80241AF0 0220202D */ daddu $a0, $s1, $zero -/* C8F6A4 80241AF4 4600B08D */ trunc.w.s $f2, $f22 -/* C8F6A8 80241AF8 44061000 */ mfc1 $a2, $f2 -/* C8F6AC 80241AFC 0C0B2026 */ jal set_variable -/* C8F6B0 80241B00 0280282D */ daddu $a1, $s4, $zero -/* C8F6B4 80241B04 0220202D */ daddu $a0, $s1, $zero -/* C8F6B8 80241B08 C7A00014 */ lwc1 $f0, 0x14($sp) -/* C8F6BC 80241B0C 4600008D */ trunc.w.s $f2, $f0 -/* C8F6C0 80241B10 44061000 */ mfc1 $a2, $f2 -/* C8F6C4 80241B14 0C0B2026 */ jal set_variable -/* C8F6C8 80241B18 02A0282D */ daddu $a1, $s5, $zero -/* C8F6CC 80241B1C 8FBF0034 */ lw $ra, 0x34($sp) -/* C8F6D0 80241B20 8FB60030 */ lw $s6, 0x30($sp) -/* C8F6D4 80241B24 8FB5002C */ lw $s5, 0x2c($sp) -/* C8F6D8 80241B28 8FB40028 */ lw $s4, 0x28($sp) -/* C8F6DC 80241B2C 8FB30024 */ lw $s3, 0x24($sp) -/* C8F6E0 80241B30 8FB20020 */ lw $s2, 0x20($sp) -/* C8F6E4 80241B34 8FB1001C */ lw $s1, 0x1c($sp) -/* C8F6E8 80241B38 8FB00018 */ lw $s0, 0x18($sp) -/* C8F6EC 80241B3C D7B60040 */ ldc1 $f22, 0x40($sp) -/* C8F6F0 80241B40 D7B40038 */ ldc1 $f20, 0x38($sp) -/* C8F6F4 80241B44 24020002 */ addiu $v0, $zero, 2 -/* C8F6F8 80241B48 03E00008 */ jr $ra -/* C8F6FC 80241B4C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_8024086C_C9679C.s b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_8024086C_C9679C.s deleted file mode 100644 index dec2ac5fe2..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_8024086C_C9679C.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024086C_C9679C -/* C9679C 8024086C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C967A0 80240870 AFB1001C */ sw $s1, 0x1c($sp) -/* C967A4 80240874 0080882D */ daddu $s1, $a0, $zero -/* C967A8 80240878 AFBF0034 */ sw $ra, 0x34($sp) -/* C967AC 8024087C AFB60030 */ sw $s6, 0x30($sp) -/* C967B0 80240880 AFB5002C */ sw $s5, 0x2c($sp) -/* C967B4 80240884 AFB40028 */ sw $s4, 0x28($sp) -/* C967B8 80240888 AFB30024 */ sw $s3, 0x24($sp) -/* C967BC 8024088C AFB20020 */ sw $s2, 0x20($sp) -/* C967C0 80240890 AFB00018 */ sw $s0, 0x18($sp) -/* C967C4 80240894 F7B60040 */ sdc1 $f22, 0x40($sp) -/* C967C8 80240898 F7B40038 */ sdc1 $f20, 0x38($sp) -/* C967CC 8024089C 8E30000C */ lw $s0, 0xc($s1) -/* C967D0 802408A0 8E160000 */ lw $s6, ($s0) -/* C967D4 802408A4 26100004 */ addiu $s0, $s0, 4 -/* C967D8 802408A8 0C0B1EAF */ jal get_variable -/* C967DC 802408AC 02C0282D */ daddu $a1, $s6, $zero -/* C967E0 802408B0 44820000 */ mtc1 $v0, $f0 -/* C967E4 802408B4 00000000 */ nop -/* C967E8 802408B8 46800020 */ cvt.s.w $f0, $f0 -/* C967EC 802408BC E7A00010 */ swc1 $f0, 0x10($sp) -/* C967F0 802408C0 8E140000 */ lw $s4, ($s0) -/* C967F4 802408C4 26100004 */ addiu $s0, $s0, 4 -/* C967F8 802408C8 0220202D */ daddu $a0, $s1, $zero -/* C967FC 802408CC 0C0B1EAF */ jal get_variable -/* C96800 802408D0 0280282D */ daddu $a1, $s4, $zero -/* C96804 802408D4 0220202D */ daddu $a0, $s1, $zero -/* C96808 802408D8 8E150000 */ lw $s5, ($s0) -/* C9680C 802408DC 4482B000 */ mtc1 $v0, $f22 -/* C96810 802408E0 00000000 */ nop -/* C96814 802408E4 4680B5A0 */ cvt.s.w $f22, $f22 -/* C96818 802408E8 0C0B1EAF */ jal get_variable -/* C9681C 802408EC 02A0282D */ daddu $a1, $s5, $zero -/* C96820 802408F0 2404FFFC */ addiu $a0, $zero, -4 -/* C96824 802408F4 44820000 */ mtc1 $v0, $f0 -/* C96828 802408F8 00000000 */ nop -/* C9682C 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* C96830 80240900 0C00EABB */ jal get_npc_unsafe -/* C96834 80240904 E7A00014 */ swc1 $f0, 0x14($sp) -/* C96838 80240908 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* C9683C 8024090C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* C96840 80240910 3C014334 */ lui $at, 0x4334 -/* C96844 80240914 44816000 */ mtc1 $at, $f12 -/* C96848 80240918 00041880 */ sll $v1, $a0, 2 -/* C9684C 8024091C 00641821 */ addu $v1, $v1, $a0 -/* C96850 80240920 00031880 */ sll $v1, $v1, 2 -/* C96854 80240924 00641823 */ subu $v1, $v1, $a0 -/* C96858 80240928 000320C0 */ sll $a0, $v1, 3 -/* C9685C 8024092C 00641821 */ addu $v1, $v1, $a0 -/* C96860 80240930 000318C0 */ sll $v1, $v1, 3 -/* C96864 80240934 3C01800B */ lui $at, 0x800b -/* C96868 80240938 00230821 */ addu $at, $at, $v1 -/* C9686C 8024093C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C96870 80240940 460C0300 */ add.s $f12, $f0, $f12 -/* C96874 80240944 0C00A6C9 */ jal clamp_angle -/* C96878 80240948 0040982D */ daddu $s3, $v0, $zero -/* C9687C 8024094C 27B00010 */ addiu $s0, $sp, 0x10 -/* C96880 80240950 0200202D */ daddu $a0, $s0, $zero -/* C96884 80240954 27B20014 */ addiu $s2, $sp, 0x14 -/* C96888 80240958 0240282D */ daddu $a1, $s2, $zero -/* C9688C 8024095C 3C064170 */ lui $a2, 0x4170 -/* C96890 80240960 8E67000C */ lw $a3, 0xc($s3) -/* C96894 80240964 0C00A7E7 */ jal add_vec2D_polar -/* C96898 80240968 46000506 */ mov.s $f20, $f0 -/* C9689C 8024096C 0200202D */ daddu $a0, $s0, $zero -/* C968A0 80240970 3C064120 */ lui $a2, 0x4120 -/* C968A4 80240974 4407A000 */ mfc1 $a3, $f20 -/* C968A8 80240978 0C00A7E7 */ jal add_vec2D_polar -/* C968AC 8024097C 0240282D */ daddu $a1, $s2, $zero -/* C968B0 80240980 0220202D */ daddu $a0, $s1, $zero -/* C968B4 80240984 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C968B8 80240988 4600008D */ trunc.w.s $f2, $f0 -/* C968BC 8024098C 44061000 */ mfc1 $a2, $f2 -/* C968C0 80240990 0C0B2026 */ jal set_variable -/* C968C4 80240994 02C0282D */ daddu $a1, $s6, $zero -/* C968C8 80240998 0220202D */ daddu $a0, $s1, $zero -/* C968CC 8024099C 4600B08D */ trunc.w.s $f2, $f22 -/* C968D0 802409A0 44061000 */ mfc1 $a2, $f2 -/* C968D4 802409A4 0C0B2026 */ jal set_variable -/* C968D8 802409A8 0280282D */ daddu $a1, $s4, $zero -/* C968DC 802409AC 0220202D */ daddu $a0, $s1, $zero -/* C968E0 802409B0 C7A00014 */ lwc1 $f0, 0x14($sp) -/* C968E4 802409B4 4600008D */ trunc.w.s $f2, $f0 -/* C968E8 802409B8 44061000 */ mfc1 $a2, $f2 -/* C968EC 802409BC 0C0B2026 */ jal set_variable -/* C968F0 802409C0 02A0282D */ daddu $a1, $s5, $zero -/* C968F4 802409C4 8FBF0034 */ lw $ra, 0x34($sp) -/* C968F8 802409C8 8FB60030 */ lw $s6, 0x30($sp) -/* C968FC 802409CC 8FB5002C */ lw $s5, 0x2c($sp) -/* C96900 802409D0 8FB40028 */ lw $s4, 0x28($sp) -/* C96904 802409D4 8FB30024 */ lw $s3, 0x24($sp) -/* C96908 802409D8 8FB20020 */ lw $s2, 0x20($sp) -/* C9690C 802409DC 8FB1001C */ lw $s1, 0x1c($sp) -/* C96910 802409E0 8FB00018 */ lw $s0, 0x18($sp) -/* C96914 802409E4 D7B60040 */ ldc1 $f22, 0x40($sp) -/* C96918 802409E8 D7B40038 */ ldc1 $f20, 0x38($sp) -/* C9691C 802409EC 24020002 */ addiu $v0, $zero, 2 -/* C96920 802409F0 03E00008 */ jr $ra -/* C96924 802409F4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241BA4_7EC8B4.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241BA4_7EC8B4.s deleted file mode 100644 index 393fac07bc..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241BA4_7EC8B4.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BA4_7EC8B4 -/* 7EC8B4 80241BA4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 7EC8B8 80241BA8 AFB1001C */ sw $s1, 0x1c($sp) -/* 7EC8BC 80241BAC 0080882D */ daddu $s1, $a0, $zero -/* 7EC8C0 80241BB0 AFBF0034 */ sw $ra, 0x34($sp) -/* 7EC8C4 80241BB4 AFB60030 */ sw $s6, 0x30($sp) -/* 7EC8C8 80241BB8 AFB5002C */ sw $s5, 0x2c($sp) -/* 7EC8CC 80241BBC AFB40028 */ sw $s4, 0x28($sp) -/* 7EC8D0 80241BC0 AFB30024 */ sw $s3, 0x24($sp) -/* 7EC8D4 80241BC4 AFB20020 */ sw $s2, 0x20($sp) -/* 7EC8D8 80241BC8 AFB00018 */ sw $s0, 0x18($sp) -/* 7EC8DC 80241BCC F7B60040 */ sdc1 $f22, 0x40($sp) -/* 7EC8E0 80241BD0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 7EC8E4 80241BD4 8E30000C */ lw $s0, 0xc($s1) -/* 7EC8E8 80241BD8 8E160000 */ lw $s6, ($s0) -/* 7EC8EC 80241BDC 26100004 */ addiu $s0, $s0, 4 -/* 7EC8F0 80241BE0 0C0B1EAF */ jal get_variable -/* 7EC8F4 80241BE4 02C0282D */ daddu $a1, $s6, $zero -/* 7EC8F8 80241BE8 44820000 */ mtc1 $v0, $f0 -/* 7EC8FC 80241BEC 00000000 */ nop -/* 7EC900 80241BF0 46800020 */ cvt.s.w $f0, $f0 -/* 7EC904 80241BF4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7EC908 80241BF8 8E140000 */ lw $s4, ($s0) -/* 7EC90C 80241BFC 26100004 */ addiu $s0, $s0, 4 -/* 7EC910 80241C00 0220202D */ daddu $a0, $s1, $zero -/* 7EC914 80241C04 0C0B1EAF */ jal get_variable -/* 7EC918 80241C08 0280282D */ daddu $a1, $s4, $zero -/* 7EC91C 80241C0C 0220202D */ daddu $a0, $s1, $zero -/* 7EC920 80241C10 8E150000 */ lw $s5, ($s0) -/* 7EC924 80241C14 4482B000 */ mtc1 $v0, $f22 -/* 7EC928 80241C18 00000000 */ nop -/* 7EC92C 80241C1C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 7EC930 80241C20 0C0B1EAF */ jal get_variable -/* 7EC934 80241C24 02A0282D */ daddu $a1, $s5, $zero -/* 7EC938 80241C28 2404FFFC */ addiu $a0, $zero, -4 -/* 7EC93C 80241C2C 44820000 */ mtc1 $v0, $f0 -/* 7EC940 80241C30 00000000 */ nop -/* 7EC944 80241C34 46800020 */ cvt.s.w $f0, $f0 -/* 7EC948 80241C38 0C00EABB */ jal get_npc_unsafe -/* 7EC94C 80241C3C E7A00014 */ swc1 $f0, 0x14($sp) -/* 7EC950 80241C40 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 7EC954 80241C44 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 7EC958 80241C48 3C014334 */ lui $at, 0x4334 -/* 7EC95C 80241C4C 44816000 */ mtc1 $at, $f12 -/* 7EC960 80241C50 00041880 */ sll $v1, $a0, 2 -/* 7EC964 80241C54 00641821 */ addu $v1, $v1, $a0 -/* 7EC968 80241C58 00031880 */ sll $v1, $v1, 2 -/* 7EC96C 80241C5C 00641823 */ subu $v1, $v1, $a0 -/* 7EC970 80241C60 000320C0 */ sll $a0, $v1, 3 -/* 7EC974 80241C64 00641821 */ addu $v1, $v1, $a0 -/* 7EC978 80241C68 000318C0 */ sll $v1, $v1, 3 -/* 7EC97C 80241C6C 3C01800B */ lui $at, 0x800b -/* 7EC980 80241C70 00230821 */ addu $at, $at, $v1 -/* 7EC984 80241C74 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 7EC988 80241C78 460C0300 */ add.s $f12, $f0, $f12 -/* 7EC98C 80241C7C 0C00A6C9 */ jal clamp_angle -/* 7EC990 80241C80 0040982D */ daddu $s3, $v0, $zero -/* 7EC994 80241C84 27B00010 */ addiu $s0, $sp, 0x10 -/* 7EC998 80241C88 0200202D */ daddu $a0, $s0, $zero -/* 7EC99C 80241C8C 27B20014 */ addiu $s2, $sp, 0x14 -/* 7EC9A0 80241C90 0240282D */ daddu $a1, $s2, $zero -/* 7EC9A4 80241C94 3C064170 */ lui $a2, 0x4170 -/* 7EC9A8 80241C98 8E67000C */ lw $a3, 0xc($s3) -/* 7EC9AC 80241C9C 0C00A7E7 */ jal add_vec2D_polar -/* 7EC9B0 80241CA0 46000506 */ mov.s $f20, $f0 -/* 7EC9B4 80241CA4 0200202D */ daddu $a0, $s0, $zero -/* 7EC9B8 80241CA8 3C064120 */ lui $a2, 0x4120 -/* 7EC9BC 80241CAC 4407A000 */ mfc1 $a3, $f20 -/* 7EC9C0 80241CB0 0C00A7E7 */ jal add_vec2D_polar -/* 7EC9C4 80241CB4 0240282D */ daddu $a1, $s2, $zero -/* 7EC9C8 80241CB8 0220202D */ daddu $a0, $s1, $zero -/* 7EC9CC 80241CBC C7A00010 */ lwc1 $f0, 0x10($sp) -/* 7EC9D0 80241CC0 4600008D */ trunc.w.s $f2, $f0 -/* 7EC9D4 80241CC4 44061000 */ mfc1 $a2, $f2 -/* 7EC9D8 80241CC8 0C0B2026 */ jal set_variable -/* 7EC9DC 80241CCC 02C0282D */ daddu $a1, $s6, $zero -/* 7EC9E0 80241CD0 0220202D */ daddu $a0, $s1, $zero -/* 7EC9E4 80241CD4 4600B08D */ trunc.w.s $f2, $f22 -/* 7EC9E8 80241CD8 44061000 */ mfc1 $a2, $f2 -/* 7EC9EC 80241CDC 0C0B2026 */ jal set_variable -/* 7EC9F0 80241CE0 0280282D */ daddu $a1, $s4, $zero -/* 7EC9F4 80241CE4 0220202D */ daddu $a0, $s1, $zero -/* 7EC9F8 80241CE8 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 7EC9FC 80241CEC 4600008D */ trunc.w.s $f2, $f0 -/* 7ECA00 80241CF0 44061000 */ mfc1 $a2, $f2 -/* 7ECA04 80241CF4 0C0B2026 */ jal set_variable -/* 7ECA08 80241CF8 02A0282D */ daddu $a1, $s5, $zero -/* 7ECA0C 80241CFC 8FBF0034 */ lw $ra, 0x34($sp) -/* 7ECA10 80241D00 8FB60030 */ lw $s6, 0x30($sp) -/* 7ECA14 80241D04 8FB5002C */ lw $s5, 0x2c($sp) -/* 7ECA18 80241D08 8FB40028 */ lw $s4, 0x28($sp) -/* 7ECA1C 80241D0C 8FB30024 */ lw $s3, 0x24($sp) -/* 7ECA20 80241D10 8FB20020 */ lw $s2, 0x20($sp) -/* 7ECA24 80241D14 8FB1001C */ lw $s1, 0x1c($sp) -/* 7ECA28 80241D18 8FB00018 */ lw $s0, 0x18($sp) -/* 7ECA2C 80241D1C D7B60040 */ ldc1 $f22, 0x40($sp) -/* 7ECA30 80241D20 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 7ECA34 80241D24 24020002 */ addiu $v0, $zero, 2 -/* 7ECA38 80241D28 03E00008 */ jr $ra -/* 7ECA3C 80241D2C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_8024395C_7EE66C.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_8024395C_7EE66C.s deleted file mode 100644 index 6b24721d0e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_8024395C_7EE66C.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024395C_7EE66C -/* 7EE66C 8024395C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 7EE670 80243960 AFB1001C */ sw $s1, 0x1c($sp) -/* 7EE674 80243964 0080882D */ daddu $s1, $a0, $zero -/* 7EE678 80243968 AFBF0034 */ sw $ra, 0x34($sp) -/* 7EE67C 8024396C AFB60030 */ sw $s6, 0x30($sp) -/* 7EE680 80243970 AFB5002C */ sw $s5, 0x2c($sp) -/* 7EE684 80243974 AFB40028 */ sw $s4, 0x28($sp) -/* 7EE688 80243978 AFB30024 */ sw $s3, 0x24($sp) -/* 7EE68C 8024397C AFB20020 */ sw $s2, 0x20($sp) -/* 7EE690 80243980 AFB00018 */ sw $s0, 0x18($sp) -/* 7EE694 80243984 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 7EE698 80243988 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 7EE69C 8024398C 8E30000C */ lw $s0, 0xc($s1) -/* 7EE6A0 80243990 8E160000 */ lw $s6, ($s0) -/* 7EE6A4 80243994 26100004 */ addiu $s0, $s0, 4 -/* 7EE6A8 80243998 0C0B1EAF */ jal get_variable -/* 7EE6AC 8024399C 02C0282D */ daddu $a1, $s6, $zero -/* 7EE6B0 802439A0 44820000 */ mtc1 $v0, $f0 -/* 7EE6B4 802439A4 00000000 */ nop -/* 7EE6B8 802439A8 46800020 */ cvt.s.w $f0, $f0 -/* 7EE6BC 802439AC E7A00010 */ swc1 $f0, 0x10($sp) -/* 7EE6C0 802439B0 8E140000 */ lw $s4, ($s0) -/* 7EE6C4 802439B4 26100004 */ addiu $s0, $s0, 4 -/* 7EE6C8 802439B8 0220202D */ daddu $a0, $s1, $zero -/* 7EE6CC 802439BC 0C0B1EAF */ jal get_variable -/* 7EE6D0 802439C0 0280282D */ daddu $a1, $s4, $zero -/* 7EE6D4 802439C4 0220202D */ daddu $a0, $s1, $zero -/* 7EE6D8 802439C8 8E150000 */ lw $s5, ($s0) -/* 7EE6DC 802439CC 4482B000 */ mtc1 $v0, $f22 -/* 7EE6E0 802439D0 00000000 */ nop -/* 7EE6E4 802439D4 4680B5A0 */ cvt.s.w $f22, $f22 -/* 7EE6E8 802439D8 0C0B1EAF */ jal get_variable -/* 7EE6EC 802439DC 02A0282D */ daddu $a1, $s5, $zero -/* 7EE6F0 802439E0 2404FFFC */ addiu $a0, $zero, -4 -/* 7EE6F4 802439E4 44820000 */ mtc1 $v0, $f0 -/* 7EE6F8 802439E8 00000000 */ nop -/* 7EE6FC 802439EC 46800020 */ cvt.s.w $f0, $f0 -/* 7EE700 802439F0 0C00EABB */ jal get_npc_unsafe -/* 7EE704 802439F4 E7A00014 */ swc1 $f0, 0x14($sp) -/* 7EE708 802439F8 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 7EE70C 802439FC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 7EE710 80243A00 3C014334 */ lui $at, 0x4334 -/* 7EE714 80243A04 44816000 */ mtc1 $at, $f12 -/* 7EE718 80243A08 00041880 */ sll $v1, $a0, 2 -/* 7EE71C 80243A0C 00641821 */ addu $v1, $v1, $a0 -/* 7EE720 80243A10 00031880 */ sll $v1, $v1, 2 -/* 7EE724 80243A14 00641823 */ subu $v1, $v1, $a0 -/* 7EE728 80243A18 000320C0 */ sll $a0, $v1, 3 -/* 7EE72C 80243A1C 00641821 */ addu $v1, $v1, $a0 -/* 7EE730 80243A20 000318C0 */ sll $v1, $v1, 3 -/* 7EE734 80243A24 3C01800B */ lui $at, 0x800b -/* 7EE738 80243A28 00230821 */ addu $at, $at, $v1 -/* 7EE73C 80243A2C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 7EE740 80243A30 460C0300 */ add.s $f12, $f0, $f12 -/* 7EE744 80243A34 0C00A6C9 */ jal clamp_angle -/* 7EE748 80243A38 0040982D */ daddu $s3, $v0, $zero -/* 7EE74C 80243A3C 27B00010 */ addiu $s0, $sp, 0x10 -/* 7EE750 80243A40 0200202D */ daddu $a0, $s0, $zero -/* 7EE754 80243A44 27B20014 */ addiu $s2, $sp, 0x14 -/* 7EE758 80243A48 0240282D */ daddu $a1, $s2, $zero -/* 7EE75C 80243A4C 3C064170 */ lui $a2, 0x4170 -/* 7EE760 80243A50 8E67000C */ lw $a3, 0xc($s3) -/* 7EE764 80243A54 0C00A7E7 */ jal add_vec2D_polar -/* 7EE768 80243A58 46000506 */ mov.s $f20, $f0 -/* 7EE76C 80243A5C 0200202D */ daddu $a0, $s0, $zero -/* 7EE770 80243A60 3C064120 */ lui $a2, 0x4120 -/* 7EE774 80243A64 4407A000 */ mfc1 $a3, $f20 -/* 7EE778 80243A68 0C00A7E7 */ jal add_vec2D_polar -/* 7EE77C 80243A6C 0240282D */ daddu $a1, $s2, $zero -/* 7EE780 80243A70 0220202D */ daddu $a0, $s1, $zero -/* 7EE784 80243A74 C7A00010 */ lwc1 $f0, 0x10($sp) -/* 7EE788 80243A78 4600008D */ trunc.w.s $f2, $f0 -/* 7EE78C 80243A7C 44061000 */ mfc1 $a2, $f2 -/* 7EE790 80243A80 0C0B2026 */ jal set_variable -/* 7EE794 80243A84 02C0282D */ daddu $a1, $s6, $zero -/* 7EE798 80243A88 0220202D */ daddu $a0, $s1, $zero -/* 7EE79C 80243A8C 4600B08D */ trunc.w.s $f2, $f22 -/* 7EE7A0 80243A90 44061000 */ mfc1 $a2, $f2 -/* 7EE7A4 80243A94 0C0B2026 */ jal set_variable -/* 7EE7A8 80243A98 0280282D */ daddu $a1, $s4, $zero -/* 7EE7AC 80243A9C 0220202D */ daddu $a0, $s1, $zero -/* 7EE7B0 80243AA0 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 7EE7B4 80243AA4 4600008D */ trunc.w.s $f2, $f0 -/* 7EE7B8 80243AA8 44061000 */ mfc1 $a2, $f2 -/* 7EE7BC 80243AAC 0C0B2026 */ jal set_variable -/* 7EE7C0 80243AB0 02A0282D */ daddu $a1, $s5, $zero -/* 7EE7C4 80243AB4 8FBF0034 */ lw $ra, 0x34($sp) -/* 7EE7C8 80243AB8 8FB60030 */ lw $s6, 0x30($sp) -/* 7EE7CC 80243ABC 8FB5002C */ lw $s5, 0x2c($sp) -/* 7EE7D0 80243AC0 8FB40028 */ lw $s4, 0x28($sp) -/* 7EE7D4 80243AC4 8FB30024 */ lw $s3, 0x24($sp) -/* 7EE7D8 80243AC8 8FB20020 */ lw $s2, 0x20($sp) -/* 7EE7DC 80243ACC 8FB1001C */ lw $s1, 0x1c($sp) -/* 7EE7E0 80243AD0 8FB00018 */ lw $s0, 0x18($sp) -/* 7EE7E4 80243AD4 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 7EE7E8 80243AD8 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 7EE7EC 80243ADC 24020002 */ addiu $v0, $zero, 2 -/* 7EE7F0 80243AE0 03E00008 */ jr $ra -/* 7EE7F4 80243AE4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243EEC_80476C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243EEC_80476C.s deleted file mode 100644 index 89937430de..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243EEC_80476C.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243EEC_80476C -/* 80476C 80243EEC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 804770 80243EF0 AFB1001C */ sw $s1, 0x1c($sp) -/* 804774 80243EF4 0080882D */ daddu $s1, $a0, $zero -/* 804778 80243EF8 AFBF0034 */ sw $ra, 0x34($sp) -/* 80477C 80243EFC AFB60030 */ sw $s6, 0x30($sp) -/* 804780 80243F00 AFB5002C */ sw $s5, 0x2c($sp) -/* 804784 80243F04 AFB40028 */ sw $s4, 0x28($sp) -/* 804788 80243F08 AFB30024 */ sw $s3, 0x24($sp) -/* 80478C 80243F0C AFB20020 */ sw $s2, 0x20($sp) -/* 804790 80243F10 AFB00018 */ sw $s0, 0x18($sp) -/* 804794 80243F14 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 804798 80243F18 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 80479C 80243F1C 8E30000C */ lw $s0, 0xc($s1) -/* 8047A0 80243F20 8E160000 */ lw $s6, ($s0) -/* 8047A4 80243F24 26100004 */ addiu $s0, $s0, 4 -/* 8047A8 80243F28 0C0B1EAF */ jal get_variable -/* 8047AC 80243F2C 02C0282D */ daddu $a1, $s6, $zero -/* 8047B0 80243F30 44820000 */ mtc1 $v0, $f0 -/* 8047B4 80243F34 00000000 */ nop -/* 8047B8 80243F38 46800020 */ cvt.s.w $f0, $f0 -/* 8047BC 80243F3C E7A00010 */ swc1 $f0, 0x10($sp) -/* 8047C0 80243F40 8E140000 */ lw $s4, ($s0) -/* 8047C4 80243F44 26100004 */ addiu $s0, $s0, 4 -/* 8047C8 80243F48 0220202D */ daddu $a0, $s1, $zero -/* 8047CC 80243F4C 0C0B1EAF */ jal get_variable -/* 8047D0 80243F50 0280282D */ daddu $a1, $s4, $zero -/* 8047D4 80243F54 0220202D */ daddu $a0, $s1, $zero -/* 8047D8 80243F58 8E150000 */ lw $s5, ($s0) -/* 8047DC 80243F5C 4482B000 */ mtc1 $v0, $f22 -/* 8047E0 80243F60 00000000 */ nop -/* 8047E4 80243F64 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8047E8 80243F68 0C0B1EAF */ jal get_variable -/* 8047EC 80243F6C 02A0282D */ daddu $a1, $s5, $zero -/* 8047F0 80243F70 2404FFFC */ addiu $a0, $zero, -4 -/* 8047F4 80243F74 44820000 */ mtc1 $v0, $f0 -/* 8047F8 80243F78 00000000 */ nop -/* 8047FC 80243F7C 46800020 */ cvt.s.w $f0, $f0 -/* 804800 80243F80 0C00EABB */ jal get_npc_unsafe -/* 804804 80243F84 E7A00014 */ swc1 $f0, 0x14($sp) -/* 804808 80243F88 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 80480C 80243F8C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 804810 80243F90 3C014334 */ lui $at, 0x4334 -/* 804814 80243F94 44816000 */ mtc1 $at, $f12 -/* 804818 80243F98 00041880 */ sll $v1, $a0, 2 -/* 80481C 80243F9C 00641821 */ addu $v1, $v1, $a0 -/* 804820 80243FA0 00031880 */ sll $v1, $v1, 2 -/* 804824 80243FA4 00641823 */ subu $v1, $v1, $a0 -/* 804828 80243FA8 000320C0 */ sll $a0, $v1, 3 -/* 80482C 80243FAC 00641821 */ addu $v1, $v1, $a0 -/* 804830 80243FB0 000318C0 */ sll $v1, $v1, 3 -/* 804834 80243FB4 3C01800B */ lui $at, 0x800b -/* 804838 80243FB8 00230821 */ addu $at, $at, $v1 -/* 80483C 80243FBC C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 804840 80243FC0 460C0300 */ add.s $f12, $f0, $f12 -/* 804844 80243FC4 0C00A6C9 */ jal clamp_angle -/* 804848 80243FC8 0040982D */ daddu $s3, $v0, $zero -/* 80484C 80243FCC 27B00010 */ addiu $s0, $sp, 0x10 -/* 804850 80243FD0 0200202D */ daddu $a0, $s0, $zero -/* 804854 80243FD4 27B20014 */ addiu $s2, $sp, 0x14 -/* 804858 80243FD8 0240282D */ daddu $a1, $s2, $zero -/* 80485C 80243FDC 3C064170 */ lui $a2, 0x4170 -/* 804860 80243FE0 8E67000C */ lw $a3, 0xc($s3) -/* 804864 80243FE4 0C00A7E7 */ jal add_vec2D_polar -/* 804868 80243FE8 46000506 */ mov.s $f20, $f0 -/* 80486C 80243FEC 0200202D */ daddu $a0, $s0, $zero -/* 804870 80243FF0 3C064120 */ lui $a2, 0x4120 -/* 804874 80243FF4 4407A000 */ mfc1 $a3, $f20 -/* 804878 80243FF8 0C00A7E7 */ jal add_vec2D_polar -/* 80487C 80243FFC 0240282D */ daddu $a1, $s2, $zero -/* 804880 80244000 0220202D */ daddu $a0, $s1, $zero -/* 804884 80244004 C7A00010 */ lwc1 $f0, 0x10($sp) -/* 804888 80244008 4600008D */ trunc.w.s $f2, $f0 -/* 80488C 8024400C 44061000 */ mfc1 $a2, $f2 -/* 804890 80244010 0C0B2026 */ jal set_variable -/* 804894 80244014 02C0282D */ daddu $a1, $s6, $zero -/* 804898 80244018 0220202D */ daddu $a0, $s1, $zero -/* 80489C 8024401C 4600B08D */ trunc.w.s $f2, $f22 -/* 8048A0 80244020 44061000 */ mfc1 $a2, $f2 -/* 8048A4 80244024 0C0B2026 */ jal set_variable -/* 8048A8 80244028 0280282D */ daddu $a1, $s4, $zero -/* 8048AC 8024402C 0220202D */ daddu $a0, $s1, $zero -/* 8048B0 80244030 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 8048B4 80244034 4600008D */ trunc.w.s $f2, $f0 -/* 8048B8 80244038 44061000 */ mfc1 $a2, $f2 -/* 8048BC 8024403C 0C0B2026 */ jal set_variable -/* 8048C0 80244040 02A0282D */ daddu $a1, $s5, $zero -/* 8048C4 80244044 8FBF0034 */ lw $ra, 0x34($sp) -/* 8048C8 80244048 8FB60030 */ lw $s6, 0x30($sp) -/* 8048CC 8024404C 8FB5002C */ lw $s5, 0x2c($sp) -/* 8048D0 80244050 8FB40028 */ lw $s4, 0x28($sp) -/* 8048D4 80244054 8FB30024 */ lw $s3, 0x24($sp) -/* 8048D8 80244058 8FB20020 */ lw $s2, 0x20($sp) -/* 8048DC 8024405C 8FB1001C */ lw $s1, 0x1c($sp) -/* 8048E0 80244060 8FB00018 */ lw $s0, 0x18($sp) -/* 8048E4 80244064 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 8048E8 80244068 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 8048EC 8024406C 24020002 */ addiu $v0, $zero, 2 -/* 8048F0 80244070 03E00008 */ jr $ra -/* 8048F4 80244074 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802431F4_8264B4.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802431F4_8264B4.s deleted file mode 100644 index 794c4a7964..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802431F4_8264B4.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802431F4_8264B4 -/* 8264B4 802431F4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8264B8 802431F8 AFB1001C */ sw $s1, 0x1c($sp) -/* 8264BC 802431FC 0080882D */ daddu $s1, $a0, $zero -/* 8264C0 80243200 AFBF0034 */ sw $ra, 0x34($sp) -/* 8264C4 80243204 AFB60030 */ sw $s6, 0x30($sp) -/* 8264C8 80243208 AFB5002C */ sw $s5, 0x2c($sp) -/* 8264CC 8024320C AFB40028 */ sw $s4, 0x28($sp) -/* 8264D0 80243210 AFB30024 */ sw $s3, 0x24($sp) -/* 8264D4 80243214 AFB20020 */ sw $s2, 0x20($sp) -/* 8264D8 80243218 AFB00018 */ sw $s0, 0x18($sp) -/* 8264DC 8024321C F7B60040 */ sdc1 $f22, 0x40($sp) -/* 8264E0 80243220 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 8264E4 80243224 8E30000C */ lw $s0, 0xc($s1) -/* 8264E8 80243228 8E160000 */ lw $s6, ($s0) -/* 8264EC 8024322C 26100004 */ addiu $s0, $s0, 4 -/* 8264F0 80243230 0C0B1EAF */ jal get_variable -/* 8264F4 80243234 02C0282D */ daddu $a1, $s6, $zero -/* 8264F8 80243238 44820000 */ mtc1 $v0, $f0 -/* 8264FC 8024323C 00000000 */ nop -/* 826500 80243240 46800020 */ cvt.s.w $f0, $f0 -/* 826504 80243244 E7A00010 */ swc1 $f0, 0x10($sp) -/* 826508 80243248 8E140000 */ lw $s4, ($s0) -/* 82650C 8024324C 26100004 */ addiu $s0, $s0, 4 -/* 826510 80243250 0220202D */ daddu $a0, $s1, $zero -/* 826514 80243254 0C0B1EAF */ jal get_variable -/* 826518 80243258 0280282D */ daddu $a1, $s4, $zero -/* 82651C 8024325C 0220202D */ daddu $a0, $s1, $zero -/* 826520 80243260 8E150000 */ lw $s5, ($s0) -/* 826524 80243264 4482B000 */ mtc1 $v0, $f22 -/* 826528 80243268 00000000 */ nop -/* 82652C 8024326C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 826530 80243270 0C0B1EAF */ jal get_variable -/* 826534 80243274 02A0282D */ daddu $a1, $s5, $zero -/* 826538 80243278 2404FFFC */ addiu $a0, $zero, -4 -/* 82653C 8024327C 44820000 */ mtc1 $v0, $f0 -/* 826540 80243280 00000000 */ nop -/* 826544 80243284 46800020 */ cvt.s.w $f0, $f0 -/* 826548 80243288 0C00EABB */ jal get_npc_unsafe -/* 82654C 8024328C E7A00014 */ swc1 $f0, 0x14($sp) -/* 826550 80243290 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 826554 80243294 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 826558 80243298 3C014334 */ lui $at, 0x4334 -/* 82655C 8024329C 44816000 */ mtc1 $at, $f12 -/* 826560 802432A0 00041880 */ sll $v1, $a0, 2 -/* 826564 802432A4 00641821 */ addu $v1, $v1, $a0 -/* 826568 802432A8 00031880 */ sll $v1, $v1, 2 -/* 82656C 802432AC 00641823 */ subu $v1, $v1, $a0 -/* 826570 802432B0 000320C0 */ sll $a0, $v1, 3 -/* 826574 802432B4 00641821 */ addu $v1, $v1, $a0 -/* 826578 802432B8 000318C0 */ sll $v1, $v1, 3 -/* 82657C 802432BC 3C01800B */ lui $at, 0x800b -/* 826580 802432C0 00230821 */ addu $at, $at, $v1 -/* 826584 802432C4 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 826588 802432C8 460C0300 */ add.s $f12, $f0, $f12 -/* 82658C 802432CC 0C00A6C9 */ jal clamp_angle -/* 826590 802432D0 0040982D */ daddu $s3, $v0, $zero -/* 826594 802432D4 27B00010 */ addiu $s0, $sp, 0x10 -/* 826598 802432D8 0200202D */ daddu $a0, $s0, $zero -/* 82659C 802432DC 27B20014 */ addiu $s2, $sp, 0x14 -/* 8265A0 802432E0 0240282D */ daddu $a1, $s2, $zero -/* 8265A4 802432E4 3C064170 */ lui $a2, 0x4170 -/* 8265A8 802432E8 8E67000C */ lw $a3, 0xc($s3) -/* 8265AC 802432EC 0C00A7E7 */ jal add_vec2D_polar -/* 8265B0 802432F0 46000506 */ mov.s $f20, $f0 -/* 8265B4 802432F4 0200202D */ daddu $a0, $s0, $zero -/* 8265B8 802432F8 3C064120 */ lui $a2, 0x4120 -/* 8265BC 802432FC 4407A000 */ mfc1 $a3, $f20 -/* 8265C0 80243300 0C00A7E7 */ jal add_vec2D_polar -/* 8265C4 80243304 0240282D */ daddu $a1, $s2, $zero -/* 8265C8 80243308 0220202D */ daddu $a0, $s1, $zero -/* 8265CC 8024330C C7A00010 */ lwc1 $f0, 0x10($sp) -/* 8265D0 80243310 4600008D */ trunc.w.s $f2, $f0 -/* 8265D4 80243314 44061000 */ mfc1 $a2, $f2 -/* 8265D8 80243318 0C0B2026 */ jal set_variable -/* 8265DC 8024331C 02C0282D */ daddu $a1, $s6, $zero -/* 8265E0 80243320 0220202D */ daddu $a0, $s1, $zero -/* 8265E4 80243324 4600B08D */ trunc.w.s $f2, $f22 -/* 8265E8 80243328 44061000 */ mfc1 $a2, $f2 -/* 8265EC 8024332C 0C0B2026 */ jal set_variable -/* 8265F0 80243330 0280282D */ daddu $a1, $s4, $zero -/* 8265F4 80243334 0220202D */ daddu $a0, $s1, $zero -/* 8265F8 80243338 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 8265FC 8024333C 4600008D */ trunc.w.s $f2, $f0 -/* 826600 80243340 44061000 */ mfc1 $a2, $f2 -/* 826604 80243344 0C0B2026 */ jal set_variable -/* 826608 80243348 02A0282D */ daddu $a1, $s5, $zero -/* 82660C 8024334C 8FBF0034 */ lw $ra, 0x34($sp) -/* 826610 80243350 8FB60030 */ lw $s6, 0x30($sp) -/* 826614 80243354 8FB5002C */ lw $s5, 0x2c($sp) -/* 826618 80243358 8FB40028 */ lw $s4, 0x28($sp) -/* 82661C 8024335C 8FB30024 */ lw $s3, 0x24($sp) -/* 826620 80243360 8FB20020 */ lw $s2, 0x20($sp) -/* 826624 80243364 8FB1001C */ lw $s1, 0x1c($sp) -/* 826628 80243368 8FB00018 */ lw $s0, 0x18($sp) -/* 82662C 8024336C D7B60040 */ ldc1 $f22, 0x40($sp) -/* 826630 80243370 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 826634 80243374 24020002 */ addiu $v0, $zero, 2 -/* 826638 80243378 03E00008 */ jr $ra -/* 82663C 8024337C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241988_833188.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241988_833188.s deleted file mode 100644 index def6eaf5f0..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241988_833188.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241988_833188 -/* 833188 80241988 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 83318C 8024198C AFB1001C */ sw $s1, 0x1c($sp) -/* 833190 80241990 0080882D */ daddu $s1, $a0, $zero -/* 833194 80241994 AFBF0034 */ sw $ra, 0x34($sp) -/* 833198 80241998 AFB60030 */ sw $s6, 0x30($sp) -/* 83319C 8024199C AFB5002C */ sw $s5, 0x2c($sp) -/* 8331A0 802419A0 AFB40028 */ sw $s4, 0x28($sp) -/* 8331A4 802419A4 AFB30024 */ sw $s3, 0x24($sp) -/* 8331A8 802419A8 AFB20020 */ sw $s2, 0x20($sp) -/* 8331AC 802419AC AFB00018 */ sw $s0, 0x18($sp) -/* 8331B0 802419B0 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 8331B4 802419B4 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 8331B8 802419B8 8E30000C */ lw $s0, 0xc($s1) -/* 8331BC 802419BC 8E160000 */ lw $s6, ($s0) -/* 8331C0 802419C0 26100004 */ addiu $s0, $s0, 4 -/* 8331C4 802419C4 0C0B1EAF */ jal get_variable -/* 8331C8 802419C8 02C0282D */ daddu $a1, $s6, $zero -/* 8331CC 802419CC 44820000 */ mtc1 $v0, $f0 -/* 8331D0 802419D0 00000000 */ nop -/* 8331D4 802419D4 46800020 */ cvt.s.w $f0, $f0 -/* 8331D8 802419D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8331DC 802419DC 8E140000 */ lw $s4, ($s0) -/* 8331E0 802419E0 26100004 */ addiu $s0, $s0, 4 -/* 8331E4 802419E4 0220202D */ daddu $a0, $s1, $zero -/* 8331E8 802419E8 0C0B1EAF */ jal get_variable -/* 8331EC 802419EC 0280282D */ daddu $a1, $s4, $zero -/* 8331F0 802419F0 0220202D */ daddu $a0, $s1, $zero -/* 8331F4 802419F4 8E150000 */ lw $s5, ($s0) -/* 8331F8 802419F8 4482B000 */ mtc1 $v0, $f22 -/* 8331FC 802419FC 00000000 */ nop -/* 833200 80241A00 4680B5A0 */ cvt.s.w $f22, $f22 -/* 833204 80241A04 0C0B1EAF */ jal get_variable -/* 833208 80241A08 02A0282D */ daddu $a1, $s5, $zero -/* 83320C 80241A0C 2404FFFC */ addiu $a0, $zero, -4 -/* 833210 80241A10 44820000 */ mtc1 $v0, $f0 -/* 833214 80241A14 00000000 */ nop -/* 833218 80241A18 46800020 */ cvt.s.w $f0, $f0 -/* 83321C 80241A1C 0C00EABB */ jal get_npc_unsafe -/* 833220 80241A20 E7A00014 */ swc1 $f0, 0x14($sp) -/* 833224 80241A24 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 833228 80241A28 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 83322C 80241A2C 3C014334 */ lui $at, 0x4334 -/* 833230 80241A30 44816000 */ mtc1 $at, $f12 -/* 833234 80241A34 00041880 */ sll $v1, $a0, 2 -/* 833238 80241A38 00641821 */ addu $v1, $v1, $a0 -/* 83323C 80241A3C 00031880 */ sll $v1, $v1, 2 -/* 833240 80241A40 00641823 */ subu $v1, $v1, $a0 -/* 833244 80241A44 000320C0 */ sll $a0, $v1, 3 -/* 833248 80241A48 00641821 */ addu $v1, $v1, $a0 -/* 83324C 80241A4C 000318C0 */ sll $v1, $v1, 3 -/* 833250 80241A50 3C01800B */ lui $at, 0x800b -/* 833254 80241A54 00230821 */ addu $at, $at, $v1 -/* 833258 80241A58 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 83325C 80241A5C 460C0300 */ add.s $f12, $f0, $f12 -/* 833260 80241A60 0C00A6C9 */ jal clamp_angle -/* 833264 80241A64 0040982D */ daddu $s3, $v0, $zero -/* 833268 80241A68 27B00010 */ addiu $s0, $sp, 0x10 -/* 83326C 80241A6C 0200202D */ daddu $a0, $s0, $zero -/* 833270 80241A70 27B20014 */ addiu $s2, $sp, 0x14 -/* 833274 80241A74 0240282D */ daddu $a1, $s2, $zero -/* 833278 80241A78 3C064170 */ lui $a2, 0x4170 -/* 83327C 80241A7C 8E67000C */ lw $a3, 0xc($s3) -/* 833280 80241A80 0C00A7E7 */ jal add_vec2D_polar -/* 833284 80241A84 46000506 */ mov.s $f20, $f0 -/* 833288 80241A88 0200202D */ daddu $a0, $s0, $zero -/* 83328C 80241A8C 3C064120 */ lui $a2, 0x4120 -/* 833290 80241A90 4407A000 */ mfc1 $a3, $f20 -/* 833294 80241A94 0C00A7E7 */ jal add_vec2D_polar -/* 833298 80241A98 0240282D */ daddu $a1, $s2, $zero -/* 83329C 80241A9C 0220202D */ daddu $a0, $s1, $zero -/* 8332A0 80241AA0 C7A00010 */ lwc1 $f0, 0x10($sp) -/* 8332A4 80241AA4 4600008D */ trunc.w.s $f2, $f0 -/* 8332A8 80241AA8 44061000 */ mfc1 $a2, $f2 -/* 8332AC 80241AAC 0C0B2026 */ jal set_variable -/* 8332B0 80241AB0 02C0282D */ daddu $a1, $s6, $zero -/* 8332B4 80241AB4 0220202D */ daddu $a0, $s1, $zero -/* 8332B8 80241AB8 4600B08D */ trunc.w.s $f2, $f22 -/* 8332BC 80241ABC 44061000 */ mfc1 $a2, $f2 -/* 8332C0 80241AC0 0C0B2026 */ jal set_variable -/* 8332C4 80241AC4 0280282D */ daddu $a1, $s4, $zero -/* 8332C8 80241AC8 0220202D */ daddu $a0, $s1, $zero -/* 8332CC 80241ACC C7A00014 */ lwc1 $f0, 0x14($sp) -/* 8332D0 80241AD0 4600008D */ trunc.w.s $f2, $f0 -/* 8332D4 80241AD4 44061000 */ mfc1 $a2, $f2 -/* 8332D8 80241AD8 0C0B2026 */ jal set_variable -/* 8332DC 80241ADC 02A0282D */ daddu $a1, $s5, $zero -/* 8332E0 80241AE0 8FBF0034 */ lw $ra, 0x34($sp) -/* 8332E4 80241AE4 8FB60030 */ lw $s6, 0x30($sp) -/* 8332E8 80241AE8 8FB5002C */ lw $s5, 0x2c($sp) -/* 8332EC 80241AEC 8FB40028 */ lw $s4, 0x28($sp) -/* 8332F0 80241AF0 8FB30024 */ lw $s3, 0x24($sp) -/* 8332F4 80241AF4 8FB20020 */ lw $s2, 0x20($sp) -/* 8332F8 80241AF8 8FB1001C */ lw $s1, 0x1c($sp) -/* 8332FC 80241AFC 8FB00018 */ lw $s0, 0x18($sp) -/* 833300 80241B00 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 833304 80241B04 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 833308 80241B08 24020002 */ addiu $v0, $zero, 2 -/* 83330C 80241B0C 03E00008 */ jr $ra -/* 833310 80241B10 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242894_854A04.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242894_854A04.s deleted file mode 100644 index d1a4b3b511..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242894_854A04.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242894_854A04 -/* 854A04 80242894 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 854A08 80242898 AFB1001C */ sw $s1, 0x1c($sp) -/* 854A0C 8024289C 0080882D */ daddu $s1, $a0, $zero -/* 854A10 802428A0 AFBF0034 */ sw $ra, 0x34($sp) -/* 854A14 802428A4 AFB60030 */ sw $s6, 0x30($sp) -/* 854A18 802428A8 AFB5002C */ sw $s5, 0x2c($sp) -/* 854A1C 802428AC AFB40028 */ sw $s4, 0x28($sp) -/* 854A20 802428B0 AFB30024 */ sw $s3, 0x24($sp) -/* 854A24 802428B4 AFB20020 */ sw $s2, 0x20($sp) -/* 854A28 802428B8 AFB00018 */ sw $s0, 0x18($sp) -/* 854A2C 802428BC F7B60040 */ sdc1 $f22, 0x40($sp) -/* 854A30 802428C0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 854A34 802428C4 8E30000C */ lw $s0, 0xc($s1) -/* 854A38 802428C8 8E160000 */ lw $s6, ($s0) -/* 854A3C 802428CC 26100004 */ addiu $s0, $s0, 4 -/* 854A40 802428D0 0C0B1EAF */ jal get_variable -/* 854A44 802428D4 02C0282D */ daddu $a1, $s6, $zero -/* 854A48 802428D8 44820000 */ mtc1 $v0, $f0 -/* 854A4C 802428DC 00000000 */ nop -/* 854A50 802428E0 46800020 */ cvt.s.w $f0, $f0 -/* 854A54 802428E4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 854A58 802428E8 8E140000 */ lw $s4, ($s0) -/* 854A5C 802428EC 26100004 */ addiu $s0, $s0, 4 -/* 854A60 802428F0 0220202D */ daddu $a0, $s1, $zero -/* 854A64 802428F4 0C0B1EAF */ jal get_variable -/* 854A68 802428F8 0280282D */ daddu $a1, $s4, $zero -/* 854A6C 802428FC 0220202D */ daddu $a0, $s1, $zero -/* 854A70 80242900 8E150000 */ lw $s5, ($s0) -/* 854A74 80242904 4482B000 */ mtc1 $v0, $f22 -/* 854A78 80242908 00000000 */ nop -/* 854A7C 8024290C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 854A80 80242910 0C0B1EAF */ jal get_variable -/* 854A84 80242914 02A0282D */ daddu $a1, $s5, $zero -/* 854A88 80242918 2404FFFC */ addiu $a0, $zero, -4 -/* 854A8C 8024291C 44820000 */ mtc1 $v0, $f0 -/* 854A90 80242920 00000000 */ nop -/* 854A94 80242924 46800020 */ cvt.s.w $f0, $f0 -/* 854A98 80242928 0C00EABB */ jal get_npc_unsafe -/* 854A9C 8024292C E7A00014 */ swc1 $f0, 0x14($sp) -/* 854AA0 80242930 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 854AA4 80242934 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 854AA8 80242938 3C014334 */ lui $at, 0x4334 -/* 854AAC 8024293C 44816000 */ mtc1 $at, $f12 -/* 854AB0 80242940 00041880 */ sll $v1, $a0, 2 -/* 854AB4 80242944 00641821 */ addu $v1, $v1, $a0 -/* 854AB8 80242948 00031880 */ sll $v1, $v1, 2 -/* 854ABC 8024294C 00641823 */ subu $v1, $v1, $a0 -/* 854AC0 80242950 000320C0 */ sll $a0, $v1, 3 -/* 854AC4 80242954 00641821 */ addu $v1, $v1, $a0 -/* 854AC8 80242958 000318C0 */ sll $v1, $v1, 3 -/* 854ACC 8024295C 3C01800B */ lui $at, 0x800b -/* 854AD0 80242960 00230821 */ addu $at, $at, $v1 -/* 854AD4 80242964 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 854AD8 80242968 460C0300 */ add.s $f12, $f0, $f12 -/* 854ADC 8024296C 0C00A6C9 */ jal clamp_angle -/* 854AE0 80242970 0040982D */ daddu $s3, $v0, $zero -/* 854AE4 80242974 27B00010 */ addiu $s0, $sp, 0x10 -/* 854AE8 80242978 0200202D */ daddu $a0, $s0, $zero -/* 854AEC 8024297C 27B20014 */ addiu $s2, $sp, 0x14 -/* 854AF0 80242980 0240282D */ daddu $a1, $s2, $zero -/* 854AF4 80242984 3C064170 */ lui $a2, 0x4170 -/* 854AF8 80242988 8E67000C */ lw $a3, 0xc($s3) -/* 854AFC 8024298C 0C00A7E7 */ jal add_vec2D_polar -/* 854B00 80242990 46000506 */ mov.s $f20, $f0 -/* 854B04 80242994 0200202D */ daddu $a0, $s0, $zero -/* 854B08 80242998 3C064120 */ lui $a2, 0x4120 -/* 854B0C 8024299C 4407A000 */ mfc1 $a3, $f20 -/* 854B10 802429A0 0C00A7E7 */ jal add_vec2D_polar -/* 854B14 802429A4 0240282D */ daddu $a1, $s2, $zero -/* 854B18 802429A8 0220202D */ daddu $a0, $s1, $zero -/* 854B1C 802429AC C7A00010 */ lwc1 $f0, 0x10($sp) -/* 854B20 802429B0 4600008D */ trunc.w.s $f2, $f0 -/* 854B24 802429B4 44061000 */ mfc1 $a2, $f2 -/* 854B28 802429B8 0C0B2026 */ jal set_variable -/* 854B2C 802429BC 02C0282D */ daddu $a1, $s6, $zero -/* 854B30 802429C0 0220202D */ daddu $a0, $s1, $zero -/* 854B34 802429C4 4600B08D */ trunc.w.s $f2, $f22 -/* 854B38 802429C8 44061000 */ mfc1 $a2, $f2 -/* 854B3C 802429CC 0C0B2026 */ jal set_variable -/* 854B40 802429D0 0280282D */ daddu $a1, $s4, $zero -/* 854B44 802429D4 0220202D */ daddu $a0, $s1, $zero -/* 854B48 802429D8 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 854B4C 802429DC 4600008D */ trunc.w.s $f2, $f0 -/* 854B50 802429E0 44061000 */ mfc1 $a2, $f2 -/* 854B54 802429E4 0C0B2026 */ jal set_variable -/* 854B58 802429E8 02A0282D */ daddu $a1, $s5, $zero -/* 854B5C 802429EC 8FBF0034 */ lw $ra, 0x34($sp) -/* 854B60 802429F0 8FB60030 */ lw $s6, 0x30($sp) -/* 854B64 802429F4 8FB5002C */ lw $s5, 0x2c($sp) -/* 854B68 802429F8 8FB40028 */ lw $s4, 0x28($sp) -/* 854B6C 802429FC 8FB30024 */ lw $s3, 0x24($sp) -/* 854B70 80242A00 8FB20020 */ lw $s2, 0x20($sp) -/* 854B74 80242A04 8FB1001C */ lw $s1, 0x1c($sp) -/* 854B78 80242A08 8FB00018 */ lw $s0, 0x18($sp) -/* 854B7C 80242A0C D7B60040 */ ldc1 $f22, 0x40($sp) -/* 854B80 80242A10 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 854B84 80242A14 24020002 */ addiu $v0, $zero, 2 -/* 854B88 80242A18 03E00008 */ jr $ra -/* 854B8C 80242A1C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242240_9C7620.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242240_9C7620.s deleted file mode 100644 index be67427f77..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242240_9C7620.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242240_9C7620 -/* 9C7620 80242240 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9C7624 80242244 AFB1001C */ sw $s1, 0x1c($sp) -/* 9C7628 80242248 0080882D */ daddu $s1, $a0, $zero -/* 9C762C 8024224C AFBF0034 */ sw $ra, 0x34($sp) -/* 9C7630 80242250 AFB60030 */ sw $s6, 0x30($sp) -/* 9C7634 80242254 AFB5002C */ sw $s5, 0x2c($sp) -/* 9C7638 80242258 AFB40028 */ sw $s4, 0x28($sp) -/* 9C763C 8024225C AFB30024 */ sw $s3, 0x24($sp) -/* 9C7640 80242260 AFB20020 */ sw $s2, 0x20($sp) -/* 9C7644 80242264 AFB00018 */ sw $s0, 0x18($sp) -/* 9C7648 80242268 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 9C764C 8024226C F7B40038 */ sdc1 $f20, 0x38($sp) -/* 9C7650 80242270 8E30000C */ lw $s0, 0xc($s1) -/* 9C7654 80242274 8E160000 */ lw $s6, ($s0) -/* 9C7658 80242278 26100004 */ addiu $s0, $s0, 4 -/* 9C765C 8024227C 0C0B1EAF */ jal get_variable -/* 9C7660 80242280 02C0282D */ daddu $a1, $s6, $zero -/* 9C7664 80242284 44820000 */ mtc1 $v0, $f0 -/* 9C7668 80242288 00000000 */ nop -/* 9C766C 8024228C 46800020 */ cvt.s.w $f0, $f0 -/* 9C7670 80242290 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9C7674 80242294 8E140000 */ lw $s4, ($s0) -/* 9C7678 80242298 26100004 */ addiu $s0, $s0, 4 -/* 9C767C 8024229C 0220202D */ daddu $a0, $s1, $zero -/* 9C7680 802422A0 0C0B1EAF */ jal get_variable -/* 9C7684 802422A4 0280282D */ daddu $a1, $s4, $zero -/* 9C7688 802422A8 0220202D */ daddu $a0, $s1, $zero -/* 9C768C 802422AC 8E150000 */ lw $s5, ($s0) -/* 9C7690 802422B0 4482B000 */ mtc1 $v0, $f22 -/* 9C7694 802422B4 00000000 */ nop -/* 9C7698 802422B8 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9C769C 802422BC 0C0B1EAF */ jal get_variable -/* 9C76A0 802422C0 02A0282D */ daddu $a1, $s5, $zero -/* 9C76A4 802422C4 2404FFFC */ addiu $a0, $zero, -4 -/* 9C76A8 802422C8 44820000 */ mtc1 $v0, $f0 -/* 9C76AC 802422CC 00000000 */ nop -/* 9C76B0 802422D0 46800020 */ cvt.s.w $f0, $f0 -/* 9C76B4 802422D4 0C00EABB */ jal get_npc_unsafe -/* 9C76B8 802422D8 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9C76BC 802422DC 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 9C76C0 802422E0 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 9C76C4 802422E4 3C014334 */ lui $at, 0x4334 -/* 9C76C8 802422E8 44816000 */ mtc1 $at, $f12 -/* 9C76CC 802422EC 00041880 */ sll $v1, $a0, 2 -/* 9C76D0 802422F0 00641821 */ addu $v1, $v1, $a0 -/* 9C76D4 802422F4 00031880 */ sll $v1, $v1, 2 -/* 9C76D8 802422F8 00641823 */ subu $v1, $v1, $a0 -/* 9C76DC 802422FC 000320C0 */ sll $a0, $v1, 3 -/* 9C76E0 80242300 00641821 */ addu $v1, $v1, $a0 -/* 9C76E4 80242304 000318C0 */ sll $v1, $v1, 3 -/* 9C76E8 80242308 3C01800B */ lui $at, 0x800b -/* 9C76EC 8024230C 00230821 */ addu $at, $at, $v1 -/* 9C76F0 80242310 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 9C76F4 80242314 460C0300 */ add.s $f12, $f0, $f12 -/* 9C76F8 80242318 0C00A6C9 */ jal clamp_angle -/* 9C76FC 8024231C 0040982D */ daddu $s3, $v0, $zero -/* 9C7700 80242320 27B00010 */ addiu $s0, $sp, 0x10 -/* 9C7704 80242324 0200202D */ daddu $a0, $s0, $zero -/* 9C7708 80242328 27B20014 */ addiu $s2, $sp, 0x14 -/* 9C770C 8024232C 0240282D */ daddu $a1, $s2, $zero -/* 9C7710 80242330 3C064170 */ lui $a2, 0x4170 -/* 9C7714 80242334 8E67000C */ lw $a3, 0xc($s3) -/* 9C7718 80242338 0C00A7E7 */ jal add_vec2D_polar -/* 9C771C 8024233C 46000506 */ mov.s $f20, $f0 -/* 9C7720 80242340 0200202D */ daddu $a0, $s0, $zero -/* 9C7724 80242344 3C064120 */ lui $a2, 0x4120 -/* 9C7728 80242348 4407A000 */ mfc1 $a3, $f20 -/* 9C772C 8024234C 0C00A7E7 */ jal add_vec2D_polar -/* 9C7730 80242350 0240282D */ daddu $a1, $s2, $zero -/* 9C7734 80242354 0220202D */ daddu $a0, $s1, $zero -/* 9C7738 80242358 C7A00010 */ lwc1 $f0, 0x10($sp) -/* 9C773C 8024235C 4600008D */ trunc.w.s $f2, $f0 -/* 9C7740 80242360 44061000 */ mfc1 $a2, $f2 -/* 9C7744 80242364 0C0B2026 */ jal set_variable -/* 9C7748 80242368 02C0282D */ daddu $a1, $s6, $zero -/* 9C774C 8024236C 0220202D */ daddu $a0, $s1, $zero -/* 9C7750 80242370 4600B08D */ trunc.w.s $f2, $f22 -/* 9C7754 80242374 44061000 */ mfc1 $a2, $f2 -/* 9C7758 80242378 0C0B2026 */ jal set_variable -/* 9C775C 8024237C 0280282D */ daddu $a1, $s4, $zero -/* 9C7760 80242380 0220202D */ daddu $a0, $s1, $zero -/* 9C7764 80242384 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 9C7768 80242388 4600008D */ trunc.w.s $f2, $f0 -/* 9C776C 8024238C 44061000 */ mfc1 $a2, $f2 -/* 9C7770 80242390 0C0B2026 */ jal set_variable -/* 9C7774 80242394 02A0282D */ daddu $a1, $s5, $zero -/* 9C7778 80242398 8FBF0034 */ lw $ra, 0x34($sp) -/* 9C777C 8024239C 8FB60030 */ lw $s6, 0x30($sp) -/* 9C7780 802423A0 8FB5002C */ lw $s5, 0x2c($sp) -/* 9C7784 802423A4 8FB40028 */ lw $s4, 0x28($sp) -/* 9C7788 802423A8 8FB30024 */ lw $s3, 0x24($sp) -/* 9C778C 802423AC 8FB20020 */ lw $s2, 0x20($sp) -/* 9C7790 802423B0 8FB1001C */ lw $s1, 0x1c($sp) -/* 9C7794 802423B4 8FB00018 */ lw $s0, 0x18($sp) -/* 9C7798 802423B8 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 9C779C 802423BC D7B40038 */ ldc1 $f20, 0x38($sp) -/* 9C77A0 802423C0 24020002 */ addiu $v0, $zero, 2 -/* 9C77A4 802423C4 03E00008 */ jr $ra -/* 9C77A8 802423C8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242DE8_9D9E08.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242DE8_9D9E08.s deleted file mode 100644 index 4782554d2d..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242DE8_9D9E08.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242DE8_9D9E08 -/* 9D9E08 80242DE8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9D9E0C 80242DEC AFB1001C */ sw $s1, 0x1c($sp) -/* 9D9E10 80242DF0 0080882D */ daddu $s1, $a0, $zero -/* 9D9E14 80242DF4 AFBF0034 */ sw $ra, 0x34($sp) -/* 9D9E18 80242DF8 AFB60030 */ sw $s6, 0x30($sp) -/* 9D9E1C 80242DFC AFB5002C */ sw $s5, 0x2c($sp) -/* 9D9E20 80242E00 AFB40028 */ sw $s4, 0x28($sp) -/* 9D9E24 80242E04 AFB30024 */ sw $s3, 0x24($sp) -/* 9D9E28 80242E08 AFB20020 */ sw $s2, 0x20($sp) -/* 9D9E2C 80242E0C AFB00018 */ sw $s0, 0x18($sp) -/* 9D9E30 80242E10 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 9D9E34 80242E14 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 9D9E38 80242E18 8E30000C */ lw $s0, 0xc($s1) -/* 9D9E3C 80242E1C 8E160000 */ lw $s6, ($s0) -/* 9D9E40 80242E20 26100004 */ addiu $s0, $s0, 4 -/* 9D9E44 80242E24 0C0B1EAF */ jal get_variable -/* 9D9E48 80242E28 02C0282D */ daddu $a1, $s6, $zero -/* 9D9E4C 80242E2C 44820000 */ mtc1 $v0, $f0 -/* 9D9E50 80242E30 00000000 */ nop -/* 9D9E54 80242E34 46800020 */ cvt.s.w $f0, $f0 -/* 9D9E58 80242E38 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9D9E5C 80242E3C 8E140000 */ lw $s4, ($s0) -/* 9D9E60 80242E40 26100004 */ addiu $s0, $s0, 4 -/* 9D9E64 80242E44 0220202D */ daddu $a0, $s1, $zero -/* 9D9E68 80242E48 0C0B1EAF */ jal get_variable -/* 9D9E6C 80242E4C 0280282D */ daddu $a1, $s4, $zero -/* 9D9E70 80242E50 0220202D */ daddu $a0, $s1, $zero -/* 9D9E74 80242E54 8E150000 */ lw $s5, ($s0) -/* 9D9E78 80242E58 4482B000 */ mtc1 $v0, $f22 -/* 9D9E7C 80242E5C 00000000 */ nop -/* 9D9E80 80242E60 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9D9E84 80242E64 0C0B1EAF */ jal get_variable -/* 9D9E88 80242E68 02A0282D */ daddu $a1, $s5, $zero -/* 9D9E8C 80242E6C 2404FFFC */ addiu $a0, $zero, -4 -/* 9D9E90 80242E70 44820000 */ mtc1 $v0, $f0 -/* 9D9E94 80242E74 00000000 */ nop -/* 9D9E98 80242E78 46800020 */ cvt.s.w $f0, $f0 -/* 9D9E9C 80242E7C 0C00EABB */ jal get_npc_unsafe -/* 9D9EA0 80242E80 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9D9EA4 80242E84 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 9D9EA8 80242E88 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 9D9EAC 80242E8C 3C014334 */ lui $at, 0x4334 -/* 9D9EB0 80242E90 44816000 */ mtc1 $at, $f12 -/* 9D9EB4 80242E94 00041880 */ sll $v1, $a0, 2 -/* 9D9EB8 80242E98 00641821 */ addu $v1, $v1, $a0 -/* 9D9EBC 80242E9C 00031880 */ sll $v1, $v1, 2 -/* 9D9EC0 80242EA0 00641823 */ subu $v1, $v1, $a0 -/* 9D9EC4 80242EA4 000320C0 */ sll $a0, $v1, 3 -/* 9D9EC8 80242EA8 00641821 */ addu $v1, $v1, $a0 -/* 9D9ECC 80242EAC 000318C0 */ sll $v1, $v1, 3 -/* 9D9ED0 80242EB0 3C01800B */ lui $at, 0x800b -/* 9D9ED4 80242EB4 00230821 */ addu $at, $at, $v1 -/* 9D9ED8 80242EB8 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 9D9EDC 80242EBC 460C0300 */ add.s $f12, $f0, $f12 -/* 9D9EE0 80242EC0 0C00A6C9 */ jal clamp_angle -/* 9D9EE4 80242EC4 0040982D */ daddu $s3, $v0, $zero -/* 9D9EE8 80242EC8 27B00010 */ addiu $s0, $sp, 0x10 -/* 9D9EEC 80242ECC 0200202D */ daddu $a0, $s0, $zero -/* 9D9EF0 80242ED0 27B20014 */ addiu $s2, $sp, 0x14 -/* 9D9EF4 80242ED4 0240282D */ daddu $a1, $s2, $zero -/* 9D9EF8 80242ED8 3C064170 */ lui $a2, 0x4170 -/* 9D9EFC 80242EDC 8E67000C */ lw $a3, 0xc($s3) -/* 9D9F00 80242EE0 0C00A7E7 */ jal add_vec2D_polar -/* 9D9F04 80242EE4 46000506 */ mov.s $f20, $f0 -/* 9D9F08 80242EE8 0200202D */ daddu $a0, $s0, $zero -/* 9D9F0C 80242EEC 3C064120 */ lui $a2, 0x4120 -/* 9D9F10 80242EF0 4407A000 */ mfc1 $a3, $f20 -/* 9D9F14 80242EF4 0C00A7E7 */ jal add_vec2D_polar -/* 9D9F18 80242EF8 0240282D */ daddu $a1, $s2, $zero -/* 9D9F1C 80242EFC 0220202D */ daddu $a0, $s1, $zero -/* 9D9F20 80242F00 C7A00010 */ lwc1 $f0, 0x10($sp) -/* 9D9F24 80242F04 4600008D */ trunc.w.s $f2, $f0 -/* 9D9F28 80242F08 44061000 */ mfc1 $a2, $f2 -/* 9D9F2C 80242F0C 0C0B2026 */ jal set_variable -/* 9D9F30 80242F10 02C0282D */ daddu $a1, $s6, $zero -/* 9D9F34 80242F14 0220202D */ daddu $a0, $s1, $zero -/* 9D9F38 80242F18 4600B08D */ trunc.w.s $f2, $f22 -/* 9D9F3C 80242F1C 44061000 */ mfc1 $a2, $f2 -/* 9D9F40 80242F20 0C0B2026 */ jal set_variable -/* 9D9F44 80242F24 0280282D */ daddu $a1, $s4, $zero -/* 9D9F48 80242F28 0220202D */ daddu $a0, $s1, $zero -/* 9D9F4C 80242F2C C7A00014 */ lwc1 $f0, 0x14($sp) -/* 9D9F50 80242F30 4600008D */ trunc.w.s $f2, $f0 -/* 9D9F54 80242F34 44061000 */ mfc1 $a2, $f2 -/* 9D9F58 80242F38 0C0B2026 */ jal set_variable -/* 9D9F5C 80242F3C 02A0282D */ daddu $a1, $s5, $zero -/* 9D9F60 80242F40 8FBF0034 */ lw $ra, 0x34($sp) -/* 9D9F64 80242F44 8FB60030 */ lw $s6, 0x30($sp) -/* 9D9F68 80242F48 8FB5002C */ lw $s5, 0x2c($sp) -/* 9D9F6C 80242F4C 8FB40028 */ lw $s4, 0x28($sp) -/* 9D9F70 80242F50 8FB30024 */ lw $s3, 0x24($sp) -/* 9D9F74 80242F54 8FB20020 */ lw $s2, 0x20($sp) -/* 9D9F78 80242F58 8FB1001C */ lw $s1, 0x1c($sp) -/* 9D9F7C 80242F5C 8FB00018 */ lw $s0, 0x18($sp) -/* 9D9F80 80242F60 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 9D9F84 80242F64 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 9D9F88 80242F68 24020002 */ addiu $v0, $zero, 2 -/* 9D9F8C 80242F6C 03E00008 */ jr $ra -/* 9D9F90 80242F70 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240D3C_BBDEDC.s b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240D3C_BBDEDC.s deleted file mode 100644 index 89154a92b1..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240D3C_BBDEDC.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_BBDEDC -/* BBDEDC 80240D3C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BBDEE0 80240D40 AFB1001C */ sw $s1, 0x1c($sp) -/* BBDEE4 80240D44 0080882D */ daddu $s1, $a0, $zero -/* BBDEE8 80240D48 AFBF0034 */ sw $ra, 0x34($sp) -/* BBDEEC 80240D4C AFB60030 */ sw $s6, 0x30($sp) -/* BBDEF0 80240D50 AFB5002C */ sw $s5, 0x2c($sp) -/* BBDEF4 80240D54 AFB40028 */ sw $s4, 0x28($sp) -/* BBDEF8 80240D58 AFB30024 */ sw $s3, 0x24($sp) -/* BBDEFC 80240D5C AFB20020 */ sw $s2, 0x20($sp) -/* BBDF00 80240D60 AFB00018 */ sw $s0, 0x18($sp) -/* BBDF04 80240D64 F7B60040 */ sdc1 $f22, 0x40($sp) -/* BBDF08 80240D68 F7B40038 */ sdc1 $f20, 0x38($sp) -/* BBDF0C 80240D6C 8E30000C */ lw $s0, 0xc($s1) -/* BBDF10 80240D70 8E160000 */ lw $s6, ($s0) -/* BBDF14 80240D74 26100004 */ addiu $s0, $s0, 4 -/* BBDF18 80240D78 0C0B1EAF */ jal get_variable -/* BBDF1C 80240D7C 02C0282D */ daddu $a1, $s6, $zero -/* BBDF20 80240D80 44820000 */ mtc1 $v0, $f0 -/* BBDF24 80240D84 00000000 */ nop -/* BBDF28 80240D88 46800020 */ cvt.s.w $f0, $f0 -/* BBDF2C 80240D8C E7A00010 */ swc1 $f0, 0x10($sp) -/* BBDF30 80240D90 8E140000 */ lw $s4, ($s0) -/* BBDF34 80240D94 26100004 */ addiu $s0, $s0, 4 -/* BBDF38 80240D98 0220202D */ daddu $a0, $s1, $zero -/* BBDF3C 80240D9C 0C0B1EAF */ jal get_variable -/* BBDF40 80240DA0 0280282D */ daddu $a1, $s4, $zero -/* BBDF44 80240DA4 0220202D */ daddu $a0, $s1, $zero -/* BBDF48 80240DA8 8E150000 */ lw $s5, ($s0) -/* BBDF4C 80240DAC 4482B000 */ mtc1 $v0, $f22 -/* BBDF50 80240DB0 00000000 */ nop -/* BBDF54 80240DB4 4680B5A0 */ cvt.s.w $f22, $f22 -/* BBDF58 80240DB8 0C0B1EAF */ jal get_variable -/* BBDF5C 80240DBC 02A0282D */ daddu $a1, $s5, $zero -/* BBDF60 80240DC0 2404FFFC */ addiu $a0, $zero, -4 -/* BBDF64 80240DC4 44820000 */ mtc1 $v0, $f0 -/* BBDF68 80240DC8 00000000 */ nop -/* BBDF6C 80240DCC 46800020 */ cvt.s.w $f0, $f0 -/* BBDF70 80240DD0 0C00EABB */ jal get_npc_unsafe -/* BBDF74 80240DD4 E7A00014 */ swc1 $f0, 0x14($sp) -/* BBDF78 80240DD8 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* BBDF7C 80240DDC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* BBDF80 80240DE0 3C014334 */ lui $at, 0x4334 -/* BBDF84 80240DE4 44816000 */ mtc1 $at, $f12 -/* BBDF88 80240DE8 00041880 */ sll $v1, $a0, 2 -/* BBDF8C 80240DEC 00641821 */ addu $v1, $v1, $a0 -/* BBDF90 80240DF0 00031880 */ sll $v1, $v1, 2 -/* BBDF94 80240DF4 00641823 */ subu $v1, $v1, $a0 -/* BBDF98 80240DF8 000320C0 */ sll $a0, $v1, 3 -/* BBDF9C 80240DFC 00641821 */ addu $v1, $v1, $a0 -/* BBDFA0 80240E00 000318C0 */ sll $v1, $v1, 3 -/* BBDFA4 80240E04 3C01800B */ lui $at, 0x800b -/* BBDFA8 80240E08 00230821 */ addu $at, $at, $v1 -/* BBDFAC 80240E0C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* BBDFB0 80240E10 460C0300 */ add.s $f12, $f0, $f12 -/* BBDFB4 80240E14 0C00A6C9 */ jal clamp_angle -/* BBDFB8 80240E18 0040982D */ daddu $s3, $v0, $zero -/* BBDFBC 80240E1C 27B00010 */ addiu $s0, $sp, 0x10 -/* BBDFC0 80240E20 0200202D */ daddu $a0, $s0, $zero -/* BBDFC4 80240E24 27B20014 */ addiu $s2, $sp, 0x14 -/* BBDFC8 80240E28 0240282D */ daddu $a1, $s2, $zero -/* BBDFCC 80240E2C 3C064170 */ lui $a2, 0x4170 -/* BBDFD0 80240E30 8E67000C */ lw $a3, 0xc($s3) -/* BBDFD4 80240E34 0C00A7E7 */ jal add_vec2D_polar -/* BBDFD8 80240E38 46000506 */ mov.s $f20, $f0 -/* BBDFDC 80240E3C 0200202D */ daddu $a0, $s0, $zero -/* BBDFE0 80240E40 3C064120 */ lui $a2, 0x4120 -/* BBDFE4 80240E44 4407A000 */ mfc1 $a3, $f20 -/* BBDFE8 80240E48 0C00A7E7 */ jal add_vec2D_polar -/* BBDFEC 80240E4C 0240282D */ daddu $a1, $s2, $zero -/* BBDFF0 80240E50 0220202D */ daddu $a0, $s1, $zero -/* BBDFF4 80240E54 C7A00010 */ lwc1 $f0, 0x10($sp) -/* BBDFF8 80240E58 4600008D */ trunc.w.s $f2, $f0 -/* BBDFFC 80240E5C 44061000 */ mfc1 $a2, $f2 -/* BBE000 80240E60 0C0B2026 */ jal set_variable -/* BBE004 80240E64 02C0282D */ daddu $a1, $s6, $zero -/* BBE008 80240E68 0220202D */ daddu $a0, $s1, $zero -/* BBE00C 80240E6C 4600B08D */ trunc.w.s $f2, $f22 -/* BBE010 80240E70 44061000 */ mfc1 $a2, $f2 -/* BBE014 80240E74 0C0B2026 */ jal set_variable -/* BBE018 80240E78 0280282D */ daddu $a1, $s4, $zero -/* BBE01C 80240E7C 0220202D */ daddu $a0, $s1, $zero -/* BBE020 80240E80 C7A00014 */ lwc1 $f0, 0x14($sp) -/* BBE024 80240E84 4600008D */ trunc.w.s $f2, $f0 -/* BBE028 80240E88 44061000 */ mfc1 $a2, $f2 -/* BBE02C 80240E8C 0C0B2026 */ jal set_variable -/* BBE030 80240E90 02A0282D */ daddu $a1, $s5, $zero -/* BBE034 80240E94 8FBF0034 */ lw $ra, 0x34($sp) -/* BBE038 80240E98 8FB60030 */ lw $s6, 0x30($sp) -/* BBE03C 80240E9C 8FB5002C */ lw $s5, 0x2c($sp) -/* BBE040 80240EA0 8FB40028 */ lw $s4, 0x28($sp) -/* BBE044 80240EA4 8FB30024 */ lw $s3, 0x24($sp) -/* BBE048 80240EA8 8FB20020 */ lw $s2, 0x20($sp) -/* BBE04C 80240EAC 8FB1001C */ lw $s1, 0x1c($sp) -/* BBE050 80240EB0 8FB00018 */ lw $s0, 0x18($sp) -/* BBE054 80240EB4 D7B60040 */ ldc1 $f22, 0x40($sp) -/* BBE058 80240EB8 D7B40038 */ ldc1 $f20, 0x38($sp) -/* BBE05C 80240EBC 24020002 */ addiu $v0, $zero, 2 -/* BBE060 80240EC0 03E00008 */ jr $ra -/* BBE064 80240EC4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802406CC_BC494C.s b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802406CC_BC494C.s deleted file mode 100644 index 3dfd7e9985..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802406CC_BC494C.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406CC_BC494C -/* BC494C 802406CC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BC4950 802406D0 AFB1001C */ sw $s1, 0x1c($sp) -/* BC4954 802406D4 0080882D */ daddu $s1, $a0, $zero -/* BC4958 802406D8 AFBF0034 */ sw $ra, 0x34($sp) -/* BC495C 802406DC AFB60030 */ sw $s6, 0x30($sp) -/* BC4960 802406E0 AFB5002C */ sw $s5, 0x2c($sp) -/* BC4964 802406E4 AFB40028 */ sw $s4, 0x28($sp) -/* BC4968 802406E8 AFB30024 */ sw $s3, 0x24($sp) -/* BC496C 802406EC AFB20020 */ sw $s2, 0x20($sp) -/* BC4970 802406F0 AFB00018 */ sw $s0, 0x18($sp) -/* BC4974 802406F4 F7B60040 */ sdc1 $f22, 0x40($sp) -/* BC4978 802406F8 F7B40038 */ sdc1 $f20, 0x38($sp) -/* BC497C 802406FC 8E30000C */ lw $s0, 0xc($s1) -/* BC4980 80240700 8E160000 */ lw $s6, ($s0) -/* BC4984 80240704 26100004 */ addiu $s0, $s0, 4 -/* BC4988 80240708 0C0B1EAF */ jal get_variable -/* BC498C 8024070C 02C0282D */ daddu $a1, $s6, $zero -/* BC4990 80240710 44820000 */ mtc1 $v0, $f0 -/* BC4994 80240714 00000000 */ nop -/* BC4998 80240718 46800020 */ cvt.s.w $f0, $f0 -/* BC499C 8024071C E7A00010 */ swc1 $f0, 0x10($sp) -/* BC49A0 80240720 8E140000 */ lw $s4, ($s0) -/* BC49A4 80240724 26100004 */ addiu $s0, $s0, 4 -/* BC49A8 80240728 0220202D */ daddu $a0, $s1, $zero -/* BC49AC 8024072C 0C0B1EAF */ jal get_variable -/* BC49B0 80240730 0280282D */ daddu $a1, $s4, $zero -/* BC49B4 80240734 0220202D */ daddu $a0, $s1, $zero -/* BC49B8 80240738 8E150000 */ lw $s5, ($s0) -/* BC49BC 8024073C 4482B000 */ mtc1 $v0, $f22 -/* BC49C0 80240740 00000000 */ nop -/* BC49C4 80240744 4680B5A0 */ cvt.s.w $f22, $f22 -/* BC49C8 80240748 0C0B1EAF */ jal get_variable -/* BC49CC 8024074C 02A0282D */ daddu $a1, $s5, $zero -/* BC49D0 80240750 2404FFFC */ addiu $a0, $zero, -4 -/* BC49D4 80240754 44820000 */ mtc1 $v0, $f0 -/* BC49D8 80240758 00000000 */ nop -/* BC49DC 8024075C 46800020 */ cvt.s.w $f0, $f0 -/* BC49E0 80240760 0C00EABB */ jal get_npc_unsafe -/* BC49E4 80240764 E7A00014 */ swc1 $f0, 0x14($sp) -/* BC49E8 80240768 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* BC49EC 8024076C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* BC49F0 80240770 3C014334 */ lui $at, 0x4334 -/* BC49F4 80240774 44816000 */ mtc1 $at, $f12 -/* BC49F8 80240778 00041880 */ sll $v1, $a0, 2 -/* BC49FC 8024077C 00641821 */ addu $v1, $v1, $a0 -/* BC4A00 80240780 00031880 */ sll $v1, $v1, 2 -/* BC4A04 80240784 00641823 */ subu $v1, $v1, $a0 -/* BC4A08 80240788 000320C0 */ sll $a0, $v1, 3 -/* BC4A0C 8024078C 00641821 */ addu $v1, $v1, $a0 -/* BC4A10 80240790 000318C0 */ sll $v1, $v1, 3 -/* BC4A14 80240794 3C01800B */ lui $at, 0x800b -/* BC4A18 80240798 00230821 */ addu $at, $at, $v1 -/* BC4A1C 8024079C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* BC4A20 802407A0 460C0300 */ add.s $f12, $f0, $f12 -/* BC4A24 802407A4 0C00A6C9 */ jal clamp_angle -/* BC4A28 802407A8 0040982D */ daddu $s3, $v0, $zero -/* BC4A2C 802407AC 27B00010 */ addiu $s0, $sp, 0x10 -/* BC4A30 802407B0 0200202D */ daddu $a0, $s0, $zero -/* BC4A34 802407B4 27B20014 */ addiu $s2, $sp, 0x14 -/* BC4A38 802407B8 0240282D */ daddu $a1, $s2, $zero -/* BC4A3C 802407BC 3C064170 */ lui $a2, 0x4170 -/* BC4A40 802407C0 8E67000C */ lw $a3, 0xc($s3) -/* BC4A44 802407C4 0C00A7E7 */ jal add_vec2D_polar -/* BC4A48 802407C8 46000506 */ mov.s $f20, $f0 -/* BC4A4C 802407CC 0200202D */ daddu $a0, $s0, $zero -/* BC4A50 802407D0 3C064120 */ lui $a2, 0x4120 -/* BC4A54 802407D4 4407A000 */ mfc1 $a3, $f20 -/* BC4A58 802407D8 0C00A7E7 */ jal add_vec2D_polar -/* BC4A5C 802407DC 0240282D */ daddu $a1, $s2, $zero -/* BC4A60 802407E0 0220202D */ daddu $a0, $s1, $zero -/* BC4A64 802407E4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* BC4A68 802407E8 4600008D */ trunc.w.s $f2, $f0 -/* BC4A6C 802407EC 44061000 */ mfc1 $a2, $f2 -/* BC4A70 802407F0 0C0B2026 */ jal set_variable -/* BC4A74 802407F4 02C0282D */ daddu $a1, $s6, $zero -/* BC4A78 802407F8 0220202D */ daddu $a0, $s1, $zero -/* BC4A7C 802407FC 4600B08D */ trunc.w.s $f2, $f22 -/* BC4A80 80240800 44061000 */ mfc1 $a2, $f2 -/* BC4A84 80240804 0C0B2026 */ jal set_variable -/* BC4A88 80240808 0280282D */ daddu $a1, $s4, $zero -/* BC4A8C 8024080C 0220202D */ daddu $a0, $s1, $zero -/* BC4A90 80240810 C7A00014 */ lwc1 $f0, 0x14($sp) -/* BC4A94 80240814 4600008D */ trunc.w.s $f2, $f0 -/* BC4A98 80240818 44061000 */ mfc1 $a2, $f2 -/* BC4A9C 8024081C 0C0B2026 */ jal set_variable -/* BC4AA0 80240820 02A0282D */ daddu $a1, $s5, $zero -/* BC4AA4 80240824 8FBF0034 */ lw $ra, 0x34($sp) -/* BC4AA8 80240828 8FB60030 */ lw $s6, 0x30($sp) -/* BC4AAC 8024082C 8FB5002C */ lw $s5, 0x2c($sp) -/* BC4AB0 80240830 8FB40028 */ lw $s4, 0x28($sp) -/* BC4AB4 80240834 8FB30024 */ lw $s3, 0x24($sp) -/* BC4AB8 80240838 8FB20020 */ lw $s2, 0x20($sp) -/* BC4ABC 8024083C 8FB1001C */ lw $s1, 0x1c($sp) -/* BC4AC0 80240840 8FB00018 */ lw $s0, 0x18($sp) -/* BC4AC4 80240844 D7B60040 */ ldc1 $f22, 0x40($sp) -/* BC4AC8 80240848 D7B40038 */ ldc1 $f20, 0x38($sp) -/* BC4ACC 8024084C 24020002 */ addiu $v0, $zero, 2 -/* BC4AD0 80240850 03E00008 */ jr $ra -/* BC4AD4 80240854 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802408BC_AB08AC.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802408BC_AB08AC.s deleted file mode 100644 index fd7635d27f..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802408BC_AB08AC.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408BC_AB08AC -/* AB08AC 802408BC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* AB08B0 802408C0 AFB1001C */ sw $s1, 0x1c($sp) -/* AB08B4 802408C4 0080882D */ daddu $s1, $a0, $zero -/* AB08B8 802408C8 AFBF0034 */ sw $ra, 0x34($sp) -/* AB08BC 802408CC AFB60030 */ sw $s6, 0x30($sp) -/* AB08C0 802408D0 AFB5002C */ sw $s5, 0x2c($sp) -/* AB08C4 802408D4 AFB40028 */ sw $s4, 0x28($sp) -/* AB08C8 802408D8 AFB30024 */ sw $s3, 0x24($sp) -/* AB08CC 802408DC AFB20020 */ sw $s2, 0x20($sp) -/* AB08D0 802408E0 AFB00018 */ sw $s0, 0x18($sp) -/* AB08D4 802408E4 F7B60040 */ sdc1 $f22, 0x40($sp) -/* AB08D8 802408E8 F7B40038 */ sdc1 $f20, 0x38($sp) -/* AB08DC 802408EC 8E30000C */ lw $s0, 0xc($s1) -/* AB08E0 802408F0 8E160000 */ lw $s6, ($s0) -/* AB08E4 802408F4 26100004 */ addiu $s0, $s0, 4 -/* AB08E8 802408F8 0C0B1EAF */ jal get_variable -/* AB08EC 802408FC 02C0282D */ daddu $a1, $s6, $zero -/* AB08F0 80240900 44820000 */ mtc1 $v0, $f0 -/* AB08F4 80240904 00000000 */ nop -/* AB08F8 80240908 46800020 */ cvt.s.w $f0, $f0 -/* AB08FC 8024090C E7A00010 */ swc1 $f0, 0x10($sp) -/* AB0900 80240910 8E140000 */ lw $s4, ($s0) -/* AB0904 80240914 26100004 */ addiu $s0, $s0, 4 -/* AB0908 80240918 0220202D */ daddu $a0, $s1, $zero -/* AB090C 8024091C 0C0B1EAF */ jal get_variable -/* AB0910 80240920 0280282D */ daddu $a1, $s4, $zero -/* AB0914 80240924 0220202D */ daddu $a0, $s1, $zero -/* AB0918 80240928 8E150000 */ lw $s5, ($s0) -/* AB091C 8024092C 4482B000 */ mtc1 $v0, $f22 -/* AB0920 80240930 00000000 */ nop -/* AB0924 80240934 4680B5A0 */ cvt.s.w $f22, $f22 -/* AB0928 80240938 0C0B1EAF */ jal get_variable -/* AB092C 8024093C 02A0282D */ daddu $a1, $s5, $zero -/* AB0930 80240940 2404FFFC */ addiu $a0, $zero, -4 -/* AB0934 80240944 44820000 */ mtc1 $v0, $f0 -/* AB0938 80240948 00000000 */ nop -/* AB093C 8024094C 46800020 */ cvt.s.w $f0, $f0 -/* AB0940 80240950 0C00EABB */ jal get_npc_unsafe -/* AB0944 80240954 E7A00014 */ swc1 $f0, 0x14($sp) -/* AB0948 80240958 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* AB094C 8024095C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* AB0950 80240960 3C014334 */ lui $at, 0x4334 -/* AB0954 80240964 44816000 */ mtc1 $at, $f12 -/* AB0958 80240968 00041880 */ sll $v1, $a0, 2 -/* AB095C 8024096C 00641821 */ addu $v1, $v1, $a0 -/* AB0960 80240970 00031880 */ sll $v1, $v1, 2 -/* AB0964 80240974 00641823 */ subu $v1, $v1, $a0 -/* AB0968 80240978 000320C0 */ sll $a0, $v1, 3 -/* AB096C 8024097C 00641821 */ addu $v1, $v1, $a0 -/* AB0970 80240980 000318C0 */ sll $v1, $v1, 3 -/* AB0974 80240984 3C01800B */ lui $at, 0x800b -/* AB0978 80240988 00230821 */ addu $at, $at, $v1 -/* AB097C 8024098C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* AB0980 80240990 460C0300 */ add.s $f12, $f0, $f12 -/* AB0984 80240994 0C00A6C9 */ jal clamp_angle -/* AB0988 80240998 0040982D */ daddu $s3, $v0, $zero -/* AB098C 8024099C 27B00010 */ addiu $s0, $sp, 0x10 -/* AB0990 802409A0 0200202D */ daddu $a0, $s0, $zero -/* AB0994 802409A4 27B20014 */ addiu $s2, $sp, 0x14 -/* AB0998 802409A8 0240282D */ daddu $a1, $s2, $zero -/* AB099C 802409AC 3C064170 */ lui $a2, 0x4170 -/* AB09A0 802409B0 8E67000C */ lw $a3, 0xc($s3) -/* AB09A4 802409B4 0C00A7E7 */ jal add_vec2D_polar -/* AB09A8 802409B8 46000506 */ mov.s $f20, $f0 -/* AB09AC 802409BC 0200202D */ daddu $a0, $s0, $zero -/* AB09B0 802409C0 3C064120 */ lui $a2, 0x4120 -/* AB09B4 802409C4 4407A000 */ mfc1 $a3, $f20 -/* AB09B8 802409C8 0C00A7E7 */ jal add_vec2D_polar -/* AB09BC 802409CC 0240282D */ daddu $a1, $s2, $zero -/* AB09C0 802409D0 0220202D */ daddu $a0, $s1, $zero -/* AB09C4 802409D4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* AB09C8 802409D8 4600008D */ trunc.w.s $f2, $f0 -/* AB09CC 802409DC 44061000 */ mfc1 $a2, $f2 -/* AB09D0 802409E0 0C0B2026 */ jal set_variable -/* AB09D4 802409E4 02C0282D */ daddu $a1, $s6, $zero -/* AB09D8 802409E8 0220202D */ daddu $a0, $s1, $zero -/* AB09DC 802409EC 4600B08D */ trunc.w.s $f2, $f22 -/* AB09E0 802409F0 44061000 */ mfc1 $a2, $f2 -/* AB09E4 802409F4 0C0B2026 */ jal set_variable -/* AB09E8 802409F8 0280282D */ daddu $a1, $s4, $zero -/* AB09EC 802409FC 0220202D */ daddu $a0, $s1, $zero -/* AB09F0 80240A00 C7A00014 */ lwc1 $f0, 0x14($sp) -/* AB09F4 80240A04 4600008D */ trunc.w.s $f2, $f0 -/* AB09F8 80240A08 44061000 */ mfc1 $a2, $f2 -/* AB09FC 80240A0C 0C0B2026 */ jal set_variable -/* AB0A00 80240A10 02A0282D */ daddu $a1, $s5, $zero -/* AB0A04 80240A14 8FBF0034 */ lw $ra, 0x34($sp) -/* AB0A08 80240A18 8FB60030 */ lw $s6, 0x30($sp) -/* AB0A0C 80240A1C 8FB5002C */ lw $s5, 0x2c($sp) -/* AB0A10 80240A20 8FB40028 */ lw $s4, 0x28($sp) -/* AB0A14 80240A24 8FB30024 */ lw $s3, 0x24($sp) -/* AB0A18 80240A28 8FB20020 */ lw $s2, 0x20($sp) -/* AB0A1C 80240A2C 8FB1001C */ lw $s1, 0x1c($sp) -/* AB0A20 80240A30 8FB00018 */ lw $s0, 0x18($sp) -/* AB0A24 80240A34 D7B60040 */ ldc1 $f22, 0x40($sp) -/* AB0A28 80240A38 D7B40038 */ ldc1 $f20, 0x38($sp) -/* AB0A2C 80240A3C 24020002 */ addiu $v0, $zero, 2 -/* AB0A30 80240A40 03E00008 */ jr $ra -/* AB0A34 80240A44 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241884_CF93F4.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241884_CF93F4.s deleted file mode 100644 index aa32e11140..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241884_CF93F4.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241884_CF93F4 -/* CF93F4 80241884 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* CF93F8 80241888 AFB1001C */ sw $s1, 0x1c($sp) -/* CF93FC 8024188C 0080882D */ daddu $s1, $a0, $zero -/* CF9400 80241890 AFBF0034 */ sw $ra, 0x34($sp) -/* CF9404 80241894 AFB60030 */ sw $s6, 0x30($sp) -/* CF9408 80241898 AFB5002C */ sw $s5, 0x2c($sp) -/* CF940C 8024189C AFB40028 */ sw $s4, 0x28($sp) -/* CF9410 802418A0 AFB30024 */ sw $s3, 0x24($sp) -/* CF9414 802418A4 AFB20020 */ sw $s2, 0x20($sp) -/* CF9418 802418A8 AFB00018 */ sw $s0, 0x18($sp) -/* CF941C 802418AC F7B60040 */ sdc1 $f22, 0x40($sp) -/* CF9420 802418B0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* CF9424 802418B4 8E30000C */ lw $s0, 0xc($s1) -/* CF9428 802418B8 8E160000 */ lw $s6, ($s0) -/* CF942C 802418BC 26100004 */ addiu $s0, $s0, 4 -/* CF9430 802418C0 0C0B1EAF */ jal get_variable -/* CF9434 802418C4 02C0282D */ daddu $a1, $s6, $zero -/* CF9438 802418C8 44820000 */ mtc1 $v0, $f0 -/* CF943C 802418CC 00000000 */ nop -/* CF9440 802418D0 46800020 */ cvt.s.w $f0, $f0 -/* CF9444 802418D4 E7A00010 */ swc1 $f0, 0x10($sp) -/* CF9448 802418D8 8E140000 */ lw $s4, ($s0) -/* CF944C 802418DC 26100004 */ addiu $s0, $s0, 4 -/* CF9450 802418E0 0220202D */ daddu $a0, $s1, $zero -/* CF9454 802418E4 0C0B1EAF */ jal get_variable -/* CF9458 802418E8 0280282D */ daddu $a1, $s4, $zero -/* CF945C 802418EC 0220202D */ daddu $a0, $s1, $zero -/* CF9460 802418F0 8E150000 */ lw $s5, ($s0) -/* CF9464 802418F4 4482B000 */ mtc1 $v0, $f22 -/* CF9468 802418F8 00000000 */ nop -/* CF946C 802418FC 4680B5A0 */ cvt.s.w $f22, $f22 -/* CF9470 80241900 0C0B1EAF */ jal get_variable -/* CF9474 80241904 02A0282D */ daddu $a1, $s5, $zero -/* CF9478 80241908 2404FFFC */ addiu $a0, $zero, -4 -/* CF947C 8024190C 44820000 */ mtc1 $v0, $f0 -/* CF9480 80241910 00000000 */ nop -/* CF9484 80241914 46800020 */ cvt.s.w $f0, $f0 -/* CF9488 80241918 0C00EABB */ jal get_npc_unsafe -/* CF948C 8024191C E7A00014 */ swc1 $f0, 0x14($sp) -/* CF9490 80241920 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* CF9494 80241924 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* CF9498 80241928 3C014334 */ lui $at, 0x4334 -/* CF949C 8024192C 44816000 */ mtc1 $at, $f12 -/* CF94A0 80241930 00041880 */ sll $v1, $a0, 2 -/* CF94A4 80241934 00641821 */ addu $v1, $v1, $a0 -/* CF94A8 80241938 00031880 */ sll $v1, $v1, 2 -/* CF94AC 8024193C 00641823 */ subu $v1, $v1, $a0 -/* CF94B0 80241940 000320C0 */ sll $a0, $v1, 3 -/* CF94B4 80241944 00641821 */ addu $v1, $v1, $a0 -/* CF94B8 80241948 000318C0 */ sll $v1, $v1, 3 -/* CF94BC 8024194C 3C01800B */ lui $at, 0x800b -/* CF94C0 80241950 00230821 */ addu $at, $at, $v1 -/* CF94C4 80241954 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* CF94C8 80241958 460C0300 */ add.s $f12, $f0, $f12 -/* CF94CC 8024195C 0C00A6C9 */ jal clamp_angle -/* CF94D0 80241960 0040982D */ daddu $s3, $v0, $zero -/* CF94D4 80241964 27B00010 */ addiu $s0, $sp, 0x10 -/* CF94D8 80241968 0200202D */ daddu $a0, $s0, $zero -/* CF94DC 8024196C 27B20014 */ addiu $s2, $sp, 0x14 -/* CF94E0 80241970 0240282D */ daddu $a1, $s2, $zero -/* CF94E4 80241974 3C064170 */ lui $a2, 0x4170 -/* CF94E8 80241978 8E67000C */ lw $a3, 0xc($s3) -/* CF94EC 8024197C 0C00A7E7 */ jal add_vec2D_polar -/* CF94F0 80241980 46000506 */ mov.s $f20, $f0 -/* CF94F4 80241984 0200202D */ daddu $a0, $s0, $zero -/* CF94F8 80241988 3C064120 */ lui $a2, 0x4120 -/* CF94FC 8024198C 4407A000 */ mfc1 $a3, $f20 -/* CF9500 80241990 0C00A7E7 */ jal add_vec2D_polar -/* CF9504 80241994 0240282D */ daddu $a1, $s2, $zero -/* CF9508 80241998 0220202D */ daddu $a0, $s1, $zero -/* CF950C 8024199C C7A00010 */ lwc1 $f0, 0x10($sp) -/* CF9510 802419A0 4600008D */ trunc.w.s $f2, $f0 -/* CF9514 802419A4 44061000 */ mfc1 $a2, $f2 -/* CF9518 802419A8 0C0B2026 */ jal set_variable -/* CF951C 802419AC 02C0282D */ daddu $a1, $s6, $zero -/* CF9520 802419B0 0220202D */ daddu $a0, $s1, $zero -/* CF9524 802419B4 4600B08D */ trunc.w.s $f2, $f22 -/* CF9528 802419B8 44061000 */ mfc1 $a2, $f2 -/* CF952C 802419BC 0C0B2026 */ jal set_variable -/* CF9530 802419C0 0280282D */ daddu $a1, $s4, $zero -/* CF9534 802419C4 0220202D */ daddu $a0, $s1, $zero -/* CF9538 802419C8 C7A00014 */ lwc1 $f0, 0x14($sp) -/* CF953C 802419CC 4600008D */ trunc.w.s $f2, $f0 -/* CF9540 802419D0 44061000 */ mfc1 $a2, $f2 -/* CF9544 802419D4 0C0B2026 */ jal set_variable -/* CF9548 802419D8 02A0282D */ daddu $a1, $s5, $zero -/* CF954C 802419DC 8FBF0034 */ lw $ra, 0x34($sp) -/* CF9550 802419E0 8FB60030 */ lw $s6, 0x30($sp) -/* CF9554 802419E4 8FB5002C */ lw $s5, 0x2c($sp) -/* CF9558 802419E8 8FB40028 */ lw $s4, 0x28($sp) -/* CF955C 802419EC 8FB30024 */ lw $s3, 0x24($sp) -/* CF9560 802419F0 8FB20020 */ lw $s2, 0x20($sp) -/* CF9564 802419F4 8FB1001C */ lw $s1, 0x1c($sp) -/* CF9568 802419F8 8FB00018 */ lw $s0, 0x18($sp) -/* CF956C 802419FC D7B60040 */ ldc1 $f22, 0x40($sp) -/* CF9570 80241A00 D7B40038 */ ldc1 $f20, 0x38($sp) -/* CF9574 80241A04 24020002 */ addiu $v0, $zero, 2 -/* CF9578 80241A08 03E00008 */ jr $ra -/* CF957C 80241A0C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024233C_D221CC.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024233C_D221CC.s deleted file mode 100644 index e7dedc7441..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024233C_D221CC.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024233C_D221CC -/* D221CC 8024233C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D221D0 80242340 AFB1001C */ sw $s1, 0x1c($sp) -/* D221D4 80242344 0080882D */ daddu $s1, $a0, $zero -/* D221D8 80242348 AFBF0034 */ sw $ra, 0x34($sp) -/* D221DC 8024234C AFB60030 */ sw $s6, 0x30($sp) -/* D221E0 80242350 AFB5002C */ sw $s5, 0x2c($sp) -/* D221E4 80242354 AFB40028 */ sw $s4, 0x28($sp) -/* D221E8 80242358 AFB30024 */ sw $s3, 0x24($sp) -/* D221EC 8024235C AFB20020 */ sw $s2, 0x20($sp) -/* D221F0 80242360 AFB00018 */ sw $s0, 0x18($sp) -/* D221F4 80242364 F7B60040 */ sdc1 $f22, 0x40($sp) -/* D221F8 80242368 F7B40038 */ sdc1 $f20, 0x38($sp) -/* D221FC 8024236C 8E30000C */ lw $s0, 0xc($s1) -/* D22200 80242370 8E160000 */ lw $s6, ($s0) -/* D22204 80242374 26100004 */ addiu $s0, $s0, 4 -/* D22208 80242378 0C0B1EAF */ jal get_variable -/* D2220C 8024237C 02C0282D */ daddu $a1, $s6, $zero -/* D22210 80242380 44820000 */ mtc1 $v0, $f0 -/* D22214 80242384 00000000 */ nop -/* D22218 80242388 46800020 */ cvt.s.w $f0, $f0 -/* D2221C 8024238C E7A00010 */ swc1 $f0, 0x10($sp) -/* D22220 80242390 8E140000 */ lw $s4, ($s0) -/* D22224 80242394 26100004 */ addiu $s0, $s0, 4 -/* D22228 80242398 0220202D */ daddu $a0, $s1, $zero -/* D2222C 8024239C 0C0B1EAF */ jal get_variable -/* D22230 802423A0 0280282D */ daddu $a1, $s4, $zero -/* D22234 802423A4 0220202D */ daddu $a0, $s1, $zero -/* D22238 802423A8 8E150000 */ lw $s5, ($s0) -/* D2223C 802423AC 4482B000 */ mtc1 $v0, $f22 -/* D22240 802423B0 00000000 */ nop -/* D22244 802423B4 4680B5A0 */ cvt.s.w $f22, $f22 -/* D22248 802423B8 0C0B1EAF */ jal get_variable -/* D2224C 802423BC 02A0282D */ daddu $a1, $s5, $zero -/* D22250 802423C0 2404FFFC */ addiu $a0, $zero, -4 -/* D22254 802423C4 44820000 */ mtc1 $v0, $f0 -/* D22258 802423C8 00000000 */ nop -/* D2225C 802423CC 46800020 */ cvt.s.w $f0, $f0 -/* D22260 802423D0 0C00EABB */ jal get_npc_unsafe -/* D22264 802423D4 E7A00014 */ swc1 $f0, 0x14($sp) -/* D22268 802423D8 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* D2226C 802423DC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* D22270 802423E0 3C014334 */ lui $at, 0x4334 -/* D22274 802423E4 44816000 */ mtc1 $at, $f12 -/* D22278 802423E8 00041880 */ sll $v1, $a0, 2 -/* D2227C 802423EC 00641821 */ addu $v1, $v1, $a0 -/* D22280 802423F0 00031880 */ sll $v1, $v1, 2 -/* D22284 802423F4 00641823 */ subu $v1, $v1, $a0 -/* D22288 802423F8 000320C0 */ sll $a0, $v1, 3 -/* D2228C 802423FC 00641821 */ addu $v1, $v1, $a0 -/* D22290 80242400 000318C0 */ sll $v1, $v1, 3 -/* D22294 80242404 3C01800B */ lui $at, 0x800b -/* D22298 80242408 00230821 */ addu $at, $at, $v1 -/* D2229C 8024240C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* D222A0 80242410 460C0300 */ add.s $f12, $f0, $f12 -/* D222A4 80242414 0C00A6C9 */ jal clamp_angle -/* D222A8 80242418 0040982D */ daddu $s3, $v0, $zero -/* D222AC 8024241C 27B00010 */ addiu $s0, $sp, 0x10 -/* D222B0 80242420 0200202D */ daddu $a0, $s0, $zero -/* D222B4 80242424 27B20014 */ addiu $s2, $sp, 0x14 -/* D222B8 80242428 0240282D */ daddu $a1, $s2, $zero -/* D222BC 8024242C 3C064170 */ lui $a2, 0x4170 -/* D222C0 80242430 8E67000C */ lw $a3, 0xc($s3) -/* D222C4 80242434 0C00A7E7 */ jal add_vec2D_polar -/* D222C8 80242438 46000506 */ mov.s $f20, $f0 -/* D222CC 8024243C 0200202D */ daddu $a0, $s0, $zero -/* D222D0 80242440 3C064120 */ lui $a2, 0x4120 -/* D222D4 80242444 4407A000 */ mfc1 $a3, $f20 -/* D222D8 80242448 0C00A7E7 */ jal add_vec2D_polar -/* D222DC 8024244C 0240282D */ daddu $a1, $s2, $zero -/* D222E0 80242450 0220202D */ daddu $a0, $s1, $zero -/* D222E4 80242454 C7A00010 */ lwc1 $f0, 0x10($sp) -/* D222E8 80242458 4600008D */ trunc.w.s $f2, $f0 -/* D222EC 8024245C 44061000 */ mfc1 $a2, $f2 -/* D222F0 80242460 0C0B2026 */ jal set_variable -/* D222F4 80242464 02C0282D */ daddu $a1, $s6, $zero -/* D222F8 80242468 0220202D */ daddu $a0, $s1, $zero -/* D222FC 8024246C 4600B08D */ trunc.w.s $f2, $f22 -/* D22300 80242470 44061000 */ mfc1 $a2, $f2 -/* D22304 80242474 0C0B2026 */ jal set_variable -/* D22308 80242478 0280282D */ daddu $a1, $s4, $zero -/* D2230C 8024247C 0220202D */ daddu $a0, $s1, $zero -/* D22310 80242480 C7A00014 */ lwc1 $f0, 0x14($sp) -/* D22314 80242484 4600008D */ trunc.w.s $f2, $f0 -/* D22318 80242488 44061000 */ mfc1 $a2, $f2 -/* D2231C 8024248C 0C0B2026 */ jal set_variable -/* D22320 80242490 02A0282D */ daddu $a1, $s5, $zero -/* D22324 80242494 8FBF0034 */ lw $ra, 0x34($sp) -/* D22328 80242498 8FB60030 */ lw $s6, 0x30($sp) -/* D2232C 8024249C 8FB5002C */ lw $s5, 0x2c($sp) -/* D22330 802424A0 8FB40028 */ lw $s4, 0x28($sp) -/* D22334 802424A4 8FB30024 */ lw $s3, 0x24($sp) -/* D22338 802424A8 8FB20020 */ lw $s2, 0x20($sp) -/* D2233C 802424AC 8FB1001C */ lw $s1, 0x1c($sp) -/* D22340 802424B0 8FB00018 */ lw $s0, 0x18($sp) -/* D22344 802424B4 D7B60040 */ ldc1 $f22, 0x40($sp) -/* D22348 802424B8 D7B40038 */ ldc1 $f20, 0x38($sp) -/* D2234C 802424BC 24020002 */ addiu $v0, $zero, 2 -/* D22350 802424C0 03E00008 */ jr $ra -/* D22354 802424C4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802413D4_940984.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802413D4_940984.s deleted file mode 100644 index 5c51ac757b..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802413D4_940984.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413D4_940984 -/* 940984 802413D4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 940988 802413D8 AFB1001C */ sw $s1, 0x1c($sp) -/* 94098C 802413DC 0080882D */ daddu $s1, $a0, $zero -/* 940990 802413E0 AFBF0034 */ sw $ra, 0x34($sp) -/* 940994 802413E4 AFB60030 */ sw $s6, 0x30($sp) -/* 940998 802413E8 AFB5002C */ sw $s5, 0x2c($sp) -/* 94099C 802413EC AFB40028 */ sw $s4, 0x28($sp) -/* 9409A0 802413F0 AFB30024 */ sw $s3, 0x24($sp) -/* 9409A4 802413F4 AFB20020 */ sw $s2, 0x20($sp) -/* 9409A8 802413F8 AFB00018 */ sw $s0, 0x18($sp) -/* 9409AC 802413FC F7B60040 */ sdc1 $f22, 0x40($sp) -/* 9409B0 80241400 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 9409B4 80241404 8E30000C */ lw $s0, 0xc($s1) -/* 9409B8 80241408 8E160000 */ lw $s6, ($s0) -/* 9409BC 8024140C 26100004 */ addiu $s0, $s0, 4 -/* 9409C0 80241410 0C0B1EAF */ jal get_variable -/* 9409C4 80241414 02C0282D */ daddu $a1, $s6, $zero -/* 9409C8 80241418 44820000 */ mtc1 $v0, $f0 -/* 9409CC 8024141C 00000000 */ nop -/* 9409D0 80241420 46800020 */ cvt.s.w $f0, $f0 -/* 9409D4 80241424 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9409D8 80241428 8E140000 */ lw $s4, ($s0) -/* 9409DC 8024142C 26100004 */ addiu $s0, $s0, 4 -/* 9409E0 80241430 0220202D */ daddu $a0, $s1, $zero -/* 9409E4 80241434 0C0B1EAF */ jal get_variable -/* 9409E8 80241438 0280282D */ daddu $a1, $s4, $zero -/* 9409EC 8024143C 0220202D */ daddu $a0, $s1, $zero -/* 9409F0 80241440 8E150000 */ lw $s5, ($s0) -/* 9409F4 80241444 4482B000 */ mtc1 $v0, $f22 -/* 9409F8 80241448 00000000 */ nop -/* 9409FC 8024144C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 940A00 80241450 0C0B1EAF */ jal get_variable -/* 940A04 80241454 02A0282D */ daddu $a1, $s5, $zero -/* 940A08 80241458 2404FFFC */ addiu $a0, $zero, -4 -/* 940A0C 8024145C 44820000 */ mtc1 $v0, $f0 -/* 940A10 80241460 00000000 */ nop -/* 940A14 80241464 46800020 */ cvt.s.w $f0, $f0 -/* 940A18 80241468 0C00EABB */ jal get_npc_unsafe -/* 940A1C 8024146C E7A00014 */ swc1 $f0, 0x14($sp) -/* 940A20 80241470 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 940A24 80241474 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 940A28 80241478 3C014334 */ lui $at, 0x4334 -/* 940A2C 8024147C 44816000 */ mtc1 $at, $f12 -/* 940A30 80241480 00041880 */ sll $v1, $a0, 2 -/* 940A34 80241484 00641821 */ addu $v1, $v1, $a0 -/* 940A38 80241488 00031880 */ sll $v1, $v1, 2 -/* 940A3C 8024148C 00641823 */ subu $v1, $v1, $a0 -/* 940A40 80241490 000320C0 */ sll $a0, $v1, 3 -/* 940A44 80241494 00641821 */ addu $v1, $v1, $a0 -/* 940A48 80241498 000318C0 */ sll $v1, $v1, 3 -/* 940A4C 8024149C 3C01800B */ lui $at, 0x800b -/* 940A50 802414A0 00230821 */ addu $at, $at, $v1 -/* 940A54 802414A4 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 940A58 802414A8 460C0300 */ add.s $f12, $f0, $f12 -/* 940A5C 802414AC 0C00A6C9 */ jal clamp_angle -/* 940A60 802414B0 0040982D */ daddu $s3, $v0, $zero -/* 940A64 802414B4 27B00010 */ addiu $s0, $sp, 0x10 -/* 940A68 802414B8 0200202D */ daddu $a0, $s0, $zero -/* 940A6C 802414BC 27B20014 */ addiu $s2, $sp, 0x14 -/* 940A70 802414C0 0240282D */ daddu $a1, $s2, $zero -/* 940A74 802414C4 3C064170 */ lui $a2, 0x4170 -/* 940A78 802414C8 8E67000C */ lw $a3, 0xc($s3) -/* 940A7C 802414CC 0C00A7E7 */ jal add_vec2D_polar -/* 940A80 802414D0 46000506 */ mov.s $f20, $f0 -/* 940A84 802414D4 0200202D */ daddu $a0, $s0, $zero -/* 940A88 802414D8 3C064120 */ lui $a2, 0x4120 -/* 940A8C 802414DC 4407A000 */ mfc1 $a3, $f20 -/* 940A90 802414E0 0C00A7E7 */ jal add_vec2D_polar -/* 940A94 802414E4 0240282D */ daddu $a1, $s2, $zero -/* 940A98 802414E8 0220202D */ daddu $a0, $s1, $zero -/* 940A9C 802414EC C7A00010 */ lwc1 $f0, 0x10($sp) -/* 940AA0 802414F0 4600008D */ trunc.w.s $f2, $f0 -/* 940AA4 802414F4 44061000 */ mfc1 $a2, $f2 -/* 940AA8 802414F8 0C0B2026 */ jal set_variable -/* 940AAC 802414FC 02C0282D */ daddu $a1, $s6, $zero -/* 940AB0 80241500 0220202D */ daddu $a0, $s1, $zero -/* 940AB4 80241504 4600B08D */ trunc.w.s $f2, $f22 -/* 940AB8 80241508 44061000 */ mfc1 $a2, $f2 -/* 940ABC 8024150C 0C0B2026 */ jal set_variable -/* 940AC0 80241510 0280282D */ daddu $a1, $s4, $zero -/* 940AC4 80241514 0220202D */ daddu $a0, $s1, $zero -/* 940AC8 80241518 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 940ACC 8024151C 4600008D */ trunc.w.s $f2, $f0 -/* 940AD0 80241520 44061000 */ mfc1 $a2, $f2 -/* 940AD4 80241524 0C0B2026 */ jal set_variable -/* 940AD8 80241528 02A0282D */ daddu $a1, $s5, $zero -/* 940ADC 8024152C 8FBF0034 */ lw $ra, 0x34($sp) -/* 940AE0 80241530 8FB60030 */ lw $s6, 0x30($sp) -/* 940AE4 80241534 8FB5002C */ lw $s5, 0x2c($sp) -/* 940AE8 80241538 8FB40028 */ lw $s4, 0x28($sp) -/* 940AEC 8024153C 8FB30024 */ lw $s3, 0x24($sp) -/* 940AF0 80241540 8FB20020 */ lw $s2, 0x20($sp) -/* 940AF4 80241544 8FB1001C */ lw $s1, 0x1c($sp) -/* 940AF8 80241548 8FB00018 */ lw $s0, 0x18($sp) -/* 940AFC 8024154C D7B60040 */ ldc1 $f22, 0x40($sp) -/* 940B00 80241550 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 940B04 80241554 24020002 */ addiu $v0, $zero, 2 -/* 940B08 80241558 03E00008 */ jr $ra -/* 940B0C 8024155C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_8024059C_94646C.s b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_8024059C_94646C.s deleted file mode 100644 index c99958a73b..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_8024059C_94646C.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024059C_94646C -/* 94646C 8024059C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 946470 802405A0 AFB1001C */ sw $s1, 0x1c($sp) -/* 946474 802405A4 0080882D */ daddu $s1, $a0, $zero -/* 946478 802405A8 AFBF0034 */ sw $ra, 0x34($sp) -/* 94647C 802405AC AFB60030 */ sw $s6, 0x30($sp) -/* 946480 802405B0 AFB5002C */ sw $s5, 0x2c($sp) -/* 946484 802405B4 AFB40028 */ sw $s4, 0x28($sp) -/* 946488 802405B8 AFB30024 */ sw $s3, 0x24($sp) -/* 94648C 802405BC AFB20020 */ sw $s2, 0x20($sp) -/* 946490 802405C0 AFB00018 */ sw $s0, 0x18($sp) -/* 946494 802405C4 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 946498 802405C8 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 94649C 802405CC 8E30000C */ lw $s0, 0xc($s1) -/* 9464A0 802405D0 8E160000 */ lw $s6, ($s0) -/* 9464A4 802405D4 26100004 */ addiu $s0, $s0, 4 -/* 9464A8 802405D8 0C0B1EAF */ jal get_variable -/* 9464AC 802405DC 02C0282D */ daddu $a1, $s6, $zero -/* 9464B0 802405E0 44820000 */ mtc1 $v0, $f0 -/* 9464B4 802405E4 00000000 */ nop -/* 9464B8 802405E8 46800020 */ cvt.s.w $f0, $f0 -/* 9464BC 802405EC E7A00010 */ swc1 $f0, 0x10($sp) -/* 9464C0 802405F0 8E140000 */ lw $s4, ($s0) -/* 9464C4 802405F4 26100004 */ addiu $s0, $s0, 4 -/* 9464C8 802405F8 0220202D */ daddu $a0, $s1, $zero -/* 9464CC 802405FC 0C0B1EAF */ jal get_variable -/* 9464D0 80240600 0280282D */ daddu $a1, $s4, $zero -/* 9464D4 80240604 0220202D */ daddu $a0, $s1, $zero -/* 9464D8 80240608 8E150000 */ lw $s5, ($s0) -/* 9464DC 8024060C 4482B000 */ mtc1 $v0, $f22 -/* 9464E0 80240610 00000000 */ nop -/* 9464E4 80240614 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9464E8 80240618 0C0B1EAF */ jal get_variable -/* 9464EC 8024061C 02A0282D */ daddu $a1, $s5, $zero -/* 9464F0 80240620 2404FFFC */ addiu $a0, $zero, -4 -/* 9464F4 80240624 44820000 */ mtc1 $v0, $f0 -/* 9464F8 80240628 00000000 */ nop -/* 9464FC 8024062C 46800020 */ cvt.s.w $f0, $f0 -/* 946500 80240630 0C00EABB */ jal get_npc_unsafe -/* 946504 80240634 E7A00014 */ swc1 $f0, 0x14($sp) -/* 946508 80240638 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 94650C 8024063C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 946510 80240640 3C014334 */ lui $at, 0x4334 -/* 946514 80240644 44816000 */ mtc1 $at, $f12 -/* 946518 80240648 00041880 */ sll $v1, $a0, 2 -/* 94651C 8024064C 00641821 */ addu $v1, $v1, $a0 -/* 946520 80240650 00031880 */ sll $v1, $v1, 2 -/* 946524 80240654 00641823 */ subu $v1, $v1, $a0 -/* 946528 80240658 000320C0 */ sll $a0, $v1, 3 -/* 94652C 8024065C 00641821 */ addu $v1, $v1, $a0 -/* 946530 80240660 000318C0 */ sll $v1, $v1, 3 -/* 946534 80240664 3C01800B */ lui $at, 0x800b -/* 946538 80240668 00230821 */ addu $at, $at, $v1 -/* 94653C 8024066C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 946540 80240670 460C0300 */ add.s $f12, $f0, $f12 -/* 946544 80240674 0C00A6C9 */ jal clamp_angle -/* 946548 80240678 0040982D */ daddu $s3, $v0, $zero -/* 94654C 8024067C 27B00010 */ addiu $s0, $sp, 0x10 -/* 946550 80240680 0200202D */ daddu $a0, $s0, $zero -/* 946554 80240684 27B20014 */ addiu $s2, $sp, 0x14 -/* 946558 80240688 0240282D */ daddu $a1, $s2, $zero -/* 94655C 8024068C 3C064170 */ lui $a2, 0x4170 -/* 946560 80240690 8E67000C */ lw $a3, 0xc($s3) -/* 946564 80240694 0C00A7E7 */ jal add_vec2D_polar -/* 946568 80240698 46000506 */ mov.s $f20, $f0 -/* 94656C 8024069C 0200202D */ daddu $a0, $s0, $zero -/* 946570 802406A0 3C064120 */ lui $a2, 0x4120 -/* 946574 802406A4 4407A000 */ mfc1 $a3, $f20 -/* 946578 802406A8 0C00A7E7 */ jal add_vec2D_polar -/* 94657C 802406AC 0240282D */ daddu $a1, $s2, $zero -/* 946580 802406B0 0220202D */ daddu $a0, $s1, $zero -/* 946584 802406B4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* 946588 802406B8 4600008D */ trunc.w.s $f2, $f0 -/* 94658C 802406BC 44061000 */ mfc1 $a2, $f2 -/* 946590 802406C0 0C0B2026 */ jal set_variable -/* 946594 802406C4 02C0282D */ daddu $a1, $s6, $zero -/* 946598 802406C8 0220202D */ daddu $a0, $s1, $zero -/* 94659C 802406CC 4600B08D */ trunc.w.s $f2, $f22 -/* 9465A0 802406D0 44061000 */ mfc1 $a2, $f2 -/* 9465A4 802406D4 0C0B2026 */ jal set_variable -/* 9465A8 802406D8 0280282D */ daddu $a1, $s4, $zero -/* 9465AC 802406DC 0220202D */ daddu $a0, $s1, $zero -/* 9465B0 802406E0 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 9465B4 802406E4 4600008D */ trunc.w.s $f2, $f0 -/* 9465B8 802406E8 44061000 */ mfc1 $a2, $f2 -/* 9465BC 802406EC 0C0B2026 */ jal set_variable -/* 9465C0 802406F0 02A0282D */ daddu $a1, $s5, $zero -/* 9465C4 802406F4 8FBF0034 */ lw $ra, 0x34($sp) -/* 9465C8 802406F8 8FB60030 */ lw $s6, 0x30($sp) -/* 9465CC 802406FC 8FB5002C */ lw $s5, 0x2c($sp) -/* 9465D0 80240700 8FB40028 */ lw $s4, 0x28($sp) -/* 9465D4 80240704 8FB30024 */ lw $s3, 0x24($sp) -/* 9465D8 80240708 8FB20020 */ lw $s2, 0x20($sp) -/* 9465DC 8024070C 8FB1001C */ lw $s1, 0x1c($sp) -/* 9465E0 80240710 8FB00018 */ lw $s0, 0x18($sp) -/* 9465E4 80240714 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 9465E8 80240718 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 9465EC 8024071C 24020002 */ addiu $v0, $zero, 2 -/* 9465F0 80240720 03E00008 */ jr $ra -/* 9465F4 80240724 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 39d3851a58..e1373cf629 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -88,7 +88,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242858_95DA58); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242E88_95E088); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80243014_95E214); diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 3dbe234741..f1e8a4fae7 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -106,7 +106,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243778_96C938); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243870_96CA30); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802439FC_96CBBC); diff --git a/src/world/area_hos/hos_06/A397F0.c b/src/world/area_hos/hos_06/A397F0.c index a6d193b84b..fe7f99d32e 100644 --- a/src/world/area_hos/hos_06/A397F0.c +++ b/src/world/area_hos/hos_06/A397F0.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802406E0_A39BC0); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_8024086C_A39D4C); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802409F8_A39ED8); diff --git a/src/world/area_jan/jan_00/B20540.c b/src/world/area_jan/jan_00/B20540.c index 3da47d1a36..cfbc2e292a 100644 --- a/src/world/area_jan/jan_00/B20540.c +++ b/src/world/area_jan/jan_00/B20540.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_802407C4_B20D04); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240950_B20E90); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240ADC_B2101C); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 66cea20d54..21569997fa 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -126,7 +126,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242C00_B377D0); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242D20_B378F0); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242EAC_B37A7C); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 372573d996..eb04df8171 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -104,7 +104,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242394_8B2404); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242514_8B2584); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802426A0_8B2710); diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index ba8680ebea..b1f2343dab 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_8024239C_C5CADC); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242528_C5CC68); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802426B4_C5CDF4); diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index b09ee695d4..e2cc1bee5a 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -58,7 +58,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024296C_C6367C); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242AF8_C63808); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242C84_C63994); diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index 4097fa2a6e..c9a30075bc 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -58,7 +58,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024367C_C7A35C); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243808_C7A4E8); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243994_C7A674); diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index 9929ba5659..495fbe8312 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -58,7 +58,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_8024296C_C8841C); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242AF8_C885A8); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242C84_C88734); diff --git a/src/world/area_kzn/kzn_19/C8DBB0.c b/src/world/area_kzn/kzn_19/C8DBB0.c index bf61bad287..8f1f330e34 100644 --- a/src/world/area_kzn/kzn_19/C8DBB0.c +++ b/src/world/area_kzn/kzn_19/C8DBB0.c @@ -48,7 +48,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241838_C8F3E8); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802419C4_C8F574); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241B50_C8F700); diff --git a/src/world/area_kzn/kzn_20/C96240.c b/src/world/area_kzn/kzn_20/C96240.c index a59b0f533e..65c2519f7d 100644 --- a/src/world/area_kzn/kzn_20/C96240.c +++ b/src/world/area_kzn/kzn_20/C96240.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_802406E0_C96610); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_8024086C_C9679C); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_802409F8_C96928); diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index 0d497c8be1..6b287ce9c7 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -64,7 +64,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241A18_7EC728); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(ApiStatus, "world/area_mac/mac_00/7EB340", func_80241BA4_7EC8B4, ScriptInstance* script, s32 isInitialCall); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241D30_7ECA40); diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index 8de45985e0..76db4670a0 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_802437D0_7EE4E0); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_8024395C_7EE66C); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243AE8_7EE7F8); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index b3dd6a74ee..e868f6ba05 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -124,7 +124,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243D60_8045E0); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243EEC_80476C); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244078_8048F8); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index 58eb66c3dd..e927011404 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -100,7 +100,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802430D0_826390); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802431F4_8264B4); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80243380_826640); diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index badb04a0ac..b5cf44a5fa 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -64,7 +64,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417FC_832FFC); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241988_833188); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241B14_833314); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index b954aa1d4a..8b34cf3058 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -96,7 +96,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242708_854878); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242894_854A04); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A20_854B90); diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 144c25bcea..275e2c6cbb 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -102,7 +102,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802420B4_9C7494); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242240_9C7620); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802423CC_9C77AC); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index 14f5db9dd4..0b50ed33b0 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -86,7 +86,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C5C_9D9C7C); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242DE8_9D9E08); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242F74_9D9F94); diff --git a/src/world/area_obk/obk_01/BBD980.c b/src/world/area_obk/obk_01/BBD980.c index 46bfed5ed9..dd192270bc 100644 --- a/src/world/area_obk/obk_01/BBD980.c +++ b/src/world/area_obk/obk_01/BBD980.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240BB0_BBDD50); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240D3C_BBDEDC); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240EC8_BBE068); diff --git a/src/world/area_obk/obk_03/BC43F0.c b/src/world/area_obk/obk_03/BC43F0.c index 0e85d93df8..3bb996ce90 100644 --- a/src/world/area_obk/obk_03/BC43F0.c +++ b/src/world/area_obk/obk_03/BC43F0.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240540_BC47C0); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_802406CC_BC494C); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240858_BC4AD8); diff --git a/src/world/area_osr/osr_01/AB0350.c b/src/world/area_osr/osr_01/AB0350.c index 5b03d8b939..d9b4085158 100644 --- a/src/world/area_osr/osr_01/AB0350.c +++ b/src/world/area_osr/osr_01/AB0350.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240730_AB0720); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802408BC_AB08AC); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240A48_AB0A38); diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index f7fc1e9651..e5eb7d7d22 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -64,7 +64,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241764_CF92D4); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241884_CF93F4); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241A10_CF9580); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index 8819e388d9..74c508fda8 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -60,7 +60,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242244_D220D4); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_8024233C_D221CC); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802424C8_D22358); diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index 6e1d4e05af..78d7d58202 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241248_9407F8); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802413D4_940984); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241560_940B10); diff --git a/src/world/area_sbk/sbk_34/945F10.c b/src/world/area_sbk/sbk_34/945F10.c index 94bf72c79d..4e4ba5cbc0 100644 --- a/src/world/area_sbk/sbk_34/945F10.c +++ b/src/world/area_sbk/sbk_34/945F10.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240410_9462E0); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_8024059C_94646C); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240728_9465F8); diff --git a/src/world/common/UnkYawFunc.inc.c b/src/world/common/UnkYawFunc.inc.c new file mode 100644 index 0000000000..041edcf2a2 --- /dev/null +++ b/src/world/common/UnkYawFunc.inc.c @@ -0,0 +1,22 @@ +#include "common.h" + +static ApiStatus UnkYawFunc(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 a0 = *args++; + f32 a = get_variable(script, a0); + s32 a1 = *args++; + f32 b = get_variable(script, a1); + s32 a2 = *args++; + f32 c = get_variable(script, a2); + Npc* partner = get_npc_unsafe(NpcId_PARTNER); + f32 currentCamYaw = clamp_angle(CURRENT_CAM->currentYaw + 180.0f); + + add_vec2D_polar(&a, &c, 15.0f, partner->yaw); + add_vec2D_polar(&a, &c, 10.0f, currentCamYaw); + + set_variable(script, a0, a); + set_variable(script, a1, b); + set_variable(script, a2, c); + + return ApiStatus_DONE2; +} From 7e24097436b7d8045db8806fff3f8b5697a05c21 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 22 Nov 2020 10:53:16 -0500 Subject: [PATCH 23/38] SetPartnerFlagsA0000 --- .../pra_01/D4D060/func_80240E84_D4DEC4.s | 18 ---------------- .../pra_02/D50010/func_80240E84_D50E74.s | 18 ---------------- .../pra_05/D55BD0/func_80240E84_D56A34.s | 18 ---------------- .../pra_06/D57430/func_80240EB4_D582E4.s | 18 ---------------- .../pra_09/D588B0/func_80240E84_D59714.s | 18 ---------------- .../pra_10/D5F2D0/func_80240E84_D60134.s | 18 ---------------- .../pra_11/D61520/func_80240E84_D62384.s | 18 ---------------- .../pra_12/D62D10/func_80240EB4_D63BC4.s | 18 ---------------- .../pra_13/D64600/func_80240E84_D65464.s | 18 ---------------- .../pra_14/D67D20/func_80240E84_D68B84.s | 18 ---------------- .../pra_16/D69B40/func_80240E84_D6A9A4.s | 18 ---------------- .../pra_18/D6B640/func_80240E84_D6C4A4.s | 18 ---------------- .../pra_19/D6E9D0/func_80240E84_D6F834.s | 18 ---------------- .../pra_20/D763C0/func_80240E84_D77224.s | 18 ---------------- .../pra_27/D799F0/func_80240EB4_D7A8A4.s | 18 ---------------- .../pra_28/D7B2A0/func_80240EB4_D7C154.s | 18 ---------------- .../pra_29/D7CB70/func_80240E84_D7D9D4.s | 18 ---------------- .../pra_33/D89700/func_80240E84_D8A564.s | 18 ---------------- .../pra_34/D8B3D0/func_80240E84_D8C234.s | 18 ---------------- .../pra_35/D8D270/func_80240E84_D8E0D4.s | 18 ---------------- .../pra_36/D91700/func_80240EB4_D925B4.s | 18 ---------------- .../pra_37/D92F40/func_80240EB4_D93DF4.s | 18 ---------------- .../pra_38/D955F0/func_80240EB4_D964A4.s | 18 ---------------- .../pra_39/D97890/func_80240EB4_D98744.s | 18 ---------------- .../pra_40/D999D0/func_80240E84_D9A834.s | 18 ---------------- .../tst_11/B1CA50/func_80240730_B1D180.s | 21 ------------------- src/world/area_pra/pra_01/D4D060.c | 2 +- src/world/area_pra/pra_02/D50010.c | 2 +- src/world/area_pra/pra_05/D55BD0.c | 2 +- src/world/area_pra/pra_06/D57430.c | 2 +- src/world/area_pra/pra_09/D588B0.c | 2 +- src/world/area_pra/pra_10/D5F2D0.c | 2 +- src/world/area_pra/pra_11/D61520.c | 2 +- src/world/area_pra/pra_12/D62D10.c | 2 +- src/world/area_pra/pra_13/D64600.c | 2 +- src/world/area_pra/pra_14/D67D20.c | 2 +- src/world/area_pra/pra_16/D69B40.c | 2 +- src/world/area_pra/pra_18/D6B640.c | 2 +- src/world/area_pra/pra_19/D6E9D0.c | 2 +- src/world/area_pra/pra_20/D763C0.c | 2 +- src/world/area_pra/pra_27/D799F0.c | 2 +- src/world/area_pra/pra_28/D7B2A0.c | 2 +- src/world/area_pra/pra_29/D7CB70.c | 2 +- src/world/area_pra/pra_33/D89700.c | 2 +- src/world/area_pra/pra_34/D8B3D0.c | 2 +- src/world/area_pra/pra_35/D8D270.c | 2 +- src/world/area_pra/pra_36/D91700.c | 2 +- src/world/area_pra/pra_37/D92F40.c | 2 +- src/world/area_pra/pra_38/D955F0.c | 2 +- src/world/area_pra/pra_39/D97890.c | 2 +- src/world/area_pra/pra_40/D999D0.c | 2 +- src/world/area_tst/tst_11/B1CA50.c | 2 +- src/world/common/SetPartnerFlagsA0000.inc.c | 9 ++++++++ 53 files changed, 35 insertions(+), 497 deletions(-) delete mode 100644 asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240E84_D4DEC4.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240E84_D50E74.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240E84_D56A34.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EB4_D582E4.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240E84_D59714.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240E84_D60134.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240E84_D62384.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240EB4_D63BC4.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240E84_D65464.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240E84_D68B84.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240E84_D6A9A4.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240E84_D6C4A4.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240E84_D6F834.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240E84_D77224.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240EB4_D7A8A4.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240EB4_D7C154.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240E84_D7D9D4.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240E84_D8A564.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240E84_D8C234.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240E84_D8E0D4.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240EB4_D925B4.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240EB4_D93DF4.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240EB4_D964A4.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240EB4_D98744.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240E84_D9A834.s delete mode 100644 asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240730_B1D180.s create mode 100644 src/world/common/SetPartnerFlagsA0000.inc.c diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240E84_D4DEC4.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240E84_D4DEC4.s deleted file mode 100644 index 8dfb5b4304..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240E84_D4DEC4.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D4DEC4 -/* D4DEC4 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4DEC8 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D4DECC 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D4DED0 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D4DED4 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D4DED8 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D4DEDC 80240E9C 3C03000A */ lui $v1, 0xa -/* D4DEE0 80240EA0 8C820000 */ lw $v0, ($a0) -/* D4DEE4 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D4DEE8 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D4DEEC 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D4DEF0 80240EB0 03E00008 */ jr $ra -/* D4DEF4 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240E84_D50E74.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240E84_D50E74.s deleted file mode 100644 index 427114b978..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240E84_D50E74.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D50E74 -/* D50E74 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D50E78 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D50E7C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D50E80 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D50E84 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D50E88 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D50E8C 80240E9C 3C03000A */ lui $v1, 0xa -/* D50E90 80240EA0 8C820000 */ lw $v0, ($a0) -/* D50E94 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D50E98 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D50E9C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D50EA0 80240EB0 03E00008 */ jr $ra -/* D50EA4 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240E84_D56A34.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240E84_D56A34.s deleted file mode 100644 index 47cd3c7dab..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240E84_D56A34.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D56A34 -/* D56A34 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D56A38 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D56A3C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D56A40 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D56A44 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D56A48 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D56A4C 80240E9C 3C03000A */ lui $v1, 0xa -/* D56A50 80240EA0 8C820000 */ lw $v0, ($a0) -/* D56A54 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D56A58 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D56A5C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D56A60 80240EB0 03E00008 */ jr $ra -/* D56A64 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EB4_D582E4.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EB4_D582E4.s deleted file mode 100644 index 624c7161a3..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EB4_D582E4.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB4_D582E4 -/* D582E4 80240EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D582E8 80240EB8 AFBF0010 */ sw $ra, 0x10($sp) -/* D582EC 80240EBC 0C00EAD2 */ jal get_npc_safe -/* D582F0 80240EC0 2404FFFC */ addiu $a0, $zero, -4 -/* D582F4 80240EC4 0040202D */ daddu $a0, $v0, $zero -/* D582F8 80240EC8 10800004 */ beqz $a0, .L80240EDC -/* D582FC 80240ECC 3C03000A */ lui $v1, 0xa -/* D58300 80240ED0 8C820000 */ lw $v0, ($a0) -/* D58304 80240ED4 00431025 */ or $v0, $v0, $v1 -/* D58308 80240ED8 AC820000 */ sw $v0, ($a0) -.L80240EDC: -/* D5830C 80240EDC 8FBF0010 */ lw $ra, 0x10($sp) -/* D58310 80240EE0 03E00008 */ jr $ra -/* D58314 80240EE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240E84_D59714.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240E84_D59714.s deleted file mode 100644 index ac98ae42b0..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240E84_D59714.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D59714 -/* D59714 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D59718 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D5971C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D59720 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D59724 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D59728 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D5972C 80240E9C 3C03000A */ lui $v1, 0xa -/* D59730 80240EA0 8C820000 */ lw $v0, ($a0) -/* D59734 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D59738 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D5973C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D59740 80240EB0 03E00008 */ jr $ra -/* D59744 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240E84_D60134.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240E84_D60134.s deleted file mode 100644 index 4d9220e219..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240E84_D60134.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D60134 -/* D60134 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D60138 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D6013C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D60140 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D60144 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D60148 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D6014C 80240E9C 3C03000A */ lui $v1, 0xa -/* D60150 80240EA0 8C820000 */ lw $v0, ($a0) -/* D60154 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D60158 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D6015C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D60160 80240EB0 03E00008 */ jr $ra -/* D60164 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240E84_D62384.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240E84_D62384.s deleted file mode 100644 index 8bff1ad940..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240E84_D62384.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D62384 -/* D62384 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D62388 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D6238C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D62390 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D62394 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D62398 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D6239C 80240E9C 3C03000A */ lui $v1, 0xa -/* D623A0 80240EA0 8C820000 */ lw $v0, ($a0) -/* D623A4 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D623A8 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D623AC 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D623B0 80240EB0 03E00008 */ jr $ra -/* D623B4 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240EB4_D63BC4.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240EB4_D63BC4.s deleted file mode 100644 index 6686656070..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240EB4_D63BC4.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB4_D63BC4 -/* D63BC4 80240EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D63BC8 80240EB8 AFBF0010 */ sw $ra, 0x10($sp) -/* D63BCC 80240EBC 0C00EAD2 */ jal get_npc_safe -/* D63BD0 80240EC0 2404FFFC */ addiu $a0, $zero, -4 -/* D63BD4 80240EC4 0040202D */ daddu $a0, $v0, $zero -/* D63BD8 80240EC8 10800004 */ beqz $a0, .L80240EDC -/* D63BDC 80240ECC 3C03000A */ lui $v1, 0xa -/* D63BE0 80240ED0 8C820000 */ lw $v0, ($a0) -/* D63BE4 80240ED4 00431025 */ or $v0, $v0, $v1 -/* D63BE8 80240ED8 AC820000 */ sw $v0, ($a0) -.L80240EDC: -/* D63BEC 80240EDC 8FBF0010 */ lw $ra, 0x10($sp) -/* D63BF0 80240EE0 03E00008 */ jr $ra -/* D63BF4 80240EE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240E84_D65464.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240E84_D65464.s deleted file mode 100644 index 2eb3f0b55f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240E84_D65464.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D65464 -/* D65464 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D65468 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D6546C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D65470 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D65474 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D65478 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D6547C 80240E9C 3C03000A */ lui $v1, 0xa -/* D65480 80240EA0 8C820000 */ lw $v0, ($a0) -/* D65484 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D65488 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D6548C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D65490 80240EB0 03E00008 */ jr $ra -/* D65494 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240E84_D68B84.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240E84_D68B84.s deleted file mode 100644 index 7c4795fc99..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240E84_D68B84.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D68B84 -/* D68B84 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D68B88 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D68B8C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D68B90 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D68B94 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D68B98 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D68B9C 80240E9C 3C03000A */ lui $v1, 0xa -/* D68BA0 80240EA0 8C820000 */ lw $v0, ($a0) -/* D68BA4 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D68BA8 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D68BAC 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D68BB0 80240EB0 03E00008 */ jr $ra -/* D68BB4 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240E84_D6A9A4.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240E84_D6A9A4.s deleted file mode 100644 index ef4e1d4a84..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240E84_D6A9A4.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D6A9A4 -/* D6A9A4 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6A9A8 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D6A9AC 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D6A9B0 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D6A9B4 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D6A9B8 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D6A9BC 80240E9C 3C03000A */ lui $v1, 0xa -/* D6A9C0 80240EA0 8C820000 */ lw $v0, ($a0) -/* D6A9C4 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D6A9C8 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D6A9CC 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D6A9D0 80240EB0 03E00008 */ jr $ra -/* D6A9D4 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240E84_D6C4A4.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240E84_D6C4A4.s deleted file mode 100644 index 2ef59400c7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240E84_D6C4A4.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D6C4A4 -/* D6C4A4 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6C4A8 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D6C4AC 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D6C4B0 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D6C4B4 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D6C4B8 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D6C4BC 80240E9C 3C03000A */ lui $v1, 0xa -/* D6C4C0 80240EA0 8C820000 */ lw $v0, ($a0) -/* D6C4C4 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D6C4C8 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D6C4CC 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D6C4D0 80240EB0 03E00008 */ jr $ra -/* D6C4D4 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240E84_D6F834.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240E84_D6F834.s deleted file mode 100644 index 20f27efd06..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240E84_D6F834.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D6F834 -/* D6F834 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6F838 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D6F83C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D6F840 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D6F844 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D6F848 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D6F84C 80240E9C 3C03000A */ lui $v1, 0xa -/* D6F850 80240EA0 8C820000 */ lw $v0, ($a0) -/* D6F854 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D6F858 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D6F85C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D6F860 80240EB0 03E00008 */ jr $ra -/* D6F864 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240E84_D77224.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240E84_D77224.s deleted file mode 100644 index 0d92f872a7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240E84_D77224.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D77224 -/* D77224 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D77228 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D7722C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D77230 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D77234 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D77238 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D7723C 80240E9C 3C03000A */ lui $v1, 0xa -/* D77240 80240EA0 8C820000 */ lw $v0, ($a0) -/* D77244 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D77248 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D7724C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D77250 80240EB0 03E00008 */ jr $ra -/* D77254 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240EB4_D7A8A4.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240EB4_D7A8A4.s deleted file mode 100644 index e01e22ac08..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240EB4_D7A8A4.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB4_D7A8A4 -/* D7A8A4 80240EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7A8A8 80240EB8 AFBF0010 */ sw $ra, 0x10($sp) -/* D7A8AC 80240EBC 0C00EAD2 */ jal get_npc_safe -/* D7A8B0 80240EC0 2404FFFC */ addiu $a0, $zero, -4 -/* D7A8B4 80240EC4 0040202D */ daddu $a0, $v0, $zero -/* D7A8B8 80240EC8 10800004 */ beqz $a0, .L80240EDC -/* D7A8BC 80240ECC 3C03000A */ lui $v1, 0xa -/* D7A8C0 80240ED0 8C820000 */ lw $v0, ($a0) -/* D7A8C4 80240ED4 00431025 */ or $v0, $v0, $v1 -/* D7A8C8 80240ED8 AC820000 */ sw $v0, ($a0) -.L80240EDC: -/* D7A8CC 80240EDC 8FBF0010 */ lw $ra, 0x10($sp) -/* D7A8D0 80240EE0 03E00008 */ jr $ra -/* D7A8D4 80240EE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240EB4_D7C154.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240EB4_D7C154.s deleted file mode 100644 index d7855298ad..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240EB4_D7C154.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB4_D7C154 -/* D7C154 80240EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7C158 80240EB8 AFBF0010 */ sw $ra, 0x10($sp) -/* D7C15C 80240EBC 0C00EAD2 */ jal get_npc_safe -/* D7C160 80240EC0 2404FFFC */ addiu $a0, $zero, -4 -/* D7C164 80240EC4 0040202D */ daddu $a0, $v0, $zero -/* D7C168 80240EC8 10800004 */ beqz $a0, .L80240EDC -/* D7C16C 80240ECC 3C03000A */ lui $v1, 0xa -/* D7C170 80240ED0 8C820000 */ lw $v0, ($a0) -/* D7C174 80240ED4 00431025 */ or $v0, $v0, $v1 -/* D7C178 80240ED8 AC820000 */ sw $v0, ($a0) -.L80240EDC: -/* D7C17C 80240EDC 8FBF0010 */ lw $ra, 0x10($sp) -/* D7C180 80240EE0 03E00008 */ jr $ra -/* D7C184 80240EE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240E84_D7D9D4.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240E84_D7D9D4.s deleted file mode 100644 index ea49f421f8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240E84_D7D9D4.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D7D9D4 -/* D7D9D4 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7D9D8 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D7D9DC 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D7D9E0 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D7D9E4 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D7D9E8 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D7D9EC 80240E9C 3C03000A */ lui $v1, 0xa -/* D7D9F0 80240EA0 8C820000 */ lw $v0, ($a0) -/* D7D9F4 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D7D9F8 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D7D9FC 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D7DA00 80240EB0 03E00008 */ jr $ra -/* D7DA04 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240E84_D8A564.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240E84_D8A564.s deleted file mode 100644 index 0ecd57a2de..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240E84_D8A564.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D8A564 -/* D8A564 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8A568 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D8A56C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D8A570 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D8A574 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D8A578 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D8A57C 80240E9C 3C03000A */ lui $v1, 0xa -/* D8A580 80240EA0 8C820000 */ lw $v0, ($a0) -/* D8A584 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D8A588 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D8A58C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D8A590 80240EB0 03E00008 */ jr $ra -/* D8A594 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240E84_D8C234.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240E84_D8C234.s deleted file mode 100644 index ab40d19093..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240E84_D8C234.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D8C234 -/* D8C234 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8C238 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D8C23C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D8C240 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D8C244 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D8C248 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D8C24C 80240E9C 3C03000A */ lui $v1, 0xa -/* D8C250 80240EA0 8C820000 */ lw $v0, ($a0) -/* D8C254 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D8C258 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D8C25C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D8C260 80240EB0 03E00008 */ jr $ra -/* D8C264 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240E84_D8E0D4.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240E84_D8E0D4.s deleted file mode 100644 index e7a0fc0d4b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240E84_D8E0D4.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D8E0D4 -/* D8E0D4 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8E0D8 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D8E0DC 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D8E0E0 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D8E0E4 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D8E0E8 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D8E0EC 80240E9C 3C03000A */ lui $v1, 0xa -/* D8E0F0 80240EA0 8C820000 */ lw $v0, ($a0) -/* D8E0F4 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D8E0F8 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D8E0FC 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D8E100 80240EB0 03E00008 */ jr $ra -/* D8E104 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240EB4_D925B4.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240EB4_D925B4.s deleted file mode 100644 index 54be3fa4c2..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240EB4_D925B4.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB4_D925B4 -/* D925B4 80240EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D925B8 80240EB8 AFBF0010 */ sw $ra, 0x10($sp) -/* D925BC 80240EBC 0C00EAD2 */ jal get_npc_safe -/* D925C0 80240EC0 2404FFFC */ addiu $a0, $zero, -4 -/* D925C4 80240EC4 0040202D */ daddu $a0, $v0, $zero -/* D925C8 80240EC8 10800004 */ beqz $a0, .L80240EDC -/* D925CC 80240ECC 3C03000A */ lui $v1, 0xa -/* D925D0 80240ED0 8C820000 */ lw $v0, ($a0) -/* D925D4 80240ED4 00431025 */ or $v0, $v0, $v1 -/* D925D8 80240ED8 AC820000 */ sw $v0, ($a0) -.L80240EDC: -/* D925DC 80240EDC 8FBF0010 */ lw $ra, 0x10($sp) -/* D925E0 80240EE0 03E00008 */ jr $ra -/* D925E4 80240EE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240EB4_D93DF4.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240EB4_D93DF4.s deleted file mode 100644 index f713b605cf..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240EB4_D93DF4.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB4_D93DF4 -/* D93DF4 80240EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D93DF8 80240EB8 AFBF0010 */ sw $ra, 0x10($sp) -/* D93DFC 80240EBC 0C00EAD2 */ jal get_npc_safe -/* D93E00 80240EC0 2404FFFC */ addiu $a0, $zero, -4 -/* D93E04 80240EC4 0040202D */ daddu $a0, $v0, $zero -/* D93E08 80240EC8 10800004 */ beqz $a0, .L80240EDC -/* D93E0C 80240ECC 3C03000A */ lui $v1, 0xa -/* D93E10 80240ED0 8C820000 */ lw $v0, ($a0) -/* D93E14 80240ED4 00431025 */ or $v0, $v0, $v1 -/* D93E18 80240ED8 AC820000 */ sw $v0, ($a0) -.L80240EDC: -/* D93E1C 80240EDC 8FBF0010 */ lw $ra, 0x10($sp) -/* D93E20 80240EE0 03E00008 */ jr $ra -/* D93E24 80240EE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240EB4_D964A4.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240EB4_D964A4.s deleted file mode 100644 index ffa191a56f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240EB4_D964A4.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB4_D964A4 -/* D964A4 80240EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D964A8 80240EB8 AFBF0010 */ sw $ra, 0x10($sp) -/* D964AC 80240EBC 0C00EAD2 */ jal get_npc_safe -/* D964B0 80240EC0 2404FFFC */ addiu $a0, $zero, -4 -/* D964B4 80240EC4 0040202D */ daddu $a0, $v0, $zero -/* D964B8 80240EC8 10800004 */ beqz $a0, .L80240EDC -/* D964BC 80240ECC 3C03000A */ lui $v1, 0xa -/* D964C0 80240ED0 8C820000 */ lw $v0, ($a0) -/* D964C4 80240ED4 00431025 */ or $v0, $v0, $v1 -/* D964C8 80240ED8 AC820000 */ sw $v0, ($a0) -.L80240EDC: -/* D964CC 80240EDC 8FBF0010 */ lw $ra, 0x10($sp) -/* D964D0 80240EE0 03E00008 */ jr $ra -/* D964D4 80240EE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240EB4_D98744.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240EB4_D98744.s deleted file mode 100644 index 2e97c7af1b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240EB4_D98744.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB4_D98744 -/* D98744 80240EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D98748 80240EB8 AFBF0010 */ sw $ra, 0x10($sp) -/* D9874C 80240EBC 0C00EAD2 */ jal get_npc_safe -/* D98750 80240EC0 2404FFFC */ addiu $a0, $zero, -4 -/* D98754 80240EC4 0040202D */ daddu $a0, $v0, $zero -/* D98758 80240EC8 10800004 */ beqz $a0, .L80240EDC -/* D9875C 80240ECC 3C03000A */ lui $v1, 0xa -/* D98760 80240ED0 8C820000 */ lw $v0, ($a0) -/* D98764 80240ED4 00431025 */ or $v0, $v0, $v1 -/* D98768 80240ED8 AC820000 */ sw $v0, ($a0) -.L80240EDC: -/* D9876C 80240EDC 8FBF0010 */ lw $ra, 0x10($sp) -/* D98770 80240EE0 03E00008 */ jr $ra -/* D98774 80240EE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240E84_D9A834.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240E84_D9A834.s deleted file mode 100644 index b7a8aa4564..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240E84_D9A834.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D9A834 -/* D9A834 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D9A838 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D9A83C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D9A840 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D9A844 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D9A848 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D9A84C 80240E9C 3C03000A */ lui $v1, 0xa -/* D9A850 80240EA0 8C820000 */ lw $v0, ($a0) -/* D9A854 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D9A858 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D9A85C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D9A860 80240EB0 03E00008 */ jr $ra -/* D9A864 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240730_B1D180.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240730_B1D180.s deleted file mode 100644 index 82316e70d3..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240730_B1D180.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_B1D180 -/* B1D180 80240730 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1D184 80240734 AFBF0010 */ sw $ra, 0x10($sp) -/* B1D188 80240738 0C00EAD2 */ jal get_npc_safe -/* B1D18C 8024073C 2404FFFC */ addiu $a0, $zero, -4 -/* B1D190 80240740 0040202D */ daddu $a0, $v0, $zero -/* B1D194 80240744 10800004 */ beqz $a0, .L80240758 -/* B1D198 80240748 3C03000A */ lui $v1, 0xa -/* B1D19C 8024074C 8C820000 */ lw $v0, ($a0) -/* B1D1A0 80240750 00431025 */ or $v0, $v0, $v1 -/* B1D1A4 80240754 AC820000 */ sw $v0, ($a0) -.L80240758: -/* B1D1A8 80240758 8FBF0010 */ lw $ra, 0x10($sp) -/* B1D1AC 8024075C 03E00008 */ jr $ra -/* B1D1B0 80240760 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1D1B4 80240764 00000000 */ nop -/* B1D1B8 80240768 00000000 */ nop -/* B1D1BC 8024076C 00000000 */ nop diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c index e2ecb1cf7f..4c4a52c140 100644 --- a/src/world/area_pra/pra_01/D4D060.c +++ b/src/world/area_pra/pra_01/D4D060.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240870_D4D8B0); INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240D3C_D4DD7C); -INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240E84_D4DEC4); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240EB8_D4DEF8); diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c index 5a717a9c36..3097814a6d 100644 --- a/src/world/area_pra/pra_02/D50010.c +++ b/src/world/area_pra/pra_02/D50010.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240870_D50860); INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240D3C_D50D2C); -INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240E84_D50E74); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240EB8_D50EA8); diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c index bf201d80df..f668913b8e 100644 --- a/src/world/area_pra/pra_05/D55BD0.c +++ b/src/world/area_pra/pra_05/D55BD0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240870_D56420); INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240D3C_D568EC); -INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240E84_D56A34); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240EB8_D56A68); diff --git a/src/world/area_pra/pra_06/D57430.c b/src/world/area_pra/pra_06/D57430.c index ed0eb09e1f..4b470125ce 100644 --- a/src/world/area_pra/pra_06/D57430.c +++ b/src/world/area_pra/pra_06/D57430.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_802408A0_D57CD0); INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240D6C_D5819C); -INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240EB4_D582E4); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240EE8_D58318); diff --git a/src/world/area_pra/pra_09/D588B0.c b/src/world/area_pra/pra_09/D588B0.c index d67ca83f79..948dcf6cce 100644 --- a/src/world/area_pra/pra_09/D588B0.c +++ b/src/world/area_pra/pra_09/D588B0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240870_D59100); INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240D3C_D595CC); -INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240E84_D59714); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240EB8_D59748); diff --git a/src/world/area_pra/pra_10/D5F2D0.c b/src/world/area_pra/pra_10/D5F2D0.c index fd0651402a..18e69f25e4 100644 --- a/src/world/area_pra/pra_10/D5F2D0.c +++ b/src/world/area_pra/pra_10/D5F2D0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240870_D5FB20); INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240D3C_D5FFEC); -INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240E84_D60134); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240EB8_D60168); diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c index b5aa5bfc93..157dcaa453 100644 --- a/src/world/area_pra/pra_11/D61520.c +++ b/src/world/area_pra/pra_11/D61520.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240870_D61D70); INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240D3C_D6223C); -INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240E84_D62384); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240EB8_D623B8); diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c index 9b32793842..e6a282951e 100644 --- a/src/world/area_pra/pra_12/D62D10.c +++ b/src/world/area_pra/pra_12/D62D10.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_802408A0_D635B0); INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240D6C_D63A7C); -INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240EB4_D63BC4); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240EE8_D63BF8); diff --git a/src/world/area_pra/pra_13/D64600.c b/src/world/area_pra/pra_13/D64600.c index 9a21ebe91b..40ff60dd41 100644 --- a/src/world/area_pra/pra_13/D64600.c +++ b/src/world/area_pra/pra_13/D64600.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240870_D64E50); INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240D3C_D6531C); -INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240E84_D65464); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240EB8_D65498); diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c index 1e1f1de106..7e70472d23 100644 --- a/src/world/area_pra/pra_14/D67D20.c +++ b/src/world/area_pra/pra_14/D67D20.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240870_D68570); INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240D3C_D68A3C); -INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240E84_D68B84); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240EB8_D68BB8); diff --git a/src/world/area_pra/pra_16/D69B40.c b/src/world/area_pra/pra_16/D69B40.c index 391b3757e6..36d322fd09 100644 --- a/src/world/area_pra/pra_16/D69B40.c +++ b/src/world/area_pra/pra_16/D69B40.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240870_D6A390); INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240D3C_D6A85C); -INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240E84_D6A9A4); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240EB8_D6A9D8); diff --git a/src/world/area_pra/pra_18/D6B640.c b/src/world/area_pra/pra_18/D6B640.c index 7d917ce6ca..e0ca39a5f8 100644 --- a/src/world/area_pra/pra_18/D6B640.c +++ b/src/world/area_pra/pra_18/D6B640.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240870_D6BE90); INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240D3C_D6C35C); -INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240E84_D6C4A4); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240EB8_D6C4D8); diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c index 0f5c4f0e22..78e20b9389 100644 --- a/src/world/area_pra/pra_19/D6E9D0.c +++ b/src/world/area_pra/pra_19/D6E9D0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240870_D6F220); INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240D3C_D6F6EC); -INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240E84_D6F834); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240EB8_D6F868); diff --git a/src/world/area_pra/pra_20/D763C0.c b/src/world/area_pra/pra_20/D763C0.c index 3e63fc1db9..5d7b22b4ad 100644 --- a/src/world/area_pra/pra_20/D763C0.c +++ b/src/world/area_pra/pra_20/D763C0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240870_D76C10); INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240D3C_D770DC); -INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240E84_D77224); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240EB8_D77258); diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c index 43aee5fc08..74151e82da 100644 --- a/src/world/area_pra/pra_27/D799F0.c +++ b/src/world/area_pra/pra_27/D799F0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_802408A0_D7A290); INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240D6C_D7A75C); -INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240EB4_D7A8A4); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240EE8_D7A8D8); diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c index b6851b8fee..531a598a3a 100644 --- a/src/world/area_pra/pra_28/D7B2A0.c +++ b/src/world/area_pra/pra_28/D7B2A0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_802408A0_D7BB40); INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240D6C_D7C00C); -INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240EB4_D7C154); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240EE8_D7C188); diff --git a/src/world/area_pra/pra_29/D7CB70.c b/src/world/area_pra/pra_29/D7CB70.c index 2dd9150934..c89d236d24 100644 --- a/src/world/area_pra/pra_29/D7CB70.c +++ b/src/world/area_pra/pra_29/D7CB70.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240870_D7D3C0); INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240D3C_D7D88C); -INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240E84_D7D9D4); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240EB8_D7DA08); diff --git a/src/world/area_pra/pra_33/D89700.c b/src/world/area_pra/pra_33/D89700.c index ede01555ae..e4c05fb24c 100644 --- a/src/world/area_pra/pra_33/D89700.c +++ b/src/world/area_pra/pra_33/D89700.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240870_D89F50); INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240D3C_D8A41C); -INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240E84_D8A564); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240EB8_D8A598); diff --git a/src/world/area_pra/pra_34/D8B3D0.c b/src/world/area_pra/pra_34/D8B3D0.c index 72db02105c..5455353dc1 100644 --- a/src/world/area_pra/pra_34/D8B3D0.c +++ b/src/world/area_pra/pra_34/D8B3D0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240870_D8BC20); INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240D3C_D8C0EC); -INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240E84_D8C234); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240EB8_D8C268); diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index e24510b74b..d927e60f51 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240870_D8DAC0); INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240D3C_D8DF8C); -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240E84_D8E0D4); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240EB8_D8E108); diff --git a/src/world/area_pra/pra_36/D91700.c b/src/world/area_pra/pra_36/D91700.c index 9cc5ab43a0..8ebdcb0ce4 100644 --- a/src/world/area_pra/pra_36/D91700.c +++ b/src/world/area_pra/pra_36/D91700.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_802408A0_D91FA0); INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240D6C_D9246C); -INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240EB4_D925B4); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240EE8_D925E8); diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c index 1f08c6cf20..9fb868b1cc 100644 --- a/src/world/area_pra/pra_37/D92F40.c +++ b/src/world/area_pra/pra_37/D92F40.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_802408A0_D937E0); INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240D6C_D93CAC); -INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240EB4_D93DF4); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240EE8_D93E28); diff --git a/src/world/area_pra/pra_38/D955F0.c b/src/world/area_pra/pra_38/D955F0.c index 4c6846773c..31f13b1f02 100644 --- a/src/world/area_pra/pra_38/D955F0.c +++ b/src/world/area_pra/pra_38/D955F0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_802408A0_D95E90); INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240D6C_D9635C); -INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240EB4_D964A4); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240EE8_D964D8); diff --git a/src/world/area_pra/pra_39/D97890.c b/src/world/area_pra/pra_39/D97890.c index 9e28d9a7cc..1259c57aad 100644 --- a/src/world/area_pra/pra_39/D97890.c +++ b/src/world/area_pra/pra_39/D97890.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_802408A0_D98130); INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240D6C_D985FC); -INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240EB4_D98744); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240EE8_D98778); diff --git a/src/world/area_pra/pra_40/D999D0.c b/src/world/area_pra/pra_40/D999D0.c index e75a438370..713425c07a 100644 --- a/src/world/area_pra/pra_40/D999D0.c +++ b/src/world/area_pra/pra_40/D999D0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240870_D9A220); INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240D3C_D9A6EC); -INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240E84_D9A834); +#include "world/common/SetPartnerFlagsA0000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240EB8_D9A868); diff --git a/src/world/area_tst/tst_11/B1CA50.c b/src/world/area_tst/tst_11/B1CA50.c index 9328e0cb7b..a7811683c6 100644 --- a/src/world/area_tst/tst_11/B1CA50.c +++ b/src/world/area_tst/tst_11/B1CA50.c @@ -14,4 +14,4 @@ INCLUDE_ASM(s32, "world/area_tst/tst_11/B1CA50", func_802403B8_B1CE08); INCLUDE_ASM(s32, "world/area_tst/tst_11/B1CA50", func_802406D4_B1D124); -INCLUDE_ASM(s32, "world/area_tst/tst_11/B1CA50", func_80240730_B1D180); +#include "world/common/SetPartnerFlagsA0000.inc.c" diff --git a/src/world/common/SetPartnerFlagsA0000.inc.c b/src/world/common/SetPartnerFlagsA0000.inc.c new file mode 100644 index 0000000000..80d76efe06 --- /dev/null +++ b/src/world/common/SetPartnerFlagsA0000.inc.c @@ -0,0 +1,9 @@ +#include "common.h" + +static void SetPartnerFlagsA0000(void) { + Npc* partner = get_npc_safe(NpcId_PARTNER); + + if (partner != NULL) { + partner->flags |= 0xA0000; + } +} From b9cbed38c42849ddc024122ee9a63156ba57599c Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 22 Nov 2020 10:56:38 -0500 Subject: [PATCH 24/38] SetPartnerFlags80000 --- .../pra_02/D50010/func_80240EB8_D50EA8.s | 18 ------------------ .../pra_05/D55BD0/func_80240EB8_D56A68.s | 18 ------------------ .../pra_06/D57430/func_80240EE8_D58318.s | 18 ------------------ .../pra_09/D588B0/func_80240EB8_D59748.s | 18 ------------------ .../pra_10/D5F2D0/func_80240EB8_D60168.s | 18 ------------------ .../pra_11/D61520/func_80240EB8_D623B8.s | 18 ------------------ .../pra_12/D62D10/func_80240EE8_D63BF8.s | 18 ------------------ .../pra_13/D64600/func_80240EB8_D65498.s | 18 ------------------ .../pra_14/D67D20/func_80240EB8_D68BB8.s | 18 ------------------ .../pra_16/D69B40/func_80240EB8_D6A9D8.s | 18 ------------------ .../pra_18/D6B640/func_80240EB8_D6C4D8.s | 18 ------------------ .../pra_19/D6E9D0/func_80240EB8_D6F868.s | 18 ------------------ .../pra_20/D763C0/func_80240EB8_D77258.s | 18 ------------------ .../pra_27/D799F0/func_80240EE8_D7A8D8.s | 18 ------------------ .../pra_28/D7B2A0/func_80240EE8_D7C188.s | 18 ------------------ .../pra_29/D7CB70/func_80240EB8_D7DA08.s | 18 ------------------ .../pra_33/D89700/func_80240EB8_D8A598.s | 18 ------------------ .../pra_34/D8B3D0/func_80240EB8_D8C268.s | 18 ------------------ .../pra_35/D8D270/func_80240EB8_D8E108.s | 18 ------------------ .../pra_36/D91700/func_80240EE8_D925E8.s | 18 ------------------ .../pra_37/D92F40/func_80240EE8_D93E28.s | 18 ------------------ .../pra_38/D955F0/func_80240EE8_D964D8.s | 18 ------------------ .../pra_39/D97890/func_80240EE8_D98778.s | 18 ------------------ .../pra_40/D999D0/func_80240EB8_D9A868.s | 18 ------------------ src/world/area_pra/pra_02/D50010.c | 2 +- src/world/area_pra/pra_05/D55BD0.c | 2 +- src/world/area_pra/pra_06/D57430.c | 2 +- src/world/area_pra/pra_09/D588B0.c | 2 +- src/world/area_pra/pra_10/D5F2D0.c | 2 +- src/world/area_pra/pra_11/D61520.c | 2 +- src/world/area_pra/pra_12/D62D10.c | 2 +- src/world/area_pra/pra_13/D64600.c | 2 +- src/world/area_pra/pra_14/D67D20.c | 2 +- src/world/area_pra/pra_16/D69B40.c | 2 +- src/world/area_pra/pra_18/D6B640.c | 2 +- src/world/area_pra/pra_19/D6E9D0.c | 2 +- src/world/area_pra/pra_20/D763C0.c | 2 +- src/world/area_pra/pra_27/D799F0.c | 2 +- src/world/area_pra/pra_28/D7B2A0.c | 2 +- src/world/area_pra/pra_29/D7CB70.c | 2 +- src/world/area_pra/pra_33/D89700.c | 2 +- src/world/area_pra/pra_34/D8B3D0.c | 2 +- src/world/area_pra/pra_35/D8D270.c | 2 +- src/world/area_pra/pra_36/D91700.c | 2 +- src/world/area_pra/pra_37/D92F40.c | 2 +- src/world/area_pra/pra_38/D955F0.c | 2 +- src/world/area_pra/pra_39/D97890.c | 2 +- src/world/area_pra/pra_40/D999D0.c | 2 +- src/world/common/SetPartnerFlags80000.inc.c | 9 +++++++++ 49 files changed, 33 insertions(+), 456 deletions(-) delete mode 100644 asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240EB8_D50EA8.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240EB8_D56A68.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EE8_D58318.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240EB8_D59748.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240EB8_D60168.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240EB8_D623B8.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240EE8_D63BF8.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240EB8_D65498.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240EB8_D68BB8.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240EB8_D6A9D8.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240EB8_D6C4D8.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240EB8_D6F868.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240EB8_D77258.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240EE8_D7A8D8.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240EE8_D7C188.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240EB8_D7DA08.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240EB8_D8A598.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240EB8_D8C268.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240EB8_D8E108.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240EE8_D925E8.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240EE8_D93E28.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240EE8_D964D8.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240EE8_D98778.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240EB8_D9A868.s create mode 100644 src/world/common/SetPartnerFlags80000.inc.c diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240EB8_D50EA8.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240EB8_D50EA8.s deleted file mode 100644 index 0edde74182..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240EB8_D50EA8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D50EA8 -/* D50EA8 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D50EAC 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D50EB0 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D50EB4 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D50EB8 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D50EBC 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D50EC0 80240ED0 3C030008 */ lui $v1, 8 -/* D50EC4 80240ED4 8C820000 */ lw $v0, ($a0) -/* D50EC8 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D50ECC 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D50ED0 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D50ED4 80240EE4 03E00008 */ jr $ra -/* D50ED8 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240EB8_D56A68.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240EB8_D56A68.s deleted file mode 100644 index c42acfe516..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240EB8_D56A68.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D56A68 -/* D56A68 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D56A6C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D56A70 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D56A74 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D56A78 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D56A7C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D56A80 80240ED0 3C030008 */ lui $v1, 8 -/* D56A84 80240ED4 8C820000 */ lw $v0, ($a0) -/* D56A88 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D56A8C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D56A90 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D56A94 80240EE4 03E00008 */ jr $ra -/* D56A98 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EE8_D58318.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EE8_D58318.s deleted file mode 100644 index 66f6fd48e4..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EE8_D58318.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE8_D58318 -/* D58318 80240EE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D5831C 80240EEC AFBF0010 */ sw $ra, 0x10($sp) -/* D58320 80240EF0 0C00EAD2 */ jal get_npc_safe -/* D58324 80240EF4 2404FFFC */ addiu $a0, $zero, -4 -/* D58328 80240EF8 0040202D */ daddu $a0, $v0, $zero -/* D5832C 80240EFC 10800004 */ beqz $a0, .L80240F10 -/* D58330 80240F00 3C030008 */ lui $v1, 8 -/* D58334 80240F04 8C820000 */ lw $v0, ($a0) -/* D58338 80240F08 00431025 */ or $v0, $v0, $v1 -/* D5833C 80240F0C AC820000 */ sw $v0, ($a0) -.L80240F10: -/* D58340 80240F10 8FBF0010 */ lw $ra, 0x10($sp) -/* D58344 80240F14 03E00008 */ jr $ra -/* D58348 80240F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240EB8_D59748.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240EB8_D59748.s deleted file mode 100644 index 3fe8b0982e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240EB8_D59748.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D59748 -/* D59748 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D5974C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D59750 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D59754 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D59758 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D5975C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D59760 80240ED0 3C030008 */ lui $v1, 8 -/* D59764 80240ED4 8C820000 */ lw $v0, ($a0) -/* D59768 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D5976C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D59770 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D59774 80240EE4 03E00008 */ jr $ra -/* D59778 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240EB8_D60168.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240EB8_D60168.s deleted file mode 100644 index 111c1decf6..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240EB8_D60168.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D60168 -/* D60168 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6016C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D60170 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D60174 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D60178 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D6017C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D60180 80240ED0 3C030008 */ lui $v1, 8 -/* D60184 80240ED4 8C820000 */ lw $v0, ($a0) -/* D60188 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D6018C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D60190 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D60194 80240EE4 03E00008 */ jr $ra -/* D60198 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240EB8_D623B8.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240EB8_D623B8.s deleted file mode 100644 index a8347c5c70..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240EB8_D623B8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D623B8 -/* D623B8 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D623BC 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D623C0 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D623C4 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D623C8 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D623CC 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D623D0 80240ED0 3C030008 */ lui $v1, 8 -/* D623D4 80240ED4 8C820000 */ lw $v0, ($a0) -/* D623D8 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D623DC 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D623E0 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D623E4 80240EE4 03E00008 */ jr $ra -/* D623E8 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240EE8_D63BF8.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240EE8_D63BF8.s deleted file mode 100644 index e7d256a906..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240EE8_D63BF8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE8_D63BF8 -/* D63BF8 80240EE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D63BFC 80240EEC AFBF0010 */ sw $ra, 0x10($sp) -/* D63C00 80240EF0 0C00EAD2 */ jal get_npc_safe -/* D63C04 80240EF4 2404FFFC */ addiu $a0, $zero, -4 -/* D63C08 80240EF8 0040202D */ daddu $a0, $v0, $zero -/* D63C0C 80240EFC 10800004 */ beqz $a0, .L80240F10 -/* D63C10 80240F00 3C030008 */ lui $v1, 8 -/* D63C14 80240F04 8C820000 */ lw $v0, ($a0) -/* D63C18 80240F08 00431025 */ or $v0, $v0, $v1 -/* D63C1C 80240F0C AC820000 */ sw $v0, ($a0) -.L80240F10: -/* D63C20 80240F10 8FBF0010 */ lw $ra, 0x10($sp) -/* D63C24 80240F14 03E00008 */ jr $ra -/* D63C28 80240F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240EB8_D65498.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240EB8_D65498.s deleted file mode 100644 index b4618eed55..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240EB8_D65498.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D65498 -/* D65498 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6549C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D654A0 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D654A4 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D654A8 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D654AC 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D654B0 80240ED0 3C030008 */ lui $v1, 8 -/* D654B4 80240ED4 8C820000 */ lw $v0, ($a0) -/* D654B8 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D654BC 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D654C0 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D654C4 80240EE4 03E00008 */ jr $ra -/* D654C8 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240EB8_D68BB8.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240EB8_D68BB8.s deleted file mode 100644 index ce465a9a10..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240EB8_D68BB8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D68BB8 -/* D68BB8 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D68BBC 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D68BC0 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D68BC4 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D68BC8 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D68BCC 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D68BD0 80240ED0 3C030008 */ lui $v1, 8 -/* D68BD4 80240ED4 8C820000 */ lw $v0, ($a0) -/* D68BD8 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D68BDC 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D68BE0 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D68BE4 80240EE4 03E00008 */ jr $ra -/* D68BE8 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240EB8_D6A9D8.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240EB8_D6A9D8.s deleted file mode 100644 index 8f095a59f8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240EB8_D6A9D8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D6A9D8 -/* D6A9D8 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6A9DC 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D6A9E0 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D6A9E4 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D6A9E8 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D6A9EC 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D6A9F0 80240ED0 3C030008 */ lui $v1, 8 -/* D6A9F4 80240ED4 8C820000 */ lw $v0, ($a0) -/* D6A9F8 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D6A9FC 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D6AA00 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D6AA04 80240EE4 03E00008 */ jr $ra -/* D6AA08 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240EB8_D6C4D8.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240EB8_D6C4D8.s deleted file mode 100644 index a913222bc8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240EB8_D6C4D8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D6C4D8 -/* D6C4D8 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6C4DC 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D6C4E0 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D6C4E4 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D6C4E8 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D6C4EC 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D6C4F0 80240ED0 3C030008 */ lui $v1, 8 -/* D6C4F4 80240ED4 8C820000 */ lw $v0, ($a0) -/* D6C4F8 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D6C4FC 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D6C500 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D6C504 80240EE4 03E00008 */ jr $ra -/* D6C508 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240EB8_D6F868.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240EB8_D6F868.s deleted file mode 100644 index 239337dd86..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240EB8_D6F868.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D6F868 -/* D6F868 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6F86C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D6F870 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D6F874 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D6F878 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D6F87C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D6F880 80240ED0 3C030008 */ lui $v1, 8 -/* D6F884 80240ED4 8C820000 */ lw $v0, ($a0) -/* D6F888 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D6F88C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D6F890 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D6F894 80240EE4 03E00008 */ jr $ra -/* D6F898 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240EB8_D77258.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240EB8_D77258.s deleted file mode 100644 index 29bbc75b9b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240EB8_D77258.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D77258 -/* D77258 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7725C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D77260 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D77264 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D77268 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D7726C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D77270 80240ED0 3C030008 */ lui $v1, 8 -/* D77274 80240ED4 8C820000 */ lw $v0, ($a0) -/* D77278 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D7727C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D77280 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D77284 80240EE4 03E00008 */ jr $ra -/* D77288 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240EE8_D7A8D8.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240EE8_D7A8D8.s deleted file mode 100644 index 002b084bc4..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240EE8_D7A8D8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE8_D7A8D8 -/* D7A8D8 80240EE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7A8DC 80240EEC AFBF0010 */ sw $ra, 0x10($sp) -/* D7A8E0 80240EF0 0C00EAD2 */ jal get_npc_safe -/* D7A8E4 80240EF4 2404FFFC */ addiu $a0, $zero, -4 -/* D7A8E8 80240EF8 0040202D */ daddu $a0, $v0, $zero -/* D7A8EC 80240EFC 10800004 */ beqz $a0, .L80240F10 -/* D7A8F0 80240F00 3C030008 */ lui $v1, 8 -/* D7A8F4 80240F04 8C820000 */ lw $v0, ($a0) -/* D7A8F8 80240F08 00431025 */ or $v0, $v0, $v1 -/* D7A8FC 80240F0C AC820000 */ sw $v0, ($a0) -.L80240F10: -/* D7A900 80240F10 8FBF0010 */ lw $ra, 0x10($sp) -/* D7A904 80240F14 03E00008 */ jr $ra -/* D7A908 80240F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240EE8_D7C188.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240EE8_D7C188.s deleted file mode 100644 index 757f35800e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240EE8_D7C188.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE8_D7C188 -/* D7C188 80240EE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7C18C 80240EEC AFBF0010 */ sw $ra, 0x10($sp) -/* D7C190 80240EF0 0C00EAD2 */ jal get_npc_safe -/* D7C194 80240EF4 2404FFFC */ addiu $a0, $zero, -4 -/* D7C198 80240EF8 0040202D */ daddu $a0, $v0, $zero -/* D7C19C 80240EFC 10800004 */ beqz $a0, .L80240F10 -/* D7C1A0 80240F00 3C030008 */ lui $v1, 8 -/* D7C1A4 80240F04 8C820000 */ lw $v0, ($a0) -/* D7C1A8 80240F08 00431025 */ or $v0, $v0, $v1 -/* D7C1AC 80240F0C AC820000 */ sw $v0, ($a0) -.L80240F10: -/* D7C1B0 80240F10 8FBF0010 */ lw $ra, 0x10($sp) -/* D7C1B4 80240F14 03E00008 */ jr $ra -/* D7C1B8 80240F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240EB8_D7DA08.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240EB8_D7DA08.s deleted file mode 100644 index 1dd8da396c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240EB8_D7DA08.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D7DA08 -/* D7DA08 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7DA0C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D7DA10 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D7DA14 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D7DA18 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D7DA1C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D7DA20 80240ED0 3C030008 */ lui $v1, 8 -/* D7DA24 80240ED4 8C820000 */ lw $v0, ($a0) -/* D7DA28 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D7DA2C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D7DA30 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D7DA34 80240EE4 03E00008 */ jr $ra -/* D7DA38 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240EB8_D8A598.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240EB8_D8A598.s deleted file mode 100644 index 61122c3eb9..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240EB8_D8A598.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D8A598 -/* D8A598 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8A59C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D8A5A0 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D8A5A4 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D8A5A8 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D8A5AC 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D8A5B0 80240ED0 3C030008 */ lui $v1, 8 -/* D8A5B4 80240ED4 8C820000 */ lw $v0, ($a0) -/* D8A5B8 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D8A5BC 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D8A5C0 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D8A5C4 80240EE4 03E00008 */ jr $ra -/* D8A5C8 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240EB8_D8C268.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240EB8_D8C268.s deleted file mode 100644 index b24a0e3087..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240EB8_D8C268.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D8C268 -/* D8C268 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8C26C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D8C270 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D8C274 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D8C278 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D8C27C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D8C280 80240ED0 3C030008 */ lui $v1, 8 -/* D8C284 80240ED4 8C820000 */ lw $v0, ($a0) -/* D8C288 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D8C28C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D8C290 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D8C294 80240EE4 03E00008 */ jr $ra -/* D8C298 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240EB8_D8E108.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240EB8_D8E108.s deleted file mode 100644 index c70b3cbbde..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240EB8_D8E108.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D8E108 -/* D8E108 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8E10C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D8E110 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D8E114 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D8E118 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D8E11C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D8E120 80240ED0 3C030008 */ lui $v1, 8 -/* D8E124 80240ED4 8C820000 */ lw $v0, ($a0) -/* D8E128 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D8E12C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D8E130 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D8E134 80240EE4 03E00008 */ jr $ra -/* D8E138 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240EE8_D925E8.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240EE8_D925E8.s deleted file mode 100644 index 31bc9968b3..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240EE8_D925E8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE8_D925E8 -/* D925E8 80240EE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D925EC 80240EEC AFBF0010 */ sw $ra, 0x10($sp) -/* D925F0 80240EF0 0C00EAD2 */ jal get_npc_safe -/* D925F4 80240EF4 2404FFFC */ addiu $a0, $zero, -4 -/* D925F8 80240EF8 0040202D */ daddu $a0, $v0, $zero -/* D925FC 80240EFC 10800004 */ beqz $a0, .L80240F10 -/* D92600 80240F00 3C030008 */ lui $v1, 8 -/* D92604 80240F04 8C820000 */ lw $v0, ($a0) -/* D92608 80240F08 00431025 */ or $v0, $v0, $v1 -/* D9260C 80240F0C AC820000 */ sw $v0, ($a0) -.L80240F10: -/* D92610 80240F10 8FBF0010 */ lw $ra, 0x10($sp) -/* D92614 80240F14 03E00008 */ jr $ra -/* D92618 80240F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240EE8_D93E28.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240EE8_D93E28.s deleted file mode 100644 index d5e5e070a7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240EE8_D93E28.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE8_D93E28 -/* D93E28 80240EE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D93E2C 80240EEC AFBF0010 */ sw $ra, 0x10($sp) -/* D93E30 80240EF0 0C00EAD2 */ jal get_npc_safe -/* D93E34 80240EF4 2404FFFC */ addiu $a0, $zero, -4 -/* D93E38 80240EF8 0040202D */ daddu $a0, $v0, $zero -/* D93E3C 80240EFC 10800004 */ beqz $a0, .L80240F10 -/* D93E40 80240F00 3C030008 */ lui $v1, 8 -/* D93E44 80240F04 8C820000 */ lw $v0, ($a0) -/* D93E48 80240F08 00431025 */ or $v0, $v0, $v1 -/* D93E4C 80240F0C AC820000 */ sw $v0, ($a0) -.L80240F10: -/* D93E50 80240F10 8FBF0010 */ lw $ra, 0x10($sp) -/* D93E54 80240F14 03E00008 */ jr $ra -/* D93E58 80240F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240EE8_D964D8.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240EE8_D964D8.s deleted file mode 100644 index 6c37085265..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240EE8_D964D8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE8_D964D8 -/* D964D8 80240EE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D964DC 80240EEC AFBF0010 */ sw $ra, 0x10($sp) -/* D964E0 80240EF0 0C00EAD2 */ jal get_npc_safe -/* D964E4 80240EF4 2404FFFC */ addiu $a0, $zero, -4 -/* D964E8 80240EF8 0040202D */ daddu $a0, $v0, $zero -/* D964EC 80240EFC 10800004 */ beqz $a0, .L80240F10 -/* D964F0 80240F00 3C030008 */ lui $v1, 8 -/* D964F4 80240F04 8C820000 */ lw $v0, ($a0) -/* D964F8 80240F08 00431025 */ or $v0, $v0, $v1 -/* D964FC 80240F0C AC820000 */ sw $v0, ($a0) -.L80240F10: -/* D96500 80240F10 8FBF0010 */ lw $ra, 0x10($sp) -/* D96504 80240F14 03E00008 */ jr $ra -/* D96508 80240F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240EE8_D98778.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240EE8_D98778.s deleted file mode 100644 index b05aed2582..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240EE8_D98778.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE8_D98778 -/* D98778 80240EE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D9877C 80240EEC AFBF0010 */ sw $ra, 0x10($sp) -/* D98780 80240EF0 0C00EAD2 */ jal get_npc_safe -/* D98784 80240EF4 2404FFFC */ addiu $a0, $zero, -4 -/* D98788 80240EF8 0040202D */ daddu $a0, $v0, $zero -/* D9878C 80240EFC 10800004 */ beqz $a0, .L80240F10 -/* D98790 80240F00 3C030008 */ lui $v1, 8 -/* D98794 80240F04 8C820000 */ lw $v0, ($a0) -/* D98798 80240F08 00431025 */ or $v0, $v0, $v1 -/* D9879C 80240F0C AC820000 */ sw $v0, ($a0) -.L80240F10: -/* D987A0 80240F10 8FBF0010 */ lw $ra, 0x10($sp) -/* D987A4 80240F14 03E00008 */ jr $ra -/* D987A8 80240F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240EB8_D9A868.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240EB8_D9A868.s deleted file mode 100644 index f0f8949c32..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240EB8_D9A868.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D9A868 -/* D9A868 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D9A86C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D9A870 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D9A874 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D9A878 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D9A87C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D9A880 80240ED0 3C030008 */ lui $v1, 8 -/* D9A884 80240ED4 8C820000 */ lw $v0, ($a0) -/* D9A888 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D9A88C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D9A890 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D9A894 80240EE4 03E00008 */ jr $ra -/* D9A898 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c index 3097814a6d..8026d68869 100644 --- a/src/world/area_pra/pra_02/D50010.c +++ b/src/world/area_pra/pra_02/D50010.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240D3C_D50D2C); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240EB8_D50EA8); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240EEC_D50EDC); diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c index f668913b8e..8e66aa4bb4 100644 --- a/src/world/area_pra/pra_05/D55BD0.c +++ b/src/world/area_pra/pra_05/D55BD0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240D3C_D568EC); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240EB8_D56A68); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240EEC_D56A9C); diff --git a/src/world/area_pra/pra_06/D57430.c b/src/world/area_pra/pra_06/D57430.c index 4b470125ce..4fcde46580 100644 --- a/src/world/area_pra/pra_06/D57430.c +++ b/src/world/area_pra/pra_06/D57430.c @@ -24,6 +24,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240D6C_D5819C); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240EE8_D58318); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240F1C_D5834C); diff --git a/src/world/area_pra/pra_09/D588B0.c b/src/world/area_pra/pra_09/D588B0.c index 948dcf6cce..293e81f764 100644 --- a/src/world/area_pra/pra_09/D588B0.c +++ b/src/world/area_pra/pra_09/D588B0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240D3C_D595CC); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240EB8_D59748); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240EEC_D5977C); diff --git a/src/world/area_pra/pra_10/D5F2D0.c b/src/world/area_pra/pra_10/D5F2D0.c index 18e69f25e4..a030e21ad9 100644 --- a/src/world/area_pra/pra_10/D5F2D0.c +++ b/src/world/area_pra/pra_10/D5F2D0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240D3C_D5FFEC); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240EB8_D60168); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240EEC_D6019C); diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c index 157dcaa453..353803b993 100644 --- a/src/world/area_pra/pra_11/D61520.c +++ b/src/world/area_pra/pra_11/D61520.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240D3C_D6223C); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240EB8_D623B8); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240EEC_D623EC); diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c index e6a282951e..fab556b915 100644 --- a/src/world/area_pra/pra_12/D62D10.c +++ b/src/world/area_pra/pra_12/D62D10.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240D6C_D63A7C); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240EE8_D63BF8); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240F1C_D63C2C); diff --git a/src/world/area_pra/pra_13/D64600.c b/src/world/area_pra/pra_13/D64600.c index 40ff60dd41..1494d4e8d5 100644 --- a/src/world/area_pra/pra_13/D64600.c +++ b/src/world/area_pra/pra_13/D64600.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240D3C_D6531C); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240EB8_D65498); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240EEC_D654CC); diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c index 7e70472d23..67376a1e4f 100644 --- a/src/world/area_pra/pra_14/D67D20.c +++ b/src/world/area_pra/pra_14/D67D20.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240D3C_D68A3C); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240EB8_D68BB8); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240EEC_D68BEC); diff --git a/src/world/area_pra/pra_16/D69B40.c b/src/world/area_pra/pra_16/D69B40.c index 36d322fd09..6ef3f80fb4 100644 --- a/src/world/area_pra/pra_16/D69B40.c +++ b/src/world/area_pra/pra_16/D69B40.c @@ -22,6 +22,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240D3C_D6A85C); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240EB8_D6A9D8); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240EEC_D6AA0C); diff --git a/src/world/area_pra/pra_18/D6B640.c b/src/world/area_pra/pra_18/D6B640.c index e0ca39a5f8..3791e03e3e 100644 --- a/src/world/area_pra/pra_18/D6B640.c +++ b/src/world/area_pra/pra_18/D6B640.c @@ -22,6 +22,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240D3C_D6C35C); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240EB8_D6C4D8); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240EEC_D6C50C); diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c index 78e20b9389..5be0072900 100644 --- a/src/world/area_pra/pra_19/D6E9D0.c +++ b/src/world/area_pra/pra_19/D6E9D0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240D3C_D6F6EC); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240EB8_D6F868); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240EEC_D6F89C); diff --git a/src/world/area_pra/pra_20/D763C0.c b/src/world/area_pra/pra_20/D763C0.c index 5d7b22b4ad..eaa094499c 100644 --- a/src/world/area_pra/pra_20/D763C0.c +++ b/src/world/area_pra/pra_20/D763C0.c @@ -22,6 +22,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240D3C_D770DC); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240EB8_D77258); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240EEC_D7728C); diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c index 74151e82da..625d9e6c89 100644 --- a/src/world/area_pra/pra_27/D799F0.c +++ b/src/world/area_pra/pra_27/D799F0.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240D6C_D7A75C); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240EE8_D7A8D8); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240F1C_D7A90C); diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c index 531a598a3a..e8ab8778ba 100644 --- a/src/world/area_pra/pra_28/D7B2A0.c +++ b/src/world/area_pra/pra_28/D7B2A0.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240D6C_D7C00C); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240EE8_D7C188); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240F1C_D7C1BC); diff --git a/src/world/area_pra/pra_29/D7CB70.c b/src/world/area_pra/pra_29/D7CB70.c index c89d236d24..1f57ea2527 100644 --- a/src/world/area_pra/pra_29/D7CB70.c +++ b/src/world/area_pra/pra_29/D7CB70.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240D3C_D7D88C); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240EB8_D7DA08); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240EEC_D7DA3C); diff --git a/src/world/area_pra/pra_33/D89700.c b/src/world/area_pra/pra_33/D89700.c index e4c05fb24c..8d38aaa200 100644 --- a/src/world/area_pra/pra_33/D89700.c +++ b/src/world/area_pra/pra_33/D89700.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240D3C_D8A41C); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240EB8_D8A598); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240EEC_D8A5CC); diff --git a/src/world/area_pra/pra_34/D8B3D0.c b/src/world/area_pra/pra_34/D8B3D0.c index 5455353dc1..813cb0d124 100644 --- a/src/world/area_pra/pra_34/D8B3D0.c +++ b/src/world/area_pra/pra_34/D8B3D0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240D3C_D8C0EC); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240EB8_D8C268); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240EEC_D8C29C); diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index d927e60f51..6bdc664fcb 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240D3C_D8DF8C); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240EB8_D8E108); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240EEC_D8E13C); diff --git a/src/world/area_pra/pra_36/D91700.c b/src/world/area_pra/pra_36/D91700.c index 8ebdcb0ce4..fb5c68d026 100644 --- a/src/world/area_pra/pra_36/D91700.c +++ b/src/world/area_pra/pra_36/D91700.c @@ -24,6 +24,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240D6C_D9246C); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240EE8_D925E8); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240F1C_D9261C); diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c index 9fb868b1cc..d4a591bbba 100644 --- a/src/world/area_pra/pra_37/D92F40.c +++ b/src/world/area_pra/pra_37/D92F40.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240D6C_D93CAC); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240EE8_D93E28); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240F1C_D93E5C); diff --git a/src/world/area_pra/pra_38/D955F0.c b/src/world/area_pra/pra_38/D955F0.c index 31f13b1f02..7c53934195 100644 --- a/src/world/area_pra/pra_38/D955F0.c +++ b/src/world/area_pra/pra_38/D955F0.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240D6C_D9635C); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240EE8_D964D8); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240F1C_D9650C); diff --git a/src/world/area_pra/pra_39/D97890.c b/src/world/area_pra/pra_39/D97890.c index 1259c57aad..f7ab229344 100644 --- a/src/world/area_pra/pra_39/D97890.c +++ b/src/world/area_pra/pra_39/D97890.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240D6C_D985FC); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240EE8_D98778); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240F1C_D987AC); diff --git a/src/world/area_pra/pra_40/D999D0.c b/src/world/area_pra/pra_40/D999D0.c index 713425c07a..7a53d17de4 100644 --- a/src/world/area_pra/pra_40/D999D0.c +++ b/src/world/area_pra/pra_40/D999D0.c @@ -22,6 +22,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240D3C_D9A6EC); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240EB8_D9A868); +#include "world/common/SetPartnerFlags80000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240EEC_D9A89C); diff --git a/src/world/common/SetPartnerFlags80000.inc.c b/src/world/common/SetPartnerFlags80000.inc.c new file mode 100644 index 0000000000..e0d34f7810 --- /dev/null +++ b/src/world/common/SetPartnerFlags80000.inc.c @@ -0,0 +1,9 @@ +#include "common.h" + +static void SetPartnerFlags80000(void) { + Npc* partner = get_npc_safe(NpcId_PARTNER); + + if (partner != NULL) { + partner->flags |= 0x80000; + } +} From c5ebc6a376f0847430446095f80526e9d1ca29b6 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 22 Nov 2020 11:03:02 -0500 Subject: [PATCH 25/38] SetGameStatusUnk84_1 --- .../area_pra/pra_01/D4D040/func_80240000_D4D040.s | 12 ------------ .../area_pra/pra_02/D4FFF0/func_80240000_D4FFF0.s | 12 ------------ .../area_pra/pra_03/D53CB0/func_80240000_D53CB0.s | 12 ------------ .../area_pra/pra_04/D54690/func_80240000_D54690.s | 12 ------------ .../area_pra/pra_05/D55BB0/func_80240000_D55BB0.s | 12 ------------ .../area_pra/pra_09/D58890/func_80240000_D58890.s | 12 ------------ .../area_pra/pra_10/D5F2B0/func_80240000_D5F2B0.s | 12 ------------ .../area_pra/pra_11/D61500/func_80240000_D61500.s | 12 ------------ .../area_pra/pra_13/D645E0/func_80240000_D645E0.s | 12 ------------ .../area_pra/pra_14/D67D00/func_80240000_D67D00.s | 12 ------------ .../area_pra/pra_15/D69810/func_80240000_D69810.s | 12 ------------ .../area_pra/pra_16/D69B20/func_80240000_D69B20.s | 12 ------------ .../area_pra/pra_18/D6B620/func_80240000_D6B620.s | 12 ------------ .../area_pra/pra_19/D6E9B0/func_80240000_D6E9B0.s | 12 ------------ .../area_pra/pra_20/D763A0/func_80240000_D763A0.s | 12 ------------ .../area_pra/pra_21/D77F20/func_80240000_D77F20.s | 12 ------------ .../area_pra/pra_22/D78880/func_80240000_D78880.s | 12 ------------ .../area_pra/pra_29/D7CB50/func_80240000_D7CB50.s | 12 ------------ .../area_pra/pra_32/D86A00/func_80240000_D86A00.s | 12 ------------ .../area_pra/pra_33/D896E0/func_80240000_D896E0.s | 12 ------------ .../area_pra/pra_34/D8B3B0/func_80240000_D8B3B0.s | 12 ------------ .../area_pra/pra_35/D8D250/func_80240000_D8D250.s | 12 ------------ .../area_pra/pra_40/D999B0/func_80240000_D999B0.s | 12 ------------ include/common_structs.h | 4 +++- src/world/area_pra/pra_01/D4D040.c | 2 +- src/world/area_pra/pra_02/D4FFF0.c | 2 +- src/world/area_pra/pra_03/D53CB0.c | 2 +- src/world/area_pra/pra_04/D54690.c | 2 +- src/world/area_pra/pra_05/D55BB0.c | 2 +- src/world/area_pra/pra_09/D58890.c | 2 +- src/world/area_pra/pra_10/D5F2B0.c | 2 +- src/world/area_pra/pra_11/D61500.c | 2 +- src/world/area_pra/pra_13/D645E0.c | 2 +- src/world/area_pra/pra_14/D67D00.c | 2 +- src/world/area_pra/pra_15/D69810.c | 2 +- src/world/area_pra/pra_16/D69B20.c | 2 +- src/world/area_pra/pra_18/D6B620.c | 2 +- src/world/area_pra/pra_19/D6E9B0.c | 2 +- src/world/area_pra/pra_20/D763A0.c | 2 +- src/world/area_pra/pra_21/D77F20.c | 2 +- src/world/area_pra/pra_22/D78880.c | 2 +- src/world/area_pra/pra_29/D7CB50.c | 2 +- src/world/area_pra/pra_32/D86A00.c | 2 +- src/world/area_pra/pra_33/D896E0.c | 2 +- src/world/area_pra/pra_34/D8B3B0.c | 2 +- src/world/area_pra/pra_35/D8D250.c | 2 +- src/world/area_pra/pra_40/D999B0.c | 2 +- src/world/common/SetGameStatusUnk84_1.inc.c | 6 ++++++ 48 files changed, 32 insertions(+), 300 deletions(-) delete mode 100644 asm/nonmatchings/world/area_pra/pra_01/D4D040/func_80240000_D4D040.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_02/D4FFF0/func_80240000_D4FFF0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_03/D53CB0/func_80240000_D53CB0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_04/D54690/func_80240000_D54690.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_05/D55BB0/func_80240000_D55BB0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_09/D58890/func_80240000_D58890.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_10/D5F2B0/func_80240000_D5F2B0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_11/D61500/func_80240000_D61500.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_13/D645E0/func_80240000_D645E0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_14/D67D00/func_80240000_D67D00.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_15/D69810/func_80240000_D69810.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_16/D69B20/func_80240000_D69B20.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_18/D6B620/func_80240000_D6B620.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_19/D6E9B0/func_80240000_D6E9B0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_20/D763A0/func_80240000_D763A0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_21/D77F20/func_80240000_D77F20.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_22/D78880/func_80240000_D78880.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_29/D7CB50/func_80240000_D7CB50.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_32/D86A00/func_80240000_D86A00.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_33/D896E0/func_80240000_D896E0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_34/D8B3B0/func_80240000_D8B3B0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8D250/func_80240000_D8D250.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_40/D999B0/func_80240000_D999B0.s create mode 100644 src/world/common/SetGameStatusUnk84_1.inc.c diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D040/func_80240000_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/D4D040/func_80240000_D4D040.s deleted file mode 100644 index 9f615af04d..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D040/func_80240000_D4D040.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D4D040 -/* D4D040 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D4D044 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D4D048 80240008 24020001 */ addiu $v0, $zero, 1 -/* D4D04C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D4D050 80240010 03E00008 */ jr $ra -/* D4D054 80240014 0000102D */ daddu $v0, $zero, $zero -/* D4D058 80240018 00000000 */ nop -/* D4D05C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_02/D4FFF0/func_80240000_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/D4FFF0/func_80240000_D4FFF0.s deleted file mode 100644 index 548ab69167..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/D4FFF0/func_80240000_D4FFF0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D4FFF0 -/* D4FFF0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D4FFF4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D4FFF8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D4FFFC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D50000 80240010 03E00008 */ jr $ra -/* D50004 80240014 0000102D */ daddu $v0, $zero, $zero -/* D50008 80240018 00000000 */ nop -/* D5000C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_03/D53CB0/func_80240000_D53CB0.s b/asm/nonmatchings/world/area_pra/pra_03/D53CB0/func_80240000_D53CB0.s deleted file mode 100644 index f79cef1276..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_03/D53CB0/func_80240000_D53CB0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D53CB0 -/* D53CB0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D53CB4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D53CB8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D53CBC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D53CC0 80240010 03E00008 */ jr $ra -/* D53CC4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D53CC8 80240018 00000000 */ nop -/* D53CCC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_04/D54690/func_80240000_D54690.s b/asm/nonmatchings/world/area_pra/pra_04/D54690/func_80240000_D54690.s deleted file mode 100644 index 80a8c4fec1..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_04/D54690/func_80240000_D54690.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D54690 -/* D54690 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D54694 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D54698 80240008 24020001 */ addiu $v0, $zero, 1 -/* D5469C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D546A0 80240010 03E00008 */ jr $ra -/* D546A4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D546A8 80240018 00000000 */ nop -/* D546AC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BB0/func_80240000_D55BB0.s b/asm/nonmatchings/world/area_pra/pra_05/D55BB0/func_80240000_D55BB0.s deleted file mode 100644 index da3ee57f70..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BB0/func_80240000_D55BB0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D55BB0 -/* D55BB0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D55BB4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D55BB8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D55BBC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D55BC0 80240010 03E00008 */ jr $ra -/* D55BC4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D55BC8 80240018 00000000 */ nop -/* D55BCC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_09/D58890/func_80240000_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/D58890/func_80240000_D58890.s deleted file mode 100644 index beb4e6b172..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/D58890/func_80240000_D58890.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D58890 -/* D58890 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D58894 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D58898 80240008 24020001 */ addiu $v0, $zero, 1 -/* D5889C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D588A0 80240010 03E00008 */ jr $ra -/* D588A4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D588A8 80240018 00000000 */ nop -/* D588AC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2B0/func_80240000_D5F2B0.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2B0/func_80240000_D5F2B0.s deleted file mode 100644 index e7706aadd3..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2B0/func_80240000_D5F2B0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D5F2B0 -/* D5F2B0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D5F2B4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D5F2B8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D5F2BC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D5F2C0 80240010 03E00008 */ jr $ra -/* D5F2C4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D5F2C8 80240018 00000000 */ nop -/* D5F2CC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61500/func_80240000_D61500.s b/asm/nonmatchings/world/area_pra/pra_11/D61500/func_80240000_D61500.s deleted file mode 100644 index 6b6584c69b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/D61500/func_80240000_D61500.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D61500 -/* D61500 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D61504 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D61508 80240008 24020001 */ addiu $v0, $zero, 1 -/* D6150C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D61510 80240010 03E00008 */ jr $ra -/* D61514 80240014 0000102D */ daddu $v0, $zero, $zero -/* D61518 80240018 00000000 */ nop -/* D6151C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_13/D645E0/func_80240000_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/D645E0/func_80240000_D645E0.s deleted file mode 100644 index 6207ecc8f1..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/D645E0/func_80240000_D645E0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D645E0 -/* D645E0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D645E4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D645E8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D645EC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D645F0 80240010 03E00008 */ jr $ra -/* D645F4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D645F8 80240018 00000000 */ nop -/* D645FC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D00/func_80240000_D67D00.s b/asm/nonmatchings/world/area_pra/pra_14/D67D00/func_80240000_D67D00.s deleted file mode 100644 index cc4c51bec7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D00/func_80240000_D67D00.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D67D00 -/* D67D00 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D67D04 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D67D08 80240008 24020001 */ addiu $v0, $zero, 1 -/* D67D0C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D67D10 80240010 03E00008 */ jr $ra -/* D67D14 80240014 0000102D */ daddu $v0, $zero, $zero -/* D67D18 80240018 00000000 */ nop -/* D67D1C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_15/D69810/func_80240000_D69810.s b/asm/nonmatchings/world/area_pra/pra_15/D69810/func_80240000_D69810.s deleted file mode 100644 index 126d748169..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_15/D69810/func_80240000_D69810.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D69810 -/* D69810 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D69814 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D69818 80240008 24020001 */ addiu $v0, $zero, 1 -/* D6981C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D69820 80240010 03E00008 */ jr $ra -/* D69824 80240014 0000102D */ daddu $v0, $zero, $zero -/* D69828 80240018 00000000 */ nop -/* D6982C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B20/func_80240000_D69B20.s b/asm/nonmatchings/world/area_pra/pra_16/D69B20/func_80240000_D69B20.s deleted file mode 100644 index 339d762738..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B20/func_80240000_D69B20.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D69B20 -/* D69B20 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D69B24 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D69B28 80240008 24020001 */ addiu $v0, $zero, 1 -/* D69B2C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D69B30 80240010 03E00008 */ jr $ra -/* D69B34 80240014 0000102D */ daddu $v0, $zero, $zero -/* D69B38 80240018 00000000 */ nop -/* D69B3C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B620/func_80240000_D6B620.s b/asm/nonmatchings/world/area_pra/pra_18/D6B620/func_80240000_D6B620.s deleted file mode 100644 index 8533ad9038..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B620/func_80240000_D6B620.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D6B620 -/* D6B620 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D6B624 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D6B628 80240008 24020001 */ addiu $v0, $zero, 1 -/* D6B62C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D6B630 80240010 03E00008 */ jr $ra -/* D6B634 80240014 0000102D */ daddu $v0, $zero, $zero -/* D6B638 80240018 00000000 */ nop -/* D6B63C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9B0/func_80240000_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9B0/func_80240000_D6E9B0.s deleted file mode 100644 index 305c210009..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9B0/func_80240000_D6E9B0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D6E9B0 -/* D6E9B0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D6E9B4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D6E9B8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D6E9BC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D6E9C0 80240010 03E00008 */ jr $ra -/* D6E9C4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D6E9C8 80240018 00000000 */ nop -/* D6E9CC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763A0/func_80240000_D763A0.s b/asm/nonmatchings/world/area_pra/pra_20/D763A0/func_80240000_D763A0.s deleted file mode 100644 index d70179964e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/D763A0/func_80240000_D763A0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D763A0 -/* D763A0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D763A4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D763A8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D763AC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D763B0 80240010 03E00008 */ jr $ra -/* D763B4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D763B8 80240018 00000000 */ nop -/* D763BC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_21/D77F20/func_80240000_D77F20.s b/asm/nonmatchings/world/area_pra/pra_21/D77F20/func_80240000_D77F20.s deleted file mode 100644 index 1262194525..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_21/D77F20/func_80240000_D77F20.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D77F20 -/* D77F20 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D77F24 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D77F28 80240008 24020001 */ addiu $v0, $zero, 1 -/* D77F2C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D77F30 80240010 03E00008 */ jr $ra -/* D77F34 80240014 0000102D */ daddu $v0, $zero, $zero -/* D77F38 80240018 00000000 */ nop -/* D77F3C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_22/D78880/func_80240000_D78880.s b/asm/nonmatchings/world/area_pra/pra_22/D78880/func_80240000_D78880.s deleted file mode 100644 index c21f08b034..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_22/D78880/func_80240000_D78880.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D78880 -/* D78880 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D78884 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D78888 80240008 24020001 */ addiu $v0, $zero, 1 -/* D7888C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D78890 80240010 03E00008 */ jr $ra -/* D78894 80240014 0000102D */ daddu $v0, $zero, $zero -/* D78898 80240018 00000000 */ nop -/* D7889C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB50/func_80240000_D7CB50.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB50/func_80240000_D7CB50.s deleted file mode 100644 index e2cda7520a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB50/func_80240000_D7CB50.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D7CB50 -/* D7CB50 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D7CB54 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D7CB58 80240008 24020001 */ addiu $v0, $zero, 1 -/* D7CB5C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D7CB60 80240010 03E00008 */ jr $ra -/* D7CB64 80240014 0000102D */ daddu $v0, $zero, $zero -/* D7CB68 80240018 00000000 */ nop -/* D7CB6C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_32/D86A00/func_80240000_D86A00.s b/asm/nonmatchings/world/area_pra/pra_32/D86A00/func_80240000_D86A00.s deleted file mode 100644 index 9308c86f10..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_32/D86A00/func_80240000_D86A00.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D86A00 -/* D86A00 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D86A04 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D86A08 80240008 24020001 */ addiu $v0, $zero, 1 -/* D86A0C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D86A10 80240010 03E00008 */ jr $ra -/* D86A14 80240014 0000102D */ daddu $v0, $zero, $zero -/* D86A18 80240018 00000000 */ nop -/* D86A1C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_33/D896E0/func_80240000_D896E0.s b/asm/nonmatchings/world/area_pra/pra_33/D896E0/func_80240000_D896E0.s deleted file mode 100644 index e4fe241ef2..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/D896E0/func_80240000_D896E0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D896E0 -/* D896E0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D896E4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D896E8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D896EC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D896F0 80240010 03E00008 */ jr $ra -/* D896F4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D896F8 80240018 00000000 */ nop -/* D896FC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3B0/func_80240000_D8B3B0.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3B0/func_80240000_D8B3B0.s deleted file mode 100644 index f8de6f4862..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3B0/func_80240000_D8B3B0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D8B3B0 -/* D8B3B0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D8B3B4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D8B3B8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D8B3BC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D8B3C0 80240010 03E00008 */ jr $ra -/* D8B3C4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D8B3C8 80240018 00000000 */ nop -/* D8B3CC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D250/func_80240000_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/D8D250/func_80240000_D8D250.s deleted file mode 100644 index d7d2c6983a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D250/func_80240000_D8D250.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D8D250 -/* D8D250 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D8D254 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D8D258 80240008 24020001 */ addiu $v0, $zero, 1 -/* D8D25C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D8D260 80240010 03E00008 */ jr $ra -/* D8D264 80240014 0000102D */ daddu $v0, $zero, $zero -/* D8D268 80240018 00000000 */ nop -/* D8D26C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999B0/func_80240000_D999B0.s b/asm/nonmatchings/world/area_pra/pra_40/D999B0/func_80240000_D999B0.s deleted file mode 100644 index a539761336..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/D999B0/func_80240000_D999B0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D999B0 -/* D999B0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D999B4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D999B8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D999BC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D999C0 80240010 03E00008 */ jr $ra -/* D999C4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D999C8 80240018 00000000 */ nop -/* D999CC 8024001C 00000000 */ nop diff --git a/include/common_structs.h b/include/common_structs.h index 5bf772177e..ffa8fb07da 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -902,7 +902,9 @@ typedef struct GameStatus { /* 0x07D */ s8 unk_7D; /* 0x07E */ u8 peachFlags; /* (1 = isPeach, 2 = isTransformed, 4 = hasUmbrella) */ /* 0x07F */ u8 peachDisguise; /* (1 = koopatrol, 2 = hammer bros, 3 = clubba) */ - /* 0x080 */ char unk_80[6]; + /* 0x080 */ char unk_80[4]; + /* 0x084 */ s8 unk_84; + /* 0x085 */ char unk_85; /* 0x086 */ s16 areaID; /* Created by retype action */ /* 0x088 */ s16 prevArea; /* 0x08A */ s16 changedArea; /* (1 = yes) */ diff --git a/src/world/area_pra/pra_01/D4D040.c b/src/world/area_pra/pra_01/D4D040.c index 9a82e4c942..7fcbb80a84 100644 --- a/src/world/area_pra/pra_01/D4D040.c +++ b/src/world/area_pra/pra_01/D4D040.c @@ -1,3 +1,3 @@ #include "pra_01.h" -INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D040", func_80240000_D4D040); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_02/D4FFF0.c b/src/world/area_pra/pra_02/D4FFF0.c index b60e6e60c0..6f00bc03de 100644 --- a/src/world/area_pra/pra_02/D4FFF0.c +++ b/src/world/area_pra/pra_02/D4FFF0.c @@ -1,3 +1,3 @@ #include "pra_02.h" -INCLUDE_ASM(s32, "world/area_pra/pra_02/D4FFF0", func_80240000_D4FFF0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_03/D53CB0.c b/src/world/area_pra/pra_03/D53CB0.c index 3a2cf7d116..b26425561a 100644 --- a/src/world/area_pra/pra_03/D53CB0.c +++ b/src/world/area_pra/pra_03/D53CB0.c @@ -1,3 +1,3 @@ #include "pra_03.h" -INCLUDE_ASM(s32, "world/area_pra/pra_03/D53CB0", func_80240000_D53CB0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_04/D54690.c b/src/world/area_pra/pra_04/D54690.c index 5a1f102bb0..ea39ab04ba 100644 --- a/src/world/area_pra/pra_04/D54690.c +++ b/src/world/area_pra/pra_04/D54690.c @@ -1,3 +1,3 @@ #include "pra_04.h" -INCLUDE_ASM(s32, "world/area_pra/pra_04/D54690", func_80240000_D54690); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_05/D55BB0.c b/src/world/area_pra/pra_05/D55BB0.c index a76fea35b6..e1a8371bc7 100644 --- a/src/world/area_pra/pra_05/D55BB0.c +++ b/src/world/area_pra/pra_05/D55BB0.c @@ -1,3 +1,3 @@ #include "pra_05.h" -INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BB0", func_80240000_D55BB0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_09/D58890.c b/src/world/area_pra/pra_09/D58890.c index bc8a76e540..1cb5264462 100644 --- a/src/world/area_pra/pra_09/D58890.c +++ b/src/world/area_pra/pra_09/D58890.c @@ -1,3 +1,3 @@ #include "pra_09.h" -INCLUDE_ASM(s32, "world/area_pra/pra_09/D58890", func_80240000_D58890); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_10/D5F2B0.c b/src/world/area_pra/pra_10/D5F2B0.c index 5e9a953841..ba3fead5e3 100644 --- a/src/world/area_pra/pra_10/D5F2B0.c +++ b/src/world/area_pra/pra_10/D5F2B0.c @@ -1,3 +1,3 @@ #include "pra_10.h" -INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2B0", func_80240000_D5F2B0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_11/D61500.c b/src/world/area_pra/pra_11/D61500.c index 373e722a18..1b31d71d22 100644 --- a/src/world/area_pra/pra_11/D61500.c +++ b/src/world/area_pra/pra_11/D61500.c @@ -1,3 +1,3 @@ #include "pra_11.h" -INCLUDE_ASM(s32, "world/area_pra/pra_11/D61500", func_80240000_D61500); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_13/D645E0.c b/src/world/area_pra/pra_13/D645E0.c index 7d8a23ffdf..1b9d5657ec 100644 --- a/src/world/area_pra/pra_13/D645E0.c +++ b/src/world/area_pra/pra_13/D645E0.c @@ -1,3 +1,3 @@ #include "pra_13.h" -INCLUDE_ASM(s32, "world/area_pra/pra_13/D645E0", func_80240000_D645E0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_14/D67D00.c b/src/world/area_pra/pra_14/D67D00.c index 14cbe32076..3a141351d5 100644 --- a/src/world/area_pra/pra_14/D67D00.c +++ b/src/world/area_pra/pra_14/D67D00.c @@ -1,3 +1,3 @@ #include "pra_14.h" -INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D00", func_80240000_D67D00); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_15/D69810.c b/src/world/area_pra/pra_15/D69810.c index 9de07a27be..6a527b7f71 100644 --- a/src/world/area_pra/pra_15/D69810.c +++ b/src/world/area_pra/pra_15/D69810.c @@ -1,3 +1,3 @@ #include "pra_15.h" -INCLUDE_ASM(s32, "world/area_pra/pra_15/D69810", func_80240000_D69810); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_16/D69B20.c b/src/world/area_pra/pra_16/D69B20.c index a0591e89d0..2703d6c503 100644 --- a/src/world/area_pra/pra_16/D69B20.c +++ b/src/world/area_pra/pra_16/D69B20.c @@ -1,3 +1,3 @@ #include "pra_16.h" -INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B20", func_80240000_D69B20); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_18/D6B620.c b/src/world/area_pra/pra_18/D6B620.c index fe48f1afad..7b91e393c9 100644 --- a/src/world/area_pra/pra_18/D6B620.c +++ b/src/world/area_pra/pra_18/D6B620.c @@ -1,3 +1,3 @@ #include "pra_18.h" -INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B620", func_80240000_D6B620); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_19/D6E9B0.c b/src/world/area_pra/pra_19/D6E9B0.c index f01da2c3a4..954288afc8 100644 --- a/src/world/area_pra/pra_19/D6E9B0.c +++ b/src/world/area_pra/pra_19/D6E9B0.c @@ -1,3 +1,3 @@ #include "pra_19.h" -INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9B0", func_80240000_D6E9B0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_20/D763A0.c b/src/world/area_pra/pra_20/D763A0.c index e7b643ff7c..7c9de4d59f 100644 --- a/src/world/area_pra/pra_20/D763A0.c +++ b/src/world/area_pra/pra_20/D763A0.c @@ -1,3 +1,3 @@ #include "pra_20.h" -INCLUDE_ASM(s32, "world/area_pra/pra_20/D763A0", func_80240000_D763A0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_21/D77F20.c b/src/world/area_pra/pra_21/D77F20.c index 04d9211a05..7185bc86ae 100644 --- a/src/world/area_pra/pra_21/D77F20.c +++ b/src/world/area_pra/pra_21/D77F20.c @@ -1,3 +1,3 @@ #include "pra_21.h" -INCLUDE_ASM(s32, "world/area_pra/pra_21/D77F20", func_80240000_D77F20); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_22/D78880.c b/src/world/area_pra/pra_22/D78880.c index 7fa620dcf5..c0ab0178ac 100644 --- a/src/world/area_pra/pra_22/D78880.c +++ b/src/world/area_pra/pra_22/D78880.c @@ -1,3 +1,3 @@ #include "pra_22.h" -INCLUDE_ASM(s32, "world/area_pra/pra_22/D78880", func_80240000_D78880); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_29/D7CB50.c b/src/world/area_pra/pra_29/D7CB50.c index 1151d65219..64b4866e3c 100644 --- a/src/world/area_pra/pra_29/D7CB50.c +++ b/src/world/area_pra/pra_29/D7CB50.c @@ -1,3 +1,3 @@ #include "pra_29.h" -INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB50", func_80240000_D7CB50); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_32/D86A00.c b/src/world/area_pra/pra_32/D86A00.c index 04be5e972b..ebc64e2d55 100644 --- a/src/world/area_pra/pra_32/D86A00.c +++ b/src/world/area_pra/pra_32/D86A00.c @@ -1,3 +1,3 @@ #include "pra_32.h" -INCLUDE_ASM(s32, "world/area_pra/pra_32/D86A00", func_80240000_D86A00); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_33/D896E0.c b/src/world/area_pra/pra_33/D896E0.c index f9ba2c2222..26e883aeec 100644 --- a/src/world/area_pra/pra_33/D896E0.c +++ b/src/world/area_pra/pra_33/D896E0.c @@ -1,3 +1,3 @@ #include "pra_33.h" -INCLUDE_ASM(s32, "world/area_pra/pra_33/D896E0", func_80240000_D896E0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_34/D8B3B0.c b/src/world/area_pra/pra_34/D8B3B0.c index c04f9203cc..d81c0ff150 100644 --- a/src/world/area_pra/pra_34/D8B3B0.c +++ b/src/world/area_pra/pra_34/D8B3B0.c @@ -1,3 +1,3 @@ #include "pra_34.h" -INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3B0", func_80240000_D8B3B0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_35/D8D250.c b/src/world/area_pra/pra_35/D8D250.c index 778223b3a2..20dff11ba4 100644 --- a/src/world/area_pra/pra_35/D8D250.c +++ b/src/world/area_pra/pra_35/D8D250.c @@ -1,3 +1,3 @@ #include "pra_35.h" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D250", func_80240000_D8D250); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_40/D999B0.c b/src/world/area_pra/pra_40/D999B0.c index 701becc035..afa78735c4 100644 --- a/src/world/area_pra/pra_40/D999B0.c +++ b/src/world/area_pra/pra_40/D999B0.c @@ -1,3 +1,3 @@ #include "pra_40.h" -INCLUDE_ASM(s32, "world/area_pra/pra_40/D999B0", func_80240000_D999B0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/common/SetGameStatusUnk84_1.inc.c b/src/world/common/SetGameStatusUnk84_1.inc.c new file mode 100644 index 0000000000..8a2857ebdb --- /dev/null +++ b/src/world/common/SetGameStatusUnk84_1.inc.c @@ -0,0 +1,6 @@ +#include "common.h" + +static ApiStatus SetGameStatusUnk84_1(ScriptInstance* script, s32 isInitialCall) { + GAME_STATUS->unk_84 = 1; + return ApiStatus_BLOCK; +} From 1f82a0c857a8ec772fc2d90c90c08def7215e805 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 22 Nov 2020 11:06:57 -0500 Subject: [PATCH 26/38] SetPartnerFlags20000 --- .../pra_01/D4D060/func_80240EEC_D4DF2C.s | 18 ------------------ .../pra_01/D4D060/func_80240F60_D4DFA0.s | 12 ------------ .../pra_05/D55BD0/func_80240EEC_D56A9C.s | 18 ------------------ .../pra_06/D57430/func_80240F1C_D5834C.s | 18 ------------------ .../pra_10/D5F2D0/func_80240EEC_D6019C.s | 18 ------------------ .../pra_11/D61520/func_80240EEC_D623EC.s | 18 ------------------ .../pra_12/D62D10/func_80240F1C_D63C2C.s | 18 ------------------ .../pra_14/D67D20/func_80240EEC_D68BEC.s | 18 ------------------ .../pra_16/D69B40/func_80240EEC_D6AA0C.s | 18 ------------------ .../pra_18/D6B640/func_80240EEC_D6C50C.s | 18 ------------------ .../pra_20/D763C0/func_80240EEC_D7728C.s | 18 ------------------ .../pra_27/D799F0/func_80240F1C_D7A90C.s | 18 ------------------ .../pra_28/D7B2A0/func_80240F1C_D7C1BC.s | 18 ------------------ .../pra_29/D7CB70/func_80240EEC_D7DA3C.s | 18 ------------------ .../pra_33/D89700/func_80240EEC_D8A5CC.s | 18 ------------------ .../pra_35/D8D270/func_80240EEC_D8E13C.s | 18 ------------------ .../pra_36/D91700/func_80240F1C_D9261C.s | 18 ------------------ .../pra_38/D955F0/func_80240F1C_D9650C.s | 18 ------------------ .../pra_39/D97890/func_80240F1C_D987AC.s | 18 ------------------ .../pra_40/D999D0/func_80240EEC_D9A89C.s | 18 ------------------ src/world/area_pra/pra_01/D4D060.c | 7 +++++-- src/world/area_pra/pra_05/D55BD0.c | 2 +- src/world/area_pra/pra_06/D57430.c | 2 +- src/world/area_pra/pra_10/D5F2D0.c | 2 +- src/world/area_pra/pra_11/D61520.c | 2 +- src/world/area_pra/pra_12/D62D10.c | 2 +- src/world/area_pra/pra_14/D67D20.c | 2 +- src/world/area_pra/pra_16/D69B40.c | 2 +- src/world/area_pra/pra_18/D6B640.c | 2 +- src/world/area_pra/pra_20/D763C0.c | 2 +- src/world/area_pra/pra_27/D799F0.c | 2 +- src/world/area_pra/pra_28/D7B2A0.c | 2 +- src/world/area_pra/pra_29/D7CB70.c | 2 +- src/world/area_pra/pra_33/D89700.c | 2 +- src/world/area_pra/pra_35/D8D270.c | 2 +- src/world/area_pra/pra_36/D91700.c | 2 +- src/world/area_pra/pra_38/D955F0.c | 2 +- src/world/area_pra/pra_39/D97890.c | 2 +- src/world/area_pra/pra_40/D999D0.c | 2 +- src/world/common/SetPartnerFlags20000.inc.c | 9 +++++++++ 40 files changed, 32 insertions(+), 374 deletions(-) delete mode 100644 asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240EEC_D4DF2C.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240F60_D4DFA0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240EEC_D56A9C.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240F1C_D5834C.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240EEC_D6019C.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240EEC_D623EC.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F1C_D63C2C.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240EEC_D68BEC.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240EEC_D6AA0C.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240EEC_D6C50C.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240EEC_D7728C.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F1C_D7A90C.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F1C_D7C1BC.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240EEC_D7DA3C.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240EEC_D8A5CC.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240EEC_D8E13C.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240F1C_D9261C.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F1C_D9650C.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F1C_D987AC.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240EEC_D9A89C.s create mode 100644 src/world/common/SetPartnerFlags20000.inc.c diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240EEC_D4DF2C.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240EEC_D4DF2C.s deleted file mode 100644 index 9f0b8b9186..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240EEC_D4DF2C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D4DF2C -/* D4DF2C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4DF30 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D4DF34 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D4DF38 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D4DF3C 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D4DF40 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D4DF44 80240F04 3C030002 */ lui $v1, 2 -/* D4DF48 80240F08 8C820000 */ lw $v0, ($a0) -/* D4DF4C 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D4DF50 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D4DF54 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D4DF58 80240F18 03E00008 */ jr $ra -/* D4DF5C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240F60_D4DFA0.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240F60_D4DFA0.s deleted file mode 100644 index 5fed9861e1..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240F60_D4DFA0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F60_D4DFA0 -/* D4DFA0 80240F60 3C02800A */ lui $v0, %hi(D_8009A650) -/* D4DFA4 80240F64 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* D4DFA8 80240F68 8C430000 */ lw $v1, ($v0) -/* D4DFAC 80240F6C 2404FF7F */ addiu $a0, $zero, -0x81 -/* D4DFB0 80240F70 00641824 */ and $v1, $v1, $a0 -/* D4DFB4 80240F74 AC430000 */ sw $v1, ($v0) -/* D4DFB8 80240F78 03E00008 */ jr $ra -/* D4DFBC 80240F7C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240EEC_D56A9C.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240EEC_D56A9C.s deleted file mode 100644 index 85a5c63b6c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240EEC_D56A9C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D56A9C -/* D56A9C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D56AA0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D56AA4 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D56AA8 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D56AAC 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D56AB0 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D56AB4 80240F04 3C030002 */ lui $v1, 2 -/* D56AB8 80240F08 8C820000 */ lw $v0, ($a0) -/* D56ABC 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D56AC0 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D56AC4 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D56AC8 80240F18 03E00008 */ jr $ra -/* D56ACC 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240F1C_D5834C.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240F1C_D5834C.s deleted file mode 100644 index 5ed59478d0..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240F1C_D5834C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F1C_D5834C -/* D5834C 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D58350 80240F20 AFBF0010 */ sw $ra, 0x10($sp) -/* D58354 80240F24 0C00EAD2 */ jal get_npc_safe -/* D58358 80240F28 2404FFFC */ addiu $a0, $zero, -4 -/* D5835C 80240F2C 0040202D */ daddu $a0, $v0, $zero -/* D58360 80240F30 10800004 */ beqz $a0, .L80240F44 -/* D58364 80240F34 3C030002 */ lui $v1, 2 -/* D58368 80240F38 8C820000 */ lw $v0, ($a0) -/* D5836C 80240F3C 00431025 */ or $v0, $v0, $v1 -/* D58370 80240F40 AC820000 */ sw $v0, ($a0) -.L80240F44: -/* D58374 80240F44 8FBF0010 */ lw $ra, 0x10($sp) -/* D58378 80240F48 03E00008 */ jr $ra -/* D5837C 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240EEC_D6019C.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240EEC_D6019C.s deleted file mode 100644 index a85393256a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240EEC_D6019C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D6019C -/* D6019C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D601A0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D601A4 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D601A8 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D601AC 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D601B0 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D601B4 80240F04 3C030002 */ lui $v1, 2 -/* D601B8 80240F08 8C820000 */ lw $v0, ($a0) -/* D601BC 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D601C0 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D601C4 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D601C8 80240F18 03E00008 */ jr $ra -/* D601CC 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240EEC_D623EC.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240EEC_D623EC.s deleted file mode 100644 index 1ca7cb6a0d..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240EEC_D623EC.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D623EC -/* D623EC 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D623F0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D623F4 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D623F8 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D623FC 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D62400 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D62404 80240F04 3C030002 */ lui $v1, 2 -/* D62408 80240F08 8C820000 */ lw $v0, ($a0) -/* D6240C 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D62410 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D62414 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D62418 80240F18 03E00008 */ jr $ra -/* D6241C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F1C_D63C2C.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F1C_D63C2C.s deleted file mode 100644 index c841e08ca3..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F1C_D63C2C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F1C_D63C2C -/* D63C2C 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D63C30 80240F20 AFBF0010 */ sw $ra, 0x10($sp) -/* D63C34 80240F24 0C00EAD2 */ jal get_npc_safe -/* D63C38 80240F28 2404FFFC */ addiu $a0, $zero, -4 -/* D63C3C 80240F2C 0040202D */ daddu $a0, $v0, $zero -/* D63C40 80240F30 10800004 */ beqz $a0, .L80240F44 -/* D63C44 80240F34 3C030002 */ lui $v1, 2 -/* D63C48 80240F38 8C820000 */ lw $v0, ($a0) -/* D63C4C 80240F3C 00431025 */ or $v0, $v0, $v1 -/* D63C50 80240F40 AC820000 */ sw $v0, ($a0) -.L80240F44: -/* D63C54 80240F44 8FBF0010 */ lw $ra, 0x10($sp) -/* D63C58 80240F48 03E00008 */ jr $ra -/* D63C5C 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240EEC_D68BEC.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240EEC_D68BEC.s deleted file mode 100644 index 0622fcbaac..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240EEC_D68BEC.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D68BEC -/* D68BEC 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D68BF0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D68BF4 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D68BF8 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D68BFC 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D68C00 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D68C04 80240F04 3C030002 */ lui $v1, 2 -/* D68C08 80240F08 8C820000 */ lw $v0, ($a0) -/* D68C0C 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D68C10 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D68C14 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D68C18 80240F18 03E00008 */ jr $ra -/* D68C1C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240EEC_D6AA0C.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240EEC_D6AA0C.s deleted file mode 100644 index dbe89d4e89..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240EEC_D6AA0C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D6AA0C -/* D6AA0C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6AA10 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D6AA14 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D6AA18 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D6AA1C 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D6AA20 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D6AA24 80240F04 3C030002 */ lui $v1, 2 -/* D6AA28 80240F08 8C820000 */ lw $v0, ($a0) -/* D6AA2C 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D6AA30 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D6AA34 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D6AA38 80240F18 03E00008 */ jr $ra -/* D6AA3C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240EEC_D6C50C.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240EEC_D6C50C.s deleted file mode 100644 index 44ac3c1c06..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240EEC_D6C50C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D6C50C -/* D6C50C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6C510 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D6C514 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D6C518 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D6C51C 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D6C520 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D6C524 80240F04 3C030002 */ lui $v1, 2 -/* D6C528 80240F08 8C820000 */ lw $v0, ($a0) -/* D6C52C 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D6C530 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D6C534 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D6C538 80240F18 03E00008 */ jr $ra -/* D6C53C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240EEC_D7728C.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240EEC_D7728C.s deleted file mode 100644 index b4ab4a302b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240EEC_D7728C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D7728C -/* D7728C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D77290 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D77294 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D77298 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D7729C 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D772A0 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D772A4 80240F04 3C030002 */ lui $v1, 2 -/* D772A8 80240F08 8C820000 */ lw $v0, ($a0) -/* D772AC 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D772B0 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D772B4 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D772B8 80240F18 03E00008 */ jr $ra -/* D772BC 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F1C_D7A90C.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F1C_D7A90C.s deleted file mode 100644 index 4775e3e0fb..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F1C_D7A90C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F1C_D7A90C -/* D7A90C 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7A910 80240F20 AFBF0010 */ sw $ra, 0x10($sp) -/* D7A914 80240F24 0C00EAD2 */ jal get_npc_safe -/* D7A918 80240F28 2404FFFC */ addiu $a0, $zero, -4 -/* D7A91C 80240F2C 0040202D */ daddu $a0, $v0, $zero -/* D7A920 80240F30 10800004 */ beqz $a0, .L80240F44 -/* D7A924 80240F34 3C030002 */ lui $v1, 2 -/* D7A928 80240F38 8C820000 */ lw $v0, ($a0) -/* D7A92C 80240F3C 00431025 */ or $v0, $v0, $v1 -/* D7A930 80240F40 AC820000 */ sw $v0, ($a0) -.L80240F44: -/* D7A934 80240F44 8FBF0010 */ lw $ra, 0x10($sp) -/* D7A938 80240F48 03E00008 */ jr $ra -/* D7A93C 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F1C_D7C1BC.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F1C_D7C1BC.s deleted file mode 100644 index 72a264f5c6..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F1C_D7C1BC.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F1C_D7C1BC -/* D7C1BC 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7C1C0 80240F20 AFBF0010 */ sw $ra, 0x10($sp) -/* D7C1C4 80240F24 0C00EAD2 */ jal get_npc_safe -/* D7C1C8 80240F28 2404FFFC */ addiu $a0, $zero, -4 -/* D7C1CC 80240F2C 0040202D */ daddu $a0, $v0, $zero -/* D7C1D0 80240F30 10800004 */ beqz $a0, .L80240F44 -/* D7C1D4 80240F34 3C030002 */ lui $v1, 2 -/* D7C1D8 80240F38 8C820000 */ lw $v0, ($a0) -/* D7C1DC 80240F3C 00431025 */ or $v0, $v0, $v1 -/* D7C1E0 80240F40 AC820000 */ sw $v0, ($a0) -.L80240F44: -/* D7C1E4 80240F44 8FBF0010 */ lw $ra, 0x10($sp) -/* D7C1E8 80240F48 03E00008 */ jr $ra -/* D7C1EC 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240EEC_D7DA3C.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240EEC_D7DA3C.s deleted file mode 100644 index 5fcc6c0966..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240EEC_D7DA3C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D7DA3C -/* D7DA3C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7DA40 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D7DA44 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D7DA48 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D7DA4C 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D7DA50 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D7DA54 80240F04 3C030002 */ lui $v1, 2 -/* D7DA58 80240F08 8C820000 */ lw $v0, ($a0) -/* D7DA5C 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D7DA60 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D7DA64 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D7DA68 80240F18 03E00008 */ jr $ra -/* D7DA6C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240EEC_D8A5CC.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240EEC_D8A5CC.s deleted file mode 100644 index 6763b73f3e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240EEC_D8A5CC.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D8A5CC -/* D8A5CC 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8A5D0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D8A5D4 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D8A5D8 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D8A5DC 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D8A5E0 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D8A5E4 80240F04 3C030002 */ lui $v1, 2 -/* D8A5E8 80240F08 8C820000 */ lw $v0, ($a0) -/* D8A5EC 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D8A5F0 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D8A5F4 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D8A5F8 80240F18 03E00008 */ jr $ra -/* D8A5FC 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240EEC_D8E13C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240EEC_D8E13C.s deleted file mode 100644 index c6da5354e7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240EEC_D8E13C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D8E13C -/* D8E13C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8E140 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D8E144 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D8E148 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D8E14C 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D8E150 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D8E154 80240F04 3C030002 */ lui $v1, 2 -/* D8E158 80240F08 8C820000 */ lw $v0, ($a0) -/* D8E15C 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D8E160 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D8E164 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D8E168 80240F18 03E00008 */ jr $ra -/* D8E16C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240F1C_D9261C.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240F1C_D9261C.s deleted file mode 100644 index da883f24f1..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240F1C_D9261C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F1C_D9261C -/* D9261C 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D92620 80240F20 AFBF0010 */ sw $ra, 0x10($sp) -/* D92624 80240F24 0C00EAD2 */ jal get_npc_safe -/* D92628 80240F28 2404FFFC */ addiu $a0, $zero, -4 -/* D9262C 80240F2C 0040202D */ daddu $a0, $v0, $zero -/* D92630 80240F30 10800004 */ beqz $a0, .L80240F44 -/* D92634 80240F34 3C030002 */ lui $v1, 2 -/* D92638 80240F38 8C820000 */ lw $v0, ($a0) -/* D9263C 80240F3C 00431025 */ or $v0, $v0, $v1 -/* D92640 80240F40 AC820000 */ sw $v0, ($a0) -.L80240F44: -/* D92644 80240F44 8FBF0010 */ lw $ra, 0x10($sp) -/* D92648 80240F48 03E00008 */ jr $ra -/* D9264C 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F1C_D9650C.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F1C_D9650C.s deleted file mode 100644 index 3135ed1e2e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F1C_D9650C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F1C_D9650C -/* D9650C 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D96510 80240F20 AFBF0010 */ sw $ra, 0x10($sp) -/* D96514 80240F24 0C00EAD2 */ jal get_npc_safe -/* D96518 80240F28 2404FFFC */ addiu $a0, $zero, -4 -/* D9651C 80240F2C 0040202D */ daddu $a0, $v0, $zero -/* D96520 80240F30 10800004 */ beqz $a0, .L80240F44 -/* D96524 80240F34 3C030002 */ lui $v1, 2 -/* D96528 80240F38 8C820000 */ lw $v0, ($a0) -/* D9652C 80240F3C 00431025 */ or $v0, $v0, $v1 -/* D96530 80240F40 AC820000 */ sw $v0, ($a0) -.L80240F44: -/* D96534 80240F44 8FBF0010 */ lw $ra, 0x10($sp) -/* D96538 80240F48 03E00008 */ jr $ra -/* D9653C 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F1C_D987AC.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F1C_D987AC.s deleted file mode 100644 index c285860b83..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F1C_D987AC.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F1C_D987AC -/* D987AC 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D987B0 80240F20 AFBF0010 */ sw $ra, 0x10($sp) -/* D987B4 80240F24 0C00EAD2 */ jal get_npc_safe -/* D987B8 80240F28 2404FFFC */ addiu $a0, $zero, -4 -/* D987BC 80240F2C 0040202D */ daddu $a0, $v0, $zero -/* D987C0 80240F30 10800004 */ beqz $a0, .L80240F44 -/* D987C4 80240F34 3C030002 */ lui $v1, 2 -/* D987C8 80240F38 8C820000 */ lw $v0, ($a0) -/* D987CC 80240F3C 00431025 */ or $v0, $v0, $v1 -/* D987D0 80240F40 AC820000 */ sw $v0, ($a0) -.L80240F44: -/* D987D4 80240F44 8FBF0010 */ lw $ra, 0x10($sp) -/* D987D8 80240F48 03E00008 */ jr $ra -/* D987DC 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240EEC_D9A89C.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240EEC_D9A89C.s deleted file mode 100644 index f5d4965a22..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240EEC_D9A89C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D9A89C -/* D9A89C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D9A8A0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D9A8A4 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D9A8A8 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D9A8AC 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D9A8B0 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D9A8B4 80240F04 3C030002 */ lui $v1, 2 -/* D9A8B8 80240F08 8C820000 */ lw $v0, ($a0) -/* D9A8BC 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D9A8C0 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D9A8C4 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D9A8C8 80240F18 03E00008 */ jr $ra -/* D9A8CC 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c index 4c4a52c140..1347268caf 100644 --- a/src/world/area_pra/pra_01/D4D060.c +++ b/src/world/area_pra/pra_01/D4D060.c @@ -24,11 +24,14 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240D3C_D4DD7C); INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240EB8_D4DEF8); -INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240EEC_D4DF2C); +#include "world/common/SetPartnerFlags20000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240F20_D4DF60); -INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240F60_D4DFA0); +ApiStatus func_80240F60_D4DFA0(ScriptInstance* script, s32 isInitialCall) { + D_8009A650[0] &= ~0x80; + return ApiStatus_DONE2; +} #include "world/common/GetNpcCollisionHeight.inc.c" diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c index 8e66aa4bb4..60d80a42db 100644 --- a/src/world/area_pra/pra_05/D55BD0.c +++ b/src/world/area_pra/pra_05/D55BD0.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240D3C_D568EC); #include "world/common/SetPartnerFlags80000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240EEC_D56A9C); +#include "world/common/SetPartnerFlags20000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240F20_D56AD0); diff --git a/src/world/area_pra/pra_06/D57430.c b/src/world/area_pra/pra_06/D57430.c index 4fcde46580..eb2d6746b6 100644 --- a/src/world/area_pra/pra_06/D57430.c +++ b/src/world/area_pra/pra_06/D57430.c @@ -26,4 +26,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240D6C_D5819C); #include "world/common/SetPartnerFlags80000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240F1C_D5834C); +#include "world/common/SetPartnerFlags20000.inc.c" diff --git a/src/world/area_pra/pra_10/D5F2D0.c b/src/world/area_pra/pra_10/D5F2D0.c index a030e21ad9..aaa2478791 100644 --- a/src/world/area_pra/pra_10/D5F2D0.c +++ b/src/world/area_pra/pra_10/D5F2D0.c @@ -24,6 +24,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240D3C_D5FFEC); #include "world/common/SetPartnerFlags80000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240EEC_D6019C); +#include "world/common/SetPartnerFlags20000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240F20_D601D0); diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c index 353803b993..48ef19fd5e 100644 --- a/src/world/area_pra/pra_11/D61520.c +++ b/src/world/area_pra/pra_11/D61520.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240D3C_D6223C); #include "world/common/SetPartnerFlags80000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240EEC_D623EC); +#include "world/common/SetPartnerFlags20000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240F20_D62420); diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c index fab556b915..7401c5d5d6 100644 --- a/src/world/area_pra/pra_12/D62D10.c +++ b/src/world/area_pra/pra_12/D62D10.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240D6C_D63A7C); #include "world/common/SetPartnerFlags80000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240F1C_D63C2C); +#include "world/common/SetPartnerFlags20000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240F50_D63C60); diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c index 67376a1e4f..d9a9d66fa7 100644 --- a/src/world/area_pra/pra_14/D67D20.c +++ b/src/world/area_pra/pra_14/D67D20.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240D3C_D68A3C); #include "world/common/SetPartnerFlags80000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240EEC_D68BEC); +#include "world/common/SetPartnerFlags20000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240F20_D68C20); diff --git a/src/world/area_pra/pra_16/D69B40.c b/src/world/area_pra/pra_16/D69B40.c index 6ef3f80fb4..95be9b7a7d 100644 --- a/src/world/area_pra/pra_16/D69B40.c +++ b/src/world/area_pra/pra_16/D69B40.c @@ -24,4 +24,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240D3C_D6A85C); #include "world/common/SetPartnerFlags80000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240EEC_D6AA0C); +#include "world/common/SetPartnerFlags20000.inc.c" diff --git a/src/world/area_pra/pra_18/D6B640.c b/src/world/area_pra/pra_18/D6B640.c index 3791e03e3e..6e4636e030 100644 --- a/src/world/area_pra/pra_18/D6B640.c +++ b/src/world/area_pra/pra_18/D6B640.c @@ -24,4 +24,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240D3C_D6C35C); #include "world/common/SetPartnerFlags80000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240EEC_D6C50C); +#include "world/common/SetPartnerFlags20000.inc.c" diff --git a/src/world/area_pra/pra_20/D763C0.c b/src/world/area_pra/pra_20/D763C0.c index eaa094499c..c70a9535f0 100644 --- a/src/world/area_pra/pra_20/D763C0.c +++ b/src/world/area_pra/pra_20/D763C0.c @@ -24,4 +24,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240D3C_D770DC); #include "world/common/SetPartnerFlags80000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240EEC_D7728C); +#include "world/common/SetPartnerFlags20000.inc.c" diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c index 625d9e6c89..3411de3245 100644 --- a/src/world/area_pra/pra_27/D799F0.c +++ b/src/world/area_pra/pra_27/D799F0.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240D6C_D7A75C); #include "world/common/SetPartnerFlags80000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240F1C_D7A90C); +#include "world/common/SetPartnerFlags20000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240F50_D7A940); diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c index e8ab8778ba..e1b18143a5 100644 --- a/src/world/area_pra/pra_28/D7B2A0.c +++ b/src/world/area_pra/pra_28/D7B2A0.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240D6C_D7C00C); #include "world/common/SetPartnerFlags80000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240F1C_D7C1BC); +#include "world/common/SetPartnerFlags20000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240F50_D7C1F0); diff --git a/src/world/area_pra/pra_29/D7CB70.c b/src/world/area_pra/pra_29/D7CB70.c index 1f57ea2527..41ba906407 100644 --- a/src/world/area_pra/pra_29/D7CB70.c +++ b/src/world/area_pra/pra_29/D7CB70.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240D3C_D7D88C); #include "world/common/SetPartnerFlags80000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240EEC_D7DA3C); +#include "world/common/SetPartnerFlags20000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240F20_D7DA70); diff --git a/src/world/area_pra/pra_33/D89700.c b/src/world/area_pra/pra_33/D89700.c index 8d38aaa200..543ca3a92e 100644 --- a/src/world/area_pra/pra_33/D89700.c +++ b/src/world/area_pra/pra_33/D89700.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240D3C_D8A41C); #include "world/common/SetPartnerFlags80000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240EEC_D8A5CC); +#include "world/common/SetPartnerFlags20000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240F20_D8A600); diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index 6bdc664fcb..9317252b46 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240D3C_D8DF8C); #include "world/common/SetPartnerFlags80000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240EEC_D8E13C); +#include "world/common/SetPartnerFlags20000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240F20_D8E170); diff --git a/src/world/area_pra/pra_36/D91700.c b/src/world/area_pra/pra_36/D91700.c index fb5c68d026..91f31dac16 100644 --- a/src/world/area_pra/pra_36/D91700.c +++ b/src/world/area_pra/pra_36/D91700.c @@ -26,4 +26,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240D6C_D9246C); #include "world/common/SetPartnerFlags80000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240F1C_D9261C); +#include "world/common/SetPartnerFlags20000.inc.c" diff --git a/src/world/area_pra/pra_38/D955F0.c b/src/world/area_pra/pra_38/D955F0.c index 7c53934195..0a22c57f68 100644 --- a/src/world/area_pra/pra_38/D955F0.c +++ b/src/world/area_pra/pra_38/D955F0.c @@ -26,6 +26,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240D6C_D9635C); #include "world/common/SetPartnerFlags80000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240F1C_D9650C); +#include "world/common/SetPartnerFlags20000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240F50_D96540); diff --git a/src/world/area_pra/pra_39/D97890.c b/src/world/area_pra/pra_39/D97890.c index f7ab229344..b2edb281c1 100644 --- a/src/world/area_pra/pra_39/D97890.c +++ b/src/world/area_pra/pra_39/D97890.c @@ -26,6 +26,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240D6C_D985FC); #include "world/common/SetPartnerFlags80000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240F1C_D987AC); +#include "world/common/SetPartnerFlags20000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240F50_D987E0); diff --git a/src/world/area_pra/pra_40/D999D0.c b/src/world/area_pra/pra_40/D999D0.c index 7a53d17de4..098a316fe9 100644 --- a/src/world/area_pra/pra_40/D999D0.c +++ b/src/world/area_pra/pra_40/D999D0.c @@ -24,4 +24,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240D3C_D9A6EC); #include "world/common/SetPartnerFlags80000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240EEC_D9A89C); +#include "world/common/SetPartnerFlags20000.inc.c" diff --git a/src/world/common/SetPartnerFlags20000.inc.c b/src/world/common/SetPartnerFlags20000.inc.c new file mode 100644 index 0000000000..d3603504b6 --- /dev/null +++ b/src/world/common/SetPartnerFlags20000.inc.c @@ -0,0 +1,9 @@ +#include "common.h" + +static void SetPartnerFlags20000(void) { + Npc* partner = get_npc_safe(NpcId_PARTNER); + + if (partner != NULL) { + partner->flags |= 0x20000; + } +} From e8774ab1632dbe680c82e617b02dea23fd0088a0 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 22 Nov 2020 11:14:56 -0500 Subject: [PATCH 27/38] UnkFunc2 --- .../pra_01/D4D060/func_80240020_D4D060.s | 18 ------------------ .../pra_01/D4D060/func_80240128_D4D168.s | 18 +++++++++--------- .../pra_01/D4D060/func_80240EB8_D4DEF8.s | 18 ------------------ .../pra_02/D50010/func_80240020_D50010.s | 18 ------------------ .../pra_02/D50010/func_80240128_D50118.s | 2 +- .../pra_05/D55BD0/func_80240020_D55BD0.s | 18 ------------------ .../pra_05/D55BD0/func_80240128_D55CD8.s | 2 +- .../pra_06/D57430/func_80240050_D57480.s | 18 ------------------ .../pra_06/D57430/func_80240158_D57588.s | 2 +- .../pra_09/D588B0/func_80240020_D588B0.s | 18 ------------------ .../pra_09/D588B0/func_80240128_D589B8.s | 2 +- .../pra_10/D5F2D0/func_80240020_D5F2D0.s | 18 ------------------ .../pra_10/D5F2D0/func_80240128_D5F3D8.s | 2 +- .../pra_11/D61520/func_80240020_D61520.s | 18 ------------------ .../pra_11/D61520/func_80240128_D61628.s | 2 +- .../pra_12/D62D10/func_80240050_D62D60.s | 18 ------------------ .../pra_12/D62D10/func_80240158_D62E68.s | 2 +- .../pra_13/D64600/func_80240020_D64600.s | 18 ------------------ .../pra_13/D64600/func_80240128_D64708.s | 2 +- .../pra_14/D67D20/func_80240020_D67D20.s | 18 ------------------ .../pra_14/D67D20/func_80240128_D67E28.s | 2 +- .../pra_16/D69B40/func_80240020_D69B40.s | 18 ------------------ .../pra_16/D69B40/func_80240128_D69C48.s | 2 +- .../pra_18/D6B640/func_80240020_D6B640.s | 18 ------------------ .../pra_18/D6B640/func_80240128_D6B748.s | 2 +- .../pra_19/D6E9D0/func_80240020_D6E9D0.s | 18 ------------------ .../pra_19/D6E9D0/func_80240128_D6EAD8.s | 2 +- .../pra_20/D763C0/func_80240020_D763C0.s | 18 ------------------ .../pra_20/D763C0/func_80240128_D764C8.s | 2 +- .../pra_27/D799F0/func_80240050_D79A40.s | 18 ------------------ .../pra_27/D799F0/func_80240158_D79B48.s | 2 +- .../pra_28/D7B2A0/func_80240050_D7B2F0.s | 18 ------------------ .../pra_28/D7B2A0/func_80240158_D7B3F8.s | 2 +- .../pra_29/D7CB70/func_80240020_D7CB70.s | 18 ------------------ .../pra_29/D7CB70/func_80240128_D7CC78.s | 2 +- .../pra_33/D89700/func_80240020_D89700.s | 18 ------------------ .../pra_33/D89700/func_80240128_D89808.s | 2 +- .../pra_34/D8B3D0/func_80240020_D8B3D0.s | 18 ------------------ .../pra_34/D8B3D0/func_80240128_D8B4D8.s | 2 +- .../pra_35/D8D270/func_80240020_D8D270.s | 18 ------------------ .../pra_35/D8D270/func_80240128_D8D378.s | 2 +- .../pra_36/D91700/func_80240050_D91750.s | 18 ------------------ .../pra_36/D91700/func_80240158_D91858.s | 2 +- .../pra_37/D92F40/func_80240050_D92F90.s | 18 ------------------ .../pra_37/D92F40/func_80240158_D93098.s | 2 +- .../pra_38/D955F0/func_80240050_D95640.s | 18 ------------------ .../pra_38/D955F0/func_80240158_D95748.s | 2 +- .../pra_39/D97890/func_80240050_D978E0.s | 18 ------------------ .../pra_39/D97890/func_80240158_D979E8.s | 2 +- .../pra_40/D999D0/func_80240020_D999D0.s | 18 ------------------ .../pra_40/D999D0/func_80240128_D99AD8.s | 2 +- src/world/area_pra/pra_01/D4D060.c | 4 ++-- src/world/area_pra/pra_02/D50010.c | 2 +- src/world/area_pra/pra_05/D55BD0.c | 2 +- src/world/area_pra/pra_06/D57430.c | 2 +- src/world/area_pra/pra_09/D588B0.c | 2 +- src/world/area_pra/pra_10/D5F2D0.c | 2 +- src/world/area_pra/pra_11/D61520.c | 2 +- src/world/area_pra/pra_12/D62D10.c | 2 +- src/world/area_pra/pra_13/D64600.c | 2 +- src/world/area_pra/pra_14/D67D20.c | 2 +- src/world/area_pra/pra_16/D69B40.c | 2 +- src/world/area_pra/pra_18/D6B640.c | 2 +- src/world/area_pra/pra_19/D6E9D0.c | 2 +- src/world/area_pra/pra_20/D763C0.c | 2 +- src/world/area_pra/pra_27/D799F0.c | 2 +- src/world/area_pra/pra_28/D7B2A0.c | 2 +- src/world/area_pra/pra_29/D7CB70.c | 2 +- src/world/area_pra/pra_33/D89700.c | 2 +- src/world/area_pra/pra_34/D8B3D0.c | 2 +- src/world/area_pra/pra_35/D8D270.c | 2 +- src/world/area_pra/pra_36/D91700.c | 2 +- src/world/area_pra/pra_37/D92F40.c | 2 +- src/world/area_pra/pra_38/D955F0.c | 2 +- src/world/area_pra/pra_39/D97890.c | 2 +- src/world/area_pra/pra_40/D999D0.c | 2 +- src/world/common/UnkFunc2.inc.c | 13 +++++++++++++ 77 files changed, 72 insertions(+), 527 deletions(-) delete mode 100644 asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240020_D4D060.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240EB8_D4DEF8.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240020_D50010.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240020_D55BD0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240050_D57480.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240020_D588B0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240020_D5F2D0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240020_D61520.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240050_D62D60.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240020_D64600.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240020_D67D20.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240020_D69B40.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240020_D6B640.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240020_D6E9D0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240020_D763C0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240050_D79A40.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240050_D7B2F0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240020_D7CB70.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240020_D89700.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240020_D8B3D0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240020_D8D270.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240050_D91750.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240050_D92F90.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240050_D95640.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240050_D978E0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240020_D999D0.s create mode 100644 src/world/common/UnkFunc2.inc.c diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240020_D4D060.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240020_D4D060.s deleted file mode 100644 index 342a1ce077..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240020_D4D060.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D4D060 -/* D4D060 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D4D064 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D4D068 80240028 00822024 */ and $a0, $a0, $v0 -/* D4D06C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D4D070 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D4D074 80240034 00821821 */ addu $v1, $a0, $v0 -/* D4D078 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D4D07C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D4D080 80240040 30620001 */ andi $v0, $v1, 1 -/* D4D084 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D4D088 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D4D08C 8024004C 03E00008 */ jr $ra -/* D4D090 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s index 9ce76f12ab..ebb2f85cdb 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s @@ -16,7 +16,7 @@ glabel func_80240128_D4D168 /* D4D194 80240154 27B20020 */ addiu $s2, $sp, 0x20 /* D4D198 80240158 8E0400CC */ lw $a0, 0xcc($s0) /* D4D19C 8024015C 0C044181 */ jal get_shadow_by_index -/* D4D1A0 80240160 00000000 */ nop +/* D4D1A0 80240160 00000000 */ nop /* D4D1A4 80240164 0C048B77 */ jal func_80122DDC /* D4D1A8 80240168 84440008 */ lh $a0, 8($v0) /* D4D1AC 8024016C 8C430000 */ lw $v1, ($v0) @@ -37,23 +37,23 @@ glabel func_80240128_D4D168 /* D4D1E8 802401A8 0C00B94E */ jal get_screen_coords /* D4D1EC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D4D1F0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D4D1F4 802401B4 0C090008 */ jal func_80240020_D4D060 -/* D4D1F8 802401B8 00000000 */ nop +/* D4D1F4 802401B4 0C090008 */ jal UnkFunc2 +/* D4D1F8 802401B8 00000000 */ nop /* D4D1FC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D4D200 802401C0 3C014307 */ lui $at, 0x4307 /* D4D204 802401C4 44810000 */ mtc1 $at, $f0 -/* D4D208 802401C8 00000000 */ nop +/* D4D208 802401C8 00000000 */ nop /* D4D20C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D4D210 802401D0 00000000 */ nop +/* D4D210 802401D0 00000000 */ nop /* D4D214 802401D4 4500000B */ bc1f .L80240204 /* D4D218 802401D8 24040002 */ addiu $a0, $zero, 2 /* D4D21C 802401DC 3C014361 */ lui $at, 0x4361 /* D4D220 802401E0 44810000 */ mtc1 $at, $f0 -/* D4D224 802401E4 00000000 */ nop +/* D4D224 802401E4 00000000 */ nop /* D4D228 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D4D22C 802401EC 00000000 */ nop +/* D4D22C 802401EC 00000000 */ nop /* D4D230 802401F0 45000004 */ bc1f .L80240204 -/* D4D234 802401F4 00000000 */ nop +/* D4D234 802401F4 00000000 */ nop /* D4D238 802401F8 0C090015 */ jal func_80240054_D4D094 /* D4D23C 802401FC 0040202D */ daddu $a0, $v0, $zero /* D4D240 80240200 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240128_D4D168 /* D4D2C8 80240288 AFA0001C */ sw $zero, 0x1c($sp) .L8024028C: /* D4D2CC 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D4D2D0 80240290 00000000 */ nop +/* D4D2D0 80240290 00000000 */ nop .L80240294: /* D4D2D4 80240294 9202000E */ lbu $v0, 0xe($s0) /* D4D2D8 80240298 3C01802E */ lui $at, 0x802e diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240EB8_D4DEF8.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240EB8_D4DEF8.s deleted file mode 100644 index d608d9f555..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240EB8_D4DEF8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D4DEF8 -/* D4DEF8 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4DEFC 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D4DF00 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D4DF04 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D4DF08 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D4DF0C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D4DF10 80240ED0 3C030008 */ lui $v1, 8 -/* D4DF14 80240ED4 8C820000 */ lw $v0, ($a0) -/* D4DF18 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D4DF1C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D4DF20 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D4DF24 80240EE4 03E00008 */ jr $ra -/* D4DF28 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240020_D50010.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240020_D50010.s deleted file mode 100644 index ac9a1f7dfa..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240020_D50010.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D50010 -/* D50010 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D50014 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D50018 80240028 00822024 */ and $a0, $a0, $v0 -/* D5001C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D50020 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D50024 80240034 00821821 */ addu $v1, $a0, $v0 -/* D50028 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D5002C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D50030 80240040 30620001 */ andi $v0, $v1, 1 -/* D50034 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D50038 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D5003C 8024004C 03E00008 */ jr $ra -/* D50040 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s index b44857d3df..b167f617da 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s @@ -37,7 +37,7 @@ glabel func_80240128_D50118 /* D50198 802401A8 0C00B94E */ jal get_screen_coords /* D5019C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D501A0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D501A4 802401B4 0C090008 */ jal func_80240020_D50010 +/* D501A4 802401B4 0C090008 */ jal UnkFunc2 /* D501A8 802401B8 00000000 */ nop /* D501AC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D501B0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240020_D55BD0.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240020_D55BD0.s deleted file mode 100644 index e48eeca155..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240020_D55BD0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D55BD0 -/* D55BD0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D55BD4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D55BD8 80240028 00822024 */ and $a0, $a0, $v0 -/* D55BDC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D55BE0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D55BE4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D55BE8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D55BEC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D55BF0 80240040 30620001 */ andi $v0, $v1, 1 -/* D55BF4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D55BF8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D55BFC 8024004C 03E00008 */ jr $ra -/* D55C00 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s index fb4cd0c6c5..48d99e7a38 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s @@ -37,7 +37,7 @@ glabel func_80240128_D55CD8 /* D55D58 802401A8 0C00B94E */ jal get_screen_coords /* D55D5C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D55D60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D55D64 802401B4 0C090008 */ jal func_80240020_D55BD0 +/* D55D64 802401B4 0C090008 */ jal UnkFunc2 /* D55D68 802401B8 00000000 */ nop /* D55D6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D55D70 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240050_D57480.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240050_D57480.s deleted file mode 100644 index a0539a2faf..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240050_D57480.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D57480 -/* D57480 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D57484 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D57488 80240058 00822024 */ and $a0, $a0, $v0 -/* D5748C 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D57490 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D57494 80240064 00821821 */ addu $v1, $a0, $v0 -/* D57498 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D5749C 8024006C 10400003 */ beqz $v0, .L8024007C -/* D574A0 80240070 30620001 */ andi $v0, $v1, 1 -/* D574A4 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D574A8 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D574AC 8024007C 03E00008 */ jr $ra -/* D574B0 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s index ae0e05920a..81305f1019 100644 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s @@ -37,7 +37,7 @@ glabel func_80240158_D57588 /* D57608 802401D8 0C00B94E */ jal get_screen_coords /* D5760C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D57610 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D57614 802401E4 0C090014 */ jal func_80240050_D57480 +/* D57614 802401E4 0C090014 */ jal UnkFunc2 /* D57618 802401E8 00000000 */ nop /* D5761C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D57620 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240020_D588B0.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240020_D588B0.s deleted file mode 100644 index 03dffc4dcc..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240020_D588B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D588B0 -/* D588B0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D588B4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D588B8 80240028 00822024 */ and $a0, $a0, $v0 -/* D588BC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D588C0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D588C4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D588C8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D588CC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D588D0 80240040 30620001 */ andi $v0, $v1, 1 -/* D588D4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D588D8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D588DC 8024004C 03E00008 */ jr $ra -/* D588E0 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s index 6491b2eeb7..b9258f4dad 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s @@ -37,7 +37,7 @@ glabel func_80240128_D589B8 /* D58A38 802401A8 0C00B94E */ jal get_screen_coords /* D58A3C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D58A40 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D58A44 802401B4 0C090008 */ jal func_80240020_D588B0 +/* D58A44 802401B4 0C090008 */ jal UnkFunc2 /* D58A48 802401B8 00000000 */ nop /* D58A4C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D58A50 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240020_D5F2D0.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240020_D5F2D0.s deleted file mode 100644 index 17a1407d74..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240020_D5F2D0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D5F2D0 -/* D5F2D0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D5F2D4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D5F2D8 80240028 00822024 */ and $a0, $a0, $v0 -/* D5F2DC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D5F2E0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D5F2E4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D5F2E8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D5F2EC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D5F2F0 80240040 30620001 */ andi $v0, $v1, 1 -/* D5F2F4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D5F2F8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D5F2FC 8024004C 03E00008 */ jr $ra -/* D5F300 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s index 8309fbbb4f..5a904f6e69 100644 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s +++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s @@ -37,7 +37,7 @@ glabel func_80240128_D5F3D8 /* D5F458 802401A8 0C00B94E */ jal get_screen_coords /* D5F45C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D5F460 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D5F464 802401B4 0C090008 */ jal func_80240020_D5F2D0 +/* D5F464 802401B4 0C090008 */ jal UnkFunc2 /* D5F468 802401B8 00000000 */ nop /* D5F46C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D5F470 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240020_D61520.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240020_D61520.s deleted file mode 100644 index d61d61b48e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240020_D61520.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D61520 -/* D61520 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D61524 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D61528 80240028 00822024 */ and $a0, $a0, $v0 -/* D6152C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D61530 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D61534 80240034 00821821 */ addu $v1, $a0, $v0 -/* D61538 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D6153C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D61540 80240040 30620001 */ andi $v0, $v1, 1 -/* D61544 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D61548 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D6154C 8024004C 03E00008 */ jr $ra -/* D61550 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s index f07d561c4b..993c392e0c 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s @@ -37,7 +37,7 @@ glabel func_80240128_D61628 /* D616A8 802401A8 0C00B94E */ jal get_screen_coords /* D616AC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D616B0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D616B4 802401B4 0C090008 */ jal func_80240020_D61520 +/* D616B4 802401B4 0C090008 */ jal UnkFunc2 /* D616B8 802401B8 00000000 */ nop /* D616BC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D616C0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240050_D62D60.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240050_D62D60.s deleted file mode 100644 index 7b8ead6925..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240050_D62D60.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D62D60 -/* D62D60 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D62D64 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D62D68 80240058 00822024 */ and $a0, $a0, $v0 -/* D62D6C 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D62D70 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D62D74 80240064 00821821 */ addu $v1, $a0, $v0 -/* D62D78 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D62D7C 8024006C 10400003 */ beqz $v0, .L8024007C -/* D62D80 80240070 30620001 */ andi $v0, $v1, 1 -/* D62D84 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D62D88 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D62D8C 8024007C 03E00008 */ jr $ra -/* D62D90 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s index 17c2dd065d..4230bd6dad 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s @@ -37,7 +37,7 @@ glabel func_80240158_D62E68 /* D62EE8 802401D8 0C00B94E */ jal get_screen_coords /* D62EEC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D62EF0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D62EF4 802401E4 0C090014 */ jal func_80240050_D62D60 +/* D62EF4 802401E4 0C090014 */ jal UnkFunc2 /* D62EF8 802401E8 00000000 */ nop /* D62EFC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D62F00 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240020_D64600.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240020_D64600.s deleted file mode 100644 index 0af9d2cf64..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240020_D64600.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D64600 -/* D64600 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D64604 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D64608 80240028 00822024 */ and $a0, $a0, $v0 -/* D6460C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D64610 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D64614 80240034 00821821 */ addu $v1, $a0, $v0 -/* D64618 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D6461C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D64620 80240040 30620001 */ andi $v0, $v1, 1 -/* D64624 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D64628 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D6462C 8024004C 03E00008 */ jr $ra -/* D64630 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s index d89cecbc6d..66f0bd6bc8 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s @@ -37,7 +37,7 @@ glabel func_80240128_D64708 /* D64788 802401A8 0C00B94E */ jal get_screen_coords /* D6478C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D64790 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D64794 802401B4 0C090008 */ jal func_80240020_D64600 +/* D64794 802401B4 0C090008 */ jal UnkFunc2 /* D64798 802401B8 00000000 */ nop /* D6479C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D647A0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240020_D67D20.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240020_D67D20.s deleted file mode 100644 index 5d92775e54..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240020_D67D20.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D67D20 -/* D67D20 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D67D24 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D67D28 80240028 00822024 */ and $a0, $a0, $v0 -/* D67D2C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D67D30 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D67D34 80240034 00821821 */ addu $v1, $a0, $v0 -/* D67D38 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D67D3C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D67D40 80240040 30620001 */ andi $v0, $v1, 1 -/* D67D44 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D67D48 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D67D4C 8024004C 03E00008 */ jr $ra -/* D67D50 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s index 31ef5814f5..d3c9059552 100644 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s +++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s @@ -37,7 +37,7 @@ glabel func_80240128_D67E28 /* D67EA8 802401A8 0C00B94E */ jal get_screen_coords /* D67EAC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D67EB0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D67EB4 802401B4 0C090008 */ jal func_80240020_D67D20 +/* D67EB4 802401B4 0C090008 */ jal UnkFunc2 /* D67EB8 802401B8 00000000 */ nop /* D67EBC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D67EC0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240020_D69B40.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240020_D69B40.s deleted file mode 100644 index c3047d05ab..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240020_D69B40.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D69B40 -/* D69B40 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D69B44 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D69B48 80240028 00822024 */ and $a0, $a0, $v0 -/* D69B4C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D69B50 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D69B54 80240034 00821821 */ addu $v1, $a0, $v0 -/* D69B58 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D69B5C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D69B60 80240040 30620001 */ andi $v0, $v1, 1 -/* D69B64 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D69B68 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D69B6C 8024004C 03E00008 */ jr $ra -/* D69B70 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s index d2c4425153..19191cd88a 100644 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s +++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s @@ -37,7 +37,7 @@ glabel func_80240128_D69C48 /* D69CC8 802401A8 0C00B94E */ jal get_screen_coords /* D69CCC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D69CD0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D69CD4 802401B4 0C090008 */ jal func_80240020_D69B40 +/* D69CD4 802401B4 0C090008 */ jal UnkFunc2 /* D69CD8 802401B8 00000000 */ nop /* D69CDC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D69CE0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240020_D6B640.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240020_D6B640.s deleted file mode 100644 index ae85c8a5fb..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240020_D6B640.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D6B640 -/* D6B640 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D6B644 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D6B648 80240028 00822024 */ and $a0, $a0, $v0 -/* D6B64C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D6B650 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D6B654 80240034 00821821 */ addu $v1, $a0, $v0 -/* D6B658 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D6B65C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D6B660 80240040 30620001 */ andi $v0, $v1, 1 -/* D6B664 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D6B668 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D6B66C 8024004C 03E00008 */ jr $ra -/* D6B670 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s index 342f0eeacd..2fb9e90fc9 100644 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s +++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s @@ -37,7 +37,7 @@ glabel func_80240128_D6B748 /* D6B7C8 802401A8 0C00B94E */ jal get_screen_coords /* D6B7CC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D6B7D0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D6B7D4 802401B4 0C090008 */ jal func_80240020_D6B640 +/* D6B7D4 802401B4 0C090008 */ jal UnkFunc2 /* D6B7D8 802401B8 00000000 */ nop /* D6B7DC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D6B7E0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240020_D6E9D0.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240020_D6E9D0.s deleted file mode 100644 index 7189e20355..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240020_D6E9D0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D6E9D0 -/* D6E9D0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D6E9D4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D6E9D8 80240028 00822024 */ and $a0, $a0, $v0 -/* D6E9DC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D6E9E0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D6E9E4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D6E9E8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D6E9EC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D6E9F0 80240040 30620001 */ andi $v0, $v1, 1 -/* D6E9F4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D6E9F8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D6E9FC 8024004C 03E00008 */ jr $ra -/* D6EA00 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s index d4e135fa38..77f4180b85 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s @@ -37,7 +37,7 @@ glabel func_80240128_D6EAD8 /* D6EB58 802401A8 0C00B94E */ jal get_screen_coords /* D6EB5C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D6EB60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D6EB64 802401B4 0C090008 */ jal func_80240020_D6E9D0 +/* D6EB64 802401B4 0C090008 */ jal UnkFunc2 /* D6EB68 802401B8 00000000 */ nop /* D6EB6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D6EB70 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240020_D763C0.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240020_D763C0.s deleted file mode 100644 index 73aa43b4ee..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240020_D763C0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D763C0 -/* D763C0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D763C4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D763C8 80240028 00822024 */ and $a0, $a0, $v0 -/* D763CC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D763D0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D763D4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D763D8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D763DC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D763E0 80240040 30620001 */ andi $v0, $v1, 1 -/* D763E4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D763E8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D763EC 8024004C 03E00008 */ jr $ra -/* D763F0 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s index 0af37f6f41..6a701983a1 100644 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s +++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s @@ -37,7 +37,7 @@ glabel func_80240128_D764C8 /* D76548 802401A8 0C00B94E */ jal get_screen_coords /* D7654C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D76550 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D76554 802401B4 0C090008 */ jal func_80240020_D763C0 +/* D76554 802401B4 0C090008 */ jal UnkFunc2 /* D76558 802401B8 00000000 */ nop /* D7655C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D76560 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240050_D79A40.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240050_D79A40.s deleted file mode 100644 index 8a0f90ef96..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240050_D79A40.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D79A40 -/* D79A40 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D79A44 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D79A48 80240058 00822024 */ and $a0, $a0, $v0 -/* D79A4C 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D79A50 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D79A54 80240064 00821821 */ addu $v1, $a0, $v0 -/* D79A58 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D79A5C 8024006C 10400003 */ beqz $v0, .L8024007C -/* D79A60 80240070 30620001 */ andi $v0, $v1, 1 -/* D79A64 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D79A68 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D79A6C 8024007C 03E00008 */ jr $ra -/* D79A70 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s index 48038b0b0d..b7c047c6eb 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s @@ -37,7 +37,7 @@ glabel func_80240158_D79B48 /* D79BC8 802401D8 0C00B94E */ jal get_screen_coords /* D79BCC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D79BD0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D79BD4 802401E4 0C090014 */ jal func_80240050_D79A40 +/* D79BD4 802401E4 0C090014 */ jal UnkFunc2 /* D79BD8 802401E8 00000000 */ nop /* D79BDC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D79BE0 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240050_D7B2F0.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240050_D7B2F0.s deleted file mode 100644 index 433e2e7e9b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240050_D7B2F0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D7B2F0 -/* D7B2F0 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D7B2F4 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D7B2F8 80240058 00822024 */ and $a0, $a0, $v0 -/* D7B2FC 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D7B300 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D7B304 80240064 00821821 */ addu $v1, $a0, $v0 -/* D7B308 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D7B30C 8024006C 10400003 */ beqz $v0, .L8024007C -/* D7B310 80240070 30620001 */ andi $v0, $v1, 1 -/* D7B314 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D7B318 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D7B31C 8024007C 03E00008 */ jr $ra -/* D7B320 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s index b67ceb78fa..3f168d0025 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s @@ -37,7 +37,7 @@ glabel func_80240158_D7B3F8 /* D7B478 802401D8 0C00B94E */ jal get_screen_coords /* D7B47C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D7B480 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D7B484 802401E4 0C090014 */ jal func_80240050_D7B2F0 +/* D7B484 802401E4 0C090014 */ jal UnkFunc2 /* D7B488 802401E8 00000000 */ nop /* D7B48C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D7B490 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240020_D7CB70.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240020_D7CB70.s deleted file mode 100644 index dee5fe419a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240020_D7CB70.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D7CB70 -/* D7CB70 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D7CB74 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D7CB78 80240028 00822024 */ and $a0, $a0, $v0 -/* D7CB7C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D7CB80 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D7CB84 80240034 00821821 */ addu $v1, $a0, $v0 -/* D7CB88 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D7CB8C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D7CB90 80240040 30620001 */ andi $v0, $v1, 1 -/* D7CB94 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D7CB98 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D7CB9C 8024004C 03E00008 */ jr $ra -/* D7CBA0 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s index 0f28f20826..43571232f4 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s @@ -37,7 +37,7 @@ glabel func_80240128_D7CC78 /* D7CCF8 802401A8 0C00B94E */ jal get_screen_coords /* D7CCFC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D7CD00 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D7CD04 802401B4 0C090008 */ jal func_80240020_D7CB70 +/* D7CD04 802401B4 0C090008 */ jal UnkFunc2 /* D7CD08 802401B8 00000000 */ nop /* D7CD0C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D7CD10 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240020_D89700.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240020_D89700.s deleted file mode 100644 index dbb7093f81..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240020_D89700.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D89700 -/* D89700 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D89704 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D89708 80240028 00822024 */ and $a0, $a0, $v0 -/* D8970C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D89710 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D89714 80240034 00821821 */ addu $v1, $a0, $v0 -/* D89718 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D8971C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D89720 80240040 30620001 */ andi $v0, $v1, 1 -/* D89724 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D89728 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D8972C 8024004C 03E00008 */ jr $ra -/* D89730 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s index 28067cd1b5..28bcac6d90 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s @@ -37,7 +37,7 @@ glabel func_80240128_D89808 /* D89888 802401A8 0C00B94E */ jal get_screen_coords /* D8988C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D89890 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D89894 802401B4 0C090008 */ jal func_80240020_D89700 +/* D89894 802401B4 0C090008 */ jal UnkFunc2 /* D89898 802401B8 00000000 */ nop /* D8989C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D898A0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240020_D8B3D0.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240020_D8B3D0.s deleted file mode 100644 index bd55909e06..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240020_D8B3D0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D8B3D0 -/* D8B3D0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D8B3D4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D8B3D8 80240028 00822024 */ and $a0, $a0, $v0 -/* D8B3DC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D8B3E0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D8B3E4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D8B3E8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D8B3EC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D8B3F0 80240040 30620001 */ andi $v0, $v1, 1 -/* D8B3F4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D8B3F8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D8B3FC 8024004C 03E00008 */ jr $ra -/* D8B400 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s index f9feb63413..9814c5e0da 100644 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s +++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s @@ -37,7 +37,7 @@ glabel func_80240128_D8B4D8 /* D8B558 802401A8 0C00B94E */ jal get_screen_coords /* D8B55C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D8B560 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D8B564 802401B4 0C090008 */ jal func_80240020_D8B3D0 +/* D8B564 802401B4 0C090008 */ jal UnkFunc2 /* D8B568 802401B8 00000000 */ nop /* D8B56C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D8B570 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240020_D8D270.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240020_D8D270.s deleted file mode 100644 index d8438c0f51..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240020_D8D270.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D8D270 -/* D8D270 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D8D274 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D8D278 80240028 00822024 */ and $a0, $a0, $v0 -/* D8D27C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D8D280 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D8D284 80240034 00821821 */ addu $v1, $a0, $v0 -/* D8D288 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D8D28C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D8D290 80240040 30620001 */ andi $v0, $v1, 1 -/* D8D294 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D8D298 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D8D29C 8024004C 03E00008 */ jr $ra -/* D8D2A0 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s index b790eb4750..50ab3e55de 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s @@ -37,7 +37,7 @@ glabel func_80240128_D8D378 /* D8D3F8 802401A8 0C00B94E */ jal get_screen_coords /* D8D3FC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D8D400 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D8D404 802401B4 0C090008 */ jal func_80240020_D8D270 +/* D8D404 802401B4 0C090008 */ jal UnkFunc2 /* D8D408 802401B8 00000000 */ nop /* D8D40C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D8D410 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240050_D91750.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240050_D91750.s deleted file mode 100644 index 4b160927a2..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240050_D91750.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D91750 -/* D91750 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D91754 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D91758 80240058 00822024 */ and $a0, $a0, $v0 -/* D9175C 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D91760 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D91764 80240064 00821821 */ addu $v1, $a0, $v0 -/* D91768 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D9176C 8024006C 10400003 */ beqz $v0, .L8024007C -/* D91770 80240070 30620001 */ andi $v0, $v1, 1 -/* D91774 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D91778 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D9177C 8024007C 03E00008 */ jr $ra -/* D91780 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s index 0ba2641c7f..e82db74e5b 100644 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s +++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s @@ -37,7 +37,7 @@ glabel func_80240158_D91858 /* D918D8 802401D8 0C00B94E */ jal get_screen_coords /* D918DC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D918E0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D918E4 802401E4 0C090014 */ jal func_80240050_D91750 +/* D918E4 802401E4 0C090014 */ jal UnkFunc2 /* D918E8 802401E8 00000000 */ nop /* D918EC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D918F0 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240050_D92F90.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240050_D92F90.s deleted file mode 100644 index cae6353cb9..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240050_D92F90.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D92F90 -/* D92F90 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D92F94 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D92F98 80240058 00822024 */ and $a0, $a0, $v0 -/* D92F9C 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D92FA0 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D92FA4 80240064 00821821 */ addu $v1, $a0, $v0 -/* D92FA8 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D92FAC 8024006C 10400003 */ beqz $v0, .L8024007C -/* D92FB0 80240070 30620001 */ andi $v0, $v1, 1 -/* D92FB4 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D92FB8 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D92FBC 8024007C 03E00008 */ jr $ra -/* D92FC0 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s index cded2ee6bf..9b6cf66e65 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s @@ -37,7 +37,7 @@ glabel func_80240158_D93098 /* D93118 802401D8 0C00B94E */ jal get_screen_coords /* D9311C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D93120 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D93124 802401E4 0C090014 */ jal func_80240050_D92F90 +/* D93124 802401E4 0C090014 */ jal UnkFunc2 /* D93128 802401E8 00000000 */ nop /* D9312C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D93130 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240050_D95640.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240050_D95640.s deleted file mode 100644 index bf7b950d89..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240050_D95640.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D95640 -/* D95640 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D95644 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D95648 80240058 00822024 */ and $a0, $a0, $v0 -/* D9564C 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D95650 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D95654 80240064 00821821 */ addu $v1, $a0, $v0 -/* D95658 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D9565C 8024006C 10400003 */ beqz $v0, .L8024007C -/* D95660 80240070 30620001 */ andi $v0, $v1, 1 -/* D95664 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D95668 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D9566C 8024007C 03E00008 */ jr $ra -/* D95670 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s index 7f958d593a..ebe8fe76b4 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s @@ -37,7 +37,7 @@ glabel func_80240158_D95748 /* D957C8 802401D8 0C00B94E */ jal get_screen_coords /* D957CC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D957D0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D957D4 802401E4 0C090014 */ jal func_80240050_D95640 +/* D957D4 802401E4 0C090014 */ jal UnkFunc2 /* D957D8 802401E8 00000000 */ nop /* D957DC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D957E0 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240050_D978E0.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240050_D978E0.s deleted file mode 100644 index eb13d4dc10..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240050_D978E0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D978E0 -/* D978E0 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D978E4 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D978E8 80240058 00822024 */ and $a0, $a0, $v0 -/* D978EC 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D978F0 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D978F4 80240064 00821821 */ addu $v1, $a0, $v0 -/* D978F8 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D978FC 8024006C 10400003 */ beqz $v0, .L8024007C -/* D97900 80240070 30620001 */ andi $v0, $v1, 1 -/* D97904 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D97908 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D9790C 8024007C 03E00008 */ jr $ra -/* D97910 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s index cfc769b08e..bd8e2fe0e2 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s @@ -37,7 +37,7 @@ glabel func_80240158_D979E8 /* D97A68 802401D8 0C00B94E */ jal get_screen_coords /* D97A6C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D97A70 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D97A74 802401E4 0C090014 */ jal func_80240050_D978E0 +/* D97A74 802401E4 0C090014 */ jal UnkFunc2 /* D97A78 802401E8 00000000 */ nop /* D97A7C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D97A80 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240020_D999D0.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240020_D999D0.s deleted file mode 100644 index dbc6d0a3d0..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240020_D999D0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D999D0 -/* D999D0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D999D4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D999D8 80240028 00822024 */ and $a0, $a0, $v0 -/* D999DC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D999E0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D999E4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D999E8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D999EC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D999F0 80240040 30620001 */ andi $v0, $v1, 1 -/* D999F4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D999F8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D999FC 8024004C 03E00008 */ jr $ra -/* D99A00 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s index 14f35eaba7..c66e70cd62 100644 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s +++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s @@ -37,7 +37,7 @@ glabel func_80240128_D99AD8 /* D99B58 802401A8 0C00B94E */ jal get_screen_coords /* D99B5C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D99B60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D99B64 802401B4 0C090008 */ jal func_80240020_D999D0 +/* D99B64 802401B4 0C090008 */ jal UnkFunc2 /* D99B68 802401B8 00000000 */ nop /* D99B6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D99B70 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c index 1347268caf..0176f9ebb5 100644 --- a/src/world/area_pra/pra_01/D4D060.c +++ b/src/world/area_pra/pra_01/D4D060.c @@ -1,6 +1,6 @@ #include "pra_01.h" -INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240020_D4D060); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240054_D4D094); @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240D3C_D4DD7C); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240EB8_D4DEF8); +#include "world/common/SetPartnerFlags80000.inc.c" #include "world/common/SetPartnerFlags20000.inc.c" diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c index 8026d68869..ddc79491ed 100644 --- a/src/world/area_pra/pra_02/D50010.c +++ b/src/world/area_pra/pra_02/D50010.c @@ -1,6 +1,6 @@ #include "pra_02.h" -INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240020_D50010); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240054_D50044); diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c index 60d80a42db..e47079fc02 100644 --- a/src/world/area_pra/pra_05/D55BD0.c +++ b/src/world/area_pra/pra_05/D55BD0.c @@ -1,6 +1,6 @@ #include "pra_05.h" -INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240020_D55BD0); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240054_D55C04); diff --git a/src/world/area_pra/pra_06/D57430.c b/src/world/area_pra/pra_06/D57430.c index eb2d6746b6..827c590aa3 100644 --- a/src/world/area_pra/pra_06/D57430.c +++ b/src/world/area_pra/pra_06/D57430.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240000_D57430); -INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240050_D57480); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240084_D574B4); diff --git a/src/world/area_pra/pra_09/D588B0.c b/src/world/area_pra/pra_09/D588B0.c index 293e81f764..ea8df7cb40 100644 --- a/src/world/area_pra/pra_09/D588B0.c +++ b/src/world/area_pra/pra_09/D588B0.c @@ -1,6 +1,6 @@ #include "pra_09.h" -INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240020_D588B0); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240054_D588E4); diff --git a/src/world/area_pra/pra_10/D5F2D0.c b/src/world/area_pra/pra_10/D5F2D0.c index aaa2478791..a30f21463c 100644 --- a/src/world/area_pra/pra_10/D5F2D0.c +++ b/src/world/area_pra/pra_10/D5F2D0.c @@ -1,6 +1,6 @@ #include "pra_10.h" -INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240020_D5F2D0); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240054_D5F304); diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c index 48ef19fd5e..992192e487 100644 --- a/src/world/area_pra/pra_11/D61520.c +++ b/src/world/area_pra/pra_11/D61520.c @@ -1,6 +1,6 @@ #include "pra_11.h" -INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240020_D61520); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240054_D61554); diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c index 7401c5d5d6..1ea03598ac 100644 --- a/src/world/area_pra/pra_12/D62D10.c +++ b/src/world/area_pra/pra_12/D62D10.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240000_D62D10); -INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240050_D62D60); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240084_D62D94); diff --git a/src/world/area_pra/pra_13/D64600.c b/src/world/area_pra/pra_13/D64600.c index 1494d4e8d5..c1c3cc8afe 100644 --- a/src/world/area_pra/pra_13/D64600.c +++ b/src/world/area_pra/pra_13/D64600.c @@ -1,6 +1,6 @@ #include "pra_13.h" -INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240020_D64600); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240054_D64634); diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c index d9a9d66fa7..9f5f683ee1 100644 --- a/src/world/area_pra/pra_14/D67D20.c +++ b/src/world/area_pra/pra_14/D67D20.c @@ -1,6 +1,6 @@ #include "pra_14.h" -INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240020_D67D20); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240054_D67D54); diff --git a/src/world/area_pra/pra_16/D69B40.c b/src/world/area_pra/pra_16/D69B40.c index 95be9b7a7d..ac0a06070f 100644 --- a/src/world/area_pra/pra_16/D69B40.c +++ b/src/world/area_pra/pra_16/D69B40.c @@ -1,6 +1,6 @@ #include "pra_16.h" -INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240020_D69B40); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240054_D69B74); diff --git a/src/world/area_pra/pra_18/D6B640.c b/src/world/area_pra/pra_18/D6B640.c index 6e4636e030..559304d125 100644 --- a/src/world/area_pra/pra_18/D6B640.c +++ b/src/world/area_pra/pra_18/D6B640.c @@ -1,6 +1,6 @@ #include "pra_18.h" -INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240020_D6B640); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240054_D6B674); diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c index 5be0072900..f80edf2d8a 100644 --- a/src/world/area_pra/pra_19/D6E9D0.c +++ b/src/world/area_pra/pra_19/D6E9D0.c @@ -1,6 +1,6 @@ #include "pra_19.h" -INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240020_D6E9D0); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240054_D6EA04); diff --git a/src/world/area_pra/pra_20/D763C0.c b/src/world/area_pra/pra_20/D763C0.c index c70a9535f0..4751288b32 100644 --- a/src/world/area_pra/pra_20/D763C0.c +++ b/src/world/area_pra/pra_20/D763C0.c @@ -1,6 +1,6 @@ #include "pra_20.h" -INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240020_D763C0); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240054_D763F4); diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c index 3411de3245..3f32651088 100644 --- a/src/world/area_pra/pra_27/D799F0.c +++ b/src/world/area_pra/pra_27/D799F0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240000_D799F0); -INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240050_D79A40); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240084_D79A74); diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c index e1b18143a5..042c289396 100644 --- a/src/world/area_pra/pra_28/D7B2A0.c +++ b/src/world/area_pra/pra_28/D7B2A0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240000_D7B2A0); -INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240050_D7B2F0); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240084_D7B324); diff --git a/src/world/area_pra/pra_29/D7CB70.c b/src/world/area_pra/pra_29/D7CB70.c index 41ba906407..bba36641ef 100644 --- a/src/world/area_pra/pra_29/D7CB70.c +++ b/src/world/area_pra/pra_29/D7CB70.c @@ -1,6 +1,6 @@ #include "pra_29.h" -INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240020_D7CB70); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240054_D7CBA4); diff --git a/src/world/area_pra/pra_33/D89700.c b/src/world/area_pra/pra_33/D89700.c index 543ca3a92e..9c2da54360 100644 --- a/src/world/area_pra/pra_33/D89700.c +++ b/src/world/area_pra/pra_33/D89700.c @@ -1,6 +1,6 @@ #include "pra_33.h" -INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240020_D89700); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240054_D89734); diff --git a/src/world/area_pra/pra_34/D8B3D0.c b/src/world/area_pra/pra_34/D8B3D0.c index 813cb0d124..10a49fbc5d 100644 --- a/src/world/area_pra/pra_34/D8B3D0.c +++ b/src/world/area_pra/pra_34/D8B3D0.c @@ -1,6 +1,6 @@ #include "pra_34.h" -INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240020_D8B3D0); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240054_D8B404); diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index 9317252b46..e546e052dd 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -1,6 +1,6 @@ #include "pra_35.h" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240020_D8D270); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240054_D8D2A4); diff --git a/src/world/area_pra/pra_36/D91700.c b/src/world/area_pra/pra_36/D91700.c index 91f31dac16..54a9730126 100644 --- a/src/world/area_pra/pra_36/D91700.c +++ b/src/world/area_pra/pra_36/D91700.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240000_D91700); -INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240050_D91750); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240084_D91784); diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c index d4a591bbba..e3cda640fe 100644 --- a/src/world/area_pra/pra_37/D92F40.c +++ b/src/world/area_pra/pra_37/D92F40.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240000_D92F40); -INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240050_D92F90); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240084_D92FC4); diff --git a/src/world/area_pra/pra_38/D955F0.c b/src/world/area_pra/pra_38/D955F0.c index 0a22c57f68..1f193b6c69 100644 --- a/src/world/area_pra/pra_38/D955F0.c +++ b/src/world/area_pra/pra_38/D955F0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240000_D955F0); -INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240050_D95640); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240084_D95674); diff --git a/src/world/area_pra/pra_39/D97890.c b/src/world/area_pra/pra_39/D97890.c index b2edb281c1..fd399b8a91 100644 --- a/src/world/area_pra/pra_39/D97890.c +++ b/src/world/area_pra/pra_39/D97890.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240000_D97890); -INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240050_D978E0); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240084_D97914); diff --git a/src/world/area_pra/pra_40/D999D0.c b/src/world/area_pra/pra_40/D999D0.c index 098a316fe9..98582cc3de 100644 --- a/src/world/area_pra/pra_40/D999D0.c +++ b/src/world/area_pra/pra_40/D999D0.c @@ -1,6 +1,6 @@ #include "pra_40.h" -INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240020_D999D0); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240054_D99A04); diff --git a/src/world/common/UnkFunc2.inc.c b/src/world/common/UnkFunc2.inc.c new file mode 100644 index 0000000000..766123e82c --- /dev/null +++ b/src/world/common/UnkFunc2.inc.c @@ -0,0 +1,13 @@ +#include "common.h" + +static s32 UnkFunc2(s32 arg0) { + u32 val; + + arg0 &= ~0x1000000; + val = arg0 + ~0x6000B; + if (val < 0x10 && val & 1) { + arg0--; + } + + return arg0; +} From ccde4308bc49848c2729863824af372c48dfc3bc Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 22 Nov 2020 11:36:35 -0500 Subject: [PATCH 28/38] UnkNpcAIFunc9 --- .../iwa_01/90FBD0/func_80240998_910048.s | 45 ------------------- .../iwa_01/90FBD0/func_80241F6C_91161C.s | 2 +- .../kpa_09/A4F0A0/func_80240518_A4F518.s | 45 ------------------- .../kpa_09/A4F0A0/func_80240F94_A4FF94.s | 2 +- .../kpa_102/A93A50/func_80240788_A93EC8.s | 45 ------------------- .../kpa_102/A93A50/func_80241204_A94944.s | 2 +- .../kpa_111/A99590/func_802405E8_A99B78.s | 45 ------------------- .../kpa_111/A99590/func_80241064_A9A5F4.s | 2 +- .../kpa_115/A9ED40/func_802405E8_A9F328.s | 45 ------------------- .../kpa_115/A9ED40/func_80241064_A9FDA4.s | 2 +- .../kpa_50/A609D0/func_80240478_A60E48.s | 45 ------------------- .../kpa_50/A609D0/func_80240EF4_A618C4.s | 2 +- .../kpa_52/A671E0/func_80240558_A67658.s | 45 ------------------- .../kpa_52/A671E0/func_80240FD4_A680D4.s | 2 +- .../omo_02/D9D510/func_80241DC0_D9F290.s | 45 ------------------- .../omo_02/D9D510/func_8024283C_D9FD0C.s | 2 +- .../omo_09/DCD6B0/func_802427D0_DCF4A0.s | 45 ------------------- .../omo_09/DCD6B0/func_8024324C_DCFF1C.s | 2 +- .../omo_17/DEF400/func_80242924_DF17C4.s | 45 ------------------- .../omo_17/DEF400/func_802433A0_DF2240.s | 2 +- src/world/area_iwa/iwa_01/90FBD0.c | 2 +- src/world/area_kpa/kpa_09/A4F0A0.c | 2 +- src/world/area_kpa/kpa_102/A93A50.c | 2 +- src/world/area_kpa/kpa_111/A99590.c | 2 +- src/world/area_kpa/kpa_115/A9ED40.c | 2 +- src/world/area_kpa/kpa_50/A609D0.c | 2 +- src/world/area_kpa/kpa_52/A671E0.c | 2 +- src/world/area_omo/omo_02/D9D510.c | 2 +- src/world/area_omo/omo_09/DCD6B0.c | 2 +- src/world/area_omo/omo_17/DEF400.c | 2 +- src/world/common/UnkNpcAIFunc9.inc.c | 16 +++++++ 31 files changed, 36 insertions(+), 470 deletions(-) delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240998_910048.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240518_A4F518.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240788_A93EC8.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405E8_A99B78.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405E8_A9F328.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240478_A60E48.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240558_A67658.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241DC0_D9F290.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802427D0_DCF4A0.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242924_DF17C4.s create mode 100644 src/world/common/UnkNpcAIFunc9.inc.c diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240998_910048.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240998_910048.s deleted file mode 100644 index 9f880e84ba..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240998_910048.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240998_910048 -/* 910048 80240998 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 91004C 8024099C AFB3001C */ sw $s3, 0x1c($sp) -/* 910050 802409A0 0080982D */ daddu $s3, $a0, $zero -/* 910054 802409A4 AFBF0020 */ sw $ra, 0x20($sp) -/* 910058 802409A8 AFB20018 */ sw $s2, 0x18($sp) -/* 91005C 802409AC AFB10014 */ sw $s1, 0x14($sp) -/* 910060 802409B0 AFB00010 */ sw $s0, 0x10($sp) -/* 910064 802409B4 8E720148 */ lw $s2, 0x148($s3) -/* 910068 802409B8 0C00EABB */ jal get_npc_unsafe -/* 91006C 802409BC 86440008 */ lh $a0, 8($s2) -/* 910070 802409C0 86440008 */ lh $a0, 8($s2) -/* 910074 802409C4 0040882D */ daddu $s1, $v0, $zero -/* 910078 802409C8 0C00FB3A */ jal get_enemy -/* 91007C 802409CC 24840001 */ addiu $a0, $a0, 1 -/* 910080 802409D0 0040802D */ daddu $s0, $v0, $zero -/* 910084 802409D4 0C00EABB */ jal get_npc_unsafe -/* 910088 802409D8 86040008 */ lh $a0, 8($s0) -/* 91008C 802409DC C62C0038 */ lwc1 $f12, 0x38($s1) -/* 910090 802409E0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 910094 802409E4 8C460038 */ lw $a2, 0x38($v0) -/* 910098 802409E8 0C00A720 */ jal atan2 -/* 91009C 802409EC 8C470040 */ lw $a3, 0x40($v0) -/* 9100A0 802409F0 E620000C */ swc1 $f0, 0xc($s1) -/* 9100A4 802409F4 8E02006C */ lw $v0, 0x6c($s0) -/* 9100A8 802409F8 14400008 */ bnez $v0, .L80240A1C -/* 9100AC 802409FC 00000000 */ nop -/* 9100B0 80240A00 8E4200CC */ lw $v0, 0xcc($s2) -/* 9100B4 80240A04 8C420000 */ lw $v0, ($v0) -/* 9100B8 80240A08 AE220028 */ sw $v0, 0x28($s1) -/* 9100BC 80240A0C 96420076 */ lhu $v0, 0x76($s2) -/* 9100C0 80240A10 A622008E */ sh $v0, 0x8e($s1) -/* 9100C4 80240A14 24020021 */ addiu $v0, $zero, 0x21 -/* 9100C8 80240A18 AE620070 */ sw $v0, 0x70($s3) -.L80240A1C: -/* 9100CC 80240A1C 8FBF0020 */ lw $ra, 0x20($sp) -/* 9100D0 80240A20 8FB3001C */ lw $s3, 0x1c($sp) -/* 9100D4 80240A24 8FB20018 */ lw $s2, 0x18($sp) -/* 9100D8 80240A28 8FB10014 */ lw $s1, 0x14($sp) -/* 9100DC 80240A2C 8FB00010 */ lw $s0, 0x10($sp) -/* 9100E0 80240A30 03E00008 */ jr $ra -/* 9100E4 80240A34 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s index 8e41a32a98..050122ed02 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s @@ -190,7 +190,7 @@ glabel func_80241F6C_91161C /* 9118E0 80242230 0260202D */ daddu $a0, $s3, $zero /* 9118E4 80242234 08090899 */ j .L80242264 /* 9118E8 80242238 00000000 */ nop -/* 9118EC 8024223C 0C090266 */ jal func_80240998_910048 +/* 9118EC 8024223C 0C090266 */ jal UnkNpcAIFunc9 /* 9118F0 80242240 0260202D */ daddu $a0, $s3, $zero /* 9118F4 80242244 08090899 */ j .L80242264 /* 9118F8 80242248 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240518_A4F518.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240518_A4F518.s deleted file mode 100644 index 87e7c48ab6..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240518_A4F518.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240518_A4F518 -/* A4F518 80240518 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A4F51C 8024051C AFB3001C */ sw $s3, 0x1c($sp) -/* A4F520 80240520 0080982D */ daddu $s3, $a0, $zero -/* A4F524 80240524 AFBF0020 */ sw $ra, 0x20($sp) -/* A4F528 80240528 AFB20018 */ sw $s2, 0x18($sp) -/* A4F52C 8024052C AFB10014 */ sw $s1, 0x14($sp) -/* A4F530 80240530 AFB00010 */ sw $s0, 0x10($sp) -/* A4F534 80240534 8E720148 */ lw $s2, 0x148($s3) -/* A4F538 80240538 0C00EABB */ jal get_npc_unsafe -/* A4F53C 8024053C 86440008 */ lh $a0, 8($s2) -/* A4F540 80240540 86440008 */ lh $a0, 8($s2) -/* A4F544 80240544 0040882D */ daddu $s1, $v0, $zero -/* A4F548 80240548 0C00FB3A */ jal get_enemy -/* A4F54C 8024054C 24840001 */ addiu $a0, $a0, 1 -/* A4F550 80240550 0040802D */ daddu $s0, $v0, $zero -/* A4F554 80240554 0C00EABB */ jal get_npc_unsafe -/* A4F558 80240558 86040008 */ lh $a0, 8($s0) -/* A4F55C 8024055C C62C0038 */ lwc1 $f12, 0x38($s1) -/* A4F560 80240560 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A4F564 80240564 8C460038 */ lw $a2, 0x38($v0) -/* A4F568 80240568 0C00A720 */ jal atan2 -/* A4F56C 8024056C 8C470040 */ lw $a3, 0x40($v0) -/* A4F570 80240570 E620000C */ swc1 $f0, 0xc($s1) -/* A4F574 80240574 8E02006C */ lw $v0, 0x6c($s0) -/* A4F578 80240578 14400008 */ bnez $v0, .L8024059C -/* A4F57C 8024057C 00000000 */ nop -/* A4F580 80240580 8E4200CC */ lw $v0, 0xcc($s2) -/* A4F584 80240584 8C420000 */ lw $v0, ($v0) -/* A4F588 80240588 AE220028 */ sw $v0, 0x28($s1) -/* A4F58C 8024058C 96420076 */ lhu $v0, 0x76($s2) -/* A4F590 80240590 A622008E */ sh $v0, 0x8e($s1) -/* A4F594 80240594 24020021 */ addiu $v0, $zero, 0x21 -/* A4F598 80240598 AE620070 */ sw $v0, 0x70($s3) -.L8024059C: -/* A4F59C 8024059C 8FBF0020 */ lw $ra, 0x20($sp) -/* A4F5A0 802405A0 8FB3001C */ lw $s3, 0x1c($sp) -/* A4F5A4 802405A4 8FB20018 */ lw $s2, 0x18($sp) -/* A4F5A8 802405A8 8FB10014 */ lw $s1, 0x14($sp) -/* A4F5AC 802405AC 8FB00010 */ lw $s0, 0x10($sp) -/* A4F5B0 802405B0 03E00008 */ jr $ra -/* A4F5B4 802405B4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s index 45c24730f1..7b8c932a60 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s @@ -190,7 +190,7 @@ glabel func_80240F94_A4FF94 /* A50258 80241258 0260202D */ daddu $a0, $s3, $zero /* A5025C 8024125C 080904A3 */ j .L8024128C /* A50260 80241260 00000000 */ nop -/* A50264 80241264 0C090146 */ jal func_80240518_A4F518 +/* A50264 80241264 0C090146 */ jal UnkNpcAIFunc9 /* A50268 80241268 0260202D */ daddu $a0, $s3, $zero /* A5026C 8024126C 080904A3 */ j .L8024128C /* A50270 80241270 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240788_A93EC8.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240788_A93EC8.s deleted file mode 100644 index fec0469b63..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240788_A93EC8.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240788_A93EC8 -/* A93EC8 80240788 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A93ECC 8024078C AFB3001C */ sw $s3, 0x1c($sp) -/* A93ED0 80240790 0080982D */ daddu $s3, $a0, $zero -/* A93ED4 80240794 AFBF0020 */ sw $ra, 0x20($sp) -/* A93ED8 80240798 AFB20018 */ sw $s2, 0x18($sp) -/* A93EDC 8024079C AFB10014 */ sw $s1, 0x14($sp) -/* A93EE0 802407A0 AFB00010 */ sw $s0, 0x10($sp) -/* A93EE4 802407A4 8E720148 */ lw $s2, 0x148($s3) -/* A93EE8 802407A8 0C00EABB */ jal get_npc_unsafe -/* A93EEC 802407AC 86440008 */ lh $a0, 8($s2) -/* A93EF0 802407B0 86440008 */ lh $a0, 8($s2) -/* A93EF4 802407B4 0040882D */ daddu $s1, $v0, $zero -/* A93EF8 802407B8 0C00FB3A */ jal get_enemy -/* A93EFC 802407BC 24840001 */ addiu $a0, $a0, 1 -/* A93F00 802407C0 0040802D */ daddu $s0, $v0, $zero -/* A93F04 802407C4 0C00EABB */ jal get_npc_unsafe -/* A93F08 802407C8 86040008 */ lh $a0, 8($s0) -/* A93F0C 802407CC C62C0038 */ lwc1 $f12, 0x38($s1) -/* A93F10 802407D0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A93F14 802407D4 8C460038 */ lw $a2, 0x38($v0) -/* A93F18 802407D8 0C00A720 */ jal atan2 -/* A93F1C 802407DC 8C470040 */ lw $a3, 0x40($v0) -/* A93F20 802407E0 E620000C */ swc1 $f0, 0xc($s1) -/* A93F24 802407E4 8E02006C */ lw $v0, 0x6c($s0) -/* A93F28 802407E8 14400008 */ bnez $v0, .L8024080C -/* A93F2C 802407EC 00000000 */ nop -/* A93F30 802407F0 8E4200CC */ lw $v0, 0xcc($s2) -/* A93F34 802407F4 8C420000 */ lw $v0, ($v0) -/* A93F38 802407F8 AE220028 */ sw $v0, 0x28($s1) -/* A93F3C 802407FC 96420076 */ lhu $v0, 0x76($s2) -/* A93F40 80240800 A622008E */ sh $v0, 0x8e($s1) -/* A93F44 80240804 24020021 */ addiu $v0, $zero, 0x21 -/* A93F48 80240808 AE620070 */ sw $v0, 0x70($s3) -.L8024080C: -/* A93F4C 8024080C 8FBF0020 */ lw $ra, 0x20($sp) -/* A93F50 80240810 8FB3001C */ lw $s3, 0x1c($sp) -/* A93F54 80240814 8FB20018 */ lw $s2, 0x18($sp) -/* A93F58 80240818 8FB10014 */ lw $s1, 0x14($sp) -/* A93F5C 8024081C 8FB00010 */ lw $s0, 0x10($sp) -/* A93F60 80240820 03E00008 */ jr $ra -/* A93F64 80240824 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s index 06ecb0f84e..a3230b90e3 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s @@ -190,7 +190,7 @@ glabel func_80241204_A94944 /* A94C08 802414C8 0260202D */ daddu $a0, $s3, $zero /* A94C0C 802414CC 0809053F */ j .L802414FC /* A94C10 802414D0 00000000 */ nop -/* A94C14 802414D4 0C0901E2 */ jal func_80240788_A93EC8 +/* A94C14 802414D4 0C0901E2 */ jal UnkNpcAIFunc9 /* A94C18 802414D8 0260202D */ daddu $a0, $s3, $zero /* A94C1C 802414DC 0809053F */ j .L802414FC /* A94C20 802414E0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405E8_A99B78.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405E8_A99B78.s deleted file mode 100644 index 4e26375ba2..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405E8_A99B78.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405E8_A99B78 -/* A99B78 802405E8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A99B7C 802405EC AFB3001C */ sw $s3, 0x1c($sp) -/* A99B80 802405F0 0080982D */ daddu $s3, $a0, $zero -/* A99B84 802405F4 AFBF0020 */ sw $ra, 0x20($sp) -/* A99B88 802405F8 AFB20018 */ sw $s2, 0x18($sp) -/* A99B8C 802405FC AFB10014 */ sw $s1, 0x14($sp) -/* A99B90 80240600 AFB00010 */ sw $s0, 0x10($sp) -/* A99B94 80240604 8E720148 */ lw $s2, 0x148($s3) -/* A99B98 80240608 0C00EABB */ jal get_npc_unsafe -/* A99B9C 8024060C 86440008 */ lh $a0, 8($s2) -/* A99BA0 80240610 86440008 */ lh $a0, 8($s2) -/* A99BA4 80240614 0040882D */ daddu $s1, $v0, $zero -/* A99BA8 80240618 0C00FB3A */ jal get_enemy -/* A99BAC 8024061C 24840001 */ addiu $a0, $a0, 1 -/* A99BB0 80240620 0040802D */ daddu $s0, $v0, $zero -/* A99BB4 80240624 0C00EABB */ jal get_npc_unsafe -/* A99BB8 80240628 86040008 */ lh $a0, 8($s0) -/* A99BBC 8024062C C62C0038 */ lwc1 $f12, 0x38($s1) -/* A99BC0 80240630 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A99BC4 80240634 8C460038 */ lw $a2, 0x38($v0) -/* A99BC8 80240638 0C00A720 */ jal atan2 -/* A99BCC 8024063C 8C470040 */ lw $a3, 0x40($v0) -/* A99BD0 80240640 E620000C */ swc1 $f0, 0xc($s1) -/* A99BD4 80240644 8E02006C */ lw $v0, 0x6c($s0) -/* A99BD8 80240648 14400008 */ bnez $v0, .L8024066C -/* A99BDC 8024064C 00000000 */ nop -/* A99BE0 80240650 8E4200CC */ lw $v0, 0xcc($s2) -/* A99BE4 80240654 8C420000 */ lw $v0, ($v0) -/* A99BE8 80240658 AE220028 */ sw $v0, 0x28($s1) -/* A99BEC 8024065C 96420076 */ lhu $v0, 0x76($s2) -/* A99BF0 80240660 A622008E */ sh $v0, 0x8e($s1) -/* A99BF4 80240664 24020021 */ addiu $v0, $zero, 0x21 -/* A99BF8 80240668 AE620070 */ sw $v0, 0x70($s3) -.L8024066C: -/* A99BFC 8024066C 8FBF0020 */ lw $ra, 0x20($sp) -/* A99C00 80240670 8FB3001C */ lw $s3, 0x1c($sp) -/* A99C04 80240674 8FB20018 */ lw $s2, 0x18($sp) -/* A99C08 80240678 8FB10014 */ lw $s1, 0x14($sp) -/* A99C0C 8024067C 8FB00010 */ lw $s0, 0x10($sp) -/* A99C10 80240680 03E00008 */ jr $ra -/* A99C14 80240684 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s index e262b966e6..3369c278db 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s @@ -190,7 +190,7 @@ glabel func_80241064_A9A5F4 /* A9A8B8 80241328 0260202D */ daddu $a0, $s3, $zero /* A9A8BC 8024132C 080904D7 */ j .L8024135C /* A9A8C0 80241330 00000000 */ nop -/* A9A8C4 80241334 0C09017A */ jal func_802405E8_A99B78 +/* A9A8C4 80241334 0C09017A */ jal UnkNpcAIFunc9 /* A9A8C8 80241338 0260202D */ daddu $a0, $s3, $zero /* A9A8CC 8024133C 080904D7 */ j .L8024135C /* A9A8D0 80241340 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405E8_A9F328.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405E8_A9F328.s deleted file mode 100644 index 3634476b45..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405E8_A9F328.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405E8_A9F328 -/* A9F328 802405E8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A9F32C 802405EC AFB3001C */ sw $s3, 0x1c($sp) -/* A9F330 802405F0 0080982D */ daddu $s3, $a0, $zero -/* A9F334 802405F4 AFBF0020 */ sw $ra, 0x20($sp) -/* A9F338 802405F8 AFB20018 */ sw $s2, 0x18($sp) -/* A9F33C 802405FC AFB10014 */ sw $s1, 0x14($sp) -/* A9F340 80240600 AFB00010 */ sw $s0, 0x10($sp) -/* A9F344 80240604 8E720148 */ lw $s2, 0x148($s3) -/* A9F348 80240608 0C00EABB */ jal get_npc_unsafe -/* A9F34C 8024060C 86440008 */ lh $a0, 8($s2) -/* A9F350 80240610 86440008 */ lh $a0, 8($s2) -/* A9F354 80240614 0040882D */ daddu $s1, $v0, $zero -/* A9F358 80240618 0C00FB3A */ jal get_enemy -/* A9F35C 8024061C 24840001 */ addiu $a0, $a0, 1 -/* A9F360 80240620 0040802D */ daddu $s0, $v0, $zero -/* A9F364 80240624 0C00EABB */ jal get_npc_unsafe -/* A9F368 80240628 86040008 */ lh $a0, 8($s0) -/* A9F36C 8024062C C62C0038 */ lwc1 $f12, 0x38($s1) -/* A9F370 80240630 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A9F374 80240634 8C460038 */ lw $a2, 0x38($v0) -/* A9F378 80240638 0C00A720 */ jal atan2 -/* A9F37C 8024063C 8C470040 */ lw $a3, 0x40($v0) -/* A9F380 80240640 E620000C */ swc1 $f0, 0xc($s1) -/* A9F384 80240644 8E02006C */ lw $v0, 0x6c($s0) -/* A9F388 80240648 14400008 */ bnez $v0, .L8024066C -/* A9F38C 8024064C 00000000 */ nop -/* A9F390 80240650 8E4200CC */ lw $v0, 0xcc($s2) -/* A9F394 80240654 8C420000 */ lw $v0, ($v0) -/* A9F398 80240658 AE220028 */ sw $v0, 0x28($s1) -/* A9F39C 8024065C 96420076 */ lhu $v0, 0x76($s2) -/* A9F3A0 80240660 A622008E */ sh $v0, 0x8e($s1) -/* A9F3A4 80240664 24020021 */ addiu $v0, $zero, 0x21 -/* A9F3A8 80240668 AE620070 */ sw $v0, 0x70($s3) -.L8024066C: -/* A9F3AC 8024066C 8FBF0020 */ lw $ra, 0x20($sp) -/* A9F3B0 80240670 8FB3001C */ lw $s3, 0x1c($sp) -/* A9F3B4 80240674 8FB20018 */ lw $s2, 0x18($sp) -/* A9F3B8 80240678 8FB10014 */ lw $s1, 0x14($sp) -/* A9F3BC 8024067C 8FB00010 */ lw $s0, 0x10($sp) -/* A9F3C0 80240680 03E00008 */ jr $ra -/* A9F3C4 80240684 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s index c13095ba06..e14ff88a56 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s @@ -190,7 +190,7 @@ glabel func_80241064_A9FDA4 /* AA0068 80241328 0260202D */ daddu $a0, $s3, $zero /* AA006C 8024132C 080904D7 */ j .L8024135C /* AA0070 80241330 00000000 */ nop -/* AA0074 80241334 0C09017A */ jal func_802405E8_A9F328 +/* AA0074 80241334 0C09017A */ jal UnkNpcAIFunc9 /* AA0078 80241338 0260202D */ daddu $a0, $s3, $zero /* AA007C 8024133C 080904D7 */ j .L8024135C /* AA0080 80241340 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240478_A60E48.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240478_A60E48.s deleted file mode 100644 index ad429a18a3..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240478_A60E48.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240478_A60E48 -/* A60E48 80240478 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A60E4C 8024047C AFB3001C */ sw $s3, 0x1c($sp) -/* A60E50 80240480 0080982D */ daddu $s3, $a0, $zero -/* A60E54 80240484 AFBF0020 */ sw $ra, 0x20($sp) -/* A60E58 80240488 AFB20018 */ sw $s2, 0x18($sp) -/* A60E5C 8024048C AFB10014 */ sw $s1, 0x14($sp) -/* A60E60 80240490 AFB00010 */ sw $s0, 0x10($sp) -/* A60E64 80240494 8E720148 */ lw $s2, 0x148($s3) -/* A60E68 80240498 0C00EABB */ jal get_npc_unsafe -/* A60E6C 8024049C 86440008 */ lh $a0, 8($s2) -/* A60E70 802404A0 86440008 */ lh $a0, 8($s2) -/* A60E74 802404A4 0040882D */ daddu $s1, $v0, $zero -/* A60E78 802404A8 0C00FB3A */ jal get_enemy -/* A60E7C 802404AC 24840001 */ addiu $a0, $a0, 1 -/* A60E80 802404B0 0040802D */ daddu $s0, $v0, $zero -/* A60E84 802404B4 0C00EABB */ jal get_npc_unsafe -/* A60E88 802404B8 86040008 */ lh $a0, 8($s0) -/* A60E8C 802404BC C62C0038 */ lwc1 $f12, 0x38($s1) -/* A60E90 802404C0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A60E94 802404C4 8C460038 */ lw $a2, 0x38($v0) -/* A60E98 802404C8 0C00A720 */ jal atan2 -/* A60E9C 802404CC 8C470040 */ lw $a3, 0x40($v0) -/* A60EA0 802404D0 E620000C */ swc1 $f0, 0xc($s1) -/* A60EA4 802404D4 8E02006C */ lw $v0, 0x6c($s0) -/* A60EA8 802404D8 14400008 */ bnez $v0, .L802404FC -/* A60EAC 802404DC 00000000 */ nop -/* A60EB0 802404E0 8E4200CC */ lw $v0, 0xcc($s2) -/* A60EB4 802404E4 8C420000 */ lw $v0, ($v0) -/* A60EB8 802404E8 AE220028 */ sw $v0, 0x28($s1) -/* A60EBC 802404EC 96420076 */ lhu $v0, 0x76($s2) -/* A60EC0 802404F0 A622008E */ sh $v0, 0x8e($s1) -/* A60EC4 802404F4 24020021 */ addiu $v0, $zero, 0x21 -/* A60EC8 802404F8 AE620070 */ sw $v0, 0x70($s3) -.L802404FC: -/* A60ECC 802404FC 8FBF0020 */ lw $ra, 0x20($sp) -/* A60ED0 80240500 8FB3001C */ lw $s3, 0x1c($sp) -/* A60ED4 80240504 8FB20018 */ lw $s2, 0x18($sp) -/* A60ED8 80240508 8FB10014 */ lw $s1, 0x14($sp) -/* A60EDC 8024050C 8FB00010 */ lw $s0, 0x10($sp) -/* A60EE0 80240510 03E00008 */ jr $ra -/* A60EE4 80240514 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s index cd90d02fde..bc8b7629af 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s @@ -190,7 +190,7 @@ glabel func_80240EF4_A618C4 /* A61B88 802411B8 0260202D */ daddu $a0, $s3, $zero /* A61B8C 802411BC 0809047B */ j .L802411EC /* A61B90 802411C0 00000000 */ nop -/* A61B94 802411C4 0C09011E */ jal func_80240478_A60E48 +/* A61B94 802411C4 0C09011E */ jal UnkNpcAIFunc9 /* A61B98 802411C8 0260202D */ daddu $a0, $s3, $zero /* A61B9C 802411CC 0809047B */ j .L802411EC /* A61BA0 802411D0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240558_A67658.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240558_A67658.s deleted file mode 100644 index b36f3c7a32..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240558_A67658.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240558_A67658 -/* A67658 80240558 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A6765C 8024055C AFB3001C */ sw $s3, 0x1c($sp) -/* A67660 80240560 0080982D */ daddu $s3, $a0, $zero -/* A67664 80240564 AFBF0020 */ sw $ra, 0x20($sp) -/* A67668 80240568 AFB20018 */ sw $s2, 0x18($sp) -/* A6766C 8024056C AFB10014 */ sw $s1, 0x14($sp) -/* A67670 80240570 AFB00010 */ sw $s0, 0x10($sp) -/* A67674 80240574 8E720148 */ lw $s2, 0x148($s3) -/* A67678 80240578 0C00EABB */ jal get_npc_unsafe -/* A6767C 8024057C 86440008 */ lh $a0, 8($s2) -/* A67680 80240580 86440008 */ lh $a0, 8($s2) -/* A67684 80240584 0040882D */ daddu $s1, $v0, $zero -/* A67688 80240588 0C00FB3A */ jal get_enemy -/* A6768C 8024058C 24840001 */ addiu $a0, $a0, 1 -/* A67690 80240590 0040802D */ daddu $s0, $v0, $zero -/* A67694 80240594 0C00EABB */ jal get_npc_unsafe -/* A67698 80240598 86040008 */ lh $a0, 8($s0) -/* A6769C 8024059C C62C0038 */ lwc1 $f12, 0x38($s1) -/* A676A0 802405A0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A676A4 802405A4 8C460038 */ lw $a2, 0x38($v0) -/* A676A8 802405A8 0C00A720 */ jal atan2 -/* A676AC 802405AC 8C470040 */ lw $a3, 0x40($v0) -/* A676B0 802405B0 E620000C */ swc1 $f0, 0xc($s1) -/* A676B4 802405B4 8E02006C */ lw $v0, 0x6c($s0) -/* A676B8 802405B8 14400008 */ bnez $v0, .L802405DC -/* A676BC 802405BC 00000000 */ nop -/* A676C0 802405C0 8E4200CC */ lw $v0, 0xcc($s2) -/* A676C4 802405C4 8C420000 */ lw $v0, ($v0) -/* A676C8 802405C8 AE220028 */ sw $v0, 0x28($s1) -/* A676CC 802405CC 96420076 */ lhu $v0, 0x76($s2) -/* A676D0 802405D0 A622008E */ sh $v0, 0x8e($s1) -/* A676D4 802405D4 24020021 */ addiu $v0, $zero, 0x21 -/* A676D8 802405D8 AE620070 */ sw $v0, 0x70($s3) -.L802405DC: -/* A676DC 802405DC 8FBF0020 */ lw $ra, 0x20($sp) -/* A676E0 802405E0 8FB3001C */ lw $s3, 0x1c($sp) -/* A676E4 802405E4 8FB20018 */ lw $s2, 0x18($sp) -/* A676E8 802405E8 8FB10014 */ lw $s1, 0x14($sp) -/* A676EC 802405EC 8FB00010 */ lw $s0, 0x10($sp) -/* A676F0 802405F0 03E00008 */ jr $ra -/* A676F4 802405F4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s index 23b7f8e3d0..c729f8820b 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s @@ -190,7 +190,7 @@ glabel func_80240FD4_A680D4 /* A68398 80241298 0260202D */ daddu $a0, $s3, $zero /* A6839C 8024129C 080904B3 */ j .L802412CC /* A683A0 802412A0 00000000 */ nop -/* A683A4 802412A4 0C090156 */ jal func_80240558_A67658 +/* A683A4 802412A4 0C090156 */ jal UnkNpcAIFunc9 /* A683A8 802412A8 0260202D */ daddu $a0, $s3, $zero /* A683AC 802412AC 080904B3 */ j .L802412CC /* A683B0 802412B0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241DC0_D9F290.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241DC0_D9F290.s deleted file mode 100644 index d18cad6ff8..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241DC0_D9F290.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DC0_D9F290 -/* D9F290 80241DC0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D9F294 80241DC4 AFB3001C */ sw $s3, 0x1c($sp) -/* D9F298 80241DC8 0080982D */ daddu $s3, $a0, $zero -/* D9F29C 80241DCC AFBF0020 */ sw $ra, 0x20($sp) -/* D9F2A0 80241DD0 AFB20018 */ sw $s2, 0x18($sp) -/* D9F2A4 80241DD4 AFB10014 */ sw $s1, 0x14($sp) -/* D9F2A8 80241DD8 AFB00010 */ sw $s0, 0x10($sp) -/* D9F2AC 80241DDC 8E720148 */ lw $s2, 0x148($s3) -/* D9F2B0 80241DE0 0C00EABB */ jal get_npc_unsafe -/* D9F2B4 80241DE4 86440008 */ lh $a0, 8($s2) -/* D9F2B8 80241DE8 86440008 */ lh $a0, 8($s2) -/* D9F2BC 80241DEC 0040882D */ daddu $s1, $v0, $zero -/* D9F2C0 80241DF0 0C00FB3A */ jal get_enemy -/* D9F2C4 80241DF4 24840001 */ addiu $a0, $a0, 1 -/* D9F2C8 80241DF8 0040802D */ daddu $s0, $v0, $zero -/* D9F2CC 80241DFC 0C00EABB */ jal get_npc_unsafe -/* D9F2D0 80241E00 86040008 */ lh $a0, 8($s0) -/* D9F2D4 80241E04 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D9F2D8 80241E08 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D9F2DC 80241E0C 8C460038 */ lw $a2, 0x38($v0) -/* D9F2E0 80241E10 0C00A720 */ jal atan2 -/* D9F2E4 80241E14 8C470040 */ lw $a3, 0x40($v0) -/* D9F2E8 80241E18 E620000C */ swc1 $f0, 0xc($s1) -/* D9F2EC 80241E1C 8E02006C */ lw $v0, 0x6c($s0) -/* D9F2F0 80241E20 14400008 */ bnez $v0, .L80241E44 -/* D9F2F4 80241E24 00000000 */ nop -/* D9F2F8 80241E28 8E4200CC */ lw $v0, 0xcc($s2) -/* D9F2FC 80241E2C 8C420000 */ lw $v0, ($v0) -/* D9F300 80241E30 AE220028 */ sw $v0, 0x28($s1) -/* D9F304 80241E34 96420076 */ lhu $v0, 0x76($s2) -/* D9F308 80241E38 A622008E */ sh $v0, 0x8e($s1) -/* D9F30C 80241E3C 24020021 */ addiu $v0, $zero, 0x21 -/* D9F310 80241E40 AE620070 */ sw $v0, 0x70($s3) -.L80241E44: -/* D9F314 80241E44 8FBF0020 */ lw $ra, 0x20($sp) -/* D9F318 80241E48 8FB3001C */ lw $s3, 0x1c($sp) -/* D9F31C 80241E4C 8FB20018 */ lw $s2, 0x18($sp) -/* D9F320 80241E50 8FB10014 */ lw $s1, 0x14($sp) -/* D9F324 80241E54 8FB00010 */ lw $s0, 0x10($sp) -/* D9F328 80241E58 03E00008 */ jr $ra -/* D9F32C 80241E5C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s index 3b90b9e1ce..c787a5b10a 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s @@ -190,7 +190,7 @@ glabel func_8024283C_D9FD0C /* D9FFD0 80242B00 0260202D */ daddu $a0, $s3, $zero /* D9FFD4 80242B04 08090ACD */ j .L80242B34 /* D9FFD8 80242B08 00000000 */ nop -/* D9FFDC 80242B0C 0C090770 */ jal func_80241DC0_D9F290 +/* D9FFDC 80242B0C 0C090770 */ jal UnkNpcAIFunc9 /* D9FFE0 80242B10 0260202D */ daddu $a0, $s3, $zero /* D9FFE4 80242B14 08090ACD */ j .L80242B34 /* D9FFE8 80242B18 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802427D0_DCF4A0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802427D0_DCF4A0.s deleted file mode 100644 index ff3970d572..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802427D0_DCF4A0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427D0_DCF4A0 -/* DCF4A0 802427D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DCF4A4 802427D4 AFB3001C */ sw $s3, 0x1c($sp) -/* DCF4A8 802427D8 0080982D */ daddu $s3, $a0, $zero -/* DCF4AC 802427DC AFBF0020 */ sw $ra, 0x20($sp) -/* DCF4B0 802427E0 AFB20018 */ sw $s2, 0x18($sp) -/* DCF4B4 802427E4 AFB10014 */ sw $s1, 0x14($sp) -/* DCF4B8 802427E8 AFB00010 */ sw $s0, 0x10($sp) -/* DCF4BC 802427EC 8E720148 */ lw $s2, 0x148($s3) -/* DCF4C0 802427F0 0C00EABB */ jal get_npc_unsafe -/* DCF4C4 802427F4 86440008 */ lh $a0, 8($s2) -/* DCF4C8 802427F8 86440008 */ lh $a0, 8($s2) -/* DCF4CC 802427FC 0040882D */ daddu $s1, $v0, $zero -/* DCF4D0 80242800 0C00FB3A */ jal get_enemy -/* DCF4D4 80242804 24840001 */ addiu $a0, $a0, 1 -/* DCF4D8 80242808 0040802D */ daddu $s0, $v0, $zero -/* DCF4DC 8024280C 0C00EABB */ jal get_npc_unsafe -/* DCF4E0 80242810 86040008 */ lh $a0, 8($s0) -/* DCF4E4 80242814 C62C0038 */ lwc1 $f12, 0x38($s1) -/* DCF4E8 80242818 C62E0040 */ lwc1 $f14, 0x40($s1) -/* DCF4EC 8024281C 8C460038 */ lw $a2, 0x38($v0) -/* DCF4F0 80242820 0C00A720 */ jal atan2 -/* DCF4F4 80242824 8C470040 */ lw $a3, 0x40($v0) -/* DCF4F8 80242828 E620000C */ swc1 $f0, 0xc($s1) -/* DCF4FC 8024282C 8E02006C */ lw $v0, 0x6c($s0) -/* DCF500 80242830 14400008 */ bnez $v0, .L80242854 -/* DCF504 80242834 00000000 */ nop -/* DCF508 80242838 8E4200CC */ lw $v0, 0xcc($s2) -/* DCF50C 8024283C 8C420000 */ lw $v0, ($v0) -/* DCF510 80242840 AE220028 */ sw $v0, 0x28($s1) -/* DCF514 80242844 96420076 */ lhu $v0, 0x76($s2) -/* DCF518 80242848 A622008E */ sh $v0, 0x8e($s1) -/* DCF51C 8024284C 24020021 */ addiu $v0, $zero, 0x21 -/* DCF520 80242850 AE620070 */ sw $v0, 0x70($s3) -.L80242854: -/* DCF524 80242854 8FBF0020 */ lw $ra, 0x20($sp) -/* DCF528 80242858 8FB3001C */ lw $s3, 0x1c($sp) -/* DCF52C 8024285C 8FB20018 */ lw $s2, 0x18($sp) -/* DCF530 80242860 8FB10014 */ lw $s1, 0x14($sp) -/* DCF534 80242864 8FB00010 */ lw $s0, 0x10($sp) -/* DCF538 80242868 03E00008 */ jr $ra -/* DCF53C 8024286C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s index 6e81866c38..3c656f396f 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s @@ -190,7 +190,7 @@ glabel func_8024324C_DCFF1C /* DD01E0 80243510 0260202D */ daddu $a0, $s3, $zero /* DD01E4 80243514 08090D51 */ j .L80243544 /* DD01E8 80243518 00000000 */ nop -/* DD01EC 8024351C 0C0909F4 */ jal func_802427D0_DCF4A0 +/* DD01EC 8024351C 0C0909F4 */ jal UnkNpcAIFunc9 /* DD01F0 80243520 0260202D */ daddu $a0, $s3, $zero /* DD01F4 80243524 08090D51 */ j .L80243544 /* DD01F8 80243528 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242924_DF17C4.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242924_DF17C4.s deleted file mode 100644 index 5d5b197c89..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242924_DF17C4.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242924_DF17C4 -/* DF17C4 80242924 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DF17C8 80242928 AFB3001C */ sw $s3, 0x1c($sp) -/* DF17CC 8024292C 0080982D */ daddu $s3, $a0, $zero -/* DF17D0 80242930 AFBF0020 */ sw $ra, 0x20($sp) -/* DF17D4 80242934 AFB20018 */ sw $s2, 0x18($sp) -/* DF17D8 80242938 AFB10014 */ sw $s1, 0x14($sp) -/* DF17DC 8024293C AFB00010 */ sw $s0, 0x10($sp) -/* DF17E0 80242940 8E720148 */ lw $s2, 0x148($s3) -/* DF17E4 80242944 0C00EABB */ jal get_npc_unsafe -/* DF17E8 80242948 86440008 */ lh $a0, 8($s2) -/* DF17EC 8024294C 86440008 */ lh $a0, 8($s2) -/* DF17F0 80242950 0040882D */ daddu $s1, $v0, $zero -/* DF17F4 80242954 0C00FB3A */ jal get_enemy -/* DF17F8 80242958 24840001 */ addiu $a0, $a0, 1 -/* DF17FC 8024295C 0040802D */ daddu $s0, $v0, $zero -/* DF1800 80242960 0C00EABB */ jal get_npc_unsafe -/* DF1804 80242964 86040008 */ lh $a0, 8($s0) -/* DF1808 80242968 C62C0038 */ lwc1 $f12, 0x38($s1) -/* DF180C 8024296C C62E0040 */ lwc1 $f14, 0x40($s1) -/* DF1810 80242970 8C460038 */ lw $a2, 0x38($v0) -/* DF1814 80242974 0C00A720 */ jal atan2 -/* DF1818 80242978 8C470040 */ lw $a3, 0x40($v0) -/* DF181C 8024297C E620000C */ swc1 $f0, 0xc($s1) -/* DF1820 80242980 8E02006C */ lw $v0, 0x6c($s0) -/* DF1824 80242984 14400008 */ bnez $v0, .L802429A8 -/* DF1828 80242988 00000000 */ nop -/* DF182C 8024298C 8E4200CC */ lw $v0, 0xcc($s2) -/* DF1830 80242990 8C420000 */ lw $v0, ($v0) -/* DF1834 80242994 AE220028 */ sw $v0, 0x28($s1) -/* DF1838 80242998 96420076 */ lhu $v0, 0x76($s2) -/* DF183C 8024299C A622008E */ sh $v0, 0x8e($s1) -/* DF1840 802429A0 24020021 */ addiu $v0, $zero, 0x21 -/* DF1844 802429A4 AE620070 */ sw $v0, 0x70($s3) -.L802429A8: -/* DF1848 802429A8 8FBF0020 */ lw $ra, 0x20($sp) -/* DF184C 802429AC 8FB3001C */ lw $s3, 0x1c($sp) -/* DF1850 802429B0 8FB20018 */ lw $s2, 0x18($sp) -/* DF1854 802429B4 8FB10014 */ lw $s1, 0x14($sp) -/* DF1858 802429B8 8FB00010 */ lw $s0, 0x10($sp) -/* DF185C 802429BC 03E00008 */ jr $ra -/* DF1860 802429C0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s index 59b911538e..191c53f074 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s @@ -190,7 +190,7 @@ glabel func_802433A0_DF2240 /* DF2504 80243664 0260202D */ daddu $a0, $s3, $zero /* DF2508 80243668 08090DA6 */ j .L80243698 /* DF250C 8024366C 00000000 */ nop -/* DF2510 80243670 0C090A49 */ jal func_80242924_DF17C4 +/* DF2510 80243670 0C090A49 */ jal UnkNpcAIFunc9 /* DF2514 80243674 0260202D */ daddu $a0, $s3, $zero /* DF2518 80243678 08090DA6 */ j .L80243698 /* DF251C 8024367C 00000000 */ nop diff --git a/src/world/area_iwa/iwa_01/90FBD0.c b/src/world/area_iwa/iwa_01/90FBD0.c index e2f13d1cfc..72aa6f7bb3 100644 --- a/src/world/area_iwa/iwa_01/90FBD0.c +++ b/src/world/area_iwa/iwa_01/90FBD0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240854_90FF04); #include "world/common/UnkSetDurationFunc.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240998_910048); +#include "world/common/UnkNpcAIFunc9.inc.c" #include "world/common/UnkDurationCheck.inc.c" diff --git a/src/world/area_kpa/kpa_09/A4F0A0.c b/src/world/area_kpa/kpa_09/A4F0A0.c index 7574a79b66..15d2736646 100644 --- a/src/world/area_kpa/kpa_09/A4F0A0.c +++ b/src/world/area_kpa/kpa_09/A4F0A0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802403D4_A4F3D4); #include "world/common/UnkSetDurationFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240518_A4F518); +#include "world/common/UnkNpcAIFunc9.inc.c" #include "world/common/UnkDurationCheck.inc.c" diff --git a/src/world/area_kpa/kpa_102/A93A50.c b/src/world/area_kpa/kpa_102/A93A50.c index 3eae62e43c..bfd248599c 100644 --- a/src/world/area_kpa/kpa_102/A93A50.c +++ b/src/world/area_kpa/kpa_102/A93A50.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240644_A93D84); #include "world/common/UnkSetDurationFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240788_A93EC8); +#include "world/common/UnkNpcAIFunc9.inc.c" #include "world/common/UnkDurationCheck.inc.c" diff --git a/src/world/area_kpa/kpa_111/A99590.c b/src/world/area_kpa/kpa_111/A99590.c index d3be68e55a..ab9c96f8c8 100644 --- a/src/world/area_kpa/kpa_111/A99590.c +++ b/src/world/area_kpa/kpa_111/A99590.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802404A4_A99A34); #include "world/common/UnkSetDurationFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802405E8_A99B78); +#include "world/common/UnkNpcAIFunc9.inc.c" #include "world/common/UnkDurationCheck.inc.c" diff --git a/src/world/area_kpa/kpa_115/A9ED40.c b/src/world/area_kpa/kpa_115/A9ED40.c index 675dce92b7..f0118eaaeb 100644 --- a/src/world/area_kpa/kpa_115/A9ED40.c +++ b/src/world/area_kpa/kpa_115/A9ED40.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_802404A4_A9F1E4); #include "world/common/UnkSetDurationFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_802405E8_A9F328); +#include "world/common/UnkNpcAIFunc9.inc.c" #include "world/common/UnkDurationCheck.inc.c" diff --git a/src/world/area_kpa/kpa_50/A609D0.c b/src/world/area_kpa/kpa_50/A609D0.c index a6e88a177f..a494ec4429 100644 --- a/src/world/area_kpa/kpa_50/A609D0.c +++ b/src/world/area_kpa/kpa_50/A609D0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240334_A60D04); #include "world/common/UnkSetDurationFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240478_A60E48); +#include "world/common/UnkNpcAIFunc9.inc.c" #include "world/common/UnkDurationCheck.inc.c" diff --git a/src/world/area_kpa/kpa_52/A671E0.c b/src/world/area_kpa/kpa_52/A671E0.c index 2463afef16..0b5fc97e7f 100644 --- a/src/world/area_kpa/kpa_52/A671E0.c +++ b/src/world/area_kpa/kpa_52/A671E0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240414_A67514); #include "world/common/UnkSetDurationFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240558_A67658); +#include "world/common/UnkNpcAIFunc9.inc.c" #include "world/common/UnkDurationCheck.inc.c" diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c index a5ef718593..6c681c9df7 100644 --- a/src/world/area_omo/omo_02/D9D510.c +++ b/src/world/area_omo/omo_02/D9D510.c @@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241C7C_D9F14C); #include "world/common/UnkSetDurationFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241DC0_D9F290); +#include "world/common/UnkNpcAIFunc9.inc.c" #include "world/common/UnkDurationCheck.inc.c" diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index 94b422f644..155ec27f4c 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -52,7 +52,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024268C_DCF35C); #include "world/common/UnkSetDurationFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802427D0_DCF4A0); +#include "world/common/UnkNpcAIFunc9.inc.c" #include "world/common/UnkDurationCheck.inc.c" diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index 099e5fbaaa..ea46fef4f6 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802427E0_DF1680); #include "world/common/UnkSetDurationFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80242924_DF17C4); +#include "world/common/UnkNpcAIFunc9.inc.c" #include "world/common/UnkDurationCheck.inc.c" diff --git a/src/world/common/UnkNpcAIFunc9.inc.c b/src/world/common/UnkNpcAIFunc9.inc.c new file mode 100644 index 0000000000..d027a58bef --- /dev/null +++ b/src/world/common/UnkNpcAIFunc9.inc.c @@ -0,0 +1,16 @@ +#include "common.h" +#include "map.h" + +static void UnkNpcAIFunc9(ScriptInstance *script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + Npc* npc2 = get_npc_unsafe(enemy2->npcID); + + npc->yaw = atan2(npc->pos.x, npc->pos.z, npc2->pos.x, npc2->pos.z); + if (enemy2->varTable[0] == 0) { + npc->currentAnim = enemy->animList[0]; + npc->duration = enemy->varTable[2]; + script->functionTemp[0].s = 33; + } +} From 9a9cc74ebb30211db3cbd702a4d2d98e3f4dfd77 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 22 Nov 2020 11:41:22 -0500 Subject: [PATCH 29/38] format --- src/os/code_4ac90_len_3910.c | 3 ++- src/world/common/UnkNpcAIFunc9.inc.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/os/code_4ac90_len_3910.c b/src/os/code_4ac90_len_3910.c index d910db8e8b..a96291c5ea 100644 --- a/src/os/code_4ac90_len_3910.c +++ b/src/os/code_4ac90_len_3910.c @@ -32,7 +32,8 @@ INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FDD0); INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FE30); -INCLUDE_ASM(void, "os/code_4ac90_len_3910", fx_emote, s32 arg0, Npc* arg1, s32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, s32 arg7, s32* arg8); +INCLUDE_ASM(void, "os/code_4ac90_len_3910", fx_emote, s32 arg0, Npc* arg1, s32 arg2, f32 arg3, f32 arg4, f32 arg5, + f32 arg6, s32 arg7, s32* arg8); INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_8006FEF0, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4); diff --git a/src/world/common/UnkNpcAIFunc9.inc.c b/src/world/common/UnkNpcAIFunc9.inc.c index d027a58bef..c22a9a255d 100644 --- a/src/world/common/UnkNpcAIFunc9.inc.c +++ b/src/world/common/UnkNpcAIFunc9.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void UnkNpcAIFunc9(ScriptInstance *script) { +static void UnkNpcAIFunc9(ScriptInstance* script) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); Enemy* enemy2 = get_enemy(enemy->npcID + 1); From 8574e9b5382b41f10027eb34854669bb2d493087 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 22 Nov 2020 15:16:08 -0500 Subject: [PATCH 30/38] UnkNpcAIFunc10 --- .../kmr_02/8B0070/func_8024191C_8B198C.s | 23 ------------------- .../kmr_02/8B0070/func_80241C18_8B1C88.s | 2 +- .../kmr_07/8D3DC0/func_802404F8_8D42B8.s | 23 ------------------- .../kmr_07/8D3DC0/func_802407F4_8D45B4.s | 16 ++++++------- .../kmr_11/8DA3A0/func_80240868_8DA968.s | 23 ------------------- .../kmr_11/8DA3A0/func_80240B64_8DAC64.s | 2 +- .../nok_01/9C53E0/func_802404F8_9C58D8.s | 23 ------------------- .../nok_01/9C53E0/func_802407F4_9C5BD4.s | 2 +- .../omo_02/D9D510/func_802413D4_D9E8A4.s | 23 ------------------- .../omo_02/D9D510/func_802416D0_D9EBA0.s | 2 +- .../sbk_30/93F5B0/func_80240868_93FE18.s | 23 ------------------- .../sbk_30/93F5B0/func_80240B64_940114.s | 2 +- .../trd_01/99CD80/func_802410BC_99DA4C.s | 23 ------------------- .../trd_01/99CD80/func_802413B8_99DD48.s | 2 +- src/world/area_kmr/kmr_02/8B0070.c | 2 +- src/world/area_kmr/kmr_07/8D3DC0.c | 2 +- src/world/area_kmr/kmr_11/8DA3A0.c | 2 +- src/world/area_nok/nok_01/9C53E0.c | 2 +- src/world/area_omo/omo_02/D9D510.c | 2 +- src/world/area_sbk/sbk_30/93F5B0.c | 2 +- src/world/area_trd/trd_01/99CD80.c | 2 +- src/world/common/UnkNpcAIFunc10.inc.c | 11 +++++++++ 22 files changed, 32 insertions(+), 182 deletions(-) delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024191C_8B198C.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802404F8_8D42B8.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240868_8DA968.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802404F8_9C58D8.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802413D4_D9E8A4.s delete mode 100644 asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240868_93FE18.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802410BC_99DA4C.s create mode 100644 src/world/common/UnkNpcAIFunc10.inc.c diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024191C_8B198C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024191C_8B198C.s deleted file mode 100644 index e470e2790a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024191C_8B198C.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024191C_8B198C -/* 8B198C 8024191C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B1990 80241920 AFB00010 */ sw $s0, 0x10($sp) -/* 8B1994 80241924 0080802D */ daddu $s0, $a0, $zero -/* 8B1998 80241928 AFBF0014 */ sw $ra, 0x14($sp) -/* 8B199C 8024192C 8E020148 */ lw $v0, 0x148($s0) -/* 8B19A0 80241930 0C00EABB */ jal get_npc_unsafe -/* 8B19A4 80241934 84440008 */ lh $a0, 8($v0) -/* 8B19A8 80241938 9443008E */ lhu $v1, 0x8e($v0) -/* 8B19AC 8024193C 2463FFFF */ addiu $v1, $v1, -1 -/* 8B19B0 80241940 A443008E */ sh $v1, 0x8e($v0) -/* 8B19B4 80241944 00031C00 */ sll $v1, $v1, 0x10 -/* 8B19B8 80241948 14600002 */ bnez $v1, .L80241954 -/* 8B19BC 8024194C 2402000F */ addiu $v0, $zero, 0xf -/* 8B19C0 80241950 AE020070 */ sw $v0, 0x70($s0) -.L80241954: -/* 8B19C4 80241954 8FBF0014 */ lw $ra, 0x14($sp) -/* 8B19C8 80241958 8FB00010 */ lw $s0, 0x10($sp) -/* 8B19CC 8024195C 03E00008 */ jr $ra -/* 8B19D0 80241960 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s index da24c27dd9..482c0089fd 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s @@ -139,7 +139,7 @@ glabel func_80241C18_8B1C88 /* 8B1E8C 80241E1C 00000000 */ nop /* 8B1E90 80241E20 0280202D */ daddu $a0, $s4, $zero /* 8B1E94 80241E24 0260282D */ daddu $a1, $s3, $zero -/* 8B1E98 80241E28 0C090647 */ jal func_8024191C_8B198C +/* 8B1E98 80241E28 0C090647 */ jal UnkNpcAIFunc10 /* 8B1E9C 80241E2C 02A0302D */ daddu $a2, $s5, $zero /* 8B1EA0 80241E30 0809079A */ j .L80241E68 /* 8B1EA4 80241E34 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802404F8_8D42B8.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802404F8_8D42B8.s deleted file mode 100644 index cae7b2f981..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802404F8_8D42B8.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404F8_8D42B8 -/* 8D42B8 802404F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D42BC 802404FC AFB00010 */ sw $s0, 0x10($sp) -/* 8D42C0 80240500 0080802D */ daddu $s0, $a0, $zero -/* 8D42C4 80240504 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D42C8 80240508 8E020148 */ lw $v0, 0x148($s0) -/* 8D42CC 8024050C 0C00EABB */ jal get_npc_unsafe -/* 8D42D0 80240510 84440008 */ lh $a0, 8($v0) -/* 8D42D4 80240514 9443008E */ lhu $v1, 0x8e($v0) -/* 8D42D8 80240518 2463FFFF */ addiu $v1, $v1, -1 -/* 8D42DC 8024051C A443008E */ sh $v1, 0x8e($v0) -/* 8D42E0 80240520 00031C00 */ sll $v1, $v1, 0x10 -/* 8D42E4 80240524 14600002 */ bnez $v1, .L80240530 -/* 8D42E8 80240528 2402000F */ addiu $v0, $zero, 0xf -/* 8D42EC 8024052C AE020070 */ sw $v0, 0x70($s0) -.L80240530: -/* 8D42F0 80240530 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D42F4 80240534 8FB00010 */ lw $s0, 0x10($sp) -/* 8D42F8 80240538 03E00008 */ jr $ra -/* 8D42FC 8024053C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s index 499779e184..3046203705 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s @@ -46,7 +46,7 @@ glabel func_802407F4_8D45B4 /* 8D4658 80240898 8E4200B0 */ lw $v0, 0xb0($s2) /* 8D465C 8024089C 30420004 */ andi $v0, $v0, 4 /* 8D4660 802408A0 1040002F */ beqz $v0, .L80240960 -/* 8D4664 802408A4 00000000 */ nop +/* 8D4664 802408A4 00000000 */ nop .L802408A8: /* 8D4668 802408A8 AE800070 */ sw $zero, 0x70($s4) /* 8D466C 802408AC C600000C */ lwc1 $f0, 0xc($s0) @@ -106,7 +106,7 @@ glabel func_802407F4_8D45B4 /* 8D4734 80240974 00220821 */ addu $at, $at, $v0 /* 8D4738 80240978 8C221EA8 */ lw $v0, 0x1ea8($at) /* 8D473C 8024097C 00400008 */ jr $v0 -/* 8D4740 80240980 00000000 */ nop +/* 8D4740 80240980 00000000 */ nop /* 8D4744 80240984 0280202D */ daddu $a0, $s4, $zero /* 8D4748 80240988 0260282D */ daddu $a1, $s3, $zero /* 8D474C 8024098C 0C090000 */ jal func_80240000_8D3DC0 @@ -116,7 +116,7 @@ glabel func_802407F4_8D45B4 /* 8D475C 8024099C 0C09002D */ jal func_802400B4_8D3E74 /* 8D4760 802409A0 02A0302D */ daddu $a2, $s5, $zero /* 8D4764 802409A4 08090291 */ j .L80240A44 -/* 8D4768 802409A8 00000000 */ nop +/* 8D4768 802409A8 00000000 */ nop /* 8D476C 802409AC 0280202D */ daddu $a0, $s4, $zero /* 8D4770 802409B0 0260282D */ daddu $a1, $s3, $zero /* 8D4774 802409B4 0C090075 */ jal func_802401D4_8D3F94 @@ -126,7 +126,7 @@ glabel func_802407F4_8D45B4 /* 8D4784 802409C4 0C09008D */ jal NpcJumpFunc /* 8D4788 802409C8 02A0302D */ daddu $a2, $s5, $zero /* 8D478C 802409CC 08090291 */ j .L80240A44 -/* 8D4790 802409D0 00000000 */ nop +/* 8D4790 802409D0 00000000 */ nop /* 8D4794 802409D4 0280202D */ daddu $a0, $s4, $zero /* 8D4798 802409D8 0260282D */ daddu $a1, $s3, $zero /* 8D479C 802409DC 0C0900AB */ jal func_802402AC_8D406C @@ -136,13 +136,13 @@ glabel func_802407F4_8D45B4 /* 8D47AC 802409EC 0C0900F7 */ jal func_802403DC_8D419C /* 8D47B0 802409F0 02A0302D */ daddu $a2, $s5, $zero /* 8D47B4 802409F4 08090291 */ j .L80240A44 -/* 8D47B8 802409F8 00000000 */ nop +/* 8D47B8 802409F8 00000000 */ nop /* 8D47BC 802409FC 0280202D */ daddu $a0, $s4, $zero /* 8D47C0 80240A00 0260282D */ daddu $a1, $s3, $zero -/* 8D47C4 80240A04 0C09013E */ jal func_802404F8_8D42B8 +/* 8D47C4 80240A04 0C09013E */ jal UnkNpcAIFunc10 /* 8D47C8 80240A08 02A0302D */ daddu $a2, $s5, $zero /* 8D47CC 80240A0C 08090291 */ j .L80240A44 -/* 8D47D0 80240A10 00000000 */ nop +/* 8D47D0 80240A10 00000000 */ nop /* 8D47D4 80240A14 0280202D */ daddu $a0, $s4, $zero /* 8D47D8 80240A18 0260282D */ daddu $a1, $s3, $zero /* 8D47DC 80240A1C 0C090150 */ jal func_80240540_8D4300 @@ -152,7 +152,7 @@ glabel func_802407F4_8D45B4 /* 8D47EC 80240A2C 0C09017B */ jal func_802405EC_8D43AC /* 8D47F0 80240A30 02A0302D */ daddu $a2, $s5, $zero /* 8D47F4 80240A34 08090291 */ j .L80240A44 -/* 8D47F8 80240A38 00000000 */ nop +/* 8D47F8 80240A38 00000000 */ nop /* 8D47FC 80240A3C 0C0129CF */ jal func_8004A73C /* 8D4800 80240A40 0280202D */ daddu $a0, $s4, $zero .L80240A44: diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240868_8DA968.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240868_8DA968.s deleted file mode 100644 index c374315403..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240868_8DA968.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240868_8DA968 -/* 8DA968 80240868 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8DA96C 8024086C AFB00010 */ sw $s0, 0x10($sp) -/* 8DA970 80240870 0080802D */ daddu $s0, $a0, $zero -/* 8DA974 80240874 AFBF0014 */ sw $ra, 0x14($sp) -/* 8DA978 80240878 8E020148 */ lw $v0, 0x148($s0) -/* 8DA97C 8024087C 0C00EABB */ jal get_npc_unsafe -/* 8DA980 80240880 84440008 */ lh $a0, 8($v0) -/* 8DA984 80240884 9443008E */ lhu $v1, 0x8e($v0) -/* 8DA988 80240888 2463FFFF */ addiu $v1, $v1, -1 -/* 8DA98C 8024088C A443008E */ sh $v1, 0x8e($v0) -/* 8DA990 80240890 00031C00 */ sll $v1, $v1, 0x10 -/* 8DA994 80240894 14600002 */ bnez $v1, .L802408A0 -/* 8DA998 80240898 2402000F */ addiu $v0, $zero, 0xf -/* 8DA99C 8024089C AE020070 */ sw $v0, 0x70($s0) -.L802408A0: -/* 8DA9A0 802408A0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8DA9A4 802408A4 8FB00010 */ lw $s0, 0x10($sp) -/* 8DA9A8 802408A8 03E00008 */ jr $ra -/* 8DA9AC 802408AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s index 162ae1ad96..782e6f97ea 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s @@ -139,7 +139,7 @@ glabel func_80240B64_8DAC64 /* 8DAE68 80240D68 00000000 */ nop /* 8DAE6C 80240D6C 0280202D */ daddu $a0, $s4, $zero /* 8DAE70 80240D70 0260282D */ daddu $a1, $s3, $zero -/* 8DAE74 80240D74 0C09021A */ jal func_80240868_8DA968 +/* 8DAE74 80240D74 0C09021A */ jal UnkNpcAIFunc10 /* 8DAE78 80240D78 02A0302D */ daddu $a2, $s5, $zero /* 8DAE7C 80240D7C 0809036D */ j .L80240DB4 /* 8DAE80 80240D80 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802404F8_9C58D8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802404F8_9C58D8.s deleted file mode 100644 index 73ddf28e22..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802404F8_9C58D8.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404F8_9C58D8 -/* 9C58D8 802404F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C58DC 802404FC AFB00010 */ sw $s0, 0x10($sp) -/* 9C58E0 80240500 0080802D */ daddu $s0, $a0, $zero -/* 9C58E4 80240504 AFBF0014 */ sw $ra, 0x14($sp) -/* 9C58E8 80240508 8E020148 */ lw $v0, 0x148($s0) -/* 9C58EC 8024050C 0C00EABB */ jal get_npc_unsafe -/* 9C58F0 80240510 84440008 */ lh $a0, 8($v0) -/* 9C58F4 80240514 9443008E */ lhu $v1, 0x8e($v0) -/* 9C58F8 80240518 2463FFFF */ addiu $v1, $v1, -1 -/* 9C58FC 8024051C A443008E */ sh $v1, 0x8e($v0) -/* 9C5900 80240520 00031C00 */ sll $v1, $v1, 0x10 -/* 9C5904 80240524 14600002 */ bnez $v1, .L80240530 -/* 9C5908 80240528 2402000F */ addiu $v0, $zero, 0xf -/* 9C590C 8024052C AE020070 */ sw $v0, 0x70($s0) -.L80240530: -/* 9C5910 80240530 8FBF0014 */ lw $ra, 0x14($sp) -/* 9C5914 80240534 8FB00010 */ lw $s0, 0x10($sp) -/* 9C5918 80240538 03E00008 */ jr $ra -/* 9C591C 8024053C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s index bb1c0d54b3..a2833da925 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s @@ -139,7 +139,7 @@ glabel func_802407F4_9C5BD4 /* 9C5DD8 802409F8 00000000 */ nop /* 9C5DDC 802409FC 0280202D */ daddu $a0, $s4, $zero /* 9C5DE0 80240A00 0260282D */ daddu $a1, $s3, $zero -/* 9C5DE4 80240A04 0C09013E */ jal func_802404F8_9C58D8 +/* 9C5DE4 80240A04 0C09013E */ jal UnkNpcAIFunc10 /* 9C5DE8 80240A08 02A0302D */ daddu $a2, $s5, $zero /* 9C5DEC 80240A0C 08090291 */ j .L80240A44 /* 9C5DF0 80240A10 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802413D4_D9E8A4.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802413D4_D9E8A4.s deleted file mode 100644 index df3cb5f006..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802413D4_D9E8A4.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413D4_D9E8A4 -/* D9E8A4 802413D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D9E8A8 802413D8 AFB00010 */ sw $s0, 0x10($sp) -/* D9E8AC 802413DC 0080802D */ daddu $s0, $a0, $zero -/* D9E8B0 802413E0 AFBF0014 */ sw $ra, 0x14($sp) -/* D9E8B4 802413E4 8E020148 */ lw $v0, 0x148($s0) -/* D9E8B8 802413E8 0C00EABB */ jal get_npc_unsafe -/* D9E8BC 802413EC 84440008 */ lh $a0, 8($v0) -/* D9E8C0 802413F0 9443008E */ lhu $v1, 0x8e($v0) -/* D9E8C4 802413F4 2463FFFF */ addiu $v1, $v1, -1 -/* D9E8C8 802413F8 A443008E */ sh $v1, 0x8e($v0) -/* D9E8CC 802413FC 00031C00 */ sll $v1, $v1, 0x10 -/* D9E8D0 80241400 14600002 */ bnez $v1, .L8024140C -/* D9E8D4 80241404 2402000F */ addiu $v0, $zero, 0xf -/* D9E8D8 80241408 AE020070 */ sw $v0, 0x70($s0) -.L8024140C: -/* D9E8DC 8024140C 8FBF0014 */ lw $ra, 0x14($sp) -/* D9E8E0 80241410 8FB00010 */ lw $s0, 0x10($sp) -/* D9E8E4 80241414 03E00008 */ jr $ra -/* D9E8E8 80241418 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s index f55191ad3b..4e68e26405 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s @@ -139,7 +139,7 @@ glabel func_802416D0_D9EBA0 /* D9EDA4 802418D4 00000000 */ nop /* D9EDA8 802418D8 0280202D */ daddu $a0, $s4, $zero /* D9EDAC 802418DC 0260282D */ daddu $a1, $s3, $zero -/* D9EDB0 802418E0 0C0904F5 */ jal func_802413D4_D9E8A4 +/* D9EDB0 802418E0 0C0904F5 */ jal UnkNpcAIFunc10 /* D9EDB4 802418E4 02A0302D */ daddu $a2, $s5, $zero /* D9EDB8 802418E8 08090648 */ j .L80241920 /* D9EDBC 802418EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240868_93FE18.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240868_93FE18.s deleted file mode 100644 index c13a3681f6..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240868_93FE18.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240868_93FE18 -/* 93FE18 80240868 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 93FE1C 8024086C AFB00010 */ sw $s0, 0x10($sp) -/* 93FE20 80240870 0080802D */ daddu $s0, $a0, $zero -/* 93FE24 80240874 AFBF0014 */ sw $ra, 0x14($sp) -/* 93FE28 80240878 8E020148 */ lw $v0, 0x148($s0) -/* 93FE2C 8024087C 0C00EABB */ jal get_npc_unsafe -/* 93FE30 80240880 84440008 */ lh $a0, 8($v0) -/* 93FE34 80240884 9443008E */ lhu $v1, 0x8e($v0) -/* 93FE38 80240888 2463FFFF */ addiu $v1, $v1, -1 -/* 93FE3C 8024088C A443008E */ sh $v1, 0x8e($v0) -/* 93FE40 80240890 00031C00 */ sll $v1, $v1, 0x10 -/* 93FE44 80240894 14600002 */ bnez $v1, .L802408A0 -/* 93FE48 80240898 2402000F */ addiu $v0, $zero, 0xf -/* 93FE4C 8024089C AE020070 */ sw $v0, 0x70($s0) -.L802408A0: -/* 93FE50 802408A0 8FBF0014 */ lw $ra, 0x14($sp) -/* 93FE54 802408A4 8FB00010 */ lw $s0, 0x10($sp) -/* 93FE58 802408A8 03E00008 */ jr $ra -/* 93FE5C 802408AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s index 39d8472c7f..812aadbca5 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s @@ -139,7 +139,7 @@ glabel func_80240B64_940114 /* 940318 80240D68 00000000 */ nop /* 94031C 80240D6C 0280202D */ daddu $a0, $s4, $zero /* 940320 80240D70 0260282D */ daddu $a1, $s3, $zero -/* 940324 80240D74 0C09021A */ jal func_80240868_93FE18 +/* 940324 80240D74 0C09021A */ jal UnkNpcAIFunc10 /* 940328 80240D78 02A0302D */ daddu $a2, $s5, $zero /* 94032C 80240D7C 0809036D */ j .L80240DB4 /* 940330 80240D80 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802410BC_99DA4C.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802410BC_99DA4C.s deleted file mode 100644 index 7b60115ab7..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802410BC_99DA4C.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410BC_99DA4C -/* 99DA4C 802410BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99DA50 802410C0 AFB00010 */ sw $s0, 0x10($sp) -/* 99DA54 802410C4 0080802D */ daddu $s0, $a0, $zero -/* 99DA58 802410C8 AFBF0014 */ sw $ra, 0x14($sp) -/* 99DA5C 802410CC 8E020148 */ lw $v0, 0x148($s0) -/* 99DA60 802410D0 0C00EABB */ jal get_npc_unsafe -/* 99DA64 802410D4 84440008 */ lh $a0, 8($v0) -/* 99DA68 802410D8 9443008E */ lhu $v1, 0x8e($v0) -/* 99DA6C 802410DC 2463FFFF */ addiu $v1, $v1, -1 -/* 99DA70 802410E0 A443008E */ sh $v1, 0x8e($v0) -/* 99DA74 802410E4 00031C00 */ sll $v1, $v1, 0x10 -/* 99DA78 802410E8 14600002 */ bnez $v1, .L802410F4 -/* 99DA7C 802410EC 2402000F */ addiu $v0, $zero, 0xf -/* 99DA80 802410F0 AE020070 */ sw $v0, 0x70($s0) -.L802410F4: -/* 99DA84 802410F4 8FBF0014 */ lw $ra, 0x14($sp) -/* 99DA88 802410F8 8FB00010 */ lw $s0, 0x10($sp) -/* 99DA8C 802410FC 03E00008 */ jr $ra -/* 99DA90 80241100 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s index c7e4853f59..c49fbf1ef7 100644 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s @@ -139,7 +139,7 @@ glabel func_802413B8_99DD48 /* 99DF4C 802415BC 00000000 */ nop /* 99DF50 802415C0 0280202D */ daddu $a0, $s4, $zero /* 99DF54 802415C4 0260282D */ daddu $a1, $s3, $zero -/* 99DF58 802415C8 0C09042F */ jal func_802410BC_99DA4C +/* 99DF58 802415C8 0C09042F */ jal UnkNpcAIFunc10 /* 99DF5C 802415CC 02A0302D */ daddu $a2, $s5, $zero /* 99DF60 802415D0 08090582 */ j .L80241608 /* 99DF64 802415D4 00000000 */ nop diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index eb04df8171..44d6821e34 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -78,7 +78,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802416D0_8B1740); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241800_8B1870); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024191C_8B198C); +# include "world/common/UnkNpcAIFunc10.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241964_8B19D4); diff --git a/src/world/area_kmr/kmr_07/8D3DC0.c b/src/world/area_kmr/kmr_07/8D3DC0.c index 42be6f7db9..005e5fc2e3 100644 --- a/src/world/area_kmr/kmr_07/8D3DC0.c +++ b/src/world/area_kmr/kmr_07/8D3DC0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802402AC_8D406C); INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802403DC_8D419C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802404F8_8D42B8); +# include "world/common/UnkNpcAIFunc10.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_80240540_8D4300); diff --git a/src/world/area_kmr/kmr_11/8DA3A0.c b/src/world/area_kmr/kmr_11/8DA3A0.c index 79dbff0ddb..e03855a229 100644 --- a/src/world/area_kmr/kmr_11/8DA3A0.c +++ b/src/world/area_kmr/kmr_11/8DA3A0.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_8024061C_8DA71C); INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_8024074C_8DA84C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240868_8DA968); +# include "world/common/UnkNpcAIFunc10.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_802408B0_8DA9B0); diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 275e2c6cbb..0d0f3c4c86 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802402AC_9C568C); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802403DC_9C57BC); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802404F8_9C58D8); +# include "world/common/UnkNpcAIFunc10.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240540_9C5920); diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c index 6c681c9df7..ea3fe14822 100644 --- a/src/world/area_omo/omo_02/D9D510.c +++ b/src/world/area_omo/omo_02/D9D510.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241188_D9E658); INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_802412B8_D9E788); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_802413D4_D9E8A4); +# include "world/common/UnkNpcAIFunc10.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_8024141C_D9E8EC); diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index 78d7d58202..ab5e096785 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_8024061C_93FBCC); INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_8024074C_93FCFC); -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240868_93FE18); +# include "world/common/UnkNpcAIFunc10.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802408B0_93FE60); diff --git a/src/world/area_trd/trd_01/99CD80.c b/src/world/area_trd/trd_01/99CD80.c index 7478eecdeb..25b0377cf4 100644 --- a/src/world/area_trd/trd_01/99CD80.c +++ b/src/world/area_trd/trd_01/99CD80.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240E70_99D800); INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240FA0_99D930); -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_802410BC_99DA4C); +# include "world/common/UnkNpcAIFunc10.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80241104_99DA94); diff --git a/src/world/common/UnkNpcAIFunc10.inc.c b/src/world/common/UnkNpcAIFunc10.inc.c new file mode 100644 index 0000000000..457c995e92 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc10.inc.c @@ -0,0 +1,11 @@ +#include "common.h" +#include "map.h" + +static void UnkNpcAIFunc10(ScriptInstance* script) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + npc->duration--; + if ((npc->duration << 0x10) == 0) { + script->functionTemp[0].s = 15; + } +} From f96113fb7b971540de7392e9a0b147d9fe667497 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 22 Nov 2020 15:26:38 -0500 Subject: [PATCH 31/38] NpcJumpFunc3 --- .../kmr_02/8B0070/func_802415F8_8B1668.s | 28 ------------------- .../kmr_02/8B0070/func_80241C18_8B1C88.s | 2 +- .../kmr_07/8D3DC0/func_802401D4_8D3F94.s | 28 ------------------- .../kmr_07/8D3DC0/func_802407F4_8D45B4.s | 2 +- .../kmr_11/8DA3A0/func_80240544_8DA644.s | 28 ------------------- .../kmr_11/8DA3A0/func_80240B64_8DAC64.s | 2 +- .../nok_01/9C53E0/func_802401D4_9C55B4.s | 28 ------------------- .../nok_01/9C53E0/func_802407F4_9C5BD4.s | 2 +- .../omo_02/D9D510/func_802410B0_D9E580.s | 28 ------------------- .../omo_02/D9D510/func_802416D0_D9EBA0.s | 2 +- .../sbk_30/93F5B0/func_80240544_93FAF4.s | 28 ------------------- .../sbk_30/93F5B0/func_80240B64_940114.s | 2 +- .../trd_01/99CD80/func_80240D98_99D728.s | 28 ------------------- .../trd_01/99CD80/func_802413B8_99DD48.s | 2 +- src/world/area_kmr/kmr_02/8B0070.c | 2 +- src/world/area_kmr/kmr_07/8D3DC0.c | 2 +- src/world/area_kmr/kmr_11/8DA3A0.c | 2 +- src/world/area_nok/nok_01/9C53E0.c | 2 +- src/world/area_omo/omo_02/D9D510.c | 2 +- src/world/area_sbk/sbk_30/93F5B0.c | 2 +- src/world/area_trd/trd_01/99CD80.c | 2 +- src/world/common/NpcJumpFunc3.inc.c | 12 ++++++++ 22 files changed, 26 insertions(+), 210 deletions(-) delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802415F8_8B1668.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802401D4_8D3F94.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240544_8DA644.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802401D4_9C55B4.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802410B0_D9E580.s delete mode 100644 asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240544_93FAF4.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240D98_99D728.s create mode 100644 src/world/common/NpcJumpFunc3.inc.c diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802415F8_8B1668.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802415F8_8B1668.s deleted file mode 100644 index 17d3f9b755..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802415F8_8B1668.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415F8_8B1668 -/* 8B1668 802415F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B166C 802415FC AFB00010 */ sw $s0, 0x10($sp) -/* 8B1670 80241600 0080802D */ daddu $s0, $a0, $zero -/* 8B1674 80241604 AFBF0014 */ sw $ra, 0x14($sp) -/* 8B1678 80241608 8E020148 */ lw $v0, 0x148($s0) -/* 8B167C 8024160C 0C00EABB */ jal get_npc_unsafe -/* 8B1680 80241610 84440008 */ lh $a0, 8($v0) -/* 8B1684 80241614 3C014120 */ lui $at, 0x4120 -/* 8B1688 80241618 44810000 */ mtc1 $at, $f0 -/* 8B168C 8024161C 3C014000 */ lui $at, 0x4000 -/* 8B1690 80241620 44811000 */ mtc1 $at, $f2 -/* 8B1694 80241624 8C430000 */ lw $v1, ($v0) -/* 8B1698 80241628 C444003C */ lwc1 $f4, 0x3c($v0) -/* 8B169C 8024162C 34630800 */ ori $v1, $v1, 0x800 -/* 8B16A0 80241630 E440001C */ swc1 $f0, 0x1c($v0) -/* 8B16A4 80241634 E4420014 */ swc1 $f2, 0x14($v0) -/* 8B16A8 80241638 E4440064 */ swc1 $f4, 0x64($v0) -/* 8B16AC 8024163C AC430000 */ sw $v1, ($v0) -/* 8B16B0 80241640 2402000B */ addiu $v0, $zero, 0xb -/* 8B16B4 80241644 AE020070 */ sw $v0, 0x70($s0) -/* 8B16B8 80241648 8FBF0014 */ lw $ra, 0x14($sp) -/* 8B16BC 8024164C 8FB00010 */ lw $s0, 0x10($sp) -/* 8B16C0 80241650 03E00008 */ jr $ra -/* 8B16C4 80241654 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s index 482c0089fd..5acce523b1 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s @@ -119,7 +119,7 @@ glabel func_80241C18_8B1C88 /* 8B1E3C 80241DCC 00000000 */ nop /* 8B1E40 80241DD0 0280202D */ daddu $a0, $s4, $zero /* 8B1E44 80241DD4 0260282D */ daddu $a1, $s3, $zero -/* 8B1E48 80241DD8 0C09057E */ jal func_802415F8_8B1668 +/* 8B1E48 80241DD8 0C09057E */ jal NpcJumpFunc3 /* 8B1E4C 80241DDC 02A0302D */ daddu $a2, $s5, $zero /* 8B1E50 80241DE0 0280202D */ daddu $a0, $s4, $zero /* 8B1E54 80241DE4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802401D4_8D3F94.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802401D4_8D3F94.s deleted file mode 100644 index 6bece0da47..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802401D4_8D3F94.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D4_8D3F94 -/* 8D3F94 802401D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D3F98 802401D8 AFB00010 */ sw $s0, 0x10($sp) -/* 8D3F9C 802401DC 0080802D */ daddu $s0, $a0, $zero -/* 8D3FA0 802401E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D3FA4 802401E4 8E020148 */ lw $v0, 0x148($s0) -/* 8D3FA8 802401E8 0C00EABB */ jal get_npc_unsafe -/* 8D3FAC 802401EC 84440008 */ lh $a0, 8($v0) -/* 8D3FB0 802401F0 3C014120 */ lui $at, 0x4120 -/* 8D3FB4 802401F4 44810000 */ mtc1 $at, $f0 -/* 8D3FB8 802401F8 3C014000 */ lui $at, 0x4000 -/* 8D3FBC 802401FC 44811000 */ mtc1 $at, $f2 -/* 8D3FC0 80240200 8C430000 */ lw $v1, ($v0) -/* 8D3FC4 80240204 C444003C */ lwc1 $f4, 0x3c($v0) -/* 8D3FC8 80240208 34630800 */ ori $v1, $v1, 0x800 -/* 8D3FCC 8024020C E440001C */ swc1 $f0, 0x1c($v0) -/* 8D3FD0 80240210 E4420014 */ swc1 $f2, 0x14($v0) -/* 8D3FD4 80240214 E4440064 */ swc1 $f4, 0x64($v0) -/* 8D3FD8 80240218 AC430000 */ sw $v1, ($v0) -/* 8D3FDC 8024021C 2402000B */ addiu $v0, $zero, 0xb -/* 8D3FE0 80240220 AE020070 */ sw $v0, 0x70($s0) -/* 8D3FE4 80240224 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D3FE8 80240228 8FB00010 */ lw $s0, 0x10($sp) -/* 8D3FEC 8024022C 03E00008 */ jr $ra -/* 8D3FF0 80240230 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s index 3046203705..619090bf4d 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s @@ -119,7 +119,7 @@ glabel func_802407F4_8D45B4 /* 8D4768 802409A8 00000000 */ nop /* 8D476C 802409AC 0280202D */ daddu $a0, $s4, $zero /* 8D4770 802409B0 0260282D */ daddu $a1, $s3, $zero -/* 8D4774 802409B4 0C090075 */ jal func_802401D4_8D3F94 +/* 8D4774 802409B4 0C090075 */ jal NpcJumpFunc3 /* 8D4778 802409B8 02A0302D */ daddu $a2, $s5, $zero /* 8D477C 802409BC 0280202D */ daddu $a0, $s4, $zero /* 8D4780 802409C0 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240544_8DA644.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240544_8DA644.s deleted file mode 100644 index eabefa8e18..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240544_8DA644.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240544_8DA644 -/* 8DA644 80240544 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8DA648 80240548 AFB00010 */ sw $s0, 0x10($sp) -/* 8DA64C 8024054C 0080802D */ daddu $s0, $a0, $zero -/* 8DA650 80240550 AFBF0014 */ sw $ra, 0x14($sp) -/* 8DA654 80240554 8E020148 */ lw $v0, 0x148($s0) -/* 8DA658 80240558 0C00EABB */ jal get_npc_unsafe -/* 8DA65C 8024055C 84440008 */ lh $a0, 8($v0) -/* 8DA660 80240560 3C014120 */ lui $at, 0x4120 -/* 8DA664 80240564 44810000 */ mtc1 $at, $f0 -/* 8DA668 80240568 3C014000 */ lui $at, 0x4000 -/* 8DA66C 8024056C 44811000 */ mtc1 $at, $f2 -/* 8DA670 80240570 8C430000 */ lw $v1, ($v0) -/* 8DA674 80240574 C444003C */ lwc1 $f4, 0x3c($v0) -/* 8DA678 80240578 34630800 */ ori $v1, $v1, 0x800 -/* 8DA67C 8024057C E440001C */ swc1 $f0, 0x1c($v0) -/* 8DA680 80240580 E4420014 */ swc1 $f2, 0x14($v0) -/* 8DA684 80240584 E4440064 */ swc1 $f4, 0x64($v0) -/* 8DA688 80240588 AC430000 */ sw $v1, ($v0) -/* 8DA68C 8024058C 2402000B */ addiu $v0, $zero, 0xb -/* 8DA690 80240590 AE020070 */ sw $v0, 0x70($s0) -/* 8DA694 80240594 8FBF0014 */ lw $ra, 0x14($sp) -/* 8DA698 80240598 8FB00010 */ lw $s0, 0x10($sp) -/* 8DA69C 8024059C 03E00008 */ jr $ra -/* 8DA6A0 802405A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s index 782e6f97ea..809e4ad3ac 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s @@ -119,7 +119,7 @@ glabel func_80240B64_8DAC64 /* 8DAE18 80240D18 00000000 */ nop /* 8DAE1C 80240D1C 0280202D */ daddu $a0, $s4, $zero /* 8DAE20 80240D20 0260282D */ daddu $a1, $s3, $zero -/* 8DAE24 80240D24 0C090151 */ jal func_80240544_8DA644 +/* 8DAE24 80240D24 0C090151 */ jal NpcJumpFunc3 /* 8DAE28 80240D28 02A0302D */ daddu $a2, $s5, $zero /* 8DAE2C 80240D2C 0280202D */ daddu $a0, $s4, $zero /* 8DAE30 80240D30 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802401D4_9C55B4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802401D4_9C55B4.s deleted file mode 100644 index 8665fa9467..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802401D4_9C55B4.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D4_9C55B4 -/* 9C55B4 802401D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C55B8 802401D8 AFB00010 */ sw $s0, 0x10($sp) -/* 9C55BC 802401DC 0080802D */ daddu $s0, $a0, $zero -/* 9C55C0 802401E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 9C55C4 802401E4 8E020148 */ lw $v0, 0x148($s0) -/* 9C55C8 802401E8 0C00EABB */ jal get_npc_unsafe -/* 9C55CC 802401EC 84440008 */ lh $a0, 8($v0) -/* 9C55D0 802401F0 3C014120 */ lui $at, 0x4120 -/* 9C55D4 802401F4 44810000 */ mtc1 $at, $f0 -/* 9C55D8 802401F8 3C014000 */ lui $at, 0x4000 -/* 9C55DC 802401FC 44811000 */ mtc1 $at, $f2 -/* 9C55E0 80240200 8C430000 */ lw $v1, ($v0) -/* 9C55E4 80240204 C444003C */ lwc1 $f4, 0x3c($v0) -/* 9C55E8 80240208 34630800 */ ori $v1, $v1, 0x800 -/* 9C55EC 8024020C E440001C */ swc1 $f0, 0x1c($v0) -/* 9C55F0 80240210 E4420014 */ swc1 $f2, 0x14($v0) -/* 9C55F4 80240214 E4440064 */ swc1 $f4, 0x64($v0) -/* 9C55F8 80240218 AC430000 */ sw $v1, ($v0) -/* 9C55FC 8024021C 2402000B */ addiu $v0, $zero, 0xb -/* 9C5600 80240220 AE020070 */ sw $v0, 0x70($s0) -/* 9C5604 80240224 8FBF0014 */ lw $ra, 0x14($sp) -/* 9C5608 80240228 8FB00010 */ lw $s0, 0x10($sp) -/* 9C560C 8024022C 03E00008 */ jr $ra -/* 9C5610 80240230 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s index a2833da925..9d6483f508 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s @@ -119,7 +119,7 @@ glabel func_802407F4_9C5BD4 /* 9C5D88 802409A8 00000000 */ nop /* 9C5D8C 802409AC 0280202D */ daddu $a0, $s4, $zero /* 9C5D90 802409B0 0260282D */ daddu $a1, $s3, $zero -/* 9C5D94 802409B4 0C090075 */ jal func_802401D4_9C55B4 +/* 9C5D94 802409B4 0C090075 */ jal NpcJumpFunc3 /* 9C5D98 802409B8 02A0302D */ daddu $a2, $s5, $zero /* 9C5D9C 802409BC 0280202D */ daddu $a0, $s4, $zero /* 9C5DA0 802409C0 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802410B0_D9E580.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802410B0_D9E580.s deleted file mode 100644 index 074d71a1d0..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802410B0_D9E580.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410B0_D9E580 -/* D9E580 802410B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D9E584 802410B4 AFB00010 */ sw $s0, 0x10($sp) -/* D9E588 802410B8 0080802D */ daddu $s0, $a0, $zero -/* D9E58C 802410BC AFBF0014 */ sw $ra, 0x14($sp) -/* D9E590 802410C0 8E020148 */ lw $v0, 0x148($s0) -/* D9E594 802410C4 0C00EABB */ jal get_npc_unsafe -/* D9E598 802410C8 84440008 */ lh $a0, 8($v0) -/* D9E59C 802410CC 3C014120 */ lui $at, 0x4120 -/* D9E5A0 802410D0 44810000 */ mtc1 $at, $f0 -/* D9E5A4 802410D4 3C014000 */ lui $at, 0x4000 -/* D9E5A8 802410D8 44811000 */ mtc1 $at, $f2 -/* D9E5AC 802410DC 8C430000 */ lw $v1, ($v0) -/* D9E5B0 802410E0 C444003C */ lwc1 $f4, 0x3c($v0) -/* D9E5B4 802410E4 34630800 */ ori $v1, $v1, 0x800 -/* D9E5B8 802410E8 E440001C */ swc1 $f0, 0x1c($v0) -/* D9E5BC 802410EC E4420014 */ swc1 $f2, 0x14($v0) -/* D9E5C0 802410F0 E4440064 */ swc1 $f4, 0x64($v0) -/* D9E5C4 802410F4 AC430000 */ sw $v1, ($v0) -/* D9E5C8 802410F8 2402000B */ addiu $v0, $zero, 0xb -/* D9E5CC 802410FC AE020070 */ sw $v0, 0x70($s0) -/* D9E5D0 80241100 8FBF0014 */ lw $ra, 0x14($sp) -/* D9E5D4 80241104 8FB00010 */ lw $s0, 0x10($sp) -/* D9E5D8 80241108 03E00008 */ jr $ra -/* D9E5DC 8024110C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s index 4e68e26405..3901a71c4f 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s @@ -119,7 +119,7 @@ glabel func_802416D0_D9EBA0 /* D9ED54 80241884 00000000 */ nop /* D9ED58 80241888 0280202D */ daddu $a0, $s4, $zero /* D9ED5C 8024188C 0260282D */ daddu $a1, $s3, $zero -/* D9ED60 80241890 0C09042C */ jal func_802410B0_D9E580 +/* D9ED60 80241890 0C09042C */ jal NpcJumpFunc3 /* D9ED64 80241894 02A0302D */ daddu $a2, $s5, $zero /* D9ED68 80241898 0280202D */ daddu $a0, $s4, $zero /* D9ED6C 8024189C 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240544_93FAF4.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240544_93FAF4.s deleted file mode 100644 index 11fbc39525..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240544_93FAF4.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240544_93FAF4 -/* 93FAF4 80240544 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 93FAF8 80240548 AFB00010 */ sw $s0, 0x10($sp) -/* 93FAFC 8024054C 0080802D */ daddu $s0, $a0, $zero -/* 93FB00 80240550 AFBF0014 */ sw $ra, 0x14($sp) -/* 93FB04 80240554 8E020148 */ lw $v0, 0x148($s0) -/* 93FB08 80240558 0C00EABB */ jal get_npc_unsafe -/* 93FB0C 8024055C 84440008 */ lh $a0, 8($v0) -/* 93FB10 80240560 3C014120 */ lui $at, 0x4120 -/* 93FB14 80240564 44810000 */ mtc1 $at, $f0 -/* 93FB18 80240568 3C014000 */ lui $at, 0x4000 -/* 93FB1C 8024056C 44811000 */ mtc1 $at, $f2 -/* 93FB20 80240570 8C430000 */ lw $v1, ($v0) -/* 93FB24 80240574 C444003C */ lwc1 $f4, 0x3c($v0) -/* 93FB28 80240578 34630800 */ ori $v1, $v1, 0x800 -/* 93FB2C 8024057C E440001C */ swc1 $f0, 0x1c($v0) -/* 93FB30 80240580 E4420014 */ swc1 $f2, 0x14($v0) -/* 93FB34 80240584 E4440064 */ swc1 $f4, 0x64($v0) -/* 93FB38 80240588 AC430000 */ sw $v1, ($v0) -/* 93FB3C 8024058C 2402000B */ addiu $v0, $zero, 0xb -/* 93FB40 80240590 AE020070 */ sw $v0, 0x70($s0) -/* 93FB44 80240594 8FBF0014 */ lw $ra, 0x14($sp) -/* 93FB48 80240598 8FB00010 */ lw $s0, 0x10($sp) -/* 93FB4C 8024059C 03E00008 */ jr $ra -/* 93FB50 802405A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s index 812aadbca5..4221306272 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s @@ -119,7 +119,7 @@ glabel func_80240B64_940114 /* 9402C8 80240D18 00000000 */ nop /* 9402CC 80240D1C 0280202D */ daddu $a0, $s4, $zero /* 9402D0 80240D20 0260282D */ daddu $a1, $s3, $zero -/* 9402D4 80240D24 0C090151 */ jal func_80240544_93FAF4 +/* 9402D4 80240D24 0C090151 */ jal NpcJumpFunc3 /* 9402D8 80240D28 02A0302D */ daddu $a2, $s5, $zero /* 9402DC 80240D2C 0280202D */ daddu $a0, $s4, $zero /* 9402E0 80240D30 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240D98_99D728.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240D98_99D728.s deleted file mode 100644 index 1c264c2457..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240D98_99D728.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D98_99D728 -/* 99D728 80240D98 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99D72C 80240D9C AFB00010 */ sw $s0, 0x10($sp) -/* 99D730 80240DA0 0080802D */ daddu $s0, $a0, $zero -/* 99D734 80240DA4 AFBF0014 */ sw $ra, 0x14($sp) -/* 99D738 80240DA8 8E020148 */ lw $v0, 0x148($s0) -/* 99D73C 80240DAC 0C00EABB */ jal get_npc_unsafe -/* 99D740 80240DB0 84440008 */ lh $a0, 8($v0) -/* 99D744 80240DB4 3C014120 */ lui $at, 0x4120 -/* 99D748 80240DB8 44810000 */ mtc1 $at, $f0 -/* 99D74C 80240DBC 3C014000 */ lui $at, 0x4000 -/* 99D750 80240DC0 44811000 */ mtc1 $at, $f2 -/* 99D754 80240DC4 8C430000 */ lw $v1, ($v0) -/* 99D758 80240DC8 C444003C */ lwc1 $f4, 0x3c($v0) -/* 99D75C 80240DCC 34630800 */ ori $v1, $v1, 0x800 -/* 99D760 80240DD0 E440001C */ swc1 $f0, 0x1c($v0) -/* 99D764 80240DD4 E4420014 */ swc1 $f2, 0x14($v0) -/* 99D768 80240DD8 E4440064 */ swc1 $f4, 0x64($v0) -/* 99D76C 80240DDC AC430000 */ sw $v1, ($v0) -/* 99D770 80240DE0 2402000B */ addiu $v0, $zero, 0xb -/* 99D774 80240DE4 AE020070 */ sw $v0, 0x70($s0) -/* 99D778 80240DE8 8FBF0014 */ lw $ra, 0x14($sp) -/* 99D77C 80240DEC 8FB00010 */ lw $s0, 0x10($sp) -/* 99D780 80240DF0 03E00008 */ jr $ra -/* 99D784 80240DF4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s index c49fbf1ef7..b74b0df06a 100644 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s @@ -119,7 +119,7 @@ glabel func_802413B8_99DD48 /* 99DEFC 8024156C 00000000 */ nop /* 99DF00 80241570 0280202D */ daddu $a0, $s4, $zero /* 99DF04 80241574 0260282D */ daddu $a1, $s3, $zero -/* 99DF08 80241578 0C090366 */ jal func_80240D98_99D728 +/* 99DF08 80241578 0C090366 */ jal NpcJumpFunc3 /* 99DF0C 8024157C 02A0302D */ daddu $a2, $s5, $zero /* 99DF10 80241580 0280202D */ daddu $a0, $s4, $zero /* 99DF14 80241584 0260282D */ daddu $a1, $s3, $zero diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 44d6821e34..611a56e154 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -70,7 +70,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241424_8B1494); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802414D8_8B1548); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802415F8_8B1668); +# include "world/common/NpcJumpFunc3.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_kmr/kmr_07/8D3DC0.c b/src/world/area_kmr/kmr_07/8D3DC0.c index 005e5fc2e3..64cd4a3d5e 100644 --- a/src/world/area_kmr/kmr_07/8D3DC0.c +++ b/src/world/area_kmr/kmr_07/8D3DC0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_80240000_8D3DC0); INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802400B4_8D3E74); -INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802401D4_8D3F94); +# include "world/common/NpcJumpFunc3.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_kmr/kmr_11/8DA3A0.c b/src/world/area_kmr/kmr_11/8DA3A0.c index e03855a229..6a9db35f7b 100644 --- a/src/world/area_kmr/kmr_11/8DA3A0.c +++ b/src/world/area_kmr/kmr_11/8DA3A0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240370_8DA470); INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240424_8DA524); -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240544_8DA644); +# include "world/common/NpcJumpFunc3.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 0d0f3c4c86..ae1fd3127c 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240000_9C53E0); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802400B4_9C5494); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802401D4_9C55B4); +# include "world/common/NpcJumpFunc3.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c index ea3fe14822..9006163461 100644 --- a/src/world/area_omo/omo_02/D9D510.c +++ b/src/world/area_omo/omo_02/D9D510.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240EDC_D9E3AC); INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240F90_D9E460); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_802410B0_D9E580); +# include "world/common/NpcJumpFunc3.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index ab5e096785..50f47e2c46 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240370_93F920); INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240424_93F9D4); -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240544_93FAF4); +# include "world/common/NpcJumpFunc3.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/area_trd/trd_01/99CD80.c b/src/world/area_trd/trd_01/99CD80.c index 25b0377cf4..b846e0cff7 100644 --- a/src/world/area_trd/trd_01/99CD80.c +++ b/src/world/area_trd/trd_01/99CD80.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240BC4_99D554); INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240C78_99D608); -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240D98_99D728); +# include "world/common/NpcJumpFunc3.inc.c" # include "world/common/NpcJumpFunc.inc.c" diff --git a/src/world/common/NpcJumpFunc3.inc.c b/src/world/common/NpcJumpFunc3.inc.c new file mode 100644 index 0000000000..a5101b1905 --- /dev/null +++ b/src/world/common/NpcJumpFunc3.inc.c @@ -0,0 +1,12 @@ +#include "common.h" +#include "map.h" + +static void NpcJumpFunc3(ScriptInstance* script) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + npc->jumpVelocity = 10.0f; + npc->jumpScale = 2.0f; + npc->moveToPos.y = npc->pos.y; + npc->flags |= 0x800; + script->functionTemp[0].s = 11; +} From dcd2acf4fe4760b85e43f5d0f7b365c7b76edf95 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 22 Nov 2020 15:47:15 -0500 Subject: [PATCH 32/38] UnkNpcAIFunc11 --- .../kmr_02/8B0070/func_80241800_8B1870.s | 78 ------------------- .../kmr_02/8B0070/func_80241C18_8B1C88.s | 2 +- .../kmr_07/8D3DC0/func_802403DC_8D419C.s | 78 ------------------- .../kmr_07/8D3DC0/func_802407F4_8D45B4.s | 2 +- .../kmr_11/8DA3A0/func_8024074C_8DA84C.s | 78 ------------------- .../kmr_11/8DA3A0/func_80240B64_8DAC64.s | 2 +- .../nok_01/9C53E0/func_802403DC_9C57BC.s | 78 ------------------- .../nok_01/9C53E0/func_802407F4_9C5BD4.s | 2 +- .../omo_02/D9D510/func_802412B8_D9E788.s | 78 ------------------- .../omo_02/D9D510/func_802416D0_D9EBA0.s | 2 +- .../sbk_30/93F5B0/func_8024074C_93FCFC.s | 78 ------------------- .../sbk_30/93F5B0/func_80240B64_940114.s | 2 +- .../trd_01/99CD80/func_80240FA0_99D930.s | 78 ------------------- .../trd_01/99CD80/func_802413B8_99DD48.s | 2 +- include/functions.h | 1 + include/map.h | 2 + src/code_13870_len_6980.c | 2 +- src/code_20ec0_len_5040.c | 2 +- src/world/area_kmr/kmr_02/8B0070.c | 2 +- src/world/area_kmr/kmr_07/8D3DC0.c | 16 +++- src/world/area_kmr/kmr_11/8DA3A0.c | 2 +- src/world/area_nok/nok_01/9C53E0.c | 2 +- src/world/area_omo/omo_02/D9D510.c | 2 +- src/world/area_sbk/sbk_30/93F5B0.c | 2 +- src/world/area_trd/trd_01/99CD80.c | 2 +- src/world/common/UnkNpcAIFunc11.inc.c | 23 ++++++ 26 files changed, 56 insertions(+), 562 deletions(-) delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241800_8B1870.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802403DC_8D419C.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024074C_8DA84C.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802403DC_9C57BC.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802412B8_D9E788.s delete mode 100644 asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_8024074C_93FCFC.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240FA0_99D930.s create mode 100644 src/world/common/UnkNpcAIFunc11.inc.c diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241800_8B1870.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241800_8B1870.s deleted file mode 100644 index c5ffcb1770..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241800_8B1870.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241800_8B1870 -/* 8B1870 80241800 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8B1874 80241804 AFB3003C */ sw $s3, 0x3c($sp) -/* 8B1878 80241808 0080982D */ daddu $s3, $a0, $zero -/* 8B187C 8024180C AFBF0040 */ sw $ra, 0x40($sp) -/* 8B1880 80241810 AFB20038 */ sw $s2, 0x38($sp) -/* 8B1884 80241814 AFB10034 */ sw $s1, 0x34($sp) -/* 8B1888 80241818 AFB00030 */ sw $s0, 0x30($sp) -/* 8B188C 8024181C 8E720148 */ lw $s2, 0x148($s3) -/* 8B1890 80241820 00A0882D */ daddu $s1, $a1, $zero -/* 8B1894 80241824 86440008 */ lh $a0, 8($s2) -/* 8B1898 80241828 0C00EABB */ jal get_npc_unsafe -/* 8B189C 8024182C 00C0802D */ daddu $s0, $a2, $zero -/* 8B18A0 80241830 0200202D */ daddu $a0, $s0, $zero -/* 8B18A4 80241834 0240282D */ daddu $a1, $s2, $zero -/* 8B18A8 80241838 24030001 */ addiu $v1, $zero, 1 -/* 8B18AC 8024183C AFA30010 */ sw $v1, 0x10($sp) -/* 8B18B0 80241840 8E260018 */ lw $a2, 0x18($s1) -/* 8B18B4 80241844 8E27001C */ lw $a3, 0x1c($s1) -/* 8B18B8 80241848 0C01242D */ jal func_800490B4 -/* 8B18BC 8024184C 0040802D */ daddu $s0, $v0, $zero -/* 8B18C0 80241850 1440001D */ bnez $v0, .L802418C8 -/* 8B18C4 80241854 24040002 */ addiu $a0, $zero, 2 -/* 8B18C8 80241858 0200282D */ daddu $a1, $s0, $zero -/* 8B18CC 8024185C 0000302D */ daddu $a2, $zero, $zero -/* 8B18D0 80241860 860300A8 */ lh $v1, 0xa8($s0) -/* 8B18D4 80241864 3C013F80 */ lui $at, 0x3f80 -/* 8B18D8 80241868 44810000 */ mtc1 $at, $f0 -/* 8B18DC 8024186C 3C014000 */ lui $at, 0x4000 -/* 8B18E0 80241870 44811000 */ mtc1 $at, $f2 -/* 8B18E4 80241874 3C01C1A0 */ lui $at, 0xc1a0 -/* 8B18E8 80241878 44812000 */ mtc1 $at, $f4 -/* 8B18EC 8024187C 2402000F */ addiu $v0, $zero, 0xf -/* 8B18F0 80241880 AFA2001C */ sw $v0, 0x1c($sp) -/* 8B18F4 80241884 44833000 */ mtc1 $v1, $f6 -/* 8B18F8 80241888 00000000 */ nop -/* 8B18FC 8024188C 468031A0 */ cvt.s.w $f6, $f6 -/* 8B1900 80241890 44073000 */ mfc1 $a3, $f6 -/* 8B1904 80241894 27A20028 */ addiu $v0, $sp, 0x28 -/* 8B1908 80241898 AFA20020 */ sw $v0, 0x20($sp) -/* 8B190C 8024189C E7A00010 */ swc1 $f0, 0x10($sp) -/* 8B1910 802418A0 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8B1914 802418A4 0C01BFA4 */ jal fx_emote -/* 8B1918 802418A8 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8B191C 802418AC 8E4200CC */ lw $v0, 0xcc($s2) -/* 8B1920 802418B0 8C430000 */ lw $v1, ($v0) -/* 8B1924 802418B4 24020019 */ addiu $v0, $zero, 0x19 -/* 8B1928 802418B8 A602008E */ sh $v0, 0x8e($s0) -/* 8B192C 802418BC 2402000E */ addiu $v0, $zero, 0xe -/* 8B1930 802418C0 0809063F */ j .L802418FC -/* 8B1934 802418C4 AE030028 */ sw $v1, 0x28($s0) -.L802418C8: -/* 8B1938 802418C8 8E050018 */ lw $a1, 0x18($s0) -/* 8B193C 802418CC 8E06000C */ lw $a2, 0xc($s0) -/* 8B1940 802418D0 0C00EA95 */ jal npc_move_heading -/* 8B1944 802418D4 0200202D */ daddu $a0, $s0, $zero -/* 8B1948 802418D8 0200202D */ daddu $a0, $s0, $zero -/* 8B194C 802418DC 0C00F598 */ jal func_8003D660 -/* 8B1950 802418E0 24050001 */ addiu $a1, $zero, 1 -/* 8B1954 802418E4 9602008E */ lhu $v0, 0x8e($s0) -/* 8B1958 802418E8 2442FFFF */ addiu $v0, $v0, -1 -/* 8B195C 802418EC A602008E */ sh $v0, 0x8e($s0) -/* 8B1960 802418F0 00021400 */ sll $v0, $v0, 0x10 -/* 8B1964 802418F4 14400002 */ bnez $v0, .L80241900 -/* 8B1968 802418F8 2402000C */ addiu $v0, $zero, 0xc -.L802418FC: -/* 8B196C 802418FC AE620070 */ sw $v0, 0x70($s3) -.L80241900: -/* 8B1970 80241900 8FBF0040 */ lw $ra, 0x40($sp) -/* 8B1974 80241904 8FB3003C */ lw $s3, 0x3c($sp) -/* 8B1978 80241908 8FB20038 */ lw $s2, 0x38($sp) -/* 8B197C 8024190C 8FB10034 */ lw $s1, 0x34($sp) -/* 8B1980 80241910 8FB00030 */ lw $s0, 0x30($sp) -/* 8B1984 80241914 03E00008 */ jr $ra -/* 8B1988 80241918 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s index 5acce523b1..509cc0f2c6 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s @@ -133,7 +133,7 @@ glabel func_80241C18_8B1C88 /* 8B1E74 80241E04 02A0302D */ daddu $a2, $s5, $zero /* 8B1E78 80241E08 0280202D */ daddu $a0, $s4, $zero /* 8B1E7C 80241E0C 0260282D */ daddu $a1, $s3, $zero -/* 8B1E80 80241E10 0C090600 */ jal func_80241800_8B1870 +/* 8B1E80 80241E10 0C090600 */ jal UnkNpcAIFunc11 /* 8B1E84 80241E14 02A0302D */ daddu $a2, $s5, $zero /* 8B1E88 80241E18 0809079A */ j .L80241E68 /* 8B1E8C 80241E1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802403DC_8D419C.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802403DC_8D419C.s deleted file mode 100644 index 0f8c8f4647..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802403DC_8D419C.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403DC_8D419C -/* 8D419C 802403DC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8D41A0 802403E0 AFB3003C */ sw $s3, 0x3c($sp) -/* 8D41A4 802403E4 0080982D */ daddu $s3, $a0, $zero -/* 8D41A8 802403E8 AFBF0040 */ sw $ra, 0x40($sp) -/* 8D41AC 802403EC AFB20038 */ sw $s2, 0x38($sp) -/* 8D41B0 802403F0 AFB10034 */ sw $s1, 0x34($sp) -/* 8D41B4 802403F4 AFB00030 */ sw $s0, 0x30($sp) -/* 8D41B8 802403F8 8E720148 */ lw $s2, 0x148($s3) -/* 8D41BC 802403FC 00A0882D */ daddu $s1, $a1, $zero -/* 8D41C0 80240400 86440008 */ lh $a0, 8($s2) -/* 8D41C4 80240404 0C00EABB */ jal get_npc_unsafe -/* 8D41C8 80240408 00C0802D */ daddu $s0, $a2, $zero -/* 8D41CC 8024040C 0200202D */ daddu $a0, $s0, $zero -/* 8D41D0 80240410 0240282D */ daddu $a1, $s2, $zero -/* 8D41D4 80240414 24030001 */ addiu $v1, $zero, 1 -/* 8D41D8 80240418 AFA30010 */ sw $v1, 0x10($sp) -/* 8D41DC 8024041C 8E260018 */ lw $a2, 0x18($s1) -/* 8D41E0 80240420 8E27001C */ lw $a3, 0x1c($s1) -/* 8D41E4 80240424 0C01242D */ jal func_800490B4 -/* 8D41E8 80240428 0040802D */ daddu $s0, $v0, $zero -/* 8D41EC 8024042C 1440001D */ bnez $v0, .L802404A4 -/* 8D41F0 80240430 24040002 */ addiu $a0, $zero, 2 -/* 8D41F4 80240434 0200282D */ daddu $a1, $s0, $zero -/* 8D41F8 80240438 0000302D */ daddu $a2, $zero, $zero -/* 8D41FC 8024043C 860300A8 */ lh $v1, 0xa8($s0) -/* 8D4200 80240440 3C013F80 */ lui $at, 0x3f80 -/* 8D4204 80240444 44810000 */ mtc1 $at, $f0 -/* 8D4208 80240448 3C014000 */ lui $at, 0x4000 -/* 8D420C 8024044C 44811000 */ mtc1 $at, $f2 -/* 8D4210 80240450 3C01C1A0 */ lui $at, 0xc1a0 -/* 8D4214 80240454 44812000 */ mtc1 $at, $f4 -/* 8D4218 80240458 2402000F */ addiu $v0, $zero, 0xf -/* 8D421C 8024045C AFA2001C */ sw $v0, 0x1c($sp) -/* 8D4220 80240460 44833000 */ mtc1 $v1, $f6 -/* 8D4224 80240464 00000000 */ nop -/* 8D4228 80240468 468031A0 */ cvt.s.w $f6, $f6 -/* 8D422C 8024046C 44073000 */ mfc1 $a3, $f6 -/* 8D4230 80240470 27A20028 */ addiu $v0, $sp, 0x28 -/* 8D4234 80240474 AFA20020 */ sw $v0, 0x20($sp) -/* 8D4238 80240478 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D423C 8024047C E7A20014 */ swc1 $f2, 0x14($sp) -/* 8D4240 80240480 0C01BFA4 */ jal fx_emote -/* 8D4244 80240484 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8D4248 80240488 8E4200CC */ lw $v0, 0xcc($s2) -/* 8D424C 8024048C 8C430000 */ lw $v1, ($v0) -/* 8D4250 80240490 24020019 */ addiu $v0, $zero, 0x19 -/* 8D4254 80240494 A602008E */ sh $v0, 0x8e($s0) -/* 8D4258 80240498 2402000E */ addiu $v0, $zero, 0xe -/* 8D425C 8024049C 08090136 */ j .L802404D8 -/* 8D4260 802404A0 AE030028 */ sw $v1, 0x28($s0) -.L802404A4: -/* 8D4264 802404A4 8E050018 */ lw $a1, 0x18($s0) -/* 8D4268 802404A8 8E06000C */ lw $a2, 0xc($s0) -/* 8D426C 802404AC 0C00EA95 */ jal npc_move_heading -/* 8D4270 802404B0 0200202D */ daddu $a0, $s0, $zero -/* 8D4274 802404B4 0200202D */ daddu $a0, $s0, $zero -/* 8D4278 802404B8 0C00F598 */ jal func_8003D660 -/* 8D427C 802404BC 24050001 */ addiu $a1, $zero, 1 -/* 8D4280 802404C0 9602008E */ lhu $v0, 0x8e($s0) -/* 8D4284 802404C4 2442FFFF */ addiu $v0, $v0, -1 -/* 8D4288 802404C8 A602008E */ sh $v0, 0x8e($s0) -/* 8D428C 802404CC 00021400 */ sll $v0, $v0, 0x10 -/* 8D4290 802404D0 14400002 */ bnez $v0, .L802404DC -/* 8D4294 802404D4 2402000C */ addiu $v0, $zero, 0xc -.L802404D8: -/* 8D4298 802404D8 AE620070 */ sw $v0, 0x70($s3) -.L802404DC: -/* 8D429C 802404DC 8FBF0040 */ lw $ra, 0x40($sp) -/* 8D42A0 802404E0 8FB3003C */ lw $s3, 0x3c($sp) -/* 8D42A4 802404E4 8FB20038 */ lw $s2, 0x38($sp) -/* 8D42A8 802404E8 8FB10034 */ lw $s1, 0x34($sp) -/* 8D42AC 802404EC 8FB00030 */ lw $s0, 0x30($sp) -/* 8D42B0 802404F0 03E00008 */ jr $ra -/* 8D42B4 802404F4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s index 619090bf4d..29753b9ec3 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s @@ -133,7 +133,7 @@ glabel func_802407F4_8D45B4 /* 8D47A0 802409E0 02A0302D */ daddu $a2, $s5, $zero /* 8D47A4 802409E4 0280202D */ daddu $a0, $s4, $zero /* 8D47A8 802409E8 0260282D */ daddu $a1, $s3, $zero -/* 8D47AC 802409EC 0C0900F7 */ jal func_802403DC_8D419C +/* 8D47AC 802409EC 0C0900F7 */ jal UnkNpcAIFunc11 /* 8D47B0 802409F0 02A0302D */ daddu $a2, $s5, $zero /* 8D47B4 802409F4 08090291 */ j .L80240A44 /* 8D47B8 802409F8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024074C_8DA84C.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024074C_8DA84C.s deleted file mode 100644 index 6d12212740..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024074C_8DA84C.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024074C_8DA84C -/* 8DA84C 8024074C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8DA850 80240750 AFB3003C */ sw $s3, 0x3c($sp) -/* 8DA854 80240754 0080982D */ daddu $s3, $a0, $zero -/* 8DA858 80240758 AFBF0040 */ sw $ra, 0x40($sp) -/* 8DA85C 8024075C AFB20038 */ sw $s2, 0x38($sp) -/* 8DA860 80240760 AFB10034 */ sw $s1, 0x34($sp) -/* 8DA864 80240764 AFB00030 */ sw $s0, 0x30($sp) -/* 8DA868 80240768 8E720148 */ lw $s2, 0x148($s3) -/* 8DA86C 8024076C 00A0882D */ daddu $s1, $a1, $zero -/* 8DA870 80240770 86440008 */ lh $a0, 8($s2) -/* 8DA874 80240774 0C00EABB */ jal get_npc_unsafe -/* 8DA878 80240778 00C0802D */ daddu $s0, $a2, $zero -/* 8DA87C 8024077C 0200202D */ daddu $a0, $s0, $zero -/* 8DA880 80240780 0240282D */ daddu $a1, $s2, $zero -/* 8DA884 80240784 24030001 */ addiu $v1, $zero, 1 -/* 8DA888 80240788 AFA30010 */ sw $v1, 0x10($sp) -/* 8DA88C 8024078C 8E260018 */ lw $a2, 0x18($s1) -/* 8DA890 80240790 8E27001C */ lw $a3, 0x1c($s1) -/* 8DA894 80240794 0C01242D */ jal func_800490B4 -/* 8DA898 80240798 0040802D */ daddu $s0, $v0, $zero -/* 8DA89C 8024079C 1440001D */ bnez $v0, .L80240814 -/* 8DA8A0 802407A0 24040002 */ addiu $a0, $zero, 2 -/* 8DA8A4 802407A4 0200282D */ daddu $a1, $s0, $zero -/* 8DA8A8 802407A8 0000302D */ daddu $a2, $zero, $zero -/* 8DA8AC 802407AC 860300A8 */ lh $v1, 0xa8($s0) -/* 8DA8B0 802407B0 3C013F80 */ lui $at, 0x3f80 -/* 8DA8B4 802407B4 44810000 */ mtc1 $at, $f0 -/* 8DA8B8 802407B8 3C014000 */ lui $at, 0x4000 -/* 8DA8BC 802407BC 44811000 */ mtc1 $at, $f2 -/* 8DA8C0 802407C0 3C01C1A0 */ lui $at, 0xc1a0 -/* 8DA8C4 802407C4 44812000 */ mtc1 $at, $f4 -/* 8DA8C8 802407C8 2402000F */ addiu $v0, $zero, 0xf -/* 8DA8CC 802407CC AFA2001C */ sw $v0, 0x1c($sp) -/* 8DA8D0 802407D0 44833000 */ mtc1 $v1, $f6 -/* 8DA8D4 802407D4 00000000 */ nop -/* 8DA8D8 802407D8 468031A0 */ cvt.s.w $f6, $f6 -/* 8DA8DC 802407DC 44073000 */ mfc1 $a3, $f6 -/* 8DA8E0 802407E0 27A20028 */ addiu $v0, $sp, 0x28 -/* 8DA8E4 802407E4 AFA20020 */ sw $v0, 0x20($sp) -/* 8DA8E8 802407E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8DA8EC 802407EC E7A20014 */ swc1 $f2, 0x14($sp) -/* 8DA8F0 802407F0 0C01BFA4 */ jal fx_emote -/* 8DA8F4 802407F4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8DA8F8 802407F8 8E4200CC */ lw $v0, 0xcc($s2) -/* 8DA8FC 802407FC 8C430000 */ lw $v1, ($v0) -/* 8DA900 80240800 24020019 */ addiu $v0, $zero, 0x19 -/* 8DA904 80240804 A602008E */ sh $v0, 0x8e($s0) -/* 8DA908 80240808 2402000E */ addiu $v0, $zero, 0xe -/* 8DA90C 8024080C 08090212 */ j .L80240848 -/* 8DA910 80240810 AE030028 */ sw $v1, 0x28($s0) -.L80240814: -/* 8DA914 80240814 8E050018 */ lw $a1, 0x18($s0) -/* 8DA918 80240818 8E06000C */ lw $a2, 0xc($s0) -/* 8DA91C 8024081C 0C00EA95 */ jal npc_move_heading -/* 8DA920 80240820 0200202D */ daddu $a0, $s0, $zero -/* 8DA924 80240824 0200202D */ daddu $a0, $s0, $zero -/* 8DA928 80240828 0C00F598 */ jal func_8003D660 -/* 8DA92C 8024082C 24050001 */ addiu $a1, $zero, 1 -/* 8DA930 80240830 9602008E */ lhu $v0, 0x8e($s0) -/* 8DA934 80240834 2442FFFF */ addiu $v0, $v0, -1 -/* 8DA938 80240838 A602008E */ sh $v0, 0x8e($s0) -/* 8DA93C 8024083C 00021400 */ sll $v0, $v0, 0x10 -/* 8DA940 80240840 14400002 */ bnez $v0, .L8024084C -/* 8DA944 80240844 2402000C */ addiu $v0, $zero, 0xc -.L80240848: -/* 8DA948 80240848 AE620070 */ sw $v0, 0x70($s3) -.L8024084C: -/* 8DA94C 8024084C 8FBF0040 */ lw $ra, 0x40($sp) -/* 8DA950 80240850 8FB3003C */ lw $s3, 0x3c($sp) -/* 8DA954 80240854 8FB20038 */ lw $s2, 0x38($sp) -/* 8DA958 80240858 8FB10034 */ lw $s1, 0x34($sp) -/* 8DA95C 8024085C 8FB00030 */ lw $s0, 0x30($sp) -/* 8DA960 80240860 03E00008 */ jr $ra -/* 8DA964 80240864 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s index 809e4ad3ac..d2ded110ad 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s @@ -133,7 +133,7 @@ glabel func_80240B64_8DAC64 /* 8DAE50 80240D50 02A0302D */ daddu $a2, $s5, $zero /* 8DAE54 80240D54 0280202D */ daddu $a0, $s4, $zero /* 8DAE58 80240D58 0260282D */ daddu $a1, $s3, $zero -/* 8DAE5C 80240D5C 0C0901D3 */ jal func_8024074C_8DA84C +/* 8DAE5C 80240D5C 0C0901D3 */ jal UnkNpcAIFunc11 /* 8DAE60 80240D60 02A0302D */ daddu $a2, $s5, $zero /* 8DAE64 80240D64 0809036D */ j .L80240DB4 /* 8DAE68 80240D68 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802403DC_9C57BC.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802403DC_9C57BC.s deleted file mode 100644 index 7eb6cc8a1b..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802403DC_9C57BC.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403DC_9C57BC -/* 9C57BC 802403DC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9C57C0 802403E0 AFB3003C */ sw $s3, 0x3c($sp) -/* 9C57C4 802403E4 0080982D */ daddu $s3, $a0, $zero -/* 9C57C8 802403E8 AFBF0040 */ sw $ra, 0x40($sp) -/* 9C57CC 802403EC AFB20038 */ sw $s2, 0x38($sp) -/* 9C57D0 802403F0 AFB10034 */ sw $s1, 0x34($sp) -/* 9C57D4 802403F4 AFB00030 */ sw $s0, 0x30($sp) -/* 9C57D8 802403F8 8E720148 */ lw $s2, 0x148($s3) -/* 9C57DC 802403FC 00A0882D */ daddu $s1, $a1, $zero -/* 9C57E0 80240400 86440008 */ lh $a0, 8($s2) -/* 9C57E4 80240404 0C00EABB */ jal get_npc_unsafe -/* 9C57E8 80240408 00C0802D */ daddu $s0, $a2, $zero -/* 9C57EC 8024040C 0200202D */ daddu $a0, $s0, $zero -/* 9C57F0 80240410 0240282D */ daddu $a1, $s2, $zero -/* 9C57F4 80240414 24030001 */ addiu $v1, $zero, 1 -/* 9C57F8 80240418 AFA30010 */ sw $v1, 0x10($sp) -/* 9C57FC 8024041C 8E260018 */ lw $a2, 0x18($s1) -/* 9C5800 80240420 8E27001C */ lw $a3, 0x1c($s1) -/* 9C5804 80240424 0C01242D */ jal func_800490B4 -/* 9C5808 80240428 0040802D */ daddu $s0, $v0, $zero -/* 9C580C 8024042C 1440001D */ bnez $v0, .L802404A4 -/* 9C5810 80240430 24040002 */ addiu $a0, $zero, 2 -/* 9C5814 80240434 0200282D */ daddu $a1, $s0, $zero -/* 9C5818 80240438 0000302D */ daddu $a2, $zero, $zero -/* 9C581C 8024043C 860300A8 */ lh $v1, 0xa8($s0) -/* 9C5820 80240440 3C013F80 */ lui $at, 0x3f80 -/* 9C5824 80240444 44810000 */ mtc1 $at, $f0 -/* 9C5828 80240448 3C014000 */ lui $at, 0x4000 -/* 9C582C 8024044C 44811000 */ mtc1 $at, $f2 -/* 9C5830 80240450 3C01C1A0 */ lui $at, 0xc1a0 -/* 9C5834 80240454 44812000 */ mtc1 $at, $f4 -/* 9C5838 80240458 2402000F */ addiu $v0, $zero, 0xf -/* 9C583C 8024045C AFA2001C */ sw $v0, 0x1c($sp) -/* 9C5840 80240460 44833000 */ mtc1 $v1, $f6 -/* 9C5844 80240464 00000000 */ nop -/* 9C5848 80240468 468031A0 */ cvt.s.w $f6, $f6 -/* 9C584C 8024046C 44073000 */ mfc1 $a3, $f6 -/* 9C5850 80240470 27A20028 */ addiu $v0, $sp, 0x28 -/* 9C5854 80240474 AFA20020 */ sw $v0, 0x20($sp) -/* 9C5858 80240478 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9C585C 8024047C E7A20014 */ swc1 $f2, 0x14($sp) -/* 9C5860 80240480 0C01BFA4 */ jal fx_emote -/* 9C5864 80240484 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9C5868 80240488 8E4200CC */ lw $v0, 0xcc($s2) -/* 9C586C 8024048C 8C430000 */ lw $v1, ($v0) -/* 9C5870 80240490 24020019 */ addiu $v0, $zero, 0x19 -/* 9C5874 80240494 A602008E */ sh $v0, 0x8e($s0) -/* 9C5878 80240498 2402000E */ addiu $v0, $zero, 0xe -/* 9C587C 8024049C 08090136 */ j .L802404D8 -/* 9C5880 802404A0 AE030028 */ sw $v1, 0x28($s0) -.L802404A4: -/* 9C5884 802404A4 8E050018 */ lw $a1, 0x18($s0) -/* 9C5888 802404A8 8E06000C */ lw $a2, 0xc($s0) -/* 9C588C 802404AC 0C00EA95 */ jal npc_move_heading -/* 9C5890 802404B0 0200202D */ daddu $a0, $s0, $zero -/* 9C5894 802404B4 0200202D */ daddu $a0, $s0, $zero -/* 9C5898 802404B8 0C00F598 */ jal func_8003D660 -/* 9C589C 802404BC 24050001 */ addiu $a1, $zero, 1 -/* 9C58A0 802404C0 9602008E */ lhu $v0, 0x8e($s0) -/* 9C58A4 802404C4 2442FFFF */ addiu $v0, $v0, -1 -/* 9C58A8 802404C8 A602008E */ sh $v0, 0x8e($s0) -/* 9C58AC 802404CC 00021400 */ sll $v0, $v0, 0x10 -/* 9C58B0 802404D0 14400002 */ bnez $v0, .L802404DC -/* 9C58B4 802404D4 2402000C */ addiu $v0, $zero, 0xc -.L802404D8: -/* 9C58B8 802404D8 AE620070 */ sw $v0, 0x70($s3) -.L802404DC: -/* 9C58BC 802404DC 8FBF0040 */ lw $ra, 0x40($sp) -/* 9C58C0 802404E0 8FB3003C */ lw $s3, 0x3c($sp) -/* 9C58C4 802404E4 8FB20038 */ lw $s2, 0x38($sp) -/* 9C58C8 802404E8 8FB10034 */ lw $s1, 0x34($sp) -/* 9C58CC 802404EC 8FB00030 */ lw $s0, 0x30($sp) -/* 9C58D0 802404F0 03E00008 */ jr $ra -/* 9C58D4 802404F4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s index 9d6483f508..e055e94d78 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s @@ -133,7 +133,7 @@ glabel func_802407F4_9C5BD4 /* 9C5DC0 802409E0 02A0302D */ daddu $a2, $s5, $zero /* 9C5DC4 802409E4 0280202D */ daddu $a0, $s4, $zero /* 9C5DC8 802409E8 0260282D */ daddu $a1, $s3, $zero -/* 9C5DCC 802409EC 0C0900F7 */ jal func_802403DC_9C57BC +/* 9C5DCC 802409EC 0C0900F7 */ jal UnkNpcAIFunc11 /* 9C5DD0 802409F0 02A0302D */ daddu $a2, $s5, $zero /* 9C5DD4 802409F4 08090291 */ j .L80240A44 /* 9C5DD8 802409F8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802412B8_D9E788.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802412B8_D9E788.s deleted file mode 100644 index 423691a376..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802412B8_D9E788.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412B8_D9E788 -/* D9E788 802412B8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D9E78C 802412BC AFB3003C */ sw $s3, 0x3c($sp) -/* D9E790 802412C0 0080982D */ daddu $s3, $a0, $zero -/* D9E794 802412C4 AFBF0040 */ sw $ra, 0x40($sp) -/* D9E798 802412C8 AFB20038 */ sw $s2, 0x38($sp) -/* D9E79C 802412CC AFB10034 */ sw $s1, 0x34($sp) -/* D9E7A0 802412D0 AFB00030 */ sw $s0, 0x30($sp) -/* D9E7A4 802412D4 8E720148 */ lw $s2, 0x148($s3) -/* D9E7A8 802412D8 00A0882D */ daddu $s1, $a1, $zero -/* D9E7AC 802412DC 86440008 */ lh $a0, 8($s2) -/* D9E7B0 802412E0 0C00EABB */ jal get_npc_unsafe -/* D9E7B4 802412E4 00C0802D */ daddu $s0, $a2, $zero -/* D9E7B8 802412E8 0200202D */ daddu $a0, $s0, $zero -/* D9E7BC 802412EC 0240282D */ daddu $a1, $s2, $zero -/* D9E7C0 802412F0 24030001 */ addiu $v1, $zero, 1 -/* D9E7C4 802412F4 AFA30010 */ sw $v1, 0x10($sp) -/* D9E7C8 802412F8 8E260018 */ lw $a2, 0x18($s1) -/* D9E7CC 802412FC 8E27001C */ lw $a3, 0x1c($s1) -/* D9E7D0 80241300 0C01242D */ jal func_800490B4 -/* D9E7D4 80241304 0040802D */ daddu $s0, $v0, $zero -/* D9E7D8 80241308 1440001D */ bnez $v0, .L80241380 -/* D9E7DC 8024130C 24040002 */ addiu $a0, $zero, 2 -/* D9E7E0 80241310 0200282D */ daddu $a1, $s0, $zero -/* D9E7E4 80241314 0000302D */ daddu $a2, $zero, $zero -/* D9E7E8 80241318 860300A8 */ lh $v1, 0xa8($s0) -/* D9E7EC 8024131C 3C013F80 */ lui $at, 0x3f80 -/* D9E7F0 80241320 44810000 */ mtc1 $at, $f0 -/* D9E7F4 80241324 3C014000 */ lui $at, 0x4000 -/* D9E7F8 80241328 44811000 */ mtc1 $at, $f2 -/* D9E7FC 8024132C 3C01C1A0 */ lui $at, 0xc1a0 -/* D9E800 80241330 44812000 */ mtc1 $at, $f4 -/* D9E804 80241334 2402000F */ addiu $v0, $zero, 0xf -/* D9E808 80241338 AFA2001C */ sw $v0, 0x1c($sp) -/* D9E80C 8024133C 44833000 */ mtc1 $v1, $f6 -/* D9E810 80241340 00000000 */ nop -/* D9E814 80241344 468031A0 */ cvt.s.w $f6, $f6 -/* D9E818 80241348 44073000 */ mfc1 $a3, $f6 -/* D9E81C 8024134C 27A20028 */ addiu $v0, $sp, 0x28 -/* D9E820 80241350 AFA20020 */ sw $v0, 0x20($sp) -/* D9E824 80241354 E7A00010 */ swc1 $f0, 0x10($sp) -/* D9E828 80241358 E7A20014 */ swc1 $f2, 0x14($sp) -/* D9E82C 8024135C 0C01BFA4 */ jal fx_emote -/* D9E830 80241360 E7A40018 */ swc1 $f4, 0x18($sp) -/* D9E834 80241364 8E4200CC */ lw $v0, 0xcc($s2) -/* D9E838 80241368 8C430000 */ lw $v1, ($v0) -/* D9E83C 8024136C 24020019 */ addiu $v0, $zero, 0x19 -/* D9E840 80241370 A602008E */ sh $v0, 0x8e($s0) -/* D9E844 80241374 2402000E */ addiu $v0, $zero, 0xe -/* D9E848 80241378 080904ED */ j .L802413B4 -/* D9E84C 8024137C AE030028 */ sw $v1, 0x28($s0) -.L80241380: -/* D9E850 80241380 8E050018 */ lw $a1, 0x18($s0) -/* D9E854 80241384 8E06000C */ lw $a2, 0xc($s0) -/* D9E858 80241388 0C00EA95 */ jal npc_move_heading -/* D9E85C 8024138C 0200202D */ daddu $a0, $s0, $zero -/* D9E860 80241390 0200202D */ daddu $a0, $s0, $zero -/* D9E864 80241394 0C00F598 */ jal func_8003D660 -/* D9E868 80241398 24050001 */ addiu $a1, $zero, 1 -/* D9E86C 8024139C 9602008E */ lhu $v0, 0x8e($s0) -/* D9E870 802413A0 2442FFFF */ addiu $v0, $v0, -1 -/* D9E874 802413A4 A602008E */ sh $v0, 0x8e($s0) -/* D9E878 802413A8 00021400 */ sll $v0, $v0, 0x10 -/* D9E87C 802413AC 14400002 */ bnez $v0, .L802413B8 -/* D9E880 802413B0 2402000C */ addiu $v0, $zero, 0xc -.L802413B4: -/* D9E884 802413B4 AE620070 */ sw $v0, 0x70($s3) -.L802413B8: -/* D9E888 802413B8 8FBF0040 */ lw $ra, 0x40($sp) -/* D9E88C 802413BC 8FB3003C */ lw $s3, 0x3c($sp) -/* D9E890 802413C0 8FB20038 */ lw $s2, 0x38($sp) -/* D9E894 802413C4 8FB10034 */ lw $s1, 0x34($sp) -/* D9E898 802413C8 8FB00030 */ lw $s0, 0x30($sp) -/* D9E89C 802413CC 03E00008 */ jr $ra -/* D9E8A0 802413D0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s index 3901a71c4f..ddf0acce42 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s @@ -133,7 +133,7 @@ glabel func_802416D0_D9EBA0 /* D9ED8C 802418BC 02A0302D */ daddu $a2, $s5, $zero /* D9ED90 802418C0 0280202D */ daddu $a0, $s4, $zero /* D9ED94 802418C4 0260282D */ daddu $a1, $s3, $zero -/* D9ED98 802418C8 0C0904AE */ jal func_802412B8_D9E788 +/* D9ED98 802418C8 0C0904AE */ jal UnkNpcAIFunc11 /* D9ED9C 802418CC 02A0302D */ daddu $a2, $s5, $zero /* D9EDA0 802418D0 08090648 */ j .L80241920 /* D9EDA4 802418D4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_8024074C_93FCFC.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_8024074C_93FCFC.s deleted file mode 100644 index 492cee23f4..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_8024074C_93FCFC.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024074C_93FCFC -/* 93FCFC 8024074C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 93FD00 80240750 AFB3003C */ sw $s3, 0x3c($sp) -/* 93FD04 80240754 0080982D */ daddu $s3, $a0, $zero -/* 93FD08 80240758 AFBF0040 */ sw $ra, 0x40($sp) -/* 93FD0C 8024075C AFB20038 */ sw $s2, 0x38($sp) -/* 93FD10 80240760 AFB10034 */ sw $s1, 0x34($sp) -/* 93FD14 80240764 AFB00030 */ sw $s0, 0x30($sp) -/* 93FD18 80240768 8E720148 */ lw $s2, 0x148($s3) -/* 93FD1C 8024076C 00A0882D */ daddu $s1, $a1, $zero -/* 93FD20 80240770 86440008 */ lh $a0, 8($s2) -/* 93FD24 80240774 0C00EABB */ jal get_npc_unsafe -/* 93FD28 80240778 00C0802D */ daddu $s0, $a2, $zero -/* 93FD2C 8024077C 0200202D */ daddu $a0, $s0, $zero -/* 93FD30 80240780 0240282D */ daddu $a1, $s2, $zero -/* 93FD34 80240784 24030001 */ addiu $v1, $zero, 1 -/* 93FD38 80240788 AFA30010 */ sw $v1, 0x10($sp) -/* 93FD3C 8024078C 8E260018 */ lw $a2, 0x18($s1) -/* 93FD40 80240790 8E27001C */ lw $a3, 0x1c($s1) -/* 93FD44 80240794 0C01242D */ jal func_800490B4 -/* 93FD48 80240798 0040802D */ daddu $s0, $v0, $zero -/* 93FD4C 8024079C 1440001D */ bnez $v0, .L80240814 -/* 93FD50 802407A0 24040002 */ addiu $a0, $zero, 2 -/* 93FD54 802407A4 0200282D */ daddu $a1, $s0, $zero -/* 93FD58 802407A8 0000302D */ daddu $a2, $zero, $zero -/* 93FD5C 802407AC 860300A8 */ lh $v1, 0xa8($s0) -/* 93FD60 802407B0 3C013F80 */ lui $at, 0x3f80 -/* 93FD64 802407B4 44810000 */ mtc1 $at, $f0 -/* 93FD68 802407B8 3C014000 */ lui $at, 0x4000 -/* 93FD6C 802407BC 44811000 */ mtc1 $at, $f2 -/* 93FD70 802407C0 3C01C1A0 */ lui $at, 0xc1a0 -/* 93FD74 802407C4 44812000 */ mtc1 $at, $f4 -/* 93FD78 802407C8 2402000F */ addiu $v0, $zero, 0xf -/* 93FD7C 802407CC AFA2001C */ sw $v0, 0x1c($sp) -/* 93FD80 802407D0 44833000 */ mtc1 $v1, $f6 -/* 93FD84 802407D4 00000000 */ nop -/* 93FD88 802407D8 468031A0 */ cvt.s.w $f6, $f6 -/* 93FD8C 802407DC 44073000 */ mfc1 $a3, $f6 -/* 93FD90 802407E0 27A20028 */ addiu $v0, $sp, 0x28 -/* 93FD94 802407E4 AFA20020 */ sw $v0, 0x20($sp) -/* 93FD98 802407E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 93FD9C 802407EC E7A20014 */ swc1 $f2, 0x14($sp) -/* 93FDA0 802407F0 0C01BFA4 */ jal fx_emote -/* 93FDA4 802407F4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 93FDA8 802407F8 8E4200CC */ lw $v0, 0xcc($s2) -/* 93FDAC 802407FC 8C430000 */ lw $v1, ($v0) -/* 93FDB0 80240800 24020019 */ addiu $v0, $zero, 0x19 -/* 93FDB4 80240804 A602008E */ sh $v0, 0x8e($s0) -/* 93FDB8 80240808 2402000E */ addiu $v0, $zero, 0xe -/* 93FDBC 8024080C 08090212 */ j .L80240848 -/* 93FDC0 80240810 AE030028 */ sw $v1, 0x28($s0) -.L80240814: -/* 93FDC4 80240814 8E050018 */ lw $a1, 0x18($s0) -/* 93FDC8 80240818 8E06000C */ lw $a2, 0xc($s0) -/* 93FDCC 8024081C 0C00EA95 */ jal npc_move_heading -/* 93FDD0 80240820 0200202D */ daddu $a0, $s0, $zero -/* 93FDD4 80240824 0200202D */ daddu $a0, $s0, $zero -/* 93FDD8 80240828 0C00F598 */ jal func_8003D660 -/* 93FDDC 8024082C 24050001 */ addiu $a1, $zero, 1 -/* 93FDE0 80240830 9602008E */ lhu $v0, 0x8e($s0) -/* 93FDE4 80240834 2442FFFF */ addiu $v0, $v0, -1 -/* 93FDE8 80240838 A602008E */ sh $v0, 0x8e($s0) -/* 93FDEC 8024083C 00021400 */ sll $v0, $v0, 0x10 -/* 93FDF0 80240840 14400002 */ bnez $v0, .L8024084C -/* 93FDF4 80240844 2402000C */ addiu $v0, $zero, 0xc -.L80240848: -/* 93FDF8 80240848 AE620070 */ sw $v0, 0x70($s3) -.L8024084C: -/* 93FDFC 8024084C 8FBF0040 */ lw $ra, 0x40($sp) -/* 93FE00 80240850 8FB3003C */ lw $s3, 0x3c($sp) -/* 93FE04 80240854 8FB20038 */ lw $s2, 0x38($sp) -/* 93FE08 80240858 8FB10034 */ lw $s1, 0x34($sp) -/* 93FE0C 8024085C 8FB00030 */ lw $s0, 0x30($sp) -/* 93FE10 80240860 03E00008 */ jr $ra -/* 93FE14 80240864 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s index 4221306272..368e8e3f24 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s @@ -133,7 +133,7 @@ glabel func_80240B64_940114 /* 940300 80240D50 02A0302D */ daddu $a2, $s5, $zero /* 940304 80240D54 0280202D */ daddu $a0, $s4, $zero /* 940308 80240D58 0260282D */ daddu $a1, $s3, $zero -/* 94030C 80240D5C 0C0901D3 */ jal func_8024074C_93FCFC +/* 94030C 80240D5C 0C0901D3 */ jal UnkNpcAIFunc11 /* 940310 80240D60 02A0302D */ daddu $a2, $s5, $zero /* 940314 80240D64 0809036D */ j .L80240DB4 /* 940318 80240D68 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240FA0_99D930.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240FA0_99D930.s deleted file mode 100644 index deadecb571..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240FA0_99D930.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FA0_99D930 -/* 99D930 80240FA0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 99D934 80240FA4 AFB3003C */ sw $s3, 0x3c($sp) -/* 99D938 80240FA8 0080982D */ daddu $s3, $a0, $zero -/* 99D93C 80240FAC AFBF0040 */ sw $ra, 0x40($sp) -/* 99D940 80240FB0 AFB20038 */ sw $s2, 0x38($sp) -/* 99D944 80240FB4 AFB10034 */ sw $s1, 0x34($sp) -/* 99D948 80240FB8 AFB00030 */ sw $s0, 0x30($sp) -/* 99D94C 80240FBC 8E720148 */ lw $s2, 0x148($s3) -/* 99D950 80240FC0 00A0882D */ daddu $s1, $a1, $zero -/* 99D954 80240FC4 86440008 */ lh $a0, 8($s2) -/* 99D958 80240FC8 0C00EABB */ jal get_npc_unsafe -/* 99D95C 80240FCC 00C0802D */ daddu $s0, $a2, $zero -/* 99D960 80240FD0 0200202D */ daddu $a0, $s0, $zero -/* 99D964 80240FD4 0240282D */ daddu $a1, $s2, $zero -/* 99D968 80240FD8 24030001 */ addiu $v1, $zero, 1 -/* 99D96C 80240FDC AFA30010 */ sw $v1, 0x10($sp) -/* 99D970 80240FE0 8E260018 */ lw $a2, 0x18($s1) -/* 99D974 80240FE4 8E27001C */ lw $a3, 0x1c($s1) -/* 99D978 80240FE8 0C01242D */ jal func_800490B4 -/* 99D97C 80240FEC 0040802D */ daddu $s0, $v0, $zero -/* 99D980 80240FF0 1440001D */ bnez $v0, .L80241068 -/* 99D984 80240FF4 24040002 */ addiu $a0, $zero, 2 -/* 99D988 80240FF8 0200282D */ daddu $a1, $s0, $zero -/* 99D98C 80240FFC 0000302D */ daddu $a2, $zero, $zero -/* 99D990 80241000 860300A8 */ lh $v1, 0xa8($s0) -/* 99D994 80241004 3C013F80 */ lui $at, 0x3f80 -/* 99D998 80241008 44810000 */ mtc1 $at, $f0 -/* 99D99C 8024100C 3C014000 */ lui $at, 0x4000 -/* 99D9A0 80241010 44811000 */ mtc1 $at, $f2 -/* 99D9A4 80241014 3C01C1A0 */ lui $at, 0xc1a0 -/* 99D9A8 80241018 44812000 */ mtc1 $at, $f4 -/* 99D9AC 8024101C 2402000F */ addiu $v0, $zero, 0xf -/* 99D9B0 80241020 AFA2001C */ sw $v0, 0x1c($sp) -/* 99D9B4 80241024 44833000 */ mtc1 $v1, $f6 -/* 99D9B8 80241028 00000000 */ nop -/* 99D9BC 8024102C 468031A0 */ cvt.s.w $f6, $f6 -/* 99D9C0 80241030 44073000 */ mfc1 $a3, $f6 -/* 99D9C4 80241034 27A20028 */ addiu $v0, $sp, 0x28 -/* 99D9C8 80241038 AFA20020 */ sw $v0, 0x20($sp) -/* 99D9CC 8024103C E7A00010 */ swc1 $f0, 0x10($sp) -/* 99D9D0 80241040 E7A20014 */ swc1 $f2, 0x14($sp) -/* 99D9D4 80241044 0C01BFA4 */ jal fx_emote -/* 99D9D8 80241048 E7A40018 */ swc1 $f4, 0x18($sp) -/* 99D9DC 8024104C 8E4200CC */ lw $v0, 0xcc($s2) -/* 99D9E0 80241050 8C430000 */ lw $v1, ($v0) -/* 99D9E4 80241054 24020019 */ addiu $v0, $zero, 0x19 -/* 99D9E8 80241058 A602008E */ sh $v0, 0x8e($s0) -/* 99D9EC 8024105C 2402000E */ addiu $v0, $zero, 0xe -/* 99D9F0 80241060 08090427 */ j .L8024109C -/* 99D9F4 80241064 AE030028 */ sw $v1, 0x28($s0) -.L80241068: -/* 99D9F8 80241068 8E050018 */ lw $a1, 0x18($s0) -/* 99D9FC 8024106C 8E06000C */ lw $a2, 0xc($s0) -/* 99DA00 80241070 0C00EA95 */ jal npc_move_heading -/* 99DA04 80241074 0200202D */ daddu $a0, $s0, $zero -/* 99DA08 80241078 0200202D */ daddu $a0, $s0, $zero -/* 99DA0C 8024107C 0C00F598 */ jal func_8003D660 -/* 99DA10 80241080 24050001 */ addiu $a1, $zero, 1 -/* 99DA14 80241084 9602008E */ lhu $v0, 0x8e($s0) -/* 99DA18 80241088 2442FFFF */ addiu $v0, $v0, -1 -/* 99DA1C 8024108C A602008E */ sh $v0, 0x8e($s0) -/* 99DA20 80241090 00021400 */ sll $v0, $v0, 0x10 -/* 99DA24 80241094 14400002 */ bnez $v0, .L802410A0 -/* 99DA28 80241098 2402000C */ addiu $v0, $zero, 0xc -.L8024109C: -/* 99DA2C 8024109C AE620070 */ sw $v0, 0x70($s3) -.L802410A0: -/* 99DA30 802410A0 8FBF0040 */ lw $ra, 0x40($sp) -/* 99DA34 802410A4 8FB3003C */ lw $s3, 0x3c($sp) -/* 99DA38 802410A8 8FB20038 */ lw $s2, 0x38($sp) -/* 99DA3C 802410AC 8FB10034 */ lw $s1, 0x34($sp) -/* 99DA40 802410B0 8FB00030 */ lw $s0, 0x30($sp) -/* 99DA44 802410B4 03E00008 */ jr $ra -/* 99DA48 802410B8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s index b74b0df06a..b6a7588135 100644 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s @@ -133,7 +133,7 @@ glabel func_802413B8_99DD48 /* 99DF34 802415A4 02A0302D */ daddu $a2, $s5, $zero /* 99DF38 802415A8 0280202D */ daddu $a0, $s4, $zero /* 99DF3C 802415AC 0260282D */ daddu $a1, $s3, $zero -/* 99DF40 802415B0 0C0903E8 */ jal func_80240FA0_99D930 +/* 99DF40 802415B0 0C0903E8 */ jal UnkNpcAIFunc11 /* 99DF44 802415B4 02A0302D */ daddu $a2, $s5, $zero /* 99DF48 802415B8 08090582 */ j .L80241608 /* 99DF4C 802415BC 00000000 */ nop diff --git a/include/functions.h b/include/functions.h index aab81a1b7d..7be9596b37 100644 --- a/include/functions.h +++ b/include/functions.h @@ -126,6 +126,7 @@ Npc* get_npc_safe(NpcId npcId); Npc* get_npc_unsafe(NpcId npcId); Npc* resolve_npc(ScriptInstance* script, NpcId npcIdOrPtr); void set_npc_yaw(Npc* npcPtr, f32 angle); +void npc_move_heading(Npc* npc, f32 speed, f32 yaw); f32 dist2D(f32 ax, f32 ay, f32 bx, f32 by); f32 dist3D(f32 ax, f32 ay, f32 az, f32 bx, f32 by, f32 bz); diff --git a/include/map.h b/include/map.h index 1278918d5b..b91d409e0f 100644 --- a/include/map.h +++ b/include/map.h @@ -249,6 +249,8 @@ typedef struct { Enemy* get_enemy(NpcId npcId); MapConfig* get_current_map_header(void); +s32 func_800490B4(s32 arg0, Enemy* arg1, f32 arg2, s32 arg3, s32 arg4); + /// Zero-terminated. Area gAreas[29]; diff --git a/src/code_13870_len_6980.c b/src/code_13870_len_6980.c index 518b1b319e..3199d38f7f 100644 --- a/src/code_13870_len_6980.c +++ b/src/code_13870_len_6980.c @@ -52,7 +52,7 @@ INCLUDE_ASM(s32, "code_13870_len_6980", appendGfx_npc); INCLUDE_ASM(s32, "code_13870_len_6980", render_npcs); -INCLUDE_ASM(s32, "code_13870_len_6980", npc_move_heading); +INCLUDE_ASM(void, "code_13870_len_6980", npc_move_heading, Npc* npc, f32 speed, f32 yaw); INCLUDE_ASM(Npc*, "code_13870_len_6980", get_npc_unsafe, NpcId npcId); diff --git a/src/code_20ec0_len_5040.c b/src/code_20ec0_len_5040.c index 1892b83b2f..8cafd4fc3c 100644 --- a/src/code_20ec0_len_5040.c +++ b/src/code_20ec0_len_5040.c @@ -184,7 +184,7 @@ s32 is_point_within_region(s32 shape, f32 pointX, f32 pointY, f32 centerX, f32 c } } -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800490B4); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800490B4, s32 arg0, Enemy* arg1, f32 arg2, s32 arg3, s32 arg4); INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800493EC); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 611a56e154..a368d24022 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -76,7 +76,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802414D8_8B1548); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802416D0_8B1740); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241800_8B1870); +# include "world/common/UnkNpcAIFunc11.inc.c" # include "world/common/UnkNpcAIFunc10.inc.c" diff --git a/src/world/area_kmr/kmr_07/8D3DC0.c b/src/world/area_kmr/kmr_07/8D3DC0.c index 64cd4a3d5e..6b077c9632 100644 --- a/src/world/area_kmr/kmr_07/8D3DC0.c +++ b/src/world/area_kmr/kmr_07/8D3DC0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802400B4_8D3E74); INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802402AC_8D406C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802403DC_8D419C); +# include "world/common/UnkNpcAIFunc11.inc.c" # include "world/common/UnkNpcAIFunc10.inc.c" @@ -20,4 +20,18 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802405EC_8D43AC); INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802407F4_8D45B4); +// see func_802402BC_8D878C +#ifdef NON_MATCHING +ApiStatus func_80240A6C_8D482C(ScriptInstance* script, s32 isInitialCall) { + Entity* entity = get_entity_by_index(get_variable(NULL, SI_MAP_VAR(0))); + + if (entity == NULL) { + return ApiStatus_BLOCK; + } + + play_model_animation(entity->unk_14, 0x1E4); + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_80240A6C_8D482C); +#endif diff --git a/src/world/area_kmr/kmr_11/8DA3A0.c b/src/world/area_kmr/kmr_11/8DA3A0.c index 6a9db35f7b..7677fcd2b5 100644 --- a/src/world/area_kmr/kmr_11/8DA3A0.c +++ b/src/world/area_kmr/kmr_11/8DA3A0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240424_8DA524); INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_8024061C_8DA71C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_8024074C_8DA84C); +# include "world/common/UnkNpcAIFunc11.inc.c" # include "world/common/UnkNpcAIFunc10.inc.c" diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index ae1fd3127c..17f61f0fff 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802400B4_9C5494); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802402AC_9C568C); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802403DC_9C57BC); +# include "world/common/UnkNpcAIFunc11.inc.c" # include "world/common/UnkNpcAIFunc10.inc.c" diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c index 9006163461..2003d12f88 100644 --- a/src/world/area_omo/omo_02/D9D510.c +++ b/src/world/area_omo/omo_02/D9D510.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240F90_D9E460); INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241188_D9E658); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_802412B8_D9E788); +# include "world/common/UnkNpcAIFunc11.inc.c" # include "world/common/UnkNpcAIFunc10.inc.c" diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index 50f47e2c46..a4ed5bca78 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240424_93F9D4); INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_8024061C_93FBCC); -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_8024074C_93FCFC); +# include "world/common/UnkNpcAIFunc11.inc.c" # include "world/common/UnkNpcAIFunc10.inc.c" diff --git a/src/world/area_trd/trd_01/99CD80.c b/src/world/area_trd/trd_01/99CD80.c index b846e0cff7..12e6d93c27 100644 --- a/src/world/area_trd/trd_01/99CD80.c +++ b/src/world/area_trd/trd_01/99CD80.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240C78_99D608); INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240E70_99D800); -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240FA0_99D930); +# include "world/common/UnkNpcAIFunc11.inc.c" # include "world/common/UnkNpcAIFunc10.inc.c" diff --git a/src/world/common/UnkNpcAIFunc11.inc.c b/src/world/common/UnkNpcAIFunc11.inc.c new file mode 100644 index 0000000000..00a783472a --- /dev/null +++ b/src/world/common/UnkNpcAIFunc11.inc.c @@ -0,0 +1,23 @@ +#include "common.h" +#include "map.h" + +static void UnkNpcAIFunc11(ScriptInstance* script, NpcAISettings* aiSettings, s32 arg2) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + if (func_800490B4(arg2, enemy, aiSettings->chaseSpeed, aiSettings->unk_1C, 1) == 0) { + s32* something; + + fx_emote(2, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &something); + npc->currentAnim = enemy->animList[0]; + npc->duration = 25; + script->functionTemp[0].s = 14; + } else { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + func_8003D660(npc, 1); + npc->duration--; + if ((npc->duration << 0x10) == 0) { + script->functionTemp[0].s = 12; + } + } +} From 8271cb5636d06c0e0cbc8efe0f9551b1ae260bb4 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 23 Nov 2020 13:48:34 -0500 Subject: [PATCH 33/38] 3251D0 OK --- asm/nonmatchings/code_10A8D0/func_802E9050.s | 79 ------------- .../code_3251D0/func_802BD100_3251D0.s | 47 -------- .../code_3251D0/func_802BD1AC_3251D0.s | 52 --------- asm/nonmatchings/code_3251D0/func_802BD26C.s | 52 --------- asm/nonmatchings/code_3251D0/func_802BD32C.s | 29 ----- asm/nonmatchings/code_3251D0/func_802BD388.s | 29 ----- asm/nonmatchings/code_3251D0/func_802BD3E4.s | 18 --- asm/nonmatchings/code_3251D0/func_802BD41C.s | 19 ---- asm/nonmatchings/code_3251D0/func_802BD458.s | 43 -------- asm/nonmatchings/code_3251D0/func_802BD4E8.s | 14 --- include/common_structs.h | 3 +- include/functions.h | 3 + src/code_10A8D0.c | 16 ++- src/code_1b40_len_20b0.c | 2 +- src/code_3251D0.c | 104 ++++++++++++++++-- src/os/code_4ac90_len_3910.c | 2 +- tools/asm_sizes.py | 8 +- 17 files changed, 121 insertions(+), 399 deletions(-) delete mode 100644 asm/nonmatchings/code_10A8D0/func_802E9050.s delete mode 100644 asm/nonmatchings/code_3251D0/func_802BD100_3251D0.s delete mode 100644 asm/nonmatchings/code_3251D0/func_802BD1AC_3251D0.s delete mode 100644 asm/nonmatchings/code_3251D0/func_802BD26C.s delete mode 100644 asm/nonmatchings/code_3251D0/func_802BD32C.s delete mode 100644 asm/nonmatchings/code_3251D0/func_802BD388.s delete mode 100644 asm/nonmatchings/code_3251D0/func_802BD3E4.s delete mode 100644 asm/nonmatchings/code_3251D0/func_802BD41C.s delete mode 100644 asm/nonmatchings/code_3251D0/func_802BD458.s delete mode 100644 asm/nonmatchings/code_3251D0/func_802BD4E8.s diff --git a/asm/nonmatchings/code_10A8D0/func_802E9050.s b/asm/nonmatchings/code_10A8D0/func_802E9050.s deleted file mode 100644 index 6c666073d9..0000000000 --- a/asm/nonmatchings/code_10A8D0/func_802E9050.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802E9050 -/* 10A8D0 802E9050 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 10A8D4 802E9054 AFB00010 */ sw $s0, 0x10($sp) -/* 10A8D8 802E9058 0080802D */ daddu $s0, $a0, $zero -/* 10A8DC 802E905C AFBF0018 */ sw $ra, 0x18($sp) -/* 10A8E0 802E9060 AFB10014 */ sw $s1, 0x14($sp) -/* 10A8E4 802E9064 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 10A8E8 802E9068 C6000064 */ lwc1 $f0, 0x64($s0) -/* 10A8EC 802E906C 3C014334 */ lui $at, 0x4334 -/* 10A8F0 802E9070 44816000 */ mtc1 $at, $f12 -/* 10A8F4 802E9074 0C00A6C9 */ jal clamp_angle -/* 10A8F8 802E9078 46006301 */ sub.s $f12, $f12, $f0 -/* 10A8FC 802E907C 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* 10A900 802E9080 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* 10A904 802E9084 C60C0048 */ lwc1 $f12, 0x48($s0) -/* 10A908 802E9088 C60E0050 */ lwc1 $f14, 0x50($s0) -/* 10A90C 802E908C 8E260028 */ lw $a2, 0x28($s1) -/* 10A910 802E9090 8E270030 */ lw $a3, 0x30($s1) -/* 10A914 802E9094 0C00A720 */ jal atan2 -/* 10A918 802E9098 46000506 */ mov.s $f20, $f0 -/* 10A91C 802E909C 0C00A6C9 */ jal clamp_angle -/* 10A920 802E90A0 46000306 */ mov.s $f12, $f0 -/* 10A924 802E90A4 4600A501 */ sub.s $f20, $f20, $f0 -/* 10A928 802E90A8 8E220004 */ lw $v0, 4($s1) -/* 10A92C 802E90AC 30420001 */ andi $v0, $v0, 1 -/* 10A930 802E90B0 14400022 */ bnez $v0, .L802E913C -/* 10A934 802E90B4 4600A505 */ abs.s $f20, $f20 -/* 10A938 802E90B8 92020006 */ lbu $v0, 6($s0) -/* 10A93C 802E90BC 30420001 */ andi $v0, $v0, 1 -/* 10A940 802E90C0 1440001E */ bnez $v0, .L802E913C -/* 10A944 802E90C4 00000000 */ nop -/* 10A948 802E90C8 3C014220 */ lui $at, 0x4220 -/* 10A94C 802E90CC 44810000 */ mtc1 $at, $f0 -/* 10A950 802E90D0 00000000 */ nop -/* 10A954 802E90D4 4600A03E */ c.le.s $f20, $f0 -/* 10A958 802E90D8 00000000 */ nop -/* 10A95C 802E90DC 45010008 */ bc1t .L802E9100 -/* 10A960 802E90E0 00000000 */ nop -/* 10A964 802E90E4 3C0143A0 */ lui $at, 0x43a0 -/* 10A968 802E90E8 44810000 */ mtc1 $at, $f0 -/* 10A96C 802E90EC 00000000 */ nop -/* 10A970 802E90F0 4614003E */ c.le.s $f0, $f20 -/* 10A974 802E90F4 00000000 */ nop -/* 10A978 802E90F8 45000010 */ bc1f .L802E913C -/* 10A97C 802E90FC 00000000 */ nop -.L802E9100: -/* 10A980 802E9100 8E020000 */ lw $v0, ($s0) -/* 10A984 802E9104 34421000 */ ori $v0, $v0, 0x1000 -/* 10A988 802E9108 AE020000 */ sw $v0, ($s0) -/* 10A98C 802E910C 8E220004 */ lw $v0, 4($s1) -/* 10A990 802E9110 30420010 */ andi $v0, $v0, 0x10 -/* 10A994 802E9114 1040000F */ beqz $v0, .L802E9154 -/* 10A998 802E9118 00000000 */ nop -/* 10A99C 802E911C 92020006 */ lbu $v0, 6($s0) -/* 10A9A0 802E9120 30420008 */ andi $v0, $v0, 8 -/* 10A9A4 802E9124 1040000B */ beqz $v0, .L802E9154 -/* 10A9A8 802E9128 00000000 */ nop -/* 10A9AC 802E912C 0C04419E */ jal func_80110678 -/* 10A9B0 802E9130 0200202D */ daddu $a0, $s0, $zero -/* 10A9B4 802E9134 080BA455 */ j .L802E9154 -/* 10A9B8 802E9138 00000000 */ nop -.L802E913C: -/* 10A9BC 802E913C 8E020000 */ lw $v0, ($s0) -/* 10A9C0 802E9140 2403EFFF */ addiu $v1, $zero, -0x1001 -/* 10A9C4 802E9144 00431024 */ and $v0, $v0, $v1 -/* 10A9C8 802E9148 AE020000 */ sw $v0, ($s0) -/* 10A9CC 802E914C 2402FFFF */ addiu $v0, $zero, -1 -/* 10A9D0 802E9150 A62200C6 */ sh $v0, 0xc6($s1) -.L802E9154: -/* 10A9D4 802E9154 8FBF0018 */ lw $ra, 0x18($sp) -/* 10A9D8 802E9158 8FB10014 */ lw $s1, 0x14($sp) -/* 10A9DC 802E915C 8FB00010 */ lw $s0, 0x10($sp) -/* 10A9E0 802E9160 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 10A9E4 802E9164 03E00008 */ jr $ra -/* 10A9E8 802E9168 27BD0028 */ addiu $sp, $sp, 0x28 -/* 10A9EC 802E916C 00000000 */ nop diff --git a/asm/nonmatchings/code_3251D0/func_802BD100_3251D0.s b/asm/nonmatchings/code_3251D0/func_802BD100_3251D0.s deleted file mode 100644 index 1332ccf32e..0000000000 --- a/asm/nonmatchings/code_3251D0/func_802BD100_3251D0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BD100_3251D0 -/* 3251D0 802BD100 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3251D4 802BD104 AFB1001C */ sw $s1, 0x1c($sp) -/* 3251D8 802BD108 0080882D */ daddu $s1, $a0, $zero -/* 3251DC 802BD10C AFBF0024 */ sw $ra, 0x24($sp) -/* 3251E0 802BD110 AFB20020 */ sw $s2, 0x20($sp) -/* 3251E4 802BD114 AFB00018 */ sw $s0, 0x18($sp) -/* 3251E8 802BD118 8E30000C */ lw $s0, 0xc($s1) -/* 3251EC 802BD11C 8E050000 */ lw $a1, ($s0) -/* 3251F0 802BD120 0C0B1EAF */ jal get_variable -/* 3251F4 802BD124 26100004 */ addiu $s0, $s0, 4 -/* 3251F8 802BD128 8E050000 */ lw $a1, ($s0) -/* 3251FC 802BD12C 26100004 */ addiu $s0, $s0, 4 -/* 325200 802BD130 0220202D */ daddu $a0, $s1, $zero -/* 325204 802BD134 0C0B1EAF */ jal get_variable -/* 325208 802BD138 0040902D */ daddu $s2, $v0, $zero -/* 32520C 802BD13C 0220202D */ daddu $a0, $s1, $zero -/* 325210 802BD140 8E050000 */ lw $a1, ($s0) -/* 325214 802BD144 0C0B1EAF */ jal get_variable -/* 325218 802BD148 0040802D */ daddu $s0, $v0, $zero -/* 32521C 802BD14C 44921000 */ mtc1 $s2, $f2 -/* 325220 802BD150 00000000 */ nop -/* 325224 802BD154 468010A0 */ cvt.s.w $f2, $f2 -/* 325228 802BD158 44051000 */ mfc1 $a1, $f2 -/* 32522C 802BD15C 44901000 */ mtc1 $s0, $f2 -/* 325230 802BD160 00000000 */ nop -/* 325234 802BD164 468010A0 */ cvt.s.w $f2, $f2 -/* 325238 802BD168 44061000 */ mfc1 $a2, $f2 -/* 32523C 802BD16C 44821000 */ mtc1 $v0, $f2 -/* 325240 802BD170 00000000 */ nop -/* 325244 802BD174 468010A0 */ cvt.s.w $f2, $f2 -/* 325248 802BD178 3C014270 */ lui $at, 0x4270 -/* 32524C 802BD17C 44810000 */ mtc1 $at, $f0 -/* 325250 802BD180 44071000 */ mfc1 $a3, $f2 -/* 325254 802BD184 0000202D */ daddu $a0, $zero, $zero -/* 325258 802BD188 0C01BFBC */ jal func_8006FEF0 -/* 32525C 802BD18C E7A00010 */ swc1 $f0, 0x10($sp) -/* 325260 802BD190 8FBF0024 */ lw $ra, 0x24($sp) -/* 325264 802BD194 8FB20020 */ lw $s2, 0x20($sp) -/* 325268 802BD198 8FB1001C */ lw $s1, 0x1c($sp) -/* 32526C 802BD19C 8FB00018 */ lw $s0, 0x18($sp) -/* 325270 802BD1A0 24020002 */ addiu $v0, $zero, 2 -/* 325274 802BD1A4 03E00008 */ jr $ra -/* 325278 802BD1A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_3251D0/func_802BD1AC_3251D0.s b/asm/nonmatchings/code_3251D0/func_802BD1AC_3251D0.s deleted file mode 100644 index 22bab7d86d..0000000000 --- a/asm/nonmatchings/code_3251D0/func_802BD1AC_3251D0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BD1AC_3251D0 -/* 32527C 802BD1AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 325280 802BD1B0 AFB1001C */ sw $s1, 0x1c($sp) -/* 325284 802BD1B4 0080882D */ daddu $s1, $a0, $zero -/* 325288 802BD1B8 AFBF0028 */ sw $ra, 0x28($sp) -/* 32528C 802BD1BC AFB30024 */ sw $s3, 0x24($sp) -/* 325290 802BD1C0 AFB20020 */ sw $s2, 0x20($sp) -/* 325294 802BD1C4 AFB00018 */ sw $s0, 0x18($sp) -/* 325298 802BD1C8 8E30000C */ lw $s0, 0xc($s1) -/* 32529C 802BD1CC 8E050000 */ lw $a1, ($s0) -/* 3252A0 802BD1D0 0C0B1EAF */ jal get_variable -/* 3252A4 802BD1D4 26100004 */ addiu $s0, $s0, 4 -/* 3252A8 802BD1D8 8E050000 */ lw $a1, ($s0) -/* 3252AC 802BD1DC 26100004 */ addiu $s0, $s0, 4 -/* 3252B0 802BD1E0 0220202D */ daddu $a0, $s1, $zero -/* 3252B4 802BD1E4 0C0B1EAF */ jal get_variable -/* 3252B8 802BD1E8 0040982D */ daddu $s3, $v0, $zero -/* 3252BC 802BD1EC 8E050000 */ lw $a1, ($s0) -/* 3252C0 802BD1F0 26100004 */ addiu $s0, $s0, 4 -/* 3252C4 802BD1F4 0220202D */ daddu $a0, $s1, $zero -/* 3252C8 802BD1F8 0C0B1EAF */ jal get_variable -/* 3252CC 802BD1FC 0040902D */ daddu $s2, $v0, $zero -/* 3252D0 802BD200 0220202D */ daddu $a0, $s1, $zero -/* 3252D4 802BD204 8E050000 */ lw $a1, ($s0) -/* 3252D8 802BD208 0C0B1EAF */ jal get_variable -/* 3252DC 802BD20C 0040802D */ daddu $s0, $v0, $zero -/* 3252E0 802BD210 44930000 */ mtc1 $s3, $f0 -/* 3252E4 802BD214 00000000 */ nop -/* 3252E8 802BD218 46800020 */ cvt.s.w $f0, $f0 -/* 3252EC 802BD21C 44050000 */ mfc1 $a1, $f0 -/* 3252F0 802BD220 44920000 */ mtc1 $s2, $f0 -/* 3252F4 802BD224 00000000 */ nop -/* 3252F8 802BD228 46800020 */ cvt.s.w $f0, $f0 -/* 3252FC 802BD22C 44060000 */ mfc1 $a2, $f0 -/* 325300 802BD230 44900000 */ mtc1 $s0, $f0 -/* 325304 802BD234 00000000 */ nop -/* 325308 802BD238 46800020 */ cvt.s.w $f0, $f0 -/* 32530C 802BD23C 44070000 */ mfc1 $a3, $f0 -/* 325310 802BD240 0000202D */ daddu $a0, $zero, $zero -/* 325314 802BD244 0C01C424 */ jal func_80071090 -/* 325318 802BD248 AFA20010 */ sw $v0, 0x10($sp) -/* 32531C 802BD24C 8FBF0028 */ lw $ra, 0x28($sp) -/* 325320 802BD250 8FB30024 */ lw $s3, 0x24($sp) -/* 325324 802BD254 8FB20020 */ lw $s2, 0x20($sp) -/* 325328 802BD258 8FB1001C */ lw $s1, 0x1c($sp) -/* 32532C 802BD25C 8FB00018 */ lw $s0, 0x18($sp) -/* 325330 802BD260 24020002 */ addiu $v0, $zero, 2 -/* 325334 802BD264 03E00008 */ jr $ra -/* 325338 802BD268 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_3251D0/func_802BD26C.s b/asm/nonmatchings/code_3251D0/func_802BD26C.s deleted file mode 100644 index 2093876aa1..0000000000 --- a/asm/nonmatchings/code_3251D0/func_802BD26C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BD26C -/* 32533C 802BD26C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 325340 802BD270 AFB1001C */ sw $s1, 0x1c($sp) -/* 325344 802BD274 0080882D */ daddu $s1, $a0, $zero -/* 325348 802BD278 AFBF0028 */ sw $ra, 0x28($sp) -/* 32534C 802BD27C AFB30024 */ sw $s3, 0x24($sp) -/* 325350 802BD280 AFB20020 */ sw $s2, 0x20($sp) -/* 325354 802BD284 AFB00018 */ sw $s0, 0x18($sp) -/* 325358 802BD288 8E30000C */ lw $s0, 0xc($s1) -/* 32535C 802BD28C 8E050000 */ lw $a1, ($s0) -/* 325360 802BD290 0C0B1EAF */ jal get_variable -/* 325364 802BD294 26100004 */ addiu $s0, $s0, 4 -/* 325368 802BD298 8E050000 */ lw $a1, ($s0) -/* 32536C 802BD29C 26100004 */ addiu $s0, $s0, 4 -/* 325370 802BD2A0 0220202D */ daddu $a0, $s1, $zero -/* 325374 802BD2A4 0C0B1EAF */ jal get_variable -/* 325378 802BD2A8 0040982D */ daddu $s3, $v0, $zero -/* 32537C 802BD2AC 8E050000 */ lw $a1, ($s0) -/* 325380 802BD2B0 26100004 */ addiu $s0, $s0, 4 -/* 325384 802BD2B4 0220202D */ daddu $a0, $s1, $zero -/* 325388 802BD2B8 0C0B1EAF */ jal get_variable -/* 32538C 802BD2BC 0040902D */ daddu $s2, $v0, $zero -/* 325390 802BD2C0 0220202D */ daddu $a0, $s1, $zero -/* 325394 802BD2C4 8E050000 */ lw $a1, ($s0) -/* 325398 802BD2C8 0C0B1EAF */ jal get_variable -/* 32539C 802BD2CC 0040802D */ daddu $s0, $v0, $zero -/* 3253A0 802BD2D0 44930000 */ mtc1 $s3, $f0 -/* 3253A4 802BD2D4 00000000 */ nop -/* 3253A8 802BD2D8 46800020 */ cvt.s.w $f0, $f0 -/* 3253AC 802BD2DC 44050000 */ mfc1 $a1, $f0 -/* 3253B0 802BD2E0 44920000 */ mtc1 $s2, $f0 -/* 3253B4 802BD2E4 00000000 */ nop -/* 3253B8 802BD2E8 46800020 */ cvt.s.w $f0, $f0 -/* 3253BC 802BD2EC 44060000 */ mfc1 $a2, $f0 -/* 3253C0 802BD2F0 44900000 */ mtc1 $s0, $f0 -/* 3253C4 802BD2F4 00000000 */ nop -/* 3253C8 802BD2F8 46800020 */ cvt.s.w $f0, $f0 -/* 3253CC 802BD2FC 44070000 */ mfc1 $a3, $f0 -/* 3253D0 802BD300 24040001 */ addiu $a0, $zero, 1 -/* 3253D4 802BD304 0C01C424 */ jal func_80071090 -/* 3253D8 802BD308 AFA20010 */ sw $v0, 0x10($sp) -/* 3253DC 802BD30C 8FBF0028 */ lw $ra, 0x28($sp) -/* 3253E0 802BD310 8FB30024 */ lw $s3, 0x24($sp) -/* 3253E4 802BD314 8FB20020 */ lw $s2, 0x20($sp) -/* 3253E8 802BD318 8FB1001C */ lw $s1, 0x1c($sp) -/* 3253EC 802BD31C 8FB00018 */ lw $s0, 0x18($sp) -/* 3253F0 802BD320 24020002 */ addiu $v0, $zero, 2 -/* 3253F4 802BD324 03E00008 */ jr $ra -/* 3253F8 802BD328 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_3251D0/func_802BD32C.s b/asm/nonmatchings/code_3251D0/func_802BD32C.s deleted file mode 100644 index 9b3cb1f670..0000000000 --- a/asm/nonmatchings/code_3251D0/func_802BD32C.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BD32C -/* 3253FC 802BD32C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 325400 802BD330 AFBF0014 */ sw $ra, 0x14($sp) -/* 325404 802BD334 AFB00010 */ sw $s0, 0x10($sp) -/* 325408 802BD338 8C82000C */ lw $v0, 0xc($a0) -/* 32540C 802BD33C 0C0B1EAF */ jal get_variable -/* 325410 802BD340 8C450000 */ lw $a1, ($v0) -/* 325414 802BD344 3C038011 */ lui $v1, %hi(gPlayerData) -/* 325418 802BD348 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 32541C 802BD34C 80640002 */ lb $a0, 2($v1) -/* 325420 802BD350 80650003 */ lb $a1, 3($v1) -/* 325424 802BD354 00822021 */ addu $a0, $a0, $v0 -/* 325428 802BD358 00A4102A */ slt $v0, $a1, $a0 -/* 32542C 802BD35C 10400002 */ beqz $v0, .L802BD368 -/* 325430 802BD360 0060802D */ daddu $s0, $v1, $zero -/* 325434 802BD364 00A0202D */ daddu $a0, $a1, $zero -.L802BD368: -/* 325438 802BD368 58800001 */ blezl $a0, .L802BD370 -/* 32543C 802BD36C 24040001 */ addiu $a0, $zero, 1 -.L802BD370: -/* 325440 802BD370 A2040002 */ sb $a0, 2($s0) -/* 325444 802BD374 8FBF0014 */ lw $ra, 0x14($sp) -/* 325448 802BD378 8FB00010 */ lw $s0, 0x10($sp) -/* 32544C 802BD37C 24020002 */ addiu $v0, $zero, 2 -/* 325450 802BD380 03E00008 */ jr $ra -/* 325454 802BD384 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_3251D0/func_802BD388.s b/asm/nonmatchings/code_3251D0/func_802BD388.s deleted file mode 100644 index 1f3b9f412c..0000000000 --- a/asm/nonmatchings/code_3251D0/func_802BD388.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BD388 -/* 325458 802BD388 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 32545C 802BD38C AFBF0014 */ sw $ra, 0x14($sp) -/* 325460 802BD390 AFB00010 */ sw $s0, 0x10($sp) -/* 325464 802BD394 8C82000C */ lw $v0, 0xc($a0) -/* 325468 802BD398 0C0B1EAF */ jal get_variable -/* 32546C 802BD39C 8C450000 */ lw $a1, ($v0) -/* 325470 802BD3A0 3C038011 */ lui $v1, %hi(gPlayerData) -/* 325474 802BD3A4 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 325478 802BD3A8 80640005 */ lb $a0, 5($v1) -/* 32547C 802BD3AC 80650006 */ lb $a1, 6($v1) -/* 325480 802BD3B0 00822021 */ addu $a0, $a0, $v0 -/* 325484 802BD3B4 00A4102A */ slt $v0, $a1, $a0 -/* 325488 802BD3B8 10400002 */ beqz $v0, .L802BD3C4 -/* 32548C 802BD3BC 0060802D */ daddu $s0, $v1, $zero -/* 325490 802BD3C0 00A0202D */ daddu $a0, $a1, $zero -.L802BD3C4: -/* 325494 802BD3C4 58800001 */ blezl $a0, .L802BD3CC -/* 325498 802BD3C8 24040001 */ addiu $a0, $zero, 1 -.L802BD3CC: -/* 32549C 802BD3CC A2040005 */ sb $a0, 5($s0) -/* 3254A0 802BD3D0 8FBF0014 */ lw $ra, 0x14($sp) -/* 3254A4 802BD3D4 8FB00010 */ lw $s0, 0x10($sp) -/* 3254A8 802BD3D8 24020002 */ addiu $v0, $zero, 2 -/* 3254AC 802BD3DC 03E00008 */ jr $ra -/* 3254B0 802BD3E0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_3251D0/func_802BD3E4.s b/asm/nonmatchings/code_3251D0/func_802BD3E4.s deleted file mode 100644 index 7ca86e6e6f..0000000000 --- a/asm/nonmatchings/code_3251D0/func_802BD3E4.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BD3E4 -/* 3254B4 802BD3E4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3254B8 802BD3E8 AFBF0010 */ sw $ra, 0x10($sp) -/* 3254BC 802BD3EC 0C009C22 */ jal func_80027088 -/* 3254C0 802BD3F0 24040002 */ addiu $a0, $zero, 2 -/* 3254C4 802BD3F4 3C02800A */ lui $v0, %hi(D_8009A650) -/* 3254C8 802BD3F8 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* 3254CC 802BD3FC 8C430000 */ lw $v1, ($v0) -/* 3254D0 802BD400 3C040020 */ lui $a0, 0x20 -/* 3254D4 802BD404 00641825 */ or $v1, $v1, $a0 -/* 3254D8 802BD408 AC430000 */ sw $v1, ($v0) -/* 3254DC 802BD40C 8FBF0010 */ lw $ra, 0x10($sp) -/* 3254E0 802BD410 24020002 */ addiu $v0, $zero, 2 -/* 3254E4 802BD414 03E00008 */ jr $ra -/* 3254E8 802BD418 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_3251D0/func_802BD41C.s b/asm/nonmatchings/code_3251D0/func_802BD41C.s deleted file mode 100644 index ed2f368755..0000000000 --- a/asm/nonmatchings/code_3251D0/func_802BD41C.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BD41C -/* 3254EC 802BD41C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3254F0 802BD420 AFBF0010 */ sw $ra, 0x10($sp) -/* 3254F4 802BD424 0C009C22 */ jal func_80027088 -/* 3254F8 802BD428 0000202D */ daddu $a0, $zero, $zero -/* 3254FC 802BD42C 3C04FFDF */ lui $a0, 0xffdf -/* 325500 802BD430 3C03800A */ lui $v1, %hi(D_8009A650) -/* 325504 802BD434 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* 325508 802BD438 8C620000 */ lw $v0, ($v1) -/* 32550C 802BD43C 3484FFFF */ ori $a0, $a0, 0xffff -/* 325510 802BD440 00441024 */ and $v0, $v0, $a0 -/* 325514 802BD444 AC620000 */ sw $v0, ($v1) -/* 325518 802BD448 8FBF0010 */ lw $ra, 0x10($sp) -/* 32551C 802BD44C 24020002 */ addiu $v0, $zero, 2 -/* 325520 802BD450 03E00008 */ jr $ra -/* 325524 802BD454 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_3251D0/func_802BD458.s b/asm/nonmatchings/code_3251D0/func_802BD458.s deleted file mode 100644 index 9ecf03f36d..0000000000 --- a/asm/nonmatchings/code_3251D0/func_802BD458.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BD458 -/* 325528 802BD458 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 32552C 802BD45C AFB00010 */ sw $s0, 0x10($sp) -/* 325530 802BD460 0080802D */ daddu $s0, $a0, $zero -/* 325534 802BD464 AFBF0014 */ sw $ra, 0x14($sp) -/* 325538 802BD468 8E02000C */ lw $v0, 0xc($s0) -/* 32553C 802BD46C 0C0B1EAF */ jal get_variable -/* 325540 802BD470 8C450000 */ lw $a1, ($v0) -/* 325544 802BD474 3C038008 */ lui $v1, %hi(gItemTable) -/* 325548 802BD478 246378E0 */ addiu $v1, $v1, %lo(gItemTable) -/* 32554C 802BD47C 00021140 */ sll $v0, $v0, 5 -/* 325550 802BD480 00431021 */ addu $v0, $v0, $v1 -/* 325554 802BD484 8043001B */ lb $v1, 0x1b($v0) -/* 325558 802BD488 AE0300B0 */ sw $v1, 0xb0($s0) -/* 32555C 802BD48C 8043001C */ lb $v1, 0x1c($v0) -/* 325560 802BD490 AE0000B8 */ sw $zero, 0xb8($s0) -/* 325564 802BD494 AE0300B4 */ sw $v1, 0xb4($s0) -/* 325568 802BD498 94420018 */ lhu $v0, 0x18($v0) -/* 32556C 802BD49C 30420100 */ andi $v0, $v0, 0x100 -/* 325570 802BD4A0 10400002 */ beqz $v0, .L802BD4AC -/* 325574 802BD4A4 24020001 */ addiu $v0, $zero, 1 -/* 325578 802BD4A8 AE0200B8 */ sw $v0, 0xb8($s0) -.L802BD4AC: -/* 32557C 802BD4AC 8E0200B0 */ lw $v0, 0xb0($s0) -/* 325580 802BD4B0 04400006 */ bltz $v0, .L802BD4CC -/* 325584 802BD4B4 0000182D */ daddu $v1, $zero, $zero -/* 325588 802BD4B8 5C400006 */ bgtzl $v0, .L802BD4D4 -/* 32558C 802BD4BC AE0300C0 */ sw $v1, 0xc0($s0) -/* 325590 802BD4C0 8E0200B4 */ lw $v0, 0xb4($s0) -/* 325594 802BD4C4 04430003 */ bgezl $v0, .L802BD4D4 -/* 325598 802BD4C8 AE0300C0 */ sw $v1, 0xc0($s0) -.L802BD4CC: -/* 32559C 802BD4CC 24030001 */ addiu $v1, $zero, 1 -/* 3255A0 802BD4D0 AE0300C0 */ sw $v1, 0xc0($s0) -.L802BD4D4: -/* 3255A4 802BD4D4 8FBF0014 */ lw $ra, 0x14($sp) -/* 3255A8 802BD4D8 8FB00010 */ lw $s0, 0x10($sp) -/* 3255AC 802BD4DC 24020002 */ addiu $v0, $zero, 2 -/* 3255B0 802BD4E0 03E00008 */ jr $ra -/* 3255B4 802BD4E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_3251D0/func_802BD4E8.s b/asm/nonmatchings/code_3251D0/func_802BD4E8.s deleted file mode 100644 index 8b6d9e49ba..0000000000 --- a/asm/nonmatchings/code_3251D0/func_802BD4E8.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BD4E8 -/* 3255B8 802BD4E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3255BC 802BD4EC AFBF0010 */ sw $ra, 0x10($sp) -/* 3255C0 802BD4F0 0C03A91F */ jal remove_consumable -/* 3255C4 802BD4F4 00000000 */ nop -/* 3255C8 802BD4F8 8FBF0010 */ lw $ra, 0x10($sp) -/* 3255CC 802BD4FC 24020002 */ addiu $v0, $zero, 2 -/* 3255D0 802BD500 03E00008 */ jr $ra -/* 3255D4 802BD504 27BD0018 */ addiu $sp, $sp, 0x18 -/* 3255D8 802BD508 00000000 */ nop -/* 3255DC 802BD50C 00000000 */ nop diff --git a/include/common_structs.h b/include/common_structs.h index ffa8fb07da..4ade59131e 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1447,7 +1447,8 @@ typedef struct PlayerStatus { /* 0x0BE */ u8 renderMode; /* 0x0BF */ s8 unk_BF; /* 0x0C0 */ u32* decorationList; - /* 0x0C4 */ char unk_C4[4]; + /* 0x0C4 */ char unk_C4[2]; + /* 0x0C6 */ s16 unk_C6; /* 0x0C8 */ UNK_PTR unk_C8; /* 0x0CC */ s32 shadowID; /* 0x0D0 */ char unk_D0[8]; diff --git a/include/functions.h b/include/functions.h index 7be9596b37..3956673a37 100644 --- a/include/functions.h +++ b/include/functions.h @@ -33,7 +33,10 @@ s32 get_model_list_index_from_tree_index(s32 treeIndex); void get_model_center_and_size(s32 modelID, f32* centerX, f32* centerY, f32* centerZ, f32* sizeX, f32* sizeY, f32* sizeZ); +void func_80027088(s32); + void func_8006FEF0(s32, f32, f32, f32, f32); +void func_80071090(s32, f32, f32, f32, s32); void func_80071750(s32, f32, f32, f32, f32, s32); void func_80072950(s32, f32, f32, f32, f32, s32 time); diff --git a/src/code_10A8D0.c b/src/code_10A8D0.c index b2800820e3..1fca3dcf42 100644 --- a/src/code_10A8D0.c +++ b/src/code_10A8D0.c @@ -1,3 +1,17 @@ #include "common.h" -INCLUDE_ASM(s32, "code_10A8D0", func_802E9050); +void func_802E9050(Entity* entity) { + PlayerStatus* playerStatus = PLAYER_STATUS; + f32 val = fabsf(clamp_angle(180.0f - entity->rotation.y) - clamp_angle(atan2(entity->position.x, entity->position.z, + playerStatus->position.x, playerStatus->position.z))); + + if ((!(playerStatus->animFlags & 1)) && (!(entity->unk_06 & 1)) && ((val <= 40.0f) || (val >= 320.0f))) { + entity->flags |= 0x1000; + if ((playerStatus->animFlags & 0x10) && (entity->unk_06 & 8)) { + func_80110678(entity); + } + } else { + entity->flags &= ~0x1000; + playerStatus->unk_C6 = -1; + } +} diff --git a/src/code_1b40_len_20b0.c b/src/code_1b40_len_20b0.c index eeca8f6708..b9cd27006d 100644 --- a/src/code_1b40_len_20b0.c +++ b/src/code_1b40_len_20b0.c @@ -109,7 +109,7 @@ INCLUDE_ASM(s32, "code_1b40_len_20b0", load_engine_data); set_game_mode(0); }*/ -INCLUDE_ASM(s32, "code_1b40_len_20b0", func_80027088); +INCLUDE_ASM(void, "code_1b40_len_20b0", func_80027088, s32 arg0); s32 func_80027190(void) { return D_8009A5D8; diff --git a/src/code_3251D0.c b/src/code_3251D0.c index f7026ac991..8b3e471db0 100644 --- a/src/code_3251D0.c +++ b/src/code_3251D0.c @@ -1,19 +1,105 @@ #include "common.h" -INCLUDE_ASM(s32, "code_3251D0", func_802BD100_3251D0); +ApiStatus func_802BD100_3251D0(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 a = get_variable(script, *args++); + s32 b = get_variable(script, *args++); + s32 c = get_variable(script, *args++); -INCLUDE_ASM(s32, "code_3251D0", func_802BD1AC_3251D0); + func_8006FEF0(0, a, b, c, 60.0f); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "code_3251D0", func_802BD26C); +ApiStatus func_802BD1AC_3251D0(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 a = get_variable(script, *args++); + s32 b = get_variable(script, *args++); + s32 c = get_variable(script, *args++); + s32 d = get_variable(script, *args++); -INCLUDE_ASM(s32, "code_3251D0", func_802BD32C); + func_80071090(0, a, b, c, d); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "code_3251D0", func_802BD388); +ApiStatus func_802BD26C(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 a = get_variable(script, *args++); + s32 b = get_variable(script, *args++); + s32 c = get_variable(script, *args++); + s32 d = get_variable(script, *args++); -INCLUDE_ASM(s32, "code_3251D0", func_802BD3E4); + func_80071090(1, a, b, c, d); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "code_3251D0", func_802BD41C); +ApiStatus func_802BD32C(ScriptInstance* script, s32 isInitialCall) { + PlayerData* playerData = PLAYER_DATA; + PlayerData* playerData2 = PLAYER_DATA; + s32 newHP = playerData->curHP + get_variable(script, *script->ptrReadPos); -INCLUDE_ASM(s32, "code_3251D0", func_802BD458); + if (newHP > playerData->curMaxHP) { + newHP = playerData->curMaxHP; + } -INCLUDE_ASM(s32, "code_3251D0", func_802BD4E8); + if (newHP <= 0) { + newHP = 1; + } + + playerData2->curHP = newHP; + return ApiStatus_DONE2; +} + +ApiStatus func_802BD388(ScriptInstance* script, s32 isInitialCall) { + PlayerData* playerData = PLAYER_DATA; + PlayerData* playerData2 = PLAYER_DATA; + s32 newFP = playerData->curFP + get_variable(script, *script->ptrReadPos); + + if (newFP > playerData->curMaxFP) { + newFP = playerData->curMaxFP; + } + + if (newFP <= 0) { + newFP = 1; + } + + playerData2->curFP = newFP; + return ApiStatus_DONE2; +} + +ApiStatus func_802BD3E4(ScriptInstance* script, s32 isInitialCall) { + func_80027088(2); + D_8009A650[0] |= 0x200000; + return ApiStatus_DONE2; +} + +ApiStatus func_802BD41C(ScriptInstance* script, s32 isInitialCall) { + func_80027088(0); + D_8009A650[0] &= ~0x200000; + return ApiStatus_DONE2; +} + +ApiStatus func_802BD458(ScriptInstance* script, s32 isInitialCall) { + s32 itemIdx = get_variable(script, *script->ptrReadPos); + s32 var15; + + script->varTable[11] = (&gItemTable[itemIdx])->potencyA; + script->varTable[12] = (&gItemTable[itemIdx])->potencyB; + script->varTable[13] = 0; + + if ((&gItemTable[itemIdx])->typeFlags & 0x100) { + script->varTable[13] = 1; + } + + var15 = 0; + if (script->varTable[11] < 0 || (script->varTable[11] <= 0 && script->varTable[12] < 0)) { + var15 = 1; + } + script->varTable[15] = var15; + + return ApiStatus_DONE2; +} + +ApiStatus func_802BD4E8(ScriptInstance* script, s32 isInitialCall) { + remove_consumable(); + return ApiStatus_DONE2; +} diff --git a/src/os/code_4ac90_len_3910.c b/src/os/code_4ac90_len_3910.c index a96291c5ea..0d15054caa 100644 --- a/src/os/code_4ac90_len_3910.c +++ b/src/os/code_4ac90_len_3910.c @@ -129,7 +129,7 @@ INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070FD0); INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071030); -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071090); +INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80071090, s32 a0, f32 a1, f32 a2, f32 a3, s32 a4); INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800710F0); diff --git a/tools/asm_sizes.py b/tools/asm_sizes.py index c2c0995586..c77b3bfa39 100755 --- a/tools/asm_sizes.py +++ b/tools/asm_sizes.py @@ -29,7 +29,7 @@ def do_dir(root, dir): if min is None or amt < min: min = amt total += amt - + avg = 0 if len(files) == 0 else total / len(files) sizes[dir] = ((min, max, total, avg)) @@ -40,8 +40,8 @@ asm_dir = script_dir + "/../asm/nonmatchings" for root, dirs, files in os.walk(asm_dir): for asm_dir in dirs: - if "/os" not in root: + if "/os" not in root and "/world/" not in root: do_dir(root, asm_dir) -for thing in sorted(sizes.keys(), key=lambda x: sizes[x][2]): - print(thing.ljust(25) + str(sizes[thing][2])) +for thing in sorted(sizes.keys(), key=lambda x: sizes[x][3]): + print(thing.ljust(25) + str(sizes[thing][3])) From 3df62667fbfb37357acd37b1b774ff7168284452 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 23 Nov 2020 14:19:13 -0500 Subject: [PATCH 34/38] Some of 317020 --- asm/nonmatchings/code_317020/func_802BD100.s | 37 ------------------- asm/nonmatchings/code_317020/func_802BDB84.s | 19 ---------- include/common_structs.h | 3 +- include/functions.h | 3 ++ src/code_317020.c | 39 +++++++++++++++++++- src/code_838b0_len_5900.c | 2 +- 6 files changed, 43 insertions(+), 60 deletions(-) delete mode 100644 asm/nonmatchings/code_317020/func_802BD100.s delete mode 100644 asm/nonmatchings/code_317020/func_802BDB84.s diff --git a/asm/nonmatchings/code_317020/func_802BD100.s b/asm/nonmatchings/code_317020/func_802BD100.s deleted file mode 100644 index 90b3bdd526..0000000000 --- a/asm/nonmatchings/code_317020/func_802BD100.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BD100 -/* 317020 802BD100 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 317024 802BD104 AFB10014 */ sw $s1, 0x14($sp) -/* 317028 802BD108 0080882D */ daddu $s1, $a0, $zero -/* 31702C 802BD10C AFB00010 */ sw $s0, 0x10($sp) -/* 317030 802BD110 0000802D */ daddu $s0, $zero, $zero -/* 317034 802BD114 AFBF0018 */ sw $ra, 0x18($sp) -.L802BD118: -/* 317038 802BD118 0C051734 */ jal get_trigger_by_id -/* 31703C 802BD11C 0200202D */ daddu $a0, $s0, $zero -/* 317040 802BD120 0040182D */ daddu $v1, $v0, $zero -/* 317044 802BD124 1060000B */ beqz $v1, .L802BD154 -/* 317048 802BD128 26100001 */ addiu $s0, $s0, 1 -/* 31704C 802BD12C 8C620000 */ lw $v0, ($v1) -/* 317050 802BD130 30420100 */ andi $v0, $v0, 0x100 -/* 317054 802BD134 10400007 */ beqz $v0, .L802BD154 -/* 317058 802BD138 00000000 */ nop -/* 31705C 802BD13C 8C620008 */ lw $v0, 8($v1) -/* 317060 802BD140 14510005 */ bne $v0, $s1, .L802BD158 -/* 317064 802BD144 2A020040 */ slti $v0, $s0, 0x40 -/* 317068 802BD148 8C62002C */ lw $v0, 0x2c($v1) -/* 31706C 802BD14C 080AF458 */ j .L802BD160 -/* 317070 802BD150 00000000 */ nop -.L802BD154: -/* 317074 802BD154 2A020040 */ slti $v0, $s0, 0x40 -.L802BD158: -/* 317078 802BD158 1440FFEF */ bnez $v0, .L802BD118 -/* 31707C 802BD15C 0000102D */ daddu $v0, $zero, $zero -.L802BD160: -/* 317080 802BD160 8FBF0018 */ lw $ra, 0x18($sp) -/* 317084 802BD164 8FB10014 */ lw $s1, 0x14($sp) -/* 317088 802BD168 8FB00010 */ lw $s0, 0x10($sp) -/* 31708C 802BD16C 03E00008 */ jr $ra -/* 317090 802BD170 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_317020/func_802BDB84.s b/asm/nonmatchings/code_317020/func_802BDB84.s deleted file mode 100644 index 15530fc7c1..0000000000 --- a/asm/nonmatchings/code_317020/func_802BDB84.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BDB84 -/* 317AA4 802BDB84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 317AA8 802BDB88 AFBF0014 */ sw $ra, 0x14($sp) -/* 317AAC 802BDB8C AFB00010 */ sw $s0, 0x10($sp) -/* 317AB0 802BDB90 10A00003 */ beqz $a1, .L802BDBA0 -/* 317AB4 802BDB94 8C90014C */ lw $s0, 0x14c($a0) -/* 317AB8 802BDB98 0C03BA65 */ jal func_800EE994 -/* 317ABC 802BDB9C 0200202D */ daddu $a0, $s0, $zero -.L802BDBA0: -/* 317AC0 802BDBA0 0C03BA6E */ jal func_800EE9B8 -/* 317AC4 802BDBA4 0200202D */ daddu $a0, $s0, $zero -/* 317AC8 802BDBA8 8FBF0014 */ lw $ra, 0x14($sp) -/* 317ACC 802BDBAC 8FB00010 */ lw $s0, 0x10($sp) -/* 317AD0 802BDBB0 0002102B */ sltu $v0, $zero, $v0 -/* 317AD4 802BDBB4 03E00008 */ jr $ra -/* 317AD8 802BDBB8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/include/common_structs.h b/include/common_structs.h index 4ade59131e..bc8c6282f2 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -202,7 +202,8 @@ typedef struct Trigger { /* 0x14 */ struct ScriptInstance* runningScript; /* 0x18 */ s32 priority; /* 0x1C */ s32 scriptVars[3]; - /* 0x28 */ char unk_28[8]; + /* 0x28 */ char unk_28[4]; + /* 0x2C */ s32 unk_2C; /* 0x30 */ u8 unk_30; /* 0x31 */ char unk_31[3]; /* 0x34 */ ScriptID runningScriptID; diff --git a/include/functions.h b/include/functions.h index 3956673a37..47d33e6b70 100644 --- a/include/functions.h +++ b/include/functions.h @@ -46,6 +46,7 @@ void get_collider_center(s32 colliderID, f32* x, f32* y, f32* z); s32 is_trigger_bound(Trigger*, Bytecode* script); Trigger* create_trigger(TriggerDefinition* def); s32 _bound_script_trigger_handler(Trigger* trigger); +Trigger* get_trigger_by_id(s32 triggerID); Actor* get_actor(s32 actorID); ActorPart* get_actor_part(Actor* actor, s32 partIndex); @@ -96,6 +97,7 @@ void enable_partner_flying(Npc* partner, s32 val); void update_player_move_history(Npc* partner); s32 is_current_partner_flying(void); void func_800ED5D0(Npc* partner); +void clear_partner_move_history(Npc* partner); s32 func_800EF394(f32); s32 does_script_exist(s32 id); @@ -130,6 +132,7 @@ Npc* get_npc_unsafe(NpcId npcId); Npc* resolve_npc(ScriptInstance* script, NpcId npcIdOrPtr); void set_npc_yaw(Npc* npcPtr, f32 angle); void npc_move_heading(Npc* npc, f32 speed, f32 yaw); +void disable_npc_blur(Npc* npc); f32 dist2D(f32 ax, f32 ay, f32 bx, f32 by); f32 dist3D(f32 ax, f32 ay, f32 az, f32 bx, f32 by, f32 bz); diff --git a/src/code_317020.c b/src/code_317020.c index 0a99d4d0a4..95b8c24a09 100644 --- a/src/code_317020.c +++ b/src/code_317020.c @@ -1,6 +1,17 @@ #include "common.h" -INCLUDE_ASM(s32, "code_317020", func_802BD100); +s32 func_802BD100(s32 arg0) { + s32 i; + + for (i = 0; i < 0x40; i++) { + Trigger* trigger = get_trigger_by_id(i); + + if (trigger != NULL && trigger->flags.flags & 0x100 && trigger->params2 == arg0) { + return trigger->unk_2C; + } + } + return 0; +} void func_802BD174(Npc* npc) { npc->collisionHeight = 24; @@ -19,6 +30,30 @@ INCLUDE_ASM(s32, "code_317020", func_802BD5D8); INCLUDE_ASM(s32, "code_317020", func_802BDB30); -INCLUDE_ASM(s32, "code_317020", func_802BDB84); +ApiStatus func_802BDB84(ScriptInstance* script, s32 isInitialCall) { + s32 unk = script->owner2.npc; // todo what is this? + if (isInitialCall) { + func_800EE994(unk); + } + + return func_800EE9B8(unk) != 0; +} + +// Something is up with D_8010EBB0 I think. It might be a struct or something +#ifdef NON_MATCHING +void func_802BDBBC(s32 arg0) { + if (D_8010EBB0[0] != 0) { + func_80027088(0); + enable_player_input(); + CancelMessageAndBlock(); + clear_partner_move_history(arg0); + D_8010EBB0[0] = 0; + D_8010EBB0[3] = 0; + disable_npc_blur(arg0); + } + D_8010EBB0[3] = 1; +} +#else INCLUDE_ASM(s32, "code_317020", func_802BDBBC); +#endif diff --git a/src/code_838b0_len_5900.c b/src/code_838b0_len_5900.c index 77ffeafbab..81a72c5031 100644 --- a/src/code_838b0_len_5900.c +++ b/src/code_838b0_len_5900.c @@ -101,7 +101,7 @@ INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF414); INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF43C); -INCLUDE_ASM(s32, "code_838b0_len_5900", clear_partner_move_history); +INCLUDE_ASM(void, "code_838b0_len_5900", clear_partner_move_history, Npc* partner); INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF4E0); From 9f068a6461a7a8e92c8eb58bec0023f1edf333f7 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 23 Nov 2020 14:23:07 -0500 Subject: [PATCH 35/38] some of 317E50 --- asm/nonmatchings/code_317E50/func_802BD300.s | 19 ----------------- asm/nonmatchings/code_317E50/func_802BD748.s | 8 ------- asm/nonmatchings/code_317E50/func_802BE4E8.s | 19 ----------------- src/code_317E50.c | 22 +++++++++++++++++--- 4 files changed, 19 insertions(+), 49 deletions(-) delete mode 100644 asm/nonmatchings/code_317E50/func_802BD300.s delete mode 100644 asm/nonmatchings/code_317E50/func_802BD748.s delete mode 100644 asm/nonmatchings/code_317E50/func_802BE4E8.s diff --git a/asm/nonmatchings/code_317E50/func_802BD300.s b/asm/nonmatchings/code_317E50/func_802BD300.s deleted file mode 100644 index b52da54411..0000000000 --- a/asm/nonmatchings/code_317E50/func_802BD300.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BD300 -/* 318050 802BD300 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 318054 802BD304 AFBF0014 */ sw $ra, 0x14($sp) -/* 318058 802BD308 AFB00010 */ sw $s0, 0x10($sp) -/* 31805C 802BD30C 10A00003 */ beqz $a1, .L802BD31C -/* 318060 802BD310 8C90014C */ lw $s0, 0x14c($a0) -/* 318064 802BD314 0C03BB31 */ jal func_800EECC4 -/* 318068 802BD318 0200202D */ daddu $a0, $s0, $zero -.L802BD31C: -/* 31806C 802BD31C 0C03BB3A */ jal func_800EECE8 -/* 318070 802BD320 0200202D */ daddu $a0, $s0, $zero -/* 318074 802BD324 8FBF0014 */ lw $ra, 0x14($sp) -/* 318078 802BD328 8FB00010 */ lw $s0, 0x10($sp) -/* 31807C 802BD32C 0002102B */ sltu $v0, $zero, $v0 -/* 318080 802BD330 03E00008 */ jr $ra -/* 318084 802BD334 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_317E50/func_802BD748.s b/asm/nonmatchings/code_317E50/func_802BD748.s deleted file mode 100644 index d1ed230c4c..0000000000 --- a/asm/nonmatchings/code_317E50/func_802BD748.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BD748 -/* 318498 802BD748 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* 31849C 802BD74C 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* 3184A0 802BD750 03E00008 */ jr $ra -/* 3184A4 802BD754 2C420001 */ sltiu $v0, $v0, 1 diff --git a/asm/nonmatchings/code_317E50/func_802BE4E8.s b/asm/nonmatchings/code_317E50/func_802BE4E8.s deleted file mode 100644 index e50ee13b01..0000000000 --- a/asm/nonmatchings/code_317E50/func_802BE4E8.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BE4E8 -/* 319238 802BE4E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 31923C 802BE4EC AFBF0014 */ sw $ra, 0x14($sp) -/* 319240 802BE4F0 AFB00010 */ sw $s0, 0x10($sp) -/* 319244 802BE4F4 10A00003 */ beqz $a1, .L802BE504 -/* 319248 802BE4F8 8C90014C */ lw $s0, 0x14c($a0) -/* 31924C 802BE4FC 0C03BA65 */ jal func_800EE994 -/* 319250 802BE500 0200202D */ daddu $a0, $s0, $zero -.L802BE504: -/* 319254 802BE504 0C03BA6E */ jal func_800EE9B8 -/* 319258 802BE508 0200202D */ daddu $a0, $s0, $zero -/* 31925C 802BE50C 8FBF0014 */ lw $ra, 0x14($sp) -/* 319260 802BE510 8FB00010 */ lw $s0, 0x10($sp) -/* 319264 802BE514 0002102B */ sltu $v0, $zero, $v0 -/* 319268 802BE518 03E00008 */ jr $ra -/* 31926C 802BE51C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/code_317E50.c b/src/code_317E50.c index f50d902bdd..8c9bbbf551 100644 --- a/src/code_317E50.c +++ b/src/code_317E50.c @@ -4,7 +4,14 @@ INCLUDE_ASM(s32, "code_317E50", func_802BD100_317E50); INCLUDE_ASM(s32, "code_317E50", func_802BD2D8); -INCLUDE_ASM(s32, "code_317E50", func_802BD300); +ApiStatus func_802BD300(ScriptInstance* script, s32 isInitialCall) { + s32 unk = script->owner2.npc; // todo what is this + + if (isInitialCall) { + func_800EECC4(unk); + } + return func_800EECE8(unk) != 0; +} INCLUDE_ASM(s32, "code_317E50", func_802BD338); @@ -12,11 +19,20 @@ INCLUDE_ASM(s32, "code_317E50", func_802BD6DC); INCLUDE_ASM(s32, "code_317E50", func_802BD720); -INCLUDE_ASM(s32, "code_317E50", func_802BD748); +s32 func_802BD748(void) { + return D_8010EBB0[0] == 0; +} INCLUDE_ASM(s32, "code_317E50", func_802BD758); -INCLUDE_ASM(s32, "code_317E50", func_802BE4E8); +ApiStatus func_802BE4E8(ScriptInstance* script, s32 isInitialCall) { + s32 unk = script->owner2.npc; // todo what is this + + if (isInitialCall) { + func_800EE994(unk); + } + return func_800EE9B8(unk) != 0; +} INCLUDE_ASM(s32, "code_317E50", func_802BE520); From 96a2d67c2e496f59a4d7dca31d485141ec5a2d01 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 23 Nov 2020 14:44:38 -0500 Subject: [PATCH 36/38] some more --- asm/nonmatchings/code_319670/func_802BD148.s | 19 ------------------- asm/nonmatchings/code_319670/func_802BE8D4.s | 19 ------------------- asm/nonmatchings/code_3278F0/func_E00021B4.s | 6 ------ asm/nonmatchings/code_3278F0/func_E0002738.s | 14 -------------- src/code_319670.c | 18 ++++++++++++++++-- src/code_3278F0.c | 7 +++++-- 6 files changed, 21 insertions(+), 62 deletions(-) delete mode 100644 asm/nonmatchings/code_319670/func_802BD148.s delete mode 100644 asm/nonmatchings/code_319670/func_802BE8D4.s delete mode 100644 asm/nonmatchings/code_3278F0/func_E00021B4.s delete mode 100644 asm/nonmatchings/code_3278F0/func_E0002738.s diff --git a/asm/nonmatchings/code_319670/func_802BD148.s b/asm/nonmatchings/code_319670/func_802BD148.s deleted file mode 100644 index 125acc9768..0000000000 --- a/asm/nonmatchings/code_319670/func_802BD148.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BD148 -/* 3196B8 802BD148 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3196BC 802BD14C AFBF0014 */ sw $ra, 0x14($sp) -/* 3196C0 802BD150 AFB00010 */ sw $s0, 0x10($sp) -/* 3196C4 802BD154 10A00003 */ beqz $a1, .L802BD164 -/* 3196C8 802BD158 8C90014C */ lw $s0, 0x14c($a0) -/* 3196CC 802BD15C 0C03BB31 */ jal func_800EECC4 -/* 3196D0 802BD160 0200202D */ daddu $a0, $s0, $zero -.L802BD164: -/* 3196D4 802BD164 0C03BB3A */ jal func_800EECE8 -/* 3196D8 802BD168 0200202D */ daddu $a0, $s0, $zero -/* 3196DC 802BD16C 8FBF0014 */ lw $ra, 0x14($sp) -/* 3196E0 802BD170 8FB00010 */ lw $s0, 0x10($sp) -/* 3196E4 802BD174 0002102B */ sltu $v0, $zero, $v0 -/* 3196E8 802BD178 03E00008 */ jr $ra -/* 3196EC 802BD17C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_319670/func_802BE8D4.s b/asm/nonmatchings/code_319670/func_802BE8D4.s deleted file mode 100644 index 039582ff67..0000000000 --- a/asm/nonmatchings/code_319670/func_802BE8D4.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BE8D4 -/* 31AE44 802BE8D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 31AE48 802BE8D8 AFBF0014 */ sw $ra, 0x14($sp) -/* 31AE4C 802BE8DC AFB00010 */ sw $s0, 0x10($sp) -/* 31AE50 802BE8E0 10A00003 */ beqz $a1, .L802BE8F0 -/* 31AE54 802BE8E4 8C90014C */ lw $s0, 0x14c($a0) -/* 31AE58 802BE8E8 0C03BA65 */ jal func_800EE994 -/* 31AE5C 802BE8EC 0200202D */ daddu $a0, $s0, $zero -.L802BE8F0: -/* 31AE60 802BE8F0 0C03BA6E */ jal func_800EE9B8 -/* 31AE64 802BE8F4 0200202D */ daddu $a0, $s0, $zero -/* 31AE68 802BE8F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 31AE6C 802BE8FC 8FB00010 */ lw $s0, 0x10($sp) -/* 31AE70 802BE900 0002102B */ sltu $v0, $zero, $v0 -/* 31AE74 802BE904 03E00008 */ jr $ra -/* 31AE78 802BE908 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_3278F0/func_E00021B4.s b/asm/nonmatchings/code_3278F0/func_E00021B4.s deleted file mode 100644 index a060bfc712..0000000000 --- a/asm/nonmatchings/code_3278F0/func_E00021B4.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E00021B4 -/* 327AA4 E00021B4 03E00008 */ jr $ra -/* 327AA8 E00021B8 00000000 */ nop diff --git a/asm/nonmatchings/code_3278F0/func_E0002738.s b/asm/nonmatchings/code_3278F0/func_E0002738.s deleted file mode 100644 index 94ba4bf6f1..0000000000 --- a/asm/nonmatchings/code_3278F0/func_E0002738.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0002738 -/* 328028 E0002738 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 32802C E000273C AFBF0010 */ sw $ra, 0x10($sp) -/* 328030 E0002740 0C080128 */ jal func_E02004A0 -/* 328034 E0002744 00000000 */ nop -/* 328038 E0002748 8FBF0010 */ lw $ra, 0x10($sp) -/* 32803C E000274C 03E00008 */ jr $ra -/* 328040 E0002750 27BD0018 */ addiu $sp, $sp, 0x18 -/* 328044 E0002754 00000000 */ nop -/* 328048 E0002758 00000000 */ nop -/* 32804C E000275C 00000000 */ nop diff --git a/src/code_319670.c b/src/code_319670.c index 22d658e5ae..6bf3ebff66 100644 --- a/src/code_319670.c +++ b/src/code_319670.c @@ -2,7 +2,14 @@ INCLUDE_ASM(s32, "code_319670", func_802BD100_319670); -INCLUDE_ASM(s32, "code_319670", func_802BD148); +ApiStatus func_802BD148(ScriptInstance* script, s32 isInitialCall) { + s32 unk = script->owner2.npc; // todo what is this + + if (isInitialCall) { + func_800EECC4(unk); + } + return func_800EECE8(unk) != 0; +} INCLUDE_ASM(s32, "code_319670", func_802BD180); @@ -12,7 +19,14 @@ INCLUDE_ASM(s32, "code_319670", func_802BD558); INCLUDE_ASM(s32, "code_319670", func_802BD660); -INCLUDE_ASM(s32, "code_319670", func_802BE8D4); +ApiStatus func_802BE8D4(ScriptInstance* script, s32 isInitialCall) { + s32 unk = script->owner2.npc; // todo what is this + + if (isInitialCall) { + func_800EE994(unk); + } + return func_800EE9B8(unk) != 0; +} INCLUDE_ASM(s32, "code_319670", func_802BE90C); diff --git a/src/code_3278F0.c b/src/code_3278F0.c index 6fac40c33f..20c565b473 100644 --- a/src/code_3278F0.c +++ b/src/code_3278F0.c @@ -2,7 +2,8 @@ INCLUDE_ASM(s32, "code_3278F0", func_E0002000); -INCLUDE_ASM(s32, "code_3278F0", func_E00021B4); +void func_E00021B4(void) { +} INCLUDE_ASM(s32, "code_3278F0", func_E00021BC); @@ -10,4 +11,6 @@ INCLUDE_ASM(s32, "code_3278F0", func_E00022BC); INCLUDE_ASM(s32, "code_3278F0", func_E0002300); -INCLUDE_ASM(s32, "code_3278F0", func_E0002738); +void func_E0002738(void) { + func_E02004A0(); +} From 83c1c2196ddabf174dcbd3111e92c76f5070e3bf Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 23 Nov 2020 14:48:06 -0500 Subject: [PATCH 37/38] asm update --- asm/nonmatchings/code_181810/EndActorSpeech.s | 24 +++++++++---------- .../code_197F40/SetActorIdleJumpGravity.s | 2 +- .../code_197F40/SetActorIdleSpeed.s | 2 +- .../code_759b0_len_61b0/func_800E06D8.s | 8 +++---- .../update_player_shadow.s | 4 ++-- .../code_7bb60_len_41b0/func_800E5098.s | 4 ++-- .../code_7bb60_len_41b0/func_800E5150.s | 4 ++-- .../code_7bb60_len_41b0/func_800E5530.s | 4 ++-- .../code_891b0_len_fb0/func_800EFD08.s | 4 ++-- asm/nonmatchings/code_F5750/func_802D244C.s | 4 ++-- asm/nonmatchings/code_F5750/func_802D2484.s | 4 ++-- .../entity_get_collision_flags.s | 20 ++++++++-------- 12 files changed, 42 insertions(+), 42 deletions(-) diff --git a/asm/nonmatchings/code_181810/EndActorSpeech.s b/asm/nonmatchings/code_181810/EndActorSpeech.s index 59ad1f59ea..722d351baf 100644 --- a/asm/nonmatchings/code_181810/EndActorSpeech.s +++ b/asm/nonmatchings/code_181810/EndActorSpeech.s @@ -33,7 +33,7 @@ glabel EndActorSpeech /* 181C20 80253340 AC22FA70 */ sw $v0, %lo(gSpeakingActorIdleAnim)($at) /* 181C24 80253344 2402FF81 */ addiu $v0, $zero, -0x7f /* 181C28 80253348 16220002 */ bne $s1, $v0, .L80253354 -/* 181C2C 8025334C 00000000 */ nop +/* 181C2C 8025334C 00000000 */ nop /* 181C30 80253350 8E510148 */ lw $s1, 0x148($s2) .L80253354: /* 181C34 80253354 0C09A75B */ jal get_actor @@ -49,7 +49,7 @@ glabel EndActorSpeech /* 181C5C 8025337C 3C01802A */ lui $at, %hi(gSpeakingActorPart) /* 181C60 80253380 AC22FA78 */ sw $v0, %lo(gSpeakingActorPart)($at) /* 181C64 80253384 0C04971C */ jal close_message -/* 181C68 80253388 00000000 */ nop +/* 181C68 80253388 00000000 */ nop /* 181C6C 8025338C 0C03A6D5 */ jal increment_status_menu_disabled /* 181C70 80253390 AE400070 */ sw $zero, 0x70($s2) .L80253394: @@ -63,7 +63,7 @@ glabel EndActorSpeech /* 181C90 802533B0 86220150 */ lh $v0, 0x150($s1) /* 181C94 802533B4 C6200144 */ lwc1 $f0, 0x144($s1) /* 181C98 802533B8 44821000 */ mtc1 $v0, $f2 -/* 181C9C 802533BC 00000000 */ nop +/* 181C9C 802533BC 00000000 */ nop /* 181CA0 802533C0 468010A0 */ cvt.s.w $f2, $f2 /* 181CA4 802533C4 8E220000 */ lw $v0, ($s1) /* 181CA8 802533C8 30428000 */ andi $v0, $v0, 0x8000 @@ -72,12 +72,12 @@ glabel EndActorSpeech /* 181CB4 802533D4 86220152 */ lh $v0, 0x152($s1) /* 181CB8 802533D8 C6200148 */ lwc1 $f0, 0x148($s1) /* 181CBC 802533DC 44821000 */ mtc1 $v0, $f2 -/* 181CC0 802533E0 00000000 */ nop +/* 181CC0 802533E0 00000000 */ nop /* 181CC4 802533E4 468010A0 */ cvt.s.w $f2, $f2 /* 181CC8 802533E8 92220191 */ lbu $v0, 0x191($s1) /* 181CCC 802533EC 46020000 */ add.s $f0, $f0, $f2 /* 181CD0 802533F0 44821000 */ mtc1 $v0, $f2 -/* 181CD4 802533F4 00000000 */ nop +/* 181CD4 802533F4 00000000 */ nop /* 181CD8 802533F8 468010A0 */ cvt.s.w $f2, $f2 /* 181CDC 802533FC 08094D0D */ j .L80253434 /* 181CE0 80253400 46001000 */ add.s $f0, $f2, $f0 @@ -85,13 +85,13 @@ glabel EndActorSpeech /* 181CE4 80253404 86220152 */ lh $v0, 0x152($s1) /* 181CE8 80253408 C6220148 */ lwc1 $f2, 0x148($s1) /* 181CEC 8025340C 44820000 */ mtc1 $v0, $f0 -/* 181CF0 80253410 00000000 */ nop +/* 181CF0 80253410 00000000 */ nop /* 181CF4 80253414 46800020 */ cvt.s.w $f0, $f0 /* 181CF8 80253418 92220191 */ lbu $v0, 0x191($s1) /* 181CFC 8025341C 46001080 */ add.s $f2, $f2, $f0 /* 181D00 80253420 00021042 */ srl $v0, $v0, 1 /* 181D04 80253424 44820000 */ mtc1 $v0, $f0 -/* 181D08 80253428 00000000 */ nop +/* 181D08 80253428 00000000 */ nop /* 181D0C 8025342C 46800020 */ cvt.s.w $f0, $f0 /* 181D10 80253430 46001000 */ add.s $f0, $f2, $f0 .L80253434: @@ -103,7 +103,7 @@ glabel EndActorSpeech /* 181D28 80253448 27A20020 */ addiu $v0, $sp, 0x20 /* 181D2C 8025344C AFA20010 */ sw $v0, 0x10($sp) /* 181D30 80253450 44830000 */ mtc1 $v1, $f0 -/* 181D34 80253454 00000000 */ nop +/* 181D34 80253454 00000000 */ nop /* 181D38 80253458 46800020 */ cvt.s.w $f0, $f0 /* 181D3C 8025345C 46001080 */ add.s $f2, $f2, $f0 /* 181D40 80253460 27A20024 */ addiu $v0, $sp, 0x24 @@ -124,16 +124,16 @@ glabel EndActorSpeech /* 181D7C 8025349C 10400005 */ beqz $v0, .L802534B4 /* 181D80 802534A0 30620080 */ andi $v0, $v1, 0x80 /* 181D84 802534A4 0C03A6CC */ jal decrement_status_menu_disabled -/* 181D88 802534A8 00000000 */ nop +/* 181D88 802534A8 00000000 */ nop /* 181D8C 802534AC 08094D47 */ j .L8025351C /* 181D90 802534B0 24020001 */ addiu $v0, $zero, 1 .L802534B4: /* 181D94 802534B4 10400005 */ beqz $v0, .L802534CC -/* 181D98 802534B8 00000000 */ nop +/* 181D98 802534B8 00000000 */ nop /* 181D9C 802534BC 3C06802A */ lui $a2, %hi(gSpeakingActorTalkAnim) /* 181DA0 802534C0 8CC6FA6C */ lw $a2, %lo(gSpeakingActorTalkAnim)($a2) /* 181DA4 802534C4 08094D35 */ j .L802534D4 -/* 181DA8 802534C8 00000000 */ nop +/* 181DA8 802534C8 00000000 */ nop .L802534CC: /* 181DAC 802534CC 3C06802A */ lui $a2, %hi(gSpeakingActorIdleAnim) /* 181DB0 802534D0 8CC6FA70 */ lw $a2, %lo(gSpeakingActorIdleAnim)($a2) @@ -149,7 +149,7 @@ glabel EndActorSpeech /* 181DD0 802534F0 1462000A */ bne $v1, $v0, .L8025351C /* 181DD4 802534F4 0000102D */ daddu $v0, $zero, $zero /* 181DD8 802534F8 0C03A6CC */ jal decrement_status_menu_disabled -/* 181DDC 802534FC 00000000 */ nop +/* 181DDC 802534FC 00000000 */ nop /* 181DE0 80253500 24020001 */ addiu $v0, $zero, 1 /* 181DE4 80253504 3C03800A */ lui $v1, %hi(D_8009A650) /* 181DE8 80253508 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) diff --git a/asm/nonmatchings/code_197F40/SetActorIdleJumpGravity.s b/asm/nonmatchings/code_197F40/SetActorIdleJumpGravity.s index b5cd7e9ab7..663aed6d84 100644 --- a/asm/nonmatchings/code_197F40/SetActorIdleJumpGravity.s +++ b/asm/nonmatchings/code_197F40/SetActorIdleJumpGravity.s @@ -16,7 +16,7 @@ glabel SetActorIdleJumpGravity /* 199EE4 8026B604 0040802D */ daddu $s0, $v0, $zero /* 199EE8 8026B608 2402FF81 */ addiu $v0, $zero, -0x7f /* 199EEC 8026B60C 16020002 */ bne $s0, $v0, .L8026B618 -/* 199EF0 8026B610 00000000 */ nop +/* 199EF0 8026B610 00000000 */ nop /* 199EF4 8026B614 8E500148 */ lw $s0, 0x148($s2) .L8026B618: /* 199EF8 8026B618 8E250000 */ lw $a1, ($s1) diff --git a/asm/nonmatchings/code_197F40/SetActorIdleSpeed.s b/asm/nonmatchings/code_197F40/SetActorIdleSpeed.s index 4dc9b81b40..92610077cf 100644 --- a/asm/nonmatchings/code_197F40/SetActorIdleSpeed.s +++ b/asm/nonmatchings/code_197F40/SetActorIdleSpeed.s @@ -16,7 +16,7 @@ glabel SetActorIdleSpeed /* 199FDC 8026B6FC 0040802D */ daddu $s0, $v0, $zero /* 199FE0 8026B700 2402FF81 */ addiu $v0, $zero, -0x7f /* 199FE4 8026B704 16020002 */ bne $s0, $v0, .L8026B710 -/* 199FE8 8026B708 00000000 */ nop +/* 199FE8 8026B708 00000000 */ nop /* 199FEC 8026B70C 8E500148 */ lw $s0, 0x148($s2) .L8026B710: /* 199FF0 8026B710 8E250000 */ lw $a1, ($s1) diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E06D8.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E06D8.s index dfd63dc9fc..3bc1dde383 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E06D8.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E06D8.s @@ -17,8 +17,8 @@ glabel func_800E06D8 /* 79BB8 800E0708 82220015 */ lb $v0, 0x15($s1) /* 79BBC 800E070C 1440003C */ bnez $v0, .L800E0800 /* 79BC0 800E0710 0000102D */ daddu $v0, $zero, $zero -/* 79BC4 800E0714 3C028016 */ lui $v0, 0x8016 -/* 79BC8 800E0718 8442A562 */ lh $v0, -0x5a9e($v0) +/* 79BC4 800E0714 3C028016 */ lui $v0, %hi(gCollisionStatus+0x12) +/* 79BC8 800E0718 8442A562 */ lh $v0, %lo(gCollisionStatus+0x12)($v0) /* 79BCC 800E071C 2405FFFF */ addiu $a1, $zero, -1 /* 79BD0 800E0720 14450003 */ bne $v0, $a1, .L800E0730 /* 79BD4 800E0724 3C020200 */ lui $v0, 0x200 @@ -41,8 +41,8 @@ glabel func_800E06D8 /* 79C10 800E0760 080381FF */ j .L800E07FC /* 79C14 800E0764 A62500C6 */ sh $a1, 0xc6($s1) .L800E0768: -/* 79C18 800E0768 3C108016 */ lui $s0, 0x8016 -/* 79C1C 800E076C 8610A562 */ lh $s0, -0x5a9e($s0) +/* 79C18 800E0768 3C108016 */ lui $s0, %hi(gCollisionStatus+0x12) +/* 79C1C 800E076C 8610A562 */ lh $s0, %lo(gCollisionStatus+0x12)($s0) /* 79C20 800E0770 32024000 */ andi $v0, $s0, 0x4000 /* 79C24 800E0774 14400007 */ bnez $v0, .L800E0794 /* 79C28 800E0778 00000000 */ nop diff --git a/asm/nonmatchings/code_759b0_len_61b0/update_player_shadow.s b/asm/nonmatchings/code_759b0_len_61b0/update_player_shadow.s index 5acd2b32e7..53cb948ec9 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/update_player_shadow.s +++ b/asm/nonmatchings/code_759b0_len_61b0/update_player_shadow.s @@ -104,8 +104,8 @@ glabel update_player_shadow /* 7B1FC 800E1D4C AFA20024 */ sw $v0, 0x24($sp) /* 7B200 800E1D50 C7A00038 */ lwc1 $f0, 0x38($sp) /* 7B204 800E1D54 C7A2003C */ lwc1 $f2, 0x3c($sp) -/* 7B208 800E1D58 3C018016 */ lui $at, 0x8016 -/* 7B20C 800E1D5C A422A556 */ sh $v0, -0x5aaa($at) +/* 7B208 800E1D58 3C018016 */ lui $at, %hi(gCollisionStatus+0x6) +/* 7B20C 800E1D5C A422A556 */ sh $v0, %lo(gCollisionStatus+0x6)($at) /* 7B210 800E1D60 E6000028 */ swc1 $f0, 0x28($s0) /* 7B214 800E1D64 E6020030 */ swc1 $f2, 0x30($s0) /* 7B218 800E1D68 C62C006C */ lwc1 $f12, 0x6c($s1) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5098.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5098.s index 85f2e2a78f..81021f0a28 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5098.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5098.s @@ -22,8 +22,8 @@ glabel func_800E5098 /* 7E584 800E50D4 00001810 */ mfhi $v1 /* 7E588 800E50D8 14600019 */ bnez $v1, .L800E5140 /* 7E58C 800E50DC 00000000 */ nop -/* 7E590 800E50E0 3C048016 */ lui $a0, 0x8016 -/* 7E594 800E50E4 8484A552 */ lh $a0, -0x5aae($a0) +/* 7E590 800E50E0 3C048016 */ lui $a0, %hi(gCollisionStatus+0x2) +/* 7E594 800E50E4 8484A552 */ lh $a0, %lo(gCollisionStatus+0x2)($a0) /* 7E598 800E50E8 0C016F6A */ jal get_collider_type_by_id /* 7E59C 800E50EC 00000000 */ nop /* 7E5A0 800E50F0 304300FF */ andi $v1, $v0, 0xff diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5150.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5150.s index 9ec0e689a1..391d88aa6b 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5150.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5150.s @@ -7,7 +7,7 @@ glabel func_800E5150 /* 7E608 800E5158 0C03945D */ jal func_800E5174 /* 7E60C 800E515C 00000000 */ nop /* 7E610 800E5160 8FBF0010 */ lw $ra, 0x10($sp) -/* 7E614 800E5164 3C018016 */ lui $at, 0x8016 -/* 7E618 800E5168 A422A55A */ sh $v0, -0x5aa6($at) +/* 7E614 800E5164 3C018016 */ lui $at, %hi(gCollisionStatus+0xA) +/* 7E618 800E5168 A422A55A */ sh $v0, %lo(gCollisionStatus+0xA)($at) /* 7E61C 800E516C 03E00008 */ jr $ra /* 7E620 800E5170 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s index c93bbf845b..5178c456de 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s @@ -214,8 +214,8 @@ glabel func_800E5530 .L800E5844: /* 7ECF4 800E5844 16020014 */ bne $s0, $v0, .L800E5898 /* 7ECF8 800E5848 00000000 */ nop -/* 7ECFC 800E584C 3C048016 */ lui $a0, 0x8016 -/* 7ED00 800E5850 8484A552 */ lh $a0, -0x5aae($a0) +/* 7ECFC 800E584C 3C048016 */ lui $a0, %hi(gCollisionStatus+0x2) +/* 7ED00 800E5850 8484A552 */ lh $a0, %lo(gCollisionStatus+0x2)($a0) /* 7ED04 800E5854 0C016F6A */ jal get_collider_type_by_id /* 7ED08 800E5858 00000000 */ nop /* 7ED0C 800E585C 304200FF */ andi $v0, $v0, 0xff diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s b/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s index 6fc2ebe769..d5e057e463 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s @@ -16,8 +16,8 @@ glabel func_800EFD08 /* 891E4 800EFD34 3C108011 */ lui $s0, 0x8011 /* 891E8 800EFD38 8E109480 */ lw $s0, -0x6b80($s0) .L800EFD3C: -/* 891EC 800EFD3C 3C048016 */ lui $a0, 0x8016 -/* 891F0 800EFD40 9484A552 */ lhu $a0, -0x5aae($a0) +/* 891EC 800EFD3C 3C048016 */ lui $a0, %hi(gCollisionStatus+0x2) +/* 891F0 800EFD40 9484A552 */ lhu $a0, %lo(gCollisionStatus+0x2)($a0) /* 891F4 800EFD44 0C016F6A */ jal get_collider_type_by_id /* 891F8 800EFD48 00000000 */ nop /* 891FC 800EFD4C 822300B4 */ lb $v1, 0xb4($s1) diff --git a/asm/nonmatchings/code_F5750/func_802D244C.s b/asm/nonmatchings/code_F5750/func_802D244C.s index 69905f6401..c07681e32b 100644 --- a/asm/nonmatchings/code_F5750/func_802D244C.s +++ b/asm/nonmatchings/code_F5750/func_802D244C.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802D244C -/* F6DFC 802D244C 3C028016 */ lui $v0, 0x8016 -/* F6E00 802D2450 8442A552 */ lh $v0, -0x5aae($v0) +/* F6DFC 802D244C 3C028016 */ lui $v0, %hi(gCollisionStatus+0x2) +/* F6E00 802D2450 8442A552 */ lh $v0, %lo(gCollisionStatus+0x2)($v0) /* F6E04 802D2454 27BDFFE8 */ addiu $sp, $sp, -0x18 /* F6E08 802D2458 04400006 */ bltz $v0, .L802D2474 /* F6E0C 802D245C AFBF0010 */ sw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_F5750/func_802D2484.s b/asm/nonmatchings/code_F5750/func_802D2484.s index add23d1b26..bfc33e073d 100644 --- a/asm/nonmatchings/code_F5750/func_802D2484.s +++ b/asm/nonmatchings/code_F5750/func_802D2484.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802D2484 -/* F6E34 802D2484 3C028016 */ lui $v0, 0x8016 -/* F6E38 802D2488 8442A552 */ lh $v0, -0x5aae($v0) +/* F6E34 802D2484 3C028016 */ lui $v0, %hi(gCollisionStatus+0x2) +/* F6E38 802D2488 8442A552 */ lh $v0, %lo(gCollisionStatus+0x2)($v0) /* F6E3C 802D248C 00021027 */ nor $v0, $zero, $v0 /* F6E40 802D2490 000217C3 */ sra $v0, $v0, 0x1f /* F6E44 802D2494 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/entity_get_collision_flags.s b/asm/nonmatchings/code_a5dd0_len_114e0/entity_get_collision_flags.s index 76d64f0484..6bbb66a76c 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/entity_get_collision_flags.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/entity_get_collision_flags.s @@ -14,8 +14,8 @@ glabel entity_get_collision_flags /* A6FDC 801108DC 00621024 */ and $v0, $v1, $v0 /* A6FE0 801108E0 AC820000 */ sw $v0, ($a0) .L801108E4: -/* A6FE4 801108E4 3C038016 */ lui $v1, 0x8016 -/* A6FE8 801108E8 8463A552 */ lh $v1, -0x5aae($v1) +/* A6FE4 801108E4 3C038016 */ lui $v1, %hi(gCollisionStatus+0x2) +/* A6FE8 801108E8 8463A552 */ lh $v1, %lo(gCollisionStatus+0x2)($v1) /* A6FEC 801108EC 2402FFFF */ addiu $v0, $zero, -1 /* A6FF0 801108F0 10620005 */ beq $v1, $v0, .L80110908 /* A6FF4 801108F4 30624000 */ andi $v0, $v1, 0x4000 @@ -24,8 +24,8 @@ glabel entity_get_collision_flags /* A7000 80110900 50C20001 */ beql $a2, $v0, .L80110908 /* A7004 80110904 34A50001 */ ori $a1, $a1, 1 .L80110908: -/* A7008 80110908 3C038016 */ lui $v1, 0x8016 -/* A700C 8011090C 8463A554 */ lh $v1, -0x5aac($v1) +/* A7008 80110908 3C038016 */ lui $v1, %hi(gCollisionStatus+0x4) +/* A700C 8011090C 8463A554 */ lh $v1, %lo(gCollisionStatus+0x4)($v1) /* A7010 80110910 2402FFFF */ addiu $v0, $zero, -1 /* A7014 80110914 10620005 */ beq $v1, $v0, .L8011092C /* A7018 80110918 30624000 */ andi $v0, $v1, 0x4000 @@ -34,8 +34,8 @@ glabel entity_get_collision_flags /* A7024 80110924 50C20001 */ beql $a2, $v0, .L8011092C /* A7028 80110928 34A50100 */ ori $a1, $a1, 0x100 .L8011092C: -/* A702C 8011092C 3C038016 */ lui $v1, 0x8016 -/* A7030 80110930 8463A558 */ lh $v1, -0x5aa8($v1) +/* A702C 8011092C 3C038016 */ lui $v1, %hi(gCollisionStatus+0x8) +/* A7030 80110930 8463A558 */ lh $v1, %lo(gCollisionStatus+0x8)($v1) /* A7034 80110934 2402FFFF */ addiu $v0, $zero, -1 /* A7038 80110938 10620005 */ beq $v1, $v0, .L80110950 /* A703C 8011093C 30624000 */ andi $v0, $v1, 0x4000 @@ -54,8 +54,8 @@ glabel entity_get_collision_flags /* A706C 8011096C 50C20001 */ beql $a2, $v0, .L80110974 /* A7070 80110970 34A50010 */ ori $a1, $a1, 0x10 .L80110974: -/* A7074 80110974 3C038016 */ lui $v1, 0x8016 -/* A7078 80110978 8463A564 */ lh $v1, -0x5a9c($v1) +/* A7074 80110974 3C038016 */ lui $v1, %hi(gCollisionStatus+0x14) +/* A7078 80110978 8463A564 */ lh $v1, %lo(gCollisionStatus+0x14)($v1) /* A707C 8011097C 2402FFFF */ addiu $v0, $zero, -1 /* A7080 80110980 10620005 */ beq $v1, $v0, .L80110998 /* A7084 80110984 30624000 */ andi $v0, $v1, 0x4000 @@ -64,8 +64,8 @@ glabel entity_get_collision_flags /* A7090 80110990 50C20001 */ beql $a2, $v0, .L80110998 /* A7094 80110994 34A50040 */ ori $a1, $a1, 0x40 .L80110998: -/* A7098 80110998 3C038016 */ lui $v1, 0x8016 -/* A709C 8011099C 8463A562 */ lh $v1, -0x5a9e($v1) +/* A7098 80110998 3C038016 */ lui $v1, %hi(gCollisionStatus+0x12) +/* A709C 8011099C 8463A562 */ lh $v1, %lo(gCollisionStatus+0x12)($v1) /* A70A0 801109A0 2402FFFF */ addiu $v0, $zero, -1 /* A70A4 801109A4 1062000B */ beq $v1, $v0, .L801109D4 /* A70A8 801109A8 30624000 */ andi $v0, $v1, 0x4000 From 36113303d976cabe85fb4b7767e1b4b87016d59d Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Wed, 25 Nov 2020 18:50:22 -0500 Subject: [PATCH 38/38] PR comments --- src/world/common/UnkDurationCheck.inc.c | 2 +- src/world/common/UnkNpcAIFunc10.inc.c | 2 +- src/world/common/UnkNpcAIFunc11.inc.c | 2 +- src/world/common/UnkNpcAIFunc3.inc.c | 2 +- src/world/common/UnkNpcAIFunc5.inc.c | 2 +- src/world/common/UnkNpcAIFunc7.inc.c | 2 +- src/world/common/UnkNpcAIFunc8.inc.c | 2 +- src/world/common/UnkNpcDurationFlagFunc.inc.c | 2 +- src/world/common/set_script_owner_npc_anim.inc.c | 1 + src/world/common/set_script_owner_npc_col_height.inc.c | 1 + 10 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/world/common/UnkDurationCheck.inc.c b/src/world/common/UnkDurationCheck.inc.c index 349be98203..2796181b78 100644 --- a/src/world/common/UnkDurationCheck.inc.c +++ b/src/world/common/UnkDurationCheck.inc.c @@ -5,7 +5,7 @@ static void UnkDurationCheck(ScriptInstance* script) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); npc->duration--; - if ((npc->duration << 0x10) <= 0) { + if (npc->duration <= 0) { script->functionTemp[0].s = 0; } } diff --git a/src/world/common/UnkNpcAIFunc10.inc.c b/src/world/common/UnkNpcAIFunc10.inc.c index 457c995e92..5662d6a16a 100644 --- a/src/world/common/UnkNpcAIFunc10.inc.c +++ b/src/world/common/UnkNpcAIFunc10.inc.c @@ -5,7 +5,7 @@ static void UnkNpcAIFunc10(ScriptInstance* script) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); npc->duration--; - if ((npc->duration << 0x10) == 0) { + if (npc->duration == 0) { script->functionTemp[0].s = 15; } } diff --git a/src/world/common/UnkNpcAIFunc11.inc.c b/src/world/common/UnkNpcAIFunc11.inc.c index 00a783472a..250c081824 100644 --- a/src/world/common/UnkNpcAIFunc11.inc.c +++ b/src/world/common/UnkNpcAIFunc11.inc.c @@ -16,7 +16,7 @@ static void UnkNpcAIFunc11(ScriptInstance* script, NpcAISettings* aiSettings, s3 npc_move_heading(npc, npc->moveSpeed, npc->yaw); func_8003D660(npc, 1); npc->duration--; - if ((npc->duration << 0x10) == 0) { + if (npc->duration == 0) { script->functionTemp[0].s = 12; } } diff --git a/src/world/common/UnkNpcAIFunc3.inc.c b/src/world/common/UnkNpcAIFunc3.inc.c index 96553e0c20..a4f3102240 100644 --- a/src/world/common/UnkNpcAIFunc3.inc.c +++ b/src/world/common/UnkNpcAIFunc3.inc.c @@ -4,7 +4,7 @@ static void UnkNpcAIFunc3(ScriptInstance* script) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - if ((npc->duration <= 0) || ((--npc->duration << 0x10) <= 0)) { + if ((npc->duration <= 0) || (--npc->duration <= 0)) { if (npc->unk_8C == 0) { npc->duration = 0; script->functionTemp[0].s = 14; diff --git a/src/world/common/UnkNpcAIFunc5.inc.c b/src/world/common/UnkNpcAIFunc5.inc.c index b4c508ec8d..6f40f3bbc9 100644 --- a/src/world/common/UnkNpcAIFunc5.inc.c +++ b/src/world/common/UnkNpcAIFunc5.inc.c @@ -6,7 +6,7 @@ static void UnkNpcAIFunc5(ScriptInstance* script) { Npc* npc = get_npc_unsafe(enemy->npcID); npc->duration--; - if ((npc->duration << 0x10) <= 0) { + if (npc->duration <= 0) { enemy->varTable[0] = 0; script->functionTemp[0].s = 12; } diff --git a/src/world/common/UnkNpcAIFunc7.inc.c b/src/world/common/UnkNpcAIFunc7.inc.c index b343138841..bf5c391571 100644 --- a/src/world/common/UnkNpcAIFunc7.inc.c +++ b/src/world/common/UnkNpcAIFunc7.inc.c @@ -6,7 +6,7 @@ static void UnkNpcAIFunc7(ScriptInstance* script) { Npc* npc = get_npc_unsafe(enemy->npcID); npc->duration--; - if ((npc->duration << 0x10) <= 0) { + if (npc->duration <= 0) { enemy->varTable[0] = 3; npc->duration = enemy->varTable[2]; npc->currentAnim = enemy->animList[9]; diff --git a/src/world/common/UnkNpcAIFunc8.inc.c b/src/world/common/UnkNpcAIFunc8.inc.c index 33d133535a..d79df68192 100644 --- a/src/world/common/UnkNpcAIFunc8.inc.c +++ b/src/world/common/UnkNpcAIFunc8.inc.c @@ -6,7 +6,7 @@ static void UnkNpcAIFunc8(ScriptInstance* script) { Npc* npc = get_npc_unsafe(enemy->npcID); npc->duration--; - if ((npc->duration << 0x10) <= 0) { + if (npc->duration <= 0) { enemy->varTable[0] = 4; npc->currentAnim = enemy->animList[0]; npc->duration = enemy->varTable[3]; diff --git a/src/world/common/UnkNpcDurationFlagFunc.inc.c b/src/world/common/UnkNpcDurationFlagFunc.inc.c index 8b8b54edbd..0a60a7420f 100644 --- a/src/world/common/UnkNpcDurationFlagFunc.inc.c +++ b/src/world/common/UnkNpcDurationFlagFunc.inc.c @@ -6,7 +6,7 @@ static void UnkNpcDurationFlagFunc(ScriptInstance* script) { Npc* npc = get_npc_unsafe(enemy->npcID); npc->duration--; - if ((npc->duration << 0x10) == 0) { + if (npc->duration == 0) { if (enemy->unk_B0 & 0x80) { script->functionTemp[0].s = 15; } else { diff --git a/src/world/common/set_script_owner_npc_anim.inc.c b/src/world/common/set_script_owner_npc_anim.inc.c index bbccfccb1a..aee9a583c4 100644 --- a/src/world/common/set_script_owner_npc_anim.inc.c +++ b/src/world/common/set_script_owner_npc_anim.inc.c @@ -1,4 +1,5 @@ #include "common.h" +#include "map.h" static void set_script_owner_npc_anim(ScriptInstance* script) { Enemy* enemy = script->owner1.enemy; diff --git a/src/world/common/set_script_owner_npc_col_height.inc.c b/src/world/common/set_script_owner_npc_col_height.inc.c index 8f4c81ea21..be6aa1e5d0 100644 --- a/src/world/common/set_script_owner_npc_col_height.inc.c +++ b/src/world/common/set_script_owner_npc_col_height.inc.c @@ -1,4 +1,5 @@ #include "common.h" +#include "map.h" static void set_script_owner_npc_col_height(ScriptInstance* script) { Enemy* enemy = script->owner1.enemy;