Remaining layout constants

2 files changed, 34 insertions, 31 deletions

diff --git a/predef/cgb.asm b/predef/cgb.asm
index cb0547714..b0c3fdb46 100644
--- a/predef/cgb.asm
+++ b/predef/cgb.asm
@@ -41,13 +41,13 @@ Predef_LoadSGBLayoutCGB: ; 8d59
 	dw _CGB_SlotMachine
 	dw _CGB06
 	dw _CGB07
-	dw _CGB08
+	dw _CGB_Diploma
 	dw _CGB_MapPals
-	dw _CGB0a
-	dw _CGB0b
+	dw _CGB_PartyMenu
+	dw _CGB_Evolution
 	dw _CGB0c
 	dw _CGB0d
-	dw _CGB0e
+	dw _CGB_MoveList
 	dw _CGB0f
 	dw _CGB_PokedexSearchOption
 	dw _CGB11
@@ -56,13 +56,13 @@ Predef_LoadSGBLayoutCGB: ; 8d59
 	dw _CGB_PackPals
 	dw _CGB_TrainerCard
 	dw _CGB_PokedexUnownMode
-	dw _CGB17
-	dw _CGB18
+	dw _CGB_BillsPC
+	dw _CGB_UnownPuzzle
 	dw _CGB_GamefreakLogo ; called before copyright
 	dw _CGB_PlayerOrMonFrontpicPals
 	dw _CGB_TradeTube
 	dw _CGB_TrainerOrMonFrontpicPals
-	dw _CGB1d
+	dw _CGB_MysteryGift
 	dw _CGB1e
 ; 8db8
 
@@ -329,7 +329,7 @@ Palette8fc2: ; 8fc2
 	RGB 00, 00, 00
 ; 8fca
 
-_CGB17: ; 8fca
+_CGB_BillsPC: ; 8fca
 	ld de, UnknBGPals
 	ld a, $1d
 	call GetPredefPal
@@ -568,8 +568,8 @@ _CGB11: ; 9195
 	ret
 ; 91ad
 
-_CGB08: ; 91ad
-	ld hl, Palettes_b641
+_CGB_Diploma: ; 91ad
+	ld hl, DiplomaPalettes
 	ld de, UnknBGPals
 	ld bc, 16 palettes
 	ld a, $5
@@ -589,7 +589,7 @@ _CGB_MapPals: ; 91c8
 	ret
 ; 91d1
 
-_CGB0a: ; 91d1
+_CGB_PartyMenu: ; 91d1
 	ld hl, PalPacket_9c56 + 1
 	call CopyFourPalettes
 	call InitPartyMenuBGPal0
@@ -599,7 +599,7 @@ _CGB0a: ; 91d1
 	ret
 ; 91e4
 
-_CGB0b: ; 91e4
+_CGB_Evolution: ; 91e4
 	ld de, UnknBGPals
 	ld a, c
 	and a
@@ -645,7 +645,7 @@ _CGB0c: ; 9228
 	ld bc, 2 palettes
 	ld a, $5
 	call FarCopyWRAM
-	ld a, SCGB_08
+	ld a, SCGB_DIPLOMA
 	ld [SGBPredef], a
 	call ApplyPals
 	ld a, $1
@@ -661,7 +661,7 @@ _CGB0d: ; 9251
 	ret
 ; 925e
 
-_CGB18: ; 925e
+_CGB_UnownPuzzle: ; 925e
 	ld hl, PalPacket_9bc6 + 1
 	call CopyFourPalettes
 	ld de, UnknOBPals
@@ -786,7 +786,7 @@ _CGB_TrainerCard: ; 9289
 	ret
 ; 9373
 
-_CGB0e: ; 9373
+_CGB_MoveList: ; 9373
 	ld de, UnknBGPals
 	ld a, $10
 	call GetPredefPal
@@ -1076,7 +1076,7 @@ _CGB_TrainerOrMonFrontpicPals: ; 9578
 	ret
 ; 9591
 
-_CGB1d: ; 9591
+_CGB_MysteryGift: ; 9591
 	ld hl, .Palettes
 	ld de, UnknBGPals
 	ld bc, 2 palettes
diff --git a/predef/sgb.asm b/predef/sgb.asm
index ca2fe24f3..65a09756d 100644
--- a/predef/sgb.asm
+++ b/predef/sgb.asm
@@ -32,13 +32,13 @@ Predef_LoadSGBLayout: ; 864c
 	dw .SGB_SlotMachine
 	dw .SGB06
 	dw .SGB07
-	dw .SGB08
+	dw .SGB_Diploma
 	dw .SGB_MapPals
-	dw .SGB0a
-	dw .SGB0b
+	dw .SGB_PartyMenu
+	dw .SGB_Evolution
 	dw .SGB0c
 	dw .SGB0d
-	dw .SGB0e
+	dw .SGB_MoveList
 	dw .SGB0f
 	dw .SGB_PokedexSearchOption
 	dw .SGB11
@@ -47,13 +47,13 @@ Predef_LoadSGBLayout: ; 864c
 	dw .SGB_PackPals
 	dw .SGB_TrainerCard
 	dw .SGB_PokedexUnownMode
-	dw .SGB17
-	dw .SGB18
+	dw .SGB_BillsPC
+	dw .SGB_UnownPuzzle
 	dw .SGB19
 	dw .SGB_PlayerOrMonFrontpicPals
 	dw .SGB_TradeTube
 	dw .SGB_TrainerOrMonFrontpicPals
-	dw .SGB1d
+	dw .SGB_MysteryGift
 	dw .SGB1e
 ; 86ad
 
@@ -138,7 +138,7 @@ Predef_LoadSGBLayout: ; 864c
 	ret
 ; 873c
 
-.SGB0e: ; 873c
+.SGB_MoveList: ; 873c
 	ld hl, PalPacket_9bd6
 	ld de, wSGBPals
 	ld bc, $10
@@ -199,7 +199,7 @@ Predef_LoadSGBLayout: ; 864c
 	ret
 ; 87ab
 
-.SGB0a: ; 87ab
+.SGB_PartyMenu: ; 87ab
 	ld hl, PalPacket_9c56
 	ld de, wSGBPals + 1
 	ret
@@ -233,7 +233,7 @@ Predef_LoadSGBLayout: ; 864c
 	ret
 ; 87e9
 
-.SGB17: ; 87e9
+.SGB_BillsPC: ; 87e9
 	ld hl, PalPacket_9ce6
 	ld de, wSGBPals
 	ld bc, $10
@@ -304,8 +304,8 @@ Predef_LoadSGBLayout: ; 864c
 	ret
 ; 8860
 
-.SGB08:
-.SGB1d: ; 8860
+.SGB_Diploma:
+.SGB_MysteryGift: ; 8860
 	ld hl, PalPacket_9cb6
 	ld de, BlkPacket_9a86
 	ret
@@ -336,7 +336,7 @@ endr
 .SGB0c: ; 8884
 	ld hl, PalPacket_9b96
 	ld de, BlkPacket_9b56
-	ld a, SCGB_08
+	ld a, SCGB_DIPLOMA
 	ld [SGBPredef], a
 	ret
 ; 8890
@@ -377,7 +377,7 @@ endr
 	ret
 ; 88cd
 
-.SGB0b: ; 88cd
+.SGB_Evolution: ; 88cd
 	push bc
 	ld hl, PalPacket_9ce6
 	ld de, wSGBPals
@@ -387,11 +387,14 @@ endr
 	ld a, c
 	and a
 	jr z, .partymon
+	; Egg
 	ld hl, wSGBPals + 3
+	; RGB 7, 7, 7
 	ld [hl], $e7
 	inc hl
 	ld [hl], $1c
 	inc hl
+	; RGB 2, 3, 3
 	ld [hl], $62
 	inc hl
 	ld [hl], $c
@@ -428,7 +431,7 @@ endr
 	ret
 ; 8921
 
-.SGB18: ; 8921
+.SGB_UnownPuzzle: ; 8921
 	ld hl, PalPacket_9bc6
 	ld de, BlkPacket_9a86
 	ret