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 /engine/gfx | |
| 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 'engine/gfx')
| -rw-r--r-- | engine/gfx/palettes.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index d9ae4369..428a6998 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -180,7 +180,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 @@ -189,7 +189,7 @@ SetPal_Overworld: xor a jr .town .trade_center_colosseum - ld a, PAL_GREYMON - 1 + ld a, PAL_GRAYMON - 1 jr .town ; used when a Pokemon is the only thing on the screen @@ -423,7 +423,7 @@ GetPal_Pikachu:: ret .PokemonTowerOrAgatha - ld a, PAL_GREYMON - 1 + ld a, PAL_GRAYMON - 1 jr .town .caveOrBruno @@ -435,7 +435,7 @@ GetPal_Pikachu:: jr .town .battleOrTradeCenter - ld a, PAL_GREYMON - 1 + ld a, PAL_GRAYMON - 1 jr .town InitPartyMenuBlkPacket: |