From 6d2cffda06aa6a5faef6f9747aaf82229a3df8d3 Mon Sep 17 00:00:00 2001
From: Cyphgirl <wendy@moniuk.ca>
Date: Sat, 8 Aug 2026 09:45:00 -0400
Subject: [PATCH] Extract the flipper frames from baserom

gFlipperTileGraphics is 6 angles of 0x200, copied into tile 0 for the left
flipper and tile 16 for the right. Each is a single 32x32 from
gBonusBoardLeft/RightFlipperSpriteSet in palette bank 0, so the sheet is 4 tiles
wide with no OAM packing and no shape.

These are the same two slots the shared bonus-board block fills at t0..31 on every
board's intro sheet, which is why bank 0 is already the answer ruby and kyogre
record for their own copies of the flipper.

Rebuilt sheet matches the ROM blob before and after recolouring, check passes,
make compare passes.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 data/rom_1.s                            |   7 ++++++-
 graphics/stage/main/flipper_frames.png  | Bin 0 -> 516 bytes
 graphics/stage/main/main_stage_gfx.json |   6 ++++++
 tools/scripts/objpalette.py             |   1 +
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 graphics/stage/main/flipper_frames.png

diff --git a/data/rom_1.s b/data/rom_1.s
index badd4907..98fc3743 100644
--- a/data/rom_1.s
+++ b/data/rom_1.s
@@ -1439,8 +1439,13 @@ gPickupIcon8_Gfx:: @ 0x083FA84C
 gPickupIcon7_Gfx:: @ 0x083FC64C
 	.incbin "graphics/board_pickups/icon7_bolt.4bpp"
 
+@ 6 flipper angles of 0x200, copied into tile 0 for the left flipper and tile 16
+@ for the right (all_board_process4.c). Each is a single 32x32 from
+@ gBonusBoardLeft/RightFlipperSpriteSet in palette bank 0, so the sheet is 4
+@ tiles wide with no OAM packing. These are the same two slots the shared
+@ bonus-board block occupies at t0..31 on every board's intro sheet.
 gFlipperTileGraphics:: @ 0x083FE44C
-	.incbin "baserom.gba", 0x3FE44C, 0xC00
+	.incbin "graphics/stage/main/flipper_frames.4bpp"
 
 @ 52 letters of 0x40 -- A-Z then a-z -- each an 8x16 pair of tiles. The name
 @ display copies one letter at a time into tile 704 + 2i (main_board_to_be_split.c)
diff --git a/graphics/stage/main/flipper_frames.png b/graphics/stage/main/flipper_frames.png
new file mode 100644
index 0000000000000000000000000000000000000000..284f5465b699040a07188ff42c3b5bb761db6699
GIT binary patch
literal 516
zcmV+f0{i`mP)<h;3K|Lk000e1NJLTq001BW006)Q0{{R3mk@kK0000mP)t-s*x2Cs
z`1q*U_(-t$V1VdAV9*#ah$vvV`1tq$002l>i1_&UaH!}wXs~d&&?rc-A`q@@0004x
zNkl<Zc-rljL2d&v2t|E>`2L5nD|tUy@;>ohiZNiI?Xs#y4Xf~l$t3@oA*CC~1HcPc
zDNcD5jOK)oXQ|B!&yP}S6igdBV%tzt3~iGyQABtFE8Hf}DGDE&s9dfM*1Rs?MiqS;
zRG_%0ncVvP1a579({9w0S75sT4v&o#lyvVvK3e3Xw#bLaVVP|d#-X+#97Xt0Mfgxf
z`4Hvs!Ae#dM48JV$5pmcOF?SKSd!|nUZd29w?CSjqx=6LkPnD_6lj5uQojxZXaNT;
zQbCH84=Fl)aFO9-yN!H+6X;H3aA9W$m#-94Zm@)Rf8PEk{~aH0f?V4~5N@oMRBFv8
z=L`-%3hqd^O)GiJe5`Nn<Za%zi`m|KYx{V6_)Am}0Q~99WPg!cxauYHfkWEiu!gjq
zAF$liBV_nELkYy~#YZJHrtTj$6+Xfn;0?$35tfEEimOkJAcMO4wAAiW%$FJFwcn4G
zCpXK)&d<8Rxh^D<%gUlTFEuCMe02LxAU=j){yYzN;o}n*e!sh}bEu~P0000<MNUMn
GLSTYJ&hNJX

literal 0
HcmV?d00001

diff --git a/graphics/stage/main/main_stage_gfx.json b/graphics/stage/main/main_stage_gfx.json
index e4d2db24..7abbc449 100644
--- a/graphics/stage/main/main_stage_gfx.json
+++ b/graphics/stage/main/main_stage_gfx.json
@@ -564,6 +564,12 @@
       "width": 21,
       "palette": "field_variants.gbapal",
       "palbank": 1
+    },
+    {
+      "gfx_filename": "flipper_frames",
+      "width": 4,
+      "palette": "../ruby/ruby_board_palset_0.gbapal",
+      "palbank": 0
     }
   ]
 }
diff --git a/tools/scripts/objpalette.py b/tools/scripts/objpalette.py
index c48fec47..3b85e499 100644
--- a/tools/scripts/objpalette.py
+++ b/tools/scripts/objpalette.py
@@ -219,6 +219,7 @@ SLOTS = {
     ('graphics/stage/main', 'alphabet'): ('ruby', 704, 2, 'main_board_to_be_split.c'),
     ('graphics/stage/main', 'capture_mode'): ('ruby', 704, 102, 'main_board_to_be_split.c'),
     ('graphics/stage/main', 'spoink_launcher'): ('ruby', 263, 14, 'main_board_launcher_and_cutscenes.c'),
+    ('graphics/stage/main', 'flipper_frames'): ('ruby', 0, 16, 'all_board_process4.c'),
     ('graphics/stage/main', 'ball_spawn_glow_type1'): ('ruby', 57, 16, 'all_board_process7.c'),
     ('graphics/stage/main', 'ball_spawn_glow_type2'): ('ruby', 57, 16, 'all_board_process7.c'),
     ('graphics/stage/main', 'end_of_ball'): ('ruby', 704, 320, 'all_board_mode_change_and_debug_menu.c'),