diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2020-02-12 17:32:51 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2020-02-12 17:32:51 -0600 |
| commit | 49421a41b2b28c167f6fca8287361f23e6bd00a9 (patch) | |
| tree | 98c986208f169c3f2f7e8405a03d519163065dc4 /src/fldeff_misc.c | |
| parent | 956090b05f678db9f43d567131d6d43ce11806ec (diff) | |
Move field effects data and graphics into own directory, and cleanup naming for object events
Diffstat (limited to 'src/fldeff_misc.c')
| -rw-r--r-- | src/fldeff_misc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c index 95c7123b3..60d1ea072 100644 --- a/src/fldeff_misc.c +++ b/src/fldeff_misc.c @@ -72,7 +72,7 @@ static const u8 gSpriteImage_858DB78[] = INCBIN_U8("graphics/unknown/858E588/4.4 static const u8 gUnusedEmptySpace_858DBF8[32] = {0}; -static const u16 gFieldEffectObjectPalette7[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_07.gbapal"); +static const u16 gFieldEffectObjectPalette7[] = INCBIN_U16("graphics/field_effects/palettes/07.gbapal"); static const u8 gSpriteImage_858DC38[] = INCBIN_U8("graphics/unknown/858E5D8/0.4bpp"); static const u8 gSpriteImage_858DCB8[] = INCBIN_U8("graphics/unknown/858E5D8/1.4bpp"); static const u8 gSpriteImage_858DD38[] = INCBIN_U8("graphics/unknown/858E5D8/2.4bpp"); @@ -84,7 +84,7 @@ static const u8 gSpriteImage_858DFB8[] = INCBIN_U8("graphics/unknown/858E5B0/2.4 static const u8 gSpriteImage_858E038[] = INCBIN_U8("graphics/unknown/858E5B0/3.4bpp"); static const u8 gSpriteImage_858E0B8[] = INCBIN_U8("graphics/unknown/858E5B0/4.4bpp"); static const u8 gSpriteImage_858E138[] = INCBIN_U8("graphics/unknown/858E5B0/5.4bpp"); -static const u16 gFieldEffectObjectPalette8[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_08.gbapal"); +static const u16 gFieldEffectObjectPalette8[] = INCBIN_U16("graphics/field_effects/palettes/08.gbapal"); static const u8 gSpriteImage_858E1D8[] = INCBIN_U8("graphics/unknown/858E674/0.4bpp"); static const u8 gSpriteImage_858E2D8[] = INCBIN_U8("graphics/unknown/858E674/1.4bpp"); static const u8 gSpriteImage_858E3D8[] = INCBIN_U8("graphics/unknown/858E674/2.4bpp"); @@ -285,7 +285,7 @@ static const struct SpriteTemplate gUnknown_0858E68C = .callback = SpriteCB_SandPillar_0, }; -// This uses one of the secret base palettes, so there is no "field_effect_object_palette_09.pal" file. +// This uses one of the secret base palettes, so there is no "graphics/field_effects/palettes/09.pal" file. const struct SpritePalette gFieldEffectObjectPaletteInfo9 = {gTilesetPalettes_SecretBase[5], 0x100E}; static const u8 gSpriteImage_858E6AC[] = INCBIN_U8("graphics/unknown/858E84C/0.4bpp"); |