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/field_effect.c | |
| parent | 95d3a7848ca07ad7035d1a717b489c4ea303a3ba (diff) | |
| parent | 68e47a6fa0b56451223c22dc9a759534c988db5b (diff) | |
Merge branch 'master' into mon_markings
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index 889664dfa..3632d7053 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -28,6 +28,8 @@ #define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))} +EWRAM_DATA u32 gUnknown_0202FF84[8] = {0}; + const u32 gSpriteImage_839DC14[] = INCBIN_U32("graphics/birch_speech/birch.4bpp"); const u16 gBirchPalette[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal"); const u32 gSpriteImage_839E434[] = INCBIN_U32("graphics/misc/pokeball_glow.4bpp"); |