Use e_misc.h across overlays

config/splat.us.stcen.yaml

@@ -45,8 +45,9 @@ segments:
       - [0xBA4, .data, e_red_door]
       - [0xBBC, .data, st_common]
       - [0xDBC, .data, e_collect]
-      - [0x10AC, .data, entity_relic_orb]
-      - [0x1110, data]
+      - [0x10AC, .data, e_misc]
+      - [0x1110, .data, e_misc]
+      - [0x11C8, data]
       - [0x12D4, .data, rooms]
       - [0x1300, .data, e_layout] # layout entries data
       - [0x13F0, data]
@@ -59,9 +60,9 @@ segments:
       - [0xD4D8, .rodata, e_red_door] # EntityRedDoor
       - [0xD540, .rodata, e_collect] # EntityPrizeDrop
       - [0xD560, .rodata, e_collect] # EntityEquipItemDrop
-      - [0xD578, .rodata, entity_relic_orb]
-      - [0xD5B0, .rodata, entity_message_box]
-      - [0xD5C4, .rodata, 18084] # EntityStageNamePopup
+      - [0xD578, .rodata, e_misc]
+      - [0xD5B0, .rodata, e_misc]
+      - [0xD5C4, .rodata, e_stage_name] # EntityStageNamePopup
       - [0xD5F8, .rodata, prim_helpers]
       - [0xD600, c]
       - [0xDF0C, c, holyglassescutscene]
@@ -73,10 +74,8 @@ segments:
       - [0x14264, c, st_common]
       - [0x15714, c, e_collect]
       - [0x16C90, c, blit_char]
-      - [0x16F30, c, entity_relic_orb]
-      - [0x17A00, c, entity_heart_drop]
-      - [0x17B28, c, entity_message_box]
-      - [0x18084, c]
+      - [0x16F30, c, e_misc]
+      - [0x1A5F0, c, e_stage_name]
       - [0x1B274, c]
       - [0x1BED4, c, prim_helpers]
       - [0x1C704, .bss, header]

config/splat.us.stdre.yaml

@@ -52,8 +52,9 @@ segments:
       - [0xD68, .data, e_red_door]
       - [0xD80, .data, st_common]
       - [0xF80, .data, e_collect]
-      - [0x1270, .data, entity_relic_orb]
-      - [0x12D4, data]
+      - [0x1270, .data, e_misc]
+      - [0x12D4, .data, e_misc]
+      - [0x138C, data]
       - [0x1498, .data, rooms]
       - [0x14AC, data]
       - [0x1608, .data, e_layout] # layout entries data
@@ -71,9 +72,9 @@ segments:
       - [0x11910, .rodata, 1697C] # EntityFadeToWhite
       - [0x1193C, .rodata, e_red_door] # EntityRedDoor
       - [0x119C4, .rodata, e_collect]
-      - [0x119DC, .rodata, entity_relic_orb]
-      - [0x11A14, .rodata, entity_message_box]
-      - [0x11A28, .rodata, 1E1C8] # EntityStageNamePopup
+      - [0x119DC, .rodata, e_misc]
+      - [0x11A14, .rodata, e_misc]
+      - [0x11A28, .rodata, 20734] # EntityStageNamePopup
       - [0x11A5C, .rodata, prim_helpers]
       - [0x11A64, c]
       - [0x11A64, c, succubus]
@@ -87,10 +88,8 @@ segments:
       - [0x1A3A8, c, st_common]
       - [0x1B858, c, e_collect]
       - [0x1CDC4, c, blit_char]
-      - [0x1D074, c, entity_relic_orb]
-      - [0x1DB44, c, entity_heart_drop]
-      - [0x1DC6C, c, entity_message_box]
-      - [0x1E1C8, c]
+      - [0x1D074, c, e_misc]
+      - [0x20734, c]
       - [0x22018, c, prim_helpers]
       - [0x22848, c]
       - [0x23264, .bss, create_entity]

config/splat.us.stmad.yaml

@@ -43,8 +43,8 @@ segments:
       - [0x9EC, .data, st_common]
       - [0xBEC, .data, e_collect]
       - [0xED8, data]
-      - [0xEF8, .data, entity_relic_orb]
-      - [0xF5C, data]
+      - [0xEF8, .data, e_misc]
+      - [0x1068, data]
       - [0x1130, data, g_Rooms]
       - [0x11D4, data] # assets/st/mad/0.objlayout
       # - [0x11E8, data] # assets/st/mad/1.objlayout
@@ -76,7 +76,7 @@ segments:
       - [0xD7CC, .rodata, e_red_door] # EntityRedDoor
       - [0xD83C, .rodata, e_collect]
       - [0xD85C, .rodata, e_collect] # EntityEquipItemDrop
-      - [0xD874, .rodata, entity_relic_orb]
+      - [0xD874, .rodata, e_misc]
       - [0xD8AC, rodata]
       - [0xD8C0, .rodata, prim_helpers]
       - [0xD8C8, c]
@@ -86,8 +86,8 @@ segments:
       - [0x110A8, c, e_red_door]
       - [0x11D3C, c, st_common]
       - [0x1344C, c, e_collect]
-      - [0x149C0, c, entity_relic_orb]
-      - [0x15520, c]
+      - [0x149C0, c, e_misc]
+      - [0x17B94, c]
       - [0x18FA0, c, prim_helpers]
       - [0x197D8, .bss, create_entity]
       - [0x197ED, .bss, bss]

config/splat.us.stno3.yaml

@@ -53,8 +53,8 @@ segments:
       - [0x20AC, .data, e_red_door]
       - [0x20C4, .data, st_common]
       - [0x22C4, .data, e_collect]
-      - [0x25B4, .data, entity_relic_orb]
-      - [0x2618, data]
+      - [0x25B4, .data, e_misc]
+      - [0x26D0, data]
       - [0x3180, data]
       - [0x3870, data]
       - [0x39A0, data]
@@ -84,9 +84,9 @@ segments:
       - [0x37590, .rodata, e_collect] # CollectGold text
       - [0x375E0, .rodata, e_collect] # EntityPrizeDrop
       - [0x37600, .rodata, e_collect] # EntityEquipItemDrop
-      - [0x37618, .rodata, entity_relic_orb]
-      - [0x37650, .rodata, entity_message_box]
-      - [0x37664, .rodata, 48A84] # EntityStageNamePopup
+      - [0x37618, .rodata, e_misc]
+      - [0x37650, .rodata, e_misc]
+      - [0x37664, .rodata, 4AFF0] # EntityStageNamePopup
       - [0x37698, rodata]
       - [0x376E8, rodata]
       - [0x37738, .rodata, 516B4]
@@ -107,10 +107,8 @@ segments:
       - [0x44C64, c, st_common]
       - [0x45BC0, c, e_collect]
       - [0x47680, c, blit_char]
-      - [0x47930, c, entity_relic_orb]
-      - [0x48400, c, entity_heart_drop]
-      - [0x48528, c, entity_message_box]
-      - [0x48A84, c]
+      - [0x47930, c, e_misc]
+      - [0x4AFF0, c]
       - [0x50A2C, c, player_water_effect]
       - [0x516B4, c]
       - [0x53F38, c]

config/splat.us.stnp3.yaml

@@ -51,7 +51,7 @@ segments:
       - [0x1A50, .data, st_common]
       - [0x1C50, .data, e_collect]
       - [0x1F40, .data, e_misc] # EntityRelicOrb
-      - [0x1FA4, data]
+      - [0x205C, data]
       - [0x22B0, data]
       - [0x23D0, data]
       - [0x2400, data]

config/splat.us.stnz0.yaml

@@ -46,8 +46,7 @@ segments:
       - [0x1960, .data, e_red_door]
       - [0x1978, .data, st_common]
       - [0x1B78, .data, e_collect]
-      - [0x1E68, .data, entity_relic_orb]
-      - [0x1ECC, data]
+      - [0x1E68, .data, e_misc]
       - [0x1F80, .data, e_particles]
       - [0x2000, .data, e_room_fg]
       - [0x208C, .data, e_bone_scimitar]
@@ -79,8 +78,8 @@ segments:
       - [0x30740, .rodata, e_collect] # CollectGold text
       - [0x30790, .rodata, e_collect] # EntityPrizeDrop
       - [0x307B0, .rodata, e_collect] # EntityEquipItemDrop
-      - [0x307C8, .rodata, entity_relic_orb]
-      - [0x30800, .rodata, entity_message_box]
+      - [0x307C8, .rodata, e_misc]
+      - [0x30800, .rodata, e_misc]
       - [0x30814, .rodata, e_bone_scimitar]
       - [0x30834, .rodata, e_axe_knight]
       - [0x30858, .rodata, e_bloody_zombie]
@@ -109,10 +108,7 @@ segments:
       - [0x3C8EC, c, st_common]
       - [0x3D848, c, e_collect]
       - [0x3F308, c, blit_char]
-      - [0x3F5B8, c, entity_relic_orb]
-      - [0x40088, c, entity_heart_drop]
-      - [0x401B0, c, entity_message_box]
-      - [0x4070C, c]
+      - [0x3F5B8, c, e_misc]
       - [0x42AA8, c, e_particles]
       - [0x432EC, c, e_room_fg]
       - [0x433d8, c, popup]

config/symbols.stmad.txt

@@ -11,18 +11,8 @@ g_eBreakableHitboxes = 0x80180664;
 g_eBreakableExplosionTypes = 0x8018066C;
 g_eBreakableanimSets = 0x80180674;
 g_eBreakableDrawModes = 0x80180684;
-g_HeartDropArray = 0x80180F5C;
-g_eUnk14SpawnRots = 0x80180FAC;
-unk14_yVel = 0x80180FE4;
-unk14_startFrame = 0x80180FFC;
-unk14_lifetime = 0x80181000;
-unk15_rot = 0x80180FBC;
-unk15_yVel = 0x80180FCC;
 g_Rooms = 0x80181130;
 g_eRedDoorTiles = 0x80180594;
-g_olroxDroolCollOffsets = 0x80181008;
-g_UnkRecursPrimVecOrder = 0x80181020;
-g_UnkRecursPrim2Inds = 0x80181040;
 g_pStrObjLayout0 = 0x801811D4;
 g_pStrObjLayout1 = 0x801811E8;
 g_pStrObjLayout2 = 0x80181206;

config/symbols.us.stcen.txt

@@ -1,13 +1,3 @@
-g_eUnk14SpawnRots = 0x80181110;
-unk15_rot = 0x80181120;
-unk15_yVel = 0x80181130;
-unk14_yVel = 0x80181148;
-unk14_startFrame = 0x80181160;
-unk14_lifetime = 0x80181164;
-g_olroxDroolCollOffsets = 0x8018116C;
-g_UnkEntityAnimData = 0x80181174;
-g_UnkRecursPrimVecOrder = 0x80181184;
-g_UnkRecursPrim2Inds = 0x801811A4;
 g_ESoulStealOrbAngles = 0x801811C8;
 g_ESoulStealOrbSprt = 0x801811D8;
 g_ESoulStealOrbAnim = 0x80181238;

config/symbols.us.stdre.txt

@@ -15,16 +15,6 @@ g_eBreakableanimSets = 0x80180640;
 g_eBreakableDrawModes = 0x80180650;
 g_HeartDropArray = 0x80180660;
 g_CloneShootOrder = 0x801807D4;
-g_eUnk14SpawnRots = 0x801812D4;
-unk15_rot = 0x801812E4;
-unk15_yVel = 0x801812F4;
-unk14_yVel = 0x8018130C;
-unk14_startFrame = 0x80181324;
-unk14_lifetime = 0x80181328;
-g_olroxDroolCollOffsets = 0x80181330;
-g_UnkEntityAnimData = 0x80181338;
-g_UnkRecursPrimVecOrder = 0x80181348;
-g_UnkRecursPrim2Inds = 0x80181368;
 g_ESoulStealOrbAngles = 0x8018138C;
 g_ESoulStealOrbSprt = 0x8018139C;
 g_ESoulStealOrbAnim = 0x801813FC;

config/symbols.us.stno3.txt

@@ -16,16 +16,6 @@ g_eBreakableanimSets = 0x80180E80;
 g_eBreakableDrawModes = 0x80180E90;
 g_TrapDoorFlag = 0x8018123C;
 g_HeartDropArray = 0x80181C8C;
-g_eUnk14SpawnRots = 0x80182618;
-unk15_rot = 0x80182628;
-unk15_yVel = 0x80182638;
-unk14_yVel = 0x80182650;
-unk14_startFrame = 0x80182668;
-unk14_lifetime = 0x8018266C;
-g_olroxDroolCollOffsets = 0x80182674;
-g_UnkEntityAnimData = 0x8018267C;
-g_UnkRecursPrimVecOrder = 0x8018268C;
-g_UnkRecursPrim2Inds = 0x801826AC;
 g_ESoulStealOrbAngles = 0x801826D0;
 g_ESoulStealOrbSprt = 0x801826E0;
 g_ESoulStealOrbAnim = 0x80182740;

config/symbols.us.stnp3.txt

@@ -1,16 +1,6 @@
 g_GfxBanks = 0x801806DC;
 g_TrapDoorFlag = 0x80181104;
 g_HeartDropArray = 0x80181618;
-g_eUnk14SpawnRots = 0x80181FA4;
-unk15_rot = 0x80181FB4;
-unk15_yVel = 0x80181FC4;
-unk14_yVel = 0x80181FDC;
-unk14_startFrame = 0x80181FF4;
-unk14_lifetime = 0x80181FF8;
-g_olroxDroolCollOffsets = 0x80182000;
-g_UnkEntityAnimData = 0x80182008;
-g_UnkRecursPrimVecOrder = 0x80182018;
-g_UnkRecursPrim2Inds = 0x80182038;
 g_ESoulStealOrbAngles = 0x8018205C;
 g_ESoulStealOrbSprt = 0x8018206C;
 g_ESoulStealOrbAnim = 0x801820CC;

config/symbols.us.stnz0.txt

@@ -4,16 +4,6 @@ g_BossFlag = 0x80181010;
 g_ElevatorTarget = 0x801813A4;
 g_ElevatorTargetPos = 0x801813A8;
 g_HeartDropArray = 0x801813B0;
-g_eUnk14SpawnRots = 0x80181ECC;
-unk15_rot = 0x80181EDC;
-unk15_yVel = 0x80181EEC;
-unk14_yVel = 0x80181F04;
-unk14_startFrame = 0x80181F1C;
-unk14_lifetime = 0x80181F20;
-g_olroxDroolCollOffsets = 0x80181F28;
-g_UnkEntityAnimData = 0x80181F30;
-g_UnkRecursPrimVecOrder = 0x80181F40;
-g_UnkRecursPrim2Inds = 0x80181F60;
 g_eBlueDoorUV = 0x801826B8;
 g_eBlueDoorTiles = 0x801826D0;
 EntityWargExplosionPuffOpaque = 0x801B3C38;

src/st/cen/entity_heart_drop.c → src/st/cen/e_misc.c

@@ -2,4 +2,4 @@
 #include "cen.h"
 
 #define HEART_DROP_CASTLE_FLAG 0xC0
-#include "../entity_heart_drop.h"
+#include "../e_misc.h"

src/st/cen/entity_relic_orb.c → src/st/cen/e_stage_name.c

@@ -1,4 +1,4 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 #include "cen.h"
 
-#include "../entity_relic_orb.h"
+#include "../e_stage_name.h"

src/st/dre/1E1C8.c → src/st/dre/20734.c

@@ -1,42 +1,6 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 #include "dre.h"
 
-#include "../check_coll_offsets.h"
-
-#include "../entity_unkId13.h"
-
-#include "../entity_unkId14_spawner.h"
-
-#include "../entity_unkId15_spawner.h"
-
-#include "../entity_unkId14.h"
-
-#include "../entity_unkId15.h"
-
-#include "../entity_olrox_drool.h"
-
-#include "../unk_collision_func5.h"
-
-#include "../unk_collision_func4.h"
-
-#include "../entity_intense_explosion.h"
-
-#include "../initialize_unk_entity.h"
-
-#include "../make_entity_from_id.h"
-
-#include "../make_explosions.h"
-
-#include "../entity_big_red_fireball.h"
-
-#include "../unk_recursive_primfunc_1.h"
-
-#include "../unk_recursive_primfunc_2.h"
-
-#include "../clut_lerp.h"
-
-#include "../play_sfx_positional.h"
-
 #include "../e_stage_name.h"
 
 #include "../entity_soul_steal_orb.h"

src/st/dre/entity_heart_drop.c → src/st/dre/e_misc.c

@@ -2,4 +2,4 @@
 #include "dre.h"
 
 #define HEART_DROP_CASTLE_FLAG 0x118
-#include "../entity_heart_drop.h"
+#include "../e_misc.h"