Adds functionality for custom oam shapes

data/rom_1.s

@@ -751,7 +751,7 @@ gBallFlashPalette:: @ 0x08137F14
 	.incbin "baserom.gba", 0x137F14, 0x100
 
 gCaptureBallTilesGfx:: @ 0x08138014
-	.incbin "graphics/stage/main/capture_ball_variants.4bpp"
+	.incbin "graphics/stage/main/ball_open_to_catch.4bpp"
 	.space 0x20
 
 gDusclopsBonusClear_Gfx:: @ 0x08138834
@@ -1361,8 +1361,8 @@ gKyogreBodySprites_After15:: @ 0x0849B8CC
 gGroudonBoardBackgroundGfx:: @ 0x0849F1CC
 	.incbin "baserom.gba", 0x49F1CC, 0x2020
 
-gGroudonBoulderSpriteFrames:: @ 0x084A11EC
-	.incbin "baserom.gba", 0x4A11EC, 0x5D00
+gGroudonBoardBoulders_Gfx:: @ 0x084A11EC
+	.incbin "graphics/stage/groudon/boulders.4bpp";
 
 gRayquazaMinionOrbFrames:: @ 0x084A6EEC
 	.incbin "baserom.gba", 0x4A6EEC, 0x1680

graphics/stage/groudon/boulder_shape.json

@@ -0,0 +1,24 @@
+{
+  "kind": "oam-shape",
+  "version":1,
+  "pngsize": "5x5",
+  "pieces": [
+    {
+      "pos":"0,0",
+      "size": "1x1",
+      "spacer":true
+    },
+    {
+      "pos":"1,0",
+      "size": "4x1"
+    },
+    {
+      "pos":"0,1",
+      "size": "1x4"
+    },
+    {
+      "pos":"1,1",
+      "size": "4x4"
+    }
+  ]
+}

graphics/stage/groudon/crystal_shape.json

@@ -0,0 +1,24 @@
+{
+  "kind": "oam-shape",
+  "version":1,
+  "pngsize": "3x3",
+  "pieces": [
+    {
+      "pos":"0,0",
+      "size": "1x2"
+    },
+    {
+      "pos":"0,2",
+      "size": "1x1",
+      "spacer":true
+    },
+    {
+      "pos":"1,2",
+      "size": "2x1"
+    },
+    {
+      "pos":"1,0",
+      "size": "2x2"
+    }
+  ]
+}

graphics/stage/groudon/groudon_head_shape.json

@@ -0,0 +1,42 @@
+{
+  "kind": "oam-shape",
+  "version":1,
+  "pngsize": "4x4",
+  "pieces": [
+    {
+      "pos":"0,0",
+      "size": "1x1",
+      "spacer":true
+    },
+    {
+      "_comment":"Fins",
+      "pos":"1,0",
+      "size": "2x1"
+    },
+    {
+      "pos":"3,0",
+      "size": "1x1",
+      "spacer":true
+    },
+    {
+      "_comment":"Face",
+      "pos":"0,1",
+      "size": "4x2"
+    },
+    {
+      "pos":"0,3",
+      "size": "1x1",
+      "spacer":true
+    },
+    {
+      "_comment":"Chin",
+      "pos":"1,3",
+      "size": "2x1"
+    },
+    {
+      "pos":"3,3",
+      "size": "1x1",
+      "spacer":true
+    }
+  ]
+}

graphics/stage/groudon/groudon_stage_gfx.json

@@ -83,80 +83,16 @@
           "width": 6
         },
         {
-          "segfile": "intro_sprite_rock_1_top",
-          "width": 4
-        },
-        {
-          "segfile": "intro_sprite_rock_1_left",
-          "width": 1
-        },
-        {
-          "segfile": "intro_sprite_rock_1_right",
-          "width": 4
-        },
-        {
-          "segfile": "intro_sprite_rock_2_top",
-          "width": 4
-        },
-        {
-          "segfile": "intro_sprite_rock_2_left",
-          "width": 1
-        },
-        {
-          "segfile": "intro_sprite_rock_2_right",
-          "width": 4
-        },
-        {
-          "segfile": "intro_sprite_rock_3_top",
-          "width": 4
-        },
-        {
-          "segfile": "intro_sprite_rock_3_left",
-          "width": 1
-        },
-        {
-          "segfile": "intro_sprite_rock_3_right",
-          "width": 4
+          "segfile": "intro_sprite_boulders",
+          "oamshape": "boulder_shape.json"
         },
         {
           "segfile": "intro_sprite_quarter_circle",
           "width": 8
         },
         {
-          "segfile": "intro_sprite_crystal_1_left",
-          "width": 1
-        },
-        {
-          "segfile": "intro_sprite_crystal_1_bottom",
-          "width": 2
-        },
-        {
-          "segfile": "intro_sprite_crystal_1_top_right",
-          "width": 2
-        },
-        {
-          "segfile": "intro_sprite_crystal_2_left",
-          "width": 1
-        },
-        {
-          "segfile": "intro_sprite_crystal_2_bottom",
-          "width": 2
-        },
-        {
-          "segfile": "intro_sprite_crystal_2_top_right",
-          "width": 2
-        },
-        {
-          "segfile": "intro_sprite_crystal_3_left",
-          "width": 1
-        },
-        {
-          "segfile": "intro_sprite_crystal_3_bottom",
-          "width": 2
-        },
-        {
-          "segfile": "intro_sprite_crystal_3_top_right",
-          "width": 2
+          "segfile": "intro_sprite_crystals",
+          "oamshape": "crystal_shape.json"
         },
         {
           "segfile": "intro_sprite_flame_pillars",
@@ -171,16 +107,8 @@
           "width": 4
         },
         {
-          "segfile": "intro_sprite_groudon_fins",
-          "width": 2
-        },
-        {
-          "segfile": "intro_sprite_groudon_face",
-          "width": 4
-        },
-        {
-          "segfile": "intro_sprite_groudon_chin",
-          "width": 2
+          "segfile": "intro_sprite_head_1",
+          "oamshape": "groudon_head_shape.json"
         },
         {
           "segfile": "intro_sprite_groudon_body",
@@ -195,16 +123,8 @@
           "width": 2
         },
         {
-          "segfile": "intro_sprite_groudon_fins_2",
-          "width": 2
-        },
-        {
-          "segfile": "intro_sprite_groudon_face_2",
-          "width": 4
-        },
-        {
-          "segfile": "intro_sprite_groudon_chin_2",
-          "width": 2
+          "segfile": "intro_sprite_head_2",
+          "oamshape": "groudon_head_shape.json"
         },
         {
           "segfile": "intro_sprite_groudon_leg_2",
@@ -243,40 +163,8 @@
           "width": 2
         },
         {
-          "segfile": "intro_sprite_groudon_fin_3",
-          "width": 2
-        },
-        {
-          "segfile": "intro_sprite_groudon_face_3",
-          "width": 4
-        },
-        {
-          "segfile": "intro_sprite_groudon_chin_3",
-          "width": 2
-        },
-        {
-          "segfile": "intro_sprite_groudon_profile_fin",
-          "width": 2
-        },
-        {
-          "segfile": "intro_sprite_groudon_profile_face",
-          "width": 4
-        },
-        {
-          "segfile": "intro_sprite_groudon_profile_chin",
-          "width": 2
-        },
-        {
-          "segfile": "intro_sprite_groudon_quarter_fin",
-          "width": 2
-        },
-        {
-          "segfile": "intro_sprite_groudon_quarter_face",
-          "width": 4
-        },
-        {
-          "segfile": "intro_sprite_groudon_quarter_chin",
-          "width": 2
+          "segfile": "intro_sprite_face_turn",
+          "oamshape": "groudon_head_shape.json"
         },
         {
           "segfile": "intro_sprite_rock_bits_2",
@@ -287,28 +175,8 @@
           "width": 2
         },
         {
-          "segfile": "intro_sprite_groudon_yell_fin",
-          "width": 2
-        },
-        {
-          "segfile": "intro_sprite_groudon_yell_face",
-          "width": 4
-        },
-        {
-          "segfile": "intro_sprite_groudon_yell_chin",
-          "width": 2
-        },
-        {
-          "segfile": "intro_sprite_groudon_yell_fin_2",
-          "width": 2
-        },
-        {
-          "segfile": "intro_sprite_groudon_yell_face_2",
-          "width": 4
-        },
-        {
-          "segfile": "intro_sprite_groudon_yell_chin_2",
-          "width": 2
+          "segfile": "intro_sprite_face_yell",
+          "oamshape": "groudon_head_shape.json"
         },
         {
           "segfile": "intro_sprite_groudon_arms",
@@ -347,6 +215,10 @@
           "width": 7
         }
       ]
+    },
+    {
+      "gfx_filename": "boulders",
+      "oamshape": "boulder_shape.json"
     }
   ]
 }

graphics/stage/main/ball_open_to_catch.json

@@ -0,0 +1,41 @@
+{
+  "kind": "oam-shape",
+  "version":1,
+  "pngsize": "3x6",
+  "pieces": [
+    {
+      "pos":"0,0",
+      "size": "2x2"
+    },
+    {
+      "pos":"2,0",
+      "size": "1x2"
+    },
+    {
+      "pos":"0,2",
+      "size": "2x1"
+    },
+    {
+      "pos":"2,2",
+      "size": "1x1"
+      "spacer":true
+    },
+    {
+      "pos":"0,3",
+      "size": "2x2"
+    },
+    {
+      "pos":"2,3",
+      "size": "1x2"
+    },
+    {
+      "pos":"0,5",
+      "size": "1x1"
+      "spacer":true
+    },
+    {
+      "pos":"1,5",
+      "size": "2x1"
+    }
+  ]
+}