git friendly mode constants

Author: zohassadar

src/constants.asm

@@ -52,40 +52,42 @@ BUTTON_SELECT := $20
 BUTTON_START := $10
 BUTTON_DPAD := BUTTON_UP | BUTTON_DOWN | BUTTON_LEFT | BUTTON_RIGHT
 
-MODE_TETRIS := 0
-MODE_TSPINS := 1
-MODE_SEED := 2
-MODE_PARITY := 3
-MODE_PACE := 4
-MODE_PRESETS := 5
-MODE_TYPEB := 6
-MODE_FLOOR := 7
-MODE_CRUNCH := 8
-MODE_TAP := 9
-MODE_TRANSITION := 10
-MODE_TAPQTY := 11
-MODE_CHECKERBOARD := 12
-MODE_GARBAGE := 13
-MODE_DROUGHT := 14
-MODE_DAS := 15
-MODE_KILLX2 := 16
-MODE_INVISIBLE := 17
-MODE_HARDDROP := 18
-MODE_SPEED_TEST := 19
-MODE_SCORE_DISPLAY := 20
-MODE_HZ_DISPLAY := 21
-MODE_INPUT_DISPLAY := 22
-MODE_DISABLE_FLASH := 23
-MODE_DISABLE_PAUSE := 24
-MODE_GOOFY := 25
-MODE_DEBUG := 26
-MODE_LINECAP := 27
-MODE_DASONLY := 28
-MODE_QUAL := 29
-MODE_PAL := 30
-
-MODE_QUANTITY := 31
-MODE_GAME_QUANTITY := 19
+.enum
+MODE_TETRIS
+MODE_TSPINS
+MODE_SEED
+MODE_PARITY
+MODE_PACE
+MODE_PRESETS
+MODE_TYPEB
+MODE_FLOOR
+MODE_CRUNCH
+MODE_TAP
+MODE_TRANSITION
+MODE_TAPQTY
+MODE_CHECKERBOARD
+MODE_GARBAGE
+MODE_DROUGHT
+MODE_DAS
+MODE_KILLX2
+MODE_INVISIBLE
+MODE_HARDDROP
+MODE_SPEED_TEST
+MODE_SCORE_DISPLAY
+MODE_HZ_DISPLAY
+MODE_INPUT_DISPLAY
+MODE_DISABLE_FLASH
+MODE_DISABLE_PAUSE
+MODE_GOOFY
+MODE_DEBUG
+MODE_LINECAP
+MODE_DASONLY
+MODE_QUAL
+MODE_PAL
+.endenum
+
+MODE_QUANTITY = MODE_PAL + 1
+MODE_GAME_QUANTITY = MODE_SPEED_TEST
 
 SCORING_CLASSIC := 0 ; for scoringModifier
 SCORING_LETTERS := 1
@@ -107,7 +109,39 @@ MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
 
 ; menuConfigSizeLookup
 ; menu ram is defined at menuRAM in ./ram.asm
-.define MENUSIZES $0, $0, $0, $0, $F, $7, $8, $C, $F, $20, $10, $1F, $8, $4, $12, $10, $0, $0, $0, $0, $4, $1, $1, $1, $1, $1, $1, $1, $1, $1, $1
+.macro MENUSIZES 
+    .byte $0    ; MODE_TETRIS
+    .byte $0    ; MODE_TSPINS
+    .byte $0    ; MODE_SEED
+    .byte $0    ; MODE_PARITY
+    .byte $F    ; MODE_PACE
+    .byte $7    ; MODE_PRESETS
+    .byte $8    ; MODE_TYPEB
+    .byte $C    ; MODE_FLOOR
+    .byte $F    ; MODE_CRUNCH
+    .byte $20   ; MODE_TAP
+    .byte $10   ; MODE_TRANSITION
+    .byte $1F   ; MODE_TAPQTY
+    .byte $8    ; MODE_CHECKERBOARD
+    .byte $4    ; MODE_GARBAGE
+    .byte $12   ; MODE_DROUGHT
+    .byte $10   ; MODE_DAS
+    .byte $0    ; MODE_KILLX2
+    .byte $0    ; MODE_INVISIBLE
+    .byte $0    ; MODE_HARDDROP
+    .byte $0    ; MODE_SPEED_TEST
+    .byte $4    ; MODE_SCORE_DISPLAY
+    .byte $1    ; MODE_HZ_DISPLAY
+    .byte $1    ; MODE_INPUT_DISPLAY
+    .byte $1    ; MODE_DISABLE_FLASH
+    .byte $1    ; MODE_DISABLE_PAUSE
+    .byte $1    ; MODE_GOOFY
+    .byte $1    ; MODE_DEBUG
+    .byte $1    ; MODE_LINECAP
+    .byte $1    ; MODE_DASONLY
+    .byte $1    ; MODE_QUAL
+    .byte $1    ; MODE_PAL
+.endmacro
 
 .macro MODENAMES
     .byte   "TETRIS"

src/gamemode/gametypemenu/menu.asm

@@ -305,7 +305,7 @@ menuConfigControls:
         rts
 
 menuConfigSizeLookup:
-        .byte   MENUSIZES
+        MENUSIZES
 
 assertValues:
         ; make sure you can only have block or qual