1 files changed, 8 insertions, 12 deletions
diff --git a/src/safari_zone.c b/src/safari_zone.c
index 600ba95d2..08bfbefbf 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -1,8 +1,12 @@
 #include "global.h"
-#include "flag.h"
+#include "safari_zone.h"
+#include "asm.h"
+#include "field_player_avatar.h"
+#include "event_data.h"
 #include "main.h"
 #include "script.h"
 #include "string_util.h"
+#include "rom4.h"
 
 struct PokeblockFeeder
 {
@@ -15,16 +19,8 @@ struct PokeblockFeeder
 
 #define NUM_POKEBLOCK_FEEDERS 10
 
-void ClearAllPokeblockFeeders(void);
-void DecrementFeederStepCounters(void);
-extern void c2_exit_to_overworld_2_switch(void);
-extern void c2_exit_to_overworld_1_continue_scripts_restart_music(void);
-extern void sub_8080E44(void);
-extern void CB2_LoadMap(void);
-extern void sav12_xor_increment(u8);
-extern void warp_in(void);
-extern void GetXYCoordsOneStepInFrontOfPlayer(void *, void *);
-extern void PlayerGetDestCoords(u16 *, u16 *);
+static void ClearAllPokeblockFeeders(void);
+static void DecrementFeederStepCounters(void);
 
 extern u8 gUnknown_02024D26;
 
@@ -59,7 +55,7 @@ void ResetSafariZoneFlag(void)
 
 void EnterSafariMode(void)
 {
-    sav12_xor_increment(0x11);
+    IncrementGameStat(0x11);
     SetSafariZoneFlag();
     ClearAllPokeblockFeeders();
     gNumSafariBalls = 30;