diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-11 17:51:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-11 17:51:03 -0700 |
| commit | 54143d33fc1211fb0c949ba62633d1c8d94f2717 (patch) | |
| tree | 9176ffc5b6384a48eb32ea8f33ac97d1d67f6865 /engine/overworld/special_warps.asm | |
| parent | Merge pull request #14 from PikalaxALT/master (diff) | |
| parent | remove address comments (diff) | |
| download | pokeyellow-54143d33fc1211fb0c949ba62633d1c8d94f2717.tar.gz pokeyellow-54143d33fc1211fb0c949ba62633d1c8d94f2717.tar.xz pokeyellow-54143d33fc1211fb0c949ba62633d1c8d94f2717.zip | |
Merge pull request #13 from YamaArashi/master
remove address comments
Diffstat (limited to 'engine/overworld/special_warps.asm')
| -rw-r--r-- | engine/overworld/special_warps.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/overworld/special_warps.asm b/engine/overworld/special_warps.asm index 8c1b4159..4814e668 100644 --- a/engine/overworld/special_warps.asm +++ b/engine/overworld/special_warps.asm @@ -1,4 +1,4 @@ -SpecialWarpIn: ; 6042 (1:6042) +SpecialWarpIn: call LoadSpecialWarpData predef LoadTilesetHeader ld hl,wd732 @@ -29,7 +29,7 @@ SpecialWarpIn: ; 6042 (1:6042) ret ; gets the map ID, tile block map view pointer, tileset, and coordinates -LoadSpecialWarpData: ; 6073 (1:6073) +LoadSpecialWarpData: ld a, [wd72d] cp TRADE_CENTER jr nz, .notTradeCenter @@ -144,4 +144,4 @@ LoadSpecialWarpData: ; 6073 (1:6073) ld [wXOffsetSinceLastSpecialWarp], a ld a, $ff ; the player's coordinates have already been updated using a special warp, so don't use any of the normal warps ld [wDestinationWarpID], a - ret
\ No newline at end of file + ret |