diff options
| author | drifloony <drifloony@users.noreply.github.com> | 2017-07-21 15:34:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-21 15:34:05 -0700 |
| commit | 8ed167339c52b32e5149077e9e2c91f981268af9 (patch) | |
| tree | 765873e0da27644ad94fcf0eee9a8f76f95e96c6 /src/use_pokeblock.c | |
| parent | 95d3a7848ca07ad7035d1a717b489c4ea303a3ba (diff) | |
| parent | 68e47a6fa0b56451223c22dc9a759534c988db5b (diff) | |
Merge branch 'master' into mon_markings
Diffstat (limited to 'src/use_pokeblock.c')
| -rw-r--r-- | src/use_pokeblock.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index ce83bc1c2..3aa2f1fa5 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -102,10 +102,11 @@ const struct SpriteTemplate gSpriteTemplate_840618C = { asm(".text\n" ".include \"constants/gba_constants.inc\""); -extern struct UnkPokenavStruct_Sub1 *gUnknown_02039304; -extern MainCallback gUnknown_02039308; -extern struct Pokeblock *gUnknown_0203930C; -extern u8 gUnknown_02039310; +static EWRAM_DATA struct UnkPokenavStruct_Sub1 *gUnknown_02039304 = NULL; +static EWRAM_DATA MainCallback gUnknown_02039308 = NULL; +static EWRAM_DATA struct Pokeblock *gUnknown_0203930C = NULL; +EWRAM_DATA u8 gUnknown_02039310 = 0; +EWRAM_DATA s16 gUnknown_02039312 = 0; extern u16 gKeyRepeatStartDelay; extern u16 gScriptItemId; // FIXME: remove after merge of #349 Pokeblock |