diff options
| author | YunataSavior <58997725+YunataSavior@users.noreply.github.com> | 2025-10-03 01:10:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-03 01:10:14 -0700 |
| commit | db219f067f1168f1b4d4748f21437c1917cdfa9b (patch) | |
| tree | 0dc672b30dceebbbcb647bcd6d0d2ed254f431bd /src/d/actor/d_a_npc_sola.cpp | |
| parent | 009f08f2f3537bb0032052b68adec79971beeff0 (diff) | |
NPC str cleanup and misc for 100% linkability (#2723)
* NPC str cleanup and misc for 100% linkability
* d_msg_object equiv
Diffstat (limited to 'src/d/actor/d_a_npc_sola.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_sola.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/d/actor/d_a_npc_sola.cpp b/src/d/actor/d_a_npc_sola.cpp index 29b42bf469..3545f3f1e9 100644 --- a/src/d/actor/d_a_npc_sola.cpp +++ b/src/d/actor/d_a_npc_sola.cpp @@ -232,20 +232,15 @@ SECTION_DATA static u8 l_bmdData[8] = { }; /* 80AEF21C-80AEF22C -00001 0010+00 0/1 0/0 0/0 .data l_evtList */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_evtList[4] = { - (void*)&d_a_npc_sola__stringBase0, - (void*)NULL, - (void*)(((char*)&d_a_npc_sola__stringBase0) + 0x1), - (void*)NULL, +static daNpcT_evtData_c l_evtList[2] = { + {"", 0}, + {"NO_RESPONSE", 0}, }; -#pragma pop /* 80AEF22C-80AEF234 -00001 0008+00 2/3 0/0 0/0 .data l_resNameList */ -SECTION_DATA static void* l_resNameList[2] = { - (void*)&d_a_npc_sola__stringBase0, - (void*)(((char*)&d_a_npc_sola__stringBase0) + 0xD), +static char* l_resNameList[2] = { + "", + "solA", }; /* 80AEF234-80AEF238 000040 0002+02 1/0 0/0 0/0 .data l_loadResPtrn0 */ @@ -293,7 +288,7 @@ SECTION_DATA static u8 l_motionSequenceData[16] = { #pragma pop /* 80AEF294-80AEF298 -00001 0004+00 1/1 0/0 0/0 .data mCutNameList__12daNpc_solA_c */ -SECTION_DATA void* daNpc_solA_c::mCutNameList = (void*)&d_a_npc_sola__stringBase0; +char* daNpc_solA_c::mCutNameList[1] = {""}; /* 80AEF298-80AEF2A4 0000A4 000C+00 2/2 0/0 0/0 .data mCutList__12daNpc_solA_c */ SECTION_DATA u8 daNpc_solA_c::mCutList[12] = { |