diff options
| author | yenatch <yenatch@gmail.com> | 2018-06-30 17:50:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-30 17:50:33 -0400 |
| commit | 2641f93ad084b1329b3f3b9f7c8c222445fc4832 (patch) | |
| tree | fb048bbc8bb7257dbd8169e2442117da5d2b30d2 /engine/menus/intro_menu.asm | |
| parent | 91f914718a263839daef24d44eda857bfc7cca95 (diff) | |
| parent | da5125e1411f9599b883181c5ee6e31252d37ac8 (diff) | |
Merge pull request #534 from Rangi42/master
[RTM] Fix triple newlines left over from removing address comments, and other improvements
Diffstat (limited to 'engine/menus/intro_menu.asm')
| -rw-r--r-- | engine/menus/intro_menu.asm | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 1bdf8b02f..9652dd73e 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -94,7 +94,6 @@ ResetWRAM: ret _ResetWRAM: - ld hl, wVirtualOAM ld bc, wOptions - wVirtualOAM xor a @@ -549,7 +548,6 @@ Continue_LoadMenuHeader: db " @" db "TIME@" - Continue_DisplayBadgesDexPlayerName: call MenuBoxCoord2Tile push hl @@ -626,7 +624,6 @@ Continue_DisplayGameTime: lb bc, PRINTNUM_LEADINGZEROS | 1, 2 jp PrintNum - OakSpeech: farcall InitClock call RotateFourPalettesLeft @@ -803,7 +800,6 @@ StorePlayerName: ret ShrinkPlayer: - ld a, [hROMBank] push af @@ -913,7 +909,6 @@ ShrinkFrame: ret Intro_PlacePlayerSprite: - farcall GetPlayerIcon ld c, $c ld hl, vTiles0 @@ -957,7 +952,6 @@ Intro_PlacePlayerSprite: db 10 * 8 + 4, 9 * 8, 2 db 10 * 8 + 4, 10 * 8, 3 - CrystalIntroSequence: callfar Copyright_GFPresents jr c, StartTitleScreen @@ -1018,7 +1012,6 @@ StartTitleScreen: dw CrystalIntroSequence dw ResetClock - .TitleScreen: farcall _TitleScreen ret @@ -1070,9 +1063,7 @@ TitleScreenScene: inc [hl] ret - TitleScreenEntrance: - ; Animate the logo: ; Move each line by 4 pixels until our count hits 0. ld a, [hSCX] @@ -1119,9 +1110,7 @@ TitleScreenEntrance: ld [hWY], a ret - TitleScreenTimer: - ; Next scene ld hl, wJumptableIndex inc [hl] @@ -1135,7 +1124,6 @@ TitleScreenTimer: ret TitleScreenMain: - ; Run the timer down. ld hl, wTitleScreenTimer ld e, [hl] @@ -1236,7 +1224,6 @@ TitleScreenMain: ret TitleScreenEnd: - ; Wait until the music is done fading. ld hl, wTitleScreenTimer |