Dump/split board intro sprites (gUnknown_0845A48C, gUnknown_0845F9EC) (#194)

* ruby board

* Sapphire Intro, naming

* remove unneeded incbin comment

data/rom_1.s

@@ -1787,25 +1787,25 @@ gUnknown_083C806C:: @ 0x083C806C
 
 .include "data/graphics/mon_hatch_sprites.inc"
 
-gUnknown_083EB84C:: @ 0x083EB84C
+gPickupIcon1_Gfx:: @ 0x083EB84C
 	.incbin "graphics/board_pickups/icon1.4bpp"
-gUnknown_083ED64C:: @ 0x083ED64C
+gPickupIcon2_Gfx:: @ 0x083ED64C
 	.incbin "graphics/board_pickups/icon2.4bpp"
-gUnknown_083EF44C:: @ 0x083EF44C
+gPickupIcon3_Gfx:: @ 0x083EF44C
 	.incbin "graphics/board_pickups/icon3.4bpp"
-gUnknown_083F124C:: @ 0x083F124C
+gPickupIcon9_Gfx:: @ 0x083F124C
 	.incbin "graphics/board_pickups/icon9.4bpp"
-gUnknown_083F304C:: @ 0x083F304C
+gPickupIcon4_Gfx:: @ 0x083F304C
 	.incbin "graphics/board_pickups/icon4.4bpp"
-gUnknown_083F4E4C:: @ 0x083F4E4C
+gPickupIcon5_Gfx:: @ 0x083F4E4C
 	.incbin "graphics/board_pickups/icon5.4bpp"
-gUnknown_083F6C4C:: @ 0x083F6C4C
+gPickupIcon6_Gfx:: @ 0x083F6C4C
 	.incbin "graphics/board_pickups/icon6.4bpp"
-gUnknown_083F8A4C:: @ 0x083F8A4C
+gPickupIcon10_Gfx:: @ 0x083F8A4C
 	.incbin "graphics/board_pickups/icon10.4bpp"
-gUnknown_083FA84C:: @ 0x083FA84C
+gPickupIcon8_Gfx:: @ 0x083FA84C
 	.incbin "graphics/board_pickups/icon8.4bpp"
-gUnknown_083FC64C:: @ 0x083FC64C
+gPickupIcon7_Gfx:: @ 0x083FC64C
 	.incbin "graphics/board_pickups/icon7.4bpp"
 
 gUnknown_083FE44C:: @ 0x083FE44C
@@ -1822,28 +1822,28 @@ gSapphireBoardWailmer_Gfx:: @ 0x083FFD8C
 
 	.include "data/graphics/mon_catch_sprites.inc"
 
-gUnknown_08447A8C:: @ 0x08447A8C
+gRubyStageGulpin_Gfx:: @ 0x08447A8C
 	.incbin "graphics/stage/ruby/gulpin.4bpp"
 
-gUnknown_0844838C:: @ 0x0844838C
+gMainStageBonusTrap_Gfx:: @ 0x0844838C
 	.incbin "graphics/stage/main/bonus_trap.4bpp"
 
 gUnknown_0844928C:: @ 0x0844928C
 	.incbin "baserom.gba", 0x44928C, 0xB00
 
-gUnknown_08449D8C:: @ 0x08449D8C
+gRubyStageCyndaquil_Gfx:: @ 0x08449D8C
 	.incbin "graphics/stage/ruby/cyndaquil.4bpp"
 
 gUnknown_0844AA0C:: @ 0x0844AA0C
 	.incbin "graphics/stage/main/gunk_0844AA0C.4bpp"
 
-gUnknown_0844F20C:: @ 0x0844F20C
+gSapphireStageBasket_Gfx:: @ 0x0844F20C
 	.incbin "graphics/stage/sapphire/seedot_basket.4bpp"
 
-gUnknown_0844F98C:: @ 0x0844F98C
+gKecleonStageKecleon_Gfx:: @ 0x0844F98C
 	.incbin "graphics/stage/kecleon/kecleon.4bpp"
 
-gUnknown_0845588C:: @ 0x0845588C
+gKecleonStageKecleonFx_Gfx:: @ 0x0845588C
 	.incbin "graphics/stage/kecleon/kecleon_fx.4bpp"
 
 gUnknown_08455E8C:: @ 0x08455E8C
@@ -1855,17 +1855,17 @@ gUnknown_0845648C:: @ 0x0845648C
 gUnknown_0845690C:: @ 0x0845690C
 	.incbin "graphics/stage/misc/gunk_0845690C.4bpp"
 
-gUnknown_0845710C:: @ 0x0845710C
+gRubyStageNuzleaf_Gfx:: @ 0x0845710C
 	.incbin "graphics/stage/ruby/nuzleaf.4bpp"
 
 gUnknown_0845A08C:: @ 0x0845A08C
 	.incbin "baserom.gba", 0x45A08C, 0x400
 
-gUnknown_0845A48C:: @ 0x0845A48C
+gRubyIntroSprites_Gfx:: @ 0x0845A48C
-	.incbin "baserom.gba", 0x45A48C, 0x5560
+	.incbin "graphics/stage/ruby/intro_sprite.4bpp"
 
-gUnknown_0845F9EC:: @ 0x0845F9EC
+gSapphireIntroSprites_Gfx:: @ 0x0845F9EC
-	.incbin "baserom.gba", 0x45F9EC, 0x5560
+	.incbin "graphics/stage/sapphire/intro_sprite.4bpp"
 
 gUnknown_08464F4C:: @ 0x08464F4C
 	.incbin "baserom.gba", 0x464F4C, 0x26A0

data/rom_2.s

@@ -643,16 +643,16 @@ gUnknown_086AD474:: @ 0x086AD474
 	.4byte gUnknown_08166F84
 
 gUnknown_086AD49C:: @ 0x086AD49C
-	.4byte gUnknown_083EB84C
+	.4byte gPickupIcon1_Gfx
-    .4byte gUnknown_083ED64C
+    .4byte gPickupIcon2_Gfx
-    .4byte gUnknown_083EF44C
+    .4byte gPickupIcon3_Gfx
-    .4byte gUnknown_083F304C
+    .4byte gPickupIcon4_Gfx
-    .4byte gUnknown_083F4E4C
+    .4byte gPickupIcon5_Gfx
-    .4byte gUnknown_083F6C4C
+    .4byte gPickupIcon6_Gfx
-    .4byte gUnknown_083FC64C
+    .4byte gPickupIcon7_Gfx
-    .4byte gUnknown_083FA84C
+    .4byte gPickupIcon8_Gfx
-    .4byte gUnknown_083F124C
+    .4byte gPickupIcon9_Gfx
-    .4byte gUnknown_083F8A4C
+    .4byte gPickupIcon10_Gfx
 
 
 gUnknown_086AD4C4:: @ 0x086AD4C4

graphics/stage/ruby/ruby_gfx.json

@@ -37,20 +37,259 @@
       "mwidth":2,
       "width":8
     },
-    { 
+    {
       "gfx_filename": "gulpin",
       "mwidth":4,
       "oam":true
     },
-    { 
+    {
       "gfx_filename": "cyndaquil",
       "mwidth":4,
       "oam":true
     },
-    { 
+    {
       "gfx_filename": "nuzleaf",
       "mwidth":4,
       "oam":true
+    },
+    {
+      "gfx_filename": "intro_sprite",
+      "segments":
+      [
+        {
+          "segfile":"intro_sprite_flipper",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_ball",
+          "width":2
+        },
+        {
+          "segfile":"intro_sprite_pika_kickback",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_spinner",
+          "oam":true,
+          "mwidth":3,
+          "mheight":3,
+          "width":3
+        },
+        {
+          "segfile":"intro_sprite_charge_indicator_edge",
+          "width":4,
+          "mheight":4,
+          "mwidth":2
+        },
+        {
+          "segfile":"intro_sprite_charge_indicator_center",
+          "width":2
+        },
+        {
+          "segfile":"intro_sprite_location_border_h",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_location_border_v",
+          "width":1
+        },
+        {
+          "segfile":"intro_sprite_catch_mon",
+          "mwidth":2,
+          "mheight":2,
+          "width":6
+        },
+        {
+          "segfile":"intro_sprite_location",
+          "mwidth":2,
+          "mheight":2,
+          "width":6
+        },
+        {
+          "segfile":"intro_sprite_hatch_mon",
+          "oam":true,
+          "mwidth":3,
+          "mheight":3,
+          "width":3
+        },
+        {
+          "segfile":"intro_sprite_explosion_left",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_explosion_right",
+          "width":2
+        },
+        {
+          "segfile":"intro_sprite_evo_pickup",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_pause_select",
+          "width":1
+        },
+        {
+          "segfile":"intro_sprite_pause_text",
+          "width":10
+        },
+        {
+          "segfile":"intro_sprite_coin",
+          "width":2
+        },
+        {
+          "segfile":"intro_sprite_egg",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_ball_upgrade_fx",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_spoink",
+          "oam": true,
+          "mwidth":3,
+          "mheight":4,
+          "width":3
+        },
+        {
+          "segfile":"intro_sprite_spoink_tail",
+          "width":2
+        },
+        {
+          "segfile":"intro_sprite_hatch_cave",
+          "oam":true,
+          "mwidth":6,
+          "mheight":6,
+          "width":6
+        },
+        {
+          "segfile":"intro_sprite_chikorita",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_linoone1",
+          "oam":true,
+          "mwidth":3,
+          "mheight":2,
+          "width":3
+        },
+        {
+          "segfile":"intro_sprite_linoone1_arm",
+          "width":2
+        },
+        {
+          "segfile":"intro_sprite_linoone2",
+          "oam":true,
+          "mwidth":3,
+          "mheight":2,
+          "width":3
+        },
+        {
+          "segfile":"intro_sprite_linoone2_arm",
+          "width":2
+        },
+        {
+          "segfile":"intro_sprite_sharpedo_top_fin",
+          "width":1
+        },
+        {
+          "segfile":"intro_sprite_sharpedo_body",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_sharpedo_side_fin",
+          "width":1
+        },
+        {
+          "segfile":"intro_sprite_chinchou",
+          "width":2
+        },
+        {
+          "segfile":"intro_sprite_shop_door",
+          "oam":true,
+          "mwidth":3,
+          "mheight":4,
+          "width":3
+        },
+        {
+          "segfile":"intro_sprite_cyndaquil",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_makuhita_top",
+          "oam":true,
+          "mwidth":5,
+          "mheight":4,
+          "width":5
+        },
+        {
+          "segfile":"intro_sprite_makuhita_feet",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_gulpin",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_shop_roof",
+          "width":5
+        },
+        {
+          "segfile":"intro_sprite_chikorita_blade",
+          "width":5
+        },
+        {
+          "segfile":"intro_sprite_chikorita_blade_hit_fx",
+          "width":5
+        },
+        {
+          "segfile":"intro_sprite_nuzleaf",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_blank",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_whiscash",
+          "oam":true,
+          "mwidth":6,
+          "mheight":6,
+          "width":6
+        },
+        {
+          "segfile":"intro_sprite_ramp_prize",
+          "width":2
+        },
+        {
+          "segfile":"intro_sprite_burst_fx",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_glint_set_0",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_glint",
+          "width":1
+        },
+        {
+          "segfile":"intro_sprite_glint_set",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_treeko",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_ball_2",
+          "width":2
+        },
+        {
+          "segfile":"intro_sprite_shape",
+          "width":1
+        }
+      ]
     }
   ]
 }

graphics/stage/sapphire/sapphire_gfx.json

@@ -42,6 +42,207 @@
       "gfx_filename": "seedot_basket",
       "mwidth":4,
       "oam":true
+    },
+    {
+      "gfx_filename": "intro_sprite",
+      "segments":
+      [
+        {
+          "segfile":"intro_sprite_flipper",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_ball",
+          "width":2
+        },
+        {
+          "segfile":"intro_sprite_pika_kickback",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_spinner",
+          "oam":true,
+          "mwidth":3,
+          "mheight":3,
+          "width":3
+        },
+        {
+          "segfile":"intro_sprite_charge_indicator_edge",
+          "width":4,
+          "mheight":4,
+          "mwidth":2
+        },
+        {
+          "segfile":"intro_sprite_charge_indicator_center",
+          "width":2
+        },
+        {
+          "segfile":"intro_sprite_location_border_h",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_location_border_v",
+          "width":1
+        },
+        {
+          "segfile":"intro_sprite_catch_mon",
+          "mwidth":2,
+          "mheight":2,
+          "width":6
+        },
+        {
+          "segfile":"intro_sprite_location",
+          "mwidth":2,
+          "mheight":2,
+          "width":6
+        },
+        {
+          "segfile":"intro_sprite_hatch_mon",
+          "oam":true,
+          "mwidth":3,
+          "mheight":3,
+          "width":3
+        },
+        {
+          "segfile":"intro_sprite_explosion_left",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_explosion_right",
+          "width":2
+        },
+        {
+          "segfile":"intro_sprite_evo_pickup",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_pause_select",
+          "width":1
+        },
+        {
+          "segfile":"intro_sprite_pause_text",
+          "width":10
+        },
+        {
+          "segfile":"intro_sprite_coin",
+          "width":2
+        },
+        {
+          "segfile":"intro_sprite_egg",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_ball_upgrade_fx",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_spoink",
+          "oam": true,
+          "mwidth":3,
+          "mheight":4,
+          "width":3
+        },
+        {
+          "segfile":"intro_sprite_spoink_tail",
+          "width":2
+        },
+        {
+          "segfile":"intro_sprite_pelipper",
+          "oam":true,
+          "mwidth":6,
+          "mheight":6,
+          "width":6
+        },
+        {
+          "segfile":"intro_sprite_wailmer",
+          "oam":true,
+          "mwidth":6,
+          "mheight":4,
+          "width":6
+        },
+        {
+          "segfile":"intro_sprite_zigzagoon",
+          "oam":true,
+          "mwidth":6,
+          "mheight":4,
+          "width":6
+        },
+        {
+          "segfile":"intro_sprite_minon",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_plussle",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_shroomish",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_basket",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_seedot",
+          "oam":true,
+          "mwidth":3,
+          "mheight":4,
+          "width":3
+        },
+        {
+          "segfile":"intro_sprite_unk",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_hatch_machine_base",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_shop_charge",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_minun_charge",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_plussle_charge",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_shop_top",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_shop_bottom",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_press_start",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_spacer",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_glint_set",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_treeko",
+          "width":4
+        },
+        {
+          "segfile":"intro_sprite_ball_2",
+          "width":2
+        },
+        {
+          "segfile":"intro_sprite_shape",
+          "width":1
+        }
+      ]
     }
   ]
 }

include/global.h

@@ -983,7 +983,7 @@ extern const u8 gUnknown_08397E6C[];
 extern const u8 gUnknown_083A8EEC[][0x300];
 extern const u8 gUnknown_083BB16C[][0x80];
 extern const u8 gUnknown_083BD36C[][0x200];
-extern const u8 gUnknown_0844838C[][0x300];
+extern const u8 gMainStageBonusTrap_Gfx[][0x300];
 extern const u8 gUnknown_0848D68C[][0x300];
 extern const u8 gUnknown_084C00EC[][0x80];
 extern const u8 gUnknown_084C07EC[];

src/board_process3_kecleon.c

@@ -31,8 +31,8 @@ struct Unk_086AEA70
 
 extern const u8 gKecleonBonusClear_Gfx[];
 extern const u16 gUnknown_08327994[];
-extern const u8 gUnknown_0844F98C[][0x280];
+extern const u8 gKecleonStageKecleon_Gfx[][0x280];
-extern const u8 gUnknown_0845588C[][0x100];
+extern const u8 gKecleonStageKecleonFx_Gfx[][0x100];
 extern struct SongHeader se_unk_fc;
 extern struct SongHeader se_unk_fd;
 extern struct SongHeader se_unk_fe;
@@ -789,7 +789,7 @@ void sub_36CB4(void)
 
     sp0 = gCurrentPinballGame->unk3DF;
     gCurrentPinballGame->unk3DF = gUnknown_086AE718[gCurrentPinballGame->unk3E2][2];
-    DmaCopy16(3, gUnknown_0844F98C[sp0], (void *)0x6010920, 0x280);
+    DmaCopy16(3, gKecleonStageKecleon_Gfx[sp0], (void *)0x6010920, 0x280);
     sp4 = gUnknown_086AE718[gCurrentPinballGame->unk3E2][0];
     spriteGroup->baseX = gCurrentPinballGame->unk3E8 / 10 + baseX - gCurrentPinballGame->unk58;
     spriteGroup->baseY = gCurrentPinballGame->unk3EA / 10 + baseY - gCurrentPinballGame->unk5A;
@@ -899,7 +899,7 @@ void sub_36CB4(void)
     var0 = gCurrentPinballGame->unk3F8 * 3;
     var1 = gCurrentPinballGame->unk3FC / 8 - 2;
 
-    DmaCopy16(3, gUnknown_0845588C[var0 - var1], (void *)0x6010BA0, 0x100);
+    DmaCopy16(3, gKecleonStageKecleonFx_Gfx[var0 - var1], (void *)0x6010BA0, 0x100);
     if (gCurrentPinballGame->unk3FC > 0)
     {
         gCurrentPinballGame->unk3FC--;

src/pinball_game_main.c

@@ -54,7 +54,7 @@ extern const u8 gUnknown_083C3C2C[][0x300];
 extern const u8 gRubyBoardSharpedo_Gfx[][0x260];
 extern const u8 gUnknown_083C806C[][0x100];
 extern const u8 gRubyBoardShopDoor_Gfx[][0x180];
-extern const u8 gUnknown_08449D8C[][0x280];
+extern const u8 gRubyStageCyndaquil_Gfx[][0x280];
 extern const u8 gRubyBoardShop_Gfx[][0x500];
 extern const u8 gUnknown_08490A4C[][0x440];
 extern const s16 gUnknown_086AE5A0[][2];
@@ -1488,7 +1488,7 @@ void sub_4C290(void)
         }
     }
 
-    DmaCopy16(3, gUnknown_0844838C[gCurrentPinballGame->unk20B], 0x060113C0, 0x300);
+    DmaCopy16(3, gMainStageBonusTrap_Gfx[gCurrentPinballGame->unk20B], 0x060113C0, 0x300);
     DmaCopy16(3, gUnknown_086AD49C[gCurrentPinballGame->unk25F] +  var0 * 0x200, 0x060116C0, 0x200);
     DmaCopy16(3, gUnknown_084FD18C[(s16)gUnknown_086AD2EE[gCurrentPinballGame->unk1ED][3]], 0x06011CE0, 0x200);
     DmaCopy16(3, gUnknown_083BD36C[gCurrentPinballGame->unk6E], 0x06011EE0, 0x200);
@@ -1516,7 +1516,7 @@ void sub_4C808(void)
     else
         gCurrentPinballGame->unk746 = 1;
 
-    DmaCopy16(3, gUnknown_08449D8C[gCurrentPinballGame->unk746], (void *)0x6013300, 0x280);
+    DmaCopy16(3, gRubyStageCyndaquil_Gfx[gCurrentPinballGame->unk746], (void *)0x6013300, 0x280);
     var0 = gUnknown_086AD456[gCurrentPinballGame->unk1A5][(gCurrentPinballGame->unk1B4 % 42) / 6];
     DmaCopy16(3, gRubyBoardShop_Gfx[var0], (void *)0x6013D00, 0x500);
 }

src/rom_201B8.c

@@ -8,7 +8,7 @@ extern const s16 gUnknown_086ADEB0[][2];
 extern const u16 gUnknown_086ADEB2[][2];
 extern const s16 gUnknown_086ADA6E[][5];
 extern const u16 gUnknown_086B2FC0[146][18];
-extern const u8 gUnknown_08447A8C[][0x180];
+extern const u8 gRubyStageGulpin_Gfx[][0x180];
 extern const s16 gUnknown_086ADA58[];
 extern const u8 gUnknown_083C3C2C[][0x300];
 extern const u8 gUnknown_083C562C[][0x100];
@@ -30,7 +30,7 @@ extern const u8 gUnknown_084B7FEC[][0x480];
 extern const u8 gRubyBoardShopDoor_Gfx[][0x180];
 extern const s16 gUnknown_086AD7C0[50][3];
 extern const s16 gUnknown_086AD856[][2];
-extern const u8 gUnknown_0845710C[][0x280];
+extern const u8 gRubyStageNuzleaf_Gfx[][0x280];
 extern const u16 gUnknown_086B2E64[58][6];
 extern const u16 gUnknown_081C00E4[];
 extern const u16 gUnknown_086AD798[2];
@@ -477,7 +477,7 @@ void sub_1D5D8(void)
     {
         group->baseX = gUnknown_086AD856[gCurrentPinballGame->unk2F9][0] - gCurrentPinballGame->unk58;
         group->baseY = gUnknown_086AD856[gCurrentPinballGame->unk2F9][1] - gCurrentPinballGame->unk5A;
-        DmaCopy16(3, gUnknown_0845710C[gCurrentPinballGame->unk2FC], (void *)0x06014380, 0x260);
+        DmaCopy16(3, gRubyStageNuzleaf_Gfx[gCurrentPinballGame->unk2FC], (void *)0x06014380, 0x260);
         for (i = 0; i < 2; i++)
         {
             oamSimple = &group->oam[i];
@@ -1660,9 +1660,9 @@ void sub_1FBC4(void)
     }
 
     index = var0[0];
-    DmaCopy16(3, gUnknown_08447A8C[var0[2]], (void *)0x06013B80, 0x180);
+    DmaCopy16(3, gRubyStageGulpin_Gfx[var0[2]], (void *)0x06013B80, 0x180);
-    DmaCopy16(3, gUnknown_08447A8C[var0[3]], (void *)0x06013A00, 0x180);
+    DmaCopy16(3, gRubyStageGulpin_Gfx[var0[3]], (void *)0x06013A00, 0x180);
-    DmaCopy16(3, gUnknown_08447A8C[var0[4]], (void *)0x06013880, 0x180);
+    DmaCopy16(3, gRubyStageGulpin_Gfx[var0[4]], (void *)0x06013880, 0x180);
     for (i = 0; i < 6; i++)
     {
         oamSimple = &group->oam[i];