diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-11 21:30:31 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-06-11 21:33:57 -0700 |
| commit | 4c5c98cb2a1bc747a0eb397cb75e48dc8a098494 (patch) | |
| tree | 2872a6436075c0d6132671e98af44f0a1429e498 /engine/titlescreen.asm | |
| parent | Merge pull request #13 from YamaArashi/master (diff) | |
| download | pokeyellow-4c5c98cb2a1bc747a0eb397cb75e48dc8a098494.tar.gz pokeyellow-4c5c98cb2a1bc747a0eb397cb75e48dc8a098494.tar.xz pokeyellow-4c5c98cb2a1bc747a0eb397cb75e48dc8a098494.zip | |
sync engine code with pokered
Diffstat (limited to 'engine/titlescreen.asm')
| -rwxr-xr-x | engine/titlescreen.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index c4dff73c..2cfcc445 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -31,7 +31,7 @@ DisplayTitleScreen: call DisableLCD call LoadFontTilePatterns ; todo: fix hl pointers - ld hl, NintendoCopyrightLogoGraphics ; 4:4c48 + ld hl, NintendoCopyrightLogoGraphics ld de, vTitleLogo + $600 ld bc, $50 ld a, BANK(NintendoCopyrightLogoGraphics) @@ -91,7 +91,7 @@ DisplayTitleScreen: call .ScrollTitleScreenPokemonLogo jr .bouncePokemonLogoLoop -.TitleScreenPokemonLogoYScrolls ; 4228 (1:4228) +.TitleScreenPokemonLogoYScrolls: ; Controls the bouncing effect of the Pokemon logo on the title screen db -4,16 ; y scroll amount, number of times to scroll db 3,4 @@ -102,7 +102,7 @@ DisplayTitleScreen: db -1,2 db 0 ; terminate list with 0 -.ScrollTitleScreenPokemonLogo ; 4237 (1:4237) +.ScrollTitleScreenPokemonLogo: ; Scrolls the Pokemon logo on the title screen to create the bouncing effect ; Scrolls d pixels e times call DelayFrame |