summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_obj_rw.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2025-12-21 19:43:06 -0500
committerGitHub <noreply@github.com>2025-12-21 16:43:06 -0800
commitb4f931f75f5d87fc7844e00eab7d7b99eceb3622 (patch)
tree0b818358d479bf2d6ececafabe71c5c0918e19cc /src/d/actor/d_a_obj_rw.cpp
parentc69e31bd0fbfde798f0b86f5880f1b9d21696365 (diff)
Miscellaneous data fixes (#2983)
* Replace bss lbl_ with init$0000 * Rename l_HIOInit to hio_set The name is excluded from TP's weird maps, but hio_set is the name they used in TWW's maps. * Fix a couple more init$ names * Fix nbomb missing some bss * Fix camera localstatics having wrong name * Rename l_initHIO to hio_set * A couple manual fixes * Rename hioInit to hio_set * Couple more manual fixes * Fix d_a_npc_cd2 data and function order * More data fixes * Fix inconsistent hex vs decimal
Diffstat (limited to 'src/d/actor/d_a_obj_rw.cpp')
-rw-r--r--src/d/actor/d_a_obj_rw.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/actor/d_a_obj_rw.cpp b/src/d/actor/d_a_obj_rw.cpp
index 72657355a8..e0f7332d6d 100644
--- a/src/d/actor/d_a_obj_rw.cpp
+++ b/src/d/actor/d_a_obj_rw.cpp
@@ -170,7 +170,7 @@ static void action(obj_rw_class* i_this) {
i_this->field_0x670 = i_this->field_0x66c * (20.0f + TREG_F(16)) * cM_ssin(i_this->field_0x672);
}
-static u8 l_HIOInit;
+static u8 hio_set;
static daOBJ_RW_HIO_c l_HIO;
@@ -267,7 +267,7 @@ static int daOBJ_RW_Delete(obj_rw_class* i_this) {
dComIfG_resDelete(&i_this->phase, "Obj_rw");
if (i_this->HIOInit) {
- l_HIOInit = FALSE;
+ hio_set = FALSE;
mDoHIO_DELETE_CHILD(l_HIO.id);
}
@@ -310,9 +310,9 @@ static int daOBJ_RW_Create(fopAc_ac_c* actor) {
OS_REPORT("//////////////OBJ_RW SET 2 !!\n");
- if (!l_HIOInit) {
+ if (!hio_set) {
i_this->HIOInit = TRUE;
- l_HIOInit = TRUE;
+ hio_set = TRUE;
l_HIO.id = mDoHIO_CREATE_CHILD("いのししまる焼き", &l_HIO);
}