diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-27 09:48:16 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-27 09:48:16 -0400 |
| commit | 08c23fb1c483ffcf7c17b8ac061ad4ff77318625 (patch) | |
| tree | 65bfdd399541ebd4f558614fd566aa92cfb94422 /src/field_effect.c | |
| parent | 41cc0382a43161c0c66ddaf73742ecec8dcbdcc6 (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' into field_tasks
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index a7f0e4129..889664dfa 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -28,8 +28,6 @@ #define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))} -#define obj_frame_tiles(ptr) {.data = (u8 *)ptr, .size = sizeof ptr} - 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"); |