Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make town map limits more intuitive (#1185)

Browse Source
This commit is contained in:
Brianum
2025-06-07 19:51:32 +02:00
committed by GitHub
parent b34b4c3291
commit b8d0c93213
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
constants/landmark_constants.asm
View File

@@ -1,7 +1,8 @@
; Landmarks indexes (see data/maps/landmarks.asm) ; Landmarks indexes (see data/maps/landmarks.asm)
const_def const_def
const LANDMARK_SPECIAL ; 00 const LANDMARK_SPECIAL ; 00
; Johto landmarks
DEF JOHTO_LANDMARK EQU const_value
const LANDMARK_NEW_BARK_TOWN ; 01 const LANDMARK_NEW_BARK_TOWN ; 01
const LANDMARK_ROUTE_29 ; 02 const LANDMARK_ROUTE_29 ; 02
const LANDMARK_CHERRYGROVE_CITY ; 03 const LANDMARK_CHERRYGROVE_CITY ; 03
@@ -48,6 +49,8 @@
const LANDMARK_DARK_CAVE ; 2c const LANDMARK_DARK_CAVE ; 2c
const LANDMARK_ROUTE_46 ; 2d const LANDMARK_ROUTE_46 ; 2d
const LANDMARK_SILVER_CAVE ; 2e const LANDMARK_SILVER_CAVE ; 2e
DEF JOHTO_LANDMARK_LAST EQU const_value - 1
DEF KANTO_LANDMARK EQU const_value DEF KANTO_LANDMARK EQU const_value
const LANDMARK_PALLET_TOWN ; 2f const LANDMARK_PALLET_TOWN ; 2f
const LANDMARK_ROUTE_1 ; 30 const LANDMARK_ROUTE_1 ; 30
@@ -97,7 +100,11 @@ DEF KANTO_LANDMARK EQU const_value
const LANDMARK_ROUTE_27 ; 5c const LANDMARK_ROUTE_27 ; 5c
const LANDMARK_TOHJO_FALLS ; 5d const LANDMARK_TOHJO_FALLS ; 5d
const LANDMARK_ROUTE_28 ; 5e const LANDMARK_ROUTE_28 ; 5e
DEF KANTO_LANDMARK_LAST EQU const_value - 1
DEF OTHER_LANDMARK EQU const_value
const LANDMARK_FAST_SHIP ; 5f const LANDMARK_FAST_SHIP ; 5f
DEF NUM_LANDMARKS EQU const_value DEF NUM_LANDMARKS EQU const_value
; used in CaughtData ; used in CaughtData

8
engine/pokegear/pokegear.asm
View File

@@ -565,8 +565,8 @@ PokegearMap_KantoMap:
jr PokegearMap_ContinueMap jr PokegearMap_ContinueMap
PokegearMap_JohtoMap: PokegearMap_JohtoMap:
ld d, LANDMARK_SILVER_CAVE ld d, JOHTO_LANDMARK_LAST
ld e, LANDMARK_NEW_BARK_TOWN ld e, JOHTO_LANDMARK
PokegearMap_ContinueMap: PokegearMap_ContinueMap:
ld hl, hJoyLast ld hl, hJoyLast
ld a, [hl] ld a, [hl]
@@ -728,8 +728,8 @@ TownMap_GetKantoLandmarkLimits:
ld a, [wStatusFlags] ld a, [wStatusFlags]
bit STATUSFLAGS_HALL_OF_FAME_F, a bit STATUSFLAGS_HALL_OF_FAME_F, a
jr z, .not_hof jr z, .not_hof
ld d, LANDMARK_ROUTE_28 ld d, KANTO_LANDMARK_LAST
ld e, LANDMARK_PALLET_TOWN ld e, KANTO_LANDMARK
ret ret
.not_hof .not_hof