ref: 3624d83d4c534d3918af795ab2f9a6258ab73182
parent: 3d6c7a464be046d6c104c62bae35e4810a1b93ae
parent: 2e7e5ca67b47bdd89c370db316992401be8af72b
author: Rangi <35663410+Rangi42@users.noreply.github.com>
date: Sun Sep 23 08:02:22 EDT 2018
Merge pull request #567 from Rangi42/master Identifying more labels and constants
--- a/constants/scgb_constants.asm
+++ b/constants/scgb_constants.asm
@@ -115,8 +115,8 @@
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
--- a/engine/gfx/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@@ -883,7 +883,7 @@
_CGB_GamefreakLogo:
ld de, wBGPals1
- ld a, PREDEFPAL_GAMEFREAK_LOGO
+ ld a, PREDEFPAL_GAMEFREAK_LOGO_BG
call GetPredefPal
call LoadHLPaletteIntoDE
ld hl, .Palette
--- 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