Use newer RGB macro; add comments

6 files changed, 139 insertions, 357 deletions

diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm
index bf9e0d2..3efcc97 100755
--- a/constants/palette_constants.asm
+++ b/constants/palette_constants.asm
@@ -1,60 +1,59 @@
 	const_def
-
-	const PAL_TOWN_00
-	const PAL_TOWN_01
-	const PAL_TOWN_02
-	const PAL_TOWN_03
-	const PAL_TOWN_04
-	const PAL_TOWN_05
-	const PAL_TOWN_06
-	const PAL_TOWN_07
-	const PAL_TOWN_08
-	const PAL_TOWN_09
-	const PAL_TOWN_0A
-	const PAL_TOWN_0B
-	const PAL_TOWN_0C
-	const PAL_TOWN_0D
-	const PAL_BLACK
-	const PAL_MEWMON
-	const PAL_BLUEMON
-	const PAL_REDMON
-	const PAL_CYANMON
-	const PAL_PURPLEMON
-	const PAL_BROWNMON
-	const PAL_GREENMON
-	const PAL_PINKMON
-	const PAL_YELLOWMON
-	const PAL_GREYMON
-	const PAL_DARKMEWMON
-	const PAL_DARKBLUEMON
-	const PAL_DARKREDMON
-	const PAL_DARKCYANMON
-	const PAL_DARKPURPLEMON
-	const PAL_DARKBROWNMON
-	const PAL_TANMON
-	const PAL_BLUEPINKMON
-	const PAL_ORANGEMON
-	const PAL_DARKGREYMON
-	const PAL_GREENBAR
-	const PAL_YELLOWBAR
-	const PAL_REDBAR
-	const PAL_TOWNMAP
-	const PAL_LOGO1
-	const PAL_LOGO2
-	const PAL_GAMEFREAK
-	const PAL_INTROWATER
-	const PAL_INTROLAPRAS
-	const PAL_INTROFOREST
-	const PAL_INTROPURINPIKA
-	const PAL_INTROKAMEX
-	const PAL_INTROFUSHIGIBANA
-	const PAL_INTROLIZARDON
-	const PAL_SLOTS1
-	const PAL_SLOTS2
-	const PAL_SLOTS3
-	const PAL_SLOTS4
-	const PAL_POKER1
-	const PAL_POKER2
-	const PAL_POKER3
-	const PAL_POKER4
-	const PAL_39
\ No newline at end of file
+	const PAL_TOWN_00 ; 00
+	const PAL_TOWN_01 ; 01
+	const PAL_TOWN_02 ; 02
+	const PAL_TOWN_03 ; 03
+	const PAL_TOWN_04 ; 04
+	const PAL_TOWN_05 ; 05
+	const PAL_TOWN_06 ; 06
+	const PAL_TOWN_07 ; 07
+	const PAL_TOWN_08 ; 08
+	const PAL_TOWN_09 ; 09
+	const PAL_TOWN_0A ; 0a
+	const PAL_TOWN_0B ; 0b
+	const PAL_TOWN_0C ; 0c
+	const PAL_TOWN_0D ; 0d
+	const PAL_BLACK ; 0e
+	const PAL_MEWMON ; 0f
+	const PAL_BLUEMON ; 10
+	const PAL_REDMON ; 11
+	const PAL_CYANMON ; 12
+	const PAL_PURPLEMON ; 13
+	const PAL_BROWNMON ; 14
+	const PAL_GREENMON ; 15
+	const PAL_PINKMON ; 16
+	const PAL_YELLOWMON ; 17
+	const PAL_GREYMON ; 18
+	const PAL_DARKMEWMON ; 19
+	const PAL_DARKBLUEMON ; 1a
+	const PAL_DARKREDMON ; 1b
+	const PAL_DARKCYANMON ; 1c
+	const PAL_DARKPURPLEMON ; 1d
+	const PAL_DARKBROWNMON ; 1e
+	const PAL_TANMON ; 1f
+	const PAL_BLUEPINKMON ; 20
+	const PAL_ORANGEMON ; 21
+	const PAL_DARKGREYMON ; 22
+	const PAL_GREENBAR ; 23
+	const PAL_YELLOWBAR ; 24
+	const PAL_REDBAR ; 25
+	const PAL_TOWN_MAP ; 26
+	const PAL_LOGO_1 ; 27
+	const PAL_LOGO_2 ; 28
+	const PAL_GAME_FREAK ; 29
+	const PAL_INTRO_WATER ; 2a
+	const PAL_INTRO_LAPRAS ; 2b
+	const PAL_INTRO_FOREST ; 2c
+	const PAL_INTRO_PURIN_PIKACHU ; 2d
+	const PAL_INTRO_KAMEX ; 2e
+	const PAL_INTRO_FUSHIGIBANA ; 2f
+	const PAL_INTRO_LIZARDON ; 30
+	const PAL_SLOTS_1 ; 31
+	const PAL_SLOTS_2 ; 32
+	const PAL_SLOTS_3 ; 33
+	const PAL_SLOTS_4 ; 34
+	const PAL_POKER_1 ; 35
+	const PAL_POKER_2 ; 36
+	const PAL_POKER_3 ; 37
+	const PAL_POKER_4 ; 38
+	const PAL_39 ; 39
diff --git a/data/super_palettes.inc b/data/super_palettes.inc
index 4931c86..927554b 100644
--- a/data/super_palettes.inc
+++ b/data/super_palettes.inc
@@ -1,290 +1,59 @@
-SuperPalettes:
-	RGB 28, 28, 28
-	RGB 23, 21, 16
-	RGB 15, 20, 20
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 25, 24, 29
-	RGB 15, 20, 20
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 11, 31, 3
-	RGB 15, 20, 20
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 18, 18, 18
-	RGB 15, 20, 20
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 16, 21, 30
-	RGB 15, 20, 20
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 25, 19, 31
-	RGB 15, 20, 20
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 31, 20, 0
-	RGB 15, 20, 20
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 12, 28, 22
-	RGB 15, 20, 20
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 31, 17, 21
-	RGB 15, 20, 20
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 26, 10, 6
-	RGB 15, 20, 20
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 18, 14, 31
-	RGB 15, 20, 20
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 29, 26, 3
-	RGB 15, 20, 20
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 21, 14, 9
-	RGB 15, 20, 20
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 12, 28, 22
-	RGB 15, 20, 20
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 7, 7, 7
-	RGB 2, 3, 3
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 30, 22, 17
-	RGB 16, 14, 19
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 18, 20, 27
-	RGB 11, 15, 23
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 31, 20, 10
-	RGB 26, 10, 6
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 21, 25, 29
-	RGB 14, 19, 25
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 27, 22, 24
-	RGB 21, 15, 23
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 28, 20, 15
-	RGB 21, 14, 9
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 20, 26, 16
-	RGB 9, 20, 11
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 30, 22, 24
-	RGB 28, 15, 21
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 31, 28, 14
-	RGB 26, 20, 0
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 26, 21, 22
-	RGB 15, 15, 18
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 23, 19, 13
-	RGB 14, 12, 17
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 16, 18, 21
-	RGB 10, 12, 18
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 22, 15, 16
-	RGB 17, 2, 5
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 15, 20, 20
-	RGB 5, 16, 16
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 23, 15, 19
-	RGB 14, 4, 12
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 20, 17, 18
-	RGB 18, 13, 11
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 23, 21, 16
-	RGB 12, 12, 10
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 21, 25, 29
-	RGB 30, 22, 24
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 26, 23, 16
-	RGB 29, 14, 9
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 18, 18, 18
-	RGB 10, 10, 10
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 30, 26, 15
-	RGB 9, 20, 11
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 30, 26, 15
-	RGB 26, 20, 0
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 30, 26, 15
-	RGB 26, 10, 6
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 20, 26, 31
-	RGB 17, 23, 10
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 24, 20, 10
-	RGB 21, 0, 4
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 31, 20, 10
-	RGB 21, 0, 4
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 30, 26, 16
-	RGB 16, 12, 9
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 15, 28, 26
-	RGB 12, 22, 26
-	RGB 3, 16, 14
-
-	RGB 28, 28, 28
-	RGB 15, 28, 26
-	RGB 23, 24, 24
-	RGB 4, 4, 4
-
-	RGB 31, 31, 24
-	RGB 7, 27, 19
-	RGB 26, 20, 10
-	RGB 19, 12, 8
-
-	RGB 28, 28, 28
-	RGB 31, 28, 14
-	RGB 30, 22, 24
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 16, 18, 21
-	RGB 10, 12, 18
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 23, 21, 16
-	RGB 12, 12, 10
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 31, 20, 10
-	RGB 26, 10, 6
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 26, 21, 22
-	RGB 26, 10, 6
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 30, 27, 4
-	RGB 24, 20, 11
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 27, 15, 21
-	RGB 24, 20, 11
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 16, 19, 29
-	RGB 24, 20, 11
-	RGB 4, 4, 4
-
-	RGB 28, 28, 28
-	RGB 30, 22, 24
-	RGB 18, 18, 18
-	RGB 16, 10, 7
-
-	RGB 28, 28, 28
-	RGB 21, 25, 29
-	RGB 18, 18, 18
-	RGB 16, 10, 7
-
-	RGB 28, 28, 28
-	RGB 20, 26, 16
-	RGB 18, 18, 18
-	RGB 16, 10, 7
-
-	RGB 28, 28, 28
-	RGB 31, 28, 14
-	RGB 18, 18, 18
-	RGB 16, 10, 7
-
-	RGB 28, 28, 28
-	RGB 18, 18, 18
-	RGB 26, 10, 6
-	RGB 4, 4, 4
+SuperPalettes::
+	RGB 28,28,28, 23,21,16, 15,20,20, 04,04,04 ; TOWN_00
+	RGB 28,28,28, 25,24,29, 15,20,20, 04,04,04 ; TOWN_01
+	RGB 28,28,28, 11,31,03, 15,20,20, 04,04,04 ; TOWN_02
+	RGB 28,28,28, 18,18,18, 15,20,20, 04,04,04 ; TOWN_03
+	RGB 28,28,28, 16,21,30, 15,20,20, 04,04,04 ; TOWN_04
+	RGB 28,28,28, 25,19,31, 15,20,20, 04,04,04 ; TOWN_05
+	RGB 28,28,28, 31,20,00, 15,20,20, 04,04,04 ; TOWN_06
+	RGB 28,28,28, 12,28,22, 15,20,20, 04,04,04 ; TOWN_07
+	RGB 28,28,28, 31,17,21, 15,20,20, 04,04,04 ; TOWN_08
+	RGB 28,28,28, 26,10,06, 15,20,20, 04,04,04 ; TOWN_09
+	RGB 28,28,28, 18,14,31, 15,20,20, 04,04,04 ; TOWN_0A
+	RGB 28,28,28, 29,26,03, 15,20,20, 04,04,04 ; TOWN_0B
+	RGB 28,28,28, 21,14,09, 15,20,20, 04,04,04 ; TOWN_0C
+	RGB 28,28,28, 12,28,22, 15,20,20, 04,04,04 ; TOWN_0D
+	RGB 28,28,28, 07,07,07, 02,03,03, 04,04,04 ; BLACK
+	RGB 28,28,28, 30,22,17, 16,14,19, 04,04,04 ; MEWMON
+	RGB 28,28,28, 18,20,27, 11,15,23, 04,04,04 ; BLUEMON
+	RGB 28,28,28, 31,20,10, 26,10,06, 04,04,04 ; REDMON
+	RGB 28,28,28, 21,25,29, 14,19,25, 04,04,04 ; CYANMON
+	RGB 28,28,28, 27,22,24, 21,15,23, 04,04,04 ; PURPLEMON
+	RGB 28,28,28, 28,20,15, 21,14,09, 04,04,04 ; BROWNMON
+	RGB 28,28,28, 20,26,16, 09,20,11, 04,04,04 ; GREENMON
+	RGB 28,28,28, 30,22,24, 28,15,21, 04,04,04 ; PINKMON
+	RGB 28,28,28, 31,28,14, 26,20,00, 04,04,04 ; YELLOWMON
+	RGB 28,28,28, 26,21,22, 15,15,18, 04,04,04 ; GREYMON
+	RGB 28,28,28, 23,19,13, 14,12,17, 04,04,04 ; DARKMEWMON
+	RGB 28,28,28, 16,18,21, 10,12,18, 04,04,04 ; DARKBLUEMON
+	RGB 28,28,28, 22,15,16, 17,02,05, 04,04,04 ; DARKREDMON
+	RGB 28,28,28, 15,20,20, 05,16,16, 04,04,04 ; DARKCYANMON
+	RGB 28,28,28, 23,15,19, 14,04,12, 04,04,04 ; DARKPURPLEMON
+	RGB 28,28,28, 20,17,18, 18,13,11, 04,04,04 ; DARKBROWNMON
+	RGB 28,28,28, 23,21,16, 12,12,10, 04,04,04 ; TANMON
+	RGB 28,28,28, 21,25,29, 30,22,24, 04,04,04 ; BLUEPINKMON
+	RGB 28,28,28, 26,23,16, 29,14,09, 04,04,04 ; ORANGEMON
+	RGB 28,28,28, 18,18,18, 10,10,10, 04,04,04 ; DARKGREYMON
+	RGB 28,28,28, 30,26,15, 09,20,11, 04,04,04 ; GREENBAR
+	RGB 28,28,28, 30,26,15, 26,20,00, 04,04,04 ; YELLOWBAR
+	RGB 28,28,28, 30,26,15, 26,10,06, 04,04,04 ; REDBAR
+	RGB 28,28,28, 20,26,31, 17,23,10, 04,04,04 ; TOWN_MAP
+	RGB 28,28,28, 24,20,10, 21,00,04, 04,04,04 ; LOGO_1
+	RGB 28,28,28, 31,20,10, 21,00,04, 04,04,04 ; LOGO_2
+	RGB 28,28,28, 30,26,16, 16,12,09, 04,04,04 ; GAME_FREAK
+	RGB 28,28,28, 15,28,26, 12,22,26, 03,16,14 ; INTRO_WATER
+	RGB 28,28,28, 15,28,26, 23,24,24, 04,04,04 ; INTRO_LAPRAS
+	RGB 31,31,24, 07,27,19, 26,20,10, 19,12,08 ; INTRO_FOREST
+	RGB 28,28,28, 31,28,14, 30,22,24, 04,04,04 ; INTRO_PURIN_PIKACHU
+	RGB 28,28,28, 16,18,21, 10,12,18, 04,04,04 ; INTRO_KAMEX
+	RGB 28,28,28, 23,21,16, 12,12,10, 04,04,04 ; INTRO_FUSHIGIBANA
+	RGB 28,28,28, 31,20,10, 26,10,06, 04,04,04 ; INTRO_LIZARDON
+	RGB 28,28,28, 26,21,22, 26,10,06, 04,04,04 ; SLOTS_1
+	RGB 28,28,28, 30,27,04, 24,20,11, 04,04,04 ; SLOTS_2
+	RGB 28,28,28, 27,15,21, 24,20,11, 04,04,04 ; SLOTS_3
+	RGB 28,28,28, 16,19,29, 24,20,11, 04,04,04 ; SLOTS_4
+	RGB 28,28,28, 30,22,24, 18,18,18, 16,10,07 ; POKER_1
+	RGB 28,28,28, 21,25,29, 18,18,18, 16,10,07 ; POKER_2
+	RGB 28,28,28, 20,26,16, 18,18,18, 16,10,07 ; POKER_3
+	RGB 28,28,28, 31,28,14, 18,18,18, 16,10,07 ; POKER_4
+	RGB 28,28,28, 18,18,18, 26,10,06, 04,04,04 ; 39
diff --git a/macros.asm b/macros.asm
index 07e5b41..e985105 100644
--- a/macros.asm
+++ b/macros.asm
@@ -1,7 +1,9 @@
+INCLUDE "macros/enum.asm"
+INCLUDE "macros/predef.asm"
+;INCLUDE "macros/rst.asm"
+INCLUDE "macros/data.asm"
 INCLUDE "macros/code.asm"
+INCLUDE "macros/gfx.asm"
 INCLUDE "macros/coords.asm"
-INCLUDE "macros/data.asm"
-INCLUDE "macros/enum.asm"
 INCLUDE "macros/farcall.asm"
-INCLUDE "macros/predef.asm"
 INCLUDE "macros/wram.asm"
diff --git a/macros/data.asm b/macros/data.asm
index aa7233d..241e52a 100644
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -127,7 +127,3 @@ rept \1
 x = x + DIV(32768, \1) ; a circle has 65536 "degrees"
 endr
 ENDM
-
-RGB: MACRO
-	dw (\3 << 10 | \2 << 5 | \1)
-ENDM
diff --git a/macros/gfx.asm b/macros/gfx.asm
index 16c7d9b..ff07ba4 100644
--- a/macros/gfx.asm
+++ b/macros/gfx.asm
@@ -1,2 +1,19 @@
+RGB: MACRO
+rept _NARG / 3
+	dw palred (\1) + palgreen (\2) + palblue (\3)
+	shift
+	shift
+	shift
+endr
+ENDM
+
+palred   EQUS "(1 << 0) *"
+palgreen EQUS "(1 << 5) *"
+palblue  EQUS "(1 << 10) *"
+
+palettes EQUS "* PALETTE_SIZE"
+palette  EQUS "+ PALETTE_SIZE *"
+color    EQUS "+ PAL_COLOR_SIZE *"
+
 tiles EQUS "* LEN_2BPP_TILE"
 tile  EQUS "+ LEN_2BPP_TILE *"
diff --git a/macros/wram.asm b/macros/wram.asm
index 7e7505f..dd9b76b 100644
--- a/macros/wram.asm
+++ b/macros/wram.asm
@@ -1,4 +1,3 @@
-
 flag_array: MACRO
 	ds ((\1) + 7) / 8
 ENDM