fix merge conflict and use EVENT_OBJECT_TEMPLATES_COUNT

1 files changed, 1 insertions, 3 deletions

diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 52dbdf65e..9b3c70ad7 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -19,6 +19,7 @@
 #include "link.h"
 #include "script.h"
 #include "battle_pike.h"
+#include "battle_pyramid.h"
 #include "constants/items.h"
 #include "constants/maps.h"
 
@@ -26,9 +27,6 @@ extern const u8 EventScript_RepelWoreOff[];
 
 #define NUM_FEEBAS_SPOTS    6
 
-extern void GenerateBattlePyramidWildMon(void);
-extern bool8 InBattlePyramid(void);
-
 // this file's functions
 static u16 FeebasRandom(void);
 static void FeebasSeedRng(u16 seed);