diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-02 11:48:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 11:48:20 -0400 |
| commit | e97f37077c793a388e3a98c13f09846839e80b22 (patch) | |
| tree | 821ca6bd8d7db65ecd0f8a092b4acea13e00f7f4 /src/data/graphics.c | |
| parent | bbd177fa20a3f53a4815061c524a14e959de6783 (diff) | |
| parent | 1bd678656c735bbeb603ccb80367c7a85f820f61 (diff) | |
Merge branch 'master' into emerald_diff
Diffstat (limited to 'src/data/graphics.c')
| -rw-r--r-- | src/data/graphics.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/data/graphics.c b/src/data/graphics.c index ce2f02b2c..20d8f91d0 100644 --- a/src/data/graphics.c +++ b/src/data/graphics.c @@ -713,7 +713,7 @@ const u8 gBattleAnimSpritePalette_256[] = INCBIN_U8("graphics/battle_anims/sprit const u8 gBattleAnimSpriteSheet_257[] = INCBIN_U8("graphics/battle_anims/sprites/257.4bpp.lz"); const u8 gBattleAnimSpritePalette_257[] = INCBIN_U8("graphics/battle_anims/sprites/257.gbapal.lz"); -#include "pokemon_gfx.h" +#include "graphics/pokemon.h" const u8 gMonFrontPic_UnownExclamationMark[] = INCBIN_U8("graphics/pokemon/unown/front_exclamation_mark.4bpp.lz"); const u8 gMonBackPic_UnownExclamationMark[] = INCBIN_U8("graphics/pokemon/unown/back_exclamation_mark.4bpp.lz"); @@ -722,7 +722,7 @@ const u8 gMonFrontPic_UnownQuestionMark[] = INCBIN_U8("graphics/pokemon/unown/fr const u8 gMonBackPic_UnownQuestionMark[] = INCBIN_U8("graphics/pokemon/unown/back_question_mark.4bpp.lz"); const u8 gMonIcon_UnownQuestionMark[] = INCBIN_U8("graphics/pokemon/unown/icon_question_mark.4bpp"); -#include "trainer_gfx.h" +#include "graphics/trainers.h" const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp"); const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp"); @@ -936,7 +936,7 @@ const u8 gUnknown_08E788E4[] = INCBIN_U8("graphics/interface/berry_tag.bin.lz"); const u8 gUnknown_08E78A84[] = INCBIN_U8("graphics/interface/berry_tag_title.bin.lz"); const u8 gBerryCheckCircle_Gfx[] = INCBIN_U8("graphics/interface/check_berry_circle.4bpp.lz"); -#include "berry_gfx.h" +#include "graphics/berries.h" const u8 gBattleAnimSpritePalette_282[] = INCBIN_U8("graphics/battle_anims/sprites/282.gbapal.lz"); const u8 gBattleAnimSpriteSheet_282[] = INCBIN_U8("graphics/battle_anims/sprites/282.4bpp.lz"); |