diff options
| author | ehw <Knuckles500@gmail.com> | 2018-06-04 22:43:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-04 22:43:32 -0400 |
| commit | 771d125c7564a0ff1e511733114d53ad0521c3f8 (patch) | |
| tree | cde859ccacf7520736c25e049294d674e29a6b1d | |
| parent | 9fb15b41e9d56e49a2535001ae298a2a516568b0 (diff) | |
Upload more correct version of last commit.
Uploaded old version from offline fork by accident.
| -rw-r--r-- | engine/title.asm | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/engine/title.asm b/engine/title.asm index 95af12c..432c9c1 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -4,22 +4,22 @@ INCLUDE "vram.asm" SECTION "Title screen", ROMX[$5D8C], BANK[$01] IntroSequence:: - callab GameFreakIntro;, $39 + callab GameFreakIntro ; Bank $39 jr c, TitleSequenceStart ld a, [wTitleSequenceOpeningType] and a jr z, .opening_sequence .pikachu_minigame - callab PikachuMiniGame;, $38 + callab PikachuMiniGame ; Bank $38 jr TitleSequenceStart .opening_sequence - callab OpeningCutscene;, $39 + callab OpeningCutscene ; Bank $39 TitleSequenceStart:: call TitleSequenceInit - callab SetTitleBGDecorationBorder;, $02 + callab SetTitleBGDecorationBorder ; Bank $02 .loop call TitleScreenMain @@ -65,10 +65,7 @@ TitleSequenceInit:: call DisableLCD call ClearSprites - ;ld a, $23 - ;ld hl, InitEffectObject - ;call FarCall_hl - callba InitEffectObject + callba InitEffectObject ; Bank $23 ld hl, vChars0 ld bc, vBGMap0 - vChars0 @@ -180,10 +177,7 @@ TitleScreenMain:: bit 7, a jr nz, .exit call TitleScreenSequence - ;ld a, $23 - ;ld hl, EffectObjectJumpNoDelay - ;call FarCall_hl - callba EffectObjectJumpNoDelay + callba EffectObjectJumpNoDelay ; Bank $23 call DelayFrame and a ret @@ -549,7 +543,7 @@ SRAMClearMenu:: cp $01 jp z, Init - callab InitAllSRAMBanks;, $05 + callab InitAllSRAMBanks ; Bank $05 jp Init SRAMClear_Message:: |