Identify SGB blk/pal packets

4 files changed, 45 insertions, 45 deletions

diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm
index 18f3fa4c..594f7edc 100644
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -79,7 +79,7 @@ Unused_CheckShininess:
 SGB_ApplyCreditsPals::
 	push de
 	push bc
-	ld hl, PalPacket_a155
+	ld hl, PalPacket_Pal01
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
@@ -95,7 +95,7 @@ SGB_ApplyCreditsPals::
 	ld [wSGBPals + 6], a
 	ld hl, wSGBPals
 	call PushSGBPals
-	ld hl, BlkPacket_9ee5
+	ld hl, BlkPacket_AllPal0
 	call PushSGBPals
 	ret
 
@@ -178,7 +178,7 @@ Function9136:
 	ldh a, [hSGB]
 	and a
 	ret z
-	ld hl, BlkPacket_9ee5
+	ld hl, BlkPacket_AllPal0
 	jp PushSGBPals
 
 Function9144: ; unreferenced
@@ -219,7 +219,7 @@ Intro_LoadMonPalette:
 	ret z
 	ld a, c
 	push af
-	ld hl, PalPacket_a155
+	ld hl, PalPacket_Pal01
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
@@ -374,7 +374,7 @@ LoadMailPalettes:
 	call CheckCGB
 	jr nz, .cgb
 	push hl
-	ld hl, PalPacket_a155
+	ld hl, PalPacket_Pal01
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
@@ -391,7 +391,7 @@ LoadMailPalettes:
 	ld [wSGBPals + 6], a
 	ld hl, wSGBPals
 	call PushSGBPals
-	ld hl, BlkPacket_9ee5
+	ld hl, BlkPacket_AllPal0
 	call PushSGBPals
 	ret
 
diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm
index 93673068..bf6f9221 100644
--- a/engine/gfx/sgb_layouts.asm
+++ b/engine/gfx/sgb_layouts.asm
@@ -64,7 +64,7 @@ LoadSGBLayout:
 	ld hl, BlkPacket_Battle
 	call PushSGBPals
 
-	ld hl, PalPacket_a155
+	ld hl, PalPacket_Pal01
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
@@ -103,7 +103,7 @@ LoadSGBLayout:
 	ld a, [hl]
 	ld [wSGBPals + 12], a
 
-	ld hl, PalPacket_a165
+	ld hl, PalPacket_Pal23
 	ld de, wSGBPals + PALPACKET_LENGTH
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
@@ -135,7 +135,7 @@ LoadSGBLayout:
 	ret
 
 .SGB_MoveList:
-	ld hl, PalPacket_a045
+	ld hl, PalPacket_Routes
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
@@ -154,11 +154,11 @@ LoadSGBLayout:
 
 .SGB_PokegearPals:
 	ld hl, PalPacket_Pokegear
-	ld de, BlkPacket_9ee5
+	ld de, BlkPacket_AllPal0
 	ret
 
 .SGB_StatsScreenHPPals:
-	ld hl, PalPacket_a155
+	ld hl, PalPacket_Pal01
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
@@ -198,7 +198,7 @@ LoadSGBLayout:
 	ret
 
 .SGB_Pokedex:
-	ld hl, PalPacket_a155
+	ld hl, PalPacket_Pal01
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
@@ -230,7 +230,7 @@ LoadSGBLayout:
 	ret
 
 .SGB_BillsPC:
-	ld hl, PalPacket_a155
+	ld hl, PalPacket_Pal01
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
@@ -254,7 +254,7 @@ LoadSGBLayout:
 	ld a, [hl]
 	ld [wSGBPals + 12], a
 	ld hl, wSGBPals
-	ld de, BlkPacket_9f55
+	ld de, BlkPacket_Bills_PC
 	ret
 
 .SGB_PokedexUnownMode:
@@ -263,7 +263,7 @@ LoadSGBLayout:
 	ret
 
 .SGB_PokedexSearchOption:
-	ld hl, PalPacket_a155
+	ld hl, PalPacket_Pal01
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
@@ -276,12 +276,12 @@ LoadSGBLayout:
 	inc hl
 	ld [hl], HIGH(palred 26 + palgreen 10 + palblue 6)
 	ld hl, wSGBPals
-	ld de, BlkPacket_9ee5
+	ld de, BlkPacket_AllPal0
 	ret
 
 .SGB_PackPals:
 	ld hl, PalPacket_Pack
-	ld de, BlkPacket_9ee5
+	ld de, BlkPacket_AllPal0
 	ret
 
 .SGB_SlotMachine:
@@ -297,7 +297,7 @@ LoadSGBLayout:
 .SGB_Diploma:
 .SGB_MysteryGift:
 	ld hl, PalPacket_Diploma
-	ld de, BlkPacket_9ee5
+	ld de, BlkPacket_AllPal0
 	ret
 
 .SGB_GSIntro:
@@ -316,9 +316,9 @@ endr
 	ret
 
 .BlkPacketTable_GSIntro:
-	dw BlkPacket_9ee5, PalPacket_GSIntroShellderLapras
+	dw BlkPacket_AllPal0, PalPacket_GSIntroShellderLapras
 	dw BlkPacket_GSIntroJigglypuffPikachu, PalPacket_GSIntroJigglypuffPikachu
-	dw BlkPacket_9ee5, PalPacket_GSIntroStartersTransition
+	dw BlkPacket_AllPal0, PalPacket_GSIntroStartersTransition
 
 .SGB_GSTitleScreen:
 	ld hl, PalPacket_GSTitleScreen
@@ -334,34 +334,34 @@ endr
 
 .SGB_BetaPikachuMinigame:
 	ld hl, PalPacket_BetaPikachuMinigame
-	ld de, BlkPacket_9ee5
+	ld de, BlkPacket_AllPal0
 	ret
 
 .SGB_BetaPoker:
-	ld hl, BlkPacket_9ee5
+	ld hl, BlkPacket_AllPal0
 	ld de, wBetaPokerSGBPals
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
 	ld hl, PalPacket_BetaPoker
-	ld de, BlkPacket_9ee5
+	ld de, BlkPacket_AllPal0
 	ret
 
 .SGB_MapPals:
-	ld hl, PalPacket_a045
+	ld hl, PalPacket_Routes
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
 	call .GetMapPalsIndex
 	ld hl, wSGBPals + 1
 	ld [hld], a
-	ld de, BlkPacket_9ee5
+	ld de, BlkPacket_AllPal0
 	ld a, SCGB_MAPPALS
 	ld [wDefaultSGBLayout], a
 	ret
 
 .SGB_Evolution:
 	push bc
-	ld hl, PalPacket_a155
+	ld hl, PalPacket_Pal01
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
@@ -400,26 +400,26 @@ endr
 
 .done
 	ld hl, wSGBPals
-	ld de, BlkPacket_9ee5
+	ld de, BlkPacket_AllPal0
 	ret
 
 .SGB0d:
 .SGB_TrainerCard:
 	ld hl, PalPacket_Diploma
-	ld de, BlkPacket_9ee5
+	ld de, BlkPacket_AllPal0
 	ret
 
 .SGB_UnownPuzzle:
 	ld hl, PalPacket_UnownPuzzle
-	ld de, BlkPacket_9ee5
+	ld de, BlkPacket_AllPal0
 	ret
 
 .SGB_Pokepic:
-	ld hl, PalPacket_a045
+	ld hl, PalPacket_Routes
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
-	ld hl, BlkPacket_9ee5
+	ld hl, BlkPacket_AllPal0
 	ld de, wSGBPals + PALPACKET_LENGTH
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
@@ -444,7 +444,7 @@ endr
 	ret
 
 .SGB1e:
-	ld hl, PalPacket_a155
+	ld hl, PalPacket_Pal01
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
@@ -472,16 +472,16 @@ endr
 	ld a, [hl]
 	ld [wSGBPals + 6], a
 	ld hl, wSGBPals
-	ld de, BlkPacket_9ee5
+	ld de, BlkPacket_AllPal0
 	ret
 
 .SGB_GamefreakLogo:
 	ld hl, PalPacket_GamefreakLogo
-	ld de, BlkPacket_9ee5
+	ld de, BlkPacket_AllPal0
 	ret
 
 .SGB_PlayerOrMonFrontpicPals:
-	ld hl, PalPacket_a155
+	ld hl, PalPacket_Pal01
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
@@ -497,16 +497,16 @@ endr
 	ld a, [hl]
 	ld [wSGBPals + 6], a
 	ld hl, wSGBPals
-	ld de, BlkPacket_9ee5
+	ld de, BlkPacket_AllPal0
 	ret
 
 .SGB_TradeTube:
 	ld hl, PalPacket_TradeTube
-	ld de, BlkPacket_9ee5
+	ld de, BlkPacket_AllPal0
 	ret
 
 .SGB_TrainerOrMonFrontpicPals:
-	ld hl, PalPacket_a155
+	ld hl, PalPacket_Pal01
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
@@ -522,7 +522,7 @@ endr
 	ld a, [hl]
 	ld [wSGBPals + 6], a
 	ld hl, wSGBPals
-	ld de, BlkPacket_9ee5
+	ld de, BlkPacket_AllPal0
 	ret
 
 .GetMapPalsIndex:
diff --git a/gfx/sgb/blk_packets.asm b/gfx/sgb/blk_packets.asm
index ae95d116..b45ba6e3 100644
--- a/gfx/sgb/blk_packets.asm
+++ b/gfx/sgb/blk_packets.asm
@@ -13,7 +13,7 @@ attr_blk_data: MACRO
 	db \5, \6, \7, \8 ; x1, y1, x2, y2
 ENDM
 
-BlkPacket_9ee5:
+BlkPacket_AllPal0:
 	attr_blk 1
 	attr_blk_data %011, 0,0,0, 00,00, 19,17
 	ds 8, 0
@@ -46,7 +46,7 @@ BlkPacket_Pokedex_PC:
 	attr_blk_data %111, 1,1,0, 00,01, 07,07 ; mon: pal 1
 	ds 8, 0
 
-BlkPacket_9f55:
+BlkPacket_Bills_PC:
 	attr_blk 1
 	attr_blk_data %111, 1,1,0, 01,04, 07,10
 	ds 8, 0
diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm
index 906d1ff1..5dbf8e22 100644
--- a/gfx/sgb/pal_packets.asm
+++ b/gfx/sgb/pal_packets.asm
@@ -28,7 +28,7 @@ PalPacket_BetaPoker:
 PalPacket_UnownPuzzle:
 	sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE
 
-PalPacket_a045:
+PalPacket_Routes:
 	sgb_pal_set ROUTES, ROUTES, ROUTES, ROUTES
 
 PalPacket_GSIntroShellderLapras:
@@ -61,7 +61,7 @@ PalPacket_BattleGrayscale:
 PalPacket_Pokegear:
 	sgb_pal_set POKEGEAR, ROUTES, ROUTES, ROUTES
 
-PalPacket_a0f5: ; unreferenced
+PalPacket_Pack2: ; unreferenced
 	sgb_pal_set PACK, ROUTES, ROUTES, ROUTES
 
 PalPacket_SlotMachine:
@@ -79,7 +79,7 @@ PalPacket_TradeTube:
 PalPacket_GamefreakLogo:
 	sgb_pal_set GS_INTRO_GAMEFREAK_LOGO, ROUTES, ROUTES, ROUTES
 
-PalPacket_a155:
+PalPacket_Pal01:
 	sgb_pal01
 	RGB 31, 31, 31
 rept 6
@@ -87,7 +87,7 @@ rept 6
 endr
 	db 0
 
-PalPacket_a165:
+PalPacket_Pal23:
 	sgb_pal23
 	RGB 31, 31, 31
 rept 6