diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-12-08 14:34:42 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-12-08 14:34:42 -0500 |
| commit | 2a65aa843187284195e5d3b8bbff77461f966af9 (patch) | |
| tree | 063b8f38197051368322277d3a3b0ffe3c783211 | |
| parent | c745dd677753e9b7820665f5ebd325731c5b728e (diff) | |
grey -> gray
| -rw-r--r-- | constants/scgb_constants.asm | 4 | ||||
| -rw-r--r-- | engine/battle/core.asm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm index c929a642..862ca84d 100644 --- a/constants/scgb_constants.asm +++ b/constants/scgb_constants.asm @@ -75,7 +75,7 @@ SCGB_DEFAULT EQU $ff 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 @@ -85,7 +85,7 @@ SCGB_DEFAULT EQU $ff 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 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 3826a182..8aa0a79a 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2782,7 +2782,7 @@ LostBattle: and a jr nz, .LostLinkBattle -; Greyscale +; Grayscale ld b, SCGB_BATTLE_GRAYSCALE call GetSGBLayout call SetPalettes |