Dedupe no0 e_stage_name (#1757)

config/splat.us.stno0.yaml

@@ -55,7 +55,7 @@ segments:
       - [0x4141C, .rodata, blit_char]
       - [0x4142C, .rodata, e_misc]
       - [0x41468, .rodata, 4C750]
-      - [0x414A8, .rodata, e_stage_name]
+      - [0x414B8, .rodata, e_stage_name]
       - [0x414EC, .rodata, unk_4F4A8]
       - [0x4184C, .rodata, prim_helpers]
       - [0x41854, c, first_c_file]

config/symbols.us.stno0.txt

@@ -3,6 +3,7 @@ g_pStObjLayoutVertical = 0x8018084C;
 PfnEntityUpdates = 0x80180920;
 g_InitializeData0 = 0x80180A70;
 g_InitializeEntityData0 = 0x80180A7C;
+g_EInitGeneric = 0x80180A94;
 g_InitDataEnt13 = 0x80180AD0;
 g_eInitGeneric2 = 0x80180AE8;
 g_eDamageDisplayInit = 0x80180B18;

src/st/no0/4C750.c

@@ -111,3 +111,5 @@ INCLUDE_ASM("st/no0/nonmatchings/4C750", func_us_801CE0F8);
 void func_us_801CE2D8(void) {}
 
 INCLUDE_ASM("st/no0/nonmatchings/4C750", func_us_801CE2E0);
+
+INCLUDE_RODATA("st/no0/nonmatchings/4C750", D_us_801C14A8);

src/st/no0/e_stage_name.c

@@ -1,8 +1,2 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-#include "common.h"
-
-INCLUDE_ASM("st/no0/nonmatchings/e_stage_name", StageNamePopupHelper);
-
-INCLUDE_RODATA("st/no0/nonmatchings/e_stage_name", D_us_801C14A8);
-
-INCLUDE_ASM("st/no0/nonmatchings/e_stage_name", EntityStageNamePopup);
+#include "../e_stage_name.h"

src/st/no0/prim_helpers.c

@@ -1,3 +1,2 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-#include <game.h>
 #include "../prim_helpers.h"

src/st/no0/unk_4F4A8.c

@@ -22,11 +22,11 @@ INCLUDE_ASM("st/no0/nonmatchings/unk_4F4A8", func_us_801D191C);
 
 INCLUDE_ASM("st/no0/nonmatchings/unk_4F4A8", func_us_801D20A4);
 
-extern u16 D_us_80180A94[];
+extern u16 g_EInitGeneric[];
 
 void func_us_801D2318(Entity* entity) {
     if (entity->step == 0) {
-        InitializeEntity(D_us_80180A94);
+        InitializeEntity(g_EInitGeneric);
     }
     if ((entity - 1)->entityId != 0x2E) {
         DestroyEntity(entity);