finished safari_zone

include/constants/flags.h

@@ -2,6 +2,7 @@
 #define GUARD_CONSTANTS_FLAGS_H
 
 // Sys Flags Maybe
+#define FLAG_SYS_SAFARI_MODE                                        0x800
 #define FLAG_WHITE_FLUTE_ACTIVE                                     0x803
 #define FLAG_BLACK_FLUTE_ACTIVE                                     0x804
 
@@ -1436,7 +1437,7 @@
 #define FLAG_SYS_USE_STRENGTH     (CODE_FLAGS + 0x29)
 #define FLAG_SYS_WEATHER_CTRL     (CODE_FLAGS + 0x2A)
 #define FLAG_SYS_CYCLING_ROAD     (CODE_FLAGS + 0x2B)
-#define FLAG_SYS_SAFARI_MODE      (CODE_FLAGS + 0x2C)
+#define FLAG_0x88C                (CODE_FLAGS + 0x2C)
 #define FLAG_SYS_CRUISE_MODE      (CODE_FLAGS + 0x2D)
 
 #define FLAG_0x88E                (CODE_FLAGS + 0x2E)

include/event_scripts.h

@@ -1148,4 +1148,9 @@ extern const u8 EventScript_FldEffStrength[];
 extern const u8 EventScript_FailSweetScent[];
 extern const u8 EventScript_FldEffRockSmash[];
 
+extern const u8 EventScript_SafariTimesUp[];
+extern const u8 EventScript_SafariRetire[];
+extern const u8 EventScript_SafariWarpOut[];
+extern const u8 EventScript_SafariOutOfBalls[];
+
 #endif //GUARD_EVENT_SCRIPTS_H

include/field_screen_effect.h

@@ -6,5 +6,6 @@
 void sub_80AF79C(void);
 void sub_807F028(u8);
 void sub_80B0244(void);
+void sub_807E3EC(void);
 
 #endif // GUARD_FIELD_SCREEN_EFFECT_H

include/overworld.h

@@ -69,8 +69,8 @@ void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *);
 void sub_8086230(void);
 void CB2_ReturnToField(void);
 bool32 sub_8087598(void);
-void c2_exit_to_overworld_1_continue_scripts_restart_music(void);
-void warp_in(void);
+void CB2_ReturnToFieldContinueScriptPlayMapMusic(void);
+void WarpIntoMap(void);
 u8 get_map_light_level_by_bank_and_number(s8 mapGroup, s8 mapNum);
 void sub_8086194(void);
 void sub_8084CCC(u8 spawn);
@@ -110,7 +110,7 @@ bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType);
 void Overworld_ResetStateAfterTeleport(void);
 
 void Overworld_FadeOutMapMusic(void);
-void sub_805671C(void);
+void CB2_LoadMap(void);
 bool8 sub_8055FC4(void);
 bool8 is_light_level_8_or_9(u8 mapType);
 bool32 sub_8055C9C(void);

include/safari_zone.h

@@ -15,7 +15,4 @@ void ExitSafariMode(void);
 bool8 SafariZoneTakeStep(void);
 void SafariZoneRetirePrompt(void);
 
-struct Pokeblock *SafariZoneGetActivePokeblock(void);
-void SafariZoneActivatePokeblockFeeder(u8 pokeblock_index);
-
 #endif // GUARD_SAFARI_ZONE_H