diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 17:15:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 17:15:20 -0500 |
| commit | b35eb72290b964b98844afbe741bb7ede34b9ef3 (patch) | |
| tree | 2cf2652bc9c3e69ae5f7b2a2632c02a12498615f /data/trainers | |
| parent | 7547ad839cf1c8141b931d08ef16a894e7db68c9 (diff) | |
| parent | 32ade4ac9bf113d630d904aab51f2c49c91bf8c2 (diff) | |
Merge pull request #480 from luckytyphlosion/master
[Ready to merge] Prefix wram labels with w.
Diffstat (limited to 'data/trainers')
| -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 c502846c4..ba546e417 100644 --- a/data/trainers/palettes.asm +++ b/data/trainers/palettes.asm @@ -1,7 +1,7 @@ TrainerPalettes: ; b0ce ; entries correspond to trainer classes -PlayerPalette: ; Chris uses the same colors as Cal +wPlayerPalette: ; Chris uses the same colors as Cal INCLUDE "gfx/trainers/cal.pal" KrisPalette: ; Kris shares Falkner's palette INCLUDE "gfx/trainers/falkner.pal" |