pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #567 from Rangi42/master

Browse Source 
Identifying more labels and constants
This commit is contained in:
Rangi 2018-09-23 12:02:22 -04:00 committed by GitHub
commit 3624d83d4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
constants/scgb_constants.asm
View File

@ -115,8 +115,8 @@ SCGB_RAM EQU -1
const PREDEFPAL_GS_TITLE_SCREEN_2 const PREDEFPAL_GS_TITLE_SCREEN_2
const PREDEFPAL_GS_TITLE_SCREEN_3 const PREDEFPAL_GS_TITLE_SCREEN_3
const PREDEFPAL_UNOWN_PUZZLE const PREDEFPAL_UNOWN_PUZZLE
const PREDEFPAL_4D const PREDEFPAL_GAMEFREAK_LOGO_OB
const PREDEFPAL_GAMEFREAK_LOGO const PREDEFPAL_GAMEFREAK_LOGO_BG
; SGB system command codes ; SGB system command codes
; http://gbdev.gg8.se/wiki/articles/SGB_Functions#SGB_System_Command_Table ; http://gbdev.gg8.se/wiki/articles/SGB_Functions#SGB_System_Command_Table

2
engine/gfx/cgb_layouts.asm
View File

@ -883,7 +883,7 @@ _CGB_MagnetTrain:
_CGB_GamefreakLogo: _CGB_GamefreakLogo:
ld de, wBGPals1 ld de, wBGPals1
ld a, PREDEFPAL_GAMEFREAK_LOGO ld a, PREDEFPAL_GAMEFREAK_LOGO_BG
call GetPredefPal call GetPredefPal
call LoadHLPaletteIntoDE call LoadHLPaletteIntoDE
ld hl, .Palette ld hl, .Palette

4
gfx/sgb/predef.pal
View File

@ -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, 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, 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, 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 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 RGB 00,00,00, 08,11,11, 21,21,21, 31,31,31 ; PREDEFPAL_GAMEFREAK_LOGO_BG