diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-18 15:37:40 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-18 15:37:40 -0400 |
| commit | bb97b63af1fbeca208cb30a41f8195b4408821dc (patch) | |
| tree | 106b0bab693daa5335445b01c43a8cd4c851d231 /engine/overworld | |
| parent | 35874024438c0a716ad3de8896207f02db56e7d1 (diff) | |
Complete documentation of bank3
Also: split out bcd predefs from yellow/main.asm, start removing traces
of W_
Diffstat (limited to 'engine/overworld')
| -rwxr-xr-x | engine/overworld/cut.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/doors.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/ledges.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/player_animations.asm | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm index 276ec93e..8c863bf2 100755 --- a/engine/overworld/cut.asm +++ b/engine/overworld/cut.asm @@ -1,7 +1,7 @@ UsedCut: ; edd1 (3:6dd1) xor a ld [wActionResultOrTookBattleTurn], a ; initialise to failure value - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] and a ; OVERWORLD jr z, .overworld cp GYM diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm index 641c021f..6b0c0464 100755 --- a/engine/overworld/doors.asm +++ b/engine/overworld/doors.asm @@ -2,7 +2,7 @@ IsPlayerStandingOnDoorTile: ; 1a609 (6:6609) push de ld hl, DoorTileIDPointers - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] ld de, $3 call IsInArray pop de diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm index df4273fd..b04f6332 100755 --- a/engine/overworld/ledges.asm +++ b/engine/overworld/ledges.asm @@ -2,7 +2,7 @@ HandleLedges: ; 1a672 (6:6672) ld a, [wd736] bit 6, a ; already jumping down ledge ret nz - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] and a ; OVERWORLD ret nz predef GetTileAndCoordsInFrontOfPlayer diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index 6488eaac..ff579a04 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -357,7 +357,7 @@ GetPlayerTeleportAnimFrameDelay: ; 707df (1c:47df) IsPlayerStandingOnWarpPadOrHole: ; 707e7 (1c:47e7) ld b, 0 ld hl, .warpPadAndHoleData - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] ld c, a .loop ld a, [hli] |