Remaining layout constants

18 files changed, 33 insertions, 33 deletions

diff --git a/engine/billspc.asm b/engine/billspc.asm
index 322e84301..b9b51f850 100755
--- a/engine/billspc.asm
+++ b/engine/billspc.asm
@@ -64,7 +64,7 @@ _DepositPKMN: ; e2391 (38:6391)
 	call PCMonInfo
 	ld a, $ff
 	ld [CurPartySpecies], a
-	ld a, SCGB_17
+	ld a, SCGB_BILLS_PC
 	call BillsPC_ApplyPalettes
 	call WaitBGMap
 	call BillsPC_UpdateSelectionCursor
@@ -120,7 +120,7 @@ _DepositPKMN: ; e2391 (38:6391)
 	call ClearSprites
 	call BillsPC_GetSelectedPokemonSpecies
 	ld [CurPartySpecies], a
-	ld a, SCGB_17
+	ld a, SCGB_BILLS_PC
 	call BillsPC_ApplyPalettes
 	ld de, PCString_WhatsUp
 	call BillsPC_PlaceString
@@ -181,7 +181,7 @@ BillsPCDepositFuncStats: ; e24c8 (38:64c8)
 	call PCMonInfo
 	call BillsPC_GetSelectedPokemonSpecies
 	ld [CurPartySpecies], a
-	ld a, SCGB_17
+	ld a, SCGB_BILLS_PC
 	call BillsPC_ApplyPalettes
 	ret
 
@@ -333,7 +333,7 @@ _WithdrawPKMN: ; e2583 (38:6583)
 	call PCMonInfo
 	ld a, $ff
 	ld [CurPartySpecies], a
-	ld a, SCGB_17
+	ld a, SCGB_BILLS_PC
 	call BillsPC_ApplyPalettes
 	call WaitBGMap
 	call BillsPC_UpdateSelectionCursor
@@ -388,7 +388,7 @@ _WithdrawPKMN: ; e2583 (38:6583)
 	call ClearSprites
 	call BillsPC_GetSelectedPokemonSpecies
 	ld [CurPartySpecies], a
-	ld a, SCGB_17
+	ld a, SCGB_BILLS_PC
 	call BillsPC_ApplyPalettes
 	ld de, PCString_WhatsUp
 	call BillsPC_PlaceString
@@ -447,7 +447,7 @@ BillsPC_Withdraw: ; e2675 (38:6675)
 	call PCMonInfo
 	call BillsPC_GetSelectedPokemonSpecies
 	ld [CurPartySpecies], a
-	ld a, SCGB_17
+	ld a, SCGB_BILLS_PC
 	call BillsPC_ApplyPalettes
 	ret
 
@@ -584,7 +584,7 @@ _MovePKMNWithoutMail: ; e2759
 	call PCMonInfo
 	ld a, $ff
 	ld [CurPartySpecies], a
-	ld a, SCGB_17
+	ld a, SCGB_BILLS_PC
 	call BillsPC_ApplyPalettes
 	call WaitBGMap
 	call BillsPC_UpdateSelectionCursor
@@ -650,7 +650,7 @@ _MovePKMNWithoutMail: ; e2759
 	call ClearSprites
 	call BillsPC_GetSelectedPokemonSpecies
 	ld [CurPartySpecies], a
-	ld a, SCGB_17
+	ld a, SCGB_BILLS_PC
 	call BillsPC_ApplyPalettes
 	ld de, PCString_WhatsUp
 	call BillsPC_PlaceString
@@ -708,7 +708,7 @@ _MovePKMNWithoutMail: ; e2759
 	call PCMonInfo
 	call BillsPC_GetSelectedPokemonSpecies
 	ld [CurPartySpecies], a
-	ld a, SCGB_17
+	ld a, SCGB_BILLS_PC
 	call BillsPC_ApplyPalettes
 	ret
 ; e28bd
diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm
index 367fa1562..050fa69af 100755
--- a/engine/breeding/egg.asm
+++ b/engine/breeding/egg.asm
@@ -786,7 +786,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
 
 Hatch_LoadFrontpicPal: ; 17363 (5:7363)
 	ld [PlayerHPPal], a
-	ld b, SCGB_0B
+	ld b, SCGB_EVOLUTION
 	ld c, $0
 	jp GetSGBLayout
 
diff --git a/engine/color.asm b/engine/color.asm
index 1f0f30ef0..3bc431d22 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -2035,7 +2035,7 @@ INCLUDE "tilesets/ob.pal"
 RoofPals:
 INCLUDE "tilesets/roof.pal"
 
-Palettes_b641:
+DiplomaPalettes:
 	RGB 27, 31, 27
 	RGB 21, 21, 21
 	RGB 13, 13, 13
diff --git a/engine/delete_save_change_clock.asm b/engine/delete_save_change_clock.asm
index b92698b49..7a806ad01 100755
--- a/engine/delete_save_change_clock.asm
+++ b/engine/delete_save_change_clock.asm
@@ -1,6 +1,6 @@
 _ResetClock: ; 4d3b1
 	callba BlankScreen
-	ld b, SCGB_08
+	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	call LoadStandardFont
 	call LoadFontsExtra
@@ -261,7 +261,7 @@ ClockResetPassword: ; 4d41e
 
 _DeleteSaveData: ; 4d54c
 	callba BlankScreen
-	ld b, SCGB_08
+	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	call LoadStandardFont
 	call LoadFontsExtra
diff --git a/engine/diploma.asm b/engine/diploma.asm
index 077fb7a8a..c446ff86b 100644
--- a/engine/diploma.asm
+++ b/engine/diploma.asm
@@ -31,7 +31,7 @@ PlaceDiplomaOnScreen: ; 1dd709
 	call PlaceString
 	call EnableLCD
 	call WaitBGMap
-	ld b, SCGB_08
+	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	call SetPalettes
 	call DelayFrame
diff --git a/engine/dummy_game.asm b/engine/dummy_game.asm
index bb5377d8f..e5ef9b4cf 100755
--- a/engine/dummy_game.asm
+++ b/engine/dummy_game.asm
@@ -8,7 +8,7 @@ _DummyGame: ; e1e5b (38:5e5b)
 
 .LoadGFXAndPals:
 	call DisableLCD
-	ld b, SCGB_08
+	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	callab ClearSpriteAnims
 	ld hl, LZ_e2221
diff --git a/engine/evolution_animation.asm b/engine/evolution_animation.asm
index d330e47c3..2f1c4c522 100755
--- a/engine/evolution_animation.asm
+++ b/engine/evolution_animation.asm
@@ -153,7 +153,7 @@ EvolutionAnimation: ; 4e5e1
 ; 4e703
 
 .GetSGBLayout: ; 4e703
-	ld b, SCGB_0B
+	ld b, SCGB_EVOLUTION
 	jp GetSGBLayout
 ; 4e708
 
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm
index 46d09721c..34eb67eeb 100755
--- a/engine/intro_menu.asm
+++ b/engine/intro_menu.asm
@@ -1048,7 +1048,7 @@ StartTitleScreen: ; 6219
 	ld [hWX], a
 	ld a, $90
 	ld [hWY], a
-	ld b, SCGB_08
+	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	call UpdateTimePals
 	ld a, [wcf64]
diff --git a/engine/link.asm b/engine/link.asm
index fc7af6680..4f20c8481 100755
--- a/engine/link.asm
+++ b/engine/link.asm
@@ -498,7 +498,7 @@ LinkTimeout: ; 283b2
 	call PlaceHLTextAtBC
 	call RotateThreePalettesRight
 	call ClearScreen
-	ld b, SCGB_08
+	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	call WaitBGMap2
 	ret
@@ -1597,7 +1597,7 @@ Function28ade: ; 28ade
 Function28b22: ; 28b22
 	call RotateThreePalettesRight
 	call ClearScreen
-	ld b, SCGB_08
+	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	call WaitBGMap2
 	xor a
@@ -1902,7 +1902,7 @@ LinkTrade: ; 28b87
 	call DelayFrames
 	call ClearTileMap
 	call LoadFontsBattleExtra
-	ld b, SCGB_08
+	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	ld a, [hLinkPlayerNumber]
 	cp $1
diff --git a/engine/link_trade.asm b/engine/link_trade.asm
index 9ff1b0a53..96401f188 100755
--- a/engine/link_trade.asm
+++ b/engine/link_trade.asm
@@ -25,7 +25,7 @@ Function16d43b: ; 16d43b
 	call ClearSprites
 	callba __LoadTradeScreenBorder ; useless to farcall
 	callba Function16d42e ; useless to farcall
-	ld b, SCGB_08
+	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	call SetPalettes
 	call WaitBGMap
diff --git a/engine/main_menu.asm b/engine/main_menu.asm
index b00f1a875..c3b30d2d0 100755
--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -6,7 +6,7 @@ MainMenu: ; 49cdc
 	xor a
 	ld [wDisableTextAcceleration], a
 	call Function49ed0
-	ld b, SCGB_08
+	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	call SetPalettes
 	ld hl, GameTimerPause
diff --git a/engine/mysterygift.asm b/engine/mysterygift.asm
index 5e6d317ba..a7b182624 100755
--- a/engine/mysterygift.asm
+++ b/engine/mysterygift.asm
@@ -27,7 +27,7 @@ DoMysteryGift: ; 1048ba (41:48ba)
 	call ClearTileMap
 	call EnableLCD
 	call WaitBGMap
-	ld b, SCGB_08
+	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	call SetPalettes
 	pop de
@@ -1333,7 +1333,7 @@ Function105153: ; 105153 (41:5153)
 	ld [hl], $41
 	call EnableLCD
 	call WaitBGMap
-	ld b, SCGB_1D
+	ld b, SCGB_MYSTERY_GIFT
 	call GetSGBLayout
 	call SetPalettes
 	ret
@@ -1511,7 +1511,7 @@ Function105777: ; 105777 (41:5777)
 	call ClearTileMap
 	call EnableLCD
 	call WaitBGMap
-	ld b, SCGB_08
+	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	call SetPalettes
 	ret
diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm
index 16a87b0c8..6da123a90 100755
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -43,7 +43,7 @@ NamingScreen: ; 116c1
 
 .SetUpNamingScreen: ; 116f8
 	call ClearBGPalettes
-	ld b, SCGB_08
+	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	call DisableLCD
 	call LoadNamingScreenGFX
@@ -1049,7 +1049,7 @@ _ComposeMailMessage: ; 11e75 (mail?)
 	ld a, $e3
 	ld [rLCDC], a
 	call .initwNamingScreenMaxNameLength
-	ld b, SCGB_08
+	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	call WaitBGMap
 	call WaitTop
diff --git a/engine/options_menu.asm b/engine/options_menu.asm
index 2986cc75b..68c1883ee 100755
--- a/engine/options_menu.asm
+++ b/engine/options_menu.asm
@@ -32,7 +32,7 @@ _OptionsMenu: ; e41d0
 	inc a
 	ld [hBGMapMode], a
 	call WaitBGMap
-	ld b, SCGB_08
+	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	call SetPalettes
 
diff --git a/engine/party_menu.asm b/engine/party_menu.asm
index 985645a8c..266451c37 100644
--- a/engine/party_menu.asm
+++ b/engine/party_menu.asm
@@ -20,7 +20,7 @@ SelectTradeOrDaycareMon: ; 5001d
 	call ClearBGPalettes
 	call InitPartyMenuLayout
 	call WaitBGMap
-	ld b, SCGB_0A
+	ld b, SCGB_PARTY_MENU
 	call GetSGBLayout
 	call SetPalettes
 	call DelayFrame
@@ -160,7 +160,7 @@ PlacePartyHPBar: ; 500cf
 	inc b
 	dec c
 	jr nz, .loop
-	ld b, SCGB_0A
+	ld b, SCGB_PARTY_MENU
 	call GetSGBLayout
 	ret
 ; 50117
diff --git a/engine/startmenu.asm b/engine/startmenu.asm
index c0ca882bc..f03d661dd 100755
--- a/engine/startmenu.asm
+++ b/engine/startmenu.asm
@@ -1797,7 +1797,7 @@ SetUpMoveScreenBG: ; 13172
 	call PrintLevel
 	ld hl, PlayerHPPal
 	call SetHPPal
-	ld b, SCGB_0E
+	ld b, SCGB_MOVE_LIST
 	call GetSGBLayout
 	hlcoord 16, 0
 	lb bc, 1, 3
diff --git a/engine/timeset.asm b/engine/timeset.asm
index 0abb7e88c..f828b0ff8 100755
--- a/engine/timeset.asm
+++ b/engine/timeset.asm
@@ -18,7 +18,7 @@ InitClock: ; 90672 (24:4672)
 	call RotateFourPalettesLeft
 	call ClearTileMap
 	call ClearSprites
-	ld b, SCGB_08
+	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	xor a
 	ld [hBGMapMode], a
diff --git a/engine/unown_puzzle.asm b/engine/unown_puzzle.asm
index 5e9ec66c0..8d46a02a6 100755
--- a/engine/unown_puzzle.asm
+++ b/engine/unown_puzzle.asm
@@ -47,7 +47,7 @@ UnownPuzzle: ; e1190
 	ld a, $93
 	ld [rLCDC], a
 	call WaitBGMap
-	ld b, SCGB_18
+	ld b, SCGB_UNOWN_PUZZLE
 	call GetSGBLayout
 	ld a, $e4
 	call DmgToCgbBGPals