diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-20 12:11:46 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-20 12:11:46 -0400 |
commit | 4d5c1ca03b4e7db3c44c71afaa01b1549a282a19 (patch) | |
tree | ec2e9ec5f3e4a6d8523e80ab58e6c9c296fbc05c /src/overworld.c | |
parent | 3f762629e830c0cad66c4efeea5b918bdf4cce20 (diff) | |
parent | 6edacdee36d31b2df69559f28a33b8d9e958bf5e (diff) |
Merge pull request #732 from PikalaxALT/modern_gcc
Modernize code for compatibility with later releases of GCC
Diffstat (limited to 'src/overworld.c')
-rw-r--r-- | src/overworld.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/overworld.c b/src/overworld.c index 4356752c1..2097abc53 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -186,15 +186,15 @@ static u8 GetAdjustedInitialDirection(struct InitialPlayerAvatarState *playerStr static u16 GetCenterScreenMetatileBehavior(void); // IWRAM bss vars -IWRAM_DATA static void *sUnusedOverworldCallback; -IWRAM_DATA static u8 sPlayerTradingStates[4]; +static void *sUnusedOverworldCallback; +static u8 sPlayerTradingStates[4]; // This callback is called with a player's key code. It then returns an // adjusted key code, effectively intercepting the input before anything // can process it. -IWRAM_DATA static u16 (*sPlayerKeyInterceptCallback)(u32); -IWRAM_DATA static bool8 sUnknown_03000E18; -IWRAM_DATA static u8 sRfuKeepAliveTimer; -IWRAM_DATA static u32 sUnusedVar; +static u16 (*sPlayerKeyInterceptCallback)(u32); +static bool8 sUnknown_03000E18; +static u8 sRfuKeepAliveTimer; +static u32 sUnusedVar; // IWRAM common u16 *gBGTilemapBuffers1; |