diff options
| author | garak <garakmon@gmail.com> | 2018-12-03 16:58:28 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-12-03 16:58:28 -0500 |
| commit | 2c14d6ee6c40f4b7e5cd9366080ce911d67be718 (patch) | |
| tree | 4a70ca275a2f161d2d23f63d0608f92d8ea08acb /src/safari_zone.c | |
| parent | d6a88e0eaa7d74f187fb27f8a376203f40537340 (diff) | |
| parent | d9a5de5317d4589b139f9532a7e8bf3b851e673f (diff) | |
fix merge conflicts
Diffstat (limited to 'src/safari_zone.c')
| -rw-r--r-- | src/safari_zone.c | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/src/safari_zone.c b/src/safari_zone.c index 427a5ceb8..accf94981 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -1,11 +1,15 @@ #include "global.h" -#include "safari_zone.h" +#include "battle.h" #include "event_data.h" -#include "constants/game_stat.h" +#include "field_player_avatar.h" +#include "overworld.h" #include "main.h" -#include "battle.h" -#include "string_util.h" #include "pokeblock.h" +#include "safari_zone.h" +#include "script.h" +#include "string_util.h" +#include "tv.h" +#include "constants/game_stat.h" struct PokeblockFeeder { @@ -18,26 +22,12 @@ struct PokeblockFeeder #define NUM_POKEBLOCK_FEEDERS 10 -extern u8 gBattleOutcome; -extern void* gFieldCallback; - -extern u8 EventScript_2A4B8A[]; -extern u8 EventScript_2A4B6F[]; -extern u8 EventScript_2A4B4C[]; -extern u8 EventScript_2A4B9B[]; - -extern void sub_80EE44C(u8, u8); -extern void IncrementGameStat(u8 index); -extern void ScriptContext1_SetupScript(u8*); -extern void ScriptContext2_RunNewScript(u8*); -extern void CB2_ReturnToField(void); -extern void CB2_ReturnToFieldContinueScriptPlayMapMusic(void); -extern void CB2_LoadMap(void); +extern const u8 EventScript_2A4B8A[]; +extern const u8 EventScript_2A4B6F[]; +extern const u8 EventScript_2A4B4C[]; +extern const u8 EventScript_2A4B9B[]; + extern void sub_80AF6F0(void); -extern void ScriptContext1_Stop(void); -extern void WarpIntoMap(void); -extern void GetXYCoordsOneStepInFrontOfPlayer(s16* x, s16* y); -extern void PlayerGetDestCoords(s16* x, s16* y); EWRAM_DATA u8 gNumSafariBalls = 0; EWRAM_DATA static u16 sSafariZoneStepCounter = 0; |