diff options
Diffstat (limited to 'home/map.asm')
| -rw-r--r-- | home/map.asm | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/home/map.asm b/home/map.asm index 3c2e0e645..ade44a4a2 100644 --- a/home/map.asm +++ b/home/map.asm @@ -197,7 +197,7 @@ endr ld de, $0060 add hl, de pop de - ld a, [$d19f] + ld a, [MapWidth] add $6 add e ld e, a @@ -421,7 +421,7 @@ Function2326: ; 2326 Function2336: ; 2336 push af - ld hl, $d1a6 + ld hl, MapEventHeaderPointer ld a, [hli] ld h, [hl] ld l, a @@ -438,7 +438,7 @@ Function2336: ; 2336 ; 234f Function234f: ; 234f - ld hl, $d1a4 + ld hl, MapScriptHeaderPointer ld a, [hli] ld h, [hl] ld l, a @@ -466,7 +466,7 @@ Function2368: ; 2368 ld [WestConnectedMapGroup], a ld [EastConnectedMapGroup], a - ld a, [$d1a8] + ld a, [MapConnections] ld b, a bit 3, b @@ -670,10 +670,10 @@ Function2471: ; 2471 ; 248a Function248a: ; 248a - call GetMapEventBank + call GetMapScriptHeaderBank rst Bankswitch - ld hl, $d1a6 + ld hl, MapEventHeaderPointer ld a, [hli] ld h, [hl] ld l, a @@ -728,7 +728,7 @@ Function24e4: ; 24e4 ld a, [hROMBank] push af ld hl, OverworldMap - ld a, [$d19f] + ld a, [MapWidth] ld [hConnectedMapWidth], a add $6 ld [hConnectionStripLength], a @@ -739,14 +739,14 @@ Function24e4: ; 24e4 add hl, bc ld c, $3 add hl, bc - ld a, [$d1a0] + ld a, [MapBlockDataBank] rst Bankswitch - ld a, [$d1a1] + ld a, [MapBlockDataPointer] ld e, a - ld a, [$d1a2] + ld a, [MapBlockDataPointer+1] ld d, a - ld a, [$d19e] + ld a, [MapHeight] ld b, a .asm_250c push hl @@ -899,7 +899,7 @@ FillSouthConnectionStrip: ; 25d3 add hl, de pop de - ld a, [$d19f] + ld a, [MapWidth] add 6 add e ld e, a @@ -916,7 +916,7 @@ FillWestConnectionStrip: FillEastConnectionStrip: ; 25f6 .asm_25f6 - ld a, [$d19f] + ld a, [MapWidth] add 6 ld [hConnectedMapWidth], a @@ -977,7 +977,7 @@ Function2631: ; 2631 ld a, [ScriptRunning] and a ret nz - call GetMapEventBank + call GetMapScriptHeaderBank jr CallScript ; 263b @@ -989,7 +989,7 @@ Function263b: ; 263b call Function2653 jr nc, .done - call GetMapEventBank + call GetMapScriptHeaderBank ld b, a ld d, h ld e, l @@ -1442,7 +1442,7 @@ Function2879: ; 2879 dec b jr nz, .asm_2888 pop hl - ld a, [$d19f] + ld a, [MapWidth] add $6 ld c, a ld b, $0 @@ -1459,7 +1459,7 @@ Function289d: ; 289d ld h, [hl] ld l, a ld de, $dcb9 - ld a, [$d19f] + ld a, [MapWidth] add $6 ld [hConnectionStripLength], a ld a, [$d151] @@ -1506,7 +1506,7 @@ Function289d: ; 289d ld a, [hli] ld h, [hl] ld l, a - ld a, [$d19f] + ld a, [MapWidth] add $6 ld [hConnectionStripLength], a ld de, $dcb9 @@ -1776,7 +1776,7 @@ Function2a3c: ; 2a3c ; 2a66 Function2a66: ; 2a66 - ld a, [$d19f] + ld a, [MapWidth] add $6 ld c, a ld b, $0 @@ -2149,14 +2149,14 @@ Function2c3d: ; 2c3d ; 2c52 Function2c52: ; 2c52 - ld a, [MapEventBank] + ld a, [MapScriptHeaderBank] rst Bankswitch ret ; 2c57 -GetMapEventBank: ; 2c57 - ld a, [MapEventBank] +GetMapScriptHeaderBank: ; 2c57 + ld a, [MapScriptHeaderBank] ret ; 2c5b |