diff options
| author | IIMarckus <iimarckus@gmail.com> | 2011-04-09 20:12:51 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2011-04-09 20:12:51 -0600 |
| commit | c7737ee3d3cf0f9d284198400befad1ff101a8d1 (patch) | |
| tree | f3b1c50085b517091973032d6a6dcab6412ccc52 | |
| parent | dd3d39418bed487b2db580f7f1045c2c2df75aaa (diff) | |
add in a function from Oak's speech
hg-commit-id: 393c2c38d860
| -rw-r--r-- | pokered.asm | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/pokered.asm b/pokered.asm index e0368a29..5b015614 100644 --- a/pokered.asm +++ b/pokered.asm @@ -684,7 +684,7 @@ OakSpeech: ; 6115 ld de,$615F ld bc,$1300 call $62A4 ; displays Oak sprite? - call $6271 ; fades in the sprite? + call FadeInIntroSprite ; fades in the sprite? ld hl,HelloWelcomeText call PrintText ; prints text box call $20D8 @@ -712,7 +712,7 @@ OakSpeech: ; 6115 ld de,$6049 ld bc,$1300 call $62A4 ; displays rival sprite - call $6271 + call FadeInIntroSprite ld hl,ThisIsMyGrandsonText call PrintText call $69A4 @@ -785,7 +785,20 @@ ThisIsMyGrandsonText: db $17,$34,$65,$22,$50 ; "This is my grandson ..." YourOwnLegendText: db $17,$97,$65,$22,$50 ; "Ninten! Your very own legend ..." -INCBIN "baserom.gbc",$6271,$1D8F + +FadeInIntroSprite: + ld hl,$6282 + ld b,6 +.next\@ + ld a,[hli] + ld [$FF47],a + ld c,$A + call Delay + dec b + jr nz,.next\@ + ret + +INCBIN "baserom.gbc",$6282,$8000 - $6282 SECTION "bank2",DATA,BANK[$2] |