diff options
| author | Rangi42 <sylvie.oukaour+rangi42@gmail.com> | 2024-12-16 10:29:59 -0500 |
|---|---|---|
| committer | Rangi42 <sylvie.oukaour+rangi42@gmail.com> | 2024-12-16 10:29:59 -0500 |
| commit | ff76bba5074abefce1d479cd422a71ad3c297536 (patch) | |
| tree | d0f46180760e54859206be05a91137a1731e7861 /engine | |
| parent | Assert the relations between some move effect constants (#478) (diff) | |
| download | pokeyellow-ff76bba5074abefce1d479cd422a71ad3c297536.tar.gz pokeyellow-ff76bba5074abefce1d479cd422a71ad3c297536.tar.xz pokeyellow-ff76bba5074abefce1d479cd422a71ad3c297536.zip | |
Use "gray", not "grey"
This matches the in-game text, e.g. Pewter is "A Stone Gray City"
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/ghost_marowak_anim.asm | 2 | ||||
| -rw-r--r-- | engine/events/poison.asm | 2 | ||||
| -rw-r--r-- | engine/gfx/palettes.asm | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm index a7f4d025..b6275e52 100644 --- a/engine/battle/ghost_marowak_anim.asm +++ b/engine/battle/ghost_marowak_anim.asm @@ -16,7 +16,7 @@ MarowakAnim: ld a, $1 ldh [hWhoseTurn], a callfar ChangeMonPic - ; alternate between black and light grey 8 times. + ; alternate between black and light gray 8 times. ; this makes the ghost's body appear to flash ld d, $80 call FlashSprite8Times diff --git a/engine/events/poison.asm b/engine/events/poison.asm index 5a7bed7c..bd79ad16 100644 --- a/engine/events/poison.asm +++ b/engine/events/poison.asm @@ -90,7 +90,7 @@ ApplyOutOfBattlePoisonDamage: and a ; are any party members poisoned? jr z, .skipPoisonEffectAndSound ld b, $2 - predef ChangeBGPalColor0_4Frames ; change BG white to dark grey for 4 frames + predef ChangeBGPalColor0_4Frames ; change BG white to dark gray for 4 frames ld a, SFX_POISONED call PlaySound .skipPoisonEffectAndSound diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index 47af5c29..05202079 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -170,7 +170,7 @@ SetPal_Overworld: ld [wDefaultPaletteCommand], a ret .PokemonTowerOrAgatha - ld a, PAL_GREYMON - 1 + ld a, PAL_GRAYMON - 1 jr .town .caveOrBruno ld a, PAL_CAVE - 1 @@ -271,7 +271,7 @@ BadgeBlkDataLengths: DeterminePaletteID: bit TRANSFORMED, a ; a is battle status 3 - ld a, PAL_GREYMON ; if the mon has used Transform, use Ditto's palette + ld a, PAL_GRAYMON ; if the mon has used Transform, use Ditto's palette ret nz ld a, [hl] DeterminePaletteIDOutOfBattle: |