From e80268a3d2c780aeca42a52976f2577479d1fad5 Mon Sep 17 00:00:00 2001
From: Angie <angheloalf95@gmail.com>
Date: Sun, 24 Jul 2022 20:25:01 -0400
Subject: [PATCH] Move segment symbols declarations back to segment_symbols.h

---
 include/segment_symbols.h  | 10 ++++++++++
 src/code/z_actor_dlftbls.c | 11 -----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/include/segment_symbols.h b/include/segment_symbols.h
index a37dcc6df8..f4386346c7 100644
--- a/include/segment_symbols.h
+++ b/include/segment_symbols.h
@@ -76,6 +76,16 @@ DECLARE_OVERLAY_SEGMENT(daytelop)
 DECLARE_OVERLAY_SEGMENT(kaleido_scope)
 DECLARE_OVERLAY_SEGMENT(player_actor)
 
+#define DEFINE_ACTOR(name, _1, _2, _3) DECLARE_OVERLAY_SEGMENT(name)
+#define DEFINE_ACTOR_INTERNAL(_0, _1, _2, _3)
+#define DEFINE_ACTOR_UNSET(_0)
+
+#include "tables/actor_table.h"
+
+#undef DEFINE_ACTOR
+#undef DEFINE_ACTOR_INTERNAL
+#undef DEFINE_ACTOR_UNSET
+
 DECLARE_ROM_SEGMENT(gameplay_keep)
 DECLARE_ROM_SEGMENT(gameplay_field_keep)
 DECLARE_ROM_SEGMENT(gameplay_dangeon_keep)
diff --git a/src/code/z_actor_dlftbls.c b/src/code/z_actor_dlftbls.c
index 6fd4d44e0b..bdb1a4c324 100644
--- a/src/code/z_actor_dlftbls.c
+++ b/src/code/z_actor_dlftbls.c
@@ -1,16 +1,5 @@
 #include "global.h"
 
-// Linker symbol declarations (used in the table below)
-#define DEFINE_ACTOR(name, _1, _2, _3) DECLARE_OVERLAY_SEGMENT(name)
-#define DEFINE_ACTOR_INTERNAL(_0, _1, _2, _3)
-#define DEFINE_ACTOR_UNSET(_0)
-
-#include "tables/actor_table.h"
-
-#undef DEFINE_ACTOR
-#undef DEFINE_ACTOR_INTERNAL
-#undef DEFINE_ACTOR_UNSET
-
 // Init Vars declarations (also used in the table below)
 #define DEFINE_ACTOR(name, _1, _2, _3) extern ActorInit name##_InitVars;
 #define DEFINE_ACTOR_INTERNAL(name, _1, _2, _3) extern ActorInit name##_InitVars;