diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-05 17:48:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-05 17:48:21 -0400 |
| commit | 124e2eb02c4adc46265e5b34b47ac0c625a24ec3 (patch) | |
| tree | 5c0af98d9e49a767f455fff1ceec5d07cb8539b8 /src/field_effect.c | |
| parent | 123d5cc8b26d2a93fa3981beaccb84377c6ae20f (diff) | |
| parent | 813c1846c94fa14b55bf75cf4c14465f1fb26635 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r--[-rwxr-xr-x] | 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 100755..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"); |