From 2e7e5ca67b47bdd89c370db316992401be8af72b Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 22 Sep 2018 13:40:37 -0400 Subject: [PATCH] PREDEFPAL_4D -> PREDEFPAL_GAMEFREAK_LOGO_OB --- constants/scgb_constants.asm | 4 ++-- engine/gfx/cgb_layouts.asm | 2 +- gfx/sgb/predef.pal | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm index e60ed9795..4c2faa438 100644 --- a/constants/scgb_constants.asm +++ b/constants/scgb_constants.asm @@ -115,8 +115,8 @@ SCGB_RAM EQU -1 const PREDEFPAL_GS_TITLE_SCREEN_2 const PREDEFPAL_GS_TITLE_SCREEN_3 const PREDEFPAL_UNOWN_PUZZLE - const PREDEFPAL_4D - const PREDEFPAL_GAMEFREAK_LOGO + const PREDEFPAL_GAMEFREAK_LOGO_OB + const PREDEFPAL_GAMEFREAK_LOGO_BG ; SGB system command codes ; http://gbdev.gg8.se/wiki/articles/SGB_Functions#SGB_System_Command_Table diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index 851486d49..06e060443 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -883,7 +883,7 @@ _CGB_MagnetTrain: _CGB_GamefreakLogo: ld de, wBGPals1 - ld a, PREDEFPAL_GAMEFREAK_LOGO + ld a, PREDEFPAL_GAMEFREAK_LOGO_BG call GetPredefPal call LoadHLPaletteIntoDE ld hl, .Palette diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index 9c86e2459..233b25789 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -75,5 +75,5 @@ RGB 31,31,31, 28,04,02, 15,20,31, 00,00,00 ; PREDEFPAL_GS_TITLE_SCREEN_2 RGB 31,31,31, 18,23,31, 15,20,31, 00,00,00 ; PREDEFPAL_GS_TITLE_SCREEN_3 RGB 31,31,31, 24,20,11, 18,13,11, 00,00,00 ; PREDEFPAL_UNOWN_PUZZLE - RGB 31,31,31, 31,31,31, 25,30,00, 25,30,00 ; PREDEFPAL_4D - RGB 00,00,00, 08,11,11, 21,21,21, 31,31,31 ; PREDEFPAL_GAMEFREAK_LOGO + RGB 31,31,31, 31,31,31, 25,30,00, 25,30,00 ; PREDEFPAL_GAMEFREAK_LOGO_OB + RGB 00,00,00, 08,11,11, 21,21,21, 31,31,31 ; PREDEFPAL_GAMEFREAK_LOGO_BG