summaryrefslogtreecommitdiff
path: root/engine/gfx/cgb_layouts.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-08-27 12:13:44 -0400
committerGitHub <noreply@github.com>2020-08-27 12:13:44 -0400
commita147c35540f4010b495cc1ba990320eeb4af1b35 (patch)
tree0ac1b41908eb1b3b3e358be3afb91fadbf600c9d /engine/gfx/cgb_layouts.asm
parentc5a3429314e26c4a26a1a5ddd5fe4d2d59294b71 (diff)
parent3b43f79dc67b0e2d65bacf222d5ef044c0376fde (diff)
Merge pull request #762 from mid-kid/master
Better document splash screen
Diffstat (limited to 'engine/gfx/cgb_layouts.asm')
-rw-r--r--engine/gfx/cgb_layouts.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm
index c58b27cd9..d9bd9a915 100644
--- a/engine/gfx/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@@ -886,10 +886,10 @@ _CGB_GamefreakLogo:
ld a, PREDEFPAL_GAMEFREAK_LOGO_BG
call GetPredefPal
call LoadHLPaletteIntoDE
- ld hl, .GamefreakLogoOBPalette
+ ld hl, .GamefreakDittoPalette
ld de, wOBPals1
call LoadHLPaletteIntoDE
- ld hl, .GamefreakLogoOBPalette
+ ld hl, .GamefreakDittoPalette
ld de, wOBPals1 palette 1
call LoadHLPaletteIntoDE
call WipeAttrmap
@@ -897,8 +897,8 @@ _CGB_GamefreakLogo:
call ApplyPals
ret
-.GamefreakLogoOBPalette:
-INCLUDE "gfx/splash/logo.pal"
+.GamefreakDittoPalette:
+INCLUDE "gfx/splash/ditto.pal"
_CGB_PlayerOrMonFrontpicPals:
ld de, wBGPals1