diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-12-21 19:43:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-21 16:43:06 -0800 |
| commit | b4f931f75f5d87fc7844e00eab7d7b99eceb3622 (patch) | |
| tree | 0b818358d479bf2d6ececafabe71c5c0918e19cc /src/d/actor/d_a_npc_tkj2.cpp | |
| parent | c69e31bd0fbfde798f0b86f5880f1b9d21696365 (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_npc_tkj2.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_tkj2.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/actor/d_a_npc_tkj2.cpp b/src/d/actor/d_a_npc_tkj2.cpp index cdbfadc75b..616b263fde 100644 --- a/src/d/actor/d_a_npc_tkj2.cpp +++ b/src/d/actor/d_a_npc_tkj2.cpp @@ -420,7 +420,7 @@ static cXyz return_pos_get(npc_tkj2_class* i_this) { return player->current.pos; } -static u8 l_initHIO; +static u8 hio_set; static daNpc_Tkj2_HIO_c l_HIO; @@ -1029,7 +1029,7 @@ static int daNpc_Tkj2_Delete(npc_tkj2_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "Tkj2"); if (i_this->field_0xa9c != 0) { - l_initHIO = 0; + hio_set = 0; } if (a_this->heap != NULL) { @@ -1093,9 +1093,9 @@ static cPhs__Step daNpc_Tkj2_Create(fopAc_ac_c* a_this) { return cPhs_ERROR_e; } - if (l_initHIO == 0) { + if (hio_set == 0) { i_this->field_0xa9c = 1; - l_initHIO = 1; + hio_set = 1; l_HIO.field_0x4 = -1; } |
