summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_npc_lf.cpp
diff options
context:
space:
mode:
authorMax Roncace <me@caseif.net>2025-12-22 18:41:19 -0500
committerGitHub <noreply@github.com>2025-12-22 15:41:19 -0800
commit9767e76ba049ce20ac0d2236758f050bcd36d90f (patch)
tree30519a089779dd789f5564adef5afb27a163a190 /src/d/actor/d_a_npc_lf.cpp
parent8fece471c6d5203aa09d5c280584096adc1b8539 (diff)
GCN data 100% matching (#2987)
* Update GZ2J01 symbols from linked DOL * GCN data 100% matching * Run dtk apply
Diffstat (limited to 'src/d/actor/d_a_npc_lf.cpp')
-rw-r--r--src/d/actor/d_a_npc_lf.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/d/actor/d_a_npc_lf.cpp b/src/d/actor/d_a_npc_lf.cpp
index 128ab10a68..c8517c3ff6 100644
--- a/src/d/actor/d_a_npc_lf.cpp
+++ b/src/d/actor/d_a_npc_lf.cpp
@@ -11,12 +11,6 @@
#include "d/actor/d_a_npc_lf.h"
#include "f_op/f_op_camera_mng.h"
-static f32 wp[3] = {
- 0.5f,
- 1.0f,
- 2.5f
-};
-
daNPC_LF_HIO_c::daNPC_LF_HIO_c() {
field_0x04 = -1;
field_0x08 = 1.0f;
@@ -70,7 +64,7 @@ static int daNPC_LF_Draw(npc_lf_class* i_this) {
return 1;
}
-static u8 data_80A6AA90;
+static u8 hio_set;
static daNPC_LF_HIO_c l_HIO;
@@ -155,6 +149,12 @@ static void npc_lf_move(fopAc_ac_c* param_0, lf_s* pFish) {
}
static void action(fopAc_ac_c* param_0, lf_s* pFish) {
+ static f32 wp[3] = {
+ 0.5f,
+ 1.0f,
+ 2.5f
+ };
+
cXyz pos;
pFish->field_0x18++;
@@ -231,7 +231,7 @@ static int daNPC_LF_Delete(npc_lf_class* i_this) {
dComIfG_resDelete(&i_this->mPhase, "NPC_LF");
if (i_this->field_0x1fc0 != 0) {
- data_80A6AA90 = 0;
+ hio_set = 0;
}
return 1;
@@ -293,9 +293,9 @@ static cPhs__Step daNPC_LF_Create(fopAc_ac_c* i_this) {
return cPhs_ERROR_e;
}
- if (data_80A6AA90 == 0) {
+ if (hio_set == 0) {
a_this->field_0x1fc0 = 1;
- data_80A6AA90 = 1;
+ hio_set = 1;
l_HIO.field_0x04 = -1;
}