diff options
| author | yenatch <yenatch@gmail.com> | 2015-10-26 01:34:08 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-10-26 01:34:08 -0400 |
| commit | e638cdb74cabff705d4879568e74b8ed43da64e1 (patch) | |
| tree | 02869ee6058c1b7d00d554af86e6eb6b197cd660 /misc/unused_title.asm | |
| parent | b8da3874bbc06e858b7b2d7a602fe33baa046e93 (diff) | |
| parent | 0d17d4a75866d053f5e0b48c66deb2508071d98b (diff) | |
Merge remote-tracking branch 'origin/master' into pngs-kind-of
Conflicts:
INSTALL.md
Diffstat (limited to 'misc/unused_title.asm')
| -rw-r--r-- | misc/unused_title.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/misc/unused_title.asm b/misc/unused_title.asm index 327eef45c..e151deb14 100644 --- a/misc/unused_title.asm +++ b/misc/unused_title.asm @@ -9,7 +9,7 @@ UnusedTitleScreen: ; 10c000 xor a ld [hBGMapMode], a - ld hl, wcf63 + ld hl, wJumptableIndex rept 3 ld [hli], a endr @@ -17,17 +17,17 @@ endr ld hl, UnusedTitleBG_GFX ld de, VTiles2 - ld bc, $800 + ld bc, VBGMap0 - VTiles2 call CopyBytes ld hl, UnusedTitleBG_GFX + $800 ld de, VTiles1 - ld bc, $800 + ld bc, VTiles2 - VTiles1 call CopyBytes ld hl, UnusedTitleFG_GFX ld de, VTiles0 - ld bc, $800 + ld bc, VTiles1 - VTiles0 call CopyBytes ld hl, UnusedTitleBG_Tilemap @@ -546,12 +546,12 @@ UnusedTitleFG_OAM: ; 10ecb1 Function10ed51: ; 10ed51 call _TitleScreen .loop - call Functiona57 - ld a, [$ffa9] + call JoyTextDelay + ld a, [hJoyLast] ld b, a and 1 jr nz, .done - call Function10eea7 + call SuicuneFrameIterator call DelayFrame jr .loop .done |