diff options
| -rw-r--r-- | constants/palette_constants.asm | 2 | ||||
| -rw-r--r-- | data/pokemon/palettes.asm | 48 | ||||
| -rw-r--r-- | data/sgb/sgb_palettes.asm | 2 | ||||
| -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 | ||||
| -rw-r--r-- | macros/data.asm | 2 |
7 files changed, 31 insertions, 31 deletions
diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm index 78d39c95..6d2d49de 100644 --- a/constants/palette_constants.asm +++ b/constants/palette_constants.asm @@ -58,7 +58,7 @@ DEF SET_PAL_DEFAULT EQU $ff const PAL_GREENMON ; $16 const PAL_PINKMON ; $17 const PAL_YELLOWMON ; $18 - const PAL_GREYMON ; $19 + const PAL_GRAYMON ; $19 const PAL_SLOTS1 ; $1A const PAL_SLOTS2 ; $1B const PAL_SLOTS3 ; $1C diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 2ce500aa..4aec84ea 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -19,8 +19,8 @@ MonsterPalettes: db PAL_BROWNMON ; PIDGEY db PAL_BROWNMON ; PIDGEOTTO db PAL_BROWNMON ; PIDGEOT - db PAL_GREYMON ; RATTATA - db PAL_GREYMON ; RATICATE + db PAL_GRAYMON ; RATTATA + db PAL_GRAYMON ; RATICATE db PAL_BROWNMON ; SPEAROW db PAL_BROWNMON ; FEAROW db PAL_PURPLEMON ; EKANS @@ -66,23 +66,23 @@ MonsterPalettes: db PAL_YELLOWMON ; ABRA db PAL_YELLOWMON ; KADABRA db PAL_YELLOWMON ; ALAKAZAM - db PAL_GREYMON ; MACHOP - db PAL_GREYMON ; MACHOKE - db PAL_GREYMON ; MACHAMP + db PAL_GRAYMON ; MACHOP + db PAL_GRAYMON ; MACHOKE + db PAL_GRAYMON ; MACHAMP db PAL_GREENMON ; BELLSPROUT db PAL_GREENMON ; WEEPINBELL db PAL_GREENMON ; VICTREEBEL db PAL_CYANMON ; TENTACOOL db PAL_CYANMON ; TENTACRUEL - db PAL_GREYMON ; GEODUDE - db PAL_GREYMON ; GRAVELER - db PAL_GREYMON ; GOLEM + db PAL_GRAYMON ; GEODUDE + db PAL_GRAYMON ; GRAVELER + db PAL_GRAYMON ; GOLEM db PAL_REDMON ; PONYTA db PAL_REDMON ; RAPIDASH db PAL_PINKMON ; SLOWPOKE db PAL_PINKMON ; SLOWBRO - db PAL_GREYMON ; MAGNEMITE - db PAL_GREYMON ; MAGNETON + db PAL_GRAYMON ; MAGNEMITE + db PAL_GRAYMON ; MAGNETON db PAL_BROWNMON ; FARFETCHD db PAL_BROWNMON ; DODUO db PAL_BROWNMON ; DODRIO @@ -90,12 +90,12 @@ MonsterPalettes: db PAL_BLUEMON ; DEWGONG db PAL_PURPLEMON ; GRIMER db PAL_PURPLEMON ; MUK - db PAL_GREYMON ; SHELLDER - db PAL_GREYMON ; CLOYSTER + db PAL_GRAYMON ; SHELLDER + db PAL_GRAYMON ; CLOYSTER db PAL_PURPLEMON ; GASTLY db PAL_PURPLEMON ; HAUNTER db PAL_PURPLEMON ; GENGAR - db PAL_GREYMON ; ONIX + db PAL_GRAYMON ; ONIX db PAL_YELLOWMON ; DROWZEE db PAL_YELLOWMON ; HYPNO db PAL_REDMON ; KRABBY @@ -104,15 +104,15 @@ MonsterPalettes: db PAL_YELLOWMON ; ELECTRODE db PAL_PINKMON ; EXEGGCUTE db PAL_GREENMON ; EXEGGUTOR - db PAL_GREYMON ; CUBONE - db PAL_GREYMON ; MAROWAK + db PAL_GRAYMON ; CUBONE + db PAL_GRAYMON ; MAROWAK db PAL_BROWNMON ; HITMONLEE db PAL_BROWNMON ; HITMONCHAN db PAL_PINKMON ; LICKITUNG db PAL_PURPLEMON ; KOFFING db PAL_PURPLEMON ; WEEZING - db PAL_GREYMON ; RHYHORN - db PAL_GREYMON ; RHYDON + db PAL_GRAYMON ; RHYHORN + db PAL_GRAYMON ; RHYDON db PAL_PINKMON ; CHANSEY db PAL_BLUEMON ; TANGELA db PAL_BROWNMON ; KANGASKHAN @@ -121,33 +121,33 @@ MonsterPalettes: db PAL_REDMON ; GOLDEEN db PAL_REDMON ; SEAKING db PAL_REDMON ; STARYU - db PAL_GREYMON ; STARMIE + db PAL_GRAYMON ; STARMIE db PAL_PINKMON ; MR_MIME db PAL_GREENMON ; SCYTHER db PAL_MEWMON ; JYNX db PAL_YELLOWMON ; ELECTABUZZ db PAL_REDMON ; MAGMAR db PAL_BROWNMON ; PINSIR - db PAL_GREYMON ; TAUROS + db PAL_GRAYMON ; TAUROS db PAL_REDMON ; MAGIKARP db PAL_BLUEMON ; GYARADOS db PAL_CYANMON ; LAPRAS - db PAL_GREYMON ; DITTO - db PAL_GREYMON ; EEVEE + db PAL_GRAYMON ; DITTO + db PAL_GRAYMON ; EEVEE db PAL_CYANMON ; VAPOREON db PAL_YELLOWMON ; JOLTEON db PAL_REDMON ; FLAREON - db PAL_GREYMON ; PORYGON + db PAL_GRAYMON ; PORYGON db PAL_BLUEMON ; OMANYTE db PAL_BLUEMON ; OMASTAR db PAL_BROWNMON ; KABUTO db PAL_BROWNMON ; KABUTOPS - db PAL_GREYMON ; AERODACTYL + db PAL_GRAYMON ; AERODACTYL db PAL_PINKMON ; SNORLAX db PAL_BLUEMON ; ARTICUNO db PAL_YELLOWMON ; ZAPDOS db PAL_REDMON ; MOLTRES - db PAL_GREYMON ; DRATINI + db PAL_GRAYMON ; DRATINI db PAL_BLUEMON ; DRAGONAIR db PAL_BROWNMON ; DRAGONITE db PAL_MEWMON ; MEWTWO diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm index 58aba757..eb6bc584 100644 --- a/data/sgb/sgb_palettes.asm +++ b/data/sgb/sgb_palettes.asm @@ -31,7 +31,7 @@ ENDC RGB 31,29,31, 20,26,16, 09,20,11, 03,02,02 ; PAL_GREENMON RGB 31,29,31, 30,22,24, 28,15,21, 03,02,02 ; PAL_PINKMON RGB 31,29,31, 31,28,14, 26,20,00, 03,02,02 ; PAL_YELLOWMON - RGB 31,29,31, 26,21,22, 15,15,18, 03,02,02 ; PAL_GREYMON + RGB 31,29,31, 26,21,22, 15,15,18, 03,02,02 ; PAL_GRAYMON RGB 31,29,31, 26,21,22, 27,20,06, 03,02,02 ; PAL_SLOTS1 IF DEF(_RED) RGB 31,29,31, 31,31,17, 25,17,21, 03,02,02 ; PAL_SLOTS2 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: diff --git a/macros/data.asm b/macros/data.asm index 2e4a7ce2..c3c9cb8d 100644 --- a/macros/data.asm +++ b/macros/data.asm @@ -15,7 +15,7 @@ ENDM ; used in data/pokemon/base_stats/*.asm MACRO tmhm -; initialize bytes to 0 + ; initialize bytes to 0 FOR n, (NUM_TM_HM + 7) / 8 DEF _tm{d:n} = 0 ENDR |