diff options
| author | Rangi42 <sylvie.oukaour+rangi42@gmail.com> | 2024-12-25 16:46:37 -0500 |
|---|---|---|
| committer | Rangi42 <sylvie.oukaour+rangi42@gmail.com> | 2024-12-25 16:53:04 -0500 |
| commit | 47b784a4fbc7513ea6106877fbb7a54158e1b13b (patch) | |
| tree | 301a856e76abb5dcb7bcc3986ddb4bbe4f70e88e /data/sgb | |
| parent | Fix comments around battle evolution code (#120) (diff) | |
| parent | Use `SERIAL_RNS_LENGTH` in `BattleRandom` (diff) | |
| download | pokeyellow-47b784a4fbc7513ea6106877fbb7a54158e1b13b.tar.gz pokeyellow-47b784a4fbc7513ea6106877fbb7a54158e1b13b.tar.xz pokeyellow-47b784a4fbc7513ea6106877fbb7a54158e1b13b.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/sgb')
| -rw-r--r-- | data/sgb/sgb_palettes.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm index 2e0b74bf..b9a4e95c 100644 --- a/data/sgb/sgb_palettes.asm +++ b/data/sgb/sgb_palettes.asm @@ -26,7 +26,7 @@ SuperPalettes: RGB 31,31,30, 24,28,18, 13,21,15, 06,06,06 ; PAL_GREENMON RGB 31,31,30, 31,24,26, 31,18,21, 06,06,06 ; PAL_PINKMON RGB 31,31,30, 31,31,19, 28,23,09, 06,06,06 ; PAL_YELLOWMON - RGB 31,31,30, 25,25,18, 16,16,14, 06,06,06 ; PAL_GREYMON + RGB 31,31,30, 25,25,18, 16,16,14, 06,06,06 ; PAL_GRAYMON RGB 31,31,30, 27,22,30, 26,09,06, 06,06,06 ; PAL_SLOTS1 RGB 31,31,30, 31,23,26, 29,29,08, 06,06,06 ; PAL_SLOTS2 RGB 31,31,30, 23,31,20, 29,29,08, 06,06,06 ; PAL_SLOTS3 @@ -71,7 +71,7 @@ GBCBasePalettes: RGB 31,31,31, 17,31,11, 01,22,06, 03,03,03 ; PAL_GREENMON RGB 31,31,31, 31,15,18, 31,00,06, 03,03,03 ; PAL_PINKMON RGB 31,31,31, 31,31,00, 28,14,00, 03,03,03 ; PAL_YELLOWMON - RGB 31,31,31, 20,23,10, 11,11,05, 03,03,03 ; PAL_GREYMON + RGB 31,31,31, 20,23,10, 11,11,05, 03,03,03 ; PAL_GRAYMON RGB 31,31,31, 25,01,31, 31,00,00, 03,03,03 ; PAL_SLOTS1 RGB 31,31,31, 31,04,19, 31,31,00, 03,03,03 ; PAL_SLOTS2 RGB 31,31,31, 08,31,00, 31,31,00, 03,03,03 ; PAL_SLOTS3 |