diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm index 058b70c22..50cf325af 100644 --- a/constants/landmark_constants.asm +++ b/constants/landmark_constants.asm @@ -1,7 +1,8 @@ ; Landmarks indexes (see data/maps/landmarks.asm) const_def const LANDMARK_SPECIAL ; 00 -; Johto landmarks + +DEF JOHTO_LANDMARK EQU const_value const LANDMARK_NEW_BARK_TOWN ; 01 const LANDMARK_ROUTE_29 ; 02 const LANDMARK_CHERRYGROVE_CITY ; 03 @@ -48,6 +49,8 @@ const LANDMARK_DARK_CAVE ; 2c const LANDMARK_ROUTE_46 ; 2d const LANDMARK_SILVER_CAVE ; 2e +DEF JOHTO_LANDMARK_LAST EQU const_value - 1 + DEF KANTO_LANDMARK EQU const_value const LANDMARK_PALLET_TOWN ; 2f const LANDMARK_ROUTE_1 ; 30 @@ -97,7 +100,11 @@ DEF KANTO_LANDMARK EQU const_value const LANDMARK_ROUTE_27 ; 5c const LANDMARK_TOHJO_FALLS ; 5d const LANDMARK_ROUTE_28 ; 5e +DEF KANTO_LANDMARK_LAST EQU const_value - 1 + +DEF OTHER_LANDMARK EQU const_value const LANDMARK_FAST_SHIP ; 5f + DEF NUM_LANDMARKS EQU const_value ; used in CaughtData diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index f0f12c3d1..a1578696b 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -565,8 +565,8 @@ PokegearMap_KantoMap: jr PokegearMap_ContinueMap PokegearMap_JohtoMap: - ld d, LANDMARK_SILVER_CAVE - ld e, LANDMARK_NEW_BARK_TOWN + ld d, JOHTO_LANDMARK_LAST + ld e, JOHTO_LANDMARK PokegearMap_ContinueMap: ld hl, hJoyLast ld a, [hl] @@ -728,8 +728,8 @@ TownMap_GetKantoLandmarkLimits: ld a, [wStatusFlags] bit STATUSFLAGS_HALL_OF_FAME_F, a jr z, .not_hof - ld d, LANDMARK_ROUTE_28 - ld e, LANDMARK_PALLET_TOWN + ld d, KANTO_LANDMARK_LAST + ld e, KANTO_LANDMARK ret .not_hof