pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Define JOHTO_FLYPOINT like KANTO_FLYPOINT

Browse Source
This commit is contained in:
Rangi
2020-07-21 12:15:14 -04:00
parent a9941e28cc
commit d96f914315
2 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
constants/map_data_constants.asm
View File

@ -102,6 +102,7 @@ NUM_SPAWNS EQU const_value
; Flypoints indexes (see data/maps/flypoints.asm) ; Flypoints indexes (see data/maps/flypoints.asm)
const_def const_def
; johto ; johto
JOHTO_FLYPOINT EQU const_value
const FLY_NEW_BARK const FLY_NEW_BARK
const FLY_CHERRYGROVE const FLY_CHERRYGROVE
const FLY_VIOLET const FLY_VIOLET

33
engine/pokegear/pokegear.asm
View File

@ -1452,7 +1452,6 @@ UpdateRadioStation:
RadioChannels: RadioChannels:
; entries correspond to constants/radio_constants.asm ; entries correspond to constants/radio_constants.asm
; frequency value given here = 4 × ingame_frequency − 2 ; frequency value given here = 4 × ingame_frequency − 2
dbw 16, .PKMNTalkAndPokedexShow ; 04.5 dbw 16, .PKMNTalkAndPokedexShow ; 04.5
dbw 28, .PokemonMusic ; 07.5 dbw 28, .PokemonMusic ; 07.5
@ -1467,7 +1466,6 @@ RadioChannels:
.PKMNTalkAndPokedexShow: .PKMNTalkAndPokedexShow:
; Pokédex Show in the morning ; Pokédex Show in the morning
; Oak's Pokémon Talk in the afternoon and evening ; Oak's Pokémon Talk in the afternoon and evening
call .InJohto call .InJohto
jr nc, .NoSignal jr nc, .NoSignal
@ -1542,7 +1540,6 @@ RadioChannels:
.InJohto: .InJohto:
; if in Johto or on the S.S. Aqua, set carry ; if in Johto or on the S.S. Aqua, set carry
; otherwise clear carry ; otherwise clear carry
ld a, [wPokegearMapPlayerIconLandmark] ld a, [wPokegearMapPlayerIconLandmark]
cp LANDMARK_FAST_SHIP cp LANDMARK_FAST_SHIP
@ -2271,13 +2268,10 @@ FlyMap:
.JohtoFlyMap: .JohtoFlyMap:
; Note that .NoKanto should be modified in tandem with this branch ; Note that .NoKanto should be modified in tandem with this branch
push af push af
; Start from New Bark Town ld a, JOHTO_FLYPOINT ; first Johto flypoint
ld a, FLY_NEW_BARK ld [wTownMapPlayerIconLandmark], a ; first one is default (New Bark Town)
ld [wTownMapPlayerIconLandmark], a
; Flypoints begin at New Bark Town...
ld [wStartFlypoint], a ld [wStartFlypoint], a
; ..and end at Silver Cave. ld a, KANTO_FLYPOINT - 1 ; last Johto flypoint
ld a, FLY_MT_SILVER
ld [wEndFlypoint], a ld [wEndFlypoint], a
; Fill out the map ; Fill out the map
call FillJohtoMap call FillJohtoMap
@ -2301,16 +2295,11 @@ FlyMap:
and a and a
jr z, .NoKanto jr z, .NoKanto
; Kanto's map is only loaded if we've visited Indigo Plateau ; Kanto's map is only loaded if we've visited Indigo Plateau
ld a, KANTO_FLYPOINT ; first Kanto flypoint
; Flypoints begin at Pallet Town...
ld a, FLY_PALLET
ld [wStartFlypoint], a ld [wStartFlypoint], a
; ...and end at Indigo Plateau ld a, NUM_FLYPOINTS - 1 ; last Kanto flypoint
ld a, FLY_INDIGO
ld [wEndFlypoint], a ld [wEndFlypoint], a
; Because Indigo Plateau is the first flypoint the player ld [wTownMapPlayerIconLandmark], a ; last one is default (Indigo Plateau)
; visits, it's made the default flypoint.
ld [wTownMapPlayerIconLandmark], a
; Fill out the map ; Fill out the map
call FillKantoMap call FillKantoMap
call .MapHud call .MapHud
@ -2320,14 +2309,10 @@ FlyMap:
.NoKanto: .NoKanto:
; If Indigo Plateau hasn't been visited, we use Johto's map instead ; If Indigo Plateau hasn't been visited, we use Johto's map instead
ld a, JOHTO_FLYPOINT ; first Johto flypoint
; Start from New Bark Town ld [wTownMapPlayerIconLandmark], a ; first one is default (New Bark Town)
ld a, FLY_NEW_BARK
ld [wTownMapPlayerIconLandmark], a
; Flypoints begin at New Bark Town...
ld [wStartFlypoint], a ld [wStartFlypoint], a
; ..and end at Silver Cave ld a, KANTO_FLYPOINT - 1 ; last Johto flypoint
ld a, FLY_MT_SILVER
ld [wEndFlypoint], a ld [wEndFlypoint], a
call FillJohtoMap call FillJohtoMap
pop af pop af