More SGB documentation

3 files changed, 113 insertions, 113 deletions

diff --git a/engine/cgb_layouts.asm b/engine/cgb_layouts.asm
index e87297828..908762520 100644
--- a/engine/cgb_layouts.asm
+++ b/engine/cgb_layouts.asm
@@ -40,12 +40,12 @@ LoadSGBLayoutCGB: ; 8d59
 	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 @@ LoadSGBLayoutCGB: ; 8d59
 	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 @@ LoadSGBLayoutCGB: ; 8d59
 ; 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 @@ INCLUDE "gfx/stats/stats.pal"
 
 _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 @@ INCLUDE "gfx/pokedex/cursor.pal"
 
 _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 @@ INCLUDE "gfx/pc/orange.pal"
 
 _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 @@ _CGB_SlotMachine: ; 906e
 ; 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 @@ _CGB06: ; 90f8
 	ret
 ; 9122
 
-_CGB07: ; 9122
+_CGB_GSIntro: ; 9122
 	ld b, 0
 	ld hl, .Jumptable
 	add hl, bc
@@ -470,16 +470,16 @@ _CGB07: ; 9122
 ; 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 @@ _CGB07: ; 9122
 	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,25 +506,25 @@ _CGB07: ; 9122
 	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
 	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 @@ _CGB07: ; 9122
 ; 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 @@ _CGB_Diploma: ; 91ad
 	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 @@ _CGB_MapPals: ; 91c8
 ; 91d1
 
 _CGB_PartyMenu: ; 91d1
-	ld hl, PalPacket_9c56 + 1
+	ld hl, PalPacket_PartyMenu + 1
 	call CopyFourPalettes
 	call InitPartyMenuBGPal0
 	call InitPartyMenuBGPal7
@@ -579,7 +579,7 @@ _CGB_Evolution: ; 91e4
 	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 @@ _CGB_Evolution: ; 91e4
 	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 @@ _CGB0c: ; 9228
 ; 9251
 
 _CGB0d: ; 9251
-	ld hl, PalPacket_9cb6 + 1
+	ld hl, PalPacket_Diploma + 1
 	call CopyFourPalettes
 	call WipeAttrMap
 	call ApplyAttrMap
@@ -637,10 +637,10 @@ _CGB0d: ; 9251
 ; 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 @@ _CGB_UnownPuzzle: ; 925e
 	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 @@ _CGB_TrainerCard: ; 9289
 	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 @@ _CGB_MoveList: ; 9373
 ; 93a6
 
 _CGB0f: ; 93a6
-	ld hl, PalPacket_9c46 + 1
+	ld hl, PalPacket_SCGB_0F + 1
 	call CopyFourPalettes
 	call WipeAttrMap
 	call ApplyAttrMap
@@ -803,7 +803,7 @@ _CGB0f: ; 93a6
 
 _CGB_PokedexSearchOption: ; 93ba
 	ld de, wBGPals1
-	ld a, PREDEFPAL_1D
+	ld a, PREDEFPAL_POKEDEX
 	call GetPredefPal
 	call LoadHLPaletteIntoDE
 	call WipeAttrMap
@@ -907,7 +907,7 @@ _CGB_Pokepic: ; 9499
 ; 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 @@ _CGB13: ; 94d0
 
 _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 @@ _CGB1e: ; 9542
 ; 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 @@ _CGB_TradeTube: ; 9555
 	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
diff --git a/engine/color.asm b/engine/color.asm
index 7a237b6be..5dea3311a 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -101,7 +101,7 @@ Unreferenced_Function8aa4:
 	ret
 
 InitPartyMenuPalettes:
-	ld hl, PalPacket_9c56 + 1
+	ld hl, PalPacket_PartyMenu + 1
 	call CopyFourPalettes
 	call InitPartyMenuOBPals
 	call WipeAttrMap
@@ -182,7 +182,7 @@ Unreferenced_Function8b4d:
 	ld a, [hSGB]
 	and a
 	ret z
-	ld hl, PalPacket_9c26
+	ld hl, PalPacket_Function8b4d
 	jp PushSGBPals_
 
 .cgb
@@ -197,12 +197,12 @@ Unreferenced_Function8b67:
 	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 @@ Unreferenced_Function97cc:
 	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 @@ INCLUDE "gfx/diploma/diploma.pal"
 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 @@ INCLUDE "gfx/pokegear/pokegear.pal"
 FemalePokegearPals:
 INCLUDE "gfx/pokegear/pokegear_f.pal"
 
-Palettes_b789:
+Palettes_SCGB_11:
 INCLUDE "gfx/unknown/b789.pal"
 
 SlotMachinePals:
diff --git a/engine/sgb_layouts.asm b/engine/sgb_layouts.asm
index faad5e672..a2d0201a2 100644
--- a/engine/sgb_layouts.asm
+++ b/engine/sgb_layouts.asm
@@ -30,12 +30,12 @@ LoadSGBLayout: ; 864c
 	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 @@ LoadSGBLayout: ; 864c
 	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 @@ LoadSGBLayout: ; 864c
 ; 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 @@ LoadSGBLayout: ; 864c
 	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 @@ LoadSGBLayout: ; 864c
 	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 @@ LoadSGBLayout: ; 864c
 .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 @@ LoadSGBLayout: ; 864c
 	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 @@ LoadSGBLayout: ; 864c
 .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 @@ LoadSGBLayout: ; 864c
 	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 @@ LoadSGBLayout: ; 864c
 .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,14 +228,14 @@ LoadSGBLayout: ; 864c
 	ld a, [hl]
 	ld [wSGBPals + 12], a
 	ld hl, wSGBPals
-	ld de, BlkPacket_9ae6
+	ld de, BlkPacket_Pokedex_PC
 	ret
 ; 87e9
 
 .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,20 +257,20 @@ LoadSGBLayout: ; 864c
 	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
 
 .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 @@ LoadSGBLayout: ; 864c
 ; 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,38 +326,38 @@ endr
 	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
 ; 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
 
 .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 @@ endr
 .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 @@ endr
 	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 @@ endr
 
 .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 @@ endr
 .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,14 +460,14 @@ endr
 	ld a, [wMenuBorderBottomCoord]
 	ld [hl], a
 	ld hl, wSGBPals
-	ld de, wSGBPals + $10
+	ld de, wSGBPals + PALPACKET_LENGTH
 	ret
 ; 8969
 
 .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 @@ endr
 	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 @@ endr
 .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 @@ endr
 ; 89d9
 
 .SGB_TradeTube: ; 89d9
-	ld hl, PalPacket_9cc6
+	ld hl, PalPacket_TradeTube
 	ld de, BlkPacket_9a86
 	ret
 ; 89e0
@@ -533,7 +533,7 @@ endr
 .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