diff options
author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-06-17 12:36:14 -0400 |
---|---|---|
committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-06-17 12:36:14 -0400 |
commit | 704c854ece3eb459d373c57e7f3cee524bd1eac5 (patch) | |
tree | c6c53c3cb892d1dd86b4b8d95aa492a87943f352 /home/copy2.asm | |
parent | c6146b6f3343654509b1e5eb5ded6de94c34ba45 (diff) | |
parent | 89ab60c6a9c5308291a169e6cbd6ffa90e0e7101 (diff) |
Merge remote-tracking branch 'origin/master'
Conflicts:
home.asm
Diffstat (limited to 'home/copy2.asm')
-rw-r--r-- | home/copy2.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/home/copy2.asm b/home/copy2.asm index ad82260a..a9673439 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -34,7 +34,7 @@ FarCopyDataDouble:: ; 15d4 (0:15d4) call BankswitchCommon ret -CopyVideoDataLCDEnabled:: ; +CopyVideoDataLCDEnabled:: ; 15fe (0:15fe) ; Wait for the next VBlank, then copy c 2bpp ; tiles from b:de to hl, 8 tiles at a time. ; This takes c/8 frames. @@ -83,7 +83,7 @@ CopyVideoDataLCDEnabled:: ; ld c, a jr .loop -CopyVideoDataDoubleLCDEnabled:: +CopyVideoDataDoubleLCDEnabled:: ; 1636 (0:1636) ; Wait for the next VBlank, then copy c 1bpp ; tiles from b:de to hl, 8 tiles at a time. ; This takes c/8 frames. @@ -182,7 +182,7 @@ ClearScreenArea:: ; 1692 (0:1692) jr nz, .y ret -CopyScreenTileBufferToVRAM:: ; 16a4 +CopyScreenTileBufferToVRAM:: ; 16a4 (0:16a4) ; Copy wTileMap to the BG Map starting at b * $100. ; This is done in thirds of 6 rows, so it takes 3 frames. @@ -217,7 +217,7 @@ CopyScreenTileBufferToVRAM:: ; 16a4 ld [H_VBCOPYBGSRC], a ret -ClearScreen:: +ClearScreen:: ; 16dd (0:16dd) ; Clear wTileMap, then wait ; for the bg map to update. ld bc, 20 * 18 |