Further remove unnecessary DMG/SGB checking (#7) and remove SGB layouts and palette data (#1)

engine/gfx/cgb_layouts.asm

@@ -1,17 +1,12 @@
 ; Replaces the functionality of sgb.asm to work with CGB hardware.
 
-CheckCGB:
-	ldh a, [hCGB]
-	and a
-	ret
-
-LoadSGBLayoutCGB:
+LoadCGBLayout:
 	ld a, b
-	cp SCGB_DEFAULT
+	cp CGB_DEFAULT
 	jr nz, .not_default
 	ld a, [wDefaultSGBLayout]
 .not_default
-	cp SCGB_PARTY_MENU_HP_BARS
+	cp CGB_PARTY_MENU_HP_BARS
 	jp z, CGB_ApplyPartyMenuHPPals
 	call ResetBGPals
 	ld l, a
@@ -60,18 +55,18 @@ CGBLayoutJumptable:
 	dw _CGB_TradeTube
 	dw _CGB_TrainerOrMonFrontpicPals
 	dw _CGB_Unused1D
-	assert_table_length NUM_SCGB_LAYOUTS
+	assert_table_length NUM_CGB_LAYOUTS
 
 _CGB_BattleGrayscale:
-	ld hl, PalPacket_BattleGrayscale + 1
+	ld hl, FourPals_BattleGrayscale
 	ld de, wBGPals1
 	ld c, 4
 	call CopyPalettes
-	ld hl, PalPacket_BattleGrayscale + 1
+	ld hl, FourPals_BattleGrayscale
 	ld de, wBGPals1 palette PAL_BATTLE_BG_EXP
 	ld c, 4
 	call CopyPalettes
-	ld hl, PalPacket_BattleGrayscale + 1
+	ld hl, FourPals_BattleGrayscale
 	ld de, wOBPals1
 	ld c, 2
 	call CopyPalettes
@@ -108,7 +103,7 @@ _CGB_BattleColors:
 	call LoadPalette_White_Col1_Col2_Black ; PAL_BATTLE_OB_ENEMY
 	pop hl
 	call LoadPalette_White_Col1_Col2_Black ; PAL_BATTLE_OB_PLAYER
-	ld a, SCGB_BATTLE_COLORS
+	ld a, CGB_BATTLE_COLORS
 	ld [wDefaultSGBLayout], a
 	call ApplyPals
 _CGB_FinishBattleScreenLayout:
@@ -411,7 +406,7 @@ _CGB_SlotMachine:
 	ret
 
 _CGB_BetaTitleScreen:
-	ld hl, PalPacket_BetaTitleScreen + 1
+	ld hl, FourPals_BetaTitleScreen
 	call CopyFourPalettes
 	call WipeAttrmap
 	ld de, wOBPals1
@@ -475,7 +470,7 @@ INCLUDE "gfx/intro/gs_shellder_lapras_ob.pal"
 	ret
 
 .StartersCharizardScene:
-	ld hl, PalPacket_Pack + 1
+	ld hl, FourPals_Pack
 	call CopyFourPalettes
 	ld de, wOBPals1
 	ld a, PREDEFPAL_GS_INTRO_STARTERS_TRANSITION
@@ -502,7 +497,7 @@ _CGB_Diploma:
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
 
-	ld hl, PalPacket_Diploma + 1
+	ld hl, FourPals_Diploma
 	call CopyFourPalettes
 	call WipeAttrmap
 	call ApplyAttrmap
@@ -510,12 +505,12 @@ _CGB_Diploma:
 
 _CGB_MapPals:
 	call LoadMapPals
-	ld a, SCGB_MAPPALS
+	ld a, CGB_MAPPALS
 	ld [wDefaultSGBLayout], a
 	ret
 
 _CGB_PartyMenu:
-	ld hl, PalPacket_PartyMenu + 1
+	ld hl, FourPals_PartyMenu
 	call CopyFourPalettes
 	call InitPartyMenuBGPal0
 	call InitPartyMenuBGPal7
@@ -568,7 +563,7 @@ _CGB_GSTitleScreen:
 	ld bc, 2 palettes
 	ld a, BANK(wOBPals1)
 	call FarCopyWRAM
-	ld a, SCGB_DIPLOMA
+	ld a, CGB_DIPLOMA
 	ld [wDefaultSGBLayout], a
 	call ApplyPals
 	ld a, TRUE
@@ -576,14 +571,14 @@ _CGB_GSTitleScreen:
 	ret
 
 _CGB_Unused0D:
-	ld hl, PalPacket_Diploma + 1
+	ld hl, FourPals_Diploma
 	call CopyFourPalettes
 	call WipeAttrmap
 	call ApplyAttrmap
 	ret
 
 _CGB_UnownPuzzle:
-	ld hl, PalPacket_UnownPuzzle + 1
+	ld hl, FourPals_UnownPuzzle
 	call CopyFourPalettes
 	ld de, wOBPals1
 	ld a, PREDEFPAL_UNOWN_PUZZLE
@@ -734,7 +729,7 @@ _CGB_MoveList:
 	ret
 
 _CGB_BetaPikachuMinigame:
-	ld hl, PalPacket_BetaPikachuMinigame + 1
+	ld hl, FourPals_BetaPikachuMinigame
 	call CopyFourPalettes
 	call WipeAttrmap
 	call ApplyAttrmap
@@ -844,7 +839,7 @@ _CGB_Pokepic:
 	ret
 
 _CGB_MagnetTrain: ; unused
-	ld hl, PalPacket_MagnetTrain + 1
+	ld hl, FourPals_MagnetTrain
 	call CopyFourPalettes
 	call WipeAttrmap
 	hlcoord 0, 4, wAttrmap
@@ -901,7 +896,7 @@ _CGB_Unused1D:
 	ret
 
 _CGB_TradeTube:
-	ld hl, PalPacket_TradeTube + 1
+	ld hl, FourPals_TradeTube
 	call CopyFourPalettes
 	ld hl, PartyMenuOBPals
 	ld de, wOBPals1

engine/gfx/trademon_frontpic.asm

@@ -24,8 +24,8 @@ AnimateTrademonFrontpic:
 	ld [wTempMonDVs], a
 	ld a, [wOTTrademonDVs + 1]
 	ld [wTempMonDVs + 1], a
-	ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
-	call GetSGBLayout
+	ld b, CGB_PLAYER_OR_MON_FRONTPIC_PALS
+	call GetCGBLayout
 	ld a, %11100100 ; 3,2,1,0
 	call DmgToCgbBGPals
 	farcall TradeAnim_ShowGetmonFrontpic