Sprite groups Array Constant tagging

asm/macros/sprite_oam.inc

@@ -11,3 +11,12 @@
     .4byte ( ((\y) & 0xFF) | (((\affineMode) & 0x3) << 8) | (((\objMode) & 0x3) << 10) | (((\mosaic) & 0x1) << 12) | (((\bpp) & 0x1) << 13) | (((__shape) & 0x3) << 14) | (((\x) & 0x1FF) << 16) | (((\matrixNum) & 0x7) << 25) | (((\hFlip) & 0x1) << 28) | (((\vFlip) & 0x1) << 29) | (((__size) & 0x3) << 30) )
     .2byte ( ((\tileNum) & 0x3FF) | (((\priority) & 0x3) << 10) | (((\paletteNum) & 0xF) << 12) )
     .endm
+
+    @ for generating sprite addresses in Rom based on indexes.
+    @ Takes in a comma separated list of indexes.
+    .macro spriteGroupAddrs indexes:vararg
+        .irp idx,\indexes
+            .set __addr, gMain_spriteGroups + ((\idx) * 0xB8)
+            .4byte (__addr)
+        .endr
+    .endm

data/rom_1.s

@@ -982,10 +982,10 @@ gSapphirePainterPalette:: @ 0x081BFCE4
 gRubyBoardPalette:: @ 0x081BFEE4
 	.incbin "baserom.gba", 0x1BFEE4, 0x180
 
-gDefaultBallPalette:: @ 0x081C0064
+gDefaultTimerPalette:: @ 0x081C0064
 	.incbin "baserom.gba", 0x1C0064, 0x80
 
-gPortraitGenericPalettes:: @ 0x081C00E4
+gLocationPalettes:: @ 0x081C00E4
 	.incbin "baserom.gba", 0x1C00E4, 0x200
 
 gPortraitAnimPalettes:: @ 0x081C02E4
@@ -1319,13 +1319,13 @@ gSapphireBumperLeft_Gfx:: @ 0x0847A40C
 gSapphireBumperLeftHit_Gfx:: @ 0x0847D10C
 	.incbin "baserom.gba", 0x47D10C, 0xE00
 
-gRubyRampGateTileGfx:: @ 0x0847DF0C
+gRubyMakuhitaGfx:: @ 0x0847DF0C
 	.incbin "baserom.gba", 0x47DF0C, 0x1E00
 
 gSideBumperGfx:: @ 0x0847FD0C
 	.incbin "baserom.gba", 0x47FD0C, 0x200
 
-gShopDigitTilesGfx:: @ 0x0847FF0C
+gShopPortraitOverlayGfx:: @ 0x0847FF0C
 	.incbin "baserom.gba", 0x47FF0C, 0xF00
 
 gDecimalDigitTilesGfx:: @ 0x08480E0C
@@ -1340,7 +1340,7 @@ gRubyTravelVolbeat_Gfx:: @ 0x08483D8C
 gSapphireTravelIllumise_Gfx:: @ 0x08488A0C
 	.incbin "baserom.gba", 0x488A0C, 0x4C80
 
-gPortraitGenericGraphics:: @ 0x0848D68C
+gLocationPortraitGfx:: @ 0x0848D68C
 	.incbin "baserom.gba", 0x48D68C, 0x2700
 
 gCaptureModeTilesGfx:: @ 0x0848FD8C
@@ -1376,10 +1376,10 @@ gRayquazaSpriteSheet:: @ 0x084AA18C
 gRayquazaBodyVariantTiles:: @ 0x084AA9EC
 	.incbin "baserom.gba", 0x4AA9EC, 0x5000
 
-gSphealScoreCounterDigitSprites:: @ 0x084AF9EC
+gSphealNetGfx:: @ 0x084AF9EC
 	.incbin "baserom.gba", 0x4AF9EC, 0x600
 
-gSphealExtendedScoreSprites:: @ 0x084AFFEC
+gSphealNetFrontGfx:: @ 0x084AFFEC
 	.incbin "baserom.gba", 0x4AFFEC, 0x480
 
 gSphealFlyingEnemyVariantSprites:: @ 0x084B046C

include/constants/board/main_board.h

@@ -137,4 +137,26 @@ enum BoardStateDispatchStates{
     BOARD_STATE_DISPATCHER_STATE_CHANGING = 2,
 };
 
+enum BannerGfxModes{
+    BANNER_MODE_NONE = 0,
+    BANNER_MODE_CHINCHOU_CATCH_BURST = 1,
+    BANNER_MODE_CATCH_EM = 2,
+    BANNER_MODE_EVOLUTION = 3,
+    BANNER_MODE_TRAVEL = 4,
+    BANNER_MODE_JIRACHI = 5,
+    BANNER_MODE_LOTAD_CATCH_BURST = 6,
+    BANNER_MODE_SHROOMISH_CATCH_BURST = 7,
+};
+
+enum OutlaneSide{
+    OUTLANE_LEFT = 1,
+    OUTLANE_RIGHT = 2
+};
+
+enum PikaCoverage {
+    PIKA_LEFT_SIDE = 0,
+    PIKA_RIGHT_SIDE = 1,
+    PIKA_BOTH_SIDES = 2
+};
+
 #endif // GUARD_CONSTANTS_MAIN_BOARD_H

include/constants/board/prize_definitions.h

@@ -21,10 +21,10 @@
 #define    PRIZE_BALL_UPGRADE_C 12
 #define    PRIZE_BALL_UPGRADE_TO_MASTER 13
 
-//Note Prize 14-16 unused
-#define    PRIZE_14 14
-#define    PRIZE_15 15
-#define    PRIZE_16 16
+//Note Prize 14-16 unused in shop/roulette
+#define    PRIZE_14 14 // 'Start Slot' graphic
+#define    PRIZE_15 15 // Goto next graphic (up arrow)
+#define    PRIZE_16 16 // Travel ramp indicator graphic
 
 #define    PRIZE_10_COINS 17
 #define    PRIZE_30_COINS 18