Map HD CEN's e_particle and create_entity

And fix some segment offsets.
hohle · Oct 4, 2024 · 32a448e · 32a448e
1 parent 87c23d5
commit 32a448e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 71 deletions.
diff --git a/config/splat.hd.stcen.yaml b/config/splat.hd.stcen.yaml
@@ -50,8 +50,8 @@ segments:
  - [0xBD4, .data, e_red_door]
  - [0xBEC, .data, st_common]
  - [0xDEC, data, e_collect]
- - [0x1140, data, e_misc]
- - [0x11FC, data, e_particles]
+ - [0x10DC, data, e_misc]
+ - [0x11F8, .data, e_particles]
  - [0x127C, .data, e_room_fg]
  - [0x1308, .data, rooms]
  - [0x1334, .data, e_layout]
@@ -83,8 +83,9 @@ segments:
  - [0x1B0AC, c, e_room_fg]
  - [0x1B240, c, popup]
  - [0x1B570, c, prim_helpers]
- - [0x1BDA0, sbss, header]
- - [0x1BE00, sbss, create_entity]
+ - [0x1BDA0, .bss, header]
+ - [0x1BE00, .bss, create_entity]
+ - [0x1be10, sbss, bss]
  - [0x1CA10, sbss, cutscene]
  - [0x1CAC4, sbss, e_collect]
  - [0x1CB04]
diff --git a/config/symbols.hd.stcen.txt b/config/symbols.hd.stcen.txt
@@ -1,5 +1,3 @@
-g_pStObjLayoutHorizontal = 0x801801EC;
-g_pStObjLayoutVertical = 0x801802C0;
 g_InitializeData0 = 0x80180410;
 g_InitializeEntityData0 = 0x8018041C;
 g_eMariaInit = 0x80180428;
@@ -24,9 +22,7 @@ c_HeartPrizes = 0x80181018;
 g_ExplosionYVelocities = 0x8018101C;
 g_bigRedFireballAnim = 0x80181044;
 g_ExplosionAnimations = 0x801810C8;
-g_ESoulStealOrbAngles = 0x801811FC;
-g_ESoulStealOrbSprt = 0x8018120C;
-g_ESoulStealOrbAnim = 0x8018126C;
+g_RelicOrbTexts = 0x801810DC;
 D_80181658 = 0x80181678;
 D_8018199C = 0x801819BC;
 D_80183A40 = 0x80183A60;
@@ -36,7 +32,7 @@ D_8018658C = 0x801865AC;
 D_8018678C = 0x801867AC;
 D_8018698C = 0x801869AC;
 D_801869AC = 0x801869CC;
-g_RelicOrbTexts = 0x8018D580;
+g_RelicOrbText = 0x8018D580;
 CutsceneUnk1 = 0x8018DEF4;
 SetCutsceneScript = 0x8018DF44;
 CutsceneUnk3 = 0x8018E0F8;
@@ -48,19 +44,6 @@ CEN_EntityCutscene = 0x8018E6C0;
 EntityMaria = 0x801902FC;
 func_801904B8 = 0x8019041C;
 EntityElevatorStationary = 0x801904A4;
-Random = 0x80190DA0;
-CreateEntityWhenInVerticalRange = 0x80192A54;
-CreateEntityWhenInHorizontalRange = 0x80192B6C;
-FindFirstEntityToTheRight = 0x80192C84;
-FindFirstEntityToTheLeft = 0x80192CD0;
-CreateEntitiesToTheLeft = 0x80192D28;
-CreateEntitiesToTheRight = 0x80192E24;
-FindFirstEntityAbove = 0x80192F38;
-FindFirstEntityBelow = 0x80192F84;
-CreateEntitiesAbove = 0x80192FDC;
-CreateEntitiesBelow = 0x801930D8;
-InitRoomEntities = 0x801931EC;
-UpdateRoomPosition = 0x80193364;
 CreateEntityFromCurrentEntity = 0x80193418;
 DestroyEntity = 0x801941B8;
 AnimateEntity = 0x801942E8;

diff --git a/src/st/cen/create_entity.c b/src/st/cen/create_entity.c
@@ -1,35 +1,3 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-#include "cen.h"
-
-#if !defined(VERSION_HD)
 
 #include "../create_entity.h"
-
-#else
-
-#include "../create_entity_from_layout.h"
-#include "../create_entity_in_range.h"
-
-INCLUDE_ASM("st/cen/nonmatchings/create_entity", FindFirstEntityToTheRight);
-
-INCLUDE_ASM("st/cen/nonmatchings/create_entity", FindFirstEntityToTheLeft);
-
-INCLUDE_ASM("st/cen/nonmatchings/create_entity", CreateEntitiesToTheLeft);
-
-INCLUDE_ASM("st/cen/nonmatchings/create_entity", CreateEntitiesToTheRight);
-
-INCLUDE_ASM("st/cen/nonmatchings/create_entity", FindFirstEntityAbove);
-
-INCLUDE_ASM("st/cen/nonmatchings/create_entity", FindFirstEntityBelow);
-
-INCLUDE_ASM("st/cen/nonmatchings/create_entity", CreateEntitiesAbove);
-
-INCLUDE_ASM("st/cen/nonmatchings/create_entity", CreateEntitiesBelow);
-
-INCLUDE_ASM("st/cen/nonmatchings/create_entity", InitRoomEntities);
-
-INCLUDE_ASM("st/cen/nonmatchings/create_entity", UpdateRoomPosition);
-
-#include "../create_entity_from_entity.h"
-
-#endif
diff --git a/src/st/cen/e_misc.c b/src/st/cen/e_misc.c
@@ -9,7 +9,7 @@
 
 #else
 
-INCLUDE_RODATA("st/cen/nonmatchings/e_misc", g_RelicOrbTexts);
+INCLUDE_RODATA("st/cen/nonmatchings/e_misc", g_RelicOrbText);
 
 INCLUDE_ASM("st/cen/nonmatchings/e_misc", EntityRelicOrb);
 

diff --git a/src/st/cen/e_particles.c b/src/st/cen/e_particles.c
@@ -1,17 +1,2 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-
-#include "cen.h"
-
-#if !defined(VERSION_HD)
-
 #include "../e_particles.h"
-
-#else
-
-// data differs
-
-#include "../entity_soul_steal_orb.h"
-
-#include "../entity_enemy_blood.h"
-
-#endif