ref: 0306e94cc3365fb7b28e3bb6e1ccccb1e6b8b449
parent: c5d9ecae9c343677150273b810703a1fd8d9d87a
author: Remy Oukaour <[email protected]>
date: Wed Jan 17 19:16:03 EST 2018
More SGB documentation
--- a/constants/gfx_constants.asm
+++ b/constants/gfx_constants.asm
@@ -19,8 +19,6 @@
HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * TILE_WIDTH ; pixels
EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * TILE_WIDTH ; pixels
-PALPACKET_LENGTH EQU $10
-
; sprite_oam_struct members (see macros/wram.asm)
const_def
const SPRITEOAMSTRUCT_YCOORD ; 0
--- a/constants/scgb_constants.asm
+++ b/constants/scgb_constants.asm
@@ -7,12 +7,12 @@
const SCGB_POKEDEX
const SCGB_SLOT_MACHINE
const SCGB_06
- const SCGB_07
+ const SCGB_GS_INTRO
const SCGB_DIPLOMA
const SCGB_MAPPALS
const SCGB_PARTY_MENU
const SCGB_EVOLUTION
- const SCGB_0C
+ const SCGB_GS_TITLE_SCREEN
const SCGB_0D
const SCGB_MOVE_LIST
const SCGB_0F
@@ -36,6 +36,7 @@
SCGB_RAM EQU -1
; PredefPals indexes (see gfx/sgb/predef.pal)
+; GetPredefPal arguments (see engine/color.asm)
const_def
const PREDEFPAL_00
const PREDEFPAL_PALLET
@@ -63,10 +64,10 @@
const PREDEFPAL_SILVER_CAVE
const PREDEFPAL_DUNGEONS
const PREDEFPAL_NITE
- const PREDEFPAL_1A
- const PREDEFPAL_1B
- const PREDEFPAL_1C
- const PREDEFPAL_1D
+ const PREDEFPAL_BLACKOUT
+ const PREDEFPAL_DIPLOMA
+ const PREDEFPAL_TRADE_TUBE
+ const PREDEFPAL_POKEDEX
const PREDEFPAL_1E
const PREDEFPAL_1F
const PREDEFPAL_20
@@ -73,7 +74,7 @@
const PREDEFPAL_21
const PREDEFPAL_22
const PREDEFPAL_23
- const PREDEFPAL_24
+ const PREDEFPAL_BADGE
const PREDEFPAL_25
const PREDEFPAL_26
const PREDEFPAL_27
@@ -83,25 +84,25 @@
const PREDEFPAL_2B
const PREDEFPAL_2C
const PREDEFPAL_2D
- const PREDEFPAL_2E
- const PREDEFPAL_2F
- const PREDEFPAL_30
- const PREDEFPAL_31
- const PREDEFPAL_32
+ const PREDEFPAL_PARTY_ICON
+ const PREDEFPAL_HP_GREEN
+ const PREDEFPAL_HP_YELLOW
+ const PREDEFPAL_HP_RED
+ const PREDEFPAL_POKEGEAR
const PREDEFPAL_33
const PREDEFPAL_34
- const PREDEFPAL_35
- const PREDEFPAL_36
+ const PREDEFPAL_GS_INTRO_GAMEFREAK_LOGO
+ const PREDEFPAL_GS_INTRO_SHELLDER_LAPRAS
const PREDEFPAL_37
- const PREDEFPAL_38
- const PREDEFPAL_39
- const PREDEFPAL_3A
+ const PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG
+ const PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB
+ const PREDEFPAL_GS_INTRO_CHARIZARD_OB
const PREDEFPAL_3B
- const PREDEFPAL_3C
- const PREDEFPAL_3D
- const PREDEFPAL_3E
- const PREDEFPAL_3F
- const PREDEFPAL_40
+ const PREDEFPAL_GS_INTRO_CHARIZARD_BG
+ const PREDEFPAL_SLOT_MACHINE_0
+ const PREDEFPAL_SLOT_MACHINE_1
+ const PREDEFPAL_SLOT_MACHINE_2
+ const PREDEFPAL_SLOT_MACHINE_3
const PREDEFPAL_41
const PREDEFPAL_42
const PREDEFPAL_43
@@ -109,13 +110,13 @@
const PREDEFPAL_45
const PREDEFPAL_46
const PREDEFPAL_47
- const PREDEFPAL_48
- const PREDEFPAL_49
- const PREDEFPAL_4A
- const PREDEFPAL_4B
- const PREDEFPAL_4C
+ const PREDEFPAL_GS_TITLE_SCREEN_0
+ const PREDEFPAL_GS_TITLE_SCREEN_1
+ const PREDEFPAL_GS_TITLE_SCREEN_2
+ const PREDEFPAL_GS_TITLE_SCREEN_3
+ const PREDEFPAL_UNOWN_PUZZLE
const PREDEFPAL_4D
- const PREDEFPAL_4E
+ const PREDEFPAL_GAMEFREAK_LOGO
; SGB system command codes
; http://gbdev.gg8.se/wiki/articles/SGB_Functions#SGB_System_Command_Table
@@ -145,3 +146,5 @@
const SGB_ATTR_SET
const SGB_MASK_EN
const SGB_OBJ_TRN
+
+PALPACKET_LENGTH EQU $10
--- a/engine/cgb_layouts.asm
+++ b/engine/cgb_layouts.asm
@@ -40,12 +40,12 @@
dw _CGB_Pokedex
dw _CGB_SlotMachine
dw _CGB06
- dw _CGB07
+ dw _CGB_GSIntro
dw _CGB_Diploma
dw _CGB_MapPals
dw _CGB_PartyMenu
dw _CGB_Evolution
- dw _CGB0c
+ dw _CGB_GSTitleScreen
dw _CGB0d
dw _CGB_MoveList
dw _CGB0f
@@ -58,7 +58,7 @@
dw _CGB_PokedexUnownMode
dw _CGB_BillsPC
dw _CGB_UnownPuzzle
- dw _CGB_GamefreakLogo ; called before copyright
+ dw _CGB_GamefreakLogo
dw _CGB_PlayerOrMonFrontpicPals
dw _CGB_TradeTube
dw _CGB_TrainerOrMonFrontpicPals
@@ -67,15 +67,15 @@
; 8db8
_CGB_BattleGrayscale: ; 8db8
- ld hl, PalPacket_9c66 + 1
+ ld hl, PalPacket_BattleGrayscale + 1
ld de, wBGPals1
ld c, 4
call CopyPalettes
- ld hl, PalPacket_9c66 + 1
+ ld hl, PalPacket_BattleGrayscale + 1
ld de, wBGPals1 palette PAL_BATTLE_BG_EXP
ld c, 4
call CopyPalettes
- ld hl, PalPacket_9c66 + 1
+ ld hl, PalPacket_BattleGrayscale + 1
ld de, wOBPals1
ld c, 2
call CopyPalettes
@@ -267,7 +267,7 @@
_CGB_Pokedex: ; 8f70
ld de, wBGPals1
- ld a, PREDEFPAL_1D
+ ld a, PREDEFPAL_POKEDEX
call GetPredefPal
call LoadHLPaletteIntoDE ; dex interface palette
ld a, [CurPartySpecies]
@@ -309,7 +309,7 @@
_CGB_BillsPC: ; 8fca
ld de, wBGPals1
- ld a, PREDEFPAL_1D
+ ld a, PREDEFPAL_POKEDEX
call GetPredefPal
call LoadHLPaletteIntoDE
ld a, [CurPartySpecies]
@@ -366,7 +366,7 @@
_CGB_PokedexUnownMode: ; 903e
ld de, wBGPals1
- ld a, PREDEFPAL_1D
+ ld a, PREDEFPAL_POKEDEX
call GetPredefPal
call LoadHLPaletteIntoDE
ld a, [CurPartySpecies]
@@ -440,11 +440,11 @@
; 90f8
_CGB06: ; 90f8
- ld hl, PalPacket_9ca6 + 1
+ ld hl, PalPacket_SCGB_06 + 1
call CopyFourPalettes
call WipeAttrMap
ld de, wOBPals1
- ld a, PREDEFPAL_3C
+ ld a, PREDEFPAL_GS_INTRO_CHARIZARD_BG
call GetPredefPal
call LoadHLPaletteIntoDE
hlcoord 0, 6, AttrMap
@@ -458,7 +458,7 @@
ret
; 9122
-_CGB07: ; 9122
+_CGB_GSIntro: ; 9122
ld b, 0
ld hl, .Jumptable
add hl, bc
@@ -470,16 +470,16 @@
; 912d
.Jumptable: ; 912d
- dw .Function9133
- dw .Function9166
- dw .Function9180
+ dw .ShellderLaprasScene
+ dw .JigglypuffPikachuScene
+ dw .StartersCharizardScene
; 9133
-.Function9133: ; 9133
- ld hl, .Palette_914e
+.ShellderLaprasScene: ; 9133
+ ld hl, .ShellderLaprasBGPalette
ld de, wBGPals1
call LoadHLPaletteIntoDE
- ld hl, .Palette_9156
+ ld hl, .ShellderLaprasOBPals
ld de, wOBPals1
ld bc, 2 palettes
ld a, BANK(wOBPals1)
@@ -488,13 +488,13 @@
ret
; 914e
-.Palette_914e: ; 914e
+.ShellderLaprasBGPalette: ; 914e
RGB 19, 31, 19
RGB 18, 23, 31
RGB 11, 21, 28
RGB 04, 16, 24
-.Palette_9156: ; 9156
+.ShellderLaprasOBPals: ; 9156
RGB 29, 29, 29
RGB 20, 19, 20
RGB 19, 06, 04
@@ -506,14 +506,14 @@
RGB 03, 04, 06
; 9166
-.Function9166: ; 9166
+.JigglypuffPikachuScene: ; 9166
ld de, wBGPals1
- ld a, PREDEFPAL_38
+ ld a, PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG
call GetPredefPal
call LoadHLPaletteIntoDE
ld de, wOBPals1
- ld a, PREDEFPAL_39
+ ld a, PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB
call GetPredefPal
call LoadHLPaletteIntoDE
call WipeAttrMap
@@ -520,11 +520,11 @@
ret
; 9180
-.Function9180: ; 9180
- ld hl, PalPacket_9c36 + 1
+.StartersCharizardScene: ; 9180
+ ld hl, PalPacket_Pack + 1
call CopyFourPalettes
ld de, wOBPals1
- ld a, PREDEFPAL_3A
+ ld a, PREDEFPAL_GS_INTRO_CHARIZARD_OB
call GetPredefPal
call LoadHLPaletteIntoDE
call WipeAttrMap
@@ -532,7 +532,7 @@
; 9195
_CGB11: ; 9195
- ld hl, Palettes_b789
+ ld hl, Palettes_SCGB_11
ld de, wBGPals1
ld bc, 5 palettes
ld a, BANK(wBGPals1)
@@ -550,7 +550,7 @@
ld a, BANK(wBGPals1)
call FarCopyWRAM
- ld hl, PalPacket_9cb6 + 1
+ ld hl, PalPacket_Diploma + 1
call CopyFourPalettes
call WipeAttrMap
call ApplyAttrMap
@@ -565,7 +565,7 @@
; 91d1
_CGB_PartyMenu: ; 91d1
- ld hl, PalPacket_9c56 + 1
+ ld hl, PalPacket_PartyMenu + 1
call CopyFourPalettes
call InitPartyMenuBGPal0
call InitPartyMenuBGPal7
@@ -579,7 +579,7 @@
ld a, c
and a
jr z, .pokemon
- ld a, PREDEFPAL_1A
+ ld a, PREDEFPAL_BLACKOUT
call GetPredefPal
call LoadHLPaletteIntoDE
jr .got_palette
@@ -609,13 +609,13 @@
ret
; 9228
-_CGB0c: ; 9228
- ld hl, Palettes_b6f1
+_CGB_GSTitleScreen: ; 9228
+ ld hl, UnusedGSTitleBGPals
ld de, wBGPals1
ld bc, 5 palettes
ld a, BANK(wBGPals1)
call FarCopyWRAM
- ld hl, Palettes_b719
+ ld hl, UnusedGSTitleOBPals
ld de, wOBPals1
ld bc, 2 palettes
ld a, BANK(wOBPals1)
@@ -629,7 +629,7 @@
; 9251
_CGB0d: ; 9251
- ld hl, PalPacket_9cb6 + 1
+ ld hl, PalPacket_Diploma + 1
call CopyFourPalettes
call WipeAttrMap
call ApplyAttrMap
@@ -637,10 +637,10 @@
; 925e
_CGB_UnownPuzzle: ; 925e
- ld hl, PalPacket_9bc6 + 1
+ ld hl, PalPacket_UnownPuzzle + 1
call CopyFourPalettes
ld de, wOBPals1
- ld a, PREDEFPAL_4C
+ ld a, PREDEFPAL_UNOWN_PUZZLE
call GetPredefPal
call LoadHLPaletteIntoDE
ld a, [rSVBK]
@@ -648,9 +648,9 @@
ld a, BANK(wOBPals1)
ld [rSVBK], a
ld hl, wOBPals1
- ld a, $1f
+ ld a, LOW(palred 31 + palgreen 0 + palblue 0)
ld [hli], a
- ld a, $0
+ ld a, HIGH(palred 31 + palgreen 0 + palblue 0)
ld [hl], a
pop af
ld [rSVBK], a
@@ -685,7 +685,7 @@
ld a, PRYCE
call GetTrainerPalettePointer
call LoadPalette_White_Col1_Col2_Black
- ld a, PREDEFPAL_24
+ ld a, PREDEFPAL_BADGE
call GetPredefPal
call LoadHLPaletteIntoDE
@@ -791,7 +791,7 @@
; 93a6
_CGB0f: ; 93a6
- ld hl, PalPacket_9c46 + 1
+ ld hl, PalPacket_SCGB_0F + 1
call CopyFourPalettes
call WipeAttrMap
call ApplyAttrMap
@@ -803,7 +803,7 @@
_CGB_PokedexSearchOption: ; 93ba
ld de, wBGPals1
- ld a, PREDEFPAL_1D
+ ld a, PREDEFPAL_POKEDEX
call GetPredefPal
call LoadHLPaletteIntoDE
call WipeAttrMap
@@ -907,7 +907,7 @@
; 94d0
_CGB13: ; 94d0
- ld hl, PalPacket_9ba6 + 1
+ ld hl, PalPacket_SCGB_13 + 1
call CopyFourPalettes
call WipeAttrMap
hlcoord 0, 4, AttrMap
@@ -927,7 +927,7 @@
_CGB_GamefreakLogo: ; 94fa
ld de, wBGPals1
- ld a, PREDEFPAL_4E
+ ld a, PREDEFPAL_GAMEFREAK_LOGO
call GetPredefPal
call LoadHLPaletteIntoDE
ld hl, .Palette
@@ -969,7 +969,7 @@
; 9555
_CGB_TradeTube: ; 9555
- ld hl, PalPacket_9cc6 + 1
+ ld hl, PalPacket_TradeTube + 1
call CopyFourPalettes
ld hl, PartyMenuOBPals
ld de, wOBPals1
@@ -977,7 +977,7 @@
ld a, BANK(wOBPals1)
call FarCopyWRAM
ld de, wOBPals1 palette 7
- ld a, PREDEFPAL_1C
+ ld a, PREDEFPAL_TRADE_TUBE
call GetPredefPal
call LoadHLPaletteIntoDE
call WipeAttrMap
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -101,7 +101,7 @@
ret
InitPartyMenuPalettes:
- ld hl, PalPacket_9c56 + 1
+ ld hl, PalPacket_PartyMenu + 1
call CopyFourPalettes
call InitPartyMenuOBPals
call WipeAttrMap
@@ -182,7 +182,7 @@
ld a, [hSGB]
and a
ret z
- ld hl, PalPacket_9c26
+ ld hl, PalPacket_Function8b4d
jp PushSGBPals_
.cgb
@@ -197,12 +197,12 @@
ld a, [hSGB]
and a
ret z
- ld hl, PalPacket_9c36
+ ld hl, PalPacket_Pack
jp PushSGBPals_
.cgb
ld de, wOBPals1
- ld a, PREDEFPAL_3C
+ ld a, PREDEFPAL_GS_INTRO_CHARIZARD_BG
call GetPredefPal
jp LoadHLPaletteIntoDE
@@ -765,7 +765,7 @@
ret z
ld a, $90
ld [rOBPI], a
- ld a, PREDEFPAL_1C
+ ld a, PREDEFPAL_TRADE_TUBE
call GetPredefPal
call .PushPalette
ld a, PREDEFPAL_21
@@ -1342,11 +1342,11 @@
PartyMenuOBPals:
INCLUDE "gfx/icons/party_menu.pal"
-Palettes_b6f1:
-INCLUDE "gfx/unknown/b6f1.pal"
+UnusedGSTitleBGPals:
+INCLUDE "gfx/title/unused_gs_bg.pal"
-Palettes_b719:
-INCLUDE "gfx/unknown/b719.pal"
+UnusedGSTitleOBPals:
+INCLUDE "gfx/title/unused_gs_fg.pal"
MalePokegearPals:
INCLUDE "gfx/pokegear/pokegear.pal"
@@ -1354,7 +1354,7 @@
FemalePokegearPals:
INCLUDE "gfx/pokegear/pokegear_f.pal"
-Palettes_b789:
+Palettes_SCGB_11:
INCLUDE "gfx/unknown/b789.pal"
SlotMachinePals:
--- a/engine/sgb_layouts.asm
+++ b/engine/sgb_layouts.asm
@@ -30,12 +30,12 @@
dw .SGB_Pokedex
dw .SGB_SlotMachine
dw .SGB06
- dw .SGB07
+ dw .SGB_GSIntro
dw .SGB_Diploma
dw .SGB_MapPals
dw .SGB_PartyMenu
dw .SGB_Evolution
- dw .SGB0c
+ dw .SGB_GSTitleScreen
dw .SGB0d
dw .SGB_MoveList
dw .SGB0f
@@ -48,7 +48,7 @@
dw .SGB_PokedexUnownMode
dw .SGB_BillsPC
dw .SGB_UnownPuzzle
- dw .SGB19
+ dw .SGB_GamefreakLogo
dw .SGB_PlayerOrMonFrontpicPals
dw .SGB_TradeTube
dw .SGB_TrainerOrMonFrontpicPals
@@ -57,18 +57,18 @@
; 86ad
.SGB_BattleGrayscale: ; 86ad
- ld hl, PalPacket_9c66
- ld de, BlkPacket_9aa6
+ ld hl, PalPacket_BattleGrayscale
+ ld de, BlkPacket_Battle
ret
; 86b4
.SGB_BattleColors: ; 86b4
- ld hl, BlkPacket_9aa6
+ ld hl, BlkPacket_Battle
call PushSGBPals_
ld hl, PalPacket_9ce6
ld de, wSGBPals
- ld bc, $10
+ ld bc, PALPACKET_LENGTH
call CopyBytes
ld a, [PlayerHPPal]
@@ -106,8 +106,8 @@
ld [wSGBPals + 12], a
ld hl, PalPacket_9cf6
- ld de, wSGBPals + $10
- ld bc, $10
+ ld de, wSGBPals + PALPACKET_LENGTH
+ ld bc, PALPACKET_LENGTH
call CopyBytes
call GetBattlemonBackpicPalettePointer
@@ -131,7 +131,7 @@
ld [wSGBPals + 28], a
ld hl, wSGBPals
- ld de, wSGBPals + $10
+ ld de, wSGBPals + PALPACKET_LENGTH
ld a, SCGB_BATTLE_COLORS
ld [SGBPredef], a
ret
@@ -140,7 +140,7 @@
.SGB_MoveList: ; 873c
ld hl, PalPacket_9bd6
ld de, wSGBPals
- ld bc, $10
+ ld bc, PALPACKET_LENGTH
call CopyBytes
ld hl, wSGBPals + 1
@@ -149,15 +149,15 @@
inc hl
ld a, [PlayerHPPal]
- add $2f
+ add PREDEFPAL_HP_GREEN
ld [hl], a
ld hl, wSGBPals
- ld de, BlkPacket_9ad6
+ ld de, BlkPacket_MoveList
ret
; 875c
.SGB_PokegearPals: ; 875c
- ld hl, PalPacket_9c76
+ ld hl, PalPacket_Pokegear
ld de, BlkPacket_9a86
ret
; 8763
@@ -165,7 +165,7 @@
.SGB_StatsScreenHPPals: ; 8763
ld hl, PalPacket_9ce6
ld de, wSGBPals
- ld bc, $10
+ ld bc, PALPACKET_LENGTH
call CopyBytes
ld a, [wCurHPPal]
ld l, a
@@ -194,12 +194,12 @@
ld a, [hl]
ld [wSGBPals + 12], a
ld hl, wSGBPals
- ld de, BlkPacket_9ac6
+ ld de, BlkPacket_StatsScreen
ret
; 87ab
.SGB_PartyMenu: ; 87ab
- ld hl, PalPacket_9c56
+ ld hl, PalPacket_PartyMenu
ld de, wSGBPals + 1
ret
; 87b2
@@ -207,7 +207,7 @@
.SGB_Pokedex: ; 87b2
ld hl, PalPacket_9ce6
ld de, wSGBPals
- ld bc, $10
+ ld bc, PALPACKET_LENGTH
call CopyBytes
ld hl, wSGBPals + 3
ld [hl], LOW(palred 31 + palgreen 20 + palblue 10)
@@ -228,7 +228,7 @@
ld a, [hl]
ld [wSGBPals + 12], a
ld hl, wSGBPals
- ld de, BlkPacket_9ae6
+ ld de, BlkPacket_Pokedex_PC
ret
; 87e9
@@ -235,7 +235,7 @@
.SGB_BillsPC: ; 87e9
ld hl, PalPacket_9ce6
ld de, wSGBPals
- ld bc, $10
+ ld bc, PALPACKET_LENGTH
call CopyBytes
ld hl, wSGBPals + 3
ld [hl], LOW(palred 31 + palgreen 20 + palblue 10)
@@ -257,13 +257,13 @@
ld a, [hl]
ld [wSGBPals + 12], a
ld hl, wSGBPals
- ld de, BlkPacket_9ae6
+ ld de, BlkPacket_Pokedex_PC
ret
; 8823
.SGB_PokedexUnownMode: ; 8823
call .SGB_Pokedex
- ld de, BlkPacket_9af6
+ ld de, BlkPacket_PokedexUnownMode
ret
; 882a
@@ -270,7 +270,7 @@
.SGB_PokedexSearchOption: ; 882a
ld hl, PalPacket_9ce6
ld de, wSGBPals
- ld bc, $10
+ ld bc, PALPACKET_LENGTH
call CopyBytes
ld hl, wSGBPals + 3
ld [hl], LOW(palred 31 + palgreen 20 + palblue 10)
@@ -286,33 +286,33 @@
; 884b
.SGB_PackPals: ; 884b
- ld hl, PalPacket_9c36
+ ld hl, PalPacket_Pack
ld de, BlkPacket_9a86
ret
; 8852
.SGB_SlotMachine: ; 8852
- ld hl, PalPacket_9c96
- ld de, BlkPacket_9b06
+ ld hl, PalPacket_SlotMachine
+ ld de, BlkPacket_SlotMachine
ret
; 8859
.SGB06: ; 8859
- ld hl, PalPacket_9ca6
- ld de, BlkPacket_9b76
+ ld hl, PalPacket_SCGB_06
+ ld de, BlkPacket_SCGB_06
ret
; 8860
.SGB_Diploma:
.SGB_MysteryGift: ; 8860
- ld hl, PalPacket_9cb6
+ ld hl, PalPacket_Diploma
ld de, BlkPacket_9a86
ret
; 8867
-.SGB07: ; 8867
+.SGB_GSIntro: ; 8867
ld b, 0
- ld hl, .BlkPacketTable_SGB07
+ ld hl, .BlkPacketTable_GSIntro
rept 4
add hl, bc
endr
@@ -326,15 +326,15 @@
ret
; 8878
-.BlkPacketTable_SGB07: ; 8878
- dw BlkPacket_9a86, PalPacket_9be6
- dw BlkPacket_9a96, PalPacket_9c06
- dw BlkPacket_9a86, PalPacket_9c16
+.BlkPacketTable_GSIntro: ; 8878
+ dw BlkPacket_9a86, PalPacket_GSIntroShellderLapras
+ dw BlkPacket_GSIntroJigglypuffPikachu, PalPacket_GSIntroJigglypuffPikachu
+ dw BlkPacket_9a86, PalPacket_GSIntroCharizard
; 8884
-.SGB0c: ; 8884
- ld hl, PalPacket_9b96
- ld de, BlkPacket_9b56
+.SGB_GSTitleScreen: ; 8884
+ ld hl, PalPacket_GSTitleScreen
+ ld de, BlkPacket_GSTitleScreen
ld a, SCGB_DIPLOMA
ld [SGBPredef], a
ret
@@ -341,13 +341,13 @@
; 8890
.SGB13: ; 8890
- ld hl, PalPacket_9ba6
- ld de, BlkPacket_9b86
+ ld hl, PalPacket_SCGB_13
+ ld de, BlkPacket_SCGB_13
ret
; 8897
.SGB0f: ; 8897
- ld hl, PalPacket_9c46
+ ld hl, PalPacket_SCGB_0F
ld de, BlkPacket_9a86
ret
; 889e
@@ -354,10 +354,10 @@
.SGB11: ; 889e
ld hl, BlkPacket_9a86
- ld de, PlayerLightScreenCount
- ld bc, $10
+ ld de, PlayerLightScreenCount ; ???
+ ld bc, PALPACKET_LENGTH
call CopyBytes
- ld hl, PalPacket_9bb6
+ ld hl, PalPacket_SCGB_11
ld de, BlkPacket_9a86
ret
; 88b1
@@ -365,7 +365,7 @@
.SGB_MapPals: ; 88b1
ld hl, PalPacket_9bd6
ld de, wSGBPals
- ld bc, $10
+ ld bc, PALPACKET_LENGTH
call CopyBytes
call .GetMapPalsIndex
ld hl, wSGBPals + 1
@@ -380,7 +380,7 @@
push bc
ld hl, PalPacket_9ce6
ld de, wSGBPals
- ld bc, $10
+ ld bc, PALPACKET_LENGTH
call CopyBytes
pop bc
ld a, c
@@ -423,13 +423,13 @@
.SGB0d:
.SGB_TrainerCard: ; 891a
- ld hl, PalPacket_9cb6
+ ld hl, PalPacket_Diploma
ld de, BlkPacket_9a86
ret
; 8921
.SGB_UnownPuzzle: ; 8921
- ld hl, PalPacket_9bc6
+ ld hl, PalPacket_UnownPuzzle
ld de, BlkPacket_9a86
ret
; 8928
@@ -437,11 +437,11 @@
.SGB12: ; 8928
ld hl, PalPacket_9bd6
ld de, wSGBPals
- ld bc, $10
+ ld bc, PALPACKET_LENGTH
call CopyBytes
ld hl, BlkPacket_9a86
- ld de, wSGBPals + $10
- ld bc, $10
+ ld de, wSGBPals + PALPACKET_LENGTH
+ ld bc, PALPACKET_LENGTH
call CopyBytes
call .GetMapPalsIndex
ld hl, wSGBPals + 1
@@ -460,7 +460,7 @@
ld a, [wMenuBorderBottomCoord]
ld [hl], a
ld hl, wSGBPals
- ld de, wSGBPals + $10
+ ld de, wSGBPals + PALPACKET_LENGTH
ret
; 8969
@@ -467,7 +467,7 @@
.SGB1e: ; 8969
ld hl, PalPacket_9ce6
ld de, wSGBPals
- ld bc, $10
+ ld bc, PALPACKET_LENGTH
call CopyBytes
ld a, [CurPartySpecies]
ld l, a
@@ -497,8 +497,8 @@
ret
; 89a6
-.SGB19: ; 89a6
- ld hl, PalPacket_9cd6
+.SGB_GamefreakLogo: ; 89a6
+ ld hl, PalPacket_GamefreakLogo
ld de, BlkPacket_9a86
ret
; 89ad
@@ -506,7 +506,7 @@
.SGB_PlayerOrMonFrontpicPals: ; 89ad
ld hl, PalPacket_9ce6
ld de, wSGBPals
- ld bc, $10
+ ld bc, PALPACKET_LENGTH
call CopyBytes
ld a, [CurPartySpecies]
ld bc, TempMonDVs
@@ -525,7 +525,7 @@
; 89d9
.SGB_TradeTube: ; 89d9
- ld hl, PalPacket_9cc6
+ ld hl, PalPacket_TradeTube
ld de, BlkPacket_9a86
ret
; 89e0
@@ -533,7 +533,7 @@
.SGB_TrainerOrMonFrontpicPals: ; 89e0
ld hl, PalPacket_9ce6
ld de, wSGBPals
- ld bc, $10
+ ld bc, PALPACKET_LENGTH
call CopyBytes
ld a, [CurPartySpecies]
ld bc, TempMonDVs
--- a/gfx/sgb/blk_packets.asm
+++ b/gfx/sgb/blk_packets.asm
@@ -19,12 +19,12 @@
attr_blk_data %011, 0,0,0, 00,00, 19,17
ds 8
-BlkPacket_9a96:
+BlkPacket_GSIntroJigglypuffPikachu:
attr_blk 1
attr_blk_data %111, 1,1,0, 00,10, 19,13
ds 8
-BlkPacket_9aa6:
+BlkPacket_Battle:
attr_blk 5
attr_blk_data %111, 2,2,0, 00,12, 19,17
attr_blk_data %011, 1,1,0, 01,00, 10,03
@@ -32,27 +32,27 @@
attr_blk_data %011, 2,2,0, 00,04, 08,11
attr_blk_data %011, 3,3,0, 11,00, 19,07
-BlkPacket_9ac6:
+BlkPacket_StatsScreen:
attr_blk 1
attr_blk_data %111, 1,1,0, 00,01, 07,07
ds 8
-BlkPacket_9ad6:
+BlkPacket_MoveList:
attr_blk 1
attr_blk_data %111, 1,1,0, 11,01, 19,02
ds 8
-BlkPacket_9ae6:
+BlkPacket_Pokedex_PC:
attr_blk 1
attr_blk_data %111, 1,1,0, 01,01, 08,08
ds 8
-BlkPacket_9af6:
+BlkPacket_PokedexUnownMode:
attr_blk 1
attr_blk_data %111, 1,1,0, 07,05, 13,11
ds 8
-BlkPacket_9b06:
+BlkPacket_SlotMachine:
attr_blk 5
attr_blk_data %011, 1,1,0, 00,00, 19,11
attr_blk_data %011, 2,2,0, 00,04, 19,09
@@ -60,7 +60,7 @@
attr_blk_data %011, 0,0,0, 04,04, 15,09
attr_blk_data %011, 0,0,0, 00,12, 19,17
-BlkPacket_9b26:
+UnreferencedBlkPacket_9b26:
attr_blk 7
attr_blk_data %111, 0,0,1, 00,00, 02,12
attr_blk_data %010, 0,0,0, 12,00, 18,01
@@ -71,7 +71,7 @@
attr_blk_data %010, 0,0,0, 12,10, 18,11
ds 4
-BlkPacket_9b56:
+BlkPacket_GSTitleScreen:
attr_blk 3
attr_blk_data %111, 0,0,2, 00,00, 19,04
attr_blk_data %011, 3,3,0, 00,06, 19,17
@@ -78,12 +78,12 @@
attr_blk_data %011, 1,1,0, 15,01, 18,04
ds 12
-BlkPacket_9b76:
+BlkPacket_SCGB_06:
attr_blk 1
attr_blk_data %111, 0,0,1, 00,00, 19,05
ds 8
-BlkPacket_9b86:
+BlkPacket_SCGB_13:
attr_blk 2
attr_blk_data %111, 2,2,0, 00,04, 19,13
attr_blk_data %011, 1,1,0, 00,06, 19,11
--- a/gfx/sgb/pal_packets.asm
+++ b/gfx/sgb/pal_packets.asm
@@ -45,27 +45,68 @@
ENDM
-PalPacket_9b96: sgb_pal_set 48, 49, 4A, 4B
-PalPacket_9ba6: sgb_pal_set 2B, 24, 20, 00
-PalPacket_9bb6: sgb_pal_set 41, 42, 43, 44
-PalPacket_9bc6: sgb_pal_set 4C, 4C, 4C, 4C
-PalPacket_9bd6: sgb_pal_set 00, 00, 00, 00
-PalPacket_9be6: sgb_pal_set 36, 00, 00, 00
-PalPacket_9bf6: sgb_pal_set 37, 00, 00, 00
-PalPacket_9c06: sgb_pal_set 38, 39, 00, 00
-PalPacket_9c16: sgb_pal_set 3A, 00, 00, 00
-PalPacket_9c26: sgb_pal_set 3B, 00, 00, 00
-PalPacket_9c36: sgb_pal_set 3C, 00, 00, 00
-PalPacket_9c46: sgb_pal_set 39, 00, 00, 00
-PalPacket_9c56: sgb_pal_set 2E, 2F, 30, 31
-PalPacket_9c66: sgb_pal_set 1A, 1A, 1A, 1A
-PalPacket_9c76: sgb_pal_set 32, 00, 00, 00
-PalPacket_9c86: sgb_pal_set 3C, 00, 00, 00
-PalPacket_9c96: sgb_pal_set 3D, 3E, 3F, 40
-PalPacket_9ca6: sgb_pal_set 33, 34, 1B, 1F
-PalPacket_9cb6: sgb_pal_set 1B, 00, 00, 00
-PalPacket_9cc6: sgb_pal_set 1C, 00, 00, 00
-PalPacket_9cd6: sgb_pal_set 35, 00, 00, 00
+PalPacket_GSTitleScreen:
+ sgb_pal_set GS_TITLE_SCREEN_0, GS_TITLE_SCREEN_1, GS_TITLE_SCREEN_2, GS_TITLE_SCREEN_3
+
+PalPacket_SCGB_13:
+ sgb_pal_set 2B, BADGE, 20, 00
+
+PalPacket_SCGB_11:
+ sgb_pal_set 41, 42, 43, 44
+
+PalPacket_UnownPuzzle:
+ sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE
+
+PalPacket_9bd6:
+ sgb_pal_set 00, 00, 00, 00
+
+PalPacket_GSIntroShellderLapras:
+ sgb_pal_set GS_INTRO_SHELLDER_LAPRAS, 00, 00, 00
+
+UnreferencedPalPacket_9bf6:
+ sgb_pal_set 37, 00, 00, 00
+
+PalPacket_GSIntroJigglypuffPikachu:
+ sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_BG, GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00
+
+PalPacket_GSIntroCharizard:
+ sgb_pal_set GS_INTRO_CHARIZARD_OB, 00, 00, 00
+
+PalPacket_Function8b4d:
+ sgb_pal_set 3B, 00, 00, 00
+
+PalPacket_Pack:
+ sgb_pal_set GS_INTRO_CHARIZARD_BG, 00, 00, 00
+
+PalPacket_SCGB_0F:
+ sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00, 00
+
+PalPacket_PartyMenu:
+ sgb_pal_set PARTY_ICON, HP_GREEN, HP_YELLOW, HP_RED
+
+PalPacket_BattleGrayscale:
+ sgb_pal_set BLACKOUT, BLACKOUT, BLACKOUT, BLACKOUT
+
+PalPacket_Pokegear:
+ sgb_pal_set POKEGEAR, 00, 00, 00
+
+UnreferencedPalPacket_9c86:
+ sgb_pal_set GS_INTRO_CHARIZARD_BG, 00, 00, 00
+
+PalPacket_SlotMachine:
+ sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3
+
+PalPacket_SCGB_06:
+ sgb_pal_set 33, 34, DIPLOMA, 1F
+
+PalPacket_Diploma:
+ sgb_pal_set DIPLOMA, 00, 00, 00
+
+PalPacket_TradeTube:
+ sgb_pal_set TRADE_TUBE, 00, 00, 00
+
+PalPacket_GamefreakLogo:
+ sgb_pal_set GS_INTRO_GAMEFREAK_LOGO, 00, 00, 00
PalPacket_9ce6:
sgb_pal01
--- a/gfx/sgb/predef.pal
+++ b/gfx/sgb/predef.pal
@@ -1,4 +1,4 @@
-; PREDEFPAL_00 (_CGB_BattleGrayscale via PalPacket_9c66)
+; PREDEFPAL_00
RGB 31, 31, 31
RGB 22, 25, 19
RGB 16, 21, 30
@@ -128,22 +128,22 @@
RGB 12, 28, 22
RGB 15, 20, 20
RGB 00, 00, 00
-; PREDEFPAL_1A (_CGB_Evolution, _CGB_BattleGrayscale via PalPacket_9c66)
+; PREDEFPAL_BLACKOUT
RGB 31, 31, 31
RGB 07, 07, 07
RGB 02, 03, 03
RGB 00, 00, 00
-; PREDEFPAL_1B (_CGB_Diploma via PalPacket_9cb6, _CGB0d via PalPacket_9cb6)
+; PREDEFPAL_DIPLOMA
RGB 31, 31, 31
RGB 30, 22, 17
RGB 16, 14, 19
RGB 00, 00, 00
-; PREDEFPAL_1C (_CGB_TradeTube, Unreferenced_Function97cc)
+; PREDEFPAL_TRADE_TUBE
RGB 31, 31, 31
RGB 18, 20, 27
RGB 11, 15, 23
RGB 00, 00, 00
-; PREDEFPAL_1D (_CGB_Pokedex, _CGB_BillsPC, _CGB_PokedexUnownMode, _CGB_PokedexSearchOption)
+; PREDEFPAL_POKEDEX
RGB 31, 31, 31
RGB 31, 20, 10
RGB 26, 10, 06
@@ -163,7 +163,7 @@
RGB 28, 20, 15
RGB 21, 14, 09
RGB 00, 00, 00
-; PREDEFPAL_21 (Unreferenced_Function97cc)
+; PREDEFPAL_21
RGB 31, 31, 31
RGB 20, 26, 16
RGB 09, 20, 11
@@ -178,7 +178,7 @@
RGB 31, 28, 14
RGB 26, 20, 00
RGB 00, 00, 00
-; PREDEFPAL_24 (_CGB_TrainerCard, _CGB13 via PalPacket_9ba6)
+; PREDEFPAL_BADGE
RGB 31, 31, 31
RGB 26, 21, 22
RGB 15, 15, 18
@@ -213,7 +213,7 @@
RGB 20, 17, 18
RGB 18, 13, 11
RGB 00, 00, 00
-; PREDEFPAL_2B (_CGB13 via PalPacket_9ba6)
+; PREDEFPAL_2B
RGB 31, 31, 31
RGB 23, 21, 16
RGB 12, 12, 10
@@ -228,47 +228,47 @@
RGB 26, 23, 16
RGB 29, 14, 09
RGB 00, 00, 00
-; PREDEFPAL_2E (_CGB_PartyMenu via PalPacket_9c56)
+; PREDEFPAL_PARTY_ICON
RGB 31, 31, 31
RGB 18, 18, 18
RGB 10, 10, 10
RGB 00, 00, 00
-; PREDEFPAL_2F (_CGB_PartyMenu via PalPacket_9c56)
+; PREDEFPAL_HP_GREEN
RGB 31, 31, 31
RGB 30, 26, 15
RGB 00, 23, 00
RGB 00, 00, 00
-; PREDEFPAL_30
+; PREDEFPAL_HP_YELLOW
RGB 31, 31, 31
RGB 30, 26, 15
RGB 31, 23, 00
RGB 00, 00, 00
-; PREDEFPAL_31
+; PREDEFPAL_HP_RED
RGB 31, 31, 31
RGB 30, 26, 15
RGB 31, 00, 00
RGB 00, 00, 00
-; PREDEFPAL_32
+; PREDEFPAL_POKEGEAR
RGB 31, 31, 31
RGB 29, 26, 19
RGB 27, 20, 14
RGB 00, 00, 00
-; PREDEFPAL_33 (_CGB06 via PalPacket_9ca6)
+; PREDEFPAL_33
RGB 31, 31, 31
RGB 24, 20, 10
RGB 21, 00, 04
RGB 00, 00, 00
-; PREDEFPAL_34 (_CGB06 via PalPacket_9ca6)
+; PREDEFPAL_34
RGB 31, 31, 31
RGB 31, 20, 10
RGB 21, 00, 04
RGB 00, 00, 00
-; PREDEFPAL_35
+; PREDEFPAL_GS_INTRO_GAMEFREAK_LOGO
RGB 31, 31, 31
RGB 30, 26, 16
RGB 16, 12, 09
RGB 00, 00, 00
-; PREDEFPAL_36
+; PREDEFPAL_GS_INTRO_SHELLDER_LAPRAS
RGB 31, 31, 31
RGB 15, 28, 26
RGB 12, 22, 26
@@ -278,47 +278,47 @@
RGB 15, 28, 26
RGB 23, 24, 24
RGB 00, 00, 00
-; PREDEFPAL_38 (_CGB07.Function9166)
+; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG
RGB 31, 31, 24
RGB 07, 27, 19
RGB 26, 20, 10
RGB 19, 12, 08
-; PREDEFPAL_39 (_CGB07.Function9166, _CGB0f via PalPacket_9c46)
+; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB
RGB 31, 31, 31
RGB 31, 28, 14
RGB 31, 13, 31
RGB 00, 00, 00
-; PREDEFPAL_3A (_CGB07.Function9180)
+; PREDEFPAL_GS_INTRO_CHARIZARD_OB
RGB 31, 31, 31
RGB 16, 18, 21
RGB 10, 12, 18
RGB 00, 00, 00
-; PREDEFPAL_3B (Unreferenced_Function8b4d)
+; PREDEFPAL_3B
RGB 31, 31, 31
RGB 23, 21, 16
RGB 12, 12, 10
RGB 00, 00, 00
-; PREDEFPAL_3C (_CGB06, Unreferenced_Function8b67, _CGB07.Function9180 via PalPacket_9c36)
+; PREDEFPAL_GS_INTRO_CHARIZARD
RGB 31, 31, 31
RGB 31, 14, 00
RGB 07, 11, 15
RGB 00, 00, 00
-; PREDEFPAL_3D
+; PREDEFPAL_SLOT_MACHINE_0
RGB 31, 31, 31
RGB 26, 21, 22
RGB 26, 10, 06
RGB 00, 00, 00
-; PREDEFPAL_3E
+; PREDEFPAL_SLOT_MACHINE_1
RGB 31, 31, 31
RGB 30, 27, 04
RGB 24, 20, 11
RGB 00, 00, 00
-; PREDEFPAL_3F
+; PREDEFPAL_SLOT_MACHINE_2
RGB 31, 31, 31
RGB 31, 13, 25
RGB 24, 20, 11
RGB 00, 00, 00
-; PREDEFPAL_40
+; PREDEFPAL_SLOT_MACHINE_3
RGB 31, 31, 31
RGB 16, 19, 29
RGB 24, 20, 11
@@ -358,27 +358,27 @@
RGB 26, 20, 00
RGB 16, 19, 29
RGB 00, 00, 00
-; PREDEFPAL_48
+; PREDEFPAL_GS_TITLE_SCREEN_0
RGB 31, 31, 31
RGB 16, 02, 30
RGB 15, 20, 31
RGB 00, 00, 00
-; PREDEFPAL_49
+; PREDEFPAL_GS_TITLE_SCREEN_1
RGB 31, 31, 31
RGB 16, 13, 04
RGB 15, 20, 31
RGB 00, 00, 00
-; PREDEFPAL_4A
+; PREDEFPAL_GS_TITLE_SCREEN_2
RGB 31, 31, 31
RGB 28, 04, 02
RGB 15, 20, 31
RGB 00, 00, 00
-; PREDEFPAL_4B
+; PREDEFPAL_GS_TITLE_SCREEN_3
RGB 31, 31, 31
RGB 18, 23, 31
RGB 15, 20, 31
RGB 00, 00, 00
-; PREDEFPAL_4C (_CGB_UnownPuzzle)
+; PREDEFPAL_UNOWN_PUZZLE
RGB 31, 31, 31
RGB 24, 20, 11
RGB 18, 13, 11
@@ -388,7 +388,7 @@
RGB 31, 31, 31
RGB 25, 30, 00
RGB 25, 30, 00
-; PREDEFPAL_4E (_CGB_GamefreakLogo)
+; PREDEFPAL_GAMEFREAK_LOGO
RGB 00, 00, 00
RGB 08, 11, 11
RGB 21, 21, 21
--- /dev/null
+++ b/gfx/title/unused_gs_bg.pal
@@ -1,0 +1,24 @@
+ RGB 31, 31, 31
+ RGB 18, 23, 31
+ RGB 15, 20, 31
+ RGB 00, 00, 00
+
+ RGB 31, 31, 31
+ RGB 22, 00, 31
+ RGB 15, 20, 31
+ RGB 00, 00, 00
+
+ RGB 31, 31, 31
+ RGB 31, 00, 00
+ RGB 15, 20, 31
+ RGB 00, 00, 00
+
+ RGB 31, 31, 31
+ RGB 25, 22, 00
+ RGB 15, 20, 31
+ RGB 00, 00, 00
+
+ RGB 31, 31, 31
+ RGB 23, 26, 31
+ RGB 18, 23, 31
+ RGB 00, 00, 00
--- /dev/null
+++ b/gfx/title/unused_gs_fg.pal
@@ -1,0 +1,9 @@
+ RGB 31, 31, 31
+ RGB 07, 06, 03
+ RGB 07, 06, 03
+ RGB 07, 06, 03
+
+ RGB 31, 31, 31
+ RGB 31, 31, 00
+ RGB 26, 22, 00
+ RGB 00, 00, 00
--- a/gfx/unknown/b6f1.pal
+++ /dev/null
@@ -1,24 +1,0 @@
- RGB 31, 31, 31
- RGB 18, 23, 31
- RGB 15, 20, 31
- RGB 00, 00, 00
-
- RGB 31, 31, 31
- RGB 22, 00, 31
- RGB 15, 20, 31
- RGB 00, 00, 00
-
- RGB 31, 31, 31
- RGB 31, 00, 00
- RGB 15, 20, 31
- RGB 00, 00, 00
-
- RGB 31, 31, 31
- RGB 25, 22, 00
- RGB 15, 20, 31
- RGB 00, 00, 00
-
- RGB 31, 31, 31
- RGB 23, 26, 31
- RGB 18, 23, 31
- RGB 00, 00, 00
--- a/gfx/unknown/b719.pal
+++ /dev/null
@@ -1,9 +1,0 @@
- RGB 31, 31, 31
- RGB 07, 06, 03
- RGB 07, 06, 03
- RGB 07, 06, 03
-
- RGB 31, 31, 31
- RGB 31, 31, 00
- RGB 26, 22, 00
- RGB 00, 00, 00