thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-01-12 20:14:02 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update palettes.asm

Browse source 
Fixed a bug where every route had the Celadon Gym rainbow palette
This commit is contained in:
Martha Schilling 2023-11-28 15:50:50 +00:00
parent f6b1c94c0c
commit b971b8fa8d
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
engine/gfx/palettes.asm
View file

@ -136,6 +136,19 @@ SetPal_GameFreakIntro:
; uses PalPacket_Empty to build a packet based on the current map ; uses PalPacket_Empty to build a packet based on the current map
; are the edits I've made here horribly inefficient? yes, but as long as it works, who cares? ; are the edits I've made here horribly inefficient? yes, but as long as it works, who cares?
SetPal_Overworld: SetPal_Overworld:
ld a, [wCurMap]
cp CELADON_GYM
jr nz, .notCeladon
ld hl, PalPacket_Gay
ld de, wPalPacket
ld bc, $10
call CopyData
ld hl, PalPacket_Gay
ld de, BlkPacket_Gay
ld a, SET_PAL_OVERWORLD
ld [wDefaultPaletteCommand], a
ret
.notCeladon
ld hl, PalPacket_Empty ld hl, PalPacket_Empty
ld de, wPalPacket ld de, wPalPacket
ld bc, $10 ld bc, $10
@ -150,8 +163,6 @@ SetPal_Overworld:
jp z, .brunswick jp z, .brunswick
cp FIRST_INDOOR_MAP cp FIRST_INDOOR_MAP
jp c, .townOrRoute jp c, .townOrRoute
cp CELADON_GYM
jp z, .gay
cp POWER_PLANT cp POWER_PLANT
jp z, .powerPlant jp z, .powerPlant
cp BRUNSWICK_GLADE cp BRUNSWICK_GLADE
@ -200,16 +211,6 @@ SetPal_Overworld:
cp NUM_CITY_MAPS cp NUM_CITY_MAPS
jp c, .town jp c, .town
ld a, PAL_ROUTE - 1 ld a, PAL_ROUTE - 1
.gay
ld hl, PalPacket_Gay
ld de, wPalPacket
ld bc, $10
call CopyData
ld hl, PalPacket_Gay
ld de, BlkPacket_Gay
ld a, SET_PAL_OVERWORLD
ld [wDefaultPaletteCommand], a
ret
.town .town
inc a ; a town's palette ID is its map ID + 1 inc a ; a town's palette ID is its map ID + 1
ld hl, wPalPacket + 1 ld hl, wPalPacket + 1