From b88572fbccecc8d125fe8a50365751f0530d1a9a Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 13 Nov 2020 11:10:03 -0500 Subject: Add constants for player and rival starters --- engine/movie/oak_speech/oak_speech.asm | 2 +- engine/movie/title_rb.asm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/movie') diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm index 1a327def..7acbd693 100755 --- a/engine/movie/oak_speech/oak_speech.asm +++ b/engine/movie/oak_speech/oak_speech.asm @@ -72,7 +72,7 @@ OakSpeech: call PrintText call GBFadeOutToWhite call ClearScreen - ld a, PIKACHU + ld a, STARTER_PIKACHU ld [wd0b5], a ld [wcf91], a call GetMonHeader diff --git a/engine/movie/title_rb.asm b/engine/movie/title_rb.asm index df630b53..597684df 100755 --- a/engine/movie/title_rb.asm +++ b/engine/movie/title_rb.asm @@ -92,11 +92,11 @@ TitleBallYTable: TitleScreenAnimateBallIfStarterOut: ; Animate the TitleBall if a starter just got scrolled out. ld a, [wTitleScreenScene] - cp STARTER1 + cp CHARMANDER ; starter 1 jr z, .ok - cp STARTER2 + cp SQUIRTLE ; starter 2 jr z, .ok - cp STARTER3 + cp BULBASAUR ; starter 3 ret nz .ok ld e, 1 ; animate titleball -- cgit v1.3.1-sl0p