thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-12 16:24:52 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update palettes.asm

Browse source 
Gives Garnet Cavern its custom palette. Also reverts the changes I made to Viridian Forest's palette since it's very hard to spot the difference anyway, and I needed the space. Also had to revert Faraway Island's, which I'll revisit at some point
This commit is contained in:
MementoMartha 2023-04-30 21:53:31 +01:00
parent 084e03efa1
commit 351b875e3b
1 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
engine/gfx/palettes.asm
View file

@ -144,8 +144,6 @@ SetPal_Overworld:
jr z, .PokemonTowerOrAgatha jr z, .PokemonTowerOrAgatha
cp CAVERN cp CAVERN
jr z, .caveOrBruno jr z, .caveOrBruno
cp CELESTE
jr z, .celeste
cp CITRINE cp CITRINE
jr z, .citrine jr z, .citrine
cp FOREST cp FOREST
@ -157,12 +155,10 @@ SetPal_Overworld:
jr c, .townOrRoute jr c, .townOrRoute
cp POWER_PLANT cp POWER_PLANT
jr z, .powerPlant jr z, .powerPlant
cp CERULEAN_CAVE_2F
jr c, .normalDungeonOrBuilding
cp CELESTE_HILL cp CELESTE_HILL
jr z, .celeste jr z, .celeste
cp CITRINE_CITY cp CERULEAN_CAVE_2F
jr z, .citrine jr c, .normalDungeonOrBuilding
cp BRUNOS_ROOM cp BRUNOS_ROOM
jr z, .caveOrBruno jr z, .caveOrBruno
.normalDungeonOrBuilding .normalDungeonOrBuilding
@ -192,18 +188,12 @@ SetPal_Overworld:
jr c, .caveDefault jr c, .caveDefault
cp SEAFOAM_ISLANDS_B4F + 1 cp SEAFOAM_ISLANDS_B4F + 1
jr c, .seafoam jr c, .seafoam
cp GARNET_CAVERN_B1F + 1
jr c, .garnet
.caveDefault .caveDefault
ld a, PAL_CAVE - 1 ld a, PAL_CAVE - 1
jr .town jr .town
.celeste .celeste
ld a, [wCurMap]
cp FARAWAY_ISLAND_OUTSIDE
jr z, .faraway
cp FARAWAY_ISLAND_INSIDE
jr z, .faraway
cp CELESTE_HILL
jr c, .celesteDefault
.celesteDefault
ld a, PAL_CELESTE - 1 ld a, PAL_CELESTE - 1
jr .town jr .town
.citrine .citrine
@ -221,9 +211,9 @@ SetPal_Overworld:
.forest .forest
ld a, [wCurMap] ld a, [wCurMap]
cp VIRIDIAN_FOREST cp VIRIDIAN_FOREST
jr z, .viridian jr z, .faraway
cp SILPH_GAUNTLET_1F cp SILPH_GAUNTLET_1F
jr z, .viridian jr z, .faraway
cp MT_MOON_CRATER cp MT_MOON_CRATER
jr z, .faraway jr z, .faraway
cp SILPH_GAUNTLET_5F cp SILPH_GAUNTLET_5F
@ -234,9 +224,6 @@ SetPal_Overworld:
.powerPlant .powerPlant
ld a, PAL_YELLOWMON - 1 ld a, PAL_YELLOWMON - 1
jr .town jr .town
.viridian
ld a, PAL_VIRIDIAN - 1
jr .town
.faraway .faraway
ld a, PAL_ROUTE - 1 ld a, PAL_ROUTE - 1
jr .town jr .town
@ -249,6 +236,9 @@ SetPal_Overworld:
.volcano .volcano
ld a, PAL_REDMON - 1 ld a, PAL_REDMON - 1
jr .town jr .town
.garnet
ld a, PAL_GARNET - 1
jr .town
; used when a Pokemon is the only thing on the screen ; used when a Pokemon is the only thing on the screen
; such as evolution, trading and the Hall of Fame ; such as evolution, trading and the Hall of Fame