fix merge conflict and use EVENT_OBJECT_TEMPLATES_COUNT

1 files changed, 3 insertions, 1 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 0454dc86b..ea6ef5bcd 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -268,7 +268,8 @@ SECTIONS {
         src/battle_arena.o(.text);
         src/battle_factory.o(.text);
         src/battle_pike.o(.text);
-        asm/battle_frontier_2.o(.text);
+        asm/mossdeep_gym.o(.text);
+        src/battle_pyramid.o(.text);
         src/item_menu.o(.text);
         src/list_menu.o(.text);
         src/dynamic_placeholder_text_util.o(.text);
@@ -579,6 +580,7 @@ SECTIONS {
         data/battle_pike.o(.rodata);
         src/battle_pike.o(.rodata);
         data/battle_frontier_3.o(.rodata);
+        src/battle_pyramid.o(.rodata);
         src/item_menu.o(.rodata);
         src/list_menu.o(.rodata);
         src/save_location.o(.rodata);