From b4e8a6d36e8fb6af8302a49da3c1d7f7c0a021bc Mon Sep 17 00:00:00 2001 From: Cyphgirl Date: Sun, 9 Aug 2026 19:20:14 -0400 Subject: [PATCH] Extract the wailmer water and hatch machine tiles AnimateRotatingBackground cycles three frames over four rows of 2, 4, 3 and 3 tiles - the water turning under the wailmer. Every tail past the DMA length is zero, so the whole family becomes .space. The board's BG0 tilemap draws that block at x=21 three times over, once per brightness zone, on banks 15/14, 3 and 1; bank 3 is the one whose fronds are gold the way the board shows them. gHatchMachineDrawSegment is ten targets, each with an idle and a hit state split into two halves of 2 tiles, all of them copied whole - so these 38 need no tails at all. Bank 6, the machine's red and green. Both families had address-suffixed labels; they now say which segment, frame and state they are. Co-Authored-By: Claude Opus 5 --- data/board_data/sapphire_board.inc | 210 +++++++++--------- data/rom_2.s | 48 ++-- .../hatch_machine_seg0_hit_a.png | Bin 0 -> 162 bytes .../hatch_machine_seg0_hit_b.png | Bin 0 -> 180 bytes .../hatch_machine_seg0_idle_a.png | Bin 0 -> 162 bytes .../hatch_machine_seg0_idle_b.png | Bin 0 -> 174 bytes .../hatch_machine_seg1_hit_a.png | Bin 0 -> 171 bytes .../hatch_machine_seg1_hit_b.png | Bin 0 -> 169 bytes .../hatch_machine_seg1_idle_a.png | Bin 0 -> 171 bytes .../hatch_machine_seg1_idle_b.png | Bin 0 -> 168 bytes .../hatch_machine_seg2_hit_a.png | Bin 0 -> 162 bytes .../hatch_machine_seg2_hit_b.png | Bin 0 -> 180 bytes .../hatch_machine_seg2_idle_a.png | Bin 0 -> 163 bytes .../hatch_machine_seg2_idle_b.png | Bin 0 -> 175 bytes .../hatch_machine/hatch_machine_seg3_hit.png | Bin 0 -> 159 bytes .../hatch_machine/hatch_machine_seg3_idle.png | Bin 0 -> 157 bytes .../hatch_machine_seg4_hit_a.png | Bin 0 -> 178 bytes .../hatch_machine_seg4_hit_b.png | Bin 0 -> 186 bytes .../hatch_machine_seg4_idle_a.png | Bin 0 -> 179 bytes .../hatch_machine_seg4_idle_b.png | Bin 0 -> 180 bytes .../hatch_machine_seg5_hit_a.png | Bin 0 -> 180 bytes .../hatch_machine_seg5_hit_b.png | Bin 0 -> 172 bytes .../hatch_machine_seg5_idle_a.png | Bin 0 -> 180 bytes .../hatch_machine_seg5_idle_b.png | Bin 0 -> 173 bytes .../hatch_machine_seg6_hit_a.png | Bin 0 -> 182 bytes .../hatch_machine_seg6_hit_b.png | Bin 0 -> 161 bytes .../hatch_machine_seg6_idle_a.png | Bin 0 -> 182 bytes .../hatch_machine_seg6_idle_b.png | Bin 0 -> 156 bytes .../hatch_machine_seg7_hit_a.png | Bin 0 -> 162 bytes .../hatch_machine_seg7_hit_b.png | Bin 0 -> 151 bytes .../hatch_machine_seg7_idle_a.png | Bin 0 -> 162 bytes .../hatch_machine_seg7_idle_b.png | Bin 0 -> 142 bytes .../hatch_machine_seg8_hit_a.png | Bin 0 -> 182 bytes .../hatch_machine_seg8_hit_b.png | Bin 0 -> 167 bytes .../hatch_machine_seg8_idle_a.png | Bin 0 -> 184 bytes .../hatch_machine_seg8_idle_b.png | Bin 0 -> 165 bytes .../hatch_machine_seg9_hit_a.png | Bin 0 -> 168 bytes .../hatch_machine_seg9_hit_b.png | Bin 0 -> 157 bytes .../hatch_machine_seg9_idle_a.png | Bin 0 -> 165 bytes .../hatch_machine_seg9_idle_b.png | Bin 0 -> 157 bytes .../wailmer_water/water_frame0_row0.png | Bin 0 -> 159 bytes .../wailmer_water/water_frame0_row1.png | Bin 0 -> 214 bytes .../wailmer_water/water_frame0_row2.png | Bin 0 -> 198 bytes .../wailmer_water/water_frame0_row3.png | Bin 0 -> 194 bytes .../wailmer_water/water_frame1_row0.png | Bin 0 -> 164 bytes .../wailmer_water/water_frame1_row1.png | Bin 0 -> 216 bytes .../wailmer_water/water_frame1_row2.png | Bin 0 -> 198 bytes .../wailmer_water/water_frame1_row3.png | Bin 0 -> 194 bytes .../wailmer_water/water_frame2_row0.png | Bin 0 -> 168 bytes .../wailmer_water/water_frame2_row1.png | Bin 0 -> 218 bytes .../wailmer_water/water_frame2_row2.png | Bin 0 -> 196 bytes .../wailmer_water/water_frame2_row3.png | Bin 0 -> 192 bytes 52 files changed, 134 insertions(+), 124 deletions(-) create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg0_hit_a.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg0_hit_b.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg0_idle_a.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg0_idle_b.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg1_hit_a.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg1_hit_b.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg1_idle_a.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg1_idle_b.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg2_hit_a.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg2_hit_b.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg2_idle_a.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg2_idle_b.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg3_hit.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg3_idle.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg4_hit_a.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg4_hit_b.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg4_idle_a.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg4_idle_b.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg5_hit_a.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg5_hit_b.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg5_idle_a.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg5_idle_b.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg6_hit_a.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg6_hit_b.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg6_idle_a.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg6_idle_b.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg7_hit_a.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg7_hit_b.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg7_idle_a.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg7_idle_b.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg8_hit_a.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg8_hit_b.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg8_idle_a.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg8_idle_b.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg9_hit_a.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg9_hit_b.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg9_idle_a.png create mode 100644 graphics/stage/sapphire/hatch_machine/hatch_machine_seg9_idle_b.png create mode 100644 graphics/stage/sapphire/wailmer_water/water_frame0_row0.png create mode 100644 graphics/stage/sapphire/wailmer_water/water_frame0_row1.png create mode 100644 graphics/stage/sapphire/wailmer_water/water_frame0_row2.png create mode 100644 graphics/stage/sapphire/wailmer_water/water_frame0_row3.png create mode 100644 graphics/stage/sapphire/wailmer_water/water_frame1_row0.png create mode 100644 graphics/stage/sapphire/wailmer_water/water_frame1_row1.png create mode 100644 graphics/stage/sapphire/wailmer_water/water_frame1_row2.png create mode 100644 graphics/stage/sapphire/wailmer_water/water_frame1_row3.png create mode 100644 graphics/stage/sapphire/wailmer_water/water_frame2_row0.png create mode 100644 graphics/stage/sapphire/wailmer_water/water_frame2_row1.png create mode 100644 graphics/stage/sapphire/wailmer_water/water_frame2_row2.png create mode 100644 graphics/stage/sapphire/wailmer_water/water_frame2_row3.png diff --git a/data/board_data/sapphire_board.inc b/data/board_data/sapphire_board.inc index c1eb8c46..b24c904f 100644 --- a/data/board_data/sapphire_board.inc +++ b/data/board_data/sapphire_board.inc @@ -604,8 +604,8 @@ gSapphireCatchLight_082DE160:: @ 0x082DE160 gSapphireCatchLight_082DE1A0:: @ 0x082DE1A0 .incbin "baserom.gba", 0x2DE1A0, 0x40 -gHatchMachine_082DE1E0:: @ 0x082DE1E0 - .incbin "baserom.gba", 0x2DE1E0, 0x40 +gHatchMachineSeg0IdleA:: @ 0x082DE1E0 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg0_idle_a.4bpp" gSapphireCenterTrap_082DE220:: @ 0x082DE220 .incbin "baserom.gba", 0x2DE220, 0x40 @@ -655,108 +655,108 @@ gSapphireCatchLight_082DE5A0:: @ 0x082DE5A0 -gHatchMachine_082DE5E0:: @ 0x082DE5E0 - .incbin "baserom.gba", 0x2DE5E0, 0x40 +gHatchMachineSeg0IdleB:: @ 0x082DE5E0 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg0_idle_b.4bpp" -gHatchMachine_082DE620:: @ 0x082DE620 - .incbin "baserom.gba", 0x2DE620, 0x40 +gHatchMachineSeg0HitA:: @ 0x082DE620 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg0_hit_a.4bpp" -gHatchMachine_082DE660:: @ 0x082DE660 - .incbin "baserom.gba", 0x2DE660, 0x40 +gHatchMachineSeg1IdleA:: @ 0x082DE660 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg1_idle_a.4bpp" -gHatchMachine_082DE6A0:: @ 0x082DE6A0 - .incbin "baserom.gba", 0x2DE6A0, 0x40 +gHatchMachineSeg1HitA:: @ 0x082DE6A0 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg1_hit_a.4bpp" -gHatchMachine_082DE6E0:: @ 0x082DE6E0 - .incbin "baserom.gba", 0x2DE6E0, 0x40 +gHatchMachineSeg2IdleA:: @ 0x082DE6E0 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg2_idle_a.4bpp" -gHatchMachine_082DE720:: @ 0x082DE720 - .incbin "baserom.gba", 0x2DE720, 0x40 +gHatchMachineSeg2HitA:: @ 0x082DE720 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg2_hit_a.4bpp" .space 0x80 -gHatchMachine_082DE7E0:: @ 0x082DE7E0 - .incbin "baserom.gba", 0x2DE7E0, 0x40 +gHatchMachineSeg4IdleA:: @ 0x082DE7E0 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg4_idle_a.4bpp" -gHatchMachine_082DE820:: @ 0x082DE820 - .incbin "baserom.gba", 0x2DE820, 0x40 +gHatchMachineSeg4HitA:: @ 0x082DE820 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg4_hit_a.4bpp" -gHatchMachine_082DE860:: @ 0x082DE860 - .incbin "baserom.gba", 0x2DE860, 0x40 +gHatchMachineSeg5IdleA:: @ 0x082DE860 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg5_idle_a.4bpp" -gHatchMachine_082DE8A0:: @ 0x082DE8A0 - .incbin "baserom.gba", 0x2DE8A0, 0x40 +gHatchMachineSeg5HitA:: @ 0x082DE8A0 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg5_hit_a.4bpp" -gHatchMachine_082DE8E0:: @ 0x082DE8E0 - .incbin "baserom.gba", 0x2DE8E0, 0x40 +gHatchMachineSeg6IdleA:: @ 0x082DE8E0 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg6_idle_a.4bpp" -gHatchMachine_082DE920:: @ 0x082DE920 - .incbin "baserom.gba", 0x2DE920, 0x40 +gHatchMachineSeg6HitA:: @ 0x082DE920 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg6_hit_a.4bpp" -gHatchMachine_082DE960:: @ 0x082DE960 - .incbin "baserom.gba", 0x2DE960, 0x40 +gHatchMachineSeg7IdleA:: @ 0x082DE960 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg7_idle_a.4bpp" -gHatchMachine_082DE9A0:: @ 0x082DE9A0 - .incbin "baserom.gba", 0x2DE9A0, 0x40 +gHatchMachineSeg7HitA:: @ 0x082DE9A0 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg7_hit_a.4bpp" -gHatchMachine_082DE9E0:: @ 0x082DE9E0 - .incbin "baserom.gba", 0x2DE9E0, 0x40 +gHatchMachineSeg8IdleA:: @ 0x082DE9E0 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg8_idle_a.4bpp" -gHatchMachine_082DEA20:: @ 0x082DEA20 - .incbin "baserom.gba", 0x2DEA20, 0x40 +gHatchMachineSeg0HitB:: @ 0x082DEA20 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg0_hit_b.4bpp" -gHatchMachine_082DEA60:: @ 0x082DEA60 - .incbin "baserom.gba", 0x2DEA60, 0x40 +gHatchMachineSeg1IdleB:: @ 0x082DEA60 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg1_idle_b.4bpp" -gHatchMachine_082DEAA0:: @ 0x082DEAA0 - .incbin "baserom.gba", 0x2DEAA0, 0x40 +gHatchMachineSeg1HitB:: @ 0x082DEAA0 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg1_hit_b.4bpp" -gHatchMachine_082DEAE0:: @ 0x082DEAE0 - .incbin "baserom.gba", 0x2DEAE0, 0x40 +gHatchMachineSeg2IdleB:: @ 0x082DEAE0 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg2_idle_b.4bpp" -gHatchMachine_082DEB20:: @ 0x082DEB20 - .incbin "baserom.gba", 0x2DEB20, 0x40 +gHatchMachineSeg2HitB:: @ 0x082DEB20 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg2_hit_b.4bpp" -gHatchMachine_082DEB60:: @ 0x082DEB60 - .incbin "baserom.gba", 0x2DEB60, 0x40 +gHatchMachineSeg3Idle:: @ 0x082DEB60 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg3_idle.4bpp" -gHatchMachine_082DEBA0:: @ 0x082DEBA0 - .incbin "baserom.gba", 0x2DEBA0, 0x40 +gHatchMachineSeg3Hit:: @ 0x082DEBA0 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg3_hit.4bpp" -gHatchMachine_082DEBE0:: @ 0x082DEBE0 - .incbin "baserom.gba", 0x2DEBE0, 0x40 +gHatchMachineSeg4IdleB:: @ 0x082DEBE0 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg4_idle_b.4bpp" -gHatchMachine_082DEC20:: @ 0x082DEC20 - .incbin "baserom.gba", 0x2DEC20, 0x40 +gHatchMachineSeg4HitB:: @ 0x082DEC20 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg4_hit_b.4bpp" -gHatchMachine_082DEC60:: @ 0x082DEC60 - .incbin "baserom.gba", 0x2DEC60, 0x40 +gHatchMachineSeg5IdleB:: @ 0x082DEC60 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg5_idle_b.4bpp" -gHatchMachine_082DECA0:: @ 0x082DECA0 - .incbin "baserom.gba", 0x2DECA0, 0x40 +gHatchMachineSeg5HitB:: @ 0x082DECA0 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg5_hit_b.4bpp" -gHatchMachine_082DECE0:: @ 0x082DECE0 - .incbin "baserom.gba", 0x2DECE0, 0x40 +gHatchMachineSeg6IdleB:: @ 0x082DECE0 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg6_idle_b.4bpp" -gHatchMachine_082DED20:: @ 0x082DED20 - .incbin "baserom.gba", 0x2DED20, 0x40 +gHatchMachineSeg6HitB:: @ 0x082DED20 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg6_hit_b.4bpp" -gHatchMachine_082DED60:: @ 0x082DED60 - .incbin "baserom.gba", 0x2DED60, 0x40 +gHatchMachineSeg7IdleB:: @ 0x082DED60 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg7_idle_b.4bpp" -gHatchMachine_082DEDA0:: @ 0x082DEDA0 - .incbin "baserom.gba", 0x2DEDA0, 0x40 +gHatchMachineSeg7HitB:: @ 0x082DEDA0 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg7_hit_b.4bpp" -gHatchMachine_082DEDE0:: @ 0x082DEDE0 - .incbin "baserom.gba", 0x2DEDE0, 0x40 +gHatchMachineSeg8IdleB:: @ 0x082DEDE0 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg8_idle_b.4bpp" -gHatchMachine_082DEE20:: @ 0x082DEE20 - .incbin "baserom.gba", 0x2DEE20, 0x40 +gHatchMachineSeg8HitA:: @ 0x082DEE20 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg8_hit_a.4bpp" -gHatchMachine_082DEE60:: @ 0x082DEE60 - .incbin "baserom.gba", 0x2DEE60, 0x40 +gHatchMachineSeg9IdleA:: @ 0x082DEE60 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg9_idle_a.4bpp" -gHatchMachine_082DEEA0:: @ 0x082DEEA0 - .incbin "baserom.gba", 0x2DEEA0, 0x40 +gHatchMachineSeg9HitA:: @ 0x082DEEA0 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg9_hit_a.4bpp" @@ -776,14 +776,14 @@ gSapphirePIndicator_082DEFE0:: @ 0x082DEFE0 .incbin "baserom.gba", 0x2DEFE0, 0x40 .space 0x200 -gHatchMachine_082DF220:: @ 0x082DF220 - .incbin "baserom.gba", 0x2DF220, 0x40 +gHatchMachineSeg8HitB:: @ 0x082DF220 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg8_hit_b.4bpp" -gHatchMachine_082DF260:: @ 0x082DF260 - .incbin "baserom.gba", 0x2DF260, 0x40 +gHatchMachineSeg9IdleB:: @ 0x082DF260 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg9_idle_b.4bpp" -gHatchMachine_082DF2A0:: @ 0x082DF2A0 - .incbin "baserom.gba", 0x2DF2A0, 0x40 +gHatchMachineSeg9HitB:: @ 0x082DF2A0 + .incbin "graphics/stage/sapphire/hatch_machine/hatch_machine_seg9_hit_b.4bpp" @@ -1066,41 +1066,51 @@ gSapphire_RSlingshot_On_R4:: @ 0x082E3BC0 .space 0x2C0 -gWailmerWater_082E3EC0:: @ 0x082E3EC0 - .incbin "baserom.gba", 0x2E3EC0, 0x80 +gWailmerWaterFrame0Row0:: @ 0x082E3EC0 + .incbin "graphics/stage/sapphire/wailmer_water/water_frame0_row0.4bpp" + .space 0x40 -gWailmerWater_082E3F40:: @ 0x082E3F40 - .incbin "baserom.gba", 0x2E3F40, 0x80 +gWailmerWaterFrame1Row0:: @ 0x082E3F40 + .incbin "graphics/stage/sapphire/wailmer_water/water_frame1_row0.4bpp" + .space 0x40 -gWailmerWater_082E3FC0:: @ 0x082E3FC0 - .incbin "baserom.gba", 0x2E3FC0, 0x300 +gWailmerWaterFrame2Row0:: @ 0x082E3FC0 + .incbin "graphics/stage/sapphire/wailmer_water/water_frame2_row0.4bpp" + .space 0x2C0 -gWailmerWater_082E42C0:: @ 0x082E42C0 - .incbin "baserom.gba", 0x2E42C0, 0x80 +gWailmerWaterFrame0Row1:: @ 0x082E42C0 + .incbin "graphics/stage/sapphire/wailmer_water/water_frame0_row1.4bpp" -gWailmerWater_082E4340:: @ 0x082E4340 - .incbin "baserom.gba", 0x2E4340, 0x80 +gWailmerWaterFrame1Row1:: @ 0x082E4340 + .incbin "graphics/stage/sapphire/wailmer_water/water_frame1_row1.4bpp" -gWailmerWater_082E43C0:: @ 0x082E43C0 - .incbin "baserom.gba", 0x2E43C0, 0x300 +gWailmerWaterFrame2Row1:: @ 0x082E43C0 + .incbin "graphics/stage/sapphire/wailmer_water/water_frame2_row1.4bpp" + .space 0x280 -gWailmerWater_082E46C0:: @ 0x082E46C0 - .incbin "baserom.gba", 0x2E46C0, 0x80 +gWailmerWaterFrame0Row2:: @ 0x082E46C0 + .incbin "graphics/stage/sapphire/wailmer_water/water_frame0_row2.4bpp" + .space 0x20 -gWailmerWater_082E4740:: @ 0x082E4740 - .incbin "baserom.gba", 0x2E4740, 0x80 +gWailmerWaterFrame1Row2:: @ 0x082E4740 + .incbin "graphics/stage/sapphire/wailmer_water/water_frame1_row2.4bpp" + .space 0x20 -gWailmerWater_082E47C0:: @ 0x082E47C0 - .incbin "baserom.gba", 0x2E47C0, 0x300 +gWailmerWaterFrame2Row2:: @ 0x082E47C0 + .incbin "graphics/stage/sapphire/wailmer_water/water_frame2_row2.4bpp" + .space 0x2A0 -gWailmerWater_082E4AC0:: @ 0x082E4AC0 - .incbin "baserom.gba", 0x2E4AC0, 0x80 +gWailmerWaterFrame0Row3:: @ 0x082E4AC0 + .incbin "graphics/stage/sapphire/wailmer_water/water_frame0_row3.4bpp" + .space 0x20 -gWailmerWater_082E4B40:: @ 0x082E4B40 - .incbin "baserom.gba", 0x2E4B40, 0x80 +gWailmerWaterFrame1Row3:: @ 0x082E4B40 + .incbin "graphics/stage/sapphire/wailmer_water/water_frame1_row3.4bpp" + .space 0x20 -gWailmerWater_082E4BC0:: @ 0x082E4BC0 - .incbin "baserom.gba", 0x2E4BC0, 0x320 +gWailmerWaterFrame2Row3:: @ 0x082E4BC0 + .incbin "graphics/stage/sapphire/wailmer_water/water_frame2_row3.4bpp" + .space 0x2C0 gSapphireBoardBGTiles:: @ 0x082E4EE0 @ loaded to charblock 2; tiles 0-703 are overwritten by the scroll ring diff --git a/data/rom_2.s b/data/rom_2.s index 8dc79742..80c1a669 100644 --- a/data/rom_2.s +++ b/data/rom_2.s @@ -8610,53 +8610,53 @@ gSapphireProgressDigitTilePtrs:: @ 0x086B0E9C gRotatingBackgroundTilePtrs:: @ 0x086B0F4C @ 5 sets of 4 @ fifth set has destination address - .4byte gWailmerWater_082E3EC0, gWailmerWater_082E42C0, gWailmerWater_082E46C0, gWailmerWater_082E4AC0 - .4byte gWailmerWater_082E3F40, gWailmerWater_082E4340, gWailmerWater_082E4740, gWailmerWater_082E4B40 - .4byte gWailmerWater_082E3FC0, gWailmerWater_082E43C0, gWailmerWater_082E47C0, gWailmerWater_082E4BC0 - .4byte gWailmerWater_082E3F40, gWailmerWater_082E4340, gWailmerWater_082E4740, gWailmerWater_082E4B40 + .4byte gWailmerWaterFrame0Row0, gWailmerWaterFrame0Row1, gWailmerWaterFrame0Row2, gWailmerWaterFrame0Row3 + .4byte gWailmerWaterFrame1Row0, gWailmerWaterFrame1Row1, gWailmerWaterFrame1Row2, gWailmerWaterFrame1Row3 + .4byte gWailmerWaterFrame2Row0, gWailmerWaterFrame2Row1, gWailmerWaterFrame2Row2, gWailmerWaterFrame2Row3 + .4byte gWailmerWaterFrame1Row0, gWailmerWaterFrame1Row1, gWailmerWaterFrame1Row2, gWailmerWaterFrame1Row3 .4byte 0x0600AEA0, 0x0600B2A0, 0x0600B6A0, 0x0600BAA0 gHatchMachineDrawSegment:: @ 0x086B0F9C @ 10 sets of 3 sets of 2 @ third set has destination address - .4byte gHatchMachine_082DE1E0, gHatchMachine_082DE5E0 - .4byte gHatchMachine_082DE620, gHatchMachine_082DEA20 + .4byte gHatchMachineSeg0IdleA, gHatchMachineSeg0IdleB + .4byte gHatchMachineSeg0HitA, gHatchMachineSeg0HitB .4byte 0x0600DD40, 0x0600DD80 - .4byte gHatchMachine_082DE660, gHatchMachine_082DEA60 - .4byte gHatchMachine_082DE6A0, gHatchMachine_082DEAA0 + .4byte gHatchMachineSeg1IdleA, gHatchMachineSeg1IdleB + .4byte gHatchMachineSeg1HitA, gHatchMachineSeg1HitB .4byte 0x0600DDC0, 0x0600DE00 - .4byte gHatchMachine_082DE6E0, gHatchMachine_082DEAE0 - .4byte gHatchMachine_082DE720, gHatchMachine_082DEB20 + .4byte gHatchMachineSeg2IdleA, gHatchMachineSeg2IdleB + .4byte gHatchMachineSeg2HitA, gHatchMachineSeg2HitB .4byte 0x0600D9C0, 0x0600DAC0 - .4byte gHatchMachine_082DEB60, gHatchMachine_082DEB60 - .4byte gHatchMachine_082DEBA0, gHatchMachine_082DEBA0 + .4byte gHatchMachineSeg3Idle, gHatchMachineSeg3Idle + .4byte gHatchMachineSeg3Hit, gHatchMachineSeg3Hit .4byte 0x0600DE40, 0x0600DE40 - .4byte gHatchMachine_082DE7E0, gHatchMachine_082DEBE0 - .4byte gHatchMachine_082DE820, gHatchMachine_082DEC20 + .4byte gHatchMachineSeg4IdleA, gHatchMachineSeg4IdleB + .4byte gHatchMachineSeg4HitA, gHatchMachineSeg4HitB .4byte 0x0600D900, 0x0600DA00 - .4byte gHatchMachine_082DE860, gHatchMachine_082DEC60 - .4byte gHatchMachine_082DE8A0, gHatchMachine_082DECA0 + .4byte gHatchMachineSeg5IdleA, gHatchMachineSeg5IdleB + .4byte gHatchMachineSeg5HitA, gHatchMachineSeg5HitB .4byte 0x0600DE80, 0x0600DEC0 - .4byte gHatchMachine_082DE8E0, gHatchMachine_082DECE0 - .4byte gHatchMachine_082DE920, gHatchMachine_082DED20 + .4byte gHatchMachineSeg6IdleA, gHatchMachineSeg6IdleB + .4byte gHatchMachineSeg6HitA, gHatchMachineSeg6HitB .4byte 0x0600DF00, 0x0600DF40 - .4byte gHatchMachine_082DE960, gHatchMachine_082DED60 - .4byte gHatchMachine_082DE9A0, gHatchMachine_082DEDA0 + .4byte gHatchMachineSeg7IdleA, gHatchMachineSeg7IdleB + .4byte gHatchMachineSeg7HitA, gHatchMachineSeg7HitB .4byte 0x0600DF80, 0x0600DFC0 - .4byte gHatchMachine_082DE9E0, gHatchMachine_082DEDE0 - .4byte gHatchMachine_082DEE20, gHatchMachine_082DF220 + .4byte gHatchMachineSeg8IdleA, gHatchMachineSeg8IdleB + .4byte gHatchMachineSeg8HitA, gHatchMachineSeg8HitB .4byte 0x0600E000, 0x0600E040 - .4byte gHatchMachine_082DEE60, gHatchMachine_082DF260 - .4byte gHatchMachine_082DEEA0, gHatchMachine_082DF2A0 + .4byte gHatchMachineSeg9IdleA, gHatchMachineSeg9IdleB + .4byte gHatchMachineSeg9HitA, gHatchMachineSeg9HitB .4byte 0x0600E080, 0x0600E0C0 gSapphireSlingshotTilePtrs:: @ 0x086B108C diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg0_hit_a.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg0_hit_a.png new file mode 100644 index 0000000000000000000000000000000000000000..9678879fd56040e149f0c1435597b0fef6fc7094 GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;bPZ!4!j+x0X7#hz> z8cPcFaIq}jBXcBUeMbHFbwVdH)~pZ~so_fzQ8Iqgz{7A=Uokk$DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;(PZ!4!j+x0CYclG; zuPZv{({`w<@6#tgj>U_a550)mnx)zixOLIuDT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;bPZ!4!j+x0X7#hz> z8cPcFaFw`KyS964bX<(M_~~7}%7nm(i@)C6PWdRW!o=`um5Px2w1yI(Mg~t;KbLh* G2~7ZEoI5)J literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg0_idle_b.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg0_idle_b.png new file mode 100644 index 0000000000000000000000000000000000000000..7f19629e5701344b9de71d7166c29e625dc6e980 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;JPZ!4!j+x0CYhG~h zzMW$@neoJn7Y@lKYooRb9a#}|@uFci>jcIn)@fyDQ&upooOyHSq(sFC-{(3Ehbojl U9QC~=1vG@g)78&qol`;+0Mvp)wEzGB literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg1_hit_a.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg1_hit_a.png new file mode 100644 index 0000000000000000000000000000000000000000..7a34e7cd625ca47f7841d6200a1c870658cf129e GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&-`PZ!4!j+w~;r(Xa; z%z*<5EJ=+L#}cmTC>*}wA$rQd?CpygI~k4`#4!f3B&9e=s=bq)yP3h(PFy$i=Ne9+ O2@IaDelF{r5}E)LWIu}l literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg1_hit_b.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg1_hit_b.png new file mode 100644 index 0000000000000000000000000000000000000000..a06b205354b1aef0d6e8ff924222c26aa7d5be41 GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&-mPZ!4!j+w~@W@cp~ zYhKJb%8+K$ZftdcM_3_Qts_w?yhINtyO literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg1_idle_a.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg1_idle_a.png new file mode 100644 index 0000000000000000000000000000000000000000..4b294165b29288de90e5377a6ba1aad7ad3bc78e GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&-`PZ!4!j+w~;r(Xa; z%z*<5EJ=+L#}cmTC>*}wA$rQd?CpygI~k4`#4!f3B&9e=E)$fUyP3hZUEKa~tLzk@ O2@IaDelF{r5}E)Iy+3~d literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg1_idle_b.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg1_idle_b.png new file mode 100644 index 0000000000000000000000000000000000000000..d3a45bfe3f6c9e91ac6096d3a6d2ac9840a55e0e GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;hPZ!4!j+w~@W@df= zZ(X$PW<2rXzdU1lNrR-C!!aL$!#}dwCp_dyNokPKD_{%AV4c9ouDT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;bPZ!4!j+x0C@kbdL zWevjEd#*AjmzHdq9DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;(PZ!4!j+x0bZvG4S z5bJuJscok5>wC8EU%W{2m~FXt&!WYPn-xuq)7;r-2$~hMwFq(vG8tVmN_SWybJeJk ahvDfCg$)Uh{!9fL#o+1c=d#Wzp$Pz#S44;a literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg2_idle_a.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg2_idle_a.png new file mode 100644 index 0000000000000000000000000000000000000000..509089f3d9949d9416c8df110b362a0ee528093c GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;5PZ!4!j+x0C@kbdL zWevjEd#*Ajmo^+=GFW`nbP@NN57qxgRjynV{QoZ7U7VR=Du-Cx1PRp%K%ESpu6{1- HoD!MDT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&-;PZ!4!j+x0bZVLYY zpY48}scoilw6n66)h>xkY3E)rFt%MeGc&+V!lgseR78m-Wl8F}1`o?ssZ5d#XErLB Uo=^Yy8E6WFr>mdKI;Vst0ItYDRsaA1 literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg3_hit.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg3_hit.png new file mode 100644 index 0000000000000000000000000000000000000000..c6d6abc8d722773ca3ad494113dc06f55083d087 GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&-=PZ!4!j+w~`3QTL7 znA-aKzLme%va*smb^0|6>-_1{ji)SM+Sb;#bSg7Lu#mvHUy%aufw~wxUHx3vIVCg! E0JbDL8vpDT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&-gPZ!4!j+w~`3QTL7 znA-aK_{75%4hF=zopr0Qs3W Apa1{> literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg4_hit_a.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg4_hit_a.png new file mode 100644 index 0000000000000000000000000000000000000000..a7a7fcac3fa8a2cfcbdf9aadbca7031add25317a GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;ZPZ!4!j+w~gTe~DWM4f!xTTk literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg4_hit_b.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg4_hit_b.png new file mode 100644 index 0000000000000000000000000000000000000000..ced59dfb01380a32fc7d27b58d9e7b12d637d686 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;VPZ!4!j+x0bR3rWc ze29JO)7JV(w)FkH^K(urL|nWW7iVeQ>$qp};>E?!wivW=DI`BT6QYqEl_A0GkrpM@ fVyGLaV#>qNzFA&dp*2PrXdr{9tDnm{r-UW|ID|y$ literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg4_idle_a.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg4_idle_a.png new file mode 100644 index 0000000000000000000000000000000000000000..0131886df93bae3588cf353e7f98302f7665fd36 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;3PZ!4!j+w~DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;(PZ!4!j+x0bR3ilc z|9^dECJ*;f>nLaCMxKLReSLj1jW0_aX)JkuCNq&opfN-vIVwYf*&{7Vs>M(@P{ovo Zp{zje;wqh_13;q~JYD@<);T3K0RZW8K$idj literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg5_hit_a.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg5_hit_a.png new file mode 100644 index 0000000000000000000000000000000000000000..1e6babf740fa0235d02a44b2ed76a4787c85718d GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;(PZ!4!j+w~@--On@ zc#+|q!eD$$s8u3nT6c4XD%vW+h7unL*XsppFWHVy8 X)h}$#w2j{bXcU8|tDnm{r-UW|jgCIi literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg5_hit_b.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg5_hit_b.png new file mode 100644 index 0000000000000000000000000000000000000000..fc1effc5b4f155651001e0dabaf2d0d1ba859f71 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;xPZ!4!j+x03ff4@# zTs%EH6I~PMDrhZcK2gwQaOyr|W~##CMLZ`A7!7YVFzNBg_KL>3d8z3!+*cQI)Qv0V Q02;yI>FVdQ&MBb@07~6DD*ylh literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg5_idle_a.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg5_idle_a.png new file mode 100644 index 0000000000000000000000000000000000000000..ffa691ebc3ae49dc255040068023b99eecad8550 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;(PZ!4!j+w~@--On@ zc#+|q!eD$$s8u3nT6c4XD%vW+h7unL*XspTLWiw*9 Xts)#VbI!_spivB-u6{1-oD!MDT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&-ePZ!4!j+x03ff0h= zLp?n^6I~Nu{?-pTR&TJF`9wjJf!3qOEk+#|*-~aWNS@N;k?j?Yb@NiwV>s?6(b#nB R;$ff}44$rjF6*2UngIP;KA!*p literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg6_hit_a.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg6_hit_a.png new file mode 100644 index 0000000000000000000000000000000000000000..779bd5996c68903784341d518d9d72d9e459e6af GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;FPZ!4!j+x0XUc8uL zscT}=!+7GwoS9sS4K0Txw5+Udoz@OM*t4tr{PLxSTgtcCi%eNP=h%fn#-xxECQ)X| c_gYpA`PK3d6Pr7q0u5vEboFyt=akR{00%@xL;wH) literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg6_hit_b.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg6_hit_b.png new file mode 100644 index 0000000000000000000000000000000000000000..97f3c386cb8e74877262ac067f9477528fab53b5 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&-wPZ!4!j+x0XUc6XQ z{e92kX2ug4`s*7E4lta`Sl`gO#duANXW`ivBZ)Al2!`kH6rZ`OP6auJ!PC{xWt~$( F69B{vJxBlm literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg6_idle_a.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg6_idle_a.png new file mode 100644 index 0000000000000000000000000000000000000000..f62a4e8c9a69fdfb288a1b84af8f89cbbe0fdaae GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;FPZ!4!j+x0XUc8uL zscT}=!+7GwoS9sS4K0Txv<|EZF<5-mG$~5Tx!S$`{_pj3FH2ZySv|U6`}PHkX5at+ cTNg7kR6kR^9rg0C1kf-BPgg&ebxsLQ07<1tLI3~& literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg6_idle_b.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg6_idle_b.png new file mode 100644 index 0000000000000000000000000000000000000000..41f832a6e51466e82e4435dfaaf537be8f6b389f GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;zPZ!4!j+x0XUcAWQ z?S1hg;Y9;eiCZzopr07%<8 A!~g&Q literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg7_hit_a.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg7_hit_a.png new file mode 100644 index 0000000000000000000000000000000000000000..5f27e77c6c1a47fe232fad87be8bc9642a5d8a4a GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;bPZ!4!j+w~@ZA@%y zdM*fX95(s4+PLLo0N)W0<8Q(uH92#R85ryO2YiUU<-;JpPq4z4_izJHBZH@_pUXO@ GgeCwvQaPRg literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg7_hit_b.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg7_hit_b.png new file mode 100644 index 0000000000000000000000000000000000000000..30d0574c18e2f6725dc754d3a00f1c76e0c78a0d GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&-&PZ!4!j+x0XUS!m3 vgkQXP@WRE5fpPa36B`)Cj`?UDNMT?&dqg=@!zSAksG7mk)z4*}Q$iB}9k@2| literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg7_idle_a.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg7_idle_a.png new file mode 100644 index 0000000000000000000000000000000000000000..55c81b9558b41e1f5802a5a73fbeee8ea228af86 GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;bPZ!4!j+w~@ZA@%y zdM*fX95ykzB6+CeKUdNc$=(0{zt5R-%)nUp>;L-gTV^sSx(avBR&_iF)X3oJ>gTe~ HDWM4fkXk&T literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg7_idle_b.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg7_idle_b.png new file mode 100644 index 0000000000000000000000000000000000000000..97a81ae11cfdfffe688caa8f7bf2881f19ae46e5 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;HPZ!4!j+x0XUcBJo lWfbC(4QS{$6y`FJWH|Id*{FW^-fcid44$rjF6*2UngF=%FnRz0 literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg8_hit_a.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg8_hit_a.png new file mode 100644 index 0000000000000000000000000000000000000000..5b25a19c5b3dfaf3d1dc72708b0dfff88f60e643 GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;FPZ!4!j+x0Gyu4@M zWQe~{05WD@4AfvuVqj&_Zs^(Y@@eZMSy`UUnWgXLnj~gkmghPZ${=ZcYhe$c!eiM9 aj10FEWks)sYDT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&-$PZ!4!j+x0XG^SU7 z-?Mme^TL>bJ$smr2#Bx;Ija7cE9s=}j(-LD%Hpq?bP82I^+; MboFyt=akR{0KLpT9RL6T literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg8_idle_a.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg8_idle_a.png new file mode 100644 index 0000000000000000000000000000000000000000..e2c767c9e0b4276f61a9c22bc3aa43fbdc428d89 GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;lPZ!4!j+x0Gyu4@M zWQe~{05WD@4AfvuVqj&_Zs3{FP~pz*9F^9ctk=*SQpu-Q54|UN7t5=I;Kd cUVxe5ak$()`LmuXK;sxZUHx3vIVCg!08Cmy=>Px# literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg8_idle_b.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg8_idle_b.png new file mode 100644 index 0000000000000000000000000000000000000000..62d02ce04eb321ae17d31b285677b097649685e3 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbC6z77sn8enaM9S#CdyP zym*nIAuh811%u&&5_aYp^B7YaUieM$V0U3S^PDT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&;hPZ!4!j+w~`2YAEQ zMlmF=c@eQStFrQ{R@>93+E%ab*}hMR(Acr(&%y;UmJ>Dx2%HdLVVK1vc;L^Q#9u(| N44$rjF6*2UngCZ?K-2&L literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg9_hit_b.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg9_hit_b.png new file mode 100644 index 0000000000000000000000000000000000000000..0595f5654bef27cd591163fdbd434342f7e00578 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&-gPZ!4!j+x038ao0$ zEPPya-}7QfsTIsMMfqbZ7U8VhOqw%m)8C-JPXvr;OXk;vd$@?2>|Ax BHi-ZL literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg9_idle_a.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg9_idle_a.png new file mode 100644 index 0000000000000000000000000000000000000000..0df91c997d308c945e4046f5f6f154de7d836fb9 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbC6z77sn8enaK$Uc*E94 zF(j^e5y8sFbNY06$(9{%B?dYoF>&v{|I40BPzX0_zc)I$z JtaD0e0sthDJjMV3 literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/hatch_machine/hatch_machine_seg9_idle_b.png b/graphics/stage/sapphire/hatch_machine/hatch_machine_seg9_idle_b.png new file mode 100644 index 0000000000000000000000000000000000000000..cd6c8dc23c990f28001b6daff68746e3e1d2a670 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5ZC`;aPQf(y<4_)cTaJ2 zbkx+;{J$mYzW~Qo1&Lw?hX4O9|DSa%4pLzF&%m&SqcP?FbD&-gPZ!4!j+x038ao0E z{{0VkWD{^UF%dWt5y!{GbNY06Ndv>-F1{un27^Wg;o9Er1wcIvp00i_>zopr0L=0= AeEDT4r?5ZC|zzX8$JXW!}qgxo7vlx)7mi(J!KsXT#FA$o-=4PikZ^D!w?fCF8tz1h73>_gQu&X%Q~lo FCIB(4If?)P literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/wailmer_water/water_frame0_row1.png b/graphics/stage/sapphire/wailmer_water/water_frame0_row1.png new file mode 100644 index 0000000000000000000000000000000000000000..049a553ee1c41529b5e12a0b5880db54e60ea9d5 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^3P8-k!VDy{RzH{nqznRlLR|m<{{}=?pM9Hi_L*1p zyLVR^j&5OS&SFRka%4E`#W2TkA6QiW-^QHhkg|7Eex=xG$@+;0=>VBiB@;mTB89m@Us869_mq;o3!>i;QAg{%I>T z@{J1HUKa41CaqXe5XN>&tMSQM@8(bmt*DqD9|t8buVYIWy5%vPzM;bWh4=Capk)l6 Lu6{1-oD!M<-ltP~ literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/wailmer_water/water_frame0_row2.png b/graphics/stage/sapphire/wailmer_water/water_frame0_row2.png new file mode 100644 index 0000000000000000000000000000000000000000..b00be245812abbfdbe508798fe1d5ffc1961a623 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^5DT4r?5ZC|zzX8$JXW!}qgxo7vlx)7mi(J!KsXGcNL^hFHvYkkmV+7SJX*ft4YWL+s!eeKiZ9Rt8U3 KKbLh*2~7Y^oH};^ literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/wailmer_water/water_frame1_row1.png b/graphics/stage/sapphire/wailmer_water/water_frame1_row1.png new file mode 100644 index 0000000000000000000000000000000000000000..6a73cf2a45392b64820e3392a0366a496ffb8104 GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^3P8-k!VDy{RzH{nqznRlLR|m<{{}=?pM9Hi_L*1p zyLVR^j&5OS&SFRka%4E`#W2TTLQM6#Z#to}Y}(xhDzv!yzU#aT`%%-Npcx6vzujX8wr r1n2662CqA;tC)%u-c-BgW$H3mPqB91b!?Xw&|n5nS3j3^P6DT4r?5ZC|zzX8$JXW!}qgxo7vlx)7mi(J>NckO0zi3a%e?Cpjo3)PlJxY;UhOaZb~o&mx|@&at2-l PYG?3t^>bP0l+XkK%y2*J literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/wailmer_water/water_frame2_row1.png b/graphics/stage/sapphire/wailmer_water/water_frame2_row1.png new file mode 100644 index 0000000000000000000000000000000000000000..95bca6e6f8ce08999270a9ba145d8e4d31431b35 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^3P8-k!VDy{RzH{nqznRlLR|m<{{}=?pM9Hi_L*1p zyLVR^j&5OS&SFRka%4E`#W2Tar>J?J^6J-YJwkY3p0?YVUiNRmsr~YguMGFMj-s$?BIp00i_>zopr0Qst1ivR!s literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/wailmer_water/water_frame2_row2.png b/graphics/stage/sapphire/wailmer_water/water_frame2_row2.png new file mode 100644 index 0000000000000000000000000000000000000000..e35e0228e517bbed635f0125ed4a611feb1595b9 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^5bG6%#hvd0OZ3#&$)8b|?A%n`xdv!7gQu&X%Q~loCIE+3O)LNa literal 0 HcmV?d00001 diff --git a/graphics/stage/sapphire/wailmer_water/water_frame2_row3.png b/graphics/stage/sapphire/wailmer_water/water_frame2_row3.png new file mode 100644 index 0000000000000000000000000000000000000000..87855c2ced39a335a46373a936765054b2eb4220 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^5(xoEgmbrdI~3eKVaj`iapU`Gjur`>yN_xul;jEER8U{j p#Hdv$zJlvSZzN^x`=mXGL22WQ%mvv4FO#u3^Oo;#h literal 0 HcmV?d00001