summaryrefslogtreecommitdiff
path: root/src/field_effect.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2020-02-12 17:32:51 -0600
committerMarcus Huderle <huderlem@gmail.com>2020-02-12 17:32:51 -0600
commit49421a41b2b28c167f6fca8287361f23e6bd00a9 (patch)
tree98c986208f169c3f2f7e8405a03d519163065dc4 /src/field_effect.c
parent956090b05f678db9f43d567131d6d43ce11806ec (diff)
Move field effects data and graphics into own directory, and cleanup naming for object events
Diffstat (limited to 'src/field_effect.c')
-rw-r--r--src/field_effect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_effect.c b/src/field_effect.c
index b89000cc3..7195f3f4a 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -245,12 +245,12 @@ const u32 gNewGameBirchPic[] = INCBIN_U32("graphics/birch_speech/birch.4bpp");
const u32 gUnusedBirchBeauty[] = INCBIN_U32("graphics/unused/intro_birch_beauty.4bpp");
const u16 gNewGameBirchPalette[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal");
const u32 gSpriteImage_855A970[] = INCBIN_U32("graphics/misc/pokeball_glow.4bpp");
-const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_04.gbapal");
+const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/field_effects/palettes/04.gbapal");
const u32 gSpriteImage_855A9B0[] = INCBIN_U32("graphics/misc/pokecenter_monitor/0.4bpp");
const u32 gSpriteImage_855AA70[] = INCBIN_U32("graphics/misc/pokecenter_monitor/1.4bpp");
const u32 gSpriteImage_855AB30[] = INCBIN_U32("graphics/misc/big_hof_monitor.4bpp");
const u8 gSpriteImage_855AD30[] = INCBIN_U8("graphics/misc/small_hof_monitor.4bpp");
-const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_05.gbapal");
+const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/field_effects/palettes/05.gbapal");
// Graphics for the lights streaking past your Pokemon when it uses a field move.
const u32 gFieldMoveStreaksTiles[] = INCBIN_U32("graphics/misc/field_move_streaks.4bpp");