diff options
| author | garak <garakmon@gmail.com> | 2019-07-20 12:30:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-20 12:30:41 -0400 |
| commit | c39d25ff4d3cf6cb8b3a6fea208de0cc3c6a7c8c (patch) | |
| tree | bce0030d8901a6b84e705baca169989fff1a4f71 /src/pokemon_storage_system.c | |
| parent | dfa3e079c0f55565fc60a6a1ba0ef04de9be94c2 (diff) | |
| parent | 4d5c1ca03b4e7db3c44c71afaa01b1549a282a19 (diff) | |
Merge branch 'master' into navdata
Diffstat (limited to 'src/pokemon_storage_system.c')
| -rw-r--r-- | src/pokemon_storage_system.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 0ddad55a6..c5cd71d15 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -443,7 +443,7 @@ enum #define TAG_TILE_1 0x1 // IWRAM bss -IWRAM_DATA static u32 gUnknown_03000F78[98]; +static u32 gUnknown_03000F78[98]; // EWRAM DATA EWRAM_DATA static u8 sPreviousBoxOption = 0; @@ -464,6 +464,9 @@ EWRAM_DATA static u8 sMovingMonOrigBoxPos = 0; EWRAM_DATA static bool8 sCanOnlyMove = 0; // This file's functions. +#if !defined(NONMATCHING) && MODERN +#define static +#endif static void CreatePCMenu(u8 whichMenu, s16 *windowIdPtr); static void Cb2_EnterPSS(u8 boxOption); static u8 GetCurrentBoxOption(void); |