diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-06-01 12:32:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-01 12:32:58 -0400 |
| commit | 2812a2bd7aa298acb9fbcfd456a31b9cfb02ce0e (patch) | |
| tree | c933af728ccc482dcdbd21552d0c8d7147dff285 /src | |
| parent | 405a4352c32b6fc33c0222fc9d526cc2cb8f7252 (diff) | |
| parent | e66ebaa1f5eddb1295b61fc975ff0a98c07250ba (diff) | |
Merge pull request #59 from garakmon/mon_sprites
Move Mon Graphics
Diffstat (limited to 'src')
| -rw-r--r-- | src/daycare.c | 2 | ||||
| -rw-r--r-- | src/egg_hatch.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/daycare.c b/src/daycare.c index fcaadc0fd..206e0b383 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -163,7 +163,7 @@ static const u8 *const sCompatibilityMessages[] = static const u8 sNewLineText[] = _("\n"); static const u8 sJapaneseEggNickname[] = _("タマゴ"); // "tamago" ("egg" in Japanese) -static const u16 sEggPalette[] = INCBIN_U16("graphics/pokemon/palettes/egg_palette.gbapal"); +static const u16 sEggPalette[] = INCBIN_U16("graphics/pokemon/egg/normal.gbapal"); static const u8 sEggHatchTiles[] = INCBIN_U8("graphics/misc/egg_hatch.4bpp"); static const u8 sEggShardTiles[] = INCBIN_U8("graphics/misc/egg_shard.4bpp"); diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 74ec35102..5e27a6482 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -78,7 +78,7 @@ static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8 static IWRAM_DATA struct EggHatchData *sEggHatchData; // rom data -static const u16 sEggPalette[] = INCBIN_U16("graphics/pokemon/palettes/egg_palette.gbapal"); +static const u16 sEggPalette[] = INCBIN_U16("graphics/pokemon/egg/normal.gbapal"); static const u8 sEggHatchTiles[] = INCBIN_U8("graphics/misc/egg_hatch.4bpp"); static const u8 sEggShardTiles[] = INCBIN_U8("graphics/misc/egg_shard.4bpp"); |