diff options
Diffstat (limited to 'engine/titlescreen2.asm')
-rwxr-xr-x | engine/titlescreen2.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engine/titlescreen2.asm b/engine/titlescreen2.asm index dc1c633a..2346fcc5 100755 --- a/engine/titlescreen2.asm +++ b/engine/titlescreen2.asm @@ -1,22 +1,22 @@ -TitleScroll_WaitBall: ; 37244 (d:7244) +TitleScroll_WaitBall: ; Wait around for the TitleBall animation to play out. ; hi: speed ; lo: duration db $05, $05, 0 -TitleScroll_In: ; 37247 (d:7247) +TitleScroll_In: ; Scroll a TitleMon in from the right. ; hi: speed ; lo: duration db $a2, $94, $84, $63, $52, $31, $11, 0 -TitleScroll_Out: ; 3724f (d:724f) +TitleScroll_Out: ; Scroll a TitleMon out to the left. ; hi: speed ; lo: duration db $12, $22, $32, $42, $52, $62, $83, $93, 0 -TitleScroll: ; 37258 (d:7258) +TitleScroll: ld a, d ld bc, TitleScroll_In @@ -31,7 +31,7 @@ TitleScroll: ; 37258 (d:7258) ld e, 0 ; don't animate titleball .ok -_TitleScroll: ; 3726a (d:726a) +_TitleScroll: ld a, [bc] and a ret z @@ -67,29 +67,29 @@ _TitleScroll: ; 3726a (d:726a) pop bc jr _TitleScroll -.ScrollBetween ; 37292 (d:7292) +.ScrollBetween: .wait - ld a, [$ff44] ; rLY + ld a, [rLY] ; rLY cp l jr nz, .wait ld a, h - ld [rSCX], a ; $ff43 + ld [rSCX], a .wait2 - ld a, [$ff44] ; rLY + ld a, [rLY] ; rLY cp h jr z, .wait2 ret -TitleBallYTable: ; 372a0 (d:72a0) +TitleBallYTable: ; OBJ y-positions for the Poke Ball held by Red in the title screen. ; This is really two 0-terminated lists. Initiated with an index of 1. db 0, $71, $6f, $6e, $6d, $6c, $6d, $6e, $6f, $71, $74, 0 -Func_372ac: ; 372ac (d:72ac) +TitleScreenAnimateBallIfStarterOut: ; Animate the TitleBall if a starter just got scrolled out. - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wTitleMonSpecies] cp STARTER1 jr z, .ok cp STARTER2 @@ -102,7 +102,7 @@ Func_372ac: ; 372ac (d:72ac) ld d, 0 jp _TitleScroll -GetTitleBallY: ; 372c4 (d:72c4) +GetTitleBallY: ; Get position e from TitleBallYTable push de push hl |