aboutsummaryrefslogtreecommitdiffstats
path: root/engine/movie
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-11-13 11:10:03 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2020-11-13 11:10:03 -0500
commitb88572fbccecc8d125fe8a50365751f0530d1a9a (patch)
tree46a733a0ad7259689b9b5577f109751f34f42956 /engine/movie
parentMention YELLMONS.GB in the readme (diff)
downloadpokeyellow-b88572fbccecc8d125fe8a50365751f0530d1a9a.tar.gz
pokeyellow-b88572fbccecc8d125fe8a50365751f0530d1a9a.tar.xz
pokeyellow-b88572fbccecc8d125fe8a50365751f0530d1a9a.zip
Add constants for player and rival starters
Diffstat (limited to 'engine/movie')
-rwxr-xr-xengine/movie/oak_speech/oak_speech.asm2
-rwxr-xr-xengine/movie/title_rb.asm6
2 files changed, 4 insertions, 4 deletions
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