diff options
Diffstat (limited to 'engine/warp_connection.asm')
| -rwxr-xr-x | engine/warp_connection.asm | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm index e15809c04..8d673de44 100755 --- a/engine/warp_connection.asm +++ b/engine/warp_connection.asm @@ -30,24 +30,24 @@ EnterMapConnection: ; 1045d6 ret .west - ld a, [WestConnectedMapGroup] - ld [MapGroup], a - ld a, [WestConnectedMapNumber] - ld [MapNumber], a - ld a, [WestConnectionStripXOffset] - ld [XCoord], a - ld a, [WestConnectionStripYOffset] - ld hl, YCoord + ld a, [wWestConnectedMapGroup] + ld [wMapGroup], a + ld a, [wWestConnectedMapNumber] + ld [wMapNumber], a + ld a, [wWestConnectionStripXOffset] + ld [wXCoord], a + ld a, [wWestConnectionStripYOffset] + ld hl, wYCoord add [hl] ld [hl], a ld c, a - ld hl, WestConnectionWindow + ld hl, wWestConnectionWindow ld a, [hli] ld h, [hl] ld l, a srl c jr z, .skip_to_load - ld a, [WestConnectedMapWidth] + ld a, [wWestConnectedMapWidth] add 6 ld e, a ld d, 0 @@ -65,24 +65,24 @@ EnterMapConnection: ; 1045d6 jp .done .east - ld a, [EastConnectedMapGroup] - ld [MapGroup], a - ld a, [EastConnectedMapNumber] - ld [MapNumber], a - ld a, [EastConnectionStripXOffset] - ld [XCoord], a - ld a, [EastConnectionStripYOffset] - ld hl, YCoord + ld a, [wEastConnectedMapGroup] + ld [wMapGroup], a + ld a, [wEastConnectedMapNumber] + ld [wMapNumber], a + ld a, [wEastConnectionStripXOffset] + ld [wXCoord], a + ld a, [wEastConnectionStripYOffset] + ld hl, wYCoord add [hl] ld [hl], a ld c, a - ld hl, EastConnectionWindow + ld hl, wEastConnectionWindow ld a, [hli] ld h, [hl] ld l, a srl c jr z, .skip_to_load2 - ld a, [EastConnectedMapWidth] + ld a, [wEastConnectedMapWidth] add 6 ld e, a ld d, 0 @@ -100,18 +100,18 @@ EnterMapConnection: ; 1045d6 jp .done .north - ld a, [NorthConnectedMapGroup] - ld [MapGroup], a - ld a, [NorthConnectedMapNumber] - ld [MapNumber], a - ld a, [NorthConnectionStripYOffset] - ld [YCoord], a - ld a, [NorthConnectionStripXOffset] - ld hl, XCoord + ld a, [wNorthConnectedMapGroup] + ld [wMapGroup], a + ld a, [wNorthConnectedMapNumber] + ld [wMapNumber], a + ld a, [wNorthConnectionStripYOffset] + ld [wYCoord], a + ld a, [wNorthConnectionStripXOffset] + ld hl, wXCoord add [hl] ld [hl], a ld c, a - ld hl, NorthConnectionWindow + ld hl, wNorthConnectionWindow ld a, [hli] ld h, [hl] ld l, a @@ -125,18 +125,18 @@ EnterMapConnection: ; 1045d6 jp .done .south - ld a, [SouthConnectedMapGroup] - ld [MapGroup], a - ld a, [SouthConnectedMapNumber] - ld [MapNumber], a - ld a, [SouthConnectionStripYOffset] - ld [YCoord], a - ld a, [SouthConnectionStripXOffset] - ld hl, XCoord + ld a, [wSouthConnectedMapGroup] + ld [wMapGroup], a + ld a, [wSouthConnectedMapNumber] + ld [wMapNumber], a + ld a, [wSouthConnectionStripYOffset] + ld [wYCoord], a + ld a, [wSouthConnectionStripXOffset] + ld hl, wXCoord add [hl] ld [hl], a ld c, a - ld hl, SouthConnectionWindow + ld hl, wSouthConnectionWindow ld a, [hli] ld h, [hl] ld l, a @@ -156,11 +156,11 @@ LoadWarpData: ; 1046c6 call .SaveDigWarp call .SetSpawn ld a, [wNextWarp] - ld [WarpNumber], a + ld [wWarpNumber], a ld a, [wNextMapGroup] - ld [MapGroup], a + ld [wMapGroup], a ld a, [wNextMapNumber] - ld [MapNumber], a + ld [wMapNumber], a ret .SaveDigWarp: ; 1046df (41:46df) @@ -228,7 +228,7 @@ LoadWarpData: ; 1046c6 ret LoadMapTimeOfDay: ; 104750 - ld hl, VramState + ld hl, wVramState res 6, [hl] ld a, $1 ld [wSpriteUpdatesEnabled], a @@ -274,7 +274,7 @@ LoadMapTimeOfDay: ; 104750 and a ret z - decoord 0, 0, AttrMap + decoord 0, 0, wAttrMap ld a, $1 ld [rVBK], a .copy @@ -324,7 +324,7 @@ RefreshMapSprites: ; 1047f0 ld hl, wPlayerSpriteSetupFlags bit 6, [hl] jr nz, .skip - ld hl, VramState + ld hl, wVramState set 0, [hl] call SafeUpdateSprites .skip @@ -349,10 +349,10 @@ CheckMovingOffEdgeOfMap:: ; 104820 (41:4820) ret .down - ld a, [PlayerStandingMapY] + ld a, [wPlayerStandingMapY] sub 4 ld b, a - ld a, [MapHeight] + ld a, [wMapHeight] add a cp b jr z, .ok @@ -360,7 +360,7 @@ CheckMovingOffEdgeOfMap:: ; 104820 (41:4820) ret .up - ld a, [PlayerStandingMapY] + ld a, [wPlayerStandingMapY] sub 4 cp -1 jr z, .ok @@ -368,7 +368,7 @@ CheckMovingOffEdgeOfMap:: ; 104820 (41:4820) ret .left - ld a, [PlayerStandingMapX] + ld a, [wPlayerStandingMapX] sub 4 cp -1 jr z, .ok @@ -376,10 +376,10 @@ CheckMovingOffEdgeOfMap:: ; 104820 (41:4820) ret .right - ld a, [PlayerStandingMapX] + ld a, [wPlayerStandingMapX] sub 4 ld b, a - ld a, [MapWidth] + ld a, [wMapWidth] add a cp b jr z, .ok @@ -392,8 +392,8 @@ CheckMovingOffEdgeOfMap:: ; 104820 (41:4820) GetCoordOfUpperLeftCorner:: ; 10486d - ld hl, OverworldMap - ld a, [XCoord] + ld hl, wOverworldMap + ld a, [wXCoord] bit 0, a jr nz, .increment_then_halve1 srl a @@ -408,11 +408,11 @@ GetCoordOfUpperLeftCorner:: ; 10486d ld c, a ld b, $0 add hl, bc - ld a, [MapWidth] + ld a, [wMapWidth] add $6 ld c, a ld b, $0 - ld a, [YCoord] + ld a, [wYCoord] bit 0, a jr nz, .increment_then_halve2 srl a @@ -429,10 +429,10 @@ GetCoordOfUpperLeftCorner:: ; 10486d ld [wOverworldMapAnchor], a ld a, h ld [wOverworldMapAnchor + 1], a - ld a, [YCoord] + ld a, [wYCoord] and $1 ld [wMetatileStandingY], a - ld a, [XCoord] + ld a, [wXCoord] and $1 ld [wMetatileStandingX], a ret |