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

gfx/battle_anims/unused_battle_anims.pal

@@ -1,30 +0,0 @@
-; gray
-	RGB 31, 31, 31
-	RGB 21, 21, 21
-	RGB 13, 13, 13
-	RGB 07, 07, 07
-; yellow
-	RGB 31, 31, 31
-	RGB 31, 31, 07
-	RGB 31, 16, 01
-	RGB 07, 07, 07
-; red
-	RGB 31, 31, 31
-	RGB 31, 19, 24
-	RGB 30, 10, 06
-	RGB 07, 07, 07
-; green
-	RGB 31, 31, 31
-	RGB 12, 25, 01
-	RGB 05, 14, 00
-	RGB 07, 07, 07
-; blue
-	RGB 31, 31, 31
-	RGB 08, 12, 31
-	RGB 01, 04, 31
-	RGB 07, 07, 07
-; brown
-	RGB 31, 31, 31
-	RGB 24, 18, 07
-	RGB 20, 15, 03
-	RGB 07, 07, 07

gfx/intro/gs_magikarp_bg.pal

@@ -1,4 +0,0 @@
-	RGB 31, 31, 31
-	RGB 18, 23, 31
-	RGB 15, 20, 31
-	RGB 00, 00, 00

gfx/intro/gs_magikarp_ob.pal

@@ -1,4 +0,0 @@
-	RGB 31, 31, 31
-	RGB 31, 31, 12
-	RGB 08, 16, 28
-	RGB 00, 00, 00

gfx/predef/four_pals.asm

@@ -0,0 +1,30 @@
+MACRO four_pals
+	dw PREDEFPAL_\1, PREDEFPAL_\2, PREDEFPAL_\3, PREDEFPAL_\4
+ENDM
+
+FourPals_MagnetTrain:
+	four_pals BETA_SHINY_GREENMON, CGB_BADGE, RB_BROWNMON, ROUTES
+
+FourPals_UnownPuzzle:
+	four_pals UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE
+
+FourPals_Pack:
+	four_pals PACK, ROUTES, ROUTES, ROUTES
+
+FourPals_BetaPikachuMinigame:
+	four_pals GS_INTRO_JIGGLYPUFF_PIKACHU_OB, ROUTES, ROUTES, ROUTES
+
+FourPals_PartyMenu:
+	four_pals PARTY_ICON, HP_GREEN, HP_YELLOW, HP_RED
+
+FourPals_BattleGrayscale:
+	four_pals BLACKOUT, BLACKOUT, BLACKOUT, BLACKOUT
+
+FourPals_BetaTitleScreen:
+	four_pals BETA_LOGO_1, BETA_LOGO_2, DIPLOMA, RB_PURPLEMON
+
+FourPals_Diploma:
+	four_pals DIPLOMA, ROUTES, ROUTES, ROUTES
+
+FourPals_TradeTube:
+	four_pals TRADE_TUBE, ROUTES, ROUTES, ROUTES

gfx/sgb/blk_packets.asm

@@ -1,89 +0,0 @@
-; macros taken from pokered's data/sgb_packets.asm
-; names taken from pandocs
-; http://gbdev.gg8.se/wiki/articles/SGB_Functions#SGB_Palette_Commands
-
-MACRO attr_blk
-	db (SGB_ATTR_BLK << 3) + ((\1 * 6) / 16 + 1)
-	db \1
-ENDM
-
-MACRO attr_blk_data
-	db \1 ; which regions are affected
-	db \2 + (\3 << 2) + (\4 << 4) ; palette for each region
-	db \5, \6, \7, \8 ; x1, y1, x2, y2
-ENDM
-
-BlkPacket_AllPal0:
-	attr_blk 1
-	attr_blk_data %011, 0,0,0, 00,00, 19,17
-	ds 8, 0
-
-BlkPacket_GSIntroJigglypuffPikachu:
-	attr_blk 1
-	attr_blk_data %111, 1,1,0, 00,10, 19,13
-	ds 8, 0
-
-BlkPacket_Battle:
-	attr_blk 5
-	attr_blk_data %111, 2,2,0, 00,12, 19,17 ; text box: pal 2
-	attr_blk_data %011, 1,1,0, 01,00, 10,03 ; enemy HP bar: pal 1
-	attr_blk_data %011, 0,0,0, 10,08, 19,10 ; player HP+exp bar: pal 0
-	attr_blk_data %011, 2,2,0, 00,04, 08,11 ; player mon: pal 2
-	attr_blk_data %011, 3,3,0, 11,00, 19,07 ; enemy mon : pal 3
-
-BlkPacket_StatsScreen:
-	attr_blk 1
-	attr_blk_data %111, 1,1,0, 00,01, 07,07 ; mon: pal 1
-	ds 8, 0
-
-BlkPacket_MoveList:
-	attr_blk 1
-	attr_blk_data %111, 1,1,0, 11,01, 19,02
-	ds 8, 0
-
-BlkPacket_Pokedex_PC:
-	attr_blk 1
-	attr_blk_data %111, 1,1,0, 01,01, 08,08 ; mon: pal 1
-	ds 8, 0
-
-BlkPacket_PokedexUnownMode:
-	attr_blk 1
-	attr_blk_data %111, 1,1,0, 07,05, 13,11 ; unown: pal 1
-	ds 8, 0
-
-BlkPacket_SlotMachine:
-	attr_blk 5
-	attr_blk_data %011, 1,1,0, 00,00, 19,11 ; "3" rows and top of screen: pal 1
-	attr_blk_data %011, 2,2,0, 00,04, 19,09 ; "2" rows: pal 2
-	attr_blk_data %010, 3,3,0, 00,06, 19,07 ; "1" row: pal 3
-	attr_blk_data %011, 0,0,0, 04,04, 15,09 ; slot reels: pal 0
-	attr_blk_data %011, 0,0,0, 00,12, 19,17 ; text box: pal 0
-
-BlkPacket_PartyMenu: ; unreferenced
-	attr_blk 7
-	attr_blk_data %111, 0,0,1, 00,00, 02,12
-	attr_blk_data %010, 0,0,0, 12,00, 18,01
-	attr_blk_data %010, 0,0,0, 12,02, 18,03
-	attr_blk_data %010, 0,0,0, 12,04, 18,05
-	attr_blk_data %010, 0,0,0, 12,06, 18,07
-	attr_blk_data %010, 0,0,0, 12,08, 18,09
-	attr_blk_data %010, 0,0,0, 12,10, 18,11
-	ds 4, 0
-
-BlkPacket_GSTitleScreen:
-	attr_blk 3
-	attr_blk_data %111, 0,0,2, 00,00, 19,04
-	attr_blk_data %011, 3,3,0, 00,06, 19,17
-	attr_blk_data %011, 1,1,0, 15,01, 18,04
-	ds 12, 0
-
-BlkPacket_BetaTitleScreen:
-	attr_blk 1
-	attr_blk_data %111, 0,0,1, 00,00, 19,05 ; logo
-	ds 8, 0
-
-BlkPacket_MagnetTrain:
-	attr_blk 2
-	attr_blk_data %111, 2,2,0, 00,04, 19,13 ; fence
-	attr_blk_data %011, 1,1,0, 00,06, 19,11 ; train
-	ds 2, 0

gfx/sgb/pal_packets.asm

@@ -1,96 +0,0 @@
-; macros taken from pokered's data/sgb_packets.asm
-; names taken from pandocs
-; http://gbdev.gg8.se/wiki/articles/SGB_Functions#SGB_Palette_Commands
-
-MACRO sgb_pal_set
-	db (SGB_PAL_SET << 3) + 1
-	dw PREDEFPAL_\1, PREDEFPAL_\2, PREDEFPAL_\3, PREDEFPAL_\4
-	ds 7, 0
-ENDM
-
-MACRO sgb_pal01
-	db (SGB_PAL01 << 3) + 1
-ENDM
-
-MACRO sgb_pal23
-	db (SGB_PAL23 << 3) + 1
-ENDM
-
-PalPacket_GSTitleScreen:
-	sgb_pal_set GS_TITLE_SCREEN_0, GS_TITLE_SCREEN_1, GS_TITLE_SCREEN_2, GS_TITLE_SCREEN_3
-
-PalPacket_MagnetTrain:
-	sgb_pal_set BETA_SHINY_GREENMON, CGB_BADGE, RB_BROWNMON, ROUTES
-
-PalPacket_BetaPoker:
-	sgb_pal_set BETA_POKER_0, BETA_POKER_1, BETA_POKER_2, BETA_POKER_3
-
-PalPacket_UnownPuzzle:
-	sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE
-
-PalPacket_AllPal0:
-	sgb_pal_set ROUTES, ROUTES, ROUTES, ROUTES
-
-PalPacket_GSIntroShellderLapras:
-	sgb_pal_set GS_INTRO_SHELLDER_LAPRAS, ROUTES, ROUTES, ROUTES
-
-PalPacket_BetaIntroLapras: ; unreferenced
-	sgb_pal_set BETA_INTRO_LAPRAS, ROUTES, ROUTES, ROUTES
-
-PalPacket_GSIntroJigglypuffPikachu:
-	sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_BG, GS_INTRO_JIGGLYPUFF_PIKACHU_OB, ROUTES, ROUTES
-
-PalPacket_GSIntroStartersTransition:
-	sgb_pal_set GS_INTRO_STARTERS_TRANSITION, ROUTES, ROUTES, ROUTES
-
-PalPacket_BetaIntroVenusaur:
-	sgb_pal_set BETA_INTRO_VENUSAUR, ROUTES, ROUTES, ROUTES
-
-PalPacket_Pack:
-	sgb_pal_set PACK, ROUTES, ROUTES, ROUTES
-
-PalPacket_BetaPikachuMinigame:
-	sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_OB, ROUTES, ROUTES, ROUTES
-
-PalPacket_PartyMenu:
-	sgb_pal_set PARTY_ICON, HP_GREEN, HP_YELLOW, HP_RED
-
-PalPacket_BattleGrayscale:
-	sgb_pal_set BLACKOUT, BLACKOUT, BLACKOUT, BLACKOUT
-
-PalPacket_Pokegear:
-	sgb_pal_set POKEGEAR, ROUTES, ROUTES, ROUTES
-
-PalPacket_Pack2: ; unreferenced
-	sgb_pal_set PACK, ROUTES, ROUTES, ROUTES
-
-PalPacket_SlotMachine:
-	sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3
-
-PalPacket_BetaTitleScreen:
-	sgb_pal_set BETA_LOGO_1, BETA_LOGO_2, DIPLOMA, RB_PURPLEMON
-
-PalPacket_Diploma:
-	sgb_pal_set DIPLOMA, ROUTES, ROUTES, ROUTES
-
-PalPacket_TradeTube:
-	sgb_pal_set TRADE_TUBE, ROUTES, ROUTES, ROUTES
-
-PalPacket_GamefreakLogo:
-	sgb_pal_set GS_INTRO_GAMEFREAK_LOGO, ROUTES, ROUTES, ROUTES
-
-PalPacket_Pal01:
-	sgb_pal01
-	RGB 31, 31, 31
-rept 6
-	RGB 00, 00, 00
-endr
-	db 0
-
-PalPacket_Pal23:
-	sgb_pal23
-	RGB 31, 31, 31
-rept 6
-	RGB 00, 00, 00
-endr
-	db 0

gfx/sgb/sgb_border.pal

@@ -1,79 +0,0 @@
-	RGB 24, 06, 06
-	RGB 24, 24, 26
-	RGB 14, 15, 20
-	RGB 04, 07, 10
-
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-
-	RGB 18, 24, 18
-	RGB 31, 26, 15
-	RGB 26, 19, 10
-	RGB 12, 07, 05
-
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-
-	RGB 18, 06, 31
-	RGB 31, 31, 29
-	RGB 31, 12, 00
-	RGB 00, 00, 00
-
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-
-	RGB 12, 31, 06
-	RGB 22, 26, 30
-	RGB 16, 17, 21
-	RGB 00, 03, 00
-
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25
-	RGB 31, 31, 25