From db4af549fdf13cdaca6654f7bb9ef54ecef14359 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 29 Jul 2019 20:44:18 -0500 Subject: resolve some Emerald differences --- src/overworld.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/overworld.c') diff --git a/src/overworld.c b/src/overworld.c index 17ecfaf8d..19fe5f377 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -85,6 +85,11 @@ extern struct MapLayout * const gMapLayouts[]; extern struct MapHeader * const * const gMapGroups[]; extern s32 gMaxFlashLevel; +u16 word_3004858; +void (*gFieldCallback)(void); +u8 gUnknown_03004860; +u8 gFieldLinkPlayerCount; + EWRAM_DATA struct WarpData gLastUsedWarp = {0}; EWRAM_DATA struct WarpData gWarpDestination = {0}; EWRAM_DATA struct WarpData gFixedDiveWarp = {0}; @@ -98,11 +103,6 @@ static u8 gUnknown_03000580[4]; static u16 (*gUnknown_03000584)(u32); static u8 gUnknown_03000588; -u16 word_3004858; -extern void (*gFieldCallback)(void); -u8 gUnknown_03004860; -u8 gFieldLinkPlayerCount; - static void CB2_Overworld(void); static u8 GetAdjustedInitialTransitionFlags(struct InitialPlayerAvatarState*, u16, u8); static u8 GetAdjustedInitialDirection(struct InitialPlayerAvatarState*, u8, u16, u8); -- cgit v1.2.3