diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
| commit | e2fb7acac0e3c1d598021b52fc2583dd983321bc (patch) | |
| tree | ea5922596ce167e5b0485ea3bacd65f43339ca60 /home/copy_tilemap.asm | |
| parent | 1a888f22004aec967d2b6049ede7e04b1815f956 (diff) | |
| parent | 364854623267a8a39242243b0cdf80144e868642 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# engine/items/mart.asm
Diffstat (limited to 'home/copy_tilemap.asm')
| -rw-r--r-- | home/copy_tilemap.asm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/home/copy_tilemap.asm b/home/copy_tilemap.asm index f6ddeff47..2c6c47244 100644 --- a/home/copy_tilemap.asm +++ b/home/copy_tilemap.asm @@ -1,4 +1,4 @@ -LoadTileMapToTempTileMap:: ; 309d +LoadTileMapToTempTileMap:: ; Load wTileMap into wTempTileMap ld a, [rSVBK] push af @@ -11,18 +11,16 @@ LoadTileMapToTempTileMap:: ; 309d pop af ld [rSVBK], a ret -; 30b4 -Call_LoadTempTileMapToTileMap:: ; 30b4 +Call_LoadTempTileMapToTileMap:: xor a ld [hBGMapMode], a call LoadTempTileMapToTileMap ld a, 1 ld [hBGMapMode], a ret -; 30bf -LoadTempTileMapToTileMap:: ; 30bf +LoadTempTileMapToTileMap:: ; Load wTempTileMap into wTileMap ld a, [rSVBK] push af @@ -35,4 +33,3 @@ LoadTempTileMapToTileMap:: ; 30bf pop af ld [rSVBK], a ret -; 30d6 |