diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-11-27 10:57:18 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-27 10:57:18 -0500 |
commit | 7b1fee32397f787a30d914ecc54c068444209b27 (patch) | |
tree | d170bf6fe02d24c97808f89ea489741a6e7727d2 | |
parent | 8d29f65c6c7f34aa53ae2e7ae3e4f34a95025602 (diff) | |
parent | 0f04944b81088133754b675d4e715c4caa53161e (diff) |
Merge pull request #1258 from V-FEXrt/master
Rename graphics files for COOLTRAINER to match define
-rw-r--r-- | graphics/trainers/front_pics/cooltrainer_f_front_pic.png (renamed from graphics/trainers/front_pics/cool_trainer_f_front_pic.png) | bin | 681 -> 681 bytes | |||
-rw-r--r-- | graphics/trainers/front_pics/cooltrainer_m_front_pic.png (renamed from graphics/trainers/front_pics/cool_trainer_m_front_pic.png) | bin | 627 -> 627 bytes | |||
-rw-r--r-- | graphics/trainers/palettes/cooltrainer_f.pal (renamed from graphics/trainers/palettes/cool_trainer_f.pal) | 0 | ||||
-rw-r--r-- | graphics/trainers/palettes/cooltrainer_m.pal (renamed from graphics/trainers/palettes/cool_trainer_m.pal) | 0 | ||||
-rw-r--r-- | src/data/graphics/trainers.h | 8 |
5 files changed, 4 insertions, 4 deletions
diff --git a/graphics/trainers/front_pics/cool_trainer_f_front_pic.png b/graphics/trainers/front_pics/cooltrainer_f_front_pic.png Binary files differindex 572aa811a..572aa811a 100644 --- a/graphics/trainers/front_pics/cool_trainer_f_front_pic.png +++ b/graphics/trainers/front_pics/cooltrainer_f_front_pic.png diff --git a/graphics/trainers/front_pics/cool_trainer_m_front_pic.png b/graphics/trainers/front_pics/cooltrainer_m_front_pic.png Binary files differindex 6b998992e..6b998992e 100644 --- a/graphics/trainers/front_pics/cool_trainer_m_front_pic.png +++ b/graphics/trainers/front_pics/cooltrainer_m_front_pic.png diff --git a/graphics/trainers/palettes/cool_trainer_f.pal b/graphics/trainers/palettes/cooltrainer_f.pal index 292d0fc78..292d0fc78 100644 --- a/graphics/trainers/palettes/cool_trainer_f.pal +++ b/graphics/trainers/palettes/cooltrainer_f.pal diff --git a/graphics/trainers/palettes/cool_trainer_m.pal b/graphics/trainers/palettes/cooltrainer_m.pal index 52a32e925..52a32e925 100644 --- a/graphics/trainers/palettes/cool_trainer_m.pal +++ b/graphics/trainers/palettes/cooltrainer_m.pal diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 3de77d6ec..206d73a88 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -7,8 +7,8 @@ const u32 gTrainerPalette_AquaGruntM[] = INCBIN_U32("graphics/trainers/palettes/ const u32 gTrainerFrontPic_PokemonBreederF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_f_front_pic.4bpp.lz"); const u32 gTrainerPalette_PokemonBreederF[] = INCBIN_U32("graphics/trainers/palettes/pokemon_breeder_f.gbapal.lz"); -const u32 gTrainerFrontPic_CoolTrainerM[] = INCBIN_U32("graphics/trainers/front_pics/cool_trainer_m_front_pic.4bpp.lz"); -const u32 gTrainerPalette_CoolTrainerM[] = INCBIN_U32("graphics/trainers/palettes/cool_trainer_m.gbapal.lz"); +const u32 gTrainerFrontPic_CoolTrainerM[] = INCBIN_U32("graphics/trainers/front_pics/cooltrainer_m_front_pic.4bpp.lz"); +const u32 gTrainerPalette_CoolTrainerM[] = INCBIN_U32("graphics/trainers/palettes/cooltrainer_m.gbapal.lz"); const u32 gTrainerFrontPic_BirdKeeper[] = INCBIN_U32("graphics/trainers/front_pics/bird_keeper_front_pic.4bpp.lz"); const u32 gTrainerPalette_BirdKeeper[] = INCBIN_U32("graphics/trainers/palettes/bird_keeper.gbapal.lz"); @@ -58,8 +58,8 @@ const u32 gTrainerPalette_TuberF[] = INCBIN_U32("graphics/trainers/palettes/tube const u32 gTrainerFrontPic_TuberM[] = INCBIN_U32("graphics/trainers/front_pics/tuber_m_front_pic.4bpp.lz"); const u32 gTrainerPalette_TuberM[] = INCBIN_U32("graphics/trainers/palettes/tuber_m.gbapal.lz"); -const u32 gTrainerFrontPic_CoolTrainerF[] = INCBIN_U32("graphics/trainers/front_pics/cool_trainer_f_front_pic.4bpp.lz"); -const u32 gTrainerPalette_CoolTrainerF[] = INCBIN_U32("graphics/trainers/palettes/cool_trainer_f.gbapal.lz"); +const u32 gTrainerFrontPic_CoolTrainerF[] = INCBIN_U32("graphics/trainers/front_pics/cooltrainer_f_front_pic.4bpp.lz"); +const u32 gTrainerPalette_CoolTrainerF[] = INCBIN_U32("graphics/trainers/palettes/cooltrainer_f.gbapal.lz"); const u32 gTrainerFrontPic_Lady[] = INCBIN_U32("graphics/trainers/front_pics/lady_front_pic.4bpp.lz"); const u32 gTrainerPalette_Lady[] = INCBIN_U32("graphics/trainers/palettes/lady.gbapal.lz"); |