A few small fixes

- Brunswick Trail and Faraway Island now use correct palettes.
- Faraway Island has been altered slightly with the same tileset as Celeste Hill
- It's now possible to fly from Citrine locations, as well as Faraway Island, and the roof of both Celadon's Mart and Mansion.
This commit is contained in:
MementoMartha 2023-04-26 09:38:47 +01:00
parent 14626866b6
commit c5264f160a
10 changed files with 65 additions and 31 deletions

View file

@ -146,6 +146,8 @@ SetPal_Overworld:
jr z, .caveOrBruno
cp CELESTE
jr z, .celeste
cp CITRINE
jr z, .citrine
ld a, [wCurMap]
cp FIRST_INDOOR_MAP
jr c, .townOrRoute
@ -155,8 +157,8 @@ SetPal_Overworld:
jr z, .Lorelei
cp CELESTE_HILL
jr z, .celeste
cp BRUNSWICK_TRAIL
jr z, .brunswick
cp CITRINE_CITY
jr z, .citrine
cp BRUNOS_ROOM
jr z, .caveOrBruno
.normalDungeonOrBuilding
@ -173,6 +175,29 @@ SetPal_Overworld:
ld a, SET_PAL_OVERWORLD
ld [wDefaultPaletteCommand], a
ret
.citrine
ld a, [wCurMap]
cp BRUNSWICK_TRAIL
jr z, .brunswick
cp CITRINE_CITY
jr c, .citrineDefault
.citrineDefault
ld a, PAL_CITRINE - 1
jr .town
.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
jr .town
.faraway
ld a, PAL_ROUTE - 1
jr .town
.brunswick
ld a, PAL_BRUNSWICK - 1
jr .town
@ -192,9 +217,6 @@ SetPal_Overworld:
.caveDefault
ld a, PAL_CAVE - 1
jr .town
.celeste
ld a, PAL_CELESTE - 1
jr .town
.Lorelei
jr c, .gbcLorelei
jr .seafoam

View file

@ -132,7 +132,7 @@ StartMenu_Pokemon::
.fly
bit BIT_THUNDERBADGE, a
jp z, .newBadgeRequired
call CheckIfInOutsideMap
call CheckIfInFlyMap
jr z, .canFly
ld a, [wWhichPokemon]
ld hl, wPartyMonNicks