diff options
| author | mid-kid <esteve.varela@gmail.com> | 2020-08-22 01:10:17 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2020-08-27 13:58:54 +0200 |
| commit | 926e2318492341b108d5591e752babc87975a7fc (patch) | |
| tree | 41c7fb03d7b133ab45a0d7e2dc637abbcee34860 /engine | |
| parent | c5a3429314e26c4a26a1a5ddd5fe4d2d59294b71 (diff) | |
Move all splash screen files to gfx/splash
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/gfx/cgb_layouts.asm | 8 | ||||
| -rw-r--r-- | engine/movie/intro.asm | 20 |
2 files changed, 14 insertions, 14 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 diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm index c05d1202c..fff4b6436 100644 --- a/engine/movie/intro.asm +++ b/engine/movie/intro.asm @@ -52,9 +52,9 @@ Copyright_GameFreakPresents: ret .GetGFLogoGFX: - ld de, GameFreakLogo + ld de, GameFreakLogoGFX ld hl, vTiles2 - lb bc, BANK(GameFreakLogo), 28 + lb bc, BANK(GameFreakLogoGFX), 28 call Get1bpp ldh a, [rSVBK] @@ -62,9 +62,9 @@ Copyright_GameFreakPresents: ld a, BANK(wDecompressScratch) ldh [rSVBK], a - ld hl, IntroLogoGFX + ld hl, GameFreakDittoGFX ld de, wDecompressScratch - ld a, BANK(IntroLogoGFX) + ld a, BANK(GameFreakDittoGFX) call FarDecompress ld hl, vTiles0 @@ -295,7 +295,7 @@ GameFreakLogoScene4: srl a ld e, a ld d, $0 - ld hl, GameFreakLogoPalettes + ld hl, GameFreakDittoPaletteFade add hl, de add hl, de ldh a, [rSVBK] @@ -320,12 +320,12 @@ GameFreakLogoScene4: GameFreakLogoScene5: ret -GameFreakLogoPalettes: -INCLUDE "gfx/intro/gamefreak_logo.pal" +GameFreakDittoPaletteFade: +INCLUDE "gfx/splash/ditto_fade.pal" -GameFreakLogo: -INCBIN "gfx/splash/logo1.1bpp" -INCBIN "gfx/splash/logo2.1bpp" +GameFreakLogoGFX: +INCBIN "gfx/splash/gamefreak_presents.1bpp" +INCBIN "gfx/splash/gamefreak_logo.1bpp" CrystalIntro: ldh a, [rSVBK] |