thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-21 22:52:15 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use constants to delineate map types, and factor out more data

Browse source
This commit is contained in:
Rangi 2020-08-31 10:23:19 -04:00
parent 70eac3a1f7
commit bfd9f617c9
17 changed files with 126 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engine/items/town_map.asm
View file

@ -1,3 +1,5 @@
NOT_VISITED EQU $fe
DisplayTownMap:
call LoadTownMap
ld hl, wUpdateSpritesEnabled
@ -224,7 +226,7 @@ LoadTownMap_Fly::
ld a, [hl]
cp $ff
jr z, .wrapToStartOfList
cp $fe
cp NOT_VISITED
jr z, .pressedUp ; skip past unvisited towns
jp .townMapFlyLoop
.wrapToStartOfList
@ -236,11 +238,11 @@ LoadTownMap_Fly::
ld a, [hl]
cp $ff
jr z, .wrapToEndOfList
cp $fe
cp NOT_VISITED
jr z, .pressedDown ; skip past unvisited towns
jp .townMapFlyLoop
.wrapToEndOfList
ld hl, wFlyLocationsList + 11
ld hl, wFlyLocationsList + NUM_CITY_MAPS
jr .pressedDown
ToText:
@ -254,11 +256,11 @@ BuildFlyLocationsList:
ld e, a
ld a, [wTownVisitedFlag + 1]
ld d, a
ld bc, SAFFRON_CITY + 1
lb bc, 0, NUM_CITY_MAPS
.loop
srl d
rr e
ld a, $fe ; store $fe if the town hasn't been visited
ld a, NOT_VISITED
jr nc, .notVisited
ld a, b ; store the map number of the town if it has been visited
.notVisited
@ -554,7 +556,7 @@ ZeroOutDuplicatesInList:
LoadTownMapEntry:
; in: a = map number
; out: lower nybble of [de] = x, upper nybble of [de] = y, hl = address of name
cp REDS_HOUSE_1F
cp FIRST_INDOOR_MAP
jr c, .external
ld bc, 4
ld hl, InternalMapEntries