diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-15 21:21:58 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-15 21:21:58 -0500 |
| commit | 612fd7cb96746cf122b0d500991ea17122f0d90c (patch) | |
| tree | 187b012600e9e9895ffe84270a64058c8edf6bbe /data | |
| parent | 62d6f72bb35ed75574bb74b2edca120f8d80a628 (diff) | |
| parent | 4046b41c3aaaf0d930f0268e52112aa7ea01e0a4 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# maps/KrissHouse2F.asm
Diffstat (limited to 'data')
| -rw-r--r-- | data/trainers/palettes.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/trainers/palettes.asm b/data/trainers/palettes.asm index ba546e417..c502846c4 100644 --- a/data/trainers/palettes.asm +++ b/data/trainers/palettes.asm @@ -1,7 +1,7 @@ TrainerPalettes: ; b0ce ; entries correspond to trainer classes -wPlayerPalette: ; Chris uses the same colors as Cal +PlayerPalette: ; Chris uses the same colors as Cal INCLUDE "gfx/trainers/cal.pal" KrisPalette: ; Kris shares Falkner's palette INCLUDE "gfx/trainers/falkner.pal" |