diff options
| author | Rangi <remy.oukaour+rangi@gmail.com> | 2020-12-08 14:33:46 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi@gmail.com> | 2020-12-08 14:33:46 -0500 |
| commit | 43286f43737fbaf9032182b85638da59634e67e7 (patch) | |
| tree | f0e2075bb1b6a1e67ec6250a40dfcd3980aa8267 /constants | |
| parent | 2831f2e3fea69de9b19b4f7e9ecebac454614576 (diff) | |
Match pokegold's battle transition code more closely
Diffstat (limited to 'constants')
| -rwxr-xr-x | constants/palette_constants.asm | 4 | ||||
| -rw-r--r-- | constants/sgb_constants.asm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm index e3a72ad..4453f18 100755 --- a/constants/palette_constants.asm +++ b/constants/palette_constants.asm @@ -23,7 +23,7 @@ const PAL_GREENMON ; 15 const PAL_PINKMON ; 16 const PAL_YELLOWMON ; 17 - const PAL_GREYMON ; 18 + const PAL_GRAYMON ; 18 const PAL_SHINY_MEWMON ; 19 const PAL_SHINY_BLUEMON ; 1a const PAL_SHINY_REDMON ; 1b @@ -33,7 +33,7 @@ const PAL_SHINY_GREENMON ; 1f const PAL_SHINY_PINKMON ; 20 const PAL_SHINY_YELLOWMON ; 21 - const PAL_SHINY_GREYMON ; 22 + const PAL_SHINY_GRAYMON ; 22 const PAL_GREEN_BAR ; 23 const PAL_YELLOW_BAR ; 24 const PAL_RED_BAR ; 25 diff --git a/constants/sgb_constants.asm b/constants/sgb_constants.asm index c3b53b5..73f65f8 100644 --- a/constants/sgb_constants.asm +++ b/constants/sgb_constants.asm @@ -74,7 +74,7 @@ SGB_RAM EQU -1 const PREDEFPAL_RB_GREENMON const PREDEFPAL_RB_PINKMON const PREDEFPAL_RB_YELLOWMON - const PREDEFPAL_CGB_BADGE ; RB_GREYMON + const PREDEFPAL_CGB_BADGE ; RB_GRAYMON const PREDEFPAL_BETA_SHINY_MEWMON const PREDEFPAL_BETA_SHINY_BLUEMON const PREDEFPAL_BETA_SHINY_REDMON @@ -84,7 +84,7 @@ SGB_RAM EQU -1 const PREDEFPAL_BETA_SHINY_GREENMON const PREDEFPAL_BETA_SHINY_PINKMON const PREDEFPAL_BETA_SHINY_YELLOWMON - const PREDEFPAL_PARTY_ICON ; BETA_SHINY_GREYMON + const PREDEFPAL_PARTY_ICON ; BETA_SHINY_GRAYMON const PREDEFPAL_HP_GREEN const PREDEFPAL_HP_YELLOW const PREDEFPAL_HP_RED |