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

Get rid of LANDMARK_SPECIAL (#1)

Browse Source
This commit is contained in:
xCrystal
2023-07-25 18:32:57 +02:00
parent 473c23a727
commit 787caa2147
5 changed files with 1 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
engine/pokegear/pokegear.asm
View File

@@ -185,13 +185,6 @@ TownMap_GetCurrentLandmark:
ld a, [wMapNumber]
ld c, a
call GetWorldMapLocation
cp LANDMARK_SPECIAL
ret nz
ld a, [wBackupMapGroup]
ld b, a
ld a, [wBackupMapNumber]
ld c, a
call GetWorldMapLocation
ret
TownMap_InitCursorAndPlayerIconPositions:
@@ -200,14 +193,6 @@ TownMap_InitCursorAndPlayerIconPositions:
ld a, [wMapNumber]
ld c, a
call GetWorldMapLocation
cp LANDMARK_SPECIAL
jr nz, .LoadLandmark
ld a, [wBackupMapGroup]
ld b, a
ld a, [wBackupMapNumber]
ld c, a
call GetWorldMapLocation
.LoadLandmark:
ld [wPokegearMapPlayerIconLandmark], a
ld [wPokegearMapCursorLandmark], a
ret
@@ -2126,16 +2111,6 @@ FlyMap:
ld a, [wMapNumber]
ld c, a
call GetWorldMapLocation
; If we're not in a valid location, i.e. Pokecenter floor 2F,
; the backup map information is used.
cp LANDMARK_SPECIAL
jr nz, .CheckRegion
ld a, [wBackupMapGroup]
ld b, a
ld a, [wBackupMapNumber]
ld c, a
call GetWorldMapLocation
.CheckRegion:
; Johto fly map
push af
ld a, FLY_1 ; first Johto flypoint