Merge pull request #514 from Rangi42/master

[Ready to merge] Named constants for sprite movement data bit flags + other minor fixes

6 files changed, 73 insertions, 56 deletions

diff --git a/gfx/unknown/b789.pal b/gfx/beta_poker/beta_poker.pal
index cce760662..cce760662 100644
--- a/gfx/unknown/b789.pal
+++ b/gfx/beta_poker/beta_poker.pal
diff --git a/gfx/pack/pack_menu.png b/gfx/pack/pack_menu.png
index 52e2bcdd5..aa693cc40 100644
--- a/gfx/pack/pack_menu.png
+++ b/gfx/pack/pack_menu.png
diff --git a/gfx/pics.asm b/gfx/pics.asm
index 198569a76..043e41489 100644
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -20,7 +20,6 @@ INCLUDE "data/trainers/pic_pointers.asm"
 
 
 SECTION "Pics 1", ROMX
-Pics_1::
 
 HoOhFrontpic:        INCBIN "gfx/pokemon/ho_oh/front.animated.2bpp.lz"
 MachampFrontpic:     INCBIN "gfx/pokemon/machamp/front.animated.2bpp.lz"
@@ -794,3 +793,21 @@ INCBIN "gfx/pokemon/unown_y/back.2bpp.lz"
 INCBIN "gfx/pokemon/unown_p/back.2bpp.lz"
 INCBIN "gfx/pokemon/unown_i/back.2bpp.lz"
 INCBIN "gfx/pokemon/unown_r/back.2bpp.lz"
+
+
+; Sections "Pics 20" to "Pics 24" are not used for any graphics,
+; but entries for their banks exist in FixPicBank (see engine/gfx/load_pics.asm).
+
+SECTION "Pics 20", ROMX
+
+
+SECTION "Pics 21", ROMX
+
+
+SECTION "Pics 22", ROMX
+
+
+SECTION "Pics 23", ROMX
+
+
+SECTION "Pics 24", ROMX
diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm
index fa3b386da..0a392fb22 100644
--- a/gfx/sgb/pal_packets.asm
+++ b/gfx/sgb/pal_packets.asm
@@ -21,10 +21,10 @@ PalPacket_GSTitleScreen:
 	sgb_pal_set GS_TITLE_SCREEN_0, GS_TITLE_SCREEN_1, GS_TITLE_SCREEN_2, GS_TITLE_SCREEN_3
 
 PalPacket_SCGB_13:
-	sgb_pal_set GREENMON_NITE, CGB_BADGE, RB_BROWNMON, 00
+	sgb_pal_set BETA_SHINY_GREENMON, CGB_BADGE, RB_BROWNMON, 00
 
-PalPacket_SCGB_11:
-	sgb_pal_set SCGB_11_0, SCGB_11_1, SCGB_11_2, SCGB_11_3
+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
@@ -35,8 +35,8 @@ PalPacket_9bd6:
 PalPacket_GSIntroShellderLapras:
 	sgb_pal_set GS_INTRO_SHELLDER_LAPRAS, 00, 00, 00
 
-UnreferencedPalPacket_9bf6:
-	sgb_pal_set 37, 00, 00, 00
+UnreferencedPalPacket_BetaIntroLapras:
+	sgb_pal_set BETA_INTRO_LAPRAS, 00, 00, 00
 
 PalPacket_GSIntroJigglypuffPikachu:
 	sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_BG, GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00
@@ -44,13 +44,13 @@ PalPacket_GSIntroJigglypuffPikachu:
 PalPacket_GSIntroStartersTransition:
 	sgb_pal_set GS_INTRO_STARTERS_TRANSITION, 00, 00, 00
 
-PalPacket_Function8b4d:
-	sgb_pal_set 3B, 00, 00, 00
+PalPacket_BetaIntroVenusaur:
+	sgb_pal_set BETA_INTRO_VENUSAUR, 00, 00, 00
 
 PalPacket_Pack:
 	sgb_pal_set PACK, 00, 00, 00
 
-PalPacket_SCGB_0F:
+PalPacket_BetaPikachuMinigame:
 	sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00, 00
 
 PalPacket_PartyMenu:
@@ -69,7 +69,7 @@ PalPacket_SlotMachine:
 	sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3
 
 PalPacket_SCGB_06:
-	sgb_pal_set 33, 34, DIPLOMA, RB_PURPLEMON
+	sgb_pal_set BETA_LOGO_1, BETA_LOGO_2, DIPLOMA, RB_PURPLEMON
 
 PalPacket_Diploma:
 	sgb_pal_set DIPLOMA, 00, 00, 00
diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal
index 67d19baec..9c86e2459 100644
--- a/gfx/sgb/predef.pal
+++ b/gfx/sgb/predef.pal
@@ -35,40 +35,40 @@
 	RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_RB_PINKMON
 	RGB 31,31,31, 31,28,14, 26,20,00, 00,00,00 ; PREDEFPAL_RB_YELLOWMON
 	RGB 31,31,31, 26,21,22, 15,15,18, 00,00,00 ; PREDEFPAL_CGB_BADGE
-	RGB 31,31,31, 23,19,13, 14,12,17, 00,00,00 ; PREDEFPAL_MEWMON_NITE
-	RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_BLUEMON_NITE
-	RGB 31,31,31, 22,15,16, 17,02,05, 00,00,00 ; PREDEFPAL_REDMON_NITE
-	RGB 31,31,31, 15,20,20, 05,16,16, 00,00,00 ; PREDEFPAL_CYANMON_NITE
-	RGB 31,31,31, 23,15,19, 14,04,12, 00,00,00 ; PREDEFPAL_PURPLEMON_NITE
-	RGB 31,31,31, 20,17,18, 18,13,11, 00,00,00 ; PREDEFPAL_BROWNMON_NITE
-	RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_GREENMON_NITE
-	RGB 31,31,31, 21,25,29, 30,22,24, 00,00,00 ; PREDEFPAL_PINKMON_NITE
-	RGB 31,31,31, 26,23,16, 29,14,09, 00,00,00 ; PREDEFPAL_YELLOWMON_NITE
+	RGB 31,31,31, 23,19,13, 14,12,17, 00,00,00 ; PREDEFPAL_SHINY_MEWMON
+	RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_SHINY_BLUEMON
+	RGB 31,31,31, 22,15,16, 17,02,05, 00,00,00 ; PREDEFPAL_SHINY_REDMON
+	RGB 31,31,31, 15,20,20, 05,16,16, 00,00,00 ; PREDEFPAL_SHINY_CYANMON
+	RGB 31,31,31, 23,15,19, 14,04,12, 00,00,00 ; PREDEFPAL_SHINY_PURPLEMON
+	RGB 31,31,31, 20,17,18, 18,13,11, 00,00,00 ; PREDEFPAL_SHINY_BROWNMON
+	RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_SHINY_GREENMON
+	RGB 31,31,31, 21,25,29, 30,22,24, 00,00,00 ; PREDEFPAL_SHINY_PINKMON
+	RGB 31,31,31, 26,23,16, 29,14,09, 00,00,00 ; PREDEFPAL_SHINY_YELLOWMON
 	RGB 31,31,31, 18,18,18, 10,10,10, 00,00,00 ; PREDEFPAL_PARTY_ICON
 	RGB 31,31,31, 30,26,15, 00,23,00, 00,00,00 ; PREDEFPAL_HP_GREEN
 	RGB 31,31,31, 30,26,15, 31,23,00, 00,00,00 ; PREDEFPAL_HP_YELLOW
 	RGB 31,31,31, 30,26,15, 31,00,00, 00,00,00 ; PREDEFPAL_HP_RED
 	RGB 31,31,31, 29,26,19, 27,20,14, 00,00,00 ; PREDEFPAL_POKEGEAR
-	RGB 31,31,31, 24,20,10, 21,00,04, 00,00,00 ; PREDEFPAL_33
-	RGB 31,31,31, 31,20,10, 21,00,04, 00,00,00 ; PREDEFPAL_34
+	RGB 31,31,31, 24,20,10, 21,00,04, 00,00,00 ; PREDEFPAL_BETA_LOGO_1
+	RGB 31,31,31, 31,20,10, 21,00,04, 00,00,00 ; PREDEFPAL_BETA_LOGO_2
 	RGB 31,31,31, 30,26,16, 16,12,09, 00,00,00 ; PREDEFPAL_GS_INTRO_GAMEFREAK_LOGO
 	RGB 31,31,31, 15,28,26, 12,22,26, 03,16,14 ; PREDEFPAL_GS_INTRO_SHELLDER_LAPRAS
-	RGB 31,31,31, 15,28,26, 23,24,24, 00,00,00 ; PREDEFPAL_37
+	RGB 31,31,31, 15,28,26, 23,24,24, 00,00,00 ; PREDEFPAL_BETA_INTRO_LAPRAS
 	RGB 31,31,24, 07,27,19, 26,20,10, 19,12,08 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG
 	RGB 31,31,31, 31,28,14, 31,13,31, 00,00,00 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB
 	RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_GS_INTRO_STARTERS_TRANSITION
-	RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_3B
+	RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_BETA_INTRO_VENUSAUR
 	RGB 31,31,31, 31,14,00, 07,11,15, 00,00,00 ; PREDEFPAL_PACK
 	RGB 31,31,31, 26,21,22, 26,10,06, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_0
 	RGB 31,31,31, 30,27,04, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_1
 	RGB 31,31,31, 31,13,25, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_2
 	RGB 31,31,31, 16,19,29, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_3
-	RGB 31,31,31, 30,22,24, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_0
-	RGB 31,31,31, 21,25,29, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_1
-	RGB 31,31,31, 20,26,16, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_2
-	RGB 31,31,31, 31,28,14, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_3
-	RGB 31,31,31, 18,18,18, 26,10,06, 00,00,00 ; PREDEFPAL_45
-	RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_46
+	RGB 31,31,31, 30,22,24, 18,18,18, 16,10,07 ; PREDEFPAL_BETA_POKER_0
+	RGB 31,31,31, 21,25,29, 18,18,18, 16,10,07 ; PREDEFPAL_BETA_POKER_1
+	RGB 31,31,31, 20,26,16, 18,18,18, 16,10,07 ; PREDEFPAL_BETA_POKER_2
+	RGB 31,31,31, 31,28,14, 18,18,18, 16,10,07 ; PREDEFPAL_BETA_POKER_3
+	RGB 31,31,31, 18,18,18, 26,10,06, 00,00,00 ; PREDEFPAL_BETA_RADIO
+	RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_BETA_POKEGEAR
 	RGB 31,31,31, 26,20,00, 16,19,29, 00,00,00 ; PREDEFPAL_47
 	RGB 31,31,31, 16,02,30, 15,20,31, 00,00,00 ; PREDEFPAL_GS_TITLE_SCREEN_0
 	RGB 31,31,31, 16,13,04, 15,20,31, 00,00,00 ; PREDEFPAL_GS_TITLE_SCREEN_1
diff --git a/gfx/tilesets/roofs.pal b/gfx/tilesets/roofs.pal
index 6daf87cb6..652b152c1 100644
--- a/gfx/tilesets/roofs.pal
+++ b/gfx/tilesets/roofs.pal
@@ -1,107 +1,107 @@
 ; group 0 (unused)
 	RGB 21,21,21, 11,11,11 ; morn/day
-	RGB 21,21,21, 11,11,11; nite
+	RGB 21,21,21, 11,11,11 ; nite
 
 ; group 1 (Olivine)
 	RGB 14,17,31, 07,11,15 ; morn/day
-	RGB 09,09,17, 05,07,13; nite
+	RGB 09,09,17, 05,07,13 ; nite
 
 ; group 2 (Mahogany)
 	RGB 12,19,00, 06,10,00 ; morn/day
-	RGB 06,09,07, 04,05,06; nite
+	RGB 06,09,07, 04,05,06 ; nite
 
 ; group 3 (dungeons)
 	RGB 21,21,21, 11,11,11 ; morn/day
-	RGB 21,21,21, 17,08,07; nite
+	RGB 21,21,21, 17,08,07 ; nite
 
 ; group 4 (Ecruteak)
 	RGB 31,19,00, 27,10,05 ; morn/day
-	RGB 15,07,02, 11,04,02; nite
+	RGB 15,07,02, 11,04,02 ; nite
 
 ; group 5 (Blackthorn)
 	RGB 11,10,16, 05,06,07 ; morn/day
-	RGB 03,04,08, 00,00,00; nite
+	RGB 03,04,08, 00,00,00 ; nite
 
 ; group 6 (Cinnabar)
 	RGB 31,10,00, 18,06,00 ; morn/day
-	RGB 18,05,09, 17,08,07; nite
+	RGB 18,05,09, 17,08,07 ; nite
 
 ; group 7 (Cerulean)
 	RGB 17,27,31, 05,15,31 ; morn/day
-	RGB 07,08,22, 07,07,16; nite
+	RGB 07,08,22, 07,07,16 ; nite
 
 ; group 8 (Azalea)
 	RGB 22,20,10, 17,14,03 ; morn/day
-	RGB 11,11,05, 10,09,07; nite
+	RGB 11,11,05, 10,09,07 ; nite
 
 ; group 9 (Lake of Rage)
 	RGB 31,08,04, 09,09,08 ; morn/day
-	RGB 18,05,09, 09,09,08; nite
+	RGB 18,05,09, 09,09,08 ; nite
 
 ; group 10 (Violet)
 	RGB 24,14,31, 13,07,21 ; morn/day
-	RGB 12,03,18, 09,03,15; nite
+	RGB 12,03,18, 09,03,15 ; nite
 
 ; group 11 (Goldenrod)
 	RGB 25,25,00, 20,17,08 ; morn/day
-	RGB 12,12,00, 10,09,05; nite
+	RGB 12,12,00, 10,09,05 ; nite
 
 ; group 12 (Vermilion)
 	RGB 27,23,01, 23,11,00 ; morn/day
-	RGB 15,11,01, 11,10,01; nite
+	RGB 15,11,01, 11,10,01 ; nite
 
 ; group 13 (Pallet)
 	RGB 27,28,31, 17,19,22 ; morn/day
-	RGB 14,14,18, 10,09,13; nite
+	RGB 14,14,18, 10,09,13 ; nite
 
 ; group 14 (Pewter)
 	RGB 19,19,16, 10,12,15 ; morn/day
-	RGB 09,09,11, 04,05,07; nite
+	RGB 09,09,11, 04,05,07 ; nite
 
 ; group 15 (Mount Moon Square)
 	RGB 14,17,31, 07,11,15 ; morn/day
-	RGB 09,13,19, 07,07,16; nite
+	RGB 09,13,19, 07,07,16 ; nite
 
 ; group 16 (Indigo)
 	RGB 21,21,21, 13,13,13 ; morn/day
-	RGB 11,11,19, 07,07,12; nite
+	RGB 11,11,19, 07,07,12 ; nite
 
 ; group 17 (Fuchsia)
 	RGB 31,18,29, 17,13,20 ; morn/day
-	RGB 14,06,12, 11,03,10; nite
+	RGB 14,06,12, 11,03,10 ; nite
 
 ; group 18 (Lavender)
 	RGB 23,15,31, 16,05,31 ; morn/day
-	RGB 12,07,17, 08,06,10; nite
+	RGB 12,07,17, 08,06,10 ; nite
 
 ; group 19 (Silver Cave)
 	RGB 21,21,25, 16,16,16 ; morn/day
-	RGB 13,13,13, 07,07,07; nite
+	RGB 13,13,13, 07,07,07 ; nite
 
 ; group 20 (Cable Club)
 	RGB 21,21,21, 11,11,11 ; morn/day
-	RGB 21,21,21, 11,11,11; nite
+	RGB 21,21,21, 11,11,11 ; nite
 
 ; group 21 (Celadon)
 	RGB 19,31,15, 31,22,02 ; morn/day
-	RGB 12,13,09, 09,12,03; nite
+	RGB 12,13,09, 09,12,03 ; nite
 
 ; group 22 (Cianwood)
 	RGB 15,10,31, 07,05,15 ; morn/day
-	RGB 06,05,17, 02,02,08; nite
+	RGB 06,05,17, 02,02,08 ; nite
 
 ; group 23 (Viridian)
 	RGB 21,31,07, 13,25,04 ; morn/day
-	RGB 09,14,08, 06,10,04; nite
+	RGB 09,14,08, 06,10,04 ; nite
 
 ; group 24 (New Bark)
 	RGB 20,31,14, 11,23,05 ; morn/day
-	RGB 09,13,08, 06,09,04; nite
+	RGB 09,13,08, 06,09,04 ; nite
 
 ; group 25 (Saffron)
 	RGB 31,26,00, 31,15,00 ; morn/day
-	RGB 13,13,01, 08,08,01; nite
+	RGB 13,13,01, 08,08,01 ; nite
 
 ; group 26 (Cherrygrove)
 	RGB 31,14,28, 31,05,21 ; morn/day
-	RGB 14,07,17, 13,00,08; nite
+	RGB 14,07,17, 13,00,08 ; nite