thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 23:55:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Palette fixes

Browse source 
This should fix some issues with map palettes being displayed incorrectly, as well as giving a unique palette to Cerulean Cave.
This commit is contained in:
MementoMartha 2023-05-07 10:34:21 +01:00
parent febb20c418
commit 466b1992b1
8 changed files with 41 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

50
engine/gfx/palettes.asm
View file

@ -144,13 +144,13 @@ SetPal_Overworld:
jr z, .PokemonTowerOrAgatha
cp CAVERN
jr z, .caveOrBruno
cp CITRINE
jr z, .citrine
cp FOREST
jr z, .forest
cp SHIP
jr z, .ship
ld a, [wCurMap]
cp BRUNSWICK_TRAIL
jr z, .brunswick
cp FIRST_INDOOR_MAP
jr c, .townOrRoute
cp POWER_PLANT
@ -180,56 +180,55 @@ SetPal_Overworld:
jr .town
.caveOrBruno
ld a, [wCurMap]
cp SEAFOAM_ISLANDS_1F
jr z, .seafoam
cp CINNABAR_VOLCANO
jr z, .volcano
cp SEAFOAM_ISLANDS_B1F
jr c, .caveDefault
cp SEAFOAM_ISLANDS_B4F + 1
jr c, .seafoam
cp SEAFOAM_ISLANDS_1F
jr z, .seafoam
cp GARNET_CAVERN_1F
jr c, .caveDefault
cp GARNET_CAVERN_B1F + 1
jr c, .garnet
cp CERULEAN_CAVE_1F + 1
jr c, .mewtwo
cp GARNET_CAVERN_2F + 1
jr c, .garnet
cp ROCK_TUNNEL_B1F + 1
jr c, .caveDefault
.caveDefault
ld a, PAL_CAVE - 1
jr .town
.celeste
ld a, PAL_CELESTE - 1
jr .town
.citrine
ld a, [wCurMap]
cp BRUNSWICK_TRAIL
jr z, .brunswick
cp CITRINE_CITY
jr c, .citrineDefault
.citrineDefault
ld a, PAL_CITRINE - 1
jr .town
.ship
ld a, PAL_VERMILION - 1
jr .town
.forest
ld a, [wCurMap]
cp VIRIDIAN_FOREST
jr z, .faraway
cp SILPH_GAUNTLET_1F
jr z, .faraway
cp MT_MOON_CRATER
jr z, .faraway
cp SILPH_GAUNTLET_1F + 1
jr c, .faraway
cp SILPH_GAUNTLET_5F
jr z, .forestDefault
cp MT_MOON_CRATER + 1
jr c, .faraway
cp SAFARI_ZONE_CENTER + 1`
jr c, .forestDefault
cp BILLS_GARDEN
jr z, .faraway
.forestDefault
ld a, PAL_FUCHSIA - 1
jr .town
.powerPlant
ld a, PAL_YELLOWMON - 1
jr .town
.faraway
ld a, PAL_ROUTE - 1
jr .town
.brunswick
ld a, PAL_BRUNSWICK - 1
jr .town
.faraway
ld a, PAL_ROUTE - 1
jr .town
.seafoam
ld a, PAL_CYANMON - 1
jr .town
@ -239,6 +238,9 @@ SetPal_Overworld:
.garnet
ld a, PAL_GARNET - 1
jr .town
.mewtwo
ld a, PAL_MEWMON - 1
jr .town
; used when a Pokemon is the only thing on the screen
; such as evolution, trading and the Hall of Fame