Merge pull request #456 from Rangi42/master

OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming

6 files changed, 348 insertions, 0 deletions

diff --git a/gfx/sgb/blk_packets.asm b/gfx/sgb/blk_packets.asm
new file mode 100644
index 000000000..a50decd34
--- /dev/null
+++ b/gfx/sgb/blk_packets.asm
@@ -0,0 +1,90 @@
+; macros taken from pokered's data/sgb_packets.asm
+; names taken from pandocs
+; http://gbdev.gg8.se/wiki/articles/SGB_Functions#SGB_Palette_Commands
+
+attr_blk: MACRO
+	db (SGB_ATTR_BLK << 3) + ((\1 * 6) / 16 + 1)
+	db \1
+ENDM
+
+attr_blk_data: MACRO
+	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_9a86:
+	attr_blk 1
+	attr_blk_data %011, 0,0,0, 00,00, 19,17
+	ds 8
+
+BlkPacket_GSIntroJigglypuffPikachu:
+	attr_blk 1
+	attr_blk_data %111, 1,1,0, 00,10, 19,13
+	ds 8
+
+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
+
+BlkPacket_MoveList:
+	attr_blk 1
+	attr_blk_data %111, 1,1,0, 11,01, 19,02
+	ds 8
+
+BlkPacket_Pokedex_PC:
+	attr_blk 1
+	attr_blk_data %111, 1,1,0, 01,01, 08,08 ; mon: pal 1
+	ds 8
+
+BlkPacket_PokedexUnownMode:
+	attr_blk 1
+	attr_blk_data %111, 1,1,0, 07,05, 13,11 ; unown: pal 1
+	ds 8
+
+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
+
+UnreferencedBlkPacket_9b26:
+	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
+
+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
+
+BlkPacket_SCGB_06:
+	attr_blk 1
+	attr_blk_data %111, 0,0,1, 00,00, 19,05
+	ds 8
+
+BlkPacket_SCGB_13:
+	attr_blk 2
+	attr_blk_data %111, 2,2,0, 00,04, 19,13
+	attr_blk_data %011, 1,1,0, 00,06, 19,11
+	ds 2
diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm
new file mode 100644
index 000000000..fa3b386da
--- /dev/null
+++ b/gfx/sgb/pal_packets.asm
@@ -0,0 +1,98 @@
+; macros taken from pokered's data/sgb_packets.asm
+; names taken from pandocs
+; http://gbdev.gg8.se/wiki/articles/SGB_Functions#SGB_Palette_Commands
+
+sgb_pal_set: MACRO
+	db (SGB_PAL_SET << 3) + 1
+	dw PREDEFPAL_\1, PREDEFPAL_\2, PREDEFPAL_\3, PREDEFPAL_\4
+	ds 7
+ENDM
+
+sgb_pal01: MACRO
+	db (SGB_PAL01 << 3) + 1
+ENDM
+
+sgb_pal23: MACRO
+	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_SCGB_13:
+	sgb_pal_set GREENMON_NITE, CGB_BADGE, RB_BROWNMON, 00
+
+PalPacket_SCGB_11:
+	sgb_pal_set SCGB_11_0, SCGB_11_1, SCGB_11_2, SCGB_11_3
+
+PalPacket_UnownPuzzle:
+	sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE
+
+PalPacket_9bd6:
+	sgb_pal_set 00, 00, 00, 00
+
+PalPacket_GSIntroShellderLapras:
+	sgb_pal_set GS_INTRO_SHELLDER_LAPRAS, 00, 00, 00
+
+UnreferencedPalPacket_9bf6:
+	sgb_pal_set 37, 00, 00, 00
+
+PalPacket_GSIntroJigglypuffPikachu:
+	sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_BG, GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00
+
+PalPacket_GSIntroStartersTransition:
+	sgb_pal_set GS_INTRO_STARTERS_TRANSITION, 00, 00, 00
+
+PalPacket_Function8b4d:
+	sgb_pal_set 3B, 00, 00, 00
+
+PalPacket_Pack:
+	sgb_pal_set PACK, 00, 00, 00
+
+PalPacket_SCGB_0F:
+	sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00, 00
+
+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, 00, 00, 00
+
+UnreferencedPalPacket_9c86:
+	sgb_pal_set PACK, 00, 00, 00
+
+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
+
+PalPacket_Diploma:
+	sgb_pal_set DIPLOMA, 00, 00, 00
+
+PalPacket_TradeTube:
+	sgb_pal_set TRADE_TUBE, 00, 00, 00
+
+PalPacket_GamefreakLogo:
+	sgb_pal_set GS_INTRO_GAMEFREAK_LOGO, 00, 00, 00
+
+
+PalPacket_9ce6:
+	sgb_pal01
+	RGB 31, 31, 31
+rept 6
+	RGB 00, 00, 00
+endr
+	ds 1
+
+PalPacket_9cf6:
+	sgb_pal23
+	RGB 31, 31, 31
+rept 6
+	RGB 00, 00, 00
+endr
+	ds 1
diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal
new file mode 100644
index 000000000..67d19baec
--- /dev/null
+++ b/gfx/sgb/predef.pal
@@ -0,0 +1,79 @@
+	RGB 31,31,31, 22,25,19, 16,21,30, 00,00,00 ; PREDEFPAL_00
+	RGB 31,31,31, 27,28,31, 15,20,31, 00,00,00 ; PREDEFPAL_PALLET
+	RGB 31,31,31, 24,28,19, 15,20,31, 00,00,00 ; PREDEFPAL_VIRIDIAN
+	RGB 31,31,31, 24,24,24, 15,20,31, 00,00,00 ; PREDEFPAL_PEWTER
+	RGB 31,31,31, 21,23,31, 15,20,31, 00,00,00 ; PREDEFPAL_CERULEAN
+	RGB 31,31,31, 24,21,27, 15,20,31, 00,00,00 ; PREDEFPAL_LAVENDER
+	RGB 31,31,31, 31,24,16, 15,20,31, 00,00,00 ; PREDEFPAL_VERMILION
+	RGB 31,31,31, 25,30,26, 15,20,31, 00,00,00 ; PREDEFPAL_CELADON
+	RGB 31,31,31, 31,25,31, 15,20,31, 00,00,00 ; PREDEFPAL_FUCHSIA
+	RGB 31,31,31, 31,20,19, 15,20,31, 00,00,00 ; PREDEFPAL_CINNABAR
+	RGB 31,31,31, 31,26,19, 15,20,31, 00,00,00 ; PREDEFPAL_SAFFRON
+	RGB 31,31,31, 27,28,27, 15,20,31, 00,00,00 ; PREDEFPAL_INDIGO
+	RGB 31,31,31, 24,30,23, 15,20,31, 00,00,00 ; PREDEFPAL_NEW_BARK
+	RGB 31,31,31, 29,24,29, 15,20,31, 00,00,00 ; PREDEFPAL_CHERRYGROVE
+	RGB 31,31,31, 26,23,29, 15,20,31, 00,00,00 ; PREDEFPAL_VIOLET
+	RGB 31,31,31, 25,23,20, 15,20,31, 00,00,00 ; PREDEFPAL_AZALEA
+	RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_GOLDENROD
+	RGB 31,31,31, 31,21,18, 15,20,31, 00,00,00 ; PREDEFPAL_ECRUTEAK
+	RGB 31,31,31, 26,25,31, 15,20,31, 00,00,00 ; PREDEFPAL_OLIVINE
+	RGB 31,31,31, 22,21,31, 15,20,31, 00,00,00 ; PREDEFPAL_CIANWOOD
+	RGB 31,31,31, 22,25,21, 15,20,31, 00,00,00 ; PREDEFPAL_MAHOGANY
+	RGB 31,31,31, 21,21,22, 15,20,31, 00,00,00 ; PREDEFPAL_BLACKTHORN
+	RGB 31,31,31, 31,20,20, 15,20,31, 00,00,00 ; PREDEFPAL_LAKE_OF_RAGE
+	RGB 31,31,31, 26,26,26, 15,20,31, 00,00,00 ; PREDEFPAL_SILVER_CAVE
+	RGB 31,31,31, 21,14,09, 15,20,20, 00,00,00 ; PREDEFPAL_DUNGEONS
+	RGB 31,31,31, 12,28,22, 15,20,20, 00,00,00 ; PREDEFPAL_NITE
+	RGB 31,31,31, 07,07,07, 02,03,03, 00,00,00 ; PREDEFPAL_BLACKOUT
+	RGB 31,31,31, 30,22,17, 16,14,19, 00,00,00 ; PREDEFPAL_DIPLOMA
+	RGB 31,31,31, 18,20,27, 11,15,23, 00,00,00 ; PREDEFPAL_TRADE_TUBE
+	RGB 31,31,31, 31,20,10, 26,10,06, 00,00,00 ; PREDEFPAL_POKEDEX
+	RGB 31,31,31, 21,25,29, 14,19,25, 00,00,00 ; PREDEFPAL_RB_CYANMON
+	RGB 31,31,31, 27,22,24, 21,15,23, 00,00,00 ; PREDEFPAL_RB_PURPLEMON
+	RGB 31,31,31, 28,20,15, 21,14,09, 00,00,00 ; PREDEFPAL_RB_BROWNMON
+	RGB 31,31,31, 20,26,16, 09,20,11, 00,00,00 ; PREDEFPAL_RB_GREENMON
+	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, 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, 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,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, 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, 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
+	RGB 31,31,31, 28,04,02, 15,20,31, 00,00,00 ; PREDEFPAL_GS_TITLE_SCREEN_2
+	RGB 31,31,31, 18,23,31, 15,20,31, 00,00,00 ; PREDEFPAL_GS_TITLE_SCREEN_3
+	RGB 31,31,31, 24,20,11, 18,13,11, 00,00,00 ; PREDEFPAL_UNOWN_PUZZLE
+	RGB 31,31,31, 31,31,31, 25,30,00, 25,30,00 ; PREDEFPAL_4D
+	RGB 00,00,00, 08,11,11, 21,21,21, 31,31,31 ; PREDEFPAL_GAMEFREAK_LOGO
diff --git a/gfx/sgb/sgb_border.bin b/gfx/sgb/sgb_border.bin
new file mode 100644
index 000000000..362eae929
--- /dev/null
+++ b/gfx/sgb/sgb_border.bin
@@ -0,0 +1,2 @@
+TTTT
TT
T$%&T&T%T$TT
TT
TTTTT$455T4T3TTTT!"##T"T!T T	
+
	
) !"##T"T!T122T688888888888888888888'2TT2T1TTT7TTTTT7TTT%&T&T7&T&T%T3455T4T7455T4T3T7T
TT7
TTT7"T!T T7 !"2T1T0T7012TTT7TTT7&T%T$T7$%&4T3TT7347
TT7TT
TTT7TTT!"##T"T7"##T"T!T122T72TT2T1TTT.////////////////////-TTTTTTT9	()*+,9TTT%&T&T%T$T
TT
T$%&T&T%T3455T4T$TTTTTT$455T4T3T !"##T"T!T T
\ No newline at end of file
diff --git a/gfx/sgb/sgb_border.pal b/gfx/sgb/sgb_border.pal
new file mode 100644
index 000000000..fd5aec402
--- /dev/null
+++ b/gfx/sgb/sgb_border.pal
@@ -0,0 +1,79 @@
+	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
diff --git a/gfx/sgb/sgb_border.png b/gfx/sgb/sgb_border.png
index 867c36b10..054ab4880 100644
--- a/gfx/sgb/sgb_border.png
+++ b/gfx/sgb/sgb_border.png