aboutsummaryrefslogtreecommitdiffstats
path: root/engine/movie
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-11-05 23:50:03 -0500
committerGitHub <noreply@github.com>2020-11-05 23:50:03 -0500
commitd3f13528754b985e892385dbd88c3c9a95681f1b (patch)
tree4a18885606996ff59bb714afb5db9a548e2f94a7 /engine/movie
parentPort some formatting from pokeyellow (diff)
parentSync more with pokeyellow (diff)
downloadpokeyellow-d3f13528754b985e892385dbd88c3c9a95681f1b.tar.gz
pokeyellow-d3f13528754b985e892385dbd88c3c9a95681f1b.tar.xz
pokeyellow-d3f13528754b985e892385dbd88c3c9a95681f1b.zip
Merge pull request #301 from Rangi42/master
Sync home and macro code with pokeyellow
Diffstat (limited to 'engine/movie')
-rwxr-xr-xengine/movie/intro.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index 040d643d..9813d67c 100755
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -23,7 +23,7 @@ PlayIntro:
PlayIntroScene:
ld b, SET_PAL_NIDORINO_INTRO
call RunPaletteCommand
- ldPal a, BLACK, DARK_GRAY, LIGHT_GRAY, WHITE
+ ldpal a, SHADE_BLACK, SHADE_DARK, SHADE_LIGHT, SHADE_WHITE
ldh [rBGP], a
ldh [rOBP0], a
ldh [rOBP1], a
@@ -307,7 +307,7 @@ PlayShootingStar:
ld b, SET_PAL_GAME_FREAK_INTRO
call RunPaletteCommand
farcall LoadCopyrightAndTextBoxTiles
- ldPal a, BLACK, DARK_GRAY, LIGHT_GRAY, WHITE
+ ldpal a, SHADE_BLACK, SHADE_DARK, SHADE_LIGHT, SHADE_WHITE
ldh [rBGP], a
ld c, 180
call DelayFrames