diff --git a/MapMacros.asm b/MapMacros.asm
new file mode 100644
index 00000000..8b620834
--- /dev/null
+++ b/MapMacros.asm
@@ -0,0 +1,80 @@
+; macro to declare a mappings table (taken from Sonic 2 Hg disassembly)
+mappingsTable macro {INTLABEL}
+__LABEL__ label *
+.current_mappings_table := __LABEL__
+ endm
+
+; macro to declare an entry in a mappings table (taken from Sonic 2 Hg disassembly)
+mappingsTableEntry macro ptr
+ dc.ATTRIBUTE ptr-.current_mappings_table
+ endm
+
+spriteHeader macro {INTLABEL}
+__LABEL__ label *
+ if SonicMappingsVer==1
+ dc.b ((__LABEL___End - __LABEL___Begin) / 5)
+ elseif SonicMappingsVer==2
+ dc.w ((__LABEL___End - __LABEL___Begin) / 8)
+ else
+ dc.w ((__LABEL___End - __LABEL___Begin) / 6)
+ endif
+__LABEL___Begin label *
+ endm
+
+spritePiece macro xpos,ypos,width,height,tile,xflip,yflip,pal,pri
+ if SonicMappingsVer==1
+ dc.b ypos
+ dc.b (((width-1)&3)<<2)|((height-1)&3)
+ dc.b ((pri&1)<<7)|((pal&3)<<5)|((yflip&1)<<4)|((xflip&1)<<3)|((tile&$700)>>8)
+ dc.b tile&$FF
+ dc.b xpos
+ elseif SonicMappingsVer==2
+ dc.w ((ypos&$FF)<<8)|(((width-1)&3)<<2)|((height-1)&3)
+ dc.w ((pri&1)<<15)|((pal&3)<<13)|((yflip&1)<<12)|((xflip&1)<<11)|(tile&$7FF)
+ dc.w ((pri&1)<<15)|((pal&3)<<13)|((yflip&1)<<12)|((xflip&1)<<11)|((tile>>1)&$7FF)
+ dc.w xpos
+ else
+ dc.w ((ypos&$FF)<<8)|(((width-1)&3)<<2)|((height-1)&3)
+ dc.w ((pri&1)<<15)|((pal&3)<<13)|((yflip&1)<<12)|((xflip&1)<<11)|(tile&$7FF)
+ dc.w xpos
+ endif
+ endm
+
+spritePiece2P macro xpos,ypos,width,height,tile,xflip,yflip,pal,pri,tile2,xflip2,yflip2,pal2,pri2
+ if SonicMappingsVer==1
+ dc.b ypos
+ dc.b (((width-1)&3)<<2)|((height-1)&3)
+ dc.b ((pri&1)<<7)|((pal&3)<<5)|((yflip&1)<<4)|((xflip&1)<<3)|((tile&$700)>>8)
+ dc.b tile&$FF
+ dc.b xpos
+ elseif SonicMappingsVer==2
+ dc.w ((ypos&$FF)<<8)|(((width-1)&3)<<2)|((height-1)&3)
+ dc.w ((pri&1)<<15)|((pal&3)<<13)|((yflip&1)<<12)|((xflip&1)<<11)|(tile&$7FF)
+ dc.w ((pri2&1)<<15)|((pal2&3)<<13)|((yflip2&1)<<12)|((xflip2&1)<<11)|(tile2&$7FF)
+ dc.w xpos
+ else
+ dc.w ((ypos&$FF)<<8)|(((width-1)&3)<<2)|((height-1)&3)
+ dc.w ((pri&1)<<15)|((pal&3)<<13)|((yflip&1)<<12)|((xflip&1)<<11)|(tile&$7FF)
+ dc.w xpos
+ endif
+ endm
+
+dplcHeader macro {INTLABEL}
+__LABEL__ label *
+ if SonicMappingsVer==1
+ dc.b ((__LABEL___End - __LABEL___Begin) / 2)
+ elseif SonicMappingsVer==2
+ dc.w ((__LABEL___End - __LABEL___Begin) / 2)
+ else
+ dc.w (((__LABEL___End - __LABEL___Begin) / 2)-1)
+ endif
+__LABEL___Begin label *
+ endm
+
+dplcEntry macro tiles,offset
+ if SonicMappingsVer==3
+ dc.w ((offset&$FFF)<<4)|((tiles-1)&$F)
+ else
+ dc.w (((tiles-1)&$F)<<12)|(offset&$FFF)
+ endif
+ endm
diff --git a/SonLVL INI Files/ARZ/Leaves.xml b/SonLVL INI Files/ARZ/Leaves.xml
index 5fc143ca..5d07b19d 100644
--- a/SonLVL INI Files/ARZ/Leaves.xml
+++ b/SonLVL INI Files/ARZ/Leaves.xml
@@ -3,15 +3,15 @@
-
+
-
+
-
+
diff --git a/SonLVL INI Files/ARZ/One-Way Barrier.xml b/SonLVL INI Files/ARZ/One-Way Barrier.xml
index 92ed05e3..e58fcf13 100644
--- a/SonLVL INI Files/ARZ/One-Way Barrier.xml
+++ b/SonLVL INI Files/ARZ/One-Way Barrier.xml
@@ -3,19 +3,19 @@
-
+
-
+
-
+
-
+
diff --git a/SonLVL INI Files/ARZ/Pillar.xml b/SonLVL INI Files/ARZ/Pillar.xml
index 058a21e9..c4470316 100644
--- a/SonLVL INI Files/ARZ/Pillar.xml
+++ b/SonLVL INI Files/ARZ/Pillar.xml
@@ -3,11 +3,11 @@
-
+
-
+
diff --git a/SonLVL INI Files/ARZ/Platform.xml b/SonLVL INI Files/ARZ/Platform.xml
index d4d08177..6cc1606e 100644
--- a/SonLVL INI Files/ARZ/Platform.xml
+++ b/SonLVL INI Files/ARZ/Platform.xml
@@ -3,11 +3,11 @@
-
+
-
+
diff --git a/SonLVL INI Files/ARZ/RotatingPlatforms.xml b/SonLVL INI Files/ARZ/RotatingPlatforms.xml
index 44e26589..6b37e1a0 100644
--- a/SonLVL INI Files/ARZ/RotatingPlatforms.xml
+++ b/SonLVL INI Files/ARZ/RotatingPlatforms.xml
@@ -3,11 +3,11 @@
-
+
-
+
diff --git a/SonLVL INI Files/ARZ/SwingingPlatform.xml b/SonLVL INI Files/ARZ/SwingingPlatform.xml
index 8bb14c0a..086b077f 100644
--- a/SonLVL INI Files/ARZ/SwingingPlatform.xml
+++ b/SonLVL INI Files/ARZ/SwingingPlatform.xml
@@ -3,15 +3,15 @@
-
+
-
+
-
+
diff --git a/SonLVL INI Files/CNZ/Bumper.xml b/SonLVL INI Files/CNZ/Bumper.xml
index 41bbbdb6..a25271f6 100644
--- a/SonLVL INI Files/CNZ/Bumper.xml
+++ b/SonLVL INI Files/CNZ/Bumper.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/SonLVL INI Files/CNZ/Cage.xml b/SonLVL INI Files/CNZ/Cage.xml
index 0b6f5624..2d0339d9 100644
--- a/SonLVL INI Files/CNZ/Cage.xml
+++ b/SonLVL INI Files/CNZ/Cage.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/SonLVL INI Files/CNZ/Flipper.xml b/SonLVL INI Files/CNZ/Flipper.xml
index a15876fe..dc220633 100644
--- a/SonLVL INI Files/CNZ/Flipper.xml
+++ b/SonLVL INI Files/CNZ/Flipper.xml
@@ -3,11 +3,11 @@
-
+
-
+
diff --git a/SonLVL INI Files/CNZ/Pinball mode.xml b/SonLVL INI Files/CNZ/Pinball mode.xml
index e92d27a9..4d4ddf6d 100644
--- a/SonLVL INI Files/CNZ/Pinball mode.xml
+++ b/SonLVL INI Files/CNZ/Pinball mode.xml
@@ -3,35 +3,35 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/SonLVL INI Files/CNZ/Pressure spring.xml b/SonLVL INI Files/CNZ/Pressure spring.xml
index 47edfb8b..a234d017 100644
--- a/SonLVL INI Files/CNZ/Pressure spring.xml
+++ b/SonLVL INI Files/CNZ/Pressure spring.xml
@@ -3,11 +3,11 @@
-
+
-
+
diff --git a/SonLVL INI Files/CPZ/Blue worm thing.xml b/SonLVL INI Files/CPZ/Blue worm thing.xml
index 0ad0b0ff..e4a94854 100644
--- a/SonLVL INI Files/CPZ/Blue worm thing.xml
+++ b/SonLVL INI Files/CPZ/Blue worm thing.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/SonLVL INI Files/CPZ/Exit spring.xml b/SonLVL INI Files/CPZ/Exit spring.xml
index a6edb7eb..7f3240b5 100644
--- a/SonLVL INI Files/CPZ/Exit spring.xml
+++ b/SonLVL INI Files/CPZ/Exit spring.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/SonLVL INI Files/CPZ/Moving Stairs.xml b/SonLVL INI Files/CPZ/Moving Stairs.xml
index 6f801c37..38d01987 100644
--- a/SonLVL INI Files/CPZ/Moving Stairs.xml
+++ b/SonLVL INI Files/CPZ/Moving Stairs.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/SonLVL INI Files/CPZ/One-Way Barrier.xml b/SonLVL INI Files/CPZ/One-Way Barrier.xml
index 83192ee1..26bcf3dd 100644
--- a/SonLVL INI Files/CPZ/One-Way Barrier.xml
+++ b/SonLVL INI Files/CPZ/One-Way Barrier.xml
@@ -3,19 +3,19 @@
-
+
-
+
-
+
-
+
diff --git a/SonLVL INI Files/CPZ/Platform.xml b/SonLVL INI Files/CPZ/Platform.xml
index 7e512afe..c1e9d8e0 100644
--- a/SonLVL INI Files/CPZ/Platform.xml
+++ b/SonLVL INI Files/CPZ/Platform.xml
@@ -3,11 +3,11 @@
-
+
-
+
diff --git a/SonLVL INI Files/CPZ/Section of Pipe.xml b/SonLVL INI Files/CPZ/Section of Pipe.xml
index f05b1822..03bc2a26 100644
--- a/SonLVL INI Files/CPZ/Section of Pipe.xml
+++ b/SonLVL INI Files/CPZ/Section of Pipe.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/SonLVL INI Files/CPZ/Speed booster.xml b/SonLVL INI Files/CPZ/Speed booster.xml
index aa85ef54..8d0e6150 100644
--- a/SonLVL INI Files/CPZ/Speed booster.xml
+++ b/SonLVL INI Files/CPZ/Speed booster.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/SonLVL INI Files/CPZ/Stairs.xml b/SonLVL INI Files/CPZ/Stairs.xml
index b7247dc4..9bca13aa 100644
--- a/SonLVL INI Files/CPZ/Stairs.xml
+++ b/SonLVL INI Files/CPZ/Stairs.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/SonLVL INI Files/Common/Capsule.xml b/SonLVL INI Files/Common/Capsule.xml
index 673dbad7..80df615d 100644
--- a/SonLVL INI Files/Common/Capsule.xml
+++ b/SonLVL INI Files/Common/Capsule.xml
@@ -3,15 +3,15 @@
-
+
-
+
-
+
diff --git a/SonLVL INI Files/Common/Invisible lava marker.xml b/SonLVL INI Files/Common/Invisible lava marker.xml
index ca62f0ef..67dd71f8 100644
--- a/SonLVL INI Files/Common/Invisible lava marker.xml
+++ b/SonLVL INI Files/Common/Invisible lava marker.xml
@@ -3,15 +3,15 @@
-
+
-
+
-
+
diff --git a/SonLVL INI Files/Common/InvisibleBlock.cs b/SonLVL INI Files/Common/InvisibleBlock.cs
index d36050e6..2aed8ebf 100644
--- a/SonLVL INI Files/Common/InvisibleBlock.cs
+++ b/SonLVL INI Files/Common/InvisibleBlock.cs
@@ -12,8 +12,8 @@ class InvisibleBlock : ObjectDefinition
public override void Init(ObjectData data)
{
byte[] artfile = ObjectHelper.OpenArtFile("../art/nemesis/Monitor and contents.bin", CompressionType.Nemesis);
- byte[] mapfile = System.IO.File.ReadAllBytes("../mappings/sprite/obj74.bin");
- img = ObjectHelper.MapToBmp(artfile, mapfile, 0, 0);
+ string mapfile = "../mappings/sprite/obj74.asm";
+ img = ObjectHelper.MapASMToBmp(artfile, mapfile, 0, 0);
}
public override ReadOnlyCollection Subtypes
diff --git a/SonLVL INI Files/Common/Monitor.xml b/SonLVL INI Files/Common/Monitor.xml
index ab527b0f..4c545e8a 100644
--- a/SonLVL INI Files/Common/Monitor.xml
+++ b/SonLVL INI Files/Common/Monitor.xml
@@ -3,48 +3,48 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/SonLVL INI Files/Common/PathSwapper.cs b/SonLVL INI Files/Common/PathSwapper.cs
index ca2ce058..55685522 100644
--- a/SonLVL INI Files/Common/PathSwapper.cs
+++ b/SonLVL INI Files/Common/PathSwapper.cs
@@ -16,9 +16,9 @@ public override void Init(ObjectData data)
{
List tmpartfile = new List();
tmpartfile.AddRange(ObjectHelper.OpenArtFile("Common/pathswapper-art.bin", CompressionType.Nemesis));
- byte[] mapfile = System.IO.File.ReadAllBytes("../mappings/sprite/obj03.bin");
+ string mapfile = "../mappings/sprite/obj03.asm";
byte[] artfile1 = tmpartfile.ToArray();
- img = ObjectHelper.MapToBmp(artfile1, mapfile, 0, 0);
+ img = ObjectHelper.MapASMToBmp(artfile1, mapfile, 0, 0);
Point off;
BitmapBits im;
Point pos;
@@ -26,7 +26,7 @@ public override void Init(ObjectData data)
for (int i = 0; i < 32; i++)
{
byte[] artfile = tmpartfile.GetRange(((i & 0x1C) << 5), 128).ToArray();
- BitmapBits tempim = ObjectHelper.MapToBmp(artfile, mapfile, (i & 4), 0).GetBitmap();
+ BitmapBits tempim = ObjectHelper.MapASMToBmp(artfile, mapfile, (i & 4), 0).GetBitmap();
if ((i & 4) != 0)
{
im = new BitmapBits(tempim.Width * (1 << (i & 3)), tempim.Height);
diff --git a/SonLVL INI Files/Common/PressureSpring.xml b/SonLVL INI Files/Common/PressureSpring.xml
index 90208eeb..ec967f3f 100644
--- a/SonLVL INI Files/Common/PressureSpring.xml
+++ b/SonLVL INI Files/Common/PressureSpring.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/SonLVL INI Files/Common/Spikes.xml b/SonLVL INI Files/Common/Spikes.xml
index 574193a7..7575137a 100644
--- a/SonLVL INI Files/Common/Spikes.xml
+++ b/SonLVL INI Files/Common/Spikes.xml
@@ -3,35 +3,35 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/SonLVL INI Files/EHZ/Bridge.cs b/SonLVL INI Files/EHZ/Bridge.cs
index fe4a9bb6..1153d304 100644
--- a/SonLVL INI Files/EHZ/Bridge.cs
+++ b/SonLVL INI Files/EHZ/Bridge.cs
@@ -12,8 +12,8 @@ class Bridge : ObjectDefinition
public override void Init(ObjectData data)
{
byte[] artfile = ObjectHelper.OpenArtFile("../art/nemesis/EHZ bridge.bin", CompressionType.Nemesis);
- byte[] mapfile = System.IO.File.ReadAllBytes("../mappings/sprite/obj11_b.bin");
- img = ObjectHelper.MapToBmp(artfile, mapfile, 0, 2);
+ string mapfile = "../mappings/sprite/obj11_b.asm";
+ img = ObjectHelper.MapASMToBmp(artfile, mapfile, 0, 2);
}
public override ReadOnlyCollection Subtypes
diff --git a/SonLVL INI Files/EHZ/Platform.xml b/SonLVL INI Files/EHZ/Platform.xml
index 5f5c3057..3d4bd306 100644
--- a/SonLVL INI Files/EHZ/Platform.xml
+++ b/SonLVL INI Files/EHZ/Platform.xml
@@ -3,11 +3,11 @@
-
+
-
+
diff --git a/SonLVL INI Files/EHZ/Waterfall.xml b/SonLVL INI Files/EHZ/Waterfall.xml
index 97d3edc5..a14a2ab1 100644
--- a/SonLVL INI Files/EHZ/Waterfall.xml
+++ b/SonLVL INI Files/EHZ/Waterfall.xml
@@ -3,19 +3,19 @@
-
+
-
+
-
+
-
+
diff --git a/SonLVL INI Files/HTZ/Lift stake.xml b/SonLVL INI Files/HTZ/Lift stake.xml
index 382b1f9c..ccadd659 100644
--- a/SonLVL INI Files/HTZ/Lift stake.xml
+++ b/SonLVL INI Files/HTZ/Lift stake.xml
@@ -3,19 +3,19 @@
-
+
-
+
-
+
-
+
diff --git a/SonLVL INI Files/HTZ/Lift.xml b/SonLVL INI Files/HTZ/Lift.xml
index 845e17e3..ff0cf85d 100644
--- a/SonLVL INI Files/HTZ/Lift.xml
+++ b/SonLVL INI Files/HTZ/Lift.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/SonLVL INI Files/HTZ/One-Way Barrier.xml b/SonLVL INI Files/HTZ/One-Way Barrier.xml
index be43b7d3..8b38d0b3 100644
--- a/SonLVL INI Files/HTZ/One-Way Barrier.xml
+++ b/SonLVL INI Files/HTZ/One-Way Barrier.xml
@@ -3,19 +3,19 @@
-
+
-
+
-
+
-
+
diff --git a/SonLVL INI Files/HTZ/Seesaw.xml b/SonLVL INI Files/HTZ/Seesaw.xml
index a1232f8e..b6d1a98d 100644
--- a/SonLVL INI Files/HTZ/Seesaw.xml
+++ b/SonLVL INI Files/HTZ/Seesaw.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/SonLVL INI Files/HTZ/Smashable ground.xml b/SonLVL INI Files/HTZ/Smashable ground.xml
index 2ed814e4..b62ce79b 100644
--- a/SonLVL INI Files/HTZ/Smashable ground.xml
+++ b/SonLVL INI Files/HTZ/Smashable ground.xml
@@ -3,23 +3,23 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/SonLVL INI Files/HTZ/Sol.xml b/SonLVL INI Files/HTZ/Sol.xml
index c188ff76..177a5e78 100644
--- a/SonLVL INI Files/HTZ/Sol.xml
+++ b/SonLVL INI Files/HTZ/Sol.xml
@@ -3,11 +3,11 @@
-
+
-
+
diff --git a/SonLVL INI Files/MCZ/Brick.xml b/SonLVL INI Files/MCZ/Brick.xml
index 6d4be107..109938e2 100644
--- a/SonLVL INI Files/MCZ/Brick.xml
+++ b/SonLVL INI Files/MCZ/Brick.xml
@@ -3,11 +3,11 @@
-
+
-
+
diff --git a/SonLVL INI Files/MCZ/DrawbridgeHorizontal.xml b/SonLVL INI Files/MCZ/DrawbridgeHorizontal.xml
index fdb4e525..21f1c411 100644
--- a/SonLVL INI Files/MCZ/DrawbridgeHorizontal.xml
+++ b/SonLVL INI Files/MCZ/DrawbridgeHorizontal.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/SonLVL INI Files/MCZ/DrawbridgeVertical.xml b/SonLVL INI Files/MCZ/DrawbridgeVertical.xml
index c2086029..0a556912 100644
--- a/SonLVL INI Files/MCZ/DrawbridgeVertical.xml
+++ b/SonLVL INI Files/MCZ/DrawbridgeVertical.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/SonLVL INI Files/MCZ/SpikedRectangles.xml b/SonLVL INI Files/MCZ/SpikedRectangles.xml
index 11a16f3a..58d2d46a 100644
--- a/SonLVL INI Files/MCZ/SpikedRectangles.xml
+++ b/SonLVL INI Files/MCZ/SpikedRectangles.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/SonLVL INI Files/MCZ/SwingingPlatform.xml b/SonLVL INI Files/MCZ/SwingingPlatform.xml
index dd1fb948..b608cb0f 100644
--- a/SonLVL INI Files/MCZ/SwingingPlatform.xml
+++ b/SonLVL INI Files/MCZ/SwingingPlatform.xml
@@ -3,23 +3,23 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/SonLVL INI Files/MCZ/VineSwitch.xml b/SonLVL INI Files/MCZ/VineSwitch.xml
index 9248834d..971dca0f 100644
--- a/SonLVL INI Files/MCZ/VineSwitch.xml
+++ b/SonLVL INI Files/MCZ/VineSwitch.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/SonLVL INI Files/MCZ/VineSwitch2.xml b/SonLVL INI Files/MCZ/VineSwitch2.xml
index 223946a6..a3367380 100644
--- a/SonLVL INI Files/MCZ/VineSwitch2.xml
+++ b/SonLVL INI Files/MCZ/VineSwitch2.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/SonLVL INI Files/MCZ/WoodenBlocks.xml b/SonLVL INI Files/MCZ/WoodenBlocks.xml
index f171bc24..50e6c37c 100644
--- a/SonLVL INI Files/MCZ/WoodenBlocks.xml
+++ b/SonLVL INI Files/MCZ/WoodenBlocks.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/SonLVL INI Files/MTZ/Bolt end and rope.xml b/SonLVL INI Files/MTZ/Bolt end and rope.xml
index bb4f6faf..42f5ecd4 100644
--- a/SonLVL INI Files/MTZ/Bolt end and rope.xml
+++ b/SonLVL INI Files/MTZ/Bolt end and rope.xml
@@ -3,15 +3,15 @@
-
+
-
+
-
+
diff --git a/SonLVL INI Files/MTZ/Crushing piston.xml b/SonLVL INI Files/MTZ/Crushing piston.xml
index cbabb37f..1c6355b4 100644
--- a/SonLVL INI Files/MTZ/Crushing piston.xml
+++ b/SonLVL INI Files/MTZ/Crushing piston.xml
@@ -3,11 +3,11 @@
-
+
-
+
diff --git a/SonLVL INI Files/MTZ/Gear.xml b/SonLVL INI Files/MTZ/Gear.xml
index 1ec957bd..b758a764 100644
--- a/SonLVL INI Files/MTZ/Gear.xml
+++ b/SonLVL INI Files/MTZ/Gear.xml
@@ -3,35 +3,35 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/SonLVL INI Files/MTZ/One-Way Barrier.xml b/SonLVL INI Files/MTZ/One-Way Barrier.xml
index e49a93d2..65eb0fc0 100644
--- a/SonLVL INI Files/MTZ/One-Way Barrier.xml
+++ b/SonLVL INI Files/MTZ/One-Way Barrier.xml
@@ -3,19 +3,19 @@
-
+
-
+
-
+
-
+
diff --git a/SonLVL INI Files/MTZ/Platform moving in a circle.xml b/SonLVL INI Files/MTZ/Platform moving in a circle.xml
index dd9e8acc..06e266be 100644
--- a/SonLVL INI Files/MTZ/Platform moving in a circle.xml
+++ b/SonLVL INI Files/MTZ/Platform moving in a circle.xml
@@ -3,19 +3,19 @@
-
+
-
+
-
+
-
+
diff --git a/SonLVL INI Files/MTZ/Spring wall.xml b/SonLVL INI Files/MTZ/Spring wall.xml
index aa0167d2..e80a5a3f 100644
--- a/SonLVL INI Files/MTZ/Spring wall.xml
+++ b/SonLVL INI Files/MTZ/Spring wall.xml
@@ -3,11 +3,11 @@
-
+
-
+
diff --git a/SonLVL INI Files/MTZ/SteamPiston.xml b/SonLVL INI Files/MTZ/SteamPiston.xml
index c1ecde78..a7e3a203 100644
--- a/SonLVL INI Files/MTZ/SteamPiston.xml
+++ b/SonLVL INI Files/MTZ/SteamPiston.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/SonLVL INI Files/MTZ/Trigger platform.xml b/SonLVL INI Files/MTZ/Trigger platform.xml
index 87a26d6d..52c14524 100644
--- a/SonLVL INI Files/MTZ/Trigger platform.xml
+++ b/SonLVL INI Files/MTZ/Trigger platform.xml
@@ -3,15 +3,15 @@
-
+
-
+
-
+
diff --git a/SonLVL INI Files/OOZ/Cannon.xml b/SonLVL INI Files/OOZ/Cannon.xml
index 5862bd26..bbae4152 100644
--- a/SonLVL INI Files/OOZ/Cannon.xml
+++ b/SonLVL INI Files/OOZ/Cannon.xml
@@ -3,11 +3,11 @@
-
+
-
+
diff --git a/SonLVL INI Files/OOZ/Falling oil.xml b/SonLVL INI Files/OOZ/Falling oil.xml
index 20ec47a4..36838ae6 100644
--- a/SonLVL INI Files/OOZ/Falling oil.xml
+++ b/SonLVL INI Files/OOZ/Falling oil.xml
@@ -3,39 +3,39 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/SonLVL INI Files/OOZ/Fan.xml b/SonLVL INI Files/OOZ/Fan.xml
index 5b66cade..3e02607c 100644
--- a/SonLVL INI Files/OOZ/Fan.xml
+++ b/SonLVL INI Files/OOZ/Fan.xml
@@ -3,11 +3,11 @@
-
+
-
+
diff --git a/SonLVL INI Files/OOZ/PushSpring.xml b/SonLVL INI Files/OOZ/PushSpring.xml
index cea28755..fd31c332 100644
--- a/SonLVL INI Files/OOZ/PushSpring.xml
+++ b/SonLVL INI Files/OOZ/PushSpring.xml
@@ -3,11 +3,11 @@
-
+
-
+
diff --git a/SonLVL INI Files/OOZ/SwingingPlatform.xml b/SonLVL INI Files/OOZ/SwingingPlatform.xml
index 4e86c247..4f41c461 100644
--- a/SonLVL INI Files/OOZ/SwingingPlatform.xml
+++ b/SonLVL INI Files/OOZ/SwingingPlatform.xml
@@ -3,15 +3,15 @@
-
+
-
+
-
+
diff --git a/SonLVL INI Files/SCZ/Balkrie.xml b/SonLVL INI Files/SCZ/Balkrie.xml
index e70b8279..04035b6f 100644
--- a/SonLVL INI Files/SCZ/Balkrie.xml
+++ b/SonLVL INI Files/SCZ/Balkrie.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/SonLVL INI Files/SCZ/Turtleroid.xml b/SonLVL INI Files/SCZ/Turtleroid.xml
index b3eecc1b..73a61181 100644
--- a/SonLVL INI Files/SCZ/Turtleroid.xml
+++ b/SonLVL INI Files/SCZ/Turtleroid.xml
@@ -3,11 +3,11 @@
-
+
-
+
diff --git a/SonLVL INI Files/WFZ/Cycling palette switcher.xml b/SonLVL INI Files/WFZ/Cycling palette switcher.xml
index 7965a26e..ae6142cc 100644
--- a/SonLVL INI Files/WFZ/Cycling palette switcher.xml
+++ b/SonLVL INI Files/WFZ/Cycling palette switcher.xml
@@ -3,19 +3,19 @@
-
+
-
+
-
+
-
+
diff --git a/SonLVL INI Files/obj.ini b/SonLVL INI Files/obj.ini
index dc213287..5a5ec1ac 100644
--- a/SonLVL INI Files/obj.ini
+++ b/SonLVL INI Files/obj.ini
@@ -2,14 +2,14 @@
codefile=Common/RingGroup.cs
codetype=S2ObjectDefinitions.Common.RingGroup
art=../art/nemesis/Ring.bin
-map=../mappings/sprite/obj37_a.bin
+mapasm=../mappings/sprite/obj37_a.asm
pal=1
spacing=24
[Sonic]
art=../art/uncompressed/Sonic's art.bin
artcmp=Uncompressed
-map=../mappings/sprite/Sonic.bin
-dplc=../mappings/spriteDPLC/Sonic.bin
+mapasm=../mappings/sprite/Sonic.asm
+dplcasm=../mappings/spriteDPLC/Sonic.asm
frame=1
[03]
codefile=Common/PathSwapper.cs
@@ -17,7 +17,7 @@ codetype=S2ObjectDefinitions.Common.PathSwapper
[0D]
name=Signpost
art=../art/nemesis/Signpost.bin
-map=../mappings/sprite/obj0D_a.bin
+mapasm=../mappings/sprite/obj0D_a.asm
frame=2
[26]
xmlfile=Common/Monitor.xml
@@ -35,5 +35,5 @@ codetype=S2ObjectDefinitions.Common.InvisibleBlock
[79]
name=Star Post
art=../art/nemesis/Star pole.bin
-map=../mappings/sprite/obj79_a.bin
+mapasm=../mappings/sprite/obj79_a.asm
rememberstate=True
\ No newline at end of file
diff --git a/SonLVL INI Files/objARZ.ini b/SonLVL INI Files/objARZ.ini
index b4b1dc86..61ba3bf8 100644
--- a/SonLVL INI Files/objARZ.ini
+++ b/SonLVL INI Files/objARZ.ini
@@ -5,19 +5,19 @@ xmlfile=ARZ/Platform.xml
[1F]
name=Falling Platform
art=LevelArt
-map=../mappings/sprite/obj1F_d.bin
+mapasm=../mappings/sprite/obj1F_d.asm
frame=0
pal=2
[22]
name=Arrow Shooter
art=../art/nemesis/Arrow shooter and arrow from ARZ.bin
-map=../mappings/sprite/obj22.bin
+mapasm=../mappings/sprite/obj22.asm
frame=1
pal=0
[23]
name=Pillar That Drops Its Lower Part
art=LevelArt
-map=../mappings/sprite/obj23.bin
+mapasm=../mappings/sprite/obj23.asm
frame=0
pal=1
[24]
@@ -25,7 +25,7 @@ xmlfile=ARZ/Bubbles.xml
[2B]
name=Rising Pillar
art=LevelArt
-map=../mappings/sprite/obj2B.bin
+mapasm=../mappings/sprite/obj2B.asm
frame=0
pal=1
[2C]
@@ -41,7 +41,7 @@ xmlfile=ARZ/RotatingPlatforms.xml
[8C]
name=Whisp
art=../art/nemesis/Blowfly from ARZ.bin
-map=../mappings/sprite/obj8C.bin
+mapasm=../mappings/sprite/obj8C.asm
frame=0
pal=1
rememberstate=True
@@ -52,7 +52,7 @@ xmlfile=ARZ/Grounder.xml
[91]
name=Chop Chop
art=../art/nemesis/Shark from ARZ.bin
-map=../mappings/sprite/obj91.bin
+mapasm=../mappings/sprite/obj91.asm
frame=0
pal=1
rememberstate=True
\ No newline at end of file
diff --git a/SonLVL INI Files/objCNZ.ini b/SonLVL INI Files/objCNZ.ini
index e2a544df..47a3a73b 100644
--- a/SonLVL INI Files/objCNZ.ini
+++ b/SonLVL INI Files/objCNZ.ini
@@ -1,7 +1,7 @@
[44]
name=Round Bumper
art=../art/nemesis/Round bumper from CNZ.bin
-map=../mappings/sprite/obj44.bin
+mapasm=../mappings/sprite/obj44.asm
frame=0
pal=2
rememberstate=True
@@ -17,26 +17,26 @@ xmlfile=CNZ/Flipper.xml
[C8]
name=Crawl
art=../art/nemesis/Bouncer badnik from CNZ.bin
-map=../mappings/sprite/objC8.bin
+mapasm=../mappings/sprite/objC8.asm
frame=0
pal=0
rememberstate=True
[D2]
name=Flashing Blocks
art=../art/nemesis/Caterpiller platforms from CNZ.bin
-map=../mappings/sprite/objD2.bin
+mapasm=../mappings/sprite/objD2.asm
frame=0
pal=2
[D4]
name=Big Moving Block
art=../art/nemesis/Moving block from CNZ and CPZ.bin
-map=../mappings/sprite/objD4.bin
+mapasm=../mappings/sprite/objD4.asm
frame=0
pal=2
[D5]
name=Elevator
art=../art/nemesis/CNZ elevator.bin
-map=../mappings/sprite/objD5.bin
+mapasm=../mappings/sprite/objD5.asm
frame=0
pal=2
[D6]
@@ -46,6 +46,6 @@ xmlfile=CNZ/Bumper.xml
[D8]
name=Colored Point Block
art=../art/nemesis/Drop target from CNZ.bin
-map=../mappings/sprite/objD8.bin
+mapasm=../mappings/sprite/objD8.asm
frame=0
pal=2
\ No newline at end of file
diff --git a/SonLVL INI Files/objCPZ.ini b/SonLVL INI Files/objCPZ.ini
index d8e9289e..f2abf91c 100644
--- a/SonLVL INI Files/objCPZ.ini
+++ b/SonLVL INI Files/objCPZ.ini
@@ -15,7 +15,7 @@ xmlfile=CPZ/One-Way Barrier.xml
[32]
name=Tube Cap
art=../art/nemesis/CPZ large moving platform blocks.bin
-map=../mappings/sprite/obj32_b.bin
+mapasm=../mappings/sprite/obj32_b.asm
frame=0
pal=3
rememberstate=True
@@ -28,7 +28,7 @@ xmlfile=CPZ/Stairs.xml
[7A]
name=Platform That Moves Back and Forth
art=../art/nemesis/Moving block from CPZ.bin
-map=../mappings/sprite/obj7A.bin
+mapasm=../mappings/sprite/obj7A.asm
frame=0
pal=3
[7B]
@@ -36,7 +36,7 @@ xmlfile=CPZ/Exit spring.xml
[A5]
name=Spiny
art=../art/nemesis/Weird crawling badnik from CPZ.bin
-map=../mappings/sprite/objA6.bin
+mapasm=../mappings/sprite/objA6.asm
frame=0
pal=1
rememberstate=True
@@ -45,7 +45,7 @@ defaultsubtype=32
[A6]
name=Spiny on Wall
art=../art/nemesis/Weird crawling badnik from CPZ.bin
-map=../mappings/sprite/objA6.bin
+mapasm=../mappings/sprite/objA6.asm
frame=3
pal=1
rememberstate=True
diff --git a/SonLVL INI Files/objDEZ.ini b/SonLVL INI Files/objDEZ.ini
index d700b920..1163be0e 100644
--- a/SonLVL INI Files/objDEZ.ini
+++ b/SonLVL INI Files/objDEZ.ini
@@ -3,12 +3,12 @@ xmlfile=CPZ/One-Way Barrier.xml
[C6]
name=Eggman
art=../art/nemesis/Robotnik's head.bin:40960|../art/nemesis/Robotnik.bin:41728|../art/nemesis/Robotnik's lower half.bin:44160
-map=../mappings/sprite/objC6_a.bin
+mapasm=../mappings/sprite/objC6_a.asm
frame=0
pal=0
[C7]
name=Giant Mech
art=../art/nemesis/Eggrobo.bin
-map=../mappings/sprite/objC7.bin
+mapasm=../mappings/sprite/objC7.asm
frame=3
pal=0
\ No newline at end of file
diff --git a/SonLVL INI Files/objEHZ.ini b/SonLVL INI Files/objEHZ.ini
index 787176d2..6be52d7e 100644
--- a/SonLVL INI Files/objEHZ.ini
+++ b/SonLVL INI Files/objEHZ.ini
@@ -9,7 +9,7 @@ xmlfile=EHZ/Platform.xml
[1C]
name=Bridge Stake
art=../art/nemesis/EHZ bridge.bin
-map=../mappings/sprite/obj11_b.bin
+mapasm=../mappings/sprite/obj11_b.asm
frame=1
pal=2
subtypes=02
@@ -19,21 +19,21 @@ xmlfile=EHZ/Waterfall.xml
[4B]
name=Buzzer
art=../art/nemesis/Buzzer enemy.bin
-map=../mappings/sprite/obj4B.bin
+mapasm=../mappings/sprite/obj4B.asm
frame=0
pal=0
rememberstate=True
[5C]
name=Masher
art=../art/nemesis/EHZ Pirahna badnik.bin
-map=../mappings/sprite/obj5C.bin
+mapasm=../mappings/sprite/obj5C.asm
frame=0
pal=0
rememberstate=True
[9D]
name=Coconuts
art=../art/nemesis/Coconuts badnik from EHZ.bin
-map=../mappings/sprite/obj9D.bin
+mapasm=../mappings/sprite/obj9D.asm
frame=0
pal=0
subtypes=1E
diff --git a/SonLVL INI Files/objHTZ.ini b/SonLVL INI Files/objHTZ.ini
index 0e13bd17..9969f45c 100644
--- a/SonLVL INI Files/objHTZ.ini
+++ b/SonLVL INI Files/objHTZ.ini
@@ -16,7 +16,7 @@ debug=True
[32]
name=Breakable Rock
art=../art/nemesis/Rock from HTZ.bin
-map=../mappings/sprite/obj32_a.bin
+mapasm=../mappings/sprite/obj32_a.asm
frame=0
pal=2
[84]
@@ -24,7 +24,7 @@ xmlfile=CNZ/Pinball mode.xml
[92]
name=Spiker
art=../art/nemesis/Sol badnik from HTZ.bin:31680|../art/nemesis/Driller badnik from HTZ.bin:41984
-map=../mappings/sprite/obj93.bin
+mapasm=../mappings/sprite/obj93.asm
frame=0
pal=0
rememberstate=True
@@ -35,7 +35,7 @@ xmlfile=HTZ/Sol.xml
[96]
name=Rexon
art=../art/nemesis/Rexxon (lava snake) from HTZ.bin
-map=../mappings/sprite/obj97.bin
+mapasm=../mappings/sprite/obj97.asm
frame=2
pal=3
rememberstate=True
diff --git a/SonLVL INI Files/objMCZ.ini b/SonLVL INI Files/objMCZ.ini
index 3b9a4073..4b03bcb1 100644
--- a/SonLVL INI Files/objMCZ.ini
+++ b/SonLVL INI Files/objMCZ.ini
@@ -3,13 +3,13 @@ xmlfile=MCZ/SwingingPlatform.xml
[1F]
name=Falling Platform
art=../art/nemesis/Collapsing platform from MCZ.bin
-map=../mappings/sprite/obj1F_c.bin
+mapasm=../mappings/sprite/obj1F_c.asm
frame=0
pal=2
[2A]
name=Stomper
art=LevelArt
-map=../mappings/sprite/obj2A.bin
+mapasm=../mappings/sprite/obj2A.asm
frame=0
pal=2
[40]
@@ -26,7 +26,7 @@ xmlfile=MCZ/DrawbridgeHorizontal.xml
name=Platform That Moves Back and Forth
art=LevelArt
mapasm=../s2.asm
-mapasmlbl=word_1025E
+mapasmlbl=Map_obj7A_a_0008
pal=0
subtypes=0,12
rememberstate=True
@@ -39,7 +39,7 @@ xmlfile=MCZ/DrawbridgeVertical.xml
[9E]
name=Crawlton
art=../art/nemesis/Snake badnik from MCZ.bin
-map=../mappings/sprite/obj9E.bin
+mapasm=../mappings/sprite/obj9E.asm
frame=0
pal=1
subtypes=22
@@ -48,7 +48,7 @@ rememberstate=True
[A3]
name=Flasher
art=../art/nemesis/Firefly from MCZ.bin
-map=../mappings/sprite/objA3.bin
+mapasm=../mappings/sprite/objA3.asm
frame=0
pal=0
subtypes=2C
diff --git a/SonLVL INI Files/objMTZ.ini b/SonLVL INI Files/objMTZ.ini
index 2e41a9f6..3ba7a490 100644
--- a/SonLVL INI Files/objMTZ.ini
+++ b/SonLVL INI Files/objMTZ.ini
@@ -11,7 +11,7 @@ xmlfile=MTZ/SteamPiston.xml
[47]
name=Button
art=../art/nemesis/Button.bin
-map=../mappings/sprite/obj47.bin
+mapasm=../mappings/sprite/obj47.asm
frame=0
pal=1
[64]
@@ -26,38 +26,38 @@ debug=True
[68]
name=Spike Block
art=../art/nemesis/MTZ spike block.bin
-map=../mappings/sprite/obj68.bin
+mapasm=../mappings/sprite/obj68.asm
frame=4
pal=3
subtypes=00,01,02,03
[69]
name=Nut
art=../art/nemesis/Similarly shaded blocks from MTZ.bin
-map=../mappings/sprite/obj69.bin
+mapasm=../mappings/sprite/obj69.asm
frame=0
pal=1
[6A]
name=Platform That Moves When You Walk Off It
art=LevelArt
-map=../mappings/sprite/obj65_a.bin
+mapasm=../mappings/sprite/obj65_a.asm
frame=1
pal=3
[6B]
name=Platform
art=LevelArt
-map=../mappings/sprite/obj65_a.bin
+mapasm=../mappings/sprite/obj65_a.asm
frame=1
pal=3
[6C]
name=Lava Cups
art=../art/nemesis/Lava cup from MTZ.bin
-map=../mappings/sprite/obj6C.bin
+mapasm=../mappings/sprite/obj6C.asm
frame=0
pal=3
[6D]
name=Spears
art=../art/nemesis/Spike from MTZ.bin
-map=../mappings/sprite/obj68.bin
+mapasm=../mappings/sprite/obj68.asm
frame=0
pal=0
[6E]
@@ -67,13 +67,13 @@ xmlfile=MTZ/Gear.xml
[71]
name=Lava Bubble
art=../art/nemesis/Lava bubble from MTZ.bin
-map=../mappings/sprite/obj71_b.bin
+mapasm=../mappings/sprite/obj71_b.asm
frame=3
pal=2
[9F]
name=Shellcracker
art=../art/nemesis/Shellcracker badnik from MTZ.bin
-map=../mappings/sprite/objA0.bin
+mapasm=../mappings/sprite/objA0.asm
frame=0
pal=0
subtypes=24
@@ -82,7 +82,7 @@ rememberstate=True
[A1]
name=Slicer
art=../art/nemesis/Praying mantis badnik from MTZ.bin
-map=../mappings/sprite/objA2.bin
+mapasm=../mappings/sprite/objA2.asm
frame=0
pal=1
subtypes=28
@@ -91,7 +91,7 @@ rememberstate=True
[A4]
name=Asteron
art=../art/nemesis/Exploding star badnik from MTZ.bin
-map=../mappings/sprite/objA4.bin
+mapasm=../mappings/sprite/objA4.asm
frame=0
pal=0
subtypes=2E
diff --git a/SonLVL INI Files/objOOZ.ini b/SonLVL INI Files/objOOZ.ini
index 9b5799ed..59a675dc 100644
--- a/SonLVL INI Files/objOOZ.ini
+++ b/SonLVL INI Files/objOOZ.ini
@@ -3,7 +3,7 @@ xmlfile=OOZ/SwingingPlatform.xml
[19]
name=Rising Platform When Sonic Stands On It
art=../art/nemesis/Rising platform from OOZ.bin
-map=../mappings/sprite/obj19.bin
+mapasm=../mappings/sprite/obj19.asm
frame=2
pal=3
subtypes=23
@@ -13,19 +13,19 @@ xmlfile=OOZ/Falling oil.xml
[1F]
name=Breaking Floor
art=../art/nemesis/OOZ collapsing platform.bin
-map=../mappings/sprite/obj1F_b.bin
+mapasm=../mappings/sprite/obj1F_b.asm
frame=0
pal=3
[33]
name=Burner Lid
art=../art/nemesis/Burner Platform from OOZ.bin
-map=../mappings/sprite/obj33_a.bin
+mapasm=../mappings/sprite/obj33_a.asm
frame=0
pal=3
[3D]
name=Breakable Block
art=../art/nemesis/Striped blocks from CPZ.bin
-map=../mappings/sprite/obj3D.bin
+mapasm=../mappings/sprite/obj3D.asm
frame=2
pal=3
[3F]
@@ -33,7 +33,7 @@ xmlfile=OOZ/Fan.xml
[43]
name=Spiky Thing
art=../art/nemesis/Spiked ball from OOZ.bin
-map=../mappings/sprite/obj43.bin
+mapasm=../mappings/sprite/obj43.asm
frame=0
pal=2
pri=true
@@ -45,14 +45,14 @@ xmlfile=OOZ/Cannon.xml
[4A]
name=Octus
art=../art/nemesis/Octopus badnik from OOZ.bin
-map=../mappings/sprite/obj4A.bin
+mapasm=../mappings/sprite/obj4A.asm
frame=0
pal=1
rememberstate=True
[50]
name=Aquis
art=../art/nemesis/Seahorse from OOZ.bin
-map=../mappings/sprite/obj50.bin
+mapasm=../mappings/sprite/obj50.asm
frame=0
pal=1
-rememberstate=True
\ No newline at end of file
+rememberstate=True
diff --git a/SonLVL INI Files/objSCZ.ini b/SonLVL INI Files/objSCZ.ini
index b3761c7b..961aeb6c 100644
--- a/SonLVL INI Files/objSCZ.ini
+++ b/SonLVL INI Files/objSCZ.ini
@@ -1,7 +1,7 @@
[99]
name=Nebula
art=../art/nemesis/Bomber badnik from SCZ.bin
-map=../mappings/sprite/obj99.bin
+mapasm=../mappings/sprite/obj99.asm
frame=1
pal=1
subtypes=12
@@ -13,7 +13,7 @@ xmlfile=SCZ/Balkrie.xml
[B2]
name=The Tornado
art=../art/nemesis/The Tornado.bin|../art/nemesis/The Tornado.bin:0x5100
-map=../mappings/sprite/objB2_a.bin
+mapasm=../mappings/sprite/objB2_a.asm
frame=0
pal=0
rememberstate=True
@@ -22,7 +22,7 @@ xmlfile=SCZ/Clouds.xml
[B4]
name=Vertical Propeller
art=../art/nemesis/Vertical spinning blades in WFZ.bin
-map=../mappings/sprite/objB4.bin
+mapasm=../mappings/sprite/objB4.asm
frame=0
pal=1
subtypes=64
@@ -30,7 +30,7 @@ defaultsubtype=64
[B5]
name=Horizontal Propeller
art=../art/nemesis/Horizontal spinning blades in WFZ.bin
-map=../mappings/sprite/objB5.bin
+mapasm=../mappings/sprite/objB5.asm
frame=0
pal=1
subtypes=68
diff --git a/SonLVL INI Files/objWFZ.ini b/SonLVL INI Files/objWFZ.ini
index 80bd8657..2836b69f 100644
--- a/SonLVL INI Files/objWFZ.ini
+++ b/SonLVL INI Files/objWFZ.ini
@@ -1,7 +1,7 @@
[19]
name=Moving Platform
art=../art/nemesis/Moving platform from WFZ.bin
-map=../mappings/sprite/obj19.bin
+mapasm=../mappings/sprite/obj19.asm
frame=3
pal=1
subtypes=30,32,38,39,3A,3B,3C,3D,3E,3F
@@ -11,7 +11,7 @@ name=One-Way Barrier
debug=True
[72]
name=Conveyor Belt
-map=../mappings/sprite/obj72.bin
+mapasm=../mappings/sprite/obj72.asm
frame=0
pal=0
subtypes=90
@@ -19,7 +19,7 @@ defaultsubtype=90
[80]
name=Hook on Chain
art=../art/nemesis/Hook on chain from WFZ.bin:-128
-map=../mappings/sprite/obj80_b.bin
+mapasm=../mappings/sprite/obj80_b.asm
frame=0
pal=1
[8B]
@@ -27,7 +27,7 @@ xmlfile=WFZ/Cycling palette switcher.xml
[AD]
name=Clucker Base
art=../art/nemesis/Scratch from WFZ.bin
-map=../mappings/sprite/objAE.bin
+mapasm=../mappings/sprite/objAE.asm
frame=12
pal=0
subtypes=42
@@ -36,7 +36,7 @@ rememberstate=True
[AE]
name=Clucker
art=../art/nemesis/Scratch from WFZ.bin
-map=../mappings/sprite/objAE.bin
+mapasm=../mappings/sprite/objAE.asm
frame=7
pal=0
subtypes=44
@@ -45,14 +45,14 @@ rememberstate=True
[B2]
name=The Tornado
art=../art/nemesis/The Tornado.bin|../art/nemesis/The Tornado.bin:0x5100
-map=../mappings/sprite/objB2_a.bin
+mapasm=../mappings/sprite/objB2_a.asm
frame=0
pal=0
rememberstate=True
[B4]
name=Vertical Propeller
art=../art/nemesis/Vertical spinning blades in WFZ.bin
-map=../mappings/sprite/objB4.bin
+mapasm=../mappings/sprite/objB4.asm
frame=0
pal=1
subtypes=64
@@ -60,7 +60,7 @@ defaultsubtype=64
[B5]
name=Horizontal Propeller
art=../art/nemesis/Horizontal spinning blades in WFZ.bin
-map=../mappings/sprite/objB5.bin
+mapasm=../mappings/sprite/objB5.asm
frame=0
pal=1
subtypes=66
@@ -68,13 +68,13 @@ defaultsubtype=66
[B6]
name=Spinning Platform
art=../art/nemesis/Tilting plaforms in WFZ.bin
-map=../mappings/sprite/objB6.bin
+mapasm=../mappings/sprite/objB6.asm
frame=0
pal=1
[B8]
name=Wall Turret
art=../art/nemesis/Wall turret from WFZ.bin
-map=../mappings/sprite/objB8.bin
+mapasm=../mappings/sprite/objB8.asm
frame=0
pal=0
subtypes=74
@@ -82,7 +82,7 @@ defaultsubtype=74
[B9]
name=Laser
art=../art/nemesis/Red horizontal laser from WFZ.bin
-map=../mappings/sprite/objB9.bin
+mapasm=../mappings/sprite/objB9.asm
frame=0
pal=2
subtypes=76
@@ -91,7 +91,7 @@ rememberstate=True
[BA]
name=Conveyor Belt Ends
art=../art/nemesis/Wheel for belt in WFZ.bin
-map=../mappings/sprite/objBA.bin
+mapasm=../mappings/sprite/objBA.asm
frame=0
pal=2
subtypes=78
@@ -99,14 +99,14 @@ defaultsubtype=78
[BC]
name=Eggman's Ship's Flames
art=../art/nemesis/Thrust from Robotnik's getaway ship in WFZ.bin
-map=../mappings/sprite/objBC.bin
+mapasm=../mappings/sprite/objBC.asm
frame=0
pal=2
rememberstate=True
[BD]
name=Mechanical Platforms
art=../art/nemesis/Platform on belt in WFZ.bin
-map=../mappings/sprite/objBD.bin
+mapasm=../mappings/sprite/objBD.asm
frame=0
pal=1
subtypes=7E,80
@@ -114,20 +114,20 @@ defaultsubtype=7E
[BE]
name=Retracting Platform
art=../art/nemesis/Retracting platform from WFZ.bin
-map=../mappings/sprite/objBE.bin
+mapasm=../mappings/sprite/objBE.asm
frame=4
pal=3
[C0]
name=Speed Launcher
art=../art/nemesis/Catapult that shoots Sonic to the side from WFZ.bin
-map=../mappings/sprite/objC0.bin
+mapasm=../mappings/sprite/objC0.asm
frame=0
pal=1
rememberstate=True
[C1]
name=Breaking Pannels
art=../art/nemesis/Breakaway panels from WFZ.bin
-map=../mappings/sprite/objC1.bin
+mapasm=../mappings/sprite/objC1.asm
frame=0
pal=1
subtypes=02
@@ -135,7 +135,7 @@ defaultsubtype=02
[C2]
name=Boss Entrance
art=../art/nemesis/WFZ boss chamber switch.bin
-map=../mappings/sprite/objC2.bin
+mapasm=../mappings/sprite/objC2.asm
frame=0
pal=1
subtypes=8A
@@ -143,10 +143,10 @@ defaultsubtype=8A
[C5]
name=WFZ Boss
art=../art/nemesis/WFZ boss.bin
-map=../mappings/sprite/objC5_a.bin
+mapasm=../mappings/sprite/objC5_a.asm
frame=0
pal=0
rememberstate=True
[D9]
name=Grabbable Object
-debug=True
\ No newline at end of file
+debug=True
diff --git a/build.lua b/build.lua
index 15bf2431..7d6733cf 100755
--- a/build.lua
+++ b/build.lua
@@ -155,7 +155,7 @@ hashes_file:close()
message_abort_wrapper(common.build_rom("s2", "s2built", "", "-p=0 -z=0," .. (improved_sound_driver_compression and "saxman-optimised" or "saxman-bugged") .. ",Size_of_Snd_driver_guess,after", true, repository))
-- Correct some pointers and other data that we couldn't until after the ROM had been assembled.
-os.execute(tools.fixpointer .. " s2.h s2built.bin off_3A294 MapRUnc_Sonic 0x2D 0 4 word_728C_user Obj5F_MapUnc_7240 2 2 1")
+os.execute(tools.fixpointer .. " s2.h s2built.bin")
-- Remove the header file, since we no longer need it.
os.remove("s2.h")
diff --git a/mappings/sprite/Sonic.asm b/mappings/sprite/Sonic.asm
new file mode 100644
index 00000000..9194d273
--- /dev/null
+++ b/mappings/sprite/Sonic.asm
@@ -0,0 +1,1552 @@
+Map_Sonic: mappingsTable
+ mappingsTableEntry.w Map_Sonic_01AC
+ mappingsTableEntry.w Map_Sonic_01AE
+ mappingsTableEntry.w Map_Sonic_01D0
+ mappingsTableEntry.w Map_Sonic_01E2
+ mappingsTableEntry.w Map_Sonic_0204
+ mappingsTableEntry.w Map_Sonic_0226
+ mappingsTableEntry.w Map_Sonic_0250
+ mappingsTableEntry.w Map_Sonic_026A
+ mappingsTableEntry.w Map_Sonic_027C
+ mappingsTableEntry.w Map_Sonic_028E
+ mappingsTableEntry.w Map_Sonic_02A0
+ mappingsTableEntry.w Map_Sonic_02B2
+ mappingsTableEntry.w Map_Sonic_02D4
+ mappingsTableEntry.w Map_Sonic_02F6
+ mappingsTableEntry.w Map_Sonic_0310
+ mappingsTableEntry.w Map_Sonic_0332
+ mappingsTableEntry.w Map_Sonic_034C
+ mappingsTableEntry.w Map_Sonic_035E
+ mappingsTableEntry.w Map_Sonic_0378
+ mappingsTableEntry.w Map_Sonic_039A
+ mappingsTableEntry.w Map_Sonic_03B4
+ mappingsTableEntry.w Map_Sonic_03C6
+ mappingsTableEntry.w Map_Sonic_03E8
+ mappingsTableEntry.w Map_Sonic_0412
+ mappingsTableEntry.w Map_Sonic_0434
+ mappingsTableEntry.w Map_Sonic_0456
+ mappingsTableEntry.w Map_Sonic_0480
+ mappingsTableEntry.w Map_Sonic_04AA
+ mappingsTableEntry.w Map_Sonic_04CC
+ mappingsTableEntry.w Map_Sonic_04F6
+ mappingsTableEntry.w Map_Sonic_0510
+ mappingsTableEntry.w Map_Sonic_052A
+ mappingsTableEntry.w Map_Sonic_0544
+ mappingsTableEntry.w Map_Sonic_0556
+ mappingsTableEntry.w Map_Sonic_0570
+ mappingsTableEntry.w Map_Sonic_058A
+ mappingsTableEntry.w Map_Sonic_05A4
+ mappingsTableEntry.w Map_Sonic_05B6
+ mappingsTableEntry.w Map_Sonic_05D8
+ mappingsTableEntry.w Map_Sonic_0602
+ mappingsTableEntry.w Map_Sonic_0624
+ mappingsTableEntry.w Map_Sonic_0646
+ mappingsTableEntry.w Map_Sonic_0668
+ mappingsTableEntry.w Map_Sonic_0692
+ mappingsTableEntry.w Map_Sonic_06B4
+ mappingsTableEntry.w Map_Sonic_06D6
+ mappingsTableEntry.w Map_Sonic_06E8
+ mappingsTableEntry.w Map_Sonic_06FA
+ mappingsTableEntry.w Map_Sonic_070C
+ mappingsTableEntry.w Map_Sonic_071E
+ mappingsTableEntry.w Map_Sonic_0740
+ mappingsTableEntry.w Map_Sonic_075A
+ mappingsTableEntry.w Map_Sonic_077C
+ mappingsTableEntry.w Map_Sonic_0796
+ mappingsTableEntry.w Map_Sonic_07A8
+ mappingsTableEntry.w Map_Sonic_07BA
+ mappingsTableEntry.w Map_Sonic_07CC
+ mappingsTableEntry.w Map_Sonic_07DE
+ mappingsTableEntry.w Map_Sonic_07F8
+ mappingsTableEntry.w Map_Sonic_080A
+ mappingsTableEntry.w Map_Sonic_0824
+ mappingsTableEntry.w Map_Sonic_0836
+ mappingsTableEntry.w Map_Sonic_0840
+ mappingsTableEntry.w Map_Sonic_084A
+ mappingsTableEntry.w Map_Sonic_0854
+ mappingsTableEntry.w Map_Sonic_085E
+ mappingsTableEntry.w Map_Sonic_0868
+ mappingsTableEntry.w Map_Sonic_0872
+ mappingsTableEntry.w Map_Sonic_087C
+ mappingsTableEntry.w Map_Sonic_0886
+ mappingsTableEntry.w Map_Sonic_0890
+ mappingsTableEntry.w Map_Sonic_089A
+ mappingsTableEntry.w Map_Sonic_08A4
+ mappingsTableEntry.w Map_Sonic_08BE
+ mappingsTableEntry.w Map_Sonic_08D8
+ mappingsTableEntry.w Map_Sonic_08F2
+ mappingsTableEntry.w Map_Sonic_090C
+ mappingsTableEntry.w Map_Sonic_0916
+ mappingsTableEntry.w Map_Sonic_0920
+ mappingsTableEntry.w Map_Sonic_0932
+ mappingsTableEntry.w Map_Sonic_0944
+ mappingsTableEntry.w Map_Sonic_095E
+ mappingsTableEntry.w Map_Sonic_0978
+ mappingsTableEntry.w Map_Sonic_098A
+ mappingsTableEntry.w Map_Sonic_099C
+ mappingsTableEntry.w Map_Sonic_09B6
+ mappingsTableEntry.w Map_Sonic_09D8
+ mappingsTableEntry.w Map_Sonic_09F2
+ mappingsTableEntry.w Map_Sonic_0A0C
+ mappingsTableEntry.w Map_Sonic_0A26
+ mappingsTableEntry.w Map_Sonic_0A40
+ mappingsTableEntry.w Map_Sonic_0A5A
+ mappingsTableEntry.w Map_Sonic_0A6C
+ mappingsTableEntry.w Map_Sonic_0A8E
+ mappingsTableEntry.w Map_Sonic_0AB0
+ mappingsTableEntry.w Map_Sonic_0ACA
+ mappingsTableEntry.w Map_Sonic_0AE4
+ mappingsTableEntry.w Map_Sonic_0AFE
+ mappingsTableEntry.w Map_Sonic_0B10
+ mappingsTableEntry.w Map_Sonic_0B1A
+ mappingsTableEntry.w Map_Sonic_0B2C
+ mappingsTableEntry.w Map_Sonic_0B46
+ mappingsTableEntry.w Map_Sonic_0B60
+ mappingsTableEntry.w Map_Sonic_0B7A
+ mappingsTableEntry.w Map_Sonic_0B8C
+ mappingsTableEntry.w Map_Sonic_0B9E
+ mappingsTableEntry.w Map_Sonic_0BB8
+ mappingsTableEntry.w Map_Sonic_0BCA
+ mappingsTableEntry.w Map_Sonic_0BE4
+ mappingsTableEntry.w Map_Sonic_0BFE
+ mappingsTableEntry.w Map_Sonic_0C08
+ mappingsTableEntry.w Map_Sonic_0C22
+ mappingsTableEntry.w Map_Sonic_0C3C
+ mappingsTableEntry.w Map_Sonic_0C66
+ mappingsTableEntry.w Map_Sonic_0C90
+ mappingsTableEntry.w Map_Sonic_0CA2
+ mappingsTableEntry.w Map_Sonic_0CB4
+ mappingsTableEntry.w Map_Sonic_0CC6
+ mappingsTableEntry.w Map_Sonic_0CE0
+ mappingsTableEntry.w Map_Sonic_0D02
+ mappingsTableEntry.w Map_Sonic_0D1C
+ mappingsTableEntry.w Map_Sonic_0D2E
+ mappingsTableEntry.w Map_Sonic_0D48
+ mappingsTableEntry.w Map_Sonic_0D6A
+ mappingsTableEntry.w Map_Sonic_0D84
+ mappingsTableEntry.w Map_Sonic_0D96
+ mappingsTableEntry.w Map_Sonic_0DB8
+ mappingsTableEntry.w Map_Sonic_0DE2
+ mappingsTableEntry.w Map_Sonic_0E0C
+ mappingsTableEntry.w Map_Sonic_0E36
+ mappingsTableEntry.w Map_Sonic_0E68
+ mappingsTableEntry.w Map_Sonic_0E9A
+ mappingsTableEntry.w Map_Sonic_0EC4
+ mappingsTableEntry.w Map_Sonic_0EEE
+ mappingsTableEntry.w Map_Sonic_0F08
+ mappingsTableEntry.w Map_Sonic_0F22
+ mappingsTableEntry.w Map_Sonic_0F3C
+ mappingsTableEntry.w Map_Sonic_0F4E
+ mappingsTableEntry.w Map_Sonic_0F68
+ mappingsTableEntry.w Map_Sonic_0F82
+ mappingsTableEntry.w Map_Sonic_0F9C
+ mappingsTableEntry.w Map_Sonic_0FAE
+ mappingsTableEntry.w Map_Sonic_0FD0
+ mappingsTableEntry.w Map_Sonic_0FFA
+ mappingsTableEntry.w Map_Sonic_101C
+ mappingsTableEntry.w Map_Sonic_103E
+ mappingsTableEntry.w Map_Sonic_1060
+ mappingsTableEntry.w Map_Sonic_108A
+ mappingsTableEntry.w Map_Sonic_10AC
+ mappingsTableEntry.w Map_Sonic_10CE
+ mappingsTableEntry.w Map_Sonic_10E8
+ mappingsTableEntry.w Map_Sonic_110A
+ mappingsTableEntry.w Map_Sonic_1124
+ mappingsTableEntry.w Map_Sonic_1136
+ mappingsTableEntry.w Map_Sonic_1150
+ mappingsTableEntry.w Map_Sonic_1172
+ mappingsTableEntry.w Map_Sonic_118C
+ mappingsTableEntry.w Map_Sonic_119E
+ mappingsTableEntry.w Map_Sonic_11C8
+ mappingsTableEntry.w Map_Sonic_11FA
+ mappingsTableEntry.w Map_Sonic_1224
+ mappingsTableEntry.w Map_Sonic_124E
+ mappingsTableEntry.w Map_Sonic_1280
+ mappingsTableEntry.w Map_Sonic_12B2
+ mappingsTableEntry.w Map_Sonic_12DC
+ mappingsTableEntry.w Map_Sonic_130E
+ mappingsTableEntry.w Map_Sonic_1328
+ mappingsTableEntry.w Map_Sonic_1342
+ mappingsTableEntry.w Map_Sonic_135C
+ mappingsTableEntry.w Map_Sonic_136E
+ mappingsTableEntry.w Map_Sonic_1388
+ mappingsTableEntry.w Map_Sonic_13A2
+ mappingsTableEntry.w Map_Sonic_13BC
+ mappingsTableEntry.w Map_Sonic_13CE
+ mappingsTableEntry.w Map_Sonic_13F0
+ mappingsTableEntry.w Map_Sonic_141A
+ mappingsTableEntry.w Map_Sonic_1444
+ mappingsTableEntry.w Map_Sonic_1466
+ mappingsTableEntry.w Map_Sonic_1488
+ mappingsTableEntry.w Map_Sonic_14B2
+ mappingsTableEntry.w Map_Sonic_14DC
+ mappingsTableEntry.w Map_Sonic_1506
+ mappingsTableEntry.w Map_Sonic_1528
+ mappingsTableEntry.w Map_Sonic_154A
+ mappingsTableEntry.w Map_Sonic_156C
+ mappingsTableEntry.w Map_Sonic_1596
+ mappingsTableEntry.w Map_Sonic_15B8
+ mappingsTableEntry.w Map_Sonic_15DA
+ mappingsTableEntry.w Map_Sonic_15FC
+ mappingsTableEntry.w Map_Sonic_1626
+ mappingsTableEntry.w Map_Sonic_1648
+ mappingsTableEntry.w Map_Sonic_166A
+ mappingsTableEntry.w Map_Sonic_168C
+ mappingsTableEntry.w Map_Sonic_16AE
+ mappingsTableEntry.w Map_Sonic_16C0
+ mappingsTableEntry.w Map_Sonic_16DA
+ mappingsTableEntry.w Map_Sonic_16F4
+ mappingsTableEntry.w Map_Sonic_170E
+ mappingsTableEntry.w Map_Sonic_1728
+ mappingsTableEntry.w Map_Sonic_1742
+ mappingsTableEntry.w Map_Sonic_175C
+ mappingsTableEntry.w Map_Sonic_1776
+ mappingsTableEntry.w Map_Sonic_1790
+ mappingsTableEntry.w Map_Sonic_17AA
+ mappingsTableEntry.w Map_Sonic_17D4
+ mappingsTableEntry.w Map_Sonic_17F6
+ mappingsTableEntry.w Map_Sonic_1818
+ mappingsTableEntry.w Map_Sonic_183A
+ mappingsTableEntry.w Map_Sonic_1854
+ mappingsTableEntry.w Map_Sonic_186E
+ mappingsTableEntry.w Map_Sonic_1888
+ mappingsTableEntry.w Map_Sonic_18AA
+ mappingsTableEntry.w Map_Sonic_18CC
+ mappingsTableEntry.w Map_Sonic_18EE
+
+Map_Sonic_01AC: spriteHeader
+Map_Sonic_01AC_End
+
+Map_Sonic_01AE: spriteHeader
+ spritePiece -8, -$1C, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$14, 1, 4, 4, 0, 0, 0, 0
+ spritePiece -8, -$C, 3, 2, 8, 0, 0, 0, 0
+ spritePiece -8, 4, 3, 2, $E, 0, 0, 0, 0
+Map_Sonic_01AE_End
+
+Map_Sonic_01D0: spriteHeader
+ spritePiece -$10, -$14, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -8, $C, 3, 2, $C, 0, 0, 0, 0
+Map_Sonic_01D0_End
+
+Map_Sonic_01E2: spriteHeader
+ spritePiece -$10, -$14, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -8, -$14, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -8, -4, 2, 2, 8, 0, 0, 0, 0
+ spritePiece -8, $C, 3, 2, $C, 0, 0, 0, 0
+Map_Sonic_01E2_End
+
+Map_Sonic_0204: spriteHeader
+ spritePiece -$10, -$14, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -8, -$14, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -8, -4, 2, 2, 8, 0, 0, 0, 0
+ spritePiece -8, $C, 3, 2, $C, 0, 0, 0, 0
+Map_Sonic_0204_End
+
+Map_Sonic_0226: spriteHeader
+ spritePiece -$10, -$14, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -8, -$14, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -8, -4, 2, 2, 8, 0, 0, 0, 0
+ spritePiece -8, $C, 1, 2, $C, 0, 0, 0, 0
+ spritePiece 0, $C, 2, 2, $E, 0, 0, 0, 0
+Map_Sonic_0226_End
+
+Map_Sonic_0250: spriteHeader
+ spritePiece -$10, -$14, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -8, -$14, 2, 4, 4, 0, 0, 0, 0
+ spritePiece -8, $C, 3, 2, $C, 0, 0, 0, 0
+Map_Sonic_0250_End
+
+Map_Sonic_026A: spriteHeader
+ spritePiece -$10, -$C, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 8, 4, 1, 2, $C, 0, 0, 0, 0
+Map_Sonic_026A_End
+
+Map_Sonic_027C: spriteHeader
+ spritePiece -$18, -$C, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 0, 4, 2, 2, $C, 0, 0, 0, 0
+Map_Sonic_027C_End
+
+Map_Sonic_028E: spriteHeader
+ spritePiece -$18, -$C, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 0, 4, 2, 2, $C, 0, 0, 0, 0
+Map_Sonic_028E_End
+
+Map_Sonic_02A0: spriteHeader
+ spritePiece -$10, -$1C, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, 4, 4, 2, $C, 0, 0, 0, 0
+Map_Sonic_02A0_End
+
+Map_Sonic_02B2: spriteHeader
+ spritePiece -8, -$1C, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$14, 1, 4, 4, 0, 0, 0, 0
+ spritePiece -8, -$C, 3, 2, 8, 0, 0, 0, 0
+ spritePiece -8, 4, 3, 2, $E, 0, 0, 0, 0
+Map_Sonic_02B2_End
+
+Map_Sonic_02D4: spriteHeader
+ spritePiece -$10, -$14, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -8, -$1C, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -8, -$C, 2, 2, 8, 0, 0, 0, 0
+ spritePiece -8, 4, 3, 2, $C, 0, 0, 0, 0
+Map_Sonic_02D4_End
+
+Map_Sonic_02F6: spriteHeader
+ spritePiece -$12, -$15, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$14, 3, 1, 2, 8, 0, 0, 0, 0
+ spritePiece -$C, -5, 4, 4, $A, 0, 0, 0, 0
+Map_Sonic_02F6_End
+
+Map_Sonic_0310: spriteHeader
+ spritePiece -$12, -$14, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$14, 4, 1, 2, 8, 0, 0, 0, 0
+ spritePiece -$C, -4, 3, 4, $A, 0, 0, 0, 0
+ spritePiece $C, 4, 1, 2, $16, 0, 0, 0, 0
+Map_Sonic_0310_End
+
+Map_Sonic_0332: spriteHeader
+ spritePiece -$13, -$13, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, -3, 3, 2, 8, 0, 0, 0, 0
+ spritePiece -9, $D, 2, 2, $E, 0, 0, 0, 0
+Map_Sonic_0332_End
+
+Map_Sonic_034C: spriteHeader
+ spritePiece -$C, -$14, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$12, -4, 4, 4, 6, 0, 0, 0, 0
+Map_Sonic_034C_End
+
+Map_Sonic_035E: spriteHeader
+ spritePiece -$C, -$15, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$12, -5, 4, 4, 6, 0, 0, 0, 0
+ spritePiece $E, -5, 1, 2, $16, 0, 0, 0, 0
+Map_Sonic_035E_End
+
+Map_Sonic_0378: spriteHeader
+ spritePiece -$C, -$14, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$14, 4, 1, 2, 6, 0, 0, 0, 0
+ spritePiece -$C, -4, 3, 4, 8, 0, 0, 0, 0
+ spritePiece $C, 4, 1, 2, $14, 0, 0, 0, 0
+Map_Sonic_0378_End
+
+Map_Sonic_039A: spriteHeader
+ spritePiece -$13, -$13, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, -3, 3, 2, 8, 0, 0, 0, 0
+ spritePiece -9, $D, 2, 2, $E, 0, 0, 0, 0
+Map_Sonic_039A_End
+
+Map_Sonic_03B4: spriteHeader
+ spritePiece -$12, -$14, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$D, -4, 3, 4, 8, 0, 0, 0, 0
+Map_Sonic_03B4_End
+
+Map_Sonic_03C6: spriteHeader
+ spritePiece -$16, -$15, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$16, -5, 3, 2, 6, 0, 0, 0, 0
+ spritePiece 2, -$D, 2, 2, $C, 0, 0, 0, 0
+ spritePiece -6, $B, 1, 2, $10, 0, 0, 0, 0
+Map_Sonic_03C6_End
+
+Map_Sonic_03E8: spriteHeader
+ spritePiece -$15, -$14, 3, 2, 0, 0, 0, 0, 0
+ spritePiece 3, -$14, 1, 2, 6, 0, 0, 0, 0
+ spritePiece -$15, -4, 4, 2, 8, 0, 0, 0, 0
+ spritePiece $B, -4, 2, 2, $10, 0, 0, 0, 0
+ spritePiece -5, $C, 1, 2, $14, 0, 0, 0, 0
+Map_Sonic_03E8_End
+
+Map_Sonic_0412: spriteHeader
+ spritePiece -$14, -$13, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$13, 1, 4, 8, 0, 0, 0, 0
+ spritePiece 4, -$B, 1, 2, $C, 0, 0, 0, 0
+ spritePiece 4, 5, 2, 2, $E, 0, 0, 0, 0
+Map_Sonic_0412_End
+
+Map_Sonic_0434: spriteHeader
+ spritePiece -$15, -$14, 3, 2, 0, 0, 0, 0, 0
+ spritePiece 3, -$14, 1, 2, 6, 0, 0, 0, 0
+ spritePiece -$15, -4, 2, 2, 8, 0, 0, 0, 0
+ spritePiece -5, -4, 3, 4, $C, 0, 0, 0, 0
+Map_Sonic_0434_End
+
+Map_Sonic_0456: spriteHeader
+ spritePiece -$16, -$15, 3, 2, 0, 0, 0, 0, 0
+ spritePiece 2, -$15, 1, 2, 6, 0, 0, 0, 0
+ spritePiece -$16, -5, 4, 2, 8, 0, 0, 0, 0
+ spritePiece $A, -$D, 1, 2, $10, 0, 0, 0, 0
+ spritePiece -$E, $B, 2, 2, $12, 0, 0, 0, 0
+Map_Sonic_0456_End
+
+Map_Sonic_0480: spriteHeader
+ spritePiece -$15, -$14, 3, 2, 0, 0, 0, 0, 0
+ spritePiece 3, -$14, 1, 2, 6, 0, 0, 0, 0
+ spritePiece -$15, -4, 4, 2, 8, 0, 0, 0, 0
+ spritePiece $B, -6, 2, 2, $10, 0, 0, 0, 0
+ spritePiece -5, $C, 1, 2, $14, 0, 0, 0, 0
+Map_Sonic_0480_End
+
+Map_Sonic_04AA: spriteHeader
+ spritePiece -$14, -$13, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$13, 1, 4, 8, 0, 0, 0, 0
+ spritePiece 4, -$B, 1, 2, $C, 0, 0, 0, 0
+ spritePiece 4, 5, 2, 2, $E, 0, 0, 0, 0
+Map_Sonic_04AA_End
+
+Map_Sonic_04CC: spriteHeader
+ spritePiece -$15, -$14, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$15, -4, 3, 2, 6, 0, 0, 0, 0
+ spritePiece 3, -$C, 1, 2, $C, 0, 0, 0, 0
+ spritePiece -5, $C, 1, 2, $E, 0, 0, 0, 0
+ spritePiece 3, 4, 2, 2, $10, 0, 0, 0, 0
+Map_Sonic_04CC_End
+
+Map_Sonic_04F6: spriteHeader
+ spritePiece -$15, -$E, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -5, -$14, 3, 4, 8, 0, 0, 0, 0
+ spritePiece 3, $C, 2, 2, $14, 0, 0, 0, 0
+Map_Sonic_04F6_End
+
+Map_Sonic_0510: spriteHeader
+ spritePiece -$14, -$E, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$14, 3, 4, 8, 0, 0, 0, 0
+ spritePiece 4, $C, 2, 2, $14, 0, 0, 0, 0
+Map_Sonic_0510_End
+
+Map_Sonic_052A: spriteHeader
+ spritePiece -$13, -$D, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -3, -$C, 1, 4, 8, 0, 0, 0, 0
+ spritePiece 5, -7, 2, 2, $C, 0, 0, 0, 0
+Map_Sonic_052A_End
+
+Map_Sonic_0544: spriteHeader
+ spritePiece -$14, -$C, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$E, 3, 4, 8, 0, 0, 0, 0
+Map_Sonic_0544_End
+
+Map_Sonic_0556: spriteHeader
+ spritePiece -$15, -$C, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -5, -$1D, 2, 2, 8, 0, 0, 0, 0
+ spritePiece -5, -$D, 3, 4, $C, 0, 0, 0, 0
+Map_Sonic_0556_End
+
+Map_Sonic_0570: spriteHeader
+ spritePiece -$14, -$C, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$14, 3, 4, 8, 0, 0, 0, 0
+ spritePiece 4, $C, 2, 2, $14, 0, 0, 0, 0
+Map_Sonic_0570_End
+
+Map_Sonic_058A: spriteHeader
+ spritePiece -$13, -$D, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -3, -$C, 1, 4, 8, 0, 0, 0, 0
+ spritePiece 5, -7, 2, 2, $C, 0, 0, 0, 0
+Map_Sonic_058A_End
+
+Map_Sonic_05A4: spriteHeader
+ spritePiece -$14, -$E, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$C, 3, 4, 8, 0, 0, 0, 0
+Map_Sonic_05A4_End
+
+Map_Sonic_05B6: spriteHeader
+ spritePiece -$D, -$12, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$15, -2, 2, 4, 4, 0, 0, 0, 0
+ spritePiece -5, -2, 4, 2, $C, 0, 0, 0, 0
+ spritePiece -5, $E, 1, 2, $14, 0, 0, 0, 0
+Map_Sonic_05B6_End
+
+Map_Sonic_05D8: spriteHeader
+ spritePiece -4, -$23, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, -$13, 3, 2, 4, 0, 0, 0, 0
+ spritePiece -$14, -3, 2, 4, $A, 0, 0, 0, 0
+ spritePiece -4, -3, 4, 2, $12, 0, 0, 0, 0
+ spritePiece -4, $D, 1, 2, $1A, 0, 0, 0, 0
+Map_Sonic_05D8_End
+
+Map_Sonic_0602: spriteHeader
+ spritePiece -$B, -$14, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$13, -4, 2, 4, 8, 0, 0, 0, 0
+ spritePiece -3, -4, 2, 2, $10, 0, 0, 0, 0
+ spritePiece -3, $C, 1, 2, $14, 0, 0, 0, 0
+Map_Sonic_0602_End
+
+Map_Sonic_0624: spriteHeader
+ spritePiece -$C, -$13, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$14, -3, 2, 4, 8, 0, 0, 0, 0
+ spritePiece -4, -3, 3, 2, $10, 0, 0, 0, 0
+ spritePiece -4, $D, 1, 2, $16, 0, 0, 0, 0
+Map_Sonic_0624_End
+
+Map_Sonic_0646: spriteHeader
+ spritePiece -$D, -$12, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$15, -2, 2, 4, 6, 0, 0, 0, 0
+ spritePiece -5, -2, 4, 2, $E, 0, 0, 0, 0
+ spritePiece -5, $E, 1, 2, $16, 0, 0, 0, 0
+Map_Sonic_0646_End
+
+Map_Sonic_0668: spriteHeader
+ spritePiece -6, -$23, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, -$13, 3, 2, 4, 0, 0, 0, 0
+ spritePiece -$14, -3, 2, 4, $A, 0, 0, 0, 0
+ spritePiece -4, -3, 4, 2, $12, 0, 0, 0, 0
+ spritePiece -4, $D, 1, 2, $1A, 0, 0, 0, 0
+Map_Sonic_0668_End
+
+Map_Sonic_0692: spriteHeader
+ spritePiece -$B, -$14, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$13, -4, 2, 4, 8, 0, 0, 0, 0
+ spritePiece -3, -4, 2, 2, $10, 0, 0, 0, 0
+ spritePiece -3, $C, 1, 2, $14, 0, 0, 0, 0
+Map_Sonic_0692_End
+
+Map_Sonic_06B4: spriteHeader
+ spritePiece -$C, -$13, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$14, -3, 2, 4, 8, 0, 0, 0, 0
+ spritePiece -4, -3, 3, 2, $10, 0, 0, 0, 0
+ spritePiece -4, $D, 1, 2, $16, 0, 0, 0, 0
+Map_Sonic_06B4_End
+
+Map_Sonic_06D6: spriteHeader
+ spritePiece -8, -$12, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -2, 4, 4, 6, 0, 0, 0, 0
+Map_Sonic_06D6_End
+
+Map_Sonic_06E8: spriteHeader
+ spritePiece -8, -$12, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -2, 4, 4, 6, 0, 0, 0, 0
+Map_Sonic_06E8_End
+
+Map_Sonic_06FA: spriteHeader
+ spritePiece -8, -$12, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -2, 4, 4, 6, 0, 0, 0, 0
+Map_Sonic_06FA_End
+
+Map_Sonic_070C: spriteHeader
+ spritePiece -8, -$12, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -2, 4, 4, 6, 0, 0, 0, 0
+Map_Sonic_070C_End
+
+Map_Sonic_071E: spriteHeader
+ spritePiece -$13, -$14, 3, 2, 0, 0, 0, 0, 0
+ spritePiece 5, -$14, 1, 2, 6, 0, 0, 0, 0
+ spritePiece -$C, -4, 4, 2, 8, 0, 0, 0, 0
+ spritePiece -6, $C, 3, 2, $10, 0, 0, 0, 0
+Map_Sonic_071E_End
+
+Map_Sonic_0740: spriteHeader
+ spritePiece -$13, -$14, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$B, -4, 4, 2, 8, 0, 0, 0, 0
+ spritePiece -8, $C, 3, 2, $10, 0, 0, 0, 0
+Map_Sonic_0740_End
+
+Map_Sonic_075A: spriteHeader
+ spritePiece -$13, -$14, 3, 2, 0, 0, 0, 0, 0
+ spritePiece 5, -$14, 1, 2, 6, 0, 0, 0, 0
+ spritePiece -$C, -4, 4, 2, 8, 0, 0, 0, 0
+ spritePiece -3, $C, 3, 2, $10, 0, 0, 0, 0
+Map_Sonic_075A_End
+
+Map_Sonic_077C: spriteHeader
+ spritePiece -$13, -$14, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$B, -4, 4, 2, 8, 0, 0, 0, 0
+ spritePiece -8, $C, 3, 2, $10, 0, 0, 0, 0
+Map_Sonic_077C_End
+
+Map_Sonic_0796: spriteHeader
+ spritePiece -$12, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -2, -$10, 3, 4, 8, 0, 0, 0, 0
+Map_Sonic_0796_End
+
+Map_Sonic_07A8: spriteHeader
+ spritePiece -$12, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -2, -$10, 3, 4, 8, 0, 0, 0, 0
+Map_Sonic_07A8_End
+
+Map_Sonic_07BA: spriteHeader
+ spritePiece -$12, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -2, -$10, 3, 4, 8, 0, 0, 0, 0
+Map_Sonic_07BA_End
+
+Map_Sonic_07CC: spriteHeader
+ spritePiece -$12, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -2, -$10, 3, 4, 8, 0, 0, 0, 0
+Map_Sonic_07CC_End
+
+Map_Sonic_07DE: spriteHeader
+ spritePiece -$C, -$17, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$14, -7, 2, 4, 2, 0, 0, 0, 0
+ spritePiece -4, -$14, 3, 4, $A, 0, 0, 0, 0
+Map_Sonic_07DE_End
+
+Map_Sonic_07F8: spriteHeader
+ spritePiece -$14, -$D, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$15, 3, 4, 8, 0, 0, 0, 0
+Map_Sonic_07F8_End
+
+Map_Sonic_080A: spriteHeader
+ spritePiece -$C, -$17, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$14, -7, 2, 4, 2, 0, 0, 0, 0
+ spritePiece -4, -$14, 3, 4, $A, 0, 0, 0, 0
+Map_Sonic_080A_End
+
+Map_Sonic_0824: spriteHeader
+ spritePiece -$14, -$D, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$15, 3, 4, 8, 0, 0, 0, 0
+Map_Sonic_0824_End
+
+Map_Sonic_0836: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+Map_Sonic_0836_End
+
+Map_Sonic_0840: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+Map_Sonic_0840_End
+
+Map_Sonic_084A: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+Map_Sonic_084A_End
+
+Map_Sonic_0854: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+Map_Sonic_0854_End
+
+Map_Sonic_085E: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+Map_Sonic_085E_End
+
+Map_Sonic_0868: spriteHeader
+ spritePiece -$C, -8, 4, 4, 0, 0, 0, 0, 0
+Map_Sonic_0868_End
+
+Map_Sonic_0872: spriteHeader
+ spritePiece -$C, -8, 4, 4, 0, 0, 0, 0, 0
+Map_Sonic_0872_End
+
+Map_Sonic_087C: spriteHeader
+ spritePiece -$C, -8, 4, 4, 0, 0, 0, 0, 0
+Map_Sonic_087C_End
+
+Map_Sonic_0886: spriteHeader
+ spritePiece -$C, -8, 4, 4, 0, 0, 0, 0, 0
+Map_Sonic_0886_End
+
+Map_Sonic_0890: spriteHeader
+ spritePiece -$C, -8, 4, 4, 0, 0, 0, 0, 0
+Map_Sonic_0890_End
+
+Map_Sonic_089A: spriteHeader
+ spritePiece -$C, -8, 4, 4, 0, 0, 0, 0, 0
+Map_Sonic_089A_End
+
+Map_Sonic_08A4: spriteHeader
+ spritePiece -$D, -$1B, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$D, -$B, 3, 2, 6, 0, 0, 0, 0
+ spritePiece -$15, 5, 4, 2, $C, 0, 0, 0, 0
+Map_Sonic_08A4_End
+
+Map_Sonic_08BE: spriteHeader
+ spritePiece -$D, -$1C, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$D, -$C, 3, 2, 6, 0, 0, 0, 0
+ spritePiece -$D, 4, 3, 2, $C, 0, 0, 0, 0
+Map_Sonic_08BE_End
+
+Map_Sonic_08D8: spriteHeader
+ spritePiece -$D, -$1B, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$D, -$B, 3, 2, 6, 0, 0, 0, 0
+ spritePiece -$15, 5, 4, 2, $C, 0, 0, 0, 0
+Map_Sonic_08D8_End
+
+Map_Sonic_08F2: spriteHeader
+ spritePiece -$D, -$1B, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$D, -$B, 3, 2, 6, 0, 0, 0, 0
+ spritePiece -$D, 5, 3, 2, $C, 0, 0, 0, 0
+Map_Sonic_08F2_End
+
+Map_Sonic_090C: spriteHeader
+ spritePiece -$A, -$C, 3, 4, 0, 0, 0, 0, 0
+Map_Sonic_090C_End
+
+Map_Sonic_0916: spriteHeader
+ spritePiece -$E, -$C, 4, 4, 0, 0, 0, 0, 0
+Map_Sonic_0916_End
+
+Map_Sonic_0920: spriteHeader
+ spritePiece -$14, -8, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, -$10, 4, 4, 2, 0, 0, 0, 0
+Map_Sonic_0920_End
+
+Map_Sonic_0932: spriteHeader
+ spritePiece -$14, -$10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, -$10, 4, 4, 4, 0, 0, 0, 0
+Map_Sonic_0932_End
+
+Map_Sonic_0944: spriteHeader
+ spritePiece -$18, -$18, 4, 4, 0, 0, 0, 0, 0
+ spritePiece 8, -$18, 1, 2, $10, 0, 0, 0, 0
+ spritePiece 8, -8, 2, 2, $12, 0, 0, 0, 0
+Map_Sonic_0944_End
+
+Map_Sonic_095E: spriteHeader
+ spritePiece -$18, -$18, 4, 4, 0, 0, 0, 0, 0
+ spritePiece 8, -$18, 1, 2, $10, 0, 0, 0, 0
+ spritePiece 8, -8, 2, 2, $12, 0, 0, 0, 0
+Map_Sonic_095E_End
+
+Map_Sonic_0978: spriteHeader
+ spritePiece -$C, -$18, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, 8, 3, 2, $C, 0, 0, 0, 0
+Map_Sonic_0978_End
+
+Map_Sonic_098A: spriteHeader
+ spritePiece -$C, -$18, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, 8, 3, 2, $C, 0, 0, 0, 0
+Map_Sonic_098A_End
+
+Map_Sonic_099C: spriteHeader
+ spritePiece -$14, -4, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -4, -$C, 3, 4, 4, 0, 0, 0, 0
+ spritePiece $14, -$C, 1, 2, $10, 0, 0, 0, 0
+Map_Sonic_099C_End
+
+Map_Sonic_09B6: spriteHeader
+ spritePiece -$18, -$C, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$C, 2, 4, 2, 0, 0, 0, 0
+ spritePiece 0, -$C, 2, 4, 2, 1, 0, 0, 0
+ spritePiece $10, -$C, 1, 2, 0, 1, 0, 0, 0
+Map_Sonic_09B6_End
+
+Map_Sonic_09D8: spriteHeader
+ spritePiece 4, -4, 2, 2, 0, 1, 0, 0, 0
+ spritePiece -$14, -$C, 3, 4, 4, 1, 0, 0, 0
+ spritePiece -$1C, -$C, 1, 2, $10, 1, 0, 0, 0
+Map_Sonic_09D8_End
+
+Map_Sonic_09F2: spriteHeader
+ spritePiece -$1C, -$C, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$14, -$C, 3, 4, 2, 0, 0, 0, 0
+ spritePiece 4, -4, 1, 2, $E, 0, 0, 0, 0
+Map_Sonic_09F2_End
+
+Map_Sonic_0A0C: spriteHeader
+ spritePiece $14, -$C, 1, 2, 0, 1, 0, 0, 0
+ spritePiece -4, -$C, 3, 4, 2, 1, 0, 0, 0
+ spritePiece -$C, -4, 1, 2, $E, 1, 0, 0, 0
+Map_Sonic_0A0C_End
+
+Map_Sonic_0A26: spriteHeader
+ spritePiece -$14, -4, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -4, -$C, 3, 4, 4, 0, 0, 0, 0
+ spritePiece $14, -$C, 1, 2, $10, 0, 0, 0, 0
+Map_Sonic_0A26_End
+
+Map_Sonic_0A40: spriteHeader
+ spritePiece -$C, -$1C, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$14, -$C, 4, 4, 6, 0, 0, 0, 0
+ spritePiece $C, 4, 1, 2, $16, 0, 0, 0, 0
+Map_Sonic_0A40_End
+
+Map_Sonic_0A5A: spriteHeader
+ spritePiece -$C, -$18, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -4, 8, 2, 2, $C, 0, 0, 0, 0
+Map_Sonic_0A5A_End
+
+Map_Sonic_0A6C: spriteHeader
+ spritePiece -$18, -$16, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$16, 3, 4, 2, 0, 0, 0, 0
+ spritePiece 8, -$16, 1, 2, $E, 0, 0, 0, 0
+ spritePiece -$10, $A, 4, 2, $10, 0, 0, 0, 0
+Map_Sonic_0A6C_End
+
+Map_Sonic_0A8E: spriteHeader
+ spritePiece -$18, -$16, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$16, 3, 4, 2, 0, 0, 0, 0
+ spritePiece 8, -$16, 1, 2, $E, 0, 0, 0, 0
+ spritePiece -$10, $A, 4, 2, $10, 0, 0, 0, 0
+Map_Sonic_0A8E_End
+
+Map_Sonic_0AB0: spriteHeader
+ spritePiece -$18, -$16, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 8, -$16, 1, 2, 8, 0, 0, 0, 0
+ spritePiece -$10, -6, 3, 4, $A, 0, 0, 0, 0
+Map_Sonic_0AB0_End
+
+Map_Sonic_0ACA: spriteHeader
+ spritePiece -$10, -$1C, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$C, 3, 4, 6, 0, 0, 0, 0
+ spritePiece 8, -$C, 1, 2, $12, 0, 0, 0, 0
+Map_Sonic_0ACA_End
+
+Map_Sonic_0AE4: spriteHeader
+ spritePiece -$10, -$1B, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 8, -$C, 1, 2, $C, 0, 0, 0, 0
+ spritePiece -8, 5, 2, 2, $E, 0, 0, 0, 0
+Map_Sonic_0AE4_End
+
+Map_Sonic_0AFE: spriteHeader
+ spritePiece -$F, -$14, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 9, -4, 1, 2, $C, 0, 0, 0, 0
+Map_Sonic_0AFE_End
+
+Map_Sonic_0B10: spriteHeader
+ spritePiece -$10, -$12, 4, 4, 0, 0, 0, 0, 0
+Map_Sonic_0B10_End
+
+Map_Sonic_0B1A: spriteHeader
+ spritePiece -$10, -$E, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 8, -6, 1, 2, $C, 0, 0, 0, 0
+Map_Sonic_0B1A_End
+
+Map_Sonic_0B2C: spriteHeader
+ spritePiece 0, -$1C, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$C, 3, 4, 2, 0, 0, 0, 0
+ spritePiece 8, -$C, 1, 2, $E, 0, 0, 0, 0
+Map_Sonic_0B2C_End
+
+Map_Sonic_0B46: spriteHeader
+ spritePiece -$10, -$1B, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$B, 3, 4, 6, 0, 0, 0, 0
+ spritePiece 8, -$13, 1, 4, $12, 0, 0, 0, 0
+Map_Sonic_0B46_End
+
+Map_Sonic_0B60: spriteHeader
+ spritePiece -8, -$1C, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$C, 3, 4, 4, 0, 0, 0, 0
+ spritePiece 8, -$C, 1, 2, $10, 0, 0, 0, 0
+Map_Sonic_0B60_End
+
+Map_Sonic_0B7A: spriteHeader
+ spritePiece -$10, -$13, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 8, -$B, 1, 2, $C, 0, 0, 0, 0
+Map_Sonic_0B7A_End
+
+Map_Sonic_0B8C: spriteHeader
+ spritePiece -$10, -$C, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -8, -$F, 3, 4, 2, 0, 0, 0, 0
+Map_Sonic_0B8C_End
+
+Map_Sonic_0B9E: spriteHeader
+ spritePiece -$F, -$1C, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$C, 3, 4, 4, 0, 0, 0, 0
+ spritePiece 8, -$C, 1, 2, $10, 0, 0, 0, 0
+Map_Sonic_0B9E_End
+
+Map_Sonic_0BB8: spriteHeader
+ spritePiece -$10, -$1F, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$F, 4, 4, 4, 0, 0, 0, 0
+Map_Sonic_0BB8_End
+
+Map_Sonic_0BCA: spriteHeader
+ spritePiece -$10, -$18, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$20, 1, 4, 8, 0, 0, 0, 0
+ spritePiece 0, 0, 3, 2, $C, 0, 0, 0, 0
+Map_Sonic_0BCA_End
+
+Map_Sonic_0BE4: spriteHeader
+ spritePiece -$10, -$18, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$20, 1, 4, 8, 0, 0, 0, 0
+ spritePiece 0, 0, 3, 2, $C, 0, 0, 0, 0
+Map_Sonic_0BE4_End
+
+Map_Sonic_0BFE: spriteHeader
+ spritePiece -$B, -$10, 3, 4, 0, 0, 0, 0, 0
+Map_Sonic_0BFE_End
+
+Map_Sonic_0C08: spriteHeader
+ spritePiece -$10, -$1A, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 8, -$12, 1, 2, $C, 0, 0, 0, 0
+ spritePiece -$10, 6, 3, 2, $E, 0, 0, 0, 0
+Map_Sonic_0C08_End
+
+Map_Sonic_0C22: spriteHeader
+ spritePiece -$10, -$1C, 3, 3, 0, 0, 0, 0, 0
+ spritePiece 8, -4, 1, 1, 9, 0, 0, 0, 0
+ spritePiece -$10, -4, 3, 3, $A, 0, 0, 0, 0
+Map_Sonic_0C22_End
+
+Map_Sonic_0C3C: spriteHeader
+ spritePiece -$10, -$1C, 3, 1, 0, 0, 0, 0, 0
+ spritePiece -$10, -$14, 1, 2, 3, 0, 0, 0, 0
+ spritePiece -8, -$14, 2, 2, 5, 0, 0, 0, 0
+ spritePiece -$10, -4, 3, 3, 9, 0, 0, 0, 0
+ spritePiece 8, -3, 1, 1, $12, 0, 0, 0, 0
+Map_Sonic_0C3C_End
+
+Map_Sonic_0C66: spriteHeader
+ spritePiece -$10, -$1C, 3, 1, 0, 0, 0, 0, 0
+ spritePiece -$10, -$14, 1, 2, 3, 0, 0, 0, 0
+ spritePiece -8, -$14, 2, 2, 5, 0, 0, 0, 0
+ spritePiece -$10, -4, 3, 3, 9, 0, 0, 0, 0
+ spritePiece 8, -3, 1, 1, $12, 0, 0, 0, 0
+Map_Sonic_0C66_End
+
+Map_Sonic_0C90: spriteHeader
+ spritePiece -$F, -$19, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -$D, -1, 3, 3, 9, 0, 0, 0, 0
+Map_Sonic_0C90_End
+
+Map_Sonic_0CA2: spriteHeader
+ spritePiece -$F, -$19, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -$D, -1, 3, 3, 9, 0, 0, 0, 0
+Map_Sonic_0CA2_End
+
+Map_Sonic_0CB4: spriteHeader
+ spritePiece -$F, -$19, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -$D, -1, 3, 3, 9, 0, 0, 0, 0
+Map_Sonic_0CB4_End
+
+Map_Sonic_0CC6: spriteHeader
+ spritePiece -$12, -$1D, 4, 3, 0, 0, 0, 0, 0
+ spritePiece -$14, 3, 1, 2, $C, 0, 0, 0, 0
+ spritePiece -$C, -5, 4, 4, $E, 0, 0, 0, 0
+Map_Sonic_0CC6_End
+
+Map_Sonic_0CE0: spriteHeader
+ spritePiece -$12, -$1C, 4, 3, 0, 0, 0, 0, 0
+ spritePiece -$14, 4, 1, 2, $C, 0, 0, 0, 0
+ spritePiece -$C, -4, 3, 4, $E, 0, 0, 0, 0
+ spritePiece $C, 4, 1, 2, $1A, 0, 0, 0, 0
+Map_Sonic_0CE0_End
+
+Map_Sonic_0D02: spriteHeader
+ spritePiece -$13, -$1B, 4, 3, 0, 0, 0, 0, 0
+ spritePiece -$C, -3, 3, 2, $C, 0, 0, 0, 0
+ spritePiece -9, $D, 2, 2, $12, 0, 0, 0, 0
+Map_Sonic_0D02_End
+
+Map_Sonic_0D1C: spriteHeader
+ spritePiece -$C, -$1C, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -$12, -4, 4, 4, 9, 0, 0, 0, 0
+Map_Sonic_0D1C_End
+
+Map_Sonic_0D2E: spriteHeader
+ spritePiece -$C, -$1D, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -$12, -5, 4, 4, 9, 0, 0, 0, 0
+ spritePiece $E, -5, 1, 2, $19, 0, 0, 0, 0
+Map_Sonic_0D2E_End
+
+Map_Sonic_0D48: spriteHeader
+ spritePiece -$C, -$1C, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -$14, 4, 1, 2, 9, 0, 0, 0, 0
+ spritePiece -$C, -4, 3, 4, $B, 0, 0, 0, 0
+ spritePiece $C, 4, 1, 2, $17, 0, 0, 0, 0
+Map_Sonic_0D48_End
+
+Map_Sonic_0D6A: spriteHeader
+ spritePiece -$13, -$1B, 4, 3, 0, 0, 0, 0, 0
+ spritePiece -$C, -3, 3, 2, $C, 0, 0, 0, 0
+ spritePiece -9, $D, 2, 2, $12, 0, 0, 0, 0
+Map_Sonic_0D6A_End
+
+Map_Sonic_0D84: spriteHeader
+ spritePiece -$12, -$1C, 4, 3, 0, 0, 0, 0, 0
+ spritePiece -$D, -4, 3, 4, $C, 0, 0, 0, 0
+Map_Sonic_0D84_End
+
+Map_Sonic_0D96: spriteHeader
+ spritePiece -$1E, -$15, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 2, -$D, 2, 2, 8, 0, 0, 0, 0
+ spritePiece -$16, -5, 3, 2, $C, 0, 0, 0, 0
+ spritePiece -6, $B, 1, 2, $12, 0, 0, 0, 0
+Map_Sonic_0D96_End
+
+Map_Sonic_0DB8: spriteHeader
+ spritePiece -$1D, -$14, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 3, -$14, 1, 2, 8, 0, 0, 0, 0
+ spritePiece -$15, -4, 4, 2, $A, 0, 0, 0, 0
+ spritePiece $B, -4, 2, 2, $12, 0, 0, 0, 0
+ spritePiece -5, $C, 1, 2, $16, 0, 0, 0, 0
+Map_Sonic_0DB8_End
+
+Map_Sonic_0DE2: spriteHeader
+ spritePiece -$1C, -$13, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -4, -$13, 1, 4, 9, 0, 0, 0, 0
+ spritePiece -$C, 5, 1, 1, $D, 0, 0, 0, 0
+ spritePiece 4, -$B, 1, 2, $E, 0, 0, 0, 0
+ spritePiece 4, 5, 2, 2, $10, 0, 0, 0, 0
+Map_Sonic_0DE2_End
+
+Map_Sonic_0E0C: spriteHeader
+ spritePiece -$F, -$1C, 1, 1, 0, 0, 0, 0, 0
+ spritePiece -$1D, -$14, 4, 2, 1, 0, 0, 0, 0
+ spritePiece 3, -$14, 1, 2, 9, 0, 0, 0, 0
+ spritePiece -$15, -4, 2, 2, $B, 0, 0, 0, 0
+ spritePiece -5, -4, 3, 4, $F, 0, 0, 0, 0
+Map_Sonic_0E0C_End
+
+Map_Sonic_0E36: spriteHeader
+ spritePiece -$10, -$1D, 1, 1, 0, 0, 0, 0, 0
+ spritePiece -$1E, -$15, 4, 2, 1, 0, 0, 0, 0
+ spritePiece 2, -$15, 1, 2, 9, 0, 0, 0, 0
+ spritePiece $A, -$D, 1, 2, $B, 0, 0, 0, 0
+ spritePiece -$16, -5, 4, 2, $D, 0, 0, 0, 0
+ spritePiece -$E, $B, 2, 2, $15, 0, 0, 0, 0
+Map_Sonic_0E36_End
+
+Map_Sonic_0E68: spriteHeader
+ spritePiece -$F, -$1C, 1, 1, 0, 0, 0, 0, 0
+ spritePiece -$1D, -$14, 4, 2, 1, 0, 0, 0, 0
+ spritePiece 3, -$14, 1, 2, 9, 0, 0, 0, 0
+ spritePiece -$15, -4, 4, 2, $B, 0, 0, 0, 0
+ spritePiece $B, -6, 2, 2, $13, 0, 0, 0, 0
+ spritePiece -5, $C, 1, 2, $17, 0, 0, 0, 0
+Map_Sonic_0E68_End
+
+Map_Sonic_0E9A: spriteHeader
+ spritePiece -$1C, -$13, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -4, -$13, 1, 4, 9, 0, 0, 0, 0
+ spritePiece -$C, 5, 1, 1, $D, 0, 0, 0, 0
+ spritePiece 4, -$B, 1, 2, $E, 0, 0, 0, 0
+ spritePiece 4, 5, 2, 2, $10, 0, 0, 0, 0
+Map_Sonic_0E9A_End
+
+Map_Sonic_0EC4: spriteHeader
+ spritePiece -$1D, -$14, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 3, -$C, 1, 2, 8, 0, 0, 0, 0
+ spritePiece -$15, -4, 3, 2, $A, 0, 0, 0, 0
+ spritePiece -5, $C, 1, 1, $10, 0, 0, 0, 0
+ spritePiece 3, 4, 2, 2, $11, 0, 0, 0, 0
+Map_Sonic_0EC4_End
+
+Map_Sonic_0EEE: spriteHeader
+ spritePiece -$1D, -$E, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -5, -$14, 3, 4, $C, 0, 0, 0, 0
+ spritePiece 3, $C, 2, 2, $18, 0, 0, 0, 0
+Map_Sonic_0EEE_End
+
+Map_Sonic_0F08: spriteHeader
+ spritePiece -$1C, -$E, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$14, 3, 4, $C, 0, 0, 0, 0
+ spritePiece 4, $C, 2, 2, $18, 0, 0, 0, 0
+Map_Sonic_0F08_End
+
+Map_Sonic_0F22: spriteHeader
+ spritePiece -$1B, -$D, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -3, -$C, 1, 4, $C, 0, 0, 0, 0
+ spritePiece 5, -7, 2, 2, $10, 0, 0, 0, 0
+Map_Sonic_0F22_End
+
+Map_Sonic_0F3C: spriteHeader
+ spritePiece -$1C, -$C, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -4, -$E, 3, 4, 9, 0, 0, 0, 0
+Map_Sonic_0F3C_End
+
+Map_Sonic_0F4E: spriteHeader
+ spritePiece -$1D, -$C, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -5, -$1D, 2, 2, 9, 0, 0, 0, 0
+ spritePiece -5, -$D, 3, 4, $D, 0, 0, 0, 0
+Map_Sonic_0F4E_End
+
+Map_Sonic_0F68: spriteHeader
+ spritePiece -$1C, -$C, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -4, -$14, 3, 4, 9, 0, 0, 0, 0
+ spritePiece 4, $C, 2, 2, $15, 0, 0, 0, 0
+Map_Sonic_0F68_End
+
+Map_Sonic_0F82: spriteHeader
+ spritePiece -$1B, -$D, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -3, -$C, 1, 4, $C, 0, 0, 0, 0
+ spritePiece 5, -7, 2, 2, $10, 0, 0, 0, 0
+Map_Sonic_0F82_End
+
+Map_Sonic_0F9C: spriteHeader
+ spritePiece -$1C, -$C, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$E, 3, 4, $C, 0, 0, 0, 0
+Map_Sonic_0F9C_End
+
+Map_Sonic_0FAE: spriteHeader
+ spritePiece -$D, -$12, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$15, -2, 2, 4, 4, 0, 0, 0, 0
+ spritePiece -5, -2, 4, 2, $C, 0, 0, 0, 0
+ spritePiece -5, $E, 1, 1, $14, 0, 0, 0, 0
+Map_Sonic_0FAE_End
+
+Map_Sonic_0FD0: spriteHeader
+ spritePiece -4, -$23, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, -$13, 3, 2, 4, 0, 0, 0, 0
+ spritePiece -$14, -3, 2, 4, $A, 0, 0, 0, 0
+ spritePiece -4, -3, 4, 2, $12, 0, 0, 0, 0
+ spritePiece -4, $D, 1, 1, $1A, 0, 0, 0, 0
+Map_Sonic_0FD0_End
+
+Map_Sonic_0FFA: spriteHeader
+ spritePiece -$B, -$14, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$13, -4, 2, 4, 8, 0, 0, 0, 0
+ spritePiece -3, -4, 2, 2, $10, 0, 0, 0, 0
+ spritePiece -3, $C, 1, 2, $14, 0, 0, 0, 0
+Map_Sonic_0FFA_End
+
+Map_Sonic_101C: spriteHeader
+ spritePiece -$C, -$13, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$1C, -3, 3, 4, 8, 0, 0, 0, 0
+ spritePiece -4, -3, 3, 2, $14, 0, 0, 0, 0
+ spritePiece -4, $D, 1, 1, $1A, 0, 0, 0, 0
+Map_Sonic_101C_End
+
+Map_Sonic_103E: spriteHeader
+ spritePiece -$D, -$12, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$1D, -2, 3, 4, 6, 0, 0, 0, 0
+ spritePiece -5, -2, 4, 2, $12, 0, 0, 0, 0
+ spritePiece -5, $E, 1, 1, $1A, 0, 0, 0, 0
+Map_Sonic_103E_End
+
+Map_Sonic_1060: spriteHeader
+ spritePiece -6, -$23, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, -$13, 3, 2, 4, 0, 0, 0, 0
+ spritePiece -$1C, -3, 3, 4, $A, 0, 0, 0, 0
+ spritePiece -4, -3, 4, 2, $16, 0, 0, 0, 0
+ spritePiece -4, $D, 1, 1, $1E, 0, 0, 0, 0
+Map_Sonic_1060_End
+
+Map_Sonic_108A: spriteHeader
+ spritePiece -$B, -$14, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$13, -4, 2, 4, 8, 0, 0, 0, 0
+ spritePiece -3, -4, 2, 2, $10, 0, 0, 0, 0
+ spritePiece -3, $C, 1, 2, $14, 0, 0, 0, 0
+Map_Sonic_108A_End
+
+Map_Sonic_10AC: spriteHeader
+ spritePiece -$C, -$13, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$14, -3, 2, 4, 8, 0, 0, 0, 0
+ spritePiece -4, -3, 3, 2, $10, 0, 0, 0, 0
+ spritePiece -4, $D, 1, 1, $16, 0, 0, 0, 0
+Map_Sonic_10AC_End
+
+Map_Sonic_10CE: spriteHeader
+ spritePiece -$12, -$1D, 4, 3, 0, 0, 0, 0, 0
+ spritePiece -$14, 3, 1, 2, $C, 0, 0, 0, 0
+ spritePiece -$C, -5, 4, 4, $E, 0, 0, 0, 0
+Map_Sonic_10CE_End
+
+Map_Sonic_10E8: spriteHeader
+ spritePiece -$12, -$1C, 4, 3, 0, 0, 0, 0, 0
+ spritePiece -$14, 4, 1, 2, $C, 0, 0, 0, 0
+ spritePiece -$C, -4, 3, 4, $E, 0, 0, 0, 0
+ spritePiece $C, 4, 1, 2, $1A, 0, 0, 0, 0
+Map_Sonic_10E8_End
+
+Map_Sonic_110A: spriteHeader
+ spritePiece -$13, -$1B, 4, 3, 0, 0, 0, 0, 0
+ spritePiece -$C, -3, 3, 2, $C, 0, 0, 0, 0
+ spritePiece -9, $D, 2, 2, $12, 0, 0, 0, 0
+Map_Sonic_110A_End
+
+Map_Sonic_1124: spriteHeader
+ spritePiece -$C, -$1C, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -$12, -4, 4, 4, 9, 0, 0, 0, 0
+Map_Sonic_1124_End
+
+Map_Sonic_1136: spriteHeader
+ spritePiece -$C, -$1D, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -$12, -5, 4, 4, 9, 0, 0, 0, 0
+ spritePiece $E, -5, 1, 2, $19, 0, 0, 0, 0
+Map_Sonic_1136_End
+
+Map_Sonic_1150: spriteHeader
+ spritePiece -$C, -$1C, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -$14, 4, 1, 2, 9, 0, 0, 0, 0
+ spritePiece -$C, -4, 3, 4, $B, 0, 0, 0, 0
+ spritePiece $C, 4, 1, 2, $17, 0, 0, 0, 0
+Map_Sonic_1150_End
+
+Map_Sonic_1172: spriteHeader
+ spritePiece -$13, -$1B, 4, 3, 0, 0, 0, 0, 0
+ spritePiece -$C, -3, 3, 2, $C, 0, 0, 0, 0
+ spritePiece -9, $D, 2, 2, $12, 0, 0, 0, 0
+Map_Sonic_1172_End
+
+Map_Sonic_118C: spriteHeader
+ spritePiece -$12, -$1C, 4, 3, 0, 0, 0, 0, 0
+ spritePiece -$D, -4, 3, 4, $C, 0, 0, 0, 0
+Map_Sonic_118C_End
+
+Map_Sonic_119E: spriteHeader
+ spritePiece -$16, -$1D, 2, 1, 0, 0, 0, 0, 0
+ spritePiece -$1E, -$15, 4, 2, 2, 0, 0, 0, 0
+ spritePiece -$16, -5, 3, 2, $A, 0, 0, 0, 0
+ spritePiece 2, -$D, 2, 2, $10, 0, 0, 0, 0
+ spritePiece -6, $B, 1, 2, $14, 0, 0, 0, 0
+Map_Sonic_119E_End
+
+Map_Sonic_11C8: spriteHeader
+ spritePiece -$15, -$1C, 2, 1, 0, 0, 0, 0, 0
+ spritePiece -$1D, -$14, 4, 2, 2, 0, 0, 0, 0
+ spritePiece 3, -$14, 1, 2, $A, 0, 0, 0, 0
+ spritePiece -$15, -4, 4, 2, $C, 0, 0, 0, 0
+ spritePiece $B, -4, 2, 2, $14, 0, 0, 0, 0
+ spritePiece -5, $C, 1, 2, $18, 0, 0, 0, 0
+Map_Sonic_11C8_End
+
+Map_Sonic_11FA: spriteHeader
+ spritePiece -$1C, -$15, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$14, -5, 2, 2, 6, 0, 0, 0, 0
+ spritePiece -4, -$13, 1, 4, $A, 0, 0, 0, 0
+ spritePiece 4, -$B, 1, 2, $E, 0, 0, 0, 0
+ spritePiece 4, 5, 2, 2, $10, 0, 0, 0, 0
+Map_Sonic_11FA_End
+
+Map_Sonic_1224: spriteHeader
+ spritePiece -$15, -$1C, 2, 1, 0, 0, 0, 0, 0
+ spritePiece -$1D, -$14, 4, 2, 2, 0, 0, 0, 0
+ spritePiece 3, -$14, 1, 2, $A, 0, 0, 0, 0
+ spritePiece -$15, -4, 2, 2, $C, 0, 0, 0, 0
+ spritePiece -5, -4, 3, 4, $10, 0, 0, 0, 0
+Map_Sonic_1224_End
+
+Map_Sonic_124E: spriteHeader
+ spritePiece -$16, -$1D, 2, 1, 0, 0, 0, 0, 0
+ spritePiece -$1E, -$15, 4, 2, 2, 0, 0, 0, 0
+ spritePiece 2, -$15, 1, 2, $A, 0, 0, 0, 0
+ spritePiece $A, -$D, 1, 2, $C, 0, 0, 0, 0
+ spritePiece -$16, -5, 4, 2, $E, 0, 0, 0, 0
+ spritePiece -$E, $B, 2, 2, $16, 0, 0, 0, 0
+Map_Sonic_124E_End
+
+Map_Sonic_1280: spriteHeader
+ spritePiece -$15, -$1C, 2, 1, 0, 0, 0, 0, 0
+ spritePiece -$1D, -$14, 4, 2, 2, 0, 0, 0, 0
+ spritePiece 3, -$14, 1, 2, $A, 0, 0, 0, 0
+ spritePiece -$15, -4, 4, 2, $C, 0, 0, 0, 0
+ spritePiece $B, -6, 2, 2, $14, 0, 0, 0, 0
+ spritePiece -5, $C, 1, 2, $18, 0, 0, 0, 0
+Map_Sonic_1280_End
+
+Map_Sonic_12B2: spriteHeader
+ spritePiece -$1C, -$15, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$14, -5, 2, 2, 6, 0, 0, 0, 0
+ spritePiece -4, -$13, 1, 4, $A, 0, 0, 0, 0
+ spritePiece 4, -$B, 1, 2, $E, 0, 0, 0, 0
+ spritePiece 4, 5, 2, 2, $10, 0, 0, 0, 0
+Map_Sonic_12B2_End
+
+Map_Sonic_12DC: spriteHeader
+ spritePiece -$15, -$1C, 2, 1, 0, 0, 0, 0, 0
+ spritePiece -$1D, -$14, 4, 2, 2, 0, 0, 0, 0
+ spritePiece -$15, -4, 3, 2, $A, 0, 0, 0, 0
+ spritePiece 3, -$C, 1, 2, $10, 0, 0, 0, 0
+ spritePiece 3, 4, 2, 2, $12, 0, 0, 0, 0
+ spritePiece -5, $C, 1, 2, $16, 0, 0, 0, 0
+Map_Sonic_12DC_End
+
+Map_Sonic_130E: spriteHeader
+ spritePiece -$1D, -$E, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -5, -$14, 3, 4, $C, 0, 0, 0, 0
+ spritePiece 3, $C, 2, 2, $18, 0, 0, 0, 0
+Map_Sonic_130E_End
+
+Map_Sonic_1328: spriteHeader
+ spritePiece -$1C, -$E, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$14, 3, 4, $C, 0, 0, 0, 0
+ spritePiece 4, $C, 2, 2, $18, 0, 0, 0, 0
+Map_Sonic_1328_End
+
+Map_Sonic_1342: spriteHeader
+ spritePiece -$1B, -$D, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -3, -$C, 1, 4, $C, 0, 0, 0, 0
+ spritePiece 5, -7, 2, 2, $10, 0, 0, 0, 0
+Map_Sonic_1342_End
+
+Map_Sonic_135C: spriteHeader
+ spritePiece -$1C, -$C, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -4, -$E, 3, 4, 9, 0, 0, 0, 0
+Map_Sonic_135C_End
+
+Map_Sonic_136E: spriteHeader
+ spritePiece -$1D, -$C, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -5, -$1D, 2, 2, 9, 0, 0, 0, 0
+ spritePiece -5, -$D, 3, 4, $D, 0, 0, 0, 0
+Map_Sonic_136E_End
+
+Map_Sonic_1388: spriteHeader
+ spritePiece -$1C, -$C, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -4, -$14, 3, 4, 9, 0, 0, 0, 0
+ spritePiece 4, $C, 2, 2, $15, 0, 0, 0, 0
+Map_Sonic_1388_End
+
+Map_Sonic_13A2: spriteHeader
+ spritePiece -$1B, -$D, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -3, -$C, 1, 4, $C, 0, 0, 0, 0
+ spritePiece 5, -7, 2, 2, $10, 0, 0, 0, 0
+Map_Sonic_13A2_End
+
+Map_Sonic_13BC: spriteHeader
+ spritePiece -$1C, -$E, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$C, 3, 4, $C, 0, 0, 0, 0
+Map_Sonic_13BC_End
+
+Map_Sonic_13CE: spriteHeader
+ spritePiece -$D, -$12, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$1D, -2, 3, 4, 4, 0, 0, 0, 0
+ spritePiece -5, -2, 4, 2, $10, 0, 0, 0, 0
+ spritePiece -5, $E, 1, 1, $18, 0, 0, 0, 0
+Map_Sonic_13CE_End
+
+Map_Sonic_13F0: spriteHeader
+ spritePiece -4, -$23, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, -$13, 3, 2, 4, 0, 0, 0, 0
+ spritePiece -$1C, -3, 3, 4, $A, 0, 0, 0, 0
+ spritePiece -4, -3, 4, 2, $16, 0, 0, 0, 0
+ spritePiece -4, $D, 1, 1, $1E, 0, 0, 0, 0
+Map_Sonic_13F0_End
+
+Map_Sonic_141A: spriteHeader
+ spritePiece -$B, -$14, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$1B, 4, 1, 2, 8, 0, 0, 0, 0
+ spritePiece -$13, -4, 2, 4, $A, 0, 0, 0, 0
+ spritePiece -3, -4, 2, 2, $12, 0, 0, 0, 0
+ spritePiece -3, $C, 1, 1, $16, 0, 0, 0, 0
+Map_Sonic_141A_End
+
+Map_Sonic_1444: spriteHeader
+ spritePiece -$C, -$13, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$1C, -3, 3, 4, 8, 0, 0, 0, 0
+ spritePiece -4, -3, 3, 2, $14, 0, 0, 0, 0
+ spritePiece -4, $D, 1, 1, $1A, 0, 0, 0, 0
+Map_Sonic_1444_End
+
+Map_Sonic_1466: spriteHeader
+ spritePiece -$D, -$12, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$1D, -2, 3, 4, 6, 0, 0, 0, 0
+ spritePiece -5, -2, 4, 2, $12, 0, 0, 0, 0
+ spritePiece -5, $E, 1, 1, $1A, 0, 0, 0, 0
+Map_Sonic_1466_End
+
+Map_Sonic_1488: spriteHeader
+ spritePiece -6, -$23, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, -$13, 3, 2, 4, 0, 0, 0, 0
+ spritePiece -$1C, -3, 3, 4, $A, 0, 0, 0, 0
+ spritePiece -4, -3, 4, 2, $16, 0, 0, 0, 0
+ spritePiece -4, $D, 1, 1, $1E, 0, 0, 0, 0
+Map_Sonic_1488_End
+
+Map_Sonic_14B2: spriteHeader
+ spritePiece -$B, -$14, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$1B, 4, 1, 2, 8, 0, 0, 0, 0
+ spritePiece -$13, -4, 2, 4, $A, 0, 0, 0, 0
+ spritePiece -3, -4, 2, 2, $12, 0, 0, 0, 0
+ spritePiece -3, $C, 1, 1, $16, 0, 0, 0, 0
+Map_Sonic_14B2_End
+
+Map_Sonic_14DC: spriteHeader
+ spritePiece -$C, -$13, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$1C, 5, 1, 2, 8, 0, 0, 0, 0
+ spritePiece -$14, -3, 2, 4, $A, 0, 0, 0, 0
+ spritePiece -4, -3, 3, 2, $12, 0, 0, 0, 0
+ spritePiece -4, $D, 1, 1, $18, 0, 0, 0, 0
+Map_Sonic_14DC_End
+
+Map_Sonic_1506: spriteHeader
+ spritePiece -4, -$10, 3, 1, 0, 0, 0, 0, 0
+ spritePiece -4, -8, 1, 1, 3, 0, 0, 0, 0
+ spritePiece 4, -8, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$14, 0, 3, 2, 8, 0, 0, 0, 0
+Map_Sonic_1506_End
+
+Map_Sonic_1528: spriteHeader
+ spritePiece -6, -$1A, 2, 1, 0, 0, 0, 0, 0
+ spritePiece -$E, -$12, 3, 4, 2, 0, 0, 0, 0
+ spritePiece $A, -$12, 1, 3, $E, 0, 0, 0, 0
+ spritePiece -6, $E, 2, 1, $11, 0, 0, 0, 0
+Map_Sonic_1528_End
+
+Map_Sonic_154A: spriteHeader
+ spritePiece -$10, -$14, 1, 3, 0, 0, 0, 0, 0
+ spritePiece -8, -$14, 2, 2, 3, 0, 0, 0, 0
+ spritePiece -8, -4, 3, 1, 7, 0, 0, 0, 0
+ spritePiece 0, 4, 2, 2, $A, 0, 0, 0, 0
+Map_Sonic_154A_End
+
+Map_Sonic_156C: spriteHeader
+ spritePiece -$12, -$12, 3, 1, 0, 0, 0, 0, 0
+ spritePiece -$1A, -$A, 4, 2, 3, 0, 0, 0, 0
+ spritePiece 6, -$A, 2, 2, $B, 0, 0, 0, 0
+ spritePiece -$12, 6, 2, 1, $F, 0, 0, 0, 0
+ spritePiece 6, 6, 1, 1, $11, 0, 0, 0, 0
+Map_Sonic_156C_End
+
+Map_Sonic_1596: spriteHeader
+ spritePiece -4, -$18, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -4, -8, 1, 1, 6, 0, 0, 0, 0
+ spritePiece 4, -8, 2, 2, 7, 0, 0, 0, 0
+ spritePiece -$14, 0, 3, 2, $B, 0, 0, 0, 0
+Map_Sonic_1596_End
+
+Map_Sonic_15B8: spriteHeader
+ spritePiece -6, -$1A, 2, 1, 0, 0, 0, 0, 0
+ spritePiece -$E, -$12, 3, 4, 2, 0, 0, 0, 0
+ spritePiece $A, -$12, 1, 3, $E, 0, 0, 0, 0
+ spritePiece -6, $E, 1, 1, $11, 0, 0, 0, 0
+Map_Sonic_15B8_End
+
+Map_Sonic_15DA: spriteHeader
+ spritePiece -$18, -$14, 2, 3, 0, 0, 0, 0, 0
+ spritePiece -8, -$14, 2, 2, 6, 0, 0, 0, 0
+ spritePiece -8, -4, 1, 1, $A, 0, 0, 0, 0
+ spritePiece 0, -4, 2, 3, $B, 0, 0, 0, 0
+Map_Sonic_15DA_End
+
+Map_Sonic_15FC: spriteHeader
+ spritePiece -$12, -$12, 3, 1, 0, 0, 0, 0, 0
+ spritePiece -$1A, -$A, 4, 2, 3, 0, 0, 0, 0
+ spritePiece 6, -$A, 2, 2, $B, 0, 0, 0, 0
+ spritePiece -$12, 6, 2, 1, $F, 0, 0, 0, 0
+ spritePiece 6, 6, 1, 1, $11, 0, 0, 0, 0
+Map_Sonic_15FC_End
+
+Map_Sonic_1626: spriteHeader
+ spritePiece -$12, -$1B, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$15, -$B, 2, 2, 6, 0, 0, 0, 0
+ spritePiece -5, -$B, 2, 2, $A, 0, 0, 0, 0
+ spritePiece -$15, 5, 4, 2, $E, 0, 0, 0, 0
+Map_Sonic_1626_End
+
+Map_Sonic_1648: spriteHeader
+ spritePiece -$12, -$1C, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$15, -$C, 2, 2, 6, 0, 0, 0, 0
+ spritePiece -5, -$C, 2, 2, $A, 0, 0, 0, 0
+ spritePiece -$15, 4, 4, 2, $E, 0, 0, 0, 0
+Map_Sonic_1648_End
+
+Map_Sonic_166A: spriteHeader
+ spritePiece -$12, -$1B, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$15, -$B, 2, 2, 6, 0, 0, 0, 0
+ spritePiece -5, -$B, 2, 2, $A, 0, 0, 0, 0
+ spritePiece -$15, 5, 4, 2, $E, 0, 0, 0, 0
+Map_Sonic_166A_End
+
+Map_Sonic_168C: spriteHeader
+ spritePiece -$12, -$1C, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$15, -$C, 2, 2, 6, 0, 0, 0, 0
+ spritePiece -5, -$C, 2, 2, $A, 0, 0, 0, 0
+ spritePiece -$15, 4, 4, 2, $E, 0, 0, 0, 0
+Map_Sonic_168C_End
+
+Map_Sonic_16AE: spriteHeader
+ spritePiece -$10, -4, 1, 3, 0, 0, 0, 0, 0
+ spritePiece -8, -$C, 3, 4, 3, 0, 0, 0, 0
+Map_Sonic_16AE_End
+
+Map_Sonic_16C0: spriteHeader
+ spritePiece -$14, -$1C, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -$14, -4, 3, 1, 9, 0, 0, 0, 0
+ spritePiece -$F, 4, 2, 2, $C, 0, 0, 0, 0
+Map_Sonic_16C0_End
+
+Map_Sonic_16DA: spriteHeader
+ spritePiece -$14, -$1C, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -$14, -4, 3, 1, 9, 0, 0, 0, 0
+ spritePiece -$F, 4, 2, 2, $C, 0, 0, 0, 0
+Map_Sonic_16DA_End
+
+Map_Sonic_16F4: spriteHeader
+ spritePiece -$14, -$1C, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -$14, -4, 3, 1, 9, 0, 0, 0, 0
+ spritePiece -$F, 4, 2, 2, $C, 0, 0, 0, 0
+Map_Sonic_16F4_End
+
+Map_Sonic_170E: spriteHeader
+ spritePiece -$13, -$1B, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -$13, -3, 3, 1, 9, 0, 0, 0, 0
+ spritePiece -$F, 5, 2, 2, $C, 0, 0, 0, 0
+Map_Sonic_170E_End
+
+Map_Sonic_1728: spriteHeader
+ spritePiece -$13, -$1B, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -$13, -3, 3, 1, 9, 0, 0, 0, 0
+ spritePiece -$F, 5, 2, 2, $C, 0, 0, 0, 0
+Map_Sonic_1728_End
+
+Map_Sonic_1742: spriteHeader
+ spritePiece -$13, -$1B, 3, 3, 0, 0, 0, 0, 0
+ spritePiece -$13, -3, 3, 1, 9, 0, 0, 0, 0
+ spritePiece -$F, 5, 2, 2, $C, 0, 0, 0, 0
+Map_Sonic_1742_End
+
+Map_Sonic_175C: spriteHeader
+ spritePiece -$10, -$14, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 8, -$14, 1, 4, $C, 0, 0, 0, 0
+ spritePiece -$F, $C, 2, 2, $10, 0, 0, 0, 0
+Map_Sonic_175C_End
+
+Map_Sonic_1776: spriteHeader
+ spritePiece -$10, -$14, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 8, -$14, 1, 4, $C, 0, 0, 0, 0
+ spritePiece -$F, $C, 2, 2, $10, 0, 0, 0, 0
+Map_Sonic_1776_End
+
+Map_Sonic_1790: spriteHeader
+ spritePiece -$10, -$14, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 8, -$14, 1, 4, $C, 0, 0, 0, 0
+ spritePiece -$F, $C, 2, 2, $10, 0, 0, 0, 0
+Map_Sonic_1790_End
+
+Map_Sonic_17AA: spriteHeader
+ spritePiece -$10, -$14, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 8, -$14, 1, 2, $C, 0, 0, 0, 0
+ spritePiece $10, -$14, 1, 2, $E, 0, 0, 0, 0
+ spritePiece 8, -4, 1, 2, $10, 0, 0, 0, 0
+ spritePiece -$F, $C, 2, 2, $12, 0, 0, 0, 0
+Map_Sonic_17AA_End
+
+Map_Sonic_17D4: spriteHeader
+ spritePiece -$15, -$14, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -5, -$14, 3, 2, 8, 0, 0, 0, 0
+ spritePiece -5, -4, 2, 2, $E, 0, 0, 0, 0
+ spritePiece -$12, $C, 3, 2, $12, 0, 0, 0, 0
+Map_Sonic_17D4_End
+
+Map_Sonic_17F6: spriteHeader
+ spritePiece -$14, -$14, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$14, 3, 2, 8, 0, 0, 0, 0
+ spritePiece -4, -4, 2, 2, $E, 0, 0, 0, 0
+ spritePiece -$11, $C, 3, 2, $12, 0, 0, 0, 0
+Map_Sonic_17F6_End
+
+Map_Sonic_1818: spriteHeader
+ spritePiece -$14, -$14, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$14, 3, 2, 8, 0, 0, 0, 0
+ spritePiece -4, -4, 3, 2, $E, 0, 0, 0, 0
+ spritePiece -$10, $C, 3, 2, $14, 0, 0, 0, 0
+Map_Sonic_1818_End
+
+Map_Sonic_183A: spriteHeader
+ spritePiece -$18, -$C, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$14, 3, 4, 4, 0, 0, 0, 0
+ spritePiece -$10, $C, 2, 2, $10, 0, 0, 0, 0
+Map_Sonic_183A_End
+
+Map_Sonic_1854: spriteHeader
+ spritePiece $C, -$C, 1, 4, 0, 1, 0, 0, 0
+ spritePiece -$C, -$14, 3, 4, 4, 1, 0, 0, 0
+ spritePiece -4, $C, 2, 2, $10, 1, 0, 0, 0
+Map_Sonic_1854_End
+
+Map_Sonic_186E: spriteHeader
+ spritePiece $C, -$C, 1, 4, 0, 1, 0, 0, 0
+ spritePiece -$C, -$14, 3, 4, 4, 1, 0, 0, 0
+ spritePiece -4, $C, 2, 2, $10, 1, 0, 0, 0
+Map_Sonic_186E_End
+
+Map_Sonic_1888: spriteHeader
+ spritePiece -$13, -$14, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$11, -4, 4, 2, 8, 0, 0, 0, 0
+ spritePiece $F, -4, 1, 2, $10, 0, 0, 0, 0
+ spritePiece 1, $C, 2, 2, $12, 0, 0, 0, 0
+Map_Sonic_1888_End
+
+Map_Sonic_18AA: spriteHeader
+ spritePiece -$12, -$14, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$11, -4, 4, 2, 8, 0, 0, 0, 0
+ spritePiece $F, -4, 1, 2, $10, 0, 0, 0, 0
+ spritePiece 1, $C, 2, 2, $12, 0, 0, 0, 0
+Map_Sonic_18AA_End
+
+Map_Sonic_18CC: spriteHeader
+ spritePiece -$11, -$14, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$11, -4, 4, 2, 8, 0, 0, 0, 0
+ spritePiece $F, -4, 1, 2, $10, 0, 0, 0, 0
+ spritePiece 1, $C, 2, 2, $12, 0, 0, 0, 0
+Map_Sonic_18CC_End
+
+Map_Sonic_18EE: spriteHeader
+ spritePiece -$C, -$14, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -9, -4, 3, 4, 6, 0, 0, 0, 0
+Map_Sonic_18EE_End
+
+ even
diff --git a/mappings/sprite/Sonic.bin b/mappings/sprite/Sonic.bin
deleted file mode 100644
index ce457d62..00000000
Binary files a/mappings/sprite/Sonic.bin and /dev/null differ
diff --git a/mappings/sprite/Tails.asm b/mappings/sprite/Tails.asm
new file mode 100644
index 00000000..8d8ae42f
--- /dev/null
+++ b/mappings/sprite/Tails.asm
@@ -0,0 +1,824 @@
+Map_Tails: mappingsTable
+ mappingsTableEntry.w Map_Tails_0116
+ mappingsTableEntry.w Map_Tails_0118
+ mappingsTableEntry.w Map_Tails_012A
+ mappingsTableEntry.w Map_Tails_013C
+ mappingsTableEntry.w Map_Tails_014E
+ mappingsTableEntry.w Map_Tails_0160
+ mappingsTableEntry.w Map_Tails_016A
+ mappingsTableEntry.w Map_Tails_0174
+ mappingsTableEntry.w Map_Tails_0186
+ mappingsTableEntry.w Map_Tails_0198
+ mappingsTableEntry.w Map_Tails_01A2
+ mappingsTableEntry.w Map_Tails_01AC
+ mappingsTableEntry.w Map_Tails_01B6
+ mappingsTableEntry.w Map_Tails_01C0
+ mappingsTableEntry.w Map_Tails_01CA
+ mappingsTableEntry.w Map_Tails_01E4
+ mappingsTableEntry.w Map_Tails_01FE
+ mappingsTableEntry.w Map_Tails_0218
+ mappingsTableEntry.w Map_Tails_0232
+ mappingsTableEntry.w Map_Tails_024C
+ mappingsTableEntry.w Map_Tails_0266
+ mappingsTableEntry.w Map_Tails_0280
+ mappingsTableEntry.w Map_Tails_029A
+ mappingsTableEntry.w Map_Tails_02B4
+ mappingsTableEntry.w Map_Tails_02CE
+ mappingsTableEntry.w Map_Tails_02E8
+ mappingsTableEntry.w Map_Tails_0302
+ mappingsTableEntry.w Map_Tails_031C
+ mappingsTableEntry.w Map_Tails_0336
+ mappingsTableEntry.w Map_Tails_0350
+ mappingsTableEntry.w Map_Tails_036A
+ mappingsTableEntry.w Map_Tails_0384
+ mappingsTableEntry.w Map_Tails_039E
+ mappingsTableEntry.w Map_Tails_03B8
+ mappingsTableEntry.w Map_Tails_03D2
+ mappingsTableEntry.w Map_Tails_03EC
+ mappingsTableEntry.w Map_Tails_0406
+ mappingsTableEntry.w Map_Tails_0420
+ mappingsTableEntry.w Map_Tails_043A
+ mappingsTableEntry.w Map_Tails_044C
+ mappingsTableEntry.w Map_Tails_0466
+ mappingsTableEntry.w Map_Tails_0478
+ mappingsTableEntry.w Map_Tails_0492
+ mappingsTableEntry.w Map_Tails_04A4
+ mappingsTableEntry.w Map_Tails_04BE
+ mappingsTableEntry.w Map_Tails_04D0
+ mappingsTableEntry.w Map_Tails_04EA
+ mappingsTableEntry.w Map_Tails_04FC
+ mappingsTableEntry.w Map_Tails_050E
+ mappingsTableEntry.w Map_Tails_0520
+ mappingsTableEntry.w Map_Tails_0532
+ mappingsTableEntry.w Map_Tails_0544
+ mappingsTableEntry.w Map_Tails_0556
+ mappingsTableEntry.w Map_Tails_0570
+ mappingsTableEntry.w Map_Tails_058A
+ mappingsTableEntry.w Map_Tails_05A4
+ mappingsTableEntry.w Map_Tails_05BE
+ mappingsTableEntry.w Map_Tails_05D8
+ mappingsTableEntry.w Map_Tails_05F2
+ mappingsTableEntry.w Map_Tails_060C
+ mappingsTableEntry.w Map_Tails_0626
+ mappingsTableEntry.w Map_Tails_060C
+ mappingsTableEntry.w Map_Tails_0640
+ mappingsTableEntry.w Map_Tails_065A
+ mappingsTableEntry.w Map_Tails_0674
+ mappingsTableEntry.w Map_Tails_068E
+ mappingsTableEntry.w Map_Tails_06A8
+ mappingsTableEntry.w Map_Tails_06C2
+ mappingsTableEntry.w Map_Tails_06DC
+ mappingsTableEntry.w Map_Tails_06F6
+ mappingsTableEntry.w Map_Tails_0710
+ mappingsTableEntry.w Map_Tails_071A
+ mappingsTableEntry.w Map_Tails_0724
+ mappingsTableEntry.w Map_Tails_072E
+ mappingsTableEntry.w Map_Tails_0738
+ mappingsTableEntry.w Map_Tails_0742
+ mappingsTableEntry.w Map_Tails_074C
+ mappingsTableEntry.w Map_Tails_0756
+ mappingsTableEntry.w Map_Tails_0760
+ mappingsTableEntry.w Map_Tails_076A
+ mappingsTableEntry.w Map_Tails_0774
+ mappingsTableEntry.w Map_Tails_077E
+ mappingsTableEntry.w Map_Tails_0788
+ mappingsTableEntry.w Map_Tails_0792
+ mappingsTableEntry.w Map_Tails_079C
+ mappingsTableEntry.w Map_Tails_07A6
+ mappingsTableEntry.w Map_Tails_07B0
+ mappingsTableEntry.w Map_Tails_07BA
+ mappingsTableEntry.w Map_Tails_07C4
+ mappingsTableEntry.w Map_Tails_07CE
+ mappingsTableEntry.w Map_Tails_07E0
+ mappingsTableEntry.w Map_Tails_07F2
+ mappingsTableEntry.w Map_Tails_07FC
+ mappingsTableEntry.w Map_Tails_0806
+ mappingsTableEntry.w Map_Tails_0810
+ mappingsTableEntry.w Map_Tails_0822
+ mappingsTableEntry.w Map_Tails_0834
+ mappingsTableEntry.w Map_Tails_083E
+ mappingsTableEntry.w Map_Tails_0848
+ mappingsTableEntry.w Map_Tails_0852
+ mappingsTableEntry.w Map_Tails_0864
+ mappingsTableEntry.w Map_Tails_0876
+ mappingsTableEntry.w Map_Tails_0888
+ mappingsTableEntry.w Map_Tails_089A
+ mappingsTableEntry.w Map_Tails_08AC
+ mappingsTableEntry.w Map_Tails_08BE
+ mappingsTableEntry.w Map_Tails_08D0
+ mappingsTableEntry.w Map_Tails_08E2
+ mappingsTableEntry.w Map_Tails_08EC
+ mappingsTableEntry.w Map_Tails_08FE
+ mappingsTableEntry.w Map_Tails_0910
+ mappingsTableEntry.w Map_Tails_0922
+ mappingsTableEntry.w Map_Tails_0934
+ mappingsTableEntry.w Map_Tails_0946
+ mappingsTableEntry.w Map_Tails_0958
+ mappingsTableEntry.w Map_Tails_096A
+ mappingsTableEntry.w Map_Tails_097C
+ mappingsTableEntry.w Map_Tails_0986
+ mappingsTableEntry.w Map_Tails_0990
+ mappingsTableEntry.w Map_Tails_09A2
+ mappingsTableEntry.w Map_Tails_09AC
+ mappingsTableEntry.w Map_Tails_09B6
+ mappingsTableEntry.w Map_Tails_09C0
+ mappingsTableEntry.w Map_Tails_09CA
+ mappingsTableEntry.w Map_Tails_09D4
+ mappingsTableEntry.w Map_Tails_09DE
+ mappingsTableEntry.w Map_Tails_09E8
+ mappingsTableEntry.w Map_Tails_09F2
+ mappingsTableEntry.w Map_Tails_0A04
+ mappingsTableEntry.w Map_Tails_0A16
+ mappingsTableEntry.w Map_Tails_0A20
+ mappingsTableEntry.w Map_Tails_0A2A
+ mappingsTableEntry.w Map_Tails_0A34
+ mappingsTableEntry.w Map_Tails_0A3E
+ mappingsTableEntry.w Map_Tails_0A50
+ mappingsTableEntry.w Map_Tails_0A62
+ mappingsTableEntry.w Map_Tails_0A6C
+ mappingsTableEntry.w Map_Tails_0A76
+ mappingsTableEntry.w Map_Tails_0A80
+
+Map_Tails_0116: spriteHeader
+Map_Tails_0116_End
+
+Map_Tails_0118: spriteHeader
+ spritePiece -$C, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, 0, 3, 2, 6, 0, 0, 0, 0
+Map_Tails_0118_End
+
+Map_Tails_012A: spriteHeader
+ spritePiece -$C, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, 0, 3, 2, 6, 0, 0, 0, 0
+Map_Tails_012A_End
+
+Map_Tails_013C: spriteHeader
+ spritePiece -$C, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, 0, 3, 2, 6, 0, 0, 0, 0
+Map_Tails_013C_End
+
+Map_Tails_014E: spriteHeader
+ spritePiece -$C, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, 0, 3, 2, 6, 0, 0, 0, 0
+Map_Tails_014E_End
+
+Map_Tails_0160: spriteHeader
+ spritePiece -$C, -$10, 3, 4, 0, 0, 0, 0, 0
+Map_Tails_0160_End
+
+Map_Tails_016A: spriteHeader
+ spritePiece -$C, -$10, 3, 4, 0, 0, 0, 0, 0
+Map_Tails_016A_End
+
+Map_Tails_0174: spriteHeader
+ spritePiece -$C, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, 0, 3, 2, 6, 0, 0, 0, 0
+Map_Tails_0174_End
+
+Map_Tails_0186: spriteHeader
+ spritePiece -$C, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, 0, 3, 2, 6, 0, 0, 0, 0
+Map_Tails_0186_End
+
+Map_Tails_0198: spriteHeader
+ spritePiece -$14, -$10, 2, 4, 0, 0, 0, 0, 0
+Map_Tails_0198_End
+
+Map_Tails_01A2: spriteHeader
+ spritePiece -$1C, -$10, 3, 4, 0, 0, 0, 0, 0
+Map_Tails_01A2_End
+
+Map_Tails_01AC: spriteHeader
+ spritePiece -$1C, -$10, 3, 4, 0, 0, 0, 0, 0
+Map_Tails_01AC_End
+
+Map_Tails_01B6: spriteHeader
+ spritePiece -$1C, 0, 3, 2, 0, 0, 0, 0, 0
+Map_Tails_01B6_End
+
+Map_Tails_01C0: spriteHeader
+ spritePiece -$1C, -$10, 3, 4, 0, 0, 0, 0, 0
+Map_Tails_01C0_End
+
+Map_Tails_01CA: spriteHeader
+ spritePiece -$10, -$14, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -4, 4, 2, 6, 0, 0, 0, 0
+ spritePiece -$1E, -4, 3, 2, $E, 0, 0, 0, 0
+Map_Tails_01CA_End
+
+Map_Tails_01E4: spriteHeader
+ spritePiece -$D, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, 6, 0, 0, 0, 0
+ spritePiece -$1C, 0, 3, 2, $E, 0, 0, 0, 0
+Map_Tails_01E4_End
+
+Map_Tails_01FE: spriteHeader
+ spritePiece -8, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$D, 0, 3, 2, 6, 0, 0, 0, 0
+ spritePiece -$1C, -3, 3, 2, $C, 0, 0, 0, 0
+Map_Tails_01FE_End
+
+Map_Tails_0218: spriteHeader
+ spritePiece -$E, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$E, 0, 3, 2, 6, 0, 0, 0, 0
+ spritePiece -$1A, -3, 3, 2, $C, 0, 0, 0, 0
+Map_Tails_0218_End
+
+Map_Tails_0232: spriteHeader
+ spritePiece -$10, -$14, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -4, 4, 2, 6, 0, 0, 0, 0
+ spritePiece -$1E, -4, 3, 2, $E, 0, 0, 0, 0
+Map_Tails_0232_End
+
+Map_Tails_024C: spriteHeader
+ spritePiece -$D, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, 6, 0, 0, 0, 0
+ spritePiece -$1C, 0, 3, 2, $E, 0, 0, 0, 0
+Map_Tails_024C_End
+
+Map_Tails_0266: spriteHeader
+ spritePiece -8, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$F, 0, 3, 2, 6, 0, 0, 0, 0
+ spritePiece -$1C, -3, 3, 2, $C, 0, 0, 0, 0
+Map_Tails_0266_End
+
+Map_Tails_0280: spriteHeader
+ spritePiece -$E, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$E, 0, 3, 2, 6, 0, 0, 0, 0
+ spritePiece -$1A, -3, 3, 2, $C, 0, 0, 0, 0
+Map_Tails_0280_End
+
+Map_Tails_029A: spriteHeader
+ spritePiece -$D, -$1D, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$14, -$D, 1, 4, 2, 0, 0, 0, 0
+ spritePiece -$C, -$D, 3, 4, 6, 0, 0, 0, 0
+Map_Tails_029A_End
+
+Map_Tails_02B4: spriteHeader
+ spritePiece -$A, -$19, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$12, -9, 3, 4, 4, 0, 0, 0, 0
+ spritePiece 6, -2, 2, 2, $10, 0, 0, 0, 0
+Map_Tails_02B4_End
+
+Map_Tails_02CE: spriteHeader
+ spritePiece -8, -$1A, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$11, -$A, 1, 4, 4, 0, 0, 0, 0
+ spritePiece -9, -$A, 3, 4, 8, 0, 0, 0, 0
+Map_Tails_02CE_End
+
+Map_Tails_02E8: spriteHeader
+ spritePiece -9, -$1D, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$14, -$D, 4, 4, 2, 0, 0, 0, 0
+ spritePiece $C, -5, 1, 2, $12, 0, 0, 0, 0
+Map_Tails_02E8_End
+
+Map_Tails_0302: spriteHeader
+ spritePiece -$D, -$1D, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$14, -$D, 1, 4, 2, 0, 0, 0, 0
+ spritePiece -$C, -$D, 3, 4, 6, 0, 0, 0, 0
+Map_Tails_0302_End
+
+Map_Tails_031C: spriteHeader
+ spritePiece -$A, -$19, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$12, -9, 3, 4, 4, 0, 0, 0, 0
+ spritePiece 6, -1, 2, 2, $10, 0, 0, 0, 0
+Map_Tails_031C_End
+
+Map_Tails_0336: spriteHeader
+ spritePiece -8, -$1A, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$11, -$A, 1, 4, 4, 0, 0, 0, 0
+ spritePiece -9, -$A, 3, 4, 8, 0, 0, 0, 0
+Map_Tails_0336_End
+
+Map_Tails_0350: spriteHeader
+ spritePiece -9, -$1D, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$14, -$D, 4, 4, 2, 0, 0, 0, 0
+ spritePiece $C, 3, 1, 2, $12, 0, 0, 0, 0
+Map_Tails_0350_End
+
+Map_Tails_036A: spriteHeader
+ spritePiece -$14, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$10, 2, 4, 8, 0, 0, 0, 0
+ spritePiece -4, 6, 2, 4, $10, 0, 0, 0, 0
+Map_Tails_036A_End
+
+Map_Tails_0384: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 4, 8, 0, 0, 0, 0
+ spritePiece 0, 4, 2, 4, $10, 0, 0, 0, 0
+Map_Tails_0384_End
+
+Map_Tails_039E: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 4, 8, 0, 0, 0, 0
+ spritePiece -3, 4, 2, 4, $10, 0, 0, 0, 0
+Map_Tails_039E_End
+
+Map_Tails_03B8: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 4, 8, 0, 0, 0, 0
+ spritePiece -3, 4, 2, 4, $10, 0, 0, 0, 0
+Map_Tails_03B8_End
+
+Map_Tails_03D2: spriteHeader
+ spritePiece -$14, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$10, 2, 4, 8, 0, 0, 0, 0
+ spritePiece -4, 6, 2, 4, $10, 0, 0, 0, 0
+Map_Tails_03D2_End
+
+Map_Tails_03EC: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 4, 8, 0, 0, 0, 0
+ spritePiece 0, 4, 2, 4, $10, 0, 0, 0, 0
+Map_Tails_03EC_End
+
+Map_Tails_0406: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 4, 8, 0, 0, 0, 0
+ spritePiece -3, 4, 2, 4, $10, 0, 0, 0, 0
+Map_Tails_0406_End
+
+Map_Tails_0420: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 4, 8, 0, 0, 0, 0
+ spritePiece -3, 4, 2, 4, $10, 0, 0, 0, 0
+Map_Tails_0420_End
+
+Map_Tails_043A: spriteHeader
+ spritePiece -$15, 4, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$D, -$C, 4, 4, 2, 0, 0, 0, 0
+Map_Tails_043A_End
+
+Map_Tails_044C: spriteHeader
+ spritePiece -8, -$1E, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -6, 1, 2, 4, 0, 0, 0, 0
+ spritePiece -8, -$E, 4, 4, 6, 0, 0, 0, 0
+Map_Tails_044C_End
+
+Map_Tails_0466: spriteHeader
+ spritePiece -$14, -7, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, -$F, 4, 4, 2, 0, 0, 0, 0
+Map_Tails_0466_End
+
+Map_Tails_0478: spriteHeader
+ spritePiece -$11, -4, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -1, -$1B, 1, 2, 2, 0, 0, 0, 0
+ spritePiece -9, -$B, 4, 4, 4, 0, 0, 0, 0
+Map_Tails_0478_End
+
+Map_Tails_0492: spriteHeader
+ spritePiece -$15, 4, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$D, -$C, 4, 4, 2, 0, 0, 0, 0
+Map_Tails_0492_End
+
+Map_Tails_04A4: spriteHeader
+ spritePiece 0, -$1E, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -6, 1, 2, 2, 0, 0, 0, 0
+ spritePiece -8, -$E, 4, 4, 4, 0, 0, 0, 0
+Map_Tails_04A4_End
+
+Map_Tails_04BE: spriteHeader
+ spritePiece -$14, -7, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, -$F, 4, 4, 2, 0, 0, 0, 0
+Map_Tails_04BE_End
+
+Map_Tails_04D0: spriteHeader
+ spritePiece -1, -$1C, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$11, -4, 1, 2, 2, 0, 0, 0, 0
+ spritePiece -9, -$C, 4, 4, 4, 0, 0, 0, 0
+Map_Tails_04D0_End
+
+Map_Tails_04EA: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$16, -$10, 2, 4, $10, 0, 0, 0, 0
+Map_Tails_04EA_End
+
+Map_Tails_04FC: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$16, -8, 2, 2, $10, 0, 0, 0, 0
+Map_Tails_04FC_End
+
+Map_Tails_050E: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$16, -8, 2, 2, $10, 0, 0, 0, 0
+Map_Tails_050E_End
+
+Map_Tails_0520: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$16, -8, 2, 2, $10, 0, 1, 0, 0
+Map_Tails_0520_End
+
+Map_Tails_0532: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$16, -$10, 2, 4, $10, 0, 0, 0, 0
+Map_Tails_0532_End
+
+Map_Tails_0544: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$18, -$10, 2, 4, $10, 1, 1, 0, 0
+Map_Tails_0544_End
+
+Map_Tails_0556: spriteHeader
+ spritePiece -6, -$1C, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$C, 3, 4, 2, 0, 0, 0, 0
+ spritePiece -$18, -2, 3, 4, $E, 0, 0, 0, 0
+Map_Tails_0556_End
+
+Map_Tails_0570: spriteHeader
+ spritePiece -8, -$1C, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$C, 3, 4, 4, 0, 0, 0, 0
+ spritePiece -$11, 4, 2, 2, $10, 0, 0, 0, 0
+Map_Tails_0570_End
+
+Map_Tails_058A: spriteHeader
+ spritePiece -6, -$1C, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$C, 3, 4, 2, 0, 0, 0, 0
+ spritePiece -$11, 4, 2, 2, $E, 0, 0, 0, 0
+Map_Tails_058A_End
+
+Map_Tails_05A4: spriteHeader
+ spritePiece -8, -$1C, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$C, 3, 4, 4, 0, 0, 0, 0
+ spritePiece -$11, 4, 2, 2, $10, 0, 0, 0, 0
+Map_Tails_05A4_End
+
+Map_Tails_05BE: spriteHeader
+ spritePiece -6, -$1C, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$C, 3, 4, 2, 0, 0, 0, 0
+ spritePiece -$16, -4, 3, 4, $E, 0, 0, 0, 0
+Map_Tails_05BE_End
+
+Map_Tails_05D8: spriteHeader
+ spritePiece -8, -$1C, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$C, 3, 4, 4, 0, 0, 0, 0
+ spritePiece -$16, -9, 3, 4, $10, 1, 1, 0, 0
+Map_Tails_05D8_End
+
+Map_Tails_05F2: spriteHeader
+ spritePiece -$10, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, 6, 0, 0, 0, 0
+ spritePiece -$10, 6, 4, 2, $E, 0, 0, 0, 0
+Map_Tails_05F2_End
+
+Map_Tails_060C: spriteHeader
+ spritePiece -$10, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, 6, 0, 0, 0, 0
+ spritePiece -8, 6, 2, 2, $E, 0, 0, 0, 0
+Map_Tails_060C_End
+
+Map_Tails_0626: spriteHeader
+ spritePiece -$10, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, 6, 0, 0, 0, 0
+ spritePiece -8, 6, 2, 2, $E, 0, 0, 0, 0
+Map_Tails_0626_End
+
+Map_Tails_0640: spriteHeader
+ spritePiece -$10, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, 6, 0, 0, 0, 0
+ spritePiece -$10, 6, 4, 2, $E, 0, 0, 0, 0
+Map_Tails_0640_End
+
+Map_Tails_065A: spriteHeader
+ spritePiece -$10, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, 6, 0, 0, 0, 0
+ spritePiece -$10, 8, 4, 2, $E, 1, 1, 0, 0
+Map_Tails_065A_End
+
+Map_Tails_0674: spriteHeader
+ spritePiece -$14, -8, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 4, -8, 2, 2, $C, 0, 0, 0, 0
+ spritePiece 0, -2, 3, 4, $10, 1, 0, 0, 0
+Map_Tails_0674_End
+
+Map_Tails_068E: spriteHeader
+ spritePiece -$14, -8, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 4, -8, 2, 2, $C, 0, 0, 0, 0
+ spritePiece 4, 1, 2, 2, $10, 1, 0, 0, 0
+Map_Tails_068E_End
+
+Map_Tails_06A8: spriteHeader
+ spritePiece -$14, -8, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 4, -8, 2, 2, $C, 0, 0, 0, 0
+ spritePiece 4, 1, 2, 2, $10, 1, 0, 0, 0
+Map_Tails_06A8_End
+
+Map_Tails_06C2: spriteHeader
+ spritePiece -$14, -8, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 4, -8, 2, 2, $C, 0, 0, 0, 0
+ spritePiece 4, 1, 2, 2, $10, 1, 0, 0, 0
+Map_Tails_06C2_End
+
+Map_Tails_06DC: spriteHeader
+ spritePiece -$14, -8, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 4, -8, 2, 2, $C, 0, 0, 0, 0
+ spritePiece -2, -4, 3, 4, $10, 1, 0, 0, 0
+Map_Tails_06DC_End
+
+Map_Tails_06F6: spriteHeader
+ spritePiece -$14, -8, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 4, -8, 2, 2, $C, 0, 0, 0, 0
+ spritePiece -1, -9, 3, 4, $10, 0, 1, 0, 0
+Map_Tails_06F6_End
+
+Map_Tails_0710: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+Map_Tails_0710_End
+
+Map_Tails_071A: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+Map_Tails_071A_End
+
+Map_Tails_0724: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+Map_Tails_0724_End
+
+Map_Tails_072E: spriteHeader
+ spritePiece -$24, -8, 3, 2, 0, 0, 0, 0, 0
+Map_Tails_072E_End
+
+Map_Tails_0738: spriteHeader
+ spritePiece -$24, -8, 3, 2, 0, 0, 0, 0, 0
+Map_Tails_0738_End
+
+Map_Tails_0742: spriteHeader
+ spritePiece -$24, -8, 3, 2, 0, 0, 0, 0, 0
+Map_Tails_0742_End
+
+Map_Tails_074C: spriteHeader
+ spritePiece -$24, -8, 3, 2, 0, 0, 0, 0, 0
+Map_Tails_074C_End
+
+Map_Tails_0756: spriteHeader
+ spritePiece -$1F, 7, 3, 2, 0, 0, 0, 0, 0
+Map_Tails_0756_End
+
+Map_Tails_0760: spriteHeader
+ spritePiece -$1F, 7, 3, 2, 0, 0, 0, 0, 0
+Map_Tails_0760_End
+
+Map_Tails_076A: spriteHeader
+ spritePiece -$1F, 7, 3, 2, 0, 0, 0, 0, 0
+Map_Tails_076A_End
+
+Map_Tails_0774: spriteHeader
+ spritePiece -$1F, 7, 3, 2, 0, 0, 0, 0, 0
+Map_Tails_0774_End
+
+Map_Tails_077E: spriteHeader
+ spritePiece -8, $C, 2, 4, 0, 0, 0, 0, 0
+Map_Tails_077E_End
+
+Map_Tails_0788: spriteHeader
+ spritePiece -8, $C, 2, 4, 0, 0, 0, 0, 0
+Map_Tails_0788_End
+
+Map_Tails_0792: spriteHeader
+ spritePiece -8, $C, 2, 4, 0, 0, 0, 0, 0
+Map_Tails_0792_End
+
+Map_Tails_079C: spriteHeader
+ spritePiece -8, $C, 2, 4, 0, 0, 0, 0, 0
+Map_Tails_079C_End
+
+Map_Tails_07A6: spriteHeader
+ spritePiece 7, 7, 2, 4, 0, 0, 0, 0, 0
+Map_Tails_07A6_End
+
+Map_Tails_07B0: spriteHeader
+ spritePiece 7, 7, 2, 4, 0, 0, 0, 0, 0
+Map_Tails_07B0_End
+
+Map_Tails_07BA: spriteHeader
+ spritePiece 7, 7, 2, 4, 0, 0, 0, 0, 0
+Map_Tails_07BA_End
+
+Map_Tails_07C4: spriteHeader
+ spritePiece 7, 7, 2, 4, 0, 0, 0, 0, 0
+Map_Tails_07C4_End
+
+Map_Tails_07CE: spriteHeader
+ spritePiece -8, -$18, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -8, 3, 4, 4, 0, 0, 0, 0
+Map_Tails_07CE_End
+
+Map_Tails_07E0: spriteHeader
+ spritePiece -8, -$18, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -8, 3, 4, 4, 0, 0, 0, 0
+Map_Tails_07E0_End
+
+Map_Tails_07F2: spriteHeader
+ spritePiece -7, -$10, 3, 4, 0, 0, 0, 0, 0
+Map_Tails_07F2_End
+
+Map_Tails_07FC: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+Map_Tails_07FC_End
+
+Map_Tails_0806: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+Map_Tails_0806_End
+
+Map_Tails_0810: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$16, -$1C, 4, 2, $10, 0, 0, 0, 0
+Map_Tails_0810_End
+
+Map_Tails_0822: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$16, -$1C, 4, 2, $10, 1, 0, 0, 0
+Map_Tails_0822_End
+
+Map_Tails_0834: spriteHeader
+ spritePiece -$10, -$C, 4, 4, 0, 0, 0, 0, 0
+Map_Tails_0834_End
+
+Map_Tails_083E: spriteHeader
+ spritePiece -$10, -$C, 4, 4, 0, 0, 0, 0, 0
+Map_Tails_083E_End
+
+Map_Tails_0848: spriteHeader
+ spritePiece -$10, -$C, 4, 4, 0, 0, 0, 0, 0
+Map_Tails_0848_End
+
+Map_Tails_0852: spriteHeader
+ spritePiece -8, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, 6, 0, 0, 0, 0
+Map_Tails_0852_End
+
+Map_Tails_0864: spriteHeader
+ spritePiece -8, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -8, 0, 3, 2, 6, 0, 0, 0, 0
+Map_Tails_0864_End
+
+Map_Tails_0876: spriteHeader
+ spritePiece -8, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -8, 0, 3, 2, 6, 0, 0, 0, 0
+Map_Tails_0876_End
+
+Map_Tails_0888: spriteHeader
+ spritePiece -8, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -8, 0, 3, 2, 6, 0, 0, 0, 0
+Map_Tails_0888_End
+
+Map_Tails_089A: spriteHeader
+ spritePiece -$10, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, 6, 0, 0, 0, 0
+Map_Tails_089A_End
+
+Map_Tails_08AC: spriteHeader
+ spritePiece -$10, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, 6, 0, 0, 0, 0
+Map_Tails_08AC_End
+
+Map_Tails_08BE: spriteHeader
+ spritePiece -$18, -8, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$10, 3, 4, 2, 0, 0, 0, 0
+Map_Tails_08BE_End
+
+Map_Tails_08D0: spriteHeader
+ spritePiece -$10, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$18, 0, 4, 2, 6, 0, 0, 0, 0
+Map_Tails_08D0_End
+
+Map_Tails_08E2: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+Map_Tails_08E2_End
+
+Map_Tails_08EC: spriteHeader
+ spritePiece -$14, -$10, 4, 4, 0, 0, 0, 0, 0
+ spritePiece $C, -$10, 1, 4, $10, 0, 0, 0, 0
+Map_Tails_08EC_End
+
+Map_Tails_08FE: spriteHeader
+ spritePiece -$14, -$10, 4, 4, 0, 0, 0, 0, 0
+ spritePiece $C, -$10, 1, 4, $10, 0, 0, 0, 0
+Map_Tails_08FE_End
+
+Map_Tails_0910: spriteHeader
+ spritePiece -$14, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -4, -$10, 3, 4, 4, 0, 0, 0, 0
+Map_Tails_0910_End
+
+Map_Tails_0922: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 4, 0, 1, 0, 0, 0
+Map_Tails_0922_End
+
+Map_Tails_0934: spriteHeader
+ spritePiece 4, -8, 2, 2, 0, 1, 0, 0, 0
+ spritePiece -$14, -$10, 3, 4, 4, 1, 0, 0, 0
+Map_Tails_0934_End
+
+Map_Tails_0946: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, 8, 0, 0, 0, 0
+Map_Tails_0946_End
+
+Map_Tails_0958: spriteHeader
+ spritePiece 0, -$10, 2, 4, 0, 1, 0, 0, 0
+ spritePiece -$10, -8, 2, 2, 8, 1, 0, 0, 0
+Map_Tails_0958_End
+
+Map_Tails_096A: spriteHeader
+ spritePiece -$14, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -4, -$10, 3, 4, 4, 0, 0, 0, 0
+Map_Tails_096A_End
+
+Map_Tails_097C: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+Map_Tails_097C_End
+
+Map_Tails_0986: spriteHeader
+ spritePiece -$F, -$10, 3, 4, 0, 0, 0, 0, 0
+Map_Tails_0986_End
+
+Map_Tails_0990: spriteHeader
+ spritePiece -8, -$1C, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$F, -$C, 3, 4, 4, 0, 0, 0, 0
+Map_Tails_0990_End
+
+Map_Tails_09A2: spriteHeader
+ spritePiece -$E, -$E, 3, 4, 0, 0, 0, 0, 0
+Map_Tails_09A2_End
+
+Map_Tails_09AC: spriteHeader
+ spritePiece -$10, -$C, 3, 4, 0, 0, 0, 0, 0
+Map_Tails_09AC_End
+
+Map_Tails_09B6: spriteHeader
+ spritePiece -$E, -$D, 3, 4, 0, 0, 0, 0, 0
+Map_Tails_09B6_End
+
+Map_Tails_09C0: spriteHeader
+ spritePiece -$E, -$E, 3, 4, 0, 0, 0, 0, 0
+Map_Tails_09C0_End
+
+Map_Tails_09CA: spriteHeader
+ spritePiece -$E, -$E, 3, 4, 0, 0, 0, 0, 0
+Map_Tails_09CA_End
+
+Map_Tails_09D4: spriteHeader
+ spritePiece -$F, -$10, 3, 4, 0, 0, 0, 0, 0
+Map_Tails_09D4_End
+
+Map_Tails_09DE: spriteHeader
+ spritePiece -$10, -$13, 3, 4, 0, 0, 0, 0, 0
+Map_Tails_09DE_End
+
+Map_Tails_09E8: spriteHeader
+ spritePiece -$F, -$14, 3, 4, 0, 0, 0, 0, 0
+Map_Tails_09E8_End
+
+Map_Tails_09F2: spriteHeader
+ spritePiece -$D, -$C, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$D, 4, 2, 2, 6, 0, 0, 0, 0
+Map_Tails_09F2_End
+
+Map_Tails_0A04: spriteHeader
+ spritePiece -$10, -$E, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$14, 1, 4, 8, 0, 0, 0, 0
+Map_Tails_0A04_End
+
+Map_Tails_0A16: spriteHeader
+ spritePiece -$20, -8, 3, 2, 0, 0, 0, 0, 0
+Map_Tails_0A16_End
+
+Map_Tails_0A20: spriteHeader
+ spritePiece -$20, -8, 3, 2, 0, 0, 0, 0, 0
+Map_Tails_0A20_End
+
+Map_Tails_0A2A: spriteHeader
+ spritePiece -$20, -8, 3, 2, 0, 0, 0, 0, 0
+Map_Tails_0A2A_End
+
+Map_Tails_0A34: spriteHeader
+ spritePiece -$20, -8, 3, 2, 0, 0, 0, 0, 0
+Map_Tails_0A34_End
+
+Map_Tails_0A3E: spriteHeader
+ spritePiece -$C, -$18, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, -8, 4, 2, 6, 0, 0, 0, 0
+Map_Tails_0A3E_End
+
+Map_Tails_0A50: spriteHeader
+ spritePiece -$C, -$18, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, -8, 4, 2, 6, 0, 0, 0, 0
+Map_Tails_0A50_End
+
+Map_Tails_0A62: spriteHeader
+ spritePiece -$1D, -3, 3, 2, 0, 0, 0, 0, 0
+Map_Tails_0A62_End
+
+Map_Tails_0A6C: spriteHeader
+ spritePiece -$1D, -3, 3, 2, 0, 0, 0, 0, 0
+Map_Tails_0A6C_End
+
+Map_Tails_0A76: spriteHeader
+ spritePiece -$1D, -3, 3, 2, 0, 0, 0, 0, 0
+Map_Tails_0A76_End
+
+Map_Tails_0A80: spriteHeader
+ spritePiece -$1D, -3, 3, 2, 0, 0, 0, 0, 0
+Map_Tails_0A80_End
+
+ even
diff --git a/mappings/sprite/Tails.bin b/mappings/sprite/Tails.bin
deleted file mode 100644
index 2422eac3..00000000
Binary files a/mappings/sprite/Tails.bin and /dev/null differ
diff --git a/mappings/sprite/hud_a.asm b/mappings/sprite/hud_a.asm
new file mode 100644
index 00000000..1abcc9ba
--- /dev/null
+++ b/mappings/sprite/hud_a.asm
@@ -0,0 +1,59 @@
+Map_hud_a: mappingsTable
+ mappingsTableEntry.w Map_hud_a_0008
+ mappingsTableEntry.w Map_hud_a_005A
+ mappingsTableEntry.w Map_hud_a_00AC
+ mappingsTableEntry.w Map_hud_a_00FE
+
+Map_hud_a_0008: spriteHeader
+ spritePiece 0, -$80, 4, 2, 0, 0, 0, 1, 0
+ spritePiece $20, -$80, 4, 2, $18, 0, 0, 1, 0
+ spritePiece $40, -$80, 4, 2, $20, 0, 0, 1, 0
+ spritePiece 0, -$70, 4, 2, $10, 0, 0, 1, 0
+ spritePiece $28, -$70, 4, 2, $28, 0, 0, 1, 0
+ spritePiece 0, -$60, 4, 2, 8, 0, 0, 1, 0
+ spritePiece $20, -$60, 1, 2, 0, 0, 0, 1, 0
+ spritePiece $30, -$60, 3, 2, $30, 0, 0, 1, 0
+ spritePiece 0, $40, 2, 2, $10A, 0, 0, 0, 0
+ spritePiece $10, $40, 4, 2, $10E, 0, 0, 1, 0
+Map_hud_a_0008_End
+
+Map_hud_a_005A: spriteHeader
+ spritePiece 0, -$80, 4, 2, 0, 0, 0, 1, 0
+ spritePiece $20, -$80, 4, 2, $18, 0, 0, 1, 0
+ spritePiece $40, -$80, 4, 2, $20, 0, 0, 1, 0
+ spritePiece 0, -$70, 4, 2, $10, 0, 0, 1, 0
+ spritePiece $28, -$70, 4, 2, $28, 0, 0, 1, 0
+ spritePiece 0, -$60, 4, 2, 8, 0, 0, 0, 0
+ spritePiece $20, -$60, 1, 2, 0, 0, 0, 0, 0
+ spritePiece $30, -$60, 3, 2, $30, 0, 0, 1, 0
+ spritePiece 0, $40, 2, 2, $10A, 0, 0, 0, 0
+ spritePiece $10, $40, 4, 2, $10E, 0, 0, 1, 0
+Map_hud_a_005A_End
+
+Map_hud_a_00AC: spriteHeader
+ spritePiece 0, -$80, 4, 2, 0, 0, 0, 1, 0
+ spritePiece $20, -$80, 4, 2, $18, 0, 0, 1, 0
+ spritePiece $40, -$80, 4, 2, $20, 0, 0, 1, 0
+ spritePiece 0, -$70, 4, 2, $10, 0, 0, 0, 0
+ spritePiece $28, -$70, 4, 2, $28, 0, 0, 1, 0
+ spritePiece 0, -$60, 4, 2, 8, 0, 0, 1, 0
+ spritePiece $20, -$60, 1, 2, 0, 0, 0, 1, 0
+ spritePiece $30, -$60, 3, 2, $30, 0, 0, 1, 0
+ spritePiece 0, $40, 2, 2, $10A, 0, 0, 0, 0
+ spritePiece $10, $40, 4, 2, $10E, 0, 0, 1, 0
+Map_hud_a_00AC_End
+
+Map_hud_a_00FE: spriteHeader
+ spritePiece 0, -$80, 4, 2, 0, 0, 0, 1, 0
+ spritePiece $20, -$80, 4, 2, $18, 0, 0, 1, 0
+ spritePiece $40, -$80, 4, 2, $20, 0, 0, 1, 0
+ spritePiece 0, -$70, 4, 2, $10, 0, 0, 0, 0
+ spritePiece $28, -$70, 4, 2, $28, 0, 0, 1, 0
+ spritePiece 0, -$60, 4, 2, 8, 0, 0, 0, 0
+ spritePiece $20, -$60, 1, 2, 0, 0, 0, 0, 0
+ spritePiece $30, -$60, 3, 2, $30, 0, 0, 1, 0
+ spritePiece 0, $40, 2, 2, $10A, 0, 0, 0, 0
+ spritePiece $10, $40, 4, 2, $10E, 0, 0, 1, 0
+Map_hud_a_00FE_End
+
+ even
diff --git a/mappings/sprite/hud_a.bin b/mappings/sprite/hud_a.bin
deleted file mode 100644
index 96184fa4..00000000
Binary files a/mappings/sprite/hud_a.bin and /dev/null differ
diff --git a/mappings/sprite/hud_b.asm b/mappings/sprite/hud_b.asm
new file mode 100644
index 00000000..2c786953
--- /dev/null
+++ b/mappings/sprite/hud_b.asm
@@ -0,0 +1,43 @@
+Map_hud_b: mappingsTable
+ mappingsTableEntry.w Map_hud_b_000C
+ mappingsTableEntry.w Map_hud_b_0026
+ mappingsTableEntry.w Map_hud_b_0040
+ mappingsTableEntry.w Map_hud_b_005A
+ mappingsTableEntry.w Map_hud_b_0074
+ mappingsTableEntry.w Map_hud_b_0086
+
+Map_hud_b_000C: spriteHeader
+ spritePiece 0, -$80, 4, 2, $10, 0, 0, 1, 0
+ spritePiece 0, -$70, 4, 2, 8, 0, 0, 1, 0
+ spritePiece $20, -$70, 1, 2, 0, 0, 0, 1, 0
+Map_hud_b_000C_End
+
+Map_hud_b_0026: spriteHeader
+ spritePiece 0, -$80, 4, 2, $10, 0, 0, 1, 0
+ spritePiece 0, -$70, 4, 2, 8, 0, 0, 0, 0
+ spritePiece $20, -$70, 1, 2, 0, 0, 0, 0, 0
+Map_hud_b_0026_End
+
+Map_hud_b_0040: spriteHeader
+ spritePiece 0, -$80, 4, 2, $10, 0, 0, 0, 0
+ spritePiece 0, -$70, 4, 2, 8, 0, 0, 1, 0
+ spritePiece $20, -$70, 1, 2, 0, 0, 0, 1, 0
+Map_hud_b_0040_End
+
+Map_hud_b_005A: spriteHeader
+ spritePiece 0, -$80, 4, 2, $10, 0, 0, 0, 0
+ spritePiece 0, -$70, 4, 2, 8, 0, 0, 0, 0
+ spritePiece $20, -$70, 1, 2, 0, 0, 0, 0, 0
+Map_hud_b_005A_End
+
+Map_hud_b_0074: spriteHeader
+ spritePiece 0, $40, 2, 2, $10A, 0, 0, 0, 0
+ spritePiece $10, $40, 4, 2, $10E, 0, 0, 1, 0
+Map_hud_b_0074_End
+
+Map_hud_b_0086: spriteHeader
+ spritePiece 0, $40, 2, 2, $1C, 0, 0, 0, 0
+ spritePiece $10, $40, 4, 2, $78, 0, 0, 1, 0
+Map_hud_b_0086_End
+
+ even
diff --git a/mappings/sprite/hud_b.bin b/mappings/sprite/hud_b.bin
deleted file mode 100644
index 576951d7..00000000
Binary files a/mappings/sprite/hud_b.bin and /dev/null differ
diff --git a/mappings/sprite/hud_c.asm b/mappings/sprite/hud_c.asm
new file mode 100644
index 00000000..2d6cf12b
--- /dev/null
+++ b/mappings/sprite/hud_c.asm
@@ -0,0 +1,58 @@
+Map_hud_c: mappingsTable
+ mappingsTableEntry.w Map_hud_c_0016
+ mappingsTableEntry.w Map_hud_c_0020
+ mappingsTableEntry.w Map_hud_c_002A
+ mappingsTableEntry.w Map_hud_c_0034
+ mappingsTableEntry.w Map_hud_c_003E
+ mappingsTableEntry.w Map_hud_c_0048
+ mappingsTableEntry.w Map_hud_c_0052
+ mappingsTableEntry.w Map_hud_c_005C
+ mappingsTableEntry.w Map_hud_c_0066
+ mappingsTableEntry.w Map_hud_c_0070
+ mappingsTableEntry.w Map_hud_c_007A
+
+Map_hud_c_0016: spriteHeader
+ spritePiece 0, 0, 1, 2, 0, 0, 0, 1, 0
+Map_hud_c_0016_End
+
+Map_hud_c_0020: spriteHeader
+ spritePiece 0, 0, 1, 2, 2, 0, 0, 1, 0
+Map_hud_c_0020_End
+
+Map_hud_c_002A: spriteHeader
+ spritePiece 0, 0, 1, 2, 4, 0, 0, 1, 0
+Map_hud_c_002A_End
+
+Map_hud_c_0034: spriteHeader
+ spritePiece 0, 0, 1, 2, 6, 0, 0, 1, 0
+Map_hud_c_0034_End
+
+Map_hud_c_003E: spriteHeader
+ spritePiece 0, 0, 1, 2, 8, 0, 0, 1, 0
+Map_hud_c_003E_End
+
+Map_hud_c_0048: spriteHeader
+ spritePiece 0, 0, 1, 2, $A, 0, 0, 1, 0
+Map_hud_c_0048_End
+
+Map_hud_c_0052: spriteHeader
+ spritePiece 0, 0, 1, 2, $C, 0, 0, 1, 0
+Map_hud_c_0052_End
+
+Map_hud_c_005C: spriteHeader
+ spritePiece 0, 0, 1, 2, $E, 0, 0, 1, 0
+Map_hud_c_005C_End
+
+Map_hud_c_0066: spriteHeader
+ spritePiece 0, 0, 1, 2, $10, 0, 0, 1, 0
+Map_hud_c_0066_End
+
+Map_hud_c_0070: spriteHeader
+ spritePiece 0, 0, 1, 2, $12, 0, 0, 1, 0
+Map_hud_c_0070_End
+
+Map_hud_c_007A: spriteHeader
+ spritePiece 0, 0, 1, 2, $14, 0, 0, 1, 0
+Map_hud_c_007A_End
+
+ even
diff --git a/mappings/sprite/hud_c.bin b/mappings/sprite/hud_c.bin
deleted file mode 100644
index 8fbd8750..00000000
Binary files a/mappings/sprite/hud_c.bin and /dev/null differ
diff --git a/mappings/sprite/obj03.asm b/mappings/sprite/obj03.asm
new file mode 100644
index 00000000..851f5748
--- /dev/null
+++ b/mappings/sprite/obj03.asm
@@ -0,0 +1,53 @@
+Map_obj03: mappingsTable
+ mappingsTableEntry.w Map_obj03_0010
+ mappingsTableEntry.w Map_obj03_0032
+ mappingsTableEntry.w Map_obj03_0054
+ mappingsTableEntry.w Map_obj03_0054
+ mappingsTableEntry.w Map_obj03_0076
+ mappingsTableEntry.w Map_obj03_0098
+ mappingsTableEntry.w Map_obj03_00BA
+ mappingsTableEntry.w Map_obj03_00BA
+
+Map_obj03_0010: spriteHeader
+ spritePiece -8, -$20, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, $10, 2, 2, 0, 0, 0, 0, 0
+Map_obj03_0010_End
+
+Map_obj03_0032: spriteHeader
+ spritePiece -8, -$40, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, -$20, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, $30, 2, 2, 0, 0, 0, 0, 0
+Map_obj03_0032_End
+
+Map_obj03_0054: spriteHeader
+ spritePiece -8, -$80, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, -$20, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, $70, 2, 2, 0, 0, 0, 0, 0
+Map_obj03_0054_End
+
+Map_obj03_0076: spriteHeader
+ spritePiece -$20, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $10, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj03_0076_End
+
+Map_obj03_0098: spriteHeader
+ spritePiece -$40, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $30, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj03_0098_End
+
+Map_obj03_00BA: spriteHeader
+ spritePiece -$80, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $70, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj03_00BA_End
+
+ even
diff --git a/mappings/sprite/obj03.bin b/mappings/sprite/obj03.bin
deleted file mode 100644
index 6a2b7e43..00000000
Binary files a/mappings/sprite/obj03.bin and /dev/null differ
diff --git a/mappings/sprite/obj04_a.asm b/mappings/sprite/obj04_a.asm
new file mode 100644
index 00000000..2e06af1b
--- /dev/null
+++ b/mappings/sprite/obj04_a.asm
@@ -0,0 +1,54 @@
+Map_obj04_a: mappingsTable
+ mappingsTableEntry.w Map_obj04_a_000C
+ mappingsTableEntry.w Map_obj04_a_0026
+ mappingsTableEntry.w Map_obj04_a_0040
+ mappingsTableEntry.w Map_obj04_a_005A
+ mappingsTableEntry.w Map_obj04_a_008C
+ mappingsTableEntry.w Map_obj04_a_00BE
+
+Map_obj04_a_000C: spriteHeader
+ spritePiece -$60, -8, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, -8, 4, 2, 0, 0, 0, 0, 0
+ spritePiece $20, -8, 4, 2, 0, 0, 0, 0, 0
+Map_obj04_a_000C_End
+
+Map_obj04_a_0026: spriteHeader
+ spritePiece -$60, -8, 4, 2, 8, 0, 0, 0, 0
+ spritePiece -$20, -8, 4, 2, 8, 0, 0, 0, 0
+ spritePiece $20, -8, 4, 2, 8, 0, 0, 0, 0
+Map_obj04_a_0026_End
+
+Map_obj04_a_0040: spriteHeader
+ spritePiece -$60, -8, 4, 2, $10, 0, 0, 0, 0
+ spritePiece -$20, -8, 4, 2, $10, 0, 0, 0, 0
+ spritePiece $20, -8, 4, 2, $10, 0, 0, 0, 0
+Map_obj04_a_0040_End
+
+Map_obj04_a_005A: spriteHeader
+ spritePiece -$60, -8, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$40, -8, 4, 2, 8, 0, 0, 0, 0
+ spritePiece -$20, -8, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -8, 4, 2, 8, 0, 0, 0, 0
+ spritePiece $20, -8, 4, 2, 0, 0, 0, 0, 0
+ spritePiece $40, -8, 4, 2, 8, 0, 0, 0, 0
+Map_obj04_a_005A_End
+
+Map_obj04_a_008C: spriteHeader
+ spritePiece -$60, -8, 4, 2, 8, 0, 0, 0, 0
+ spritePiece -$40, -8, 4, 2, $10, 0, 0, 0, 0
+ spritePiece -$20, -8, 4, 2, 8, 0, 0, 0, 0
+ spritePiece 0, -8, 4, 2, $10, 0, 0, 0, 0
+ spritePiece $20, -8, 4, 2, 8, 0, 0, 0, 0
+ spritePiece $40, -8, 4, 2, $10, 0, 0, 0, 0
+Map_obj04_a_008C_End
+
+Map_obj04_a_00BE: spriteHeader
+ spritePiece -$60, -8, 4, 2, $10, 0, 0, 0, 0
+ spritePiece -$40, -8, 4, 2, 8, 0, 0, 0, 0
+ spritePiece -$20, -8, 4, 2, $10, 0, 0, 0, 0
+ spritePiece 0, -8, 4, 2, 8, 0, 0, 0, 0
+ spritePiece $20, -8, 4, 2, $10, 0, 0, 0, 0
+ spritePiece $40, -8, 4, 2, 8, 0, 0, 0, 0
+Map_obj04_a_00BE_End
+
+ even
diff --git a/mappings/sprite/obj04_a.bin b/mappings/sprite/obj04_a.bin
deleted file mode 100644
index 6a93b13e..00000000
Binary files a/mappings/sprite/obj04_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj04_b.asm b/mappings/sprite/obj04_b.asm
new file mode 100644
index 00000000..8bdf7978
--- /dev/null
+++ b/mappings/sprite/obj04_b.asm
@@ -0,0 +1,37 @@
+Map_obj04_b: mappingsTable
+ mappingsTableEntry.w Map_obj04_b_0008
+ mappingsTableEntry.w Map_obj04_b_0022
+ mappingsTableEntry.w Map_obj04_b_003C
+ mappingsTableEntry.w Map_obj04_b_006E
+
+Map_obj04_b_0008: spriteHeader
+ spritePiece -$60, -4, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, -4, 4, 2, 0, 0, 0, 0, 0
+ spritePiece $20, -4, 4, 2, 0, 0, 0, 0, 0
+Map_obj04_b_0008_End
+
+Map_obj04_b_0022: spriteHeader
+ spritePiece -$60, -4, 4, 2, 8, 0, 0, 0, 0
+ spritePiece -$20, -4, 4, 2, 8, 0, 0, 0, 0
+ spritePiece $20, -4, 4, 2, 8, 0, 0, 0, 0
+Map_obj04_b_0022_End
+
+Map_obj04_b_003C: spriteHeader
+ spritePiece -$60, -4, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$40, -4, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, -4, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -4, 4, 2, 0, 0, 0, 0, 0
+ spritePiece $20, -4, 4, 2, 0, 0, 0, 0, 0
+ spritePiece $40, -4, 4, 2, 0, 0, 0, 0, 0
+Map_obj04_b_003C_End
+
+Map_obj04_b_006E: spriteHeader
+ spritePiece -$60, -4, 4, 2, 8, 0, 0, 0, 0
+ spritePiece -$40, -4, 4, 2, 8, 0, 0, 0, 0
+ spritePiece -$20, -4, 4, 2, 8, 0, 0, 0, 0
+ spritePiece 0, -4, 4, 2, 8, 0, 0, 0, 0
+ spritePiece $20, -4, 4, 2, 8, 0, 0, 0, 0
+ spritePiece $40, -4, 4, 2, 8, 0, 0, 0, 0
+Map_obj04_b_006E_End
+
+ even
diff --git a/mappings/sprite/obj04_b.bin b/mappings/sprite/obj04_b.bin
deleted file mode 100644
index bc7ecbd8..00000000
Binary files a/mappings/sprite/obj04_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj08.asm b/mappings/sprite/obj08.asm
new file mode 100644
index 00000000..adcc4564
--- /dev/null
+++ b/mappings/sprite/obj08.asm
@@ -0,0 +1,112 @@
+Map_obj08: mappingsTable
+ mappingsTableEntry.w Map_obj08_002C
+ mappingsTableEntry.w Map_obj08_002E
+ mappingsTableEntry.w Map_obj08_0038
+ mappingsTableEntry.w Map_obj08_0042
+ mappingsTableEntry.w Map_obj08_004C
+ mappingsTableEntry.w Map_obj08_0056
+ mappingsTableEntry.w Map_obj08_0060
+ mappingsTableEntry.w Map_obj08_006A
+ mappingsTableEntry.w Map_obj08_0074
+ mappingsTableEntry.w Map_obj08_007E
+ mappingsTableEntry.w Map_obj08_0088
+ mappingsTableEntry.w Map_obj08_0092
+ mappingsTableEntry.w Map_obj08_009C
+ mappingsTableEntry.w Map_obj08_00A6
+ mappingsTableEntry.w Map_obj08_00B8
+ mappingsTableEntry.w Map_obj08_00CA
+ mappingsTableEntry.w Map_obj08_00DC
+ mappingsTableEntry.w Map_obj08_00EE
+ mappingsTableEntry.w Map_obj08_00F8
+ mappingsTableEntry.w Map_obj08_0102
+ mappingsTableEntry.w Map_obj08_010C
+ mappingsTableEntry.w Map_obj08_002C
+
+Map_obj08_002C: spriteHeader
+Map_obj08_002C_End
+
+Map_obj08_002E: spriteHeader
+ spritePiece -$10, -$E, 4, 2, 0, 0, 0, 0, 0
+Map_obj08_002E_End
+
+Map_obj08_0038: spriteHeader
+ spritePiece -$10, -$1E, 4, 4, 0, 0, 0, 0, 0
+Map_obj08_0038_End
+
+Map_obj08_0042: spriteHeader
+ spritePiece -$10, -$1E, 4, 4, 0, 0, 0, 0, 0
+Map_obj08_0042_End
+
+Map_obj08_004C: spriteHeader
+ spritePiece -$10, -$1E, 4, 4, 0, 0, 0, 0, 0
+Map_obj08_004C_End
+
+Map_obj08_0056: spriteHeader
+ spritePiece -$10, -$1E, 4, 4, 0, 0, 0, 0, 0
+Map_obj08_0056_End
+
+Map_obj08_0060: spriteHeader
+ spritePiece -$10, -$1E, 4, 4, 0, 0, 0, 0, 0
+Map_obj08_0060_End
+
+Map_obj08_006A: spriteHeader
+ spritePiece -$10, -$E, 4, 2, 0, 0, 0, 0, 0
+Map_obj08_006A_End
+
+Map_obj08_0074: spriteHeader
+ spritePiece -$10, -$E, 4, 2, 0, 0, 0, 0, 0
+Map_obj08_0074_End
+
+Map_obj08_007E: spriteHeader
+ spritePiece -$10, -$E, 4, 2, 0, 0, 0, 0, 0
+Map_obj08_007E_End
+
+Map_obj08_0088: spriteHeader
+ spritePiece -$20, 4, 4, 2, 0, 0, 0, 0, 0
+Map_obj08_0088_End
+
+Map_obj08_0092: spriteHeader
+ spritePiece -$20, 4, 4, 2, 0, 0, 0, 0, 0
+Map_obj08_0092_End
+
+Map_obj08_009C: spriteHeader
+ spritePiece -$20, 4, 4, 2, 0, 0, 0, 0, 0
+Map_obj08_009C_End
+
+Map_obj08_00A6: spriteHeader
+ spritePiece -$18, -$C, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, 4, 4, 2, 2, 0, 0, 0, 0
+Map_obj08_00A6_End
+
+Map_obj08_00B8: spriteHeader
+ spritePiece -$18, -$C, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, 4, 4, 2, 4, 0, 0, 0, 0
+Map_obj08_00B8_End
+
+Map_obj08_00CA: spriteHeader
+ spritePiece -$20, -$C, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, 4, 4, 2, 6, 0, 0, 0, 0
+Map_obj08_00CA_End
+
+Map_obj08_00DC: spriteHeader
+ spritePiece -$20, -$C, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, 4, 4, 2, 6, 0, 0, 0, 0
+Map_obj08_00DC_End
+
+Map_obj08_00EE: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj08_00EE_End
+
+Map_obj08_00F8: spriteHeader
+ spritePiece -8, -8, 2, 2, 4, 0, 0, 0, 0
+Map_obj08_00F8_End
+
+Map_obj08_0102: spriteHeader
+ spritePiece -8, -8, 2, 2, 8, 0, 0, 0, 0
+Map_obj08_0102_End
+
+Map_obj08_010C: spriteHeader
+ spritePiece -8, -8, 2, 2, $C, 0, 0, 0, 0
+Map_obj08_010C_End
+
+ even
diff --git a/mappings/sprite/obj08.bin b/mappings/sprite/obj08.bin
deleted file mode 100644
index 484ca59a..00000000
Binary files a/mappings/sprite/obj08.bin and /dev/null differ
diff --git a/mappings/sprite/obj09.asm b/mappings/sprite/obj09.asm
new file mode 100644
index 00000000..a230ded7
--- /dev/null
+++ b/mappings/sprite/obj09.asm
@@ -0,0 +1,146 @@
+Map_obj09: mappingsTable
+ mappingsTableEntry.w Map_obj09_0024
+ mappingsTableEntry.w Map_obj09_003E
+ mappingsTableEntry.w Map_obj09_0058
+ mappingsTableEntry.w Map_obj09_0072
+ mappingsTableEntry.w Map_obj09_008C
+ mappingsTableEntry.w Map_obj09_00AE
+ mappingsTableEntry.w Map_obj09_00D8
+ mappingsTableEntry.w Map_obj09_0102
+ mappingsTableEntry.w Map_obj09_012C
+ mappingsTableEntry.w Map_obj09_014E
+ mappingsTableEntry.w Map_obj09_0178
+ mappingsTableEntry.w Map_obj09_01A2
+ mappingsTableEntry.w Map_obj09_01D4
+ mappingsTableEntry.w Map_obj09_01EE
+ mappingsTableEntry.w Map_obj09_0208
+ mappingsTableEntry.w Map_obj09_0222
+ mappingsTableEntry.w Map_obj09_023C
+ mappingsTableEntry.w Map_obj09_025E
+
+Map_obj09_0024: spriteHeader
+ spritePiece -$10, -$1C, 4, 4, 0, 0, 0, 0, 1
+ spritePiece -$10, 4, 3, 3, $10, 0, 0, 0, 1
+ spritePiece 8, 4, 1, 2, $19, 0, 0, 0, 1
+Map_obj09_0024_End
+
+Map_obj09_003E: spriteHeader
+ spritePiece -$E, -$1C, 3, 3, 0, 0, 0, 0, 1
+ spritePiece -$10, -4, 4, 2, 9, 0, 0, 0, 1
+ spritePiece -9, $C, 2, 2, $11, 0, 0, 0, 1
+Map_obj09_003E_End
+
+Map_obj09_0058: spriteHeader
+ spritePiece -$10, -$1C, 4, 3, 0, 0, 0, 0, 1
+ spritePiece -$10, -4, 4, 2, $C, 0, 0, 0, 1
+ spritePiece -$10, $C, 3, 2, $14, 0, 0, 0, 1
+Map_obj09_0058_End
+
+Map_obj09_0072: spriteHeader
+ spritePiece -$A, -$1C, 3, 3, 0, 1, 0, 0, 1
+ spritePiece -$10, -4, 4, 2, 9, 0, 0, 0, 1
+ spritePiece -8, $C, 3, 2, $11, 0, 0, 0, 1
+Map_obj09_0072_End
+
+Map_obj09_008C: spriteHeader
+ spritePiece -$14, -$1C, 3, 3, 0, 0, 0, 0, 1
+ spritePiece 4, -$1C, 1, 4, 9, 0, 0, 0, 1
+ spritePiece $C, -$14, 1, 2, $D, 0, 0, 0, 1
+ spritePiece -$1C, -4, 4, 3, $F, 0, 0, 0, 1
+Map_obj09_008C_End
+
+Map_obj09_00AE: spriteHeader
+ spritePiece -$C, -$1C, 3, 2, 0, 0, 0, 0, 1
+ spritePiece $C, -$14, 1, 2, 6, 0, 0, 0, 1
+ spritePiece -$14, -$C, 4, 2, 8, 0, 0, 0, 1
+ spritePiece -$1A, 4, 4, 2, $10, 0, 0, 0, 1
+ spritePiece -$12, $14, 1, 1, $18, 0, 0, 0, 1
+Map_obj09_00AE_End
+
+Map_obj09_00D8: spriteHeader
+ spritePiece -5, -$1C, 2, 1, 0, 0, 0, 0, 1
+ spritePiece -$14, -$14, 4, 3, 2, 0, 0, 0, 1
+ spritePiece $C, -$14, 1, 3, $E, 0, 0, 0, 1
+ spritePiece -$19, 4, 2, 3, $11, 0, 0, 0, 1
+ spritePiece -9, 4, 2, 2, $17, 0, 0, 0, 1
+Map_obj09_00D8_End
+
+Map_obj09_0102: spriteHeader
+ spritePiece -4, -$1C, 2, 1, 0, 0, 0, 0, 1
+ spritePiece -$14, -$14, 4, 4, 2, 0, 0, 0, 1
+ spritePiece $C, -$14, 1, 3, $12, 0, 0, 0, 1
+ spritePiece -$1C, 4, 1, 1, $15, 0, 0, 0, 1
+ spritePiece -$16, $C, 2, 2, $16, 0, 0, 0, 1
+Map_obj09_0102_End
+
+Map_obj09_012C: spriteHeader
+ spritePiece -4, -$1C, 2, 2, 0, 0, 0, 0, 1
+ spritePiece $C, -$14, 1, 4, 4, 0, 0, 0, 1
+ spritePiece -$14, -$C, 4, 3, 8, 0, 0, 0, 1
+ spritePiece -$14, $C, 2, 2, $14, 0, 0, 0, 1
+Map_obj09_012C_End
+
+Map_obj09_014E: spriteHeader
+ spritePiece -4, -$1C, 2, 2, 0, 0, 0, 0, 1
+ spritePiece $C, -$14, 1, 3, 4, 0, 0, 0, 1
+ spritePiece -$14, -$C, 4, 2, 7, 0, 0, 0, 1
+ spritePiece -$18, 4, 4, 2, $F, 0, 0, 0, 1
+ spritePiece -$C, -$14, 1, 1, $17, 0, 0, 0, 1
+Map_obj09_014E_End
+
+Map_obj09_0178: spriteHeader
+ spritePiece -5, -$1C, 3, 2, 0, 0, 0, 0, 1
+ spritePiece $E, -$C, 1, 2, 6, 0, 0, 0, 1
+ spritePiece -$12, -$C, 4, 2, 8, 0, 0, 0, 1
+ spritePiece -$19, 4, 4, 2, $10, 0, 0, 0, 1
+ spritePiece -$11, $14, 1, 1, $18, 0, 0, 0, 1
+Map_obj09_0178_End
+
+Map_obj09_01A2: spriteHeader
+ spritePiece 2, -$1C, 1, 1, 0, 0, 0, 0, 1
+ spritePiece -$C, -$14, 4, 2, 1, 0, 0, 0, 1
+ spritePiece $C, -4, 1, 1, 9, 0, 0, 0, 1
+ spritePiece -$1C, 4, 1, 2, $A, 0, 0, 0, 1
+ spritePiece -$14, -4, 2, 4, $C, 0, 0, 0, 1
+ spritePiece -4, -4, 2, 3, $14, 0, 0, 0, 1
+Map_obj09_01A2_End
+
+Map_obj09_01D4: spriteHeader
+ spritePiece -$18, -$10, 2, 3, 0, 0, 0, 0, 1
+ spritePiece -$10, 8, 1, 1, 6, 0, 0, 0, 1
+ spritePiece -8, -$10, 4, 4, 7, 0, 0, 0, 1
+Map_obj09_01D4_End
+
+Map_obj09_01EE: spriteHeader
+ spritePiece -$18, -$10, 2, 3, 0, 0, 0, 0, 1
+ spritePiece -8, -$F, 1, 4, 6, 0, 0, 0, 1
+ spritePiece 0, -$10, 3, 4, $A, 0, 0, 0, 1
+Map_obj09_01EE_End
+
+Map_obj09_0208: spriteHeader
+ spritePiece -$18, -$F, 1, 3, 0, 0, 0, 0, 1
+ spritePiece -$10, -$10, 1, 3, 3, 0, 0, 0, 1
+ spritePiece -8, -$10, 4, 4, 6, 0, 0, 0, 1
+Map_obj09_0208_End
+
+Map_obj09_0222: spriteHeader
+ spritePiece -$18, -8, 2, 3, 0, 0, 0, 0, 1
+ spritePiece -8, -$11, 1, 4, 6, 0, 0, 0, 1
+ spritePiece 0, -$10, 3, 4, $A, 0, 0, 0, 1
+Map_obj09_0222_End
+
+Map_obj09_023C: spriteHeader
+ spritePiece -$10, -$14, 2, 4, 0, 0, 0, 0, 1
+ spritePiece -$10, $C, 2, 1, 8, 0, 0, 0, 1
+ spritePiece 0, -$14, 2, 4, 0, 1, 0, 0, 1
+ spritePiece 0, $C, 2, 1, 8, 1, 0, 0, 1
+Map_obj09_023C_End
+
+Map_obj09_025E: spriteHeader
+ spritePiece -$10, -$14, 2, 4, 0, 0, 0, 0, 1
+ spritePiece -$10, $C, 2, 1, 8, 0, 0, 0, 1
+ spritePiece 0, -$14, 2, 4, 0, 1, 0, 0, 1
+ spritePiece 0, $C, 2, 1, 8, 1, 0, 0, 1
+Map_obj09_025E_End
+
+ even
diff --git a/mappings/sprite/obj09.bin b/mappings/sprite/obj09.bin
deleted file mode 100644
index a7165a83..00000000
Binary files a/mappings/sprite/obj09.bin and /dev/null differ
diff --git a/mappings/sprite/obj0B.asm b/mappings/sprite/obj0B.asm
new file mode 100644
index 00000000..c7b8db72
--- /dev/null
+++ b/mappings/sprite/obj0B.asm
@@ -0,0 +1,33 @@
+Map_obj0B: mappingsTable
+ mappingsTableEntry.w Map_obj0B_000A
+ mappingsTableEntry.w Map_obj0B_001C
+ mappingsTableEntry.w Map_obj0B_002E
+ mappingsTableEntry.w Map_obj0B_0040
+ mappingsTableEntry.w Map_obj0B_0052
+
+Map_obj0B_000A: spriteHeader
+ spritePiece -$10, -$10, 4, 1, 0, 0, 0, 0, 0
+ spritePiece -$10, -8, 4, 3, $24, 0, 0, 0, 0
+Map_obj0B_000A_End
+
+Map_obj0B_001C: spriteHeader
+ spritePiece -$10, -$18, 4, 4, 4, 0, 0, 0, 0
+ spritePiece -$10, -8, 4, 3, $24, 0, 0, 0, 0
+Map_obj0B_001C_End
+
+Map_obj0B_002E: spriteHeader
+ spritePiece -$10, -$C, 4, 4, $14, 0, 0, 0, 0
+ spritePiece -$10, -8, 4, 3, $24, 0, 0, 0, 0
+Map_obj0B_002E_End
+
+Map_obj0B_0040: spriteHeader
+ spritePiece -$10, 0, 4, 4, 4, 0, 1, 0, 0
+ spritePiece -$10, -8, 4, 3, $24, 0, 0, 0, 0
+Map_obj0B_0040_End
+
+Map_obj0B_0052: spriteHeader
+ spritePiece -$10, $10, 4, 1, 0, 0, 1, 0, 0
+ spritePiece -$10, -8, 4, 3, $24, 0, 0, 0, 0
+Map_obj0B_0052_End
+
+ even
diff --git a/mappings/sprite/obj0B.bin b/mappings/sprite/obj0B.bin
deleted file mode 100644
index 7c2c5461..00000000
Binary files a/mappings/sprite/obj0B.bin and /dev/null differ
diff --git a/mappings/sprite/obj0C.asm b/mappings/sprite/obj0C.asm
new file mode 100644
index 00000000..424aa863
--- /dev/null
+++ b/mappings/sprite/obj0C.asm
@@ -0,0 +1,8 @@
+Map_obj0C: mappingsTable
+ mappingsTableEntry.w Map_obj0C_0002
+
+Map_obj0C_0002: spriteHeader
+ spritePiece -$10, -8, 4, 2, 0, 0, 0, 0, 0
+Map_obj0C_0002_End
+
+ even
diff --git a/mappings/sprite/obj0C.bin b/mappings/sprite/obj0C.bin
deleted file mode 100644
index 543e56fe..00000000
Binary files a/mappings/sprite/obj0C.bin and /dev/null differ
diff --git a/mappings/sprite/obj0D_a.asm b/mappings/sprite/obj0D_a.asm
new file mode 100644
index 00000000..648a5300
--- /dev/null
+++ b/mappings/sprite/obj0D_a.asm
@@ -0,0 +1,43 @@
+Map_obj0D_a: mappingsTable
+ mappingsTableEntry.w Map_obj0D_a_000C
+ mappingsTableEntry.w Map_obj0D_a_0026
+ mappingsTableEntry.w Map_obj0D_a_0048
+ mappingsTableEntry.w Map_obj0D_a_0062
+ mappingsTableEntry.w Map_obj0D_a_0074
+ mappingsTableEntry.w Map_obj0D_a_0086
+
+Map_obj0D_a_000C: spriteHeader
+ spritePiece -$18, -$10, 3, 4, $22, 0, 0, 0, 0
+ spritePiece 0, -$10, 3, 4, $2E, 0, 0, 0, 0
+ spritePiece -4, $10, 1, 2, $20, 0, 0, 0, 0
+Map_obj0D_a_000C_End
+
+Map_obj0D_a_0026: spriteHeader
+ spritePiece -$18, -$10, 1, 4, $3A, 0, 0, 0, 0
+ spritePiece -$10, -$10, 4, 4, $3E, 0, 0, 0, 0
+ spritePiece $10, -$10, 1, 4, $3A, 1, 0, 0, 0
+ spritePiece -4, $10, 1, 2, $20, 0, 0, 0, 0
+Map_obj0D_a_0026_End
+
+Map_obj0D_a_0048: spriteHeader
+ spritePiece -$18, -$10, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 3, 4, 0, 1, 0, 0, 0
+ spritePiece -4, $10, 1, 2, $20, 0, 0, 0, 0
+Map_obj0D_a_0048_End
+
+Map_obj0D_a_0062: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $C, 0, 0, 0, 0
+ spritePiece -4, $10, 1, 2, $20, 0, 0, 0, 0
+Map_obj0D_a_0062_End
+
+Map_obj0D_a_0074: spriteHeader
+ spritePiece -4, -$10, 1, 4, $1C, 0, 0, 0, 0
+ spritePiece -4, $10, 1, 2, $20, 0, 0, 0, 0
+Map_obj0D_a_0074_End
+
+Map_obj0D_a_0086: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $C, 1, 0, 0, 0
+ spritePiece -4, $10, 1, 2, $20, 0, 0, 0, 0
+Map_obj0D_a_0086_End
+
+ even
diff --git a/mappings/sprite/obj0D_a.bin b/mappings/sprite/obj0D_a.bin
deleted file mode 100644
index b22fe8ae..00000000
Binary files a/mappings/sprite/obj0D_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj0D_b.asm b/mappings/sprite/obj0D_b.asm
new file mode 100644
index 00000000..d1bfd6fd
--- /dev/null
+++ b/mappings/sprite/obj0D_b.asm
@@ -0,0 +1,43 @@
+Map_obj0D_b: mappingsTable
+ mappingsTableEntry.w Map_obj0D_b_000C
+ mappingsTableEntry.w Map_obj0D_b_0026
+ mappingsTableEntry.w Map_obj0D_b_0048
+ mappingsTableEntry.w Map_obj0D_b_0062
+ mappingsTableEntry.w Map_obj0D_b_0074
+ mappingsTableEntry.w Map_obj0D_b_0086
+
+Map_obj0D_b_000C: spriteHeader
+ spritePiece -$18, -$10, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 3, 4, $C, 0, 0, 0, 0
+ spritePiece -4, $10, 1, 2, $214, 0, 0, 0, 0
+Map_obj0D_b_000C_End
+
+Map_obj0D_b_0026: spriteHeader
+ spritePiece -$18, -$10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$10, 4, 4, 4, 0, 0, 0, 0
+ spritePiece $10, -$10, 1, 4, $14, 1, 0, 0, 0
+ spritePiece -4, $10, 1, 2, $214, 0, 0, 0, 0
+Map_obj0D_b_0026_End
+
+Map_obj0D_b_0048: spriteHeader
+ spritePiece -$18, -$10, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 3, 4, 0, 1, 0, 0, 0
+ spritePiece -4, $10, 1, 2, $214, 0, 0, 0, 0
+Map_obj0D_b_0048_End
+
+Map_obj0D_b_0062: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $10, 1, 2, $214, 0, 0, 0, 0
+Map_obj0D_b_0062_End
+
+Map_obj0D_b_0074: spriteHeader
+ spritePiece -4, -$10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $10, 1, 2, $214, 0, 0, 0, 0
+Map_obj0D_b_0074_End
+
+Map_obj0D_b_0086: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 1, 0, 0, 0
+ spritePiece -4, $10, 1, 2, $214, 0, 0, 0, 0
+Map_obj0D_b_0086_End
+
+ even
diff --git a/mappings/sprite/obj0D_b.bin b/mappings/sprite/obj0D_b.bin
deleted file mode 100644
index ef8f87eb..00000000
Binary files a/mappings/sprite/obj0D_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj0E.asm b/mappings/sprite/obj0E.asm
new file mode 100644
index 00000000..ac058862
--- /dev/null
+++ b/mappings/sprite/obj0E.asm
@@ -0,0 +1,226 @@
+Map_obj0E: mappingsTable
+ mappingsTableEntry.w Map_obj0E_0028
+ mappingsTableEntry.w Map_obj0E_005A
+ mappingsTableEntry.w Map_obj0E_00A4
+ mappingsTableEntry.w Map_obj0E_00E6
+ mappingsTableEntry.w Map_obj0E_0150
+ mappingsTableEntry.w Map_obj0E_01BA
+ mappingsTableEntry.w Map_obj0E_0224
+ mappingsTableEntry.w Map_obj0E_028E
+ mappingsTableEntry.w Map_obj0E_0308
+ mappingsTableEntry.w Map_obj0E_0372
+ mappingsTableEntry.w Map_obj0E_038C
+ mappingsTableEntry.w Map_obj0E_03BE
+ mappingsTableEntry.w Map_obj0E_03F8
+ mappingsTableEntry.w Map_obj0E_0402
+ mappingsTableEntry.w Map_obj0E_040C
+ mappingsTableEntry.w Map_obj0E_0416
+ mappingsTableEntry.w Map_obj0E_0420
+ mappingsTableEntry.w Map_obj0E_042A
+ mappingsTableEntry.w Map_obj0E_044C
+ mappingsTableEntry.w Map_obj0E_04BE
+
+Map_obj0E_0028: spriteHeader
+ spritePiece $30, $10, 4, 1, 0, 0, 0, 1, 1
+ spritePiece $18, $18, 4, 4, 4, 0, 0, 1, 1
+ spritePiece $38, $18, 3, 4, $14, 0, 0, 1, 1
+ spritePiece $20, $38, 2, 1, $20, 0, 0, 1, 1
+ spritePiece $28, $40, 1, 1, $22, 0, 0, 1, 1
+ spritePiece $30, $38, 4, 3, $23, 0, 0, 1, 1
+Map_obj0E_0028_End
+
+Map_obj0E_005A: spriteHeader
+ spritePiece $48, $10, 2, 1, $2F, 0, 0, 1, 1
+ spritePiece $20, $18, 4, 4, $31, 0, 0, 1, 1
+ spritePiece $40, $18, 3, 4, $41, 0, 0, 1, 1
+ spritePiece $58, $18, 1, 2, $4D, 0, 0, 1, 1
+ spritePiece 0, $38, 1, 2, $4F, 0, 0, 1, 1
+ spritePiece 8, $38, 4, 3, $51, 0, 0, 1, 1
+ spritePiece $28, $38, 3, 3, $5D, 0, 0, 1, 1
+ spritePiece $40, $38, 2, 2, $66, 0, 0, 1, 1
+ spritePiece $50, $38, 1, 1, $6A, 0, 0, 1, 1
+Map_obj0E_005A_End
+
+Map_obj0E_00A4: spriteHeader
+ spritePiece $28, $10, 3, 3, $6B, 0, 0, 1, 1
+ spritePiece $40, $18, 4, 2, $74, 0, 0, 1, 1
+ spritePiece 8, $28, 4, 4, $7C, 0, 0, 1, 1
+ spritePiece $28, $28, 4, 4, $8C, 0, 0, 1, 1
+ spritePiece $48, $28, 2, 4, $9C, 0, 0, 1, 1
+ spritePiece $58, $28, 1, 2, $A4, 0, 0, 1, 1
+ spritePiece $10, $48, 4, 1, $A6, 0, 0, 1, 1
+ spritePiece $30, $48, 2, 1, $AA, 0, 0, 1, 1
+Map_obj0E_00A4_End
+
+Map_obj0E_00E6: spriteHeader
+ spritePiece $20, $10, 1, 1, $AC, 0, 0, 1, 1
+ spritePiece $28, $10, 4, 3, $AD, 0, 0, 1, 1
+ spritePiece $48, $10, 1, 1, $B9, 0, 0, 1, 1
+ spritePiece $48, $18, 3, 2, $BA, 0, 0, 1, 1
+ spritePiece $10, $20, 2, 1, $C0, 0, 0, 1, 1
+ spritePiece 0, $38, 1, 1, $C2, 0, 0, 1, 1
+ spritePiece 8, $28, 4, 3, $C3, 0, 0, 1, 1
+ spritePiece $28, $28, 4, 3, $CF, 0, 0, 1, 1
+ spritePiece $48, $28, 2, 3, $DB, 0, 0, 1, 1
+ spritePiece $58, $28, 1, 1, $E1, 0, 0, 1, 1
+ spritePiece $10, $40, 4, 2, $E2, 0, 0, 1, 1
+ spritePiece $30, $40, 2, 2, $EA, 0, 0, 1, 1
+ spritePiece $40, $40, 3, 1, $EE, 0, 0, 1, 1
+Map_obj0E_00E6_End
+
+Map_obj0E_0150: spriteHeader
+ spritePiece $40, 8, 2, 1, $F1, 0, 0, 1, 1
+ spritePiece $18, $10, 1, 1, $AC, 0, 1, 1, 1
+ spritePiece $20, $10, 4, 3, $F3, 0, 0, 1, 1
+ spritePiece $40, $10, 4, 2, $FF, 0, 0, 1, 1
+ spritePiece $58, $20, 1, 1, $107, 0, 0, 1, 1
+ spritePiece $40, $20, 2, 1, $108, 0, 0, 1, 1
+ spritePiece 8, $28, 1, 1, $10A, 0, 0, 1, 1
+ spritePiece $10, $28, 4, 4, $10B, 0, 0, 1, 1
+ spritePiece 0, $38, 2, 2, $11B, 0, 0, 1, 1
+ spritePiece $30, $28, 4, 4, $11F, 0, 0, 1, 1
+ spritePiece $50, $28, 1, 2, $12F, 0, 0, 1, 1
+ spritePiece $10, $48, 4, 1, $131, 0, 0, 1, 1
+ spritePiece $30, $48, 2, 1, $135, 0, 0, 1, 1
+Map_obj0E_0150_End
+
+Map_obj0E_01BA: spriteHeader
+ spritePiece $20, 8, 4, 1, $137, 0, 0, 0, 1
+ spritePiece $40, $10, 1, 1, $13B, 0, 0, 0, 1
+ spritePiece 8, $10, 4, 4, $13C, 0, 0, 0, 1
+ spritePiece 0, $30, 4, 2, $14C, 0, 0, 0, 1
+ spritePiece 0, $18, 1, 3, $154, 0, 0, 0, 1
+ spritePiece $28, $10, 3, 4, $157, 0, 0, 0, 1
+ spritePiece $40, $28, 1, 1, $163, 0, 0, 0, 1
+ spritePiece $48, $30, 1, 1, $164, 0, 0, 0, 1
+ spritePiece $20, $30, 4, 2, $165, 0, 0, 0, 1
+ spritePiece 8, $40, 1, 1, $16D, 0, 0, 0, 1
+ spritePiece $10, $40, 4, 2, $16E, 0, 0, 0, 1
+ spritePiece $30, $40, 2, 2, $176, 0, 0, 0, 1
+ spritePiece $40, $30, 1, 3, $17A, 0, 0, 0, 1
+Map_obj0E_01BA_End
+
+Map_obj0E_0224: spriteHeader
+ spritePiece $18, 8, 4, 1, $17D, 0, 0, 0, 1
+ spritePiece $38, 8, 2, 4, $181, 0, 0, 0, 1
+ spritePiece $48, $10, 1, 1, $189, 0, 0, 0, 1
+ spritePiece 0, $20, 4, 4, $18A, 0, 0, 0, 1
+ spritePiece 8, $18, 1, 1, $19A, 0, 0, 0, 1
+ spritePiece $10, $10, 2, 2, $19B, 0, 0, 0, 1
+ spritePiece $20, $10, 3, 3, $19F, 0, 0, 0, 1
+ spritePiece $20, $28, 4, 4, $1A8, 0, 0, 0, 1
+ spritePiece $40, $28, 2, 4, $1B8, 0, 0, 0, 1
+ spritePiece 8, $40, 3, 1, $1C0, 0, 0, 0, 1
+ spritePiece 8, $50, 1, 2, $1C3, 0, 0, 0, 1
+ spritePiece $10, $48, 3, 3, $1C5, 0, 0, 0, 1
+ spritePiece $28, $48, 4, 2, $1CE, 0, 0, 0, 1
+Map_obj0E_0224_End
+
+Map_obj0E_028E: spriteHeader
+ spritePiece $28, 8, 4, 1, $1D6, 0, 0, 0, 1
+ spritePiece $48, 8, 1, 1, $1DA, 0, 0, 0, 1
+ spritePiece $10, $18, 1, 4, $1DB, 0, 0, 0, 1
+ spritePiece $18, $10, 4, 4, $1DF, 0, 0, 0, 1
+ spritePiece $38, $10, 4, 4, $1EF, 0, 0, 0, 1
+ spritePiece $58, $10, 1, 1, $1FF, 0, 0, 0, 1
+ spritePiece $58, $28, 1, 1, $200, 0, 0, 0, 1
+ spritePiece $10, $38, 1, 1, $201, 0, 0, 0, 1
+ spritePiece $18, $30, 4, 2, $202, 0, 0, 0, 1
+ spritePiece $38, $30, 4, 2, $20A, 0, 0, 0, 1
+ spritePiece $20, $40, 1, 1, $212, 0, 0, 0, 1
+ spritePiece $28, $40, 1, 2, $213, 0, 0, 0, 1
+ spritePiece $30, $40, 4, 3, $215, 0, 0, 0, 1
+ spritePiece $50, $40, 1, 3, $221, 0, 0, 0, 1
+ spritePiece $58, $38, 1, 2, $224, 0, 0, 0, 1
+Map_obj0E_028E_End
+
+Map_obj0E_0308: spriteHeader
+ spritePiece $28, 8, 4, 4, $226, 0, 0, 0, 1
+ spritePiece $20, $10, 1, 1, $236, 0, 0, 0, 1
+ spritePiece $18, $18, 2, 4, $237, 0, 0, 0, 1
+ spritePiece $48, 8, 2, 4, $23F, 0, 0, 0, 1
+ spritePiece $58, $10, 1, 1, $247, 0, 0, 0, 1
+ spritePiece $18, $38, 2, 1, $248, 0, 0, 0, 1
+ spritePiece $28, $28, 4, 4, $24A, 0, 0, 0, 1
+ spritePiece $48, $28, 3, 2, $25A, 0, 0, 0, 1
+ spritePiece $48, $38, 2, 2, $260, 0, 0, 0, 1
+ spritePiece $58, $40, 1, 2, $264, 0, 0, 0, 1
+ spritePiece $28, $48, 2, 1, $266, 0, 0, 0, 1
+ spritePiece $30, $50, 1, 1, $268, 0, 0, 0, 1
+ spritePiece $38, $48, 4, 2, $269, 0, 0, 0, 1
+Map_obj0E_0308_End
+
+Map_obj0E_0372: spriteHeader
+ spritePiece 8, 0, 4, 2, $271, 0, 0, 0, 1
+ spritePiece 8, $10, 3, 2, $279, 0, 0, 0, 1
+ spritePiece $10, $20, 2, 2, $27F, 0, 0, 0, 1
+Map_obj0E_0372_End
+
+Map_obj0E_038C: spriteHeader
+ spritePiece -$50, 0, 4, 1, $283, 0, 0, 3, 1
+ spritePiece -$30, 0, 3, 1, $287, 0, 0, 3, 1
+ spritePiece $18, 0, 3, 1, $28A, 0, 0, 3, 1
+ spritePiece $30, 0, 4, 1, $28D, 0, 0, 3, 1
+ spritePiece -$18, 0, 4, 1, $10, 0, 0, 0, 0
+ spritePiece 8, 0, 2, 1, $10, 0, 0, 0, 0
+Map_obj0E_038C_End
+
+Map_obj0E_03BE: spriteHeader
+ spritePiece -$50, 0, 4, 1, $283, 0, 0, 3, 1
+ spritePiece -$30, 0, 3, 1, $287, 0, 0, 3, 1
+ spritePiece $18, 0, 3, 1, $28A, 0, 0, 3, 1
+ spritePiece $30, 0, 4, 1, $28D, 0, 0, 3, 1
+ spritePiece -$18, 0, 4, 1, $10, 0, 0, 0, 0
+ spritePiece 8, 0, 2, 1, $10, 0, 0, 0, 0
+ spritePiece $58, 8, 2, 1, $2A0, 0, 0, 3, 1
+Map_obj0E_03BE_End
+
+Map_obj0E_03F8: spriteHeader
+ spritePiece -4, -4, 1, 1, $291, 0, 0, 1, 0
+Map_obj0E_03F8_End
+
+Map_obj0E_0402: spriteHeader
+ spritePiece -8, -8, 2, 2, $292, 0, 0, 1, 0
+Map_obj0E_0402_End
+
+Map_obj0E_040C: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $296, 0, 0, 1, 0
+Map_obj0E_040C_End
+
+Map_obj0E_0416: spriteHeader
+ spritePiece -4, -4, 1, 1, $29F, 0, 0, 1, 0
+Map_obj0E_0416_End
+
+Map_obj0E_0420: spriteHeader
+ spritePiece -8, -4, 2, 1, $2A0, 0, 0, 0, 1
+Map_obj0E_0420_End
+
+Map_obj0E_042A: spriteHeader
+ spritePiece 8, 0, 1, 4, 0, 0, 0, 0, 0
+ spritePiece 0, 0, 1, 4, 0, 0, 0, 0, 0
+ spritePiece 8, $20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece 0, $20, 1, 4, 0, 0, 0, 0, 0
+Map_obj0E_042A_End
+
+Map_obj0E_044C: spriteHeader
+ spritePiece $28, 8, 4, 4, $226, 0, 0, 0, 1
+ spritePiece $20, $10, 1, 1, $236, 0, 0, 0, 1
+ spritePiece $18, $18, 2, 4, $237, 0, 0, 0, 1
+ spritePiece $48, 8, 2, 4, $23F, 0, 0, 0, 1
+ spritePiece $58, $10, 1, 1, $247, 0, 0, 0, 1
+ spritePiece $18, $38, 2, 1, $248, 0, 0, 0, 1
+ spritePiece $28, $28, 4, 4, $24A, 0, 0, 0, 1
+ spritePiece $48, $28, 3, 2, $25A, 0, 0, 0, 1
+ spritePiece $48, $38, 2, 2, $260, 0, 0, 0, 1
+ spritePiece $58, $40, 1, 2, $264, 0, 0, 0, 1
+ spritePiece $28, $48, 2, 1, $266, 0, 0, 0, 1
+ spritePiece $30, $50, 1, 1, $268, 0, 0, 0, 1
+ spritePiece $38, $48, 4, 2, $269, 0, 0, 0, 1
+ spritePiece $20, $48, 2, 1, $2A2, 0, 0, 0, 1
+Map_obj0E_044C_End
+
+Map_obj0E_04BE: spriteHeader
+ spritePiece 8, 0, 2, 3, $2A4, 0, 0, 1, 1
+Map_obj0E_04BE_End
+
+ even
diff --git a/mappings/sprite/obj0E.bin b/mappings/sprite/obj0E.bin
deleted file mode 100644
index 2012aee6..00000000
Binary files a/mappings/sprite/obj0E.bin and /dev/null differ
diff --git a/mappings/sprite/obj0F.asm b/mappings/sprite/obj0F.asm
new file mode 100644
index 00000000..f48aa4a2
--- /dev/null
+++ b/mappings/sprite/obj0F.asm
@@ -0,0 +1,39 @@
+Map_obj0F: mappingsTable
+ mappingsTableEntry.w Map_obj0F_0006
+ mappingsTableEntry.w Map_obj0F_0048
+ mappingsTableEntry.w Map_obj0F_008A
+
+Map_obj0F_0006: spriteHeader
+ spritePiece -$2C, -$C, 1, 1, $402, 0, 0, 3, 0
+ spritePiece -$1C, -$C, 4, 1, $403, 0, 0, 3, 0
+ spritePiece 4, -$C, 2, 1, $407, 0, 0, 3, 0
+ spritePiece -$2C, 4, 1, 1, $409, 0, 0, 0, 0
+ spritePiece -$1C, 4, 4, 1, $403, 0, 0, 0, 0
+ spritePiece 4, 4, 2, 1, $407, 0, 0, 0, 0
+ spritePiece $1C, 4, 2, 1, $40A, 0, 0, 0, 0
+ spritePiece -$44, -$C, 2, 1, $3FA, 0, 0, 3, 0
+Map_obj0F_0006_End
+
+Map_obj0F_0048: spriteHeader
+ spritePiece -$2C, -$C, 1, 1, $402, 0, 0, 0, 0
+ spritePiece -$1C, -$C, 4, 1, $403, 0, 0, 0, 0
+ spritePiece 4, -$C, 2, 1, $407, 0, 0, 0, 0
+ spritePiece -$2C, 4, 1, 1, $409, 0, 0, 3, 0
+ spritePiece -$1C, 4, 4, 1, $403, 0, 0, 3, 0
+ spritePiece 4, 4, 2, 1, $407, 0, 0, 3, 0
+ spritePiece $1C, 4, 2, 1, $40A, 0, 0, 3, 0
+ spritePiece -$44, 4, 2, 1, $3FA, 0, 0, 3, 0
+Map_obj0F_0048_End
+
+Map_obj0F_008A: spriteHeader
+ spritePiece -$24, -8, 1, 1, $69C, 0, 0, 3, 0
+ spritePiece -$1C, -8, 1, 1, $69D, 0, 0, 3, 0
+ spritePiece -$14, -8, 1, 1, $6A1, 0, 0, 3, 0
+ spritePiece -$C, -8, 1, 1, $696, 0, 0, 3, 0
+ spritePiece -4, -8, 1, 1, $69C, 0, 0, 3, 0
+ spritePiece 4, -8, 1, 1, $69B, 0, 0, 3, 0
+ spritePiece $C, -8, 1, 1, $6A0, 0, 0, 3, 0
+ spritePiece -$44, -8, 2, 1, $3FA, 0, 0, 3, 0
+Map_obj0F_008A_End
+
+ even
diff --git a/mappings/sprite/obj0F.bin b/mappings/sprite/obj0F.bin
deleted file mode 100644
index f409597f..00000000
Binary files a/mappings/sprite/obj0F.bin and /dev/null differ
diff --git a/mappings/sprite/obj10.asm b/mappings/sprite/obj10.asm
new file mode 100644
index 00000000..bac21d40
--- /dev/null
+++ b/mappings/sprite/obj10.asm
@@ -0,0 +1,139 @@
+Map_obj10: mappingsTable
+ mappingsTableEntry.w Map_obj10_0024
+ mappingsTableEntry.w Map_obj10_003E
+ mappingsTableEntry.w Map_obj10_0060
+ mappingsTableEntry.w Map_obj10_0082
+ mappingsTableEntry.w Map_obj10_00AC
+ mappingsTableEntry.w Map_obj10_00C6
+ mappingsTableEntry.w Map_obj10_00E8
+ mappingsTableEntry.w Map_obj10_0112
+ mappingsTableEntry.w Map_obj10_0134
+ mappingsTableEntry.w Map_obj10_0156
+ mappingsTableEntry.w Map_obj10_0180
+ mappingsTableEntry.w Map_obj10_01AA
+ mappingsTableEntry.w Map_obj10_01CC
+ mappingsTableEntry.w Map_obj10_01DE
+ mappingsTableEntry.w Map_obj10_01F8
+ mappingsTableEntry.w Map_obj10_020A
+ mappingsTableEntry.w Map_obj10_0224
+ mappingsTableEntry.w Map_obj10_0236
+
+Map_obj10_0024: spriteHeader
+ spritePiece -$C, -$18, 3, 3, 0, 0, 0, 0, 1
+ spritePiece -$C, 0, 3, 2, 9, 0, 0, 0, 1
+ spritePiece -$C, $10, 1, 1, $F, 0, 0, 0, 1
+Map_obj10_0024_End
+
+Map_obj10_003E: spriteHeader
+ spritePiece -$10, -$18, 4, 1, 0, 0, 0, 0, 1
+ spritePiece -$D, -$10, 3, 2, 4, 0, 0, 0, 1
+ spritePiece -$10, 0, 4, 1, $A, 0, 0, 0, 1
+ spritePiece -8, 8, 2, 2, $E, 0, 0, 0, 1
+Map_obj10_003E_End
+
+Map_obj10_0060: spriteHeader
+ spritePiece -$10, -$18, 4, 1, 0, 0, 0, 0, 1
+ spritePiece -$D, -$10, 3, 2, 4, 0, 0, 0, 1
+ spritePiece -$10, 0, 4, 1, $A, 0, 0, 0, 1
+ spritePiece -8, 8, 2, 2, $E, 0, 0, 0, 1
+Map_obj10_0060_End
+
+Map_obj10_0082: spriteHeader
+ spritePiece -$10, -$18, 4, 1, 0, 1, 0, 0, 1
+ spritePiece -$B, -$10, 3, 2, 4, 1, 0, 0, 1
+ spritePiece -$10, 0, 4, 1, $A, 0, 0, 0, 1
+ spritePiece -8, 8, 2, 2, $E, 0, 0, 0, 1
+ spritePiece 8, $10, 1, 1, $12, 0, 0, 0, 1
+Map_obj10_0082_End
+
+Map_obj10_00AC: spriteHeader
+ spritePiece 0, -$1F, 2, 2, 0, 0, 0, 0, 1
+ spritePiece -8, -$F, 4, 2, 4, 0, 0, 0, 1
+ spritePiece -$14, 1, 4, 2, $C, 0, 0, 0, 1
+Map_obj10_00AC_End
+
+Map_obj10_00C6: spriteHeader
+ spritePiece 0, -$1F, 1, 2, 0, 0, 0, 0, 1
+ spritePiece -9, -$F, 4, 2, 2, 0, 0, 0, 1
+ spritePiece -$11, 1, 3, 3, $A, 0, 0, 0, 1
+ spritePiece 7, 1, 1, 2, $13, 0, 0, 0, 1
+Map_obj10_00C6_End
+
+Map_obj10_00E8: spriteHeader
+ spritePiece 0, -$18, 1, 1, 0, 0, 0, 0, 1
+ spritePiece -8, -$14, 3, 1, 1, 0, 0, 0, 1
+ spritePiece -$10, -$C, 4, 2, 4, 0, 0, 0, 1
+ spritePiece $10, -$C, 1, 1, $C, 0, 0, 0, 1
+ spritePiece -$10, 4, 3, 2, $D, 0, 0, 0, 1
+Map_obj10_00E8_End
+
+Map_obj10_0112: spriteHeader
+ spritePiece 1, -$17, 1, 1, 0, 0, 0, 0, 1
+ spritePiece -$10, -$F, 4, 4, 1, 0, 0, 0, 1
+ spritePiece $10, -7, 1, 1, $11, 0, 0, 0, 1
+ spritePiece -$10, $11, 2, 1, $12, 0, 0, 0, 1
+Map_obj10_0112_End
+
+Map_obj10_0134: spriteHeader
+ spritePiece 0, -$1E, 2, 2, 0, 0, 0, 0, 1
+ spritePiece -8, -$E, 4, 1, 4, 0, 0, 0, 1
+ spritePiece -$10, -6, 2, 4, 8, 0, 0, 0, 1
+ spritePiece 0, -6, 3, 2, $10, 0, 0, 0, 1
+Map_obj10_0134_End
+
+Map_obj10_0156: spriteHeader
+ spritePiece 0, -$18, 1, 1, 0, 0, 0, 0, 1
+ spritePiece -$10, -$10, 4, 2, 1, 0, 0, 0, 1
+ spritePiece $10, -8, 1, 1, 9, 0, 0, 0, 1
+ spritePiece -$10, 0, 4, 2, $A, 0, 0, 0, 1
+ spritePiece -$10, $10, 2, 1, $12, 0, 0, 0, 1
+Map_obj10_0156_End
+
+Map_obj10_0180: spriteHeader
+ spritePiece 0, -$18, 1, 1, 0, 0, 0, 0, 1
+ spritePiece -$10, -$10, 4, 3, 1, 0, 0, 0, 1
+ spritePiece $10, -8, 1, 1, $D, 0, 0, 0, 1
+ spritePiece -$18, 8, 4, 1, $E, 0, 0, 0, 1
+ spritePiece -$10, $10, 2, 1, $12, 0, 0, 0, 1
+Map_obj10_0180_End
+
+Map_obj10_01AA: spriteHeader
+ spritePiece 0, -$18, 1, 1, 0, 0, 0, 0, 1
+ spritePiece -$10, -$10, 4, 3, 1, 0, 0, 0, 1
+ spritePiece $10, -8, 1, 1, $D, 0, 0, 0, 1
+ spritePiece -$18, 8, 4, 2, $E, 0, 0, 0, 1
+Map_obj10_01AA_End
+
+Map_obj10_01CC: spriteHeader
+ spritePiece -$14, -8, 3, 3, 0, 0, 0, 0, 1
+ spritePiece 4, -$10, 2, 4, 9, 0, 0, 0, 1
+Map_obj10_01CC_End
+
+Map_obj10_01DE: spriteHeader
+ spritePiece -$14, -8, 2, 2, 0, 0, 0, 0, 1
+ spritePiece -$C, 8, 1, 1, 4, 0, 0, 0, 1
+ spritePiece -4, -$10, 3, 4, 5, 0, 0, 0, 1
+Map_obj10_01DE_End
+
+Map_obj10_01F8: spriteHeader
+ spritePiece -$14, -9, 1, 2, 0, 0, 0, 0, 1
+ spritePiece -$C, -$10, 4, 4, 2, 0, 0, 0, 1
+Map_obj10_01F8_End
+
+Map_obj10_020A: spriteHeader
+ spritePiece -$14, -8, 1, 3, 0, 0, 0, 0, 1
+ spritePiece -$C, -$10, 1, 3, 3, 0, 0, 0, 1
+ spritePiece -4, -$10, 3, 4, 6, 0, 0, 0, 1
+Map_obj10_020A_End
+
+Map_obj10_0224: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 1
+ spritePiece 0, -$10, 2, 4, 0, 1, 0, 0, 1
+Map_obj10_0224_End
+
+Map_obj10_0236: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 1
+ spritePiece 0, -$10, 2, 4, 0, 1, 0, 0, 1
+Map_obj10_0236_End
+
+ even
diff --git a/mappings/sprite/obj10.bin b/mappings/sprite/obj10.bin
deleted file mode 100644
index 73e1ba3b..00000000
Binary files a/mappings/sprite/obj10.bin and /dev/null differ
diff --git a/mappings/sprite/obj11_a.asm b/mappings/sprite/obj11_a.asm
new file mode 100644
index 00000000..ef94b36b
--- /dev/null
+++ b/mappings/sprite/obj11_a.asm
@@ -0,0 +1,33 @@
+Map_obj11_a: mappingsTable
+ mappingsTableEntry.w Map_obj11_a_000C
+ mappingsTableEntry.w Map_obj11_a_0016
+ mappingsTableEntry.w Map_obj11_a_0020
+ mappingsTableEntry.w Map_obj11_a_002A
+ mappingsTableEntry.w Map_obj11_a_0034
+ mappingsTableEntry.w Map_obj11_a_003E
+
+Map_obj11_a_000C: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj11_a_000C_End
+
+Map_obj11_a_0016: spriteHeader
+ spritePiece -8, -8, 2, 2, 4, 0, 0, 0, 0
+Map_obj11_a_0016_End
+
+Map_obj11_a_0020: spriteHeader
+ spritePiece -8, -8, 2, 2, 8, 0, 0, 0, 0
+Map_obj11_a_0020_End
+
+Map_obj11_a_002A: spriteHeader
+ spritePiece -4, -$C, 1, 3, $C, 0, 0, 0, 0
+Map_obj11_a_002A_End
+
+Map_obj11_a_0034: spriteHeader
+ spritePiece -4, -$C, 1, 3, $F, 0, 0, 0, 0
+Map_obj11_a_0034_End
+
+Map_obj11_a_003E: spriteHeader
+ spritePiece -4, -$C, 1, 3, $12, 0, 0, 0, 0
+Map_obj11_a_003E_End
+
+ even
diff --git a/mappings/sprite/obj11_a.bin b/mappings/sprite/obj11_a.bin
deleted file mode 100644
index 51361f8b..00000000
Binary files a/mappings/sprite/obj11_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj11_b.asm b/mappings/sprite/obj11_b.asm
new file mode 100644
index 00000000..1d05fe68
--- /dev/null
+++ b/mappings/sprite/obj11_b.asm
@@ -0,0 +1,13 @@
+Map_obj11_b: mappingsTable
+ mappingsTableEntry.w Map_obj11_b_0004
+ mappingsTableEntry.w Map_obj11_b_000E
+
+Map_obj11_b_0004: spriteHeader
+ spritePiece -8, -8, 2, 2, 4, 0, 0, 0, 0
+Map_obj11_b_0004_End
+
+Map_obj11_b_000E: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj11_b_000E_End
+
+ even
diff --git a/mappings/sprite/obj11_b.bin b/mappings/sprite/obj11_b.bin
deleted file mode 100644
index 568970f4..00000000
Binary files a/mappings/sprite/obj11_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj12.asm b/mappings/sprite/obj12.asm
new file mode 100644
index 00000000..5d341be5
--- /dev/null
+++ b/mappings/sprite/obj12.asm
@@ -0,0 +1,9 @@
+Map_obj12: mappingsTable
+ mappingsTableEntry.w Map_obj12_0002
+
+Map_obj12_0002: spriteHeader
+ spritePiece -$20, -$10, 4, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 4, 4, $10, 0, 0, 0, 0
+Map_obj12_0002_End
+
+ even
diff --git a/mappings/sprite/obj12.bin b/mappings/sprite/obj12.bin
deleted file mode 100644
index de56f407..00000000
Binary files a/mappings/sprite/obj12.bin and /dev/null differ
diff --git a/mappings/sprite/obj13.asm b/mappings/sprite/obj13.asm
new file mode 100644
index 00000000..3e153e2e
--- /dev/null
+++ b/mappings/sprite/obj13.asm
@@ -0,0 +1,211 @@
+Map_obj13: mappingsTable
+ mappingsTableEntry.w Map_obj13_003A
+ mappingsTableEntry.w Map_obj13_0044
+ mappingsTableEntry.w Map_obj13_0056
+ mappingsTableEntry.w Map_obj13_0068
+ mappingsTableEntry.w Map_obj13_0082
+ mappingsTableEntry.w Map_obj13_009C
+ mappingsTableEntry.w Map_obj13_00BE
+ mappingsTableEntry.w Map_obj13_00E0
+ mappingsTableEntry.w Map_obj13_010A
+ mappingsTableEntry.w Map_obj13_0134
+ mappingsTableEntry.w Map_obj13_0166
+ mappingsTableEntry.w Map_obj13_0198
+ mappingsTableEntry.w Map_obj13_01D2
+ mappingsTableEntry.w Map_obj13_020C
+ mappingsTableEntry.w Map_obj13_024E
+ mappingsTableEntry.w Map_obj13_0290
+ mappingsTableEntry.w Map_obj13_02DA
+ mappingsTableEntry.w Map_obj13_02DA
+ mappingsTableEntry.w Map_obj13_02DA
+ mappingsTableEntry.w Map_obj13_0038
+ mappingsTableEntry.w Map_obj13_02EC
+ mappingsTableEntry.w Map_obj13_02F6
+ mappingsTableEntry.w Map_obj13_0300
+ mappingsTableEntry.w Map_obj13_0312
+ mappingsTableEntry.w Map_obj13_0324
+ mappingsTableEntry.w Map_obj13_033E
+ mappingsTableEntry.w Map_obj13_0358
+ mappingsTableEntry.w Map_obj13_037A
+
+Map_obj13_0038: spriteHeader
+Map_obj13_0038_End
+
+Map_obj13_003A: spriteHeader
+ spritePiece -$10, -$80, 4, 1, $10, 0, 0, 0, 0
+Map_obj13_003A_End
+
+Map_obj13_0044: spriteHeader
+ spritePiece -$10, -$80, 4, 1, $10, 0, 0, 0, 0
+ spritePiece -$10, -$78, 4, 2, $2D, 0, 0, 0, 0
+Map_obj13_0044_End
+
+Map_obj13_0056: spriteHeader
+ spritePiece -$10, -$80, 4, 1, $10, 0, 0, 0, 0
+ spritePiece -$10, -$78, 4, 4, 0, 0, 0, 0, 0
+Map_obj13_0056_End
+
+Map_obj13_0068: spriteHeader
+ spritePiece -$10, -$80, 4, 1, $10, 0, 0, 0, 0
+ spritePiece -$10, -$78, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$58, 4, 2, $2D, 0, 0, 0, 0
+Map_obj13_0068_End
+
+Map_obj13_0082: spriteHeader
+ spritePiece -$10, -$80, 4, 1, $10, 0, 0, 0, 0
+ spritePiece -$10, -$78, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$58, 4, 4, 0, 0, 0, 0, 0
+Map_obj13_0082_End
+
+Map_obj13_009C: spriteHeader
+ spritePiece -$10, -$80, 4, 1, $10, 0, 0, 0, 0
+ spritePiece -$10, -$78, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$58, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$38, 4, 2, $2D, 0, 0, 0, 0
+Map_obj13_009C_End
+
+Map_obj13_00BE: spriteHeader
+ spritePiece -$10, -$80, 4, 1, $10, 0, 0, 0, 0
+ spritePiece -$10, -$78, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$58, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$38, 4, 4, 0, 0, 0, 0, 0
+Map_obj13_00BE_End
+
+Map_obj13_00E0: spriteHeader
+ spritePiece -$10, -$80, 4, 1, $10, 0, 0, 0, 0
+ spritePiece -$10, -$78, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$58, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$38, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 2, $2D, 0, 0, 0, 0
+Map_obj13_00E0_End
+
+Map_obj13_010A: spriteHeader
+ spritePiece -$10, -$80, 4, 1, $10, 0, 0, 0, 0
+ spritePiece -$10, -$78, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$58, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$38, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 4, 0, 0, 0, 0, 0
+Map_obj13_010A_End
+
+Map_obj13_0134: spriteHeader
+ spritePiece -$10, -$80, 4, 1, $10, 0, 0, 0, 0
+ spritePiece -$10, -$78, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$58, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$38, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, 8, 4, 2, $2D, 0, 0, 0, 0
+Map_obj13_0134_End
+
+Map_obj13_0166: spriteHeader
+ spritePiece -$10, -$80, 4, 1, $10, 0, 0, 0, 0
+ spritePiece -$10, -$78, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$58, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$38, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, 8, 4, 4, 0, 0, 0, 0, 0
+Map_obj13_0166_End
+
+Map_obj13_0198: spriteHeader
+ spritePiece -$10, -$80, 4, 1, $10, 0, 0, 0, 0
+ spritePiece -$10, -$78, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$58, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$38, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, 8, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, $28, 4, 2, $2D, 0, 0, 0, 0
+Map_obj13_0198_End
+
+Map_obj13_01D2: spriteHeader
+ spritePiece -$10, -$80, 4, 1, $10, 0, 0, 0, 0
+ spritePiece -$10, -$78, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$58, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$38, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, 8, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, $28, 4, 4, 0, 0, 0, 0, 0
+Map_obj13_01D2_End
+
+Map_obj13_020C: spriteHeader
+ spritePiece -$10, -$80, 4, 1, $10, 0, 0, 0, 0
+ spritePiece -$10, -$78, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$58, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$38, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, 8, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, $28, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, $48, 4, 2, $2D, 0, 0, 0, 0
+Map_obj13_020C_End
+
+Map_obj13_024E: spriteHeader
+ spritePiece -$10, -$80, 4, 1, $10, 0, 0, 0, 0
+ spritePiece -$10, -$78, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$58, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$38, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, 8, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, $28, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, $48, 4, 4, 0, 0, 0, 0, 0
+Map_obj13_024E_End
+
+Map_obj13_0290: spriteHeader
+ spritePiece -$10, -$80, 4, 1, $10, 0, 0, 0, 0
+ spritePiece -$10, -$78, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$58, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$38, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, 8, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, $28, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, $48, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, $68, 4, 2, $2D, 0, 0, 0, 0
+Map_obj13_0290_End
+
+Map_obj13_02DA: spriteHeader
+ spritePiece -$18, -$10, 3, 3, $18, 0, 0, 0, 0
+ spritePiece 0, -$10, 3, 3, $18, 1, 0, 0, 0
+Map_obj13_02DA_End
+
+Map_obj13_02EC: spriteHeader
+ spritePiece -$10, -$20, 4, 2, $2D, 0, 0, 0, 0
+Map_obj13_02EC_End
+
+Map_obj13_02F6: spriteHeader
+ spritePiece -$10, -$20, 4, 4, 0, 0, 0, 0, 0
+Map_obj13_02F6_End
+
+Map_obj13_0300: spriteHeader
+ spritePiece -$10, -$20, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, $2D, 0, 0, 0, 0
+Map_obj13_0300_End
+
+Map_obj13_0312: spriteHeader
+ spritePiece -$10, -$20, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 4, 0, 0, 0, 0, 0
+Map_obj13_0312_End
+
+Map_obj13_0324: spriteHeader
+ spritePiece -$10, -$20, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, $20, 4, 2, $2D, 0, 0, 0, 0
+Map_obj13_0324_End
+
+Map_obj13_033E: spriteHeader
+ spritePiece -$10, -$20, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, $20, 4, 4, 0, 0, 0, 0, 0
+Map_obj13_033E_End
+
+Map_obj13_0358: spriteHeader
+ spritePiece -$10, -$20, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, $20, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, $40, 4, 2, $2D, 0, 0, 0, 0
+Map_obj13_0358_End
+
+Map_obj13_037A: spriteHeader
+ spritePiece -$10, -$20, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, $20, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, $40, 4, 4, 0, 0, 0, 0, 0
+Map_obj13_037A_End
+
+ even
diff --git a/mappings/sprite/obj13.bin b/mappings/sprite/obj13.bin
deleted file mode 100644
index 24f3c722..00000000
Binary files a/mappings/sprite/obj13.bin and /dev/null differ
diff --git a/mappings/sprite/obj14_a.asm b/mappings/sprite/obj14_a.asm
new file mode 100644
index 00000000..4c62cde7
--- /dev/null
+++ b/mappings/sprite/obj14_a.asm
@@ -0,0 +1,29 @@
+Map_obj14_a: mappingsTable
+ mappingsTableEntry.w Map_obj14_a_0008
+ mappingsTableEntry.w Map_obj14_a_004A
+ mappingsTableEntry.w Map_obj14_a_0008
+ mappingsTableEntry.w Map_obj14_a_004A
+
+Map_obj14_a_0008: spriteHeader
+ spritePiece -8, -4, 2, 2, $14, 0, 0, 2, 0
+ spritePiece -4, $C, 1, 2, $12, 0, 0, 1, 0
+ spritePiece -$30, -$1C, 2, 2, 6, 0, 0, 2, 0
+ spritePiece -$20, -$14, 2, 2, $A, 0, 0, 2, 0
+ spritePiece -$10, -$C, 2, 2, $A, 0, 0, 2, 0
+ spritePiece 0, -4, 2, 2, $A, 0, 0, 2, 0
+ spritePiece $10, 4, 2, 2, $A, 0, 0, 2, 0
+ spritePiece $20, $C, 2, 2, $E, 0, 0, 2, 0
+Map_obj14_a_0008_End
+
+Map_obj14_a_004A: spriteHeader
+ spritePiece -8, -4, 2, 2, $14, 0, 0, 2, 0
+ spritePiece -4, $C, 1, 2, $12, 0, 0, 1, 0
+ spritePiece -$30, -$C, 2, 2, 0, 0, 0, 2, 0
+ spritePiece -$20, -$C, 2, 2, 2, 0, 0, 2, 0
+ spritePiece -$10, -$C, 2, 2, 2, 0, 0, 2, 0
+ spritePiece 0, -$C, 2, 2, 2, 0, 0, 2, 0
+ spritePiece $10, -$C, 2, 2, 2, 0, 0, 2, 0
+ spritePiece $20, -$C, 2, 2, 0, 1, 0, 2, 0
+Map_obj14_a_004A_End
+
+ even
diff --git a/mappings/sprite/obj14_a.bin b/mappings/sprite/obj14_a.bin
deleted file mode 100644
index 34107bd8..00000000
Binary files a/mappings/sprite/obj14_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj14_b.asm b/mappings/sprite/obj14_b.asm
new file mode 100644
index 00000000..4c0dee97
--- /dev/null
+++ b/mappings/sprite/obj14_b.asm
@@ -0,0 +1,13 @@
+Map_obj14_b: mappingsTable
+ mappingsTableEntry.w Map_obj14_b_0004
+ mappingsTableEntry.w Map_obj14_b_000E
+
+Map_obj14_b_0004: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj14_b_0004_End
+
+Map_obj14_b_000E: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 1, 0
+Map_obj14_b_000E_End
+
+ even
diff --git a/mappings/sprite/obj14_b.bin b/mappings/sprite/obj14_b.bin
deleted file mode 100644
index cf922159..00000000
Binary files a/mappings/sprite/obj14_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj15_a.asm b/mappings/sprite/obj15_a.asm
new file mode 100644
index 00000000..aef83e5e
--- /dev/null
+++ b/mappings/sprite/obj15_a.asm
@@ -0,0 +1,21 @@
+Map_obj15_a: mappingsTable
+ mappingsTableEntry.w Map_obj15_a_0008
+ mappingsTableEntry.w Map_obj15_a_002A
+ mappingsTableEntry.w Map_obj15_a_002A
+ mappingsTableEntry.w Map_obj15_a_0034
+
+Map_obj15_a_0008: spriteHeader
+ spritePiece -$20, -$10, 4, 2, 4, 0, 0, 1, 0
+ spritePiece 0, -$10, 4, 2, $C, 0, 0, 1, 0
+ spritePiece -$20, 0, 4, 2, $14, 0, 0, 1, 0
+ spritePiece 0, 0, 4, 2, $14, 1, 0, 1, 0
+Map_obj15_a_0008_End
+
+Map_obj15_a_002A: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj15_a_002A_End
+
+Map_obj15_a_0034: spriteHeader
+Map_obj15_a_0034_End
+
+ even
diff --git a/mappings/sprite/obj15_a.bin b/mappings/sprite/obj15_a.bin
deleted file mode 100644
index 26314d18..00000000
Binary files a/mappings/sprite/obj15_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj16.asm b/mappings/sprite/obj16.asm
new file mode 100644
index 00000000..a9a061d0
--- /dev/null
+++ b/mappings/sprite/obj16.asm
@@ -0,0 +1,49 @@
+Map_obj16: mappingsTable
+ mappingsTableEntry.w Map_obj16_000A
+ mappingsTableEntry.w Map_obj16_005C
+ mappingsTableEntry.w Map_obj16_009E
+ mappingsTableEntry.w Map_obj16_00B0
+ mappingsTableEntry.w Map_obj16_00CA
+
+Map_obj16_000A: spriteHeader
+ spritePiece -$1C, -$3F, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$1A, -$30, 1, 4, 4, 0, 0, 0, 0
+ spritePiece -$1A, -$10, 1, 4, 4, 0, 0, 0, 0
+ spritePiece -$19, $10, 1, 2, 8, 0, 0, 0, 0
+ spritePiece $C, -$2B, 2, 2, $A, 0, 0, 0, 0
+ spritePiece $11, -$20, 1, 4, $E, 0, 0, 0, 0
+ spritePiece $11, $10, 1, 2, $12, 0, 0, 0, 0
+ spritePiece $11, 0, 1, 4, $E, 0, 0, 0, 0
+ spritePiece -$20, $20, 4, 2, $14, 0, 0, 0, 0
+ spritePiece 0, $20, 4, 2, $14, 1, 0, 0, 0
+Map_obj16_000A_End
+
+Map_obj16_005C: spriteHeader
+ spritePiece -$1C, -$3F, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$1A, -$30, 1, 4, 4, 0, 0, 0, 0
+ spritePiece -$1A, -$10, 1, 4, 4, 0, 0, 0, 0
+ spritePiece -$1A, $10, 1, 2, $2C, 0, 0, 0, 0
+ spritePiece $C, -$2B, 2, 2, $A, 0, 0, 0, 0
+ spritePiece $11, -$20, 1, 4, $E, 0, 0, 0, 0
+ spritePiece $11, $18, 1, 2, $2E, 0, 0, 0, 0
+ spritePiece $11, 0, 1, 4, $E, 0, 0, 0, 0
+Map_obj16_005C_End
+
+Map_obj16_009E: spriteHeader
+ spritePiece -$20, $20, 4, 2, $14, 0, 0, 0, 0
+ spritePiece 0, $20, 4, 2, $14, 1, 0, 0, 0
+Map_obj16_009E_End
+
+Map_obj16_00B0: spriteHeader
+ spritePiece -8, -$28, 2, 2, $1C, 0, 0, 0, 0
+ spritePiece -8, -$18, 2, 4, $20, 0, 0, 0, 0
+ spritePiece -8, 8, 2, 4, $20, 0, 0, 0, 0
+Map_obj16_00B0_End
+
+Map_obj16_00CA: spriteHeader
+ spritePiece -8, -$28, 2, 2, $28, 0, 0, 0, 0
+ spritePiece -8, -$18, 2, 4, $20, 1, 0, 0, 0
+ spritePiece -8, 8, 2, 4, $20, 1, 0, 0, 0
+Map_obj16_00CA_End
+
+ even
diff --git a/mappings/sprite/obj16.bin b/mappings/sprite/obj16.bin
deleted file mode 100644
index 9bd8848c..00000000
Binary files a/mappings/sprite/obj16.bin and /dev/null differ
diff --git a/mappings/sprite/obj17.asm b/mappings/sprite/obj17.asm
new file mode 100644
index 00000000..046ccdbb
--- /dev/null
+++ b/mappings/sprite/obj17.asm
@@ -0,0 +1,42 @@
+Map_obj17: mappingsTable
+ mappingsTableEntry.w Map_obj17_0010
+ mappingsTableEntry.w Map_obj17_001A
+ mappingsTableEntry.w Map_obj17_0024
+ mappingsTableEntry.w Map_obj17_002E
+ mappingsTableEntry.w Map_obj17_0038
+ mappingsTableEntry.w Map_obj17_0042
+ mappingsTableEntry.w Map_obj17_0056
+ mappingsTableEntry.w Map_obj17_004C
+
+Map_obj17_0010: spriteHeader
+ spritePiece -4, -$10, 1, 2, 0, 0, 0, 0, 0
+Map_obj17_0010_End
+
+Map_obj17_001A: spriteHeader
+ spritePiece -8, -$B, 2, 2, 2, 0, 0, 0, 0
+Map_obj17_001A_End
+
+Map_obj17_0024: spriteHeader
+ spritePiece -8, -8, 2, 2, 6, 0, 0, 0, 0
+Map_obj17_0024_End
+
+Map_obj17_002E: spriteHeader
+ spritePiece -8, -5, 2, 2, $A, 0, 0, 0, 0
+Map_obj17_002E_End
+
+Map_obj17_0038: spriteHeader
+ spritePiece -4, 0, 1, 2, $E, 0, 0, 0, 0
+Map_obj17_0038_End
+
+Map_obj17_0042: spriteHeader
+ spritePiece -3, 4, 1, 1, $10, 0, 0, 0, 0
+Map_obj17_0042_End
+
+Map_obj17_004C: spriteHeader
+ spritePiece -3, -$C, 1, 1, $11, 0, 0, 0, 0
+Map_obj17_004C_End
+
+Map_obj17_0056: spriteHeader
+Map_obj17_0056_End
+
+ even
diff --git a/mappings/sprite/obj17.bin b/mappings/sprite/obj17.bin
deleted file mode 100644
index 1f723213..00000000
Binary files a/mappings/sprite/obj17.bin and /dev/null differ
diff --git a/mappings/sprite/obj18_a.asm b/mappings/sprite/obj18_a.asm
new file mode 100644
index 00000000..e463bac7
--- /dev/null
+++ b/mappings/sprite/obj18_a.asm
@@ -0,0 +1,21 @@
+Map_obj18_a: mappingsTable
+ mappingsTableEntry.w Map_obj18_a_0004
+ mappingsTableEntry.w Map_obj18_a_0016
+
+Map_obj18_a_0004: spriteHeader
+ spritePiece -$20, -$C, 4, 4, $56, 0, 0, 0, 0
+ spritePiece 0, -$C, 4, 4, $56, 1, 0, 0, 0
+Map_obj18_a_0004_End
+
+Map_obj18_a_0016: spriteHeader
+ spritePiece -$20, -$34, 2, 4, $A, 0, 0, 0, 0
+ spritePiece -$10, -$34, 4, 2, $12, 0, 0, 0, 0
+ spritePiece -$10, -$24, 4, 2, $1A, 0, 0, 0, 0
+ spritePiece $10, -$34, 2, 4, $22, 0, 0, 0, 0
+ spritePiece -$20, -$14, 4, 4, $2A, 0, 0, 0, 0
+ spritePiece 0, -$14, 4, 4, $2A, 1, 0, 0, 0
+ spritePiece -$20, $C, 4, 4, $3A, 0, 0, 0, 0
+ spritePiece 0, $C, 4, 4, $3A, 1, 0, 0, 0
+Map_obj18_a_0016_End
+
+ even
diff --git a/mappings/sprite/obj18_a.bin b/mappings/sprite/obj18_a.bin
deleted file mode 100644
index 5577aff0..00000000
Binary files a/mappings/sprite/obj18_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj18_b.asm b/mappings/sprite/obj18_b.asm
new file mode 100644
index 00000000..fd43c76f
--- /dev/null
+++ b/mappings/sprite/obj18_b.asm
@@ -0,0 +1,21 @@
+Map_obj18_b: mappingsTable
+ mappingsTableEntry.w Map_obj18_b_0004
+ mappingsTableEntry.w Map_obj18_b_0026
+
+Map_obj18_b_0004: spriteHeader
+ spritePiece -$20, -$10, 4, 3, 1, 0, 0, 0, 0
+ spritePiece 0, -$10, 4, 3, 1, 1, 0, 0, 0
+ spritePiece -$20, 8, 4, 3, $2D, 0, 0, 0, 0
+ spritePiece 0, 8, 4, 3, $39, 0, 0, 0, 0
+Map_obj18_b_0004_End
+
+Map_obj18_b_0026: spriteHeader
+ spritePiece -$20, -$30, 4, 3, 1, 0, 0, 0, 0
+ spritePiece 0, -$30, 4, 3, 1, 1, 0, 0, 0
+ spritePiece -$20, -$18, 4, 4, $D, 0, 0, 0, 0
+ spritePiece 0, -$18, 4, 4, $1D, 0, 0, 0, 0
+ spritePiece -$20, 8, 4, 4, $D, 0, 0, 0, 0
+ spritePiece 0, 8, 4, 4, $1D, 0, 0, 0, 0
+Map_obj18_b_0026_End
+
+ even
diff --git a/mappings/sprite/obj18_b.bin b/mappings/sprite/obj18_b.bin
deleted file mode 100644
index 6f7904f1..00000000
Binary files a/mappings/sprite/obj18_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj19.asm b/mappings/sprite/obj19.asm
new file mode 100644
index 00000000..88e48717
--- /dev/null
+++ b/mappings/sprite/obj19.asm
@@ -0,0 +1,29 @@
+Map_obj19: mappingsTable
+ mappingsTableEntry.w Map_obj19_0008
+ mappingsTableEntry.w Map_obj19_001A
+ mappingsTableEntry.w Map_obj19_002C
+ mappingsTableEntry.w Map_obj19_004E
+
+Map_obj19_0008: spriteHeader
+ spritePiece -$20, -$10, 4, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 4, 4, 0, 1, 0, 0, 0
+Map_obj19_0008_End
+
+Map_obj19_001A: spriteHeader
+ spritePiece -$18, -$10, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 3, 4, 0, 1, 0, 0, 0
+Map_obj19_001A_End
+
+Map_obj19_002C: spriteHeader
+ spritePiece -$40, -$10, 4, 3, 0, 0, 0, 0, 0
+ spritePiece -$20, -$10, 4, 3, $C, 0, 0, 0, 0
+ spritePiece 0, -$10, 4, 3, $C, 1, 0, 0, 0
+ spritePiece $20, -$10, 4, 3, 0, 1, 0, 0, 0
+Map_obj19_002C_End
+
+Map_obj19_004E: spriteHeader
+ spritePiece -$20, -$10, 4, 3, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 4, 3, 0, 1, 0, 0, 0
+Map_obj19_004E_End
+
+ even
diff --git a/mappings/sprite/obj19.bin b/mappings/sprite/obj19.bin
deleted file mode 100644
index adac9cfd..00000000
Binary files a/mappings/sprite/obj19.bin and /dev/null differ
diff --git a/mappings/sprite/obj1A_a.asm b/mappings/sprite/obj1A_a.asm
new file mode 100644
index 00000000..31e8f651
--- /dev/null
+++ b/mappings/sprite/obj1A_a.asm
@@ -0,0 +1,101 @@
+Map_obj1A_a: mappingsTable
+ mappingsTableEntry.w Map_obj1A_a_0008
+ mappingsTableEntry.w Map_obj1A_a_008A
+ mappingsTableEntry.w Map_obj1A_a_010C
+ mappingsTableEntry.w Map_obj1A_a_01D6
+
+Map_obj1A_a_0008: spriteHeader
+ spritePiece $10, -$38, 4, 3, $57, 0, 0, 0, 0
+ spritePiece -$10, -$30, 4, 2, $63, 0, 0, 0, 0
+ spritePiece $10, -$20, 4, 2, $6B, 0, 0, 0, 0
+ spritePiece -$10, -$20, 4, 2, $73, 0, 0, 0, 0
+ spritePiece -$20, -$28, 2, 3, $7B, 0, 0, 0, 0
+ spritePiece -$30, -$28, 2, 3, $81, 0, 0, 0, 0
+ spritePiece $10, -$10, 4, 2, $87, 0, 0, 0, 0
+ spritePiece -$10, -$10, 4, 2, $8F, 0, 0, 0, 0
+ spritePiece -$20, -$10, 2, 2, $97, 0, 0, 0, 0
+ spritePiece -$30, -$10, 2, 2, $9B, 0, 0, 0, 0
+ spritePiece $10, 0, 4, 2, $9F, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, $A7, 0, 0, 0, 0
+ spritePiece -$20, 0, 4, 2, $AB, 0, 0, 0, 0
+ spritePiece -$30, 0, 2, 2, $B3, 0, 0, 0, 0
+ spritePiece $10, $10, 4, 2, $AB, 0, 0, 0, 0
+ spritePiece 0, $10, 2, 2, $B7, 0, 0, 0, 0
+Map_obj1A_a_0008_End
+
+Map_obj1A_a_008A: spriteHeader
+ spritePiece $10, -$38, 4, 3, $57, 0, 0, 0, 0
+ spritePiece -$10, -$30, 4, 2, $63, 0, 0, 0, 0
+ spritePiece $10, -$20, 4, 2, $6B, 0, 0, 0, 0
+ spritePiece -$10, -$20, 4, 2, $73, 0, 0, 0, 0
+ spritePiece -$20, -$28, 2, 3, $7B, 0, 0, 0, 0
+ spritePiece -$30, -$28, 2, 3, $BB, 0, 0, 0, 0
+ spritePiece $10, -$10, 4, 2, $87, 0, 0, 0, 0
+ spritePiece -$10, -$10, 4, 2, $8F, 0, 0, 0, 0
+ spritePiece -$20, -$10, 2, 2, $97, 0, 0, 0, 0
+ spritePiece -$30, -$10, 2, 2, $C1, 0, 0, 0, 0
+ spritePiece $10, 0, 4, 2, $9F, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, $A7, 0, 0, 0, 0
+ spritePiece -$20, 0, 4, 2, $AB, 0, 0, 0, 0
+ spritePiece -$30, 0, 2, 2, $B7, 0, 0, 0, 0
+ spritePiece $10, $10, 4, 2, $AB, 0, 0, 0, 0
+ spritePiece 0, $10, 2, 2, $B7, 0, 0, 0, 0
+Map_obj1A_a_008A_End
+
+Map_obj1A_a_010C: spriteHeader
+ spritePiece $20, -$38, 2, 3, $5D, 0, 0, 0, 0
+ spritePiece $10, -$38, 2, 3, $57, 0, 0, 0, 0
+ spritePiece 0, -$30, 2, 2, $67, 0, 0, 0, 0
+ spritePiece -$10, -$30, 2, 2, $63, 0, 0, 0, 0
+ spritePiece $20, -$20, 2, 2, $6F, 0, 0, 0, 0
+ spritePiece $10, -$20, 2, 2, $6B, 0, 0, 0, 0
+ spritePiece 0, -$20, 2, 2, $77, 0, 0, 0, 0
+ spritePiece -$10, -$20, 2, 2, $73, 0, 0, 0, 0
+ spritePiece -$20, -$28, 2, 3, $7B, 0, 0, 0, 0
+ spritePiece -$30, -$28, 2, 3, $81, 0, 0, 0, 0
+ spritePiece $20, -$10, 2, 2, $8B, 0, 0, 0, 0
+ spritePiece $10, -$10, 2, 2, $87, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, $93, 0, 0, 0, 0
+ spritePiece -$10, -$10, 2, 2, $8F, 0, 0, 0, 0
+ spritePiece -$20, -$10, 2, 2, $97, 0, 0, 0, 0
+ spritePiece -$30, -$10, 2, 2, $9B, 0, 0, 0, 0
+ spritePiece $20, 0, 2, 2, $8B, 0, 0, 0, 0
+ spritePiece $10, 0, 2, 2, $8B, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, $A7, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $AB, 0, 0, 0, 0
+ spritePiece -$20, 0, 2, 2, $AB, 0, 0, 0, 0
+ spritePiece -$30, 0, 2, 2, $B3, 0, 0, 0, 0
+ spritePiece $20, $10, 2, 2, $AB, 0, 0, 0, 0
+ spritePiece $10, $10, 2, 2, $AB, 0, 0, 0, 0
+ spritePiece 0, $10, 2, 2, $B7, 0, 0, 0, 0
+Map_obj1A_a_010C_End
+
+Map_obj1A_a_01D6: spriteHeader
+ spritePiece $20, -$38, 2, 3, $5D, 0, 0, 0, 0
+ spritePiece $10, -$38, 2, 3, $57, 0, 0, 0, 0
+ spritePiece 0, -$30, 2, 2, $67, 0, 0, 0, 0
+ spritePiece -$10, -$30, 2, 2, $63, 0, 0, 0, 0
+ spritePiece $20, -$20, 2, 2, $6F, 0, 0, 0, 0
+ spritePiece $10, -$20, 2, 2, $6B, 0, 0, 0, 0
+ spritePiece 0, -$20, 2, 2, $77, 0, 0, 0, 0
+ spritePiece -$10, -$20, 2, 2, $73, 0, 0, 0, 0
+ spritePiece -$20, -$28, 2, 3, $7B, 0, 0, 0, 0
+ spritePiece -$30, -$28, 2, 3, $BB, 0, 0, 0, 0
+ spritePiece $20, -$10, 2, 2, $8B, 0, 0, 0, 0
+ spritePiece $10, -$10, 2, 2, $87, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, $93, 0, 0, 0, 0
+ spritePiece -$10, -$10, 2, 2, $8F, 0, 0, 0, 0
+ spritePiece -$20, -$10, 2, 2, $97, 0, 0, 0, 0
+ spritePiece -$30, -$10, 2, 2, $C1, 0, 0, 0, 0
+ spritePiece $20, 0, 2, 2, $8B, 0, 0, 0, 0
+ spritePiece $10, 0, 2, 2, $8B, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, $A7, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $AB, 0, 0, 0, 0
+ spritePiece -$20, 0, 2, 2, $AB, 0, 0, 0, 0
+ spritePiece -$30, 0, 2, 2, $B7, 0, 0, 0, 0
+ spritePiece $20, $10, 2, 2, $AB, 0, 0, 0, 0
+ spritePiece $10, $10, 2, 2, $AB, 0, 0, 0, 0
+ spritePiece 0, $10, 2, 2, $B7, 0, 0, 0, 0
+Map_obj1A_a_01D6_End
+
+ even
diff --git a/mappings/sprite/obj1A_a.bin b/mappings/sprite/obj1A_a.bin
deleted file mode 100644
index f67aa3df..00000000
Binary files a/mappings/sprite/obj1A_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj1A_b.asm b/mappings/sprite/obj1A_b.asm
new file mode 100644
index 00000000..6134942d
--- /dev/null
+++ b/mappings/sprite/obj1A_b.asm
@@ -0,0 +1,32 @@
+Map_obj1A_b: mappingsTable
+ mappingsTableEntry.w Map_obj1A_b_0006
+ mappingsTableEntry.w Map_obj1A_b_0048
+ mappingsTableEntry.w Map_obj1A_b_0048
+
+Map_obj1A_b_0006: spriteHeader
+ spritePiece -$30, -$10, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$30, 0, 4, 2, 8, 0, 0, 0, 0
+ spritePiece -$10, -$10, 2, 2, 4, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, 4, 1, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $C, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, $C, 1, 0, 0, 0
+ spritePiece $10, -$10, 4, 2, 0, 1, 0, 0, 0
+ spritePiece $10, 0, 4, 2, 8, 1, 0, 0, 0
+Map_obj1A_b_0006_End
+
+Map_obj1A_b_0048: spriteHeader
+ spritePiece -$30, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, -$10, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$10, -$10, 2, 2, 4, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, 4, 1, 0, 0, 0
+ spritePiece $10, -$10, 2, 2, 4, 1, 0, 0, 0
+ spritePiece $20, -$10, 2, 2, 0, 1, 0, 0, 0
+ spritePiece -$30, 0, 2, 2, 8, 0, 0, 0, 0
+ spritePiece -$20, 0, 2, 2, $C, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $C, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, $C, 1, 0, 0, 0
+ spritePiece $10, 0, 2, 2, $C, 1, 0, 0, 0
+ spritePiece $20, 0, 2, 2, 8, 1, 0, 0, 0
+Map_obj1A_b_0048_End
+
+ even
diff --git a/mappings/sprite/obj1A_b.bin b/mappings/sprite/obj1A_b.bin
deleted file mode 100644
index b685cf1f..00000000
Binary files a/mappings/sprite/obj1A_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj1B.asm b/mappings/sprite/obj1B.asm
new file mode 100644
index 00000000..5ac0517b
--- /dev/null
+++ b/mappings/sprite/obj1B.asm
@@ -0,0 +1,14 @@
+Map_obj1B: mappingsTable
+ mappingsTableEntry.w Map_obj1B_0006
+ mappingsTableEntry.w Map_obj1B_0006
+ mappingsTableEntry.w Map_obj1B_0018
+
+Map_obj1B_0006: spriteHeader
+ spritePiece -$18, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 8, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj1B_0006_End
+
+Map_obj1B_0018: spriteHeader
+Map_obj1B_0018_End
+
+ even
diff --git a/mappings/sprite/obj1B.bin b/mappings/sprite/obj1B.bin
deleted file mode 100644
index c1624396..00000000
Binary files a/mappings/sprite/obj1B.bin and /dev/null differ
diff --git a/mappings/sprite/obj1C_a.asm b/mappings/sprite/obj1C_a.asm
new file mode 100644
index 00000000..0c4da6ea
--- /dev/null
+++ b/mappings/sprite/obj1C_a.asm
@@ -0,0 +1,13 @@
+Map_obj1C_a: mappingsTable
+ mappingsTableEntry.w Map_obj1C_a_0004
+ mappingsTableEntry.w Map_obj1C_a_000E
+
+Map_obj1C_a_0004: spriteHeader
+ spritePiece -8, -8, 2, 2, 2, 0, 0, 0, 0
+Map_obj1C_a_0004_End
+
+Map_obj1C_a_000E: spriteHeader
+ spritePiece -8, -8, 2, 2, 6, 0, 0, 0, 0
+Map_obj1C_a_000E_End
+
+ even
diff --git a/mappings/sprite/obj1C_a.bin b/mappings/sprite/obj1C_a.bin
deleted file mode 100644
index c91696ef..00000000
Binary files a/mappings/sprite/obj1C_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj1C_b.asm b/mappings/sprite/obj1C_b.asm
new file mode 100644
index 00000000..76d16e07
--- /dev/null
+++ b/mappings/sprite/obj1C_b.asm
@@ -0,0 +1,13 @@
+Map_obj1C_b: mappingsTable
+ mappingsTableEntry.w Map_obj1C_b_0004
+ mappingsTableEntry.w Map_obj1C_b_000E
+
+Map_obj1C_b_0004: spriteHeader
+ spritePiece -4, -8, 1, 2, 0, 0, 0, 0, 0
+Map_obj1C_b_0004_End
+
+Map_obj1C_b_000E: spriteHeader
+ spritePiece -4, -8, 1, 2, 2, 0, 0, 0, 0
+Map_obj1C_b_000E_End
+
+ even
diff --git a/mappings/sprite/obj1C_b.bin b/mappings/sprite/obj1C_b.bin
deleted file mode 100644
index 3a946c42..00000000
Binary files a/mappings/sprite/obj1C_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj1C_c.asm b/mappings/sprite/obj1C_c.asm
new file mode 100644
index 00000000..cbefc804
--- /dev/null
+++ b/mappings/sprite/obj1C_c.asm
@@ -0,0 +1,45 @@
+Map_obj1C_c: mappingsTable
+ mappingsTableEntry.w Map_obj1C_c_000C
+ mappingsTableEntry.w Map_obj1C_c_0016
+ mappingsTableEntry.w Map_obj1C_c_0020
+ mappingsTableEntry.w Map_obj1C_c_0032
+ mappingsTableEntry.w Map_obj1C_c_004C
+ mappingsTableEntry.w Map_obj1C_c_006E
+
+Map_obj1C_c_000C: spriteHeader
+ spritePiece -4, -8, 1, 2, 0, 0, 0, 0, 0
+Map_obj1C_c_000C_End
+
+Map_obj1C_c_0016: spriteHeader
+ spritePiece -4, -$10, 1, 4, 0, 0, 0, 0, 0
+Map_obj1C_c_0016_End
+
+Map_obj1C_c_0020: spriteHeader
+ spritePiece -4, -$18, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -4, -8, 1, 4, 0, 0, 0, 0, 0
+Map_obj1C_c_0020_End
+
+Map_obj1C_c_0032: spriteHeader
+ spritePiece -4, -$30, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $10, 1, 4, 0, 0, 0, 0, 0
+Map_obj1C_c_0032_End
+
+Map_obj1C_c_004C: spriteHeader
+ spritePiece -4, -$40, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, 0, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $20, 1, 4, 0, 0, 0, 0, 0
+Map_obj1C_c_004C_End
+
+Map_obj1C_c_006E: spriteHeader
+ spritePiece -4, -$68, 1, 1, 4, 0, 0, 0, 0
+ spritePiece -4, -$60, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$40, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, 0, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $40, 1, 4, 0, 0, 0, 0, 0
+Map_obj1C_c_006E_End
+
+ even
diff --git a/mappings/sprite/obj1C_c.bin b/mappings/sprite/obj1C_c.bin
deleted file mode 100644
index 3335b9ed..00000000
Binary files a/mappings/sprite/obj1C_c.bin and /dev/null differ
diff --git a/mappings/sprite/obj1C_d.asm b/mappings/sprite/obj1C_d.asm
new file mode 100644
index 00000000..0cc84ab8
--- /dev/null
+++ b/mappings/sprite/obj1C_d.asm
@@ -0,0 +1,41 @@
+Map_obj1C_d: mappingsTable
+ mappingsTableEntry.w Map_obj1C_d_000A
+ mappingsTableEntry.w Map_obj1C_d_001C
+ mappingsTableEntry.w Map_obj1C_d_003E
+ mappingsTableEntry.w Map_obj1C_d_0058
+ mappingsTableEntry.w Map_obj1C_d_007A
+
+Map_obj1C_d_000A: spriteHeader
+ spritePiece -$18, -$10, 2, 4, 5, 0, 0, 0, 0
+ spritePiece 8, -$10, 2, 4, 5, 0, 0, 0, 0
+Map_obj1C_d_000A_End
+
+Map_obj1C_d_001C: spriteHeader
+ spritePiece -$18, -$20, 2, 4, 5, 0, 0, 0, 0
+ spritePiece 8, -$20, 2, 4, 5, 0, 0, 0, 0
+ spritePiece -$18, 0, 2, 4, 5, 0, 0, 0, 0
+ spritePiece 8, 0, 2, 4, 5, 0, 0, 0, 0
+Map_obj1C_d_001C_End
+
+Map_obj1C_d_003E: spriteHeader
+ spritePiece -8, -$30, 2, 4, 5, 0, 0, 0, 0
+ spritePiece -8, -$10, 2, 4, 5, 0, 0, 0, 0
+ spritePiece -8, $10, 2, 4, 5, 0, 0, 0, 0
+Map_obj1C_d_003E_End
+
+Map_obj1C_d_0058: spriteHeader
+ spritePiece -8, -$40, 2, 4, 5, 0, 0, 0, 0
+ spritePiece -8, -$20, 2, 4, 5, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 4, 5, 0, 0, 0, 0
+ spritePiece -8, $20, 2, 4, 5, 0, 0, 0, 0
+Map_obj1C_d_0058_End
+
+Map_obj1C_d_007A: spriteHeader
+ spritePiece -8, -$50, 2, 4, 5, 0, 0, 0, 0
+ spritePiece -8, -$30, 2, 4, 5, 0, 0, 0, 0
+ spritePiece -8, -$10, 2, 4, 5, 0, 0, 0, 0
+ spritePiece -8, $10, 2, 4, 5, 0, 0, 0, 0
+ spritePiece -8, $30, 2, 4, 5, 0, 0, 0, 0
+Map_obj1C_d_007A_End
+
+ even
diff --git a/mappings/sprite/obj1C_d.bin b/mappings/sprite/obj1C_d.bin
deleted file mode 100644
index 3bb0f439..00000000
Binary files a/mappings/sprite/obj1C_d.bin and /dev/null differ
diff --git a/mappings/sprite/obj1C_e.asm b/mappings/sprite/obj1C_e.asm
new file mode 100644
index 00000000..31385ec7
--- /dev/null
+++ b/mappings/sprite/obj1C_e.asm
@@ -0,0 +1,18 @@
+Map_obj1C_e: mappingsTable
+ mappingsTableEntry.w Map_obj1C_e_0006
+ mappingsTableEntry.w Map_obj1C_e_0010
+ mappingsTableEntry.w Map_obj1C_e_001A
+
+Map_obj1C_e_0006: spriteHeader
+ spritePiece -4, -8, 1, 2, 4, 0, 0, 0, 0
+Map_obj1C_e_0006_End
+
+Map_obj1C_e_0010: spriteHeader
+ spritePiece -4, -8, 1, 2, 6, 0, 0, 0, 0
+Map_obj1C_e_0010_End
+
+Map_obj1C_e_001A: spriteHeader
+ spritePiece -$10, -4, 4, 1, 0, 0, 0, 0, 0
+Map_obj1C_e_001A_End
+
+ even
diff --git a/mappings/sprite/obj1C_e.bin b/mappings/sprite/obj1C_e.bin
deleted file mode 100644
index 0a4e5940..00000000
Binary files a/mappings/sprite/obj1C_e.bin and /dev/null differ
diff --git a/mappings/sprite/obj1D.asm b/mappings/sprite/obj1D.asm
new file mode 100644
index 00000000..873171ff
--- /dev/null
+++ b/mappings/sprite/obj1D.asm
@@ -0,0 +1,8 @@
+Map_obj1D: mappingsTable
+ mappingsTableEntry.w Map_obj1D_0002
+
+Map_obj1D_0002: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj1D_0002_End
+
+ even
diff --git a/mappings/sprite/obj1D.bin b/mappings/sprite/obj1D.bin
deleted file mode 100644
index 56e3a1b6..00000000
Binary files a/mappings/sprite/obj1D.bin and /dev/null differ
diff --git a/mappings/sprite/obj1F_a.asm b/mappings/sprite/obj1F_a.asm
new file mode 100644
index 00000000..1571e3d9
--- /dev/null
+++ b/mappings/sprite/obj1F_a.asm
@@ -0,0 +1,43 @@
+Map_obj1F_a: mappingsTable
+ mappingsTableEntry.w Map_obj1F_a_0008
+ mappingsTableEntry.w Map_obj1F_a_002A
+ mappingsTableEntry.w Map_obj1F_a_006C
+ mappingsTableEntry.w Map_obj1F_a_008E
+
+Map_obj1F_a_0008: spriteHeader
+ spritePiece -$20, -8, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, 8, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -8, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 0, 8, 4, 2, 0, 0, 0, 0, 0
+Map_obj1F_a_0008_End
+
+Map_obj1F_a_002A: spriteHeader
+ spritePiece -$20, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $10, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, 8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 0, 8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $10, 8, 2, 2, 0, 0, 0, 0, 0
+Map_obj1F_a_002A_End
+
+Map_obj1F_a_006C: spriteHeader
+ spritePiece -$20, -8, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, 8, 4, 2, 8, 0, 0, 0, 0
+ spritePiece 0, -8, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 0, 8, 4, 2, 8, 0, 0, 0, 0
+Map_obj1F_a_006C_End
+
+Map_obj1F_a_008E: spriteHeader
+ spritePiece -$20, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -8, 2, 2, 4, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $10, -8, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$20, 8, 2, 2, 8, 0, 0, 0, 0
+ spritePiece -$10, 8, 2, 2, $C, 0, 0, 0, 0
+ spritePiece 0, 8, 2, 2, 8, 0, 0, 0, 0
+ spritePiece $10, 8, 2, 2, $C, 0, 0, 0, 0
+Map_obj1F_a_008E_End
+
+ even
diff --git a/mappings/sprite/obj1F_a.bin b/mappings/sprite/obj1F_a.bin
deleted file mode 100644
index fe4ffdfe..00000000
Binary files a/mappings/sprite/obj1F_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj1F_b.asm b/mappings/sprite/obj1F_b.asm
new file mode 100644
index 00000000..bd62b329
--- /dev/null
+++ b/mappings/sprite/obj1F_b.asm
@@ -0,0 +1,16 @@
+Map_obj1F_b: mappingsTable
+ mappingsTableEntry.w Map_obj1F_b_0006
+ mappingsTableEntry.w Map_obj1F_b_0006
+ mappingsTableEntry.w Map_obj1F_b_0006
+
+Map_obj1F_b_0006: spriteHeader
+ spritePiece -$40, -$10, 4, 4, $10, 1, 0, 0, 0
+ spritePiece -$20, -$10, 4, 4, $10, 1, 0, 0, 0
+ spritePiece 0, -$10, 4, 4, $10, 1, 0, 0, 0
+ spritePiece $20, -$10, 4, 4, 0, 1, 0, 0, 0
+ spritePiece -$40, $10, 4, 2, $20, 1, 0, 0, 0
+ spritePiece -$20, $10, 4, 2, $20, 1, 0, 0, 0
+ spritePiece 0, $10, 4, 2, $20, 1, 0, 0, 0
+Map_obj1F_b_0006_End
+
+ even
diff --git a/mappings/sprite/obj1F_b.bin b/mappings/sprite/obj1F_b.bin
deleted file mode 100644
index 3c008246..00000000
Binary files a/mappings/sprite/obj1F_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj1F_c.asm b/mappings/sprite/obj1F_c.asm
new file mode 100644
index 00000000..829213bb
--- /dev/null
+++ b/mappings/sprite/obj1F_c.asm
@@ -0,0 +1,21 @@
+Map_obj1F_c: mappingsTable
+ mappingsTableEntry.w Map_obj1F_c_0004
+ mappingsTableEntry.w Map_obj1F_c_0026
+
+Map_obj1F_c_0004: spriteHeader
+ spritePiece -$20, -$10, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 4, 2, 0, 1, 0, 0, 0
+ spritePiece -$10, 0, 3, 2, 8, 0, 0, 0, 0
+ spritePiece 8, 0, 3, 4, $E, 0, 0, 0, 0
+Map_obj1F_c_0004_End
+
+Map_obj1F_c_0026: spriteHeader
+ spritePiece -$20, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$10, 2, 2, 4, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, 4, 1, 0, 0, 0
+ spritePiece $10, -$10, 2, 2, 0, 1, 0, 0, 0
+ spritePiece -$10, 0, 3, 2, 8, 0, 0, 0, 0
+ spritePiece 8, 0, 3, 4, $E, 0, 0, 0, 0
+Map_obj1F_c_0026_End
+
+ even
diff --git a/mappings/sprite/obj1F_c.bin b/mappings/sprite/obj1F_c.bin
deleted file mode 100644
index 14e4367b..00000000
Binary files a/mappings/sprite/obj1F_c.bin and /dev/null differ
diff --git a/mappings/sprite/obj1F_d.asm b/mappings/sprite/obj1F_d.asm
new file mode 100644
index 00000000..fa514b26
--- /dev/null
+++ b/mappings/sprite/obj1F_d.asm
@@ -0,0 +1,23 @@
+Map_obj1F_d: mappingsTable
+ mappingsTableEntry.w Map_obj1F_d_0004
+ mappingsTableEntry.w Map_obj1F_d_0026
+
+Map_obj1F_d_0004: spriteHeader
+ spritePiece -$20, -$10, 4, 2, $55, 0, 0, 0, 0
+ spritePiece 0, -$10, 4, 2, $55, 1, 0, 0, 0
+ spritePiece -$20, 0, 4, 2, $A3, 0, 0, 0, 0
+ spritePiece 0, 0, 4, 2, $A3, 1, 0, 0, 0
+Map_obj1F_d_0004_End
+
+Map_obj1F_d_0026: spriteHeader
+ spritePiece -$20, -$10, 2, 2, $55, 0, 0, 0, 0
+ spritePiece -$10, -$10, 2, 2, $59, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, $59, 1, 0, 0, 0
+ spritePiece $10, -$10, 2, 2, $55, 1, 0, 0, 0
+ spritePiece -$20, 0, 2, 2, $A3, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $A7, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, $A7, 1, 0, 0, 0
+ spritePiece $10, 0, 2, 2, $A3, 1, 0, 0, 0
+Map_obj1F_d_0026_End
+
+ even
diff --git a/mappings/sprite/obj1F_d.bin b/mappings/sprite/obj1F_d.bin
deleted file mode 100644
index b7e7895d..00000000
Binary files a/mappings/sprite/obj1F_d.bin and /dev/null differ
diff --git a/mappings/sprite/obj20_a.asm b/mappings/sprite/obj20_a.asm
new file mode 100644
index 00000000..379ffe9b
--- /dev/null
+++ b/mappings/sprite/obj20_a.asm
@@ -0,0 +1,32 @@
+Map_obj20_a: mappingsTable
+ mappingsTableEntry.w Map_obj20_a_000C
+ mappingsTableEntry.w Map_obj20_a_0016
+ mappingsTableEntry.w Map_obj20_a_0020
+ mappingsTableEntry.w Map_obj20_a_002A
+ mappingsTableEntry.w Map_obj20_a_0034
+ mappingsTableEntry.w Map_obj20_a_003E
+
+Map_obj20_a_000C: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj20_a_000C_End
+
+Map_obj20_a_0016: spriteHeader
+ spritePiece -8, -8, 2, 2, 4, 0, 0, 0, 0
+Map_obj20_a_0016_End
+
+Map_obj20_a_0020: spriteHeader
+ spritePiece -8, -7, 2, 2, 8, 0, 0, 0, 0
+Map_obj20_a_0020_End
+
+Map_obj20_a_002A: spriteHeader
+ spritePiece -8, -$A, 2, 2, 8, 0, 0, 0, 0
+Map_obj20_a_002A_End
+
+Map_obj20_a_0034: spriteHeader
+ spritePiece -8, -$A, 2, 2, $C, 0, 0, 0, 0
+Map_obj20_a_0034_End
+
+Map_obj20_a_003E: spriteHeader
+Map_obj20_a_003E_End
+
+ even
diff --git a/mappings/sprite/obj20_a.bin b/mappings/sprite/obj20_a.bin
deleted file mode 100644
index a43b5541..00000000
Binary files a/mappings/sprite/obj20_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj20_b.asm b/mappings/sprite/obj20_b.asm
new file mode 100644
index 00000000..ff5b4404
--- /dev/null
+++ b/mappings/sprite/obj20_b.asm
@@ -0,0 +1,33 @@
+Map_obj20_b: mappingsTable
+ mappingsTableEntry.w Map_obj20_b_000C
+ mappingsTableEntry.w Map_obj20_b_0016
+ mappingsTableEntry.w Map_obj20_b_0020
+ mappingsTableEntry.w Map_obj20_b_002A
+ mappingsTableEntry.w Map_obj20_b_0034
+ mappingsTableEntry.w Map_obj20_b_003E
+
+Map_obj20_b_000C: spriteHeader
+ spritePiece -8, -$10, 2, 4, 0, 0, 0, 0, 0
+Map_obj20_b_000C_End
+
+Map_obj20_b_0016: spriteHeader
+ spritePiece -8, -$10, 2, 4, 0, 1, 0, 0, 0
+Map_obj20_b_0016_End
+
+Map_obj20_b_0020: spriteHeader
+ spritePiece -8, -$10, 2, 4, 8, 0, 0, 0, 0
+Map_obj20_b_0020_End
+
+Map_obj20_b_002A: spriteHeader
+ spritePiece -8, -$10, 2, 4, 8, 1, 0, 0, 0
+Map_obj20_b_002A_End
+
+Map_obj20_b_0034: spriteHeader
+ spritePiece -8, 0, 2, 2, $10, 0, 0, 0, 0
+Map_obj20_b_0034_End
+
+Map_obj20_b_003E: spriteHeader
+ spritePiece -8, 0, 2, 2, $10, 1, 0, 0, 0
+Map_obj20_b_003E_End
+
+ even
diff --git a/mappings/sprite/obj20_b.bin b/mappings/sprite/obj20_b.bin
deleted file mode 100644
index cf1f5964..00000000
Binary files a/mappings/sprite/obj20_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj21.asm b/mappings/sprite/obj21.asm
new file mode 100644
index 00000000..f332d6e8
--- /dev/null
+++ b/mappings/sprite/obj21.asm
@@ -0,0 +1,24 @@
+Map_obj21: mappingsTable
+ mappingsTableEntry.w Map_obj21_0006
+ mappingsTableEntry.w Map_obj21_0020
+ mappingsTableEntry.w Map_obj21_0042
+
+Map_obj21_0006: spriteHeader
+ spritePiece 0, -8, 4, 2, 0, 0, 0, 0, 0
+ spritePiece $28, -8, 4, 2, $C, 0, 0, 0, 0
+ spritePiece $48, -8, 3, 2, $14, 0, 0, 0, 0
+Map_obj21_0006_End
+
+Map_obj21_0020: spriteHeader
+ spritePiece 0, -8, 2, 2, 8, 0, 0, 0, 0
+ spritePiece $10, -8, 2, 2, 4, 0, 0, 0, 0
+ spritePiece $28, -8, 4, 2, $C, 0, 0, 0, 0
+ spritePiece $48, -8, 3, 2, $14, 0, 0, 0, 0
+Map_obj21_0020_End
+
+Map_obj21_0042: spriteHeader
+ spritePiece $18, -8, 4, 2, $1A, 0, 0, 0, 0
+ spritePiece $38, -8, 2, 2, $22, 0, 0, 0, 0
+Map_obj21_0042_End
+
+ even
diff --git a/mappings/sprite/obj21.bin b/mappings/sprite/obj21.bin
deleted file mode 100644
index 57292062..00000000
Binary files a/mappings/sprite/obj21.bin and /dev/null differ
diff --git a/mappings/sprite/obj22.asm b/mappings/sprite/obj22.asm
new file mode 100644
index 00000000..392b759f
--- /dev/null
+++ b/mappings/sprite/obj22.asm
@@ -0,0 +1,33 @@
+Map_obj22: mappingsTable
+ mappingsTableEntry.w Map_obj22_000A
+ mappingsTableEntry.w Map_obj22_0014
+ mappingsTableEntry.w Map_obj22_0026
+ mappingsTableEntry.w Map_obj22_0040
+ mappingsTableEntry.w Map_obj22_0052
+
+Map_obj22_000A: spriteHeader
+ spritePiece -$10, -4, 4, 1, 0, 0, 0, 1, 0
+Map_obj22_000A_End
+
+Map_obj22_0014: spriteHeader
+ spritePiece -$10, -8, 3, 2, 4, 0, 0, 1, 0
+ spritePiece 8, -8, 1, 2, $B, 0, 0, 1, 0
+Map_obj22_0014_End
+
+Map_obj22_0026: spriteHeader
+ spritePiece -4, -4, 1, 1, $A, 0, 0, 0, 0
+ spritePiece -$10, -8, 3, 2, 4, 0, 0, 1, 0
+ spritePiece 8, -8, 1, 2, $B, 0, 0, 1, 0
+Map_obj22_0026_End
+
+Map_obj22_0040: spriteHeader
+ spritePiece -$10, -8, 3, 2, 4, 0, 0, 1, 0
+ spritePiece 8, -8, 1, 2, $D, 0, 0, 1, 0
+Map_obj22_0040_End
+
+Map_obj22_0052: spriteHeader
+ spritePiece -$10, -8, 3, 2, 4, 0, 0, 1, 0
+ spritePiece 8, -8, 1, 2, $F, 0, 0, 1, 0
+Map_obj22_0052_End
+
+ even
diff --git a/mappings/sprite/obj22.bin b/mappings/sprite/obj22.bin
deleted file mode 100644
index 2c0a6404..00000000
Binary files a/mappings/sprite/obj22.bin and /dev/null differ
diff --git a/mappings/sprite/obj23.asm b/mappings/sprite/obj23.asm
new file mode 100644
index 00000000..ee721cf0
--- /dev/null
+++ b/mappings/sprite/obj23.asm
@@ -0,0 +1,28 @@
+Map_obj23: mappingsTable
+ mappingsTableEntry.w Map_obj23_0006
+ mappingsTableEntry.w Map_obj23_0038
+ mappingsTableEntry.w Map_obj23_0052
+
+Map_obj23_0006: spriteHeader
+ spritePiece -$20, -$20, 2, 2, $5D, 0, 0, 0, 0
+ spritePiece $10, -$20, 2, 2, $5D, 1, 0, 0, 0
+ spritePiece -$10, -$20, 4, 2, $61, 0, 0, 0, 0
+ spritePiece -$10, -$10, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, $10, 4, 2, $71, 0, 0, 0, 0
+Map_obj23_0006_End
+
+Map_obj23_0038: spriteHeader
+ spritePiece -$10, -$10, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, $79, 0, 0, 0, 0
+ spritePiece -$10, $10, 2, 1, $81, 0, 0, 0, 0
+Map_obj23_0038_End
+
+Map_obj23_0052: spriteHeader
+ spritePiece -$10, 9, 4, 2, $8B, 0, 0, 1, 0
+ spritePiece -$10, -$10, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, $79, 0, 0, 0, 0
+ spritePiece -$10, $10, 2, 1, $81, 0, 0, 0, 0
+Map_obj23_0052_End
+
+ even
diff --git a/mappings/sprite/obj23.bin b/mappings/sprite/obj23.bin
deleted file mode 100644
index 33e7b73b..00000000
Binary files a/mappings/sprite/obj23.bin and /dev/null differ
diff --git a/mappings/sprite/obj26.asm b/mappings/sprite/obj26.asm
new file mode 100644
index 00000000..a395ec6c
--- /dev/null
+++ b/mappings/sprite/obj26.asm
@@ -0,0 +1,73 @@
+Map_obj26: mappingsTable
+ mappingsTableEntry.w Map_obj26_0018
+ mappingsTableEntry.w Map_obj26_0022
+ mappingsTableEntry.w Map_obj26_0034
+ mappingsTableEntry.w Map_obj26_0046
+ mappingsTableEntry.w Map_obj26_0058
+ mappingsTableEntry.w Map_obj26_006A
+ mappingsTableEntry.w Map_obj26_007C
+ mappingsTableEntry.w Map_obj26_008E
+ mappingsTableEntry.w Map_obj26_00A0
+ mappingsTableEntry.w Map_obj26_00B2
+ mappingsTableEntry.w Map_obj26_00C4
+ mappingsTableEntry.w Map_obj26_00D6
+
+Map_obj26_0018: spriteHeader
+ spritePiece -$10, -$11, 4, 4, 0, 0, 0, 0, 0
+Map_obj26_0018_End
+
+Map_obj26_0022: spriteHeader
+ spritePiece -8, -$B, 2, 2, $18, 0, 0, 0, 0
+ spritePiece -$10, -$11, 4, 4, 0, 0, 0, 0, 0
+Map_obj26_0022_End
+
+Map_obj26_0034: spriteHeader
+ spritePiece -8, -$B, 2, 2, $154, 0, 0, 0, 0
+ spritePiece -$10, -$11, 4, 4, 0, 0, 0, 0, 0
+Map_obj26_0034_End
+
+Map_obj26_0046: spriteHeader
+ spritePiece -8, -$B, 2, 2, $1C, 0, 0, 0, 0
+ spritePiece -$10, -$11, 4, 4, 0, 0, 0, 0, 0
+Map_obj26_0046_End
+
+Map_obj26_0058: spriteHeader
+ spritePiece -8, -$B, 2, 2, $20, 0, 0, 0, 0
+ spritePiece -$10, -$11, 4, 4, 0, 0, 0, 0, 0
+Map_obj26_0058_End
+
+Map_obj26_006A: spriteHeader
+ spritePiece -8, -$B, 2, 2, $24, 0, 0, 1, 0
+ spritePiece -$10, -$11, 4, 4, 0, 0, 0, 0, 0
+Map_obj26_006A_End
+
+Map_obj26_007C: spriteHeader
+ spritePiece -8, -$B, 2, 2, $28, 0, 0, 0, 0
+ spritePiece -$10, -$11, 4, 4, 0, 0, 0, 0, 0
+Map_obj26_007C_End
+
+Map_obj26_008E: spriteHeader
+ spritePiece -8, -$B, 2, 2, $2C, 0, 0, 0, 0
+ spritePiece -$10, -$11, 4, 4, 0, 0, 0, 0, 0
+Map_obj26_008E_End
+
+Map_obj26_00A0: spriteHeader
+ spritePiece -8, -$B, 2, 2, $30, 0, 0, 0, 0
+ spritePiece -$10, -$11, 4, 4, 0, 0, 0, 0, 0
+Map_obj26_00A0_End
+
+Map_obj26_00B2: spriteHeader
+ spritePiece -8, -$B, 2, 2, $38, 0, 0, 0, 0
+ spritePiece -$10, -$11, 4, 4, 0, 0, 0, 0, 0
+Map_obj26_00B2_End
+
+Map_obj26_00C4: spriteHeader
+ spritePiece -8, -$B, 2, 2, $34, 0, 0, 0, 0
+ spritePiece -$10, -$11, 4, 4, 0, 0, 0, 0, 0
+Map_obj26_00C4_End
+
+Map_obj26_00D6: spriteHeader
+ spritePiece -$10, -1, 4, 2, $10, 0, 0, 0, 0
+Map_obj26_00D6_End
+
+ even
diff --git a/mappings/sprite/obj26.bin b/mappings/sprite/obj26.bin
deleted file mode 100644
index 619ad930..00000000
Binary files a/mappings/sprite/obj26.bin and /dev/null differ
diff --git a/mappings/sprite/obj27.asm b/mappings/sprite/obj27.asm
new file mode 100644
index 00000000..c09b6ead
--- /dev/null
+++ b/mappings/sprite/obj27.asm
@@ -0,0 +1,28 @@
+Map_obj27: mappingsTable
+ mappingsTableEntry.w Map_obj27_000A
+ mappingsTableEntry.w Map_obj27_0014
+ mappingsTableEntry.w Map_obj27_001E
+ mappingsTableEntry.w Map_obj27_0028
+ mappingsTableEntry.w Map_obj27_0032
+
+Map_obj27_000A: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj27_000A_End
+
+Map_obj27_0014: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 4, 0, 0, 1, 0
+Map_obj27_0014_End
+
+Map_obj27_001E: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $14, 0, 0, 1, 0
+Map_obj27_001E_End
+
+Map_obj27_0028: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $24, 0, 0, 1, 0
+Map_obj27_0028_End
+
+Map_obj27_0032: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $34, 0, 0, 1, 0
+Map_obj27_0032_End
+
+ even
diff --git a/mappings/sprite/obj27.bin b/mappings/sprite/obj27.bin
deleted file mode 100644
index bd711a36..00000000
Binary files a/mappings/sprite/obj27.bin and /dev/null differ
diff --git a/mappings/sprite/obj28_a.asm b/mappings/sprite/obj28_a.asm
new file mode 100644
index 00000000..13a25f27
--- /dev/null
+++ b/mappings/sprite/obj28_a.asm
@@ -0,0 +1,18 @@
+Map_obj28_a: mappingsTable
+ mappingsTableEntry.w Map_obj28_a_0010
+ mappingsTableEntry.w Map_obj28_a_001A
+ mappingsTableEntry.w Map_obj28_a_0006
+
+Map_obj28_a_0006: spriteHeader
+ spritePiece -8, -$14, 2, 4, 0, 0, 0, 0, 0
+Map_obj28_a_0006_End
+
+Map_obj28_a_0010: spriteHeader
+ spritePiece -8, -8, 2, 2, 8, 0, 0, 0, 0
+Map_obj28_a_0010_End
+
+Map_obj28_a_001A: spriteHeader
+ spritePiece -8, -8, 2, 2, $C, 0, 0, 0, 0
+Map_obj28_a_001A_End
+
+ even
diff --git a/mappings/sprite/obj28_a.bin b/mappings/sprite/obj28_a.bin
deleted file mode 100644
index 5232e8eb..00000000
Binary files a/mappings/sprite/obj28_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj28_b.asm b/mappings/sprite/obj28_b.asm
new file mode 100644
index 00000000..77fac3a7
--- /dev/null
+++ b/mappings/sprite/obj28_b.asm
@@ -0,0 +1,18 @@
+Map_obj28_b: mappingsTable
+ mappingsTableEntry.w Map_obj28_b_0010
+ mappingsTableEntry.w Map_obj28_b_001A
+ mappingsTableEntry.w Map_obj28_b_0006
+
+Map_obj28_b_0006: spriteHeader
+ spritePiece -8, -$14, 2, 4, 0, 0, 0, 0, 0
+Map_obj28_b_0006_End
+
+Map_obj28_b_0010: spriteHeader
+ spritePiece -$C, -8, 3, 2, 8, 0, 0, 0, 0
+Map_obj28_b_0010_End
+
+Map_obj28_b_001A: spriteHeader
+ spritePiece -$C, -8, 3, 2, $E, 0, 0, 0, 0
+Map_obj28_b_001A_End
+
+ even
diff --git a/mappings/sprite/obj28_b.bin b/mappings/sprite/obj28_b.bin
deleted file mode 100644
index f27f4f8f..00000000
Binary files a/mappings/sprite/obj28_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj28_c.asm b/mappings/sprite/obj28_c.asm
new file mode 100644
index 00000000..8395ed70
--- /dev/null
+++ b/mappings/sprite/obj28_c.asm
@@ -0,0 +1,18 @@
+Map_obj28_c: mappingsTable
+ mappingsTableEntry.w Map_obj28_c_0010
+ mappingsTableEntry.w Map_obj28_c_001A
+ mappingsTableEntry.w Map_obj28_c_0006
+
+Map_obj28_c_0006: spriteHeader
+ spritePiece -8, -$C, 2, 3, 0, 0, 0, 0, 0
+Map_obj28_c_0006_End
+
+Map_obj28_c_0010: spriteHeader
+ spritePiece -$C, -8, 3, 2, 6, 0, 0, 0, 0
+Map_obj28_c_0010_End
+
+Map_obj28_c_001A: spriteHeader
+ spritePiece -$C, -8, 3, 2, $C, 0, 0, 0, 0
+Map_obj28_c_001A_End
+
+ even
diff --git a/mappings/sprite/obj28_c.bin b/mappings/sprite/obj28_c.bin
deleted file mode 100644
index 39a41038..00000000
Binary files a/mappings/sprite/obj28_c.bin and /dev/null differ
diff --git a/mappings/sprite/obj28_d.asm b/mappings/sprite/obj28_d.asm
new file mode 100644
index 00000000..c3da4a21
--- /dev/null
+++ b/mappings/sprite/obj28_d.asm
@@ -0,0 +1,18 @@
+Map_obj28_d: mappingsTable
+ mappingsTableEntry.w Map_obj28_d_0010
+ mappingsTableEntry.w Map_obj28_d_001A
+ mappingsTableEntry.w Map_obj28_d_0006
+
+Map_obj28_d_0006: spriteHeader
+ spritePiece -8, -$C, 2, 3, 0, 0, 0, 0, 0
+Map_obj28_d_0006_End
+
+Map_obj28_d_0010: spriteHeader
+ spritePiece -8, -8, 2, 2, 6, 0, 0, 0, 0
+Map_obj28_d_0010_End
+
+Map_obj28_d_001A: spriteHeader
+ spritePiece -8, -8, 2, 2, $A, 0, 0, 0, 0
+Map_obj28_d_001A_End
+
+ even
diff --git a/mappings/sprite/obj28_d.bin b/mappings/sprite/obj28_d.bin
deleted file mode 100644
index f376512a..00000000
Binary files a/mappings/sprite/obj28_d.bin and /dev/null differ
diff --git a/mappings/sprite/obj28_e.asm b/mappings/sprite/obj28_e.asm
new file mode 100644
index 00000000..b9626ec8
--- /dev/null
+++ b/mappings/sprite/obj28_e.asm
@@ -0,0 +1,18 @@
+Map_obj28_e: mappingsTable
+ mappingsTableEntry.w Map_obj28_e_0010
+ mappingsTableEntry.w Map_obj28_e_001A
+ mappingsTableEntry.w Map_obj28_e_0006
+
+Map_obj28_e_0006: spriteHeader
+ spritePiece -8, -$C, 2, 3, 0, 0, 0, 0, 0
+Map_obj28_e_0006_End
+
+Map_obj28_e_0010: spriteHeader
+ spritePiece -8, -$C, 2, 3, 6, 0, 0, 0, 0
+Map_obj28_e_0010_End
+
+Map_obj28_e_001A: spriteHeader
+ spritePiece -8, -$C, 2, 3, $C, 0, 0, 0, 0
+Map_obj28_e_001A_End
+
+ even
diff --git a/mappings/sprite/obj28_e.bin b/mappings/sprite/obj28_e.bin
deleted file mode 100644
index d9cca438..00000000
Binary files a/mappings/sprite/obj28_e.bin and /dev/null differ
diff --git a/mappings/sprite/obj29.asm b/mappings/sprite/obj29.asm
new file mode 100644
index 00000000..4ff5fa1b
--- /dev/null
+++ b/mappings/sprite/obj29.asm
@@ -0,0 +1,41 @@
+Map_obj29: mappingsTable
+ mappingsTableEntry.w Map_obj29_000E
+ mappingsTableEntry.w Map_obj29_0018
+ mappingsTableEntry.w Map_obj29_0022
+ mappingsTableEntry.w Map_obj29_002C
+ mappingsTableEntry.w Map_obj29_003E
+ mappingsTableEntry.w Map_obj29_0048
+ mappingsTableEntry.w Map_obj29_005A
+
+Map_obj29_000E: spriteHeader
+ spritePiece -8, -8, 2, 2, 2, 0, 0, 0, 0
+Map_obj29_000E_End
+
+Map_obj29_0018: spriteHeader
+ spritePiece -8, -8, 2, 2, 6, 0, 0, 0, 0
+Map_obj29_0018_End
+
+Map_obj29_0022: spriteHeader
+ spritePiece -8, -8, 2, 2, $A, 0, 0, 0, 0
+Map_obj29_0022_End
+
+Map_obj29_002C: spriteHeader
+ spritePiece -8, -8, 1, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, $E, 0, 0, 0, 0
+Map_obj29_002C_End
+
+Map_obj29_003E: spriteHeader
+ spritePiece -4, -8, 1, 2, 0, 0, 0, 0, 0
+Map_obj29_003E_End
+
+Map_obj29_0048: spriteHeader
+ spritePiece -$10, -8, 2, 2, 2, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, $E, 0, 0, 0, 0
+Map_obj29_0048_End
+
+Map_obj29_005A: spriteHeader
+ spritePiece -$10, -8, 2, 2, $A, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, $E, 0, 0, 0, 0
+Map_obj29_005A_End
+
+ even
diff --git a/mappings/sprite/obj29.bin b/mappings/sprite/obj29.bin
deleted file mode 100644
index 94da9fa5..00000000
Binary files a/mappings/sprite/obj29.bin and /dev/null differ
diff --git a/mappings/sprite/obj2A.asm b/mappings/sprite/obj2A.asm
new file mode 100644
index 00000000..ce8c5231
--- /dev/null
+++ b/mappings/sprite/obj2A.asm
@@ -0,0 +1,13 @@
+Map_obj2A: mappingsTable
+ mappingsTableEntry.w Map_obj2A_0002
+
+Map_obj2A_0002: spriteHeader
+ spritePiece -$10, -$50, 3, 2, $1A, 0, 0, 0, 0
+ spritePiece -$10, -$40, 4, 4, $20, 0, 0, 0, 0
+ spritePiece -$10, -$20, 4, 4, $30, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 4, $30, 0, 1, 0, 0
+ spritePiece -$10, $20, 4, 4, $20, 0, 1, 0, 0
+ spritePiece -$10, $40, 3, 2, $1A, 0, 1, 0, 0
+Map_obj2A_0002_End
+
+ even
diff --git a/mappings/sprite/obj2A.bin b/mappings/sprite/obj2A.bin
deleted file mode 100644
index 8ca8ed39..00000000
Binary files a/mappings/sprite/obj2A.bin and /dev/null differ
diff --git a/mappings/sprite/obj2B.asm b/mappings/sprite/obj2B.asm
new file mode 100644
index 00000000..cbf1b6fa
--- /dev/null
+++ b/mappings/sprite/obj2B.asm
@@ -0,0 +1,193 @@
+Map_obj2B: mappingsTable
+ mappingsTableEntry.w Map_obj2B_001C
+ mappingsTableEntry.w Map_obj2B_004E
+ mappingsTableEntry.w Map_obj2B_0088
+ mappingsTableEntry.w Map_obj2B_00C2
+ mappingsTableEntry.w Map_obj2B_0104
+ mappingsTableEntry.w Map_obj2B_0146
+ mappingsTableEntry.w Map_obj2B_0190
+ mappingsTableEntry.w Map_obj2B_01DA
+ mappingsTableEntry.w Map_obj2B_021C
+ mappingsTableEntry.w Map_obj2B_026E
+ mappingsTableEntry.w Map_obj2B_02C0
+ mappingsTableEntry.w Map_obj2B_0322
+ mappingsTableEntry.w Map_obj2B_0384
+ mappingsTableEntry.w Map_obj2B_03F6
+
+Map_obj2B_001C: spriteHeader
+ spritePiece -$10, $10, 4, 2, $8B, 0, 0, 1, 0
+ spritePiece -$20, -$18, 2, 2, $5D, 0, 0, 0, 0
+ spritePiece $10, -$18, 2, 2, $5D, 1, 0, 0, 0
+ spritePiece -$10, -$18, 4, 2, $61, 0, 0, 0, 0
+ spritePiece -$10, -8, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, 8, 4, 2, $83, 0, 0, 0, 0
+Map_obj2B_001C_End
+
+Map_obj2B_004E: spriteHeader
+ spritePiece -$10, $14, 4, 2, $8B, 0, 0, 1, 0
+ spritePiece -$20, -$1C, 2, 2, $5D, 0, 0, 0, 0
+ spritePiece $10, -$1C, 2, 2, $5D, 1, 0, 0, 0
+ spritePiece -$10, -$1C, 4, 2, $61, 0, 0, 0, 0
+ spritePiece -$10, -$C, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, -4, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, $C, 4, 2, $83, 0, 0, 0, 0
+Map_obj2B_004E_End
+
+Map_obj2B_0088: spriteHeader
+ spritePiece -$10, $18, 4, 2, $8B, 0, 0, 1, 0
+ spritePiece -$20, -$20, 2, 2, $5D, 0, 0, 0, 0
+ spritePiece $10, -$20, 2, 2, $5D, 1, 0, 0, 0
+ spritePiece -$10, -$20, 4, 2, $61, 0, 0, 0, 0
+ spritePiece -$10, -$10, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, $10, 4, 2, $83, 0, 0, 0, 0
+Map_obj2B_0088_End
+
+Map_obj2B_00C2: spriteHeader
+ spritePiece -$10, $1C, 4, 2, $8B, 0, 0, 1, 0
+ spritePiece -$20, -$24, 2, 2, $5D, 0, 0, 0, 0
+ spritePiece $10, -$24, 2, 2, $5D, 1, 0, 0, 0
+ spritePiece -$10, -$24, 4, 2, $61, 0, 0, 0, 0
+ spritePiece -$10, -$14, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, -4, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, 4, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, $14, 4, 2, $83, 0, 0, 0, 0
+Map_obj2B_00C2_End
+
+Map_obj2B_0104: spriteHeader
+ spritePiece -$10, $20, 4, 2, $8B, 0, 0, 1, 0
+ spritePiece -$20, -$28, 2, 2, $5D, 0, 0, 0, 0
+ spritePiece $10, -$28, 2, 2, $5D, 1, 0, 0, 0
+ spritePiece -$10, -$28, 4, 2, $61, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, -8, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, 8, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, $18, 4, 2, $83, 0, 0, 0, 0
+Map_obj2B_0104_End
+
+Map_obj2B_0146: spriteHeader
+ spritePiece -$10, $24, 4, 2, $8B, 0, 0, 1, 0
+ spritePiece -$20, -$2C, 2, 2, $5D, 0, 0, 0, 0
+ spritePiece $10, -$2C, 2, 2, $5D, 1, 0, 0, 0
+ spritePiece -$10, -$2C, 4, 2, $61, 0, 0, 0, 0
+ spritePiece -$10, -$1C, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, -$C, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, 4, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, $C, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, $1C, 4, 2, $83, 0, 0, 0, 0
+Map_obj2B_0146_End
+
+Map_obj2B_0190: spriteHeader
+ spritePiece -$10, $28, 4, 2, $8B, 0, 0, 1, 0
+ spritePiece -$20, -$30, 2, 2, $5D, 0, 0, 0, 0
+ spritePiece $10, -$30, 2, 2, $5D, 1, 0, 0, 0
+ spritePiece -$10, -$30, 4, 2, $61, 0, 0, 0, 0
+ spritePiece -$10, -$20, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, -$10, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, $10, 4, 2, $69, 0, 0, 0, 0
+ spritePiece -$10, $20, 4, 2, $83, 0, 0, 0, 0
+Map_obj2B_0190_End
+
+Map_obj2B_01DA: spriteHeader
+ spritePiece -$20, -$18, 2, 2, $5D, 0, 0, 0, 0
+ spritePiece $10, -$18, 2, 2, $5D, 1, 0, 0, 0
+ spritePiece -$10, -$18, 2, 2, $61, 0, 0, 0, 0
+ spritePiece 0, -$18, 2, 2, $65, 0, 0, 0, 0
+ spritePiece -$10, -8, 2, 2, $69, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, $6D, 0, 0, 0, 0
+ spritePiece -$10, 8, 2, 2, $83, 0, 0, 0, 0
+ spritePiece 0, 8, 2, 2, $87, 0, 0, 0, 0
+Map_obj2B_01DA_End
+
+Map_obj2B_021C: spriteHeader
+ spritePiece -$20, -$1C, 2, 2, $5D, 0, 0, 0, 0
+ spritePiece $10, -$1C, 2, 2, $5D, 1, 0, 0, 0
+ spritePiece -$10, -$1C, 2, 2, $61, 0, 0, 0, 0
+ spritePiece 0, -$1C, 2, 2, $65, 0, 0, 0, 0
+ spritePiece -$10, -$C, 2, 2, $69, 0, 0, 0, 0
+ spritePiece 0, -$C, 2, 2, $6D, 0, 0, 0, 0
+ spritePiece -$10, -4, 2, 2, $69, 0, 0, 0, 0
+ spritePiece 0, -4, 2, 2, $6D, 0, 0, 0, 0
+ spritePiece -$10, $C, 2, 2, $83, 0, 0, 0, 0
+ spritePiece 0, $C, 2, 2, $87, 0, 0, 0, 0
+Map_obj2B_021C_End
+
+Map_obj2B_026E: spriteHeader
+ spritePiece -$20, -$20, 2, 2, $5D, 0, 0, 0, 0
+ spritePiece $10, -$20, 2, 2, $5D, 1, 0, 0, 0
+ spritePiece -$10, -$20, 2, 2, $61, 0, 0, 0, 0
+ spritePiece 0, -$20, 2, 2, $65, 0, 0, 0, 0
+ spritePiece -$10, -$10, 2, 2, $69, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, $6D, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $69, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, $6D, 0, 0, 0, 0
+ spritePiece -$10, $10, 2, 2, $83, 0, 0, 0, 0
+ spritePiece 0, $10, 2, 2, $87, 0, 0, 0, 0
+Map_obj2B_026E_End
+
+Map_obj2B_02C0: spriteHeader
+ spritePiece -$20, -$24, 2, 2, $5D, 0, 0, 0, 0
+ spritePiece $10, -$24, 2, 2, $5D, 1, 0, 0, 0
+ spritePiece -$10, -$24, 2, 2, $61, 0, 0, 0, 0
+ spritePiece 0, -$24, 2, 2, $65, 0, 0, 0, 0
+ spritePiece -$10, -$14, 2, 2, $69, 0, 0, 0, 0
+ spritePiece 0, -$14, 2, 2, $6D, 0, 0, 0, 0
+ spritePiece -$10, -4, 2, 2, $69, 0, 0, 0, 0
+ spritePiece 0, -4, 2, 2, $6D, 0, 0, 0, 0
+ spritePiece -$10, 4, 2, 2, $69, 0, 0, 0, 0
+ spritePiece 0, 4, 2, 2, $6D, 0, 0, 0, 0
+ spritePiece -$10, $14, 2, 2, $83, 0, 0, 0, 0
+ spritePiece 0, $14, 2, 2, $87, 0, 0, 0, 0
+Map_obj2B_02C0_End
+
+Map_obj2B_0322: spriteHeader
+ spritePiece -$20, -$28, 2, 2, $5D, 0, 0, 0, 0
+ spritePiece $10, -$28, 2, 2, $5D, 1, 0, 0, 0
+ spritePiece -$10, -$28, 2, 2, $61, 0, 0, 0, 0
+ spritePiece 0, -$28, 2, 2, $65, 0, 0, 0, 0
+ spritePiece -$10, -$18, 2, 2, $69, 0, 0, 0, 0
+ spritePiece 0, -$18, 2, 2, $6D, 0, 0, 0, 0
+ spritePiece -$10, -8, 2, 2, $69, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, $6D, 0, 0, 0, 0
+ spritePiece -$10, 8, 2, 2, $69, 0, 0, 0, 0
+ spritePiece 0, 8, 2, 2, $6D, 0, 0, 0, 0
+ spritePiece -$10, $18, 2, 2, $83, 0, 0, 0, 0
+ spritePiece 0, $18, 2, 2, $87, 0, 0, 0, 0
+Map_obj2B_0322_End
+
+Map_obj2B_0384: spriteHeader
+ spritePiece -$20, -$2C, 2, 2, $5D, 0, 0, 0, 0
+ spritePiece $10, -$2C, 2, 2, $5D, 1, 0, 0, 0
+ spritePiece -$10, -$2C, 2, 2, $61, 0, 0, 0, 0
+ spritePiece 0, -$2C, 2, 2, $65, 0, 0, 0, 0
+ spritePiece -$10, -$1C, 2, 2, $69, 0, 0, 0, 0
+ spritePiece 0, -$1C, 2, 2, $6D, 0, 0, 0, 0
+ spritePiece -$10, -$C, 2, 2, $69, 0, 0, 0, 0
+ spritePiece 0, -$C, 2, 2, $6D, 0, 0, 0, 0
+ spritePiece -$10, 4, 2, 2, $69, 0, 0, 0, 0
+ spritePiece 0, 4, 2, 2, $6D, 0, 0, 0, 0
+ spritePiece -$10, $C, 2, 2, $69, 0, 0, 0, 0
+ spritePiece 0, $C, 2, 2, $6D, 0, 0, 0, 0
+ spritePiece -$10, $1C, 2, 2, $83, 0, 0, 0, 0
+ spritePiece 0, $1C, 2, 2, $87, 0, 0, 0, 0
+Map_obj2B_0384_End
+
+Map_obj2B_03F6: spriteHeader
+ spritePiece -$20, -$30, 2, 2, $5D, 0, 0, 0, 0
+ spritePiece $10, -$30, 2, 2, $5D, 1, 0, 0, 0
+ spritePiece -$10, -$30, 2, 2, $61, 0, 0, 0, 0
+ spritePiece 0, -$30, 2, 2, $65, 0, 0, 0, 0
+ spritePiece -$10, -$20, 2, 2, $69, 0, 0, 0, 0
+ spritePiece 0, -$20, 2, 2, $6D, 0, 0, 0, 0
+ spritePiece -$10, -$10, 2, 2, $69, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, $6D, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $69, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, $6D, 0, 0, 0, 0
+ spritePiece -$10, $10, 2, 2, $69, 0, 0, 0, 0
+ spritePiece 0, $10, 2, 2, $6D, 0, 0, 0, 0
+ spritePiece -$10, $20, 2, 2, $83, 0, 0, 0, 0
+ spritePiece 0, $20, 2, 2, $87, 0, 0, 0, 0
+Map_obj2B_03F6_End
+
+ even
diff --git a/mappings/sprite/obj2B.bin b/mappings/sprite/obj2B.bin
deleted file mode 100644
index 1b4f0b6f..00000000
Binary files a/mappings/sprite/obj2B.bin and /dev/null differ
diff --git a/mappings/sprite/obj2C.asm b/mappings/sprite/obj2C.asm
new file mode 100644
index 00000000..bd0dccb0
--- /dev/null
+++ b/mappings/sprite/obj2C.asm
@@ -0,0 +1,23 @@
+Map_obj2C: mappingsTable
+ mappingsTableEntry.w Map_obj2C_0008
+ mappingsTableEntry.w Map_obj2C_0012
+ mappingsTableEntry.w Map_obj2C_001C
+ mappingsTableEntry.w Map_obj2C_0026
+
+Map_obj2C_0008: spriteHeader
+ spritePiece -4, -4, 1, 1, 0, 0, 0, 0, 0
+Map_obj2C_0008_End
+
+Map_obj2C_0012: spriteHeader
+ spritePiece -8, -4, 2, 1, 1, 0, 0, 0, 0
+Map_obj2C_0012_End
+
+Map_obj2C_001C: spriteHeader
+ spritePiece -8, -4, 2, 1, 3, 0, 0, 0, 0
+Map_obj2C_001C_End
+
+Map_obj2C_0026: spriteHeader
+ spritePiece -8, -4, 2, 1, 5, 0, 0, 0, 0
+Map_obj2C_0026_End
+
+ even
diff --git a/mappings/sprite/obj2C.bin b/mappings/sprite/obj2C.bin
deleted file mode 100644
index bfe16905..00000000
Binary files a/mappings/sprite/obj2C.bin and /dev/null differ
diff --git a/mappings/sprite/obj2D.asm b/mappings/sprite/obj2D.asm
new file mode 100644
index 00000000..ad6f8040
--- /dev/null
+++ b/mappings/sprite/obj2D.asm
@@ -0,0 +1,29 @@
+Map_obj2D: mappingsTable
+ mappingsTableEntry.w Map_obj2D_0008
+ mappingsTableEntry.w Map_obj2D_002A
+ mappingsTableEntry.w Map_obj2D_003C
+ mappingsTableEntry.w Map_obj2D_004E
+
+Map_obj2D_0008: spriteHeader
+ spritePiece -8, -$20, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, $10, 2, 2, 0, 0, 0, 0, 0
+Map_obj2D_0008_End
+
+Map_obj2D_002A: spriteHeader
+ spritePiece -$C, -$20, 3, 4, $5F, 0, 0, 0, 0
+ spritePiece -$C, 0, 3, 4, $5F, 0, 0, 0, 0
+Map_obj2D_002A_End
+
+Map_obj2D_003C: spriteHeader
+ spritePiece -8, -$20, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 4, 0, 0, 0, 0, 0
+Map_obj2D_003C_End
+
+Map_obj2D_004E: spriteHeader
+ spritePiece -8, -$20, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 4, 0, 0, 0, 0, 0
+Map_obj2D_004E_End
+
+ even
diff --git a/mappings/sprite/obj2D.bin b/mappings/sprite/obj2D.bin
deleted file mode 100644
index be7c141a..00000000
Binary files a/mappings/sprite/obj2D.bin and /dev/null differ
diff --git a/mappings/sprite/obj2F.asm b/mappings/sprite/obj2F.asm
new file mode 100644
index 00000000..ad602cf1
--- /dev/null
+++ b/mappings/sprite/obj2F.asm
@@ -0,0 +1,70 @@
+Map_obj2F: mappingsTable
+ mappingsTableEntry.w Map_obj2F_0014
+ mappingsTableEntry.w Map_obj2F_005E
+ mappingsTableEntry.w Map_obj2F_00B0
+ mappingsTableEntry.w Map_obj2F_00B0
+ mappingsTableEntry.w Map_obj2F_00F2
+ mappingsTableEntry.w Map_obj2F_00F2
+ mappingsTableEntry.w Map_obj2F_0124
+ mappingsTableEntry.w Map_obj2F_0124
+ mappingsTableEntry.w Map_obj2F_0146
+ mappingsTableEntry.w Map_obj2F_0146
+
+Map_obj2F_0014: spriteHeader
+ spritePiece -$10, -$28, 4, 2, $12, 0, 0, 0, 0
+ spritePiece -$10, -$18, 2, 2, $4A, 0, 0, 0, 0
+ spritePiece 0, -$18, 2, 2, $4A, 0, 0, 0, 0
+ spritePiece -$10, -8, 2, 2, $4E, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, $4E, 0, 0, 0, 0
+ spritePiece -$10, 8, 2, 2, $52, 0, 0, 0, 0
+ spritePiece 0, 8, 2, 2, $52, 0, 0, 0, 0
+ spritePiece -$10, $18, 2, 2, $52, 0, 0, 0, 0
+ spritePiece 0, $18, 2, 2, $52, 0, 0, 0, 0
+Map_obj2F_0014_End
+
+Map_obj2F_005E: spriteHeader
+ spritePiece -$10, -$28, 2, 2, $12, 0, 0, 0, 0
+ spritePiece 0, -$28, 2, 2, $16, 0, 0, 0, 0
+ spritePiece -$10, -$18, 2, 2, $4A, 0, 0, 0, 0
+ spritePiece 0, -$18, 2, 2, $4A, 0, 0, 0, 0
+ spritePiece -$10, -8, 2, 2, $4E, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, $4E, 0, 0, 0, 0
+ spritePiece -$10, 8, 2, 2, $52, 0, 0, 0, 0
+ spritePiece 0, 8, 2, 2, $52, 0, 0, 0, 0
+ spritePiece -$10, $18, 2, 2, $52, 0, 0, 0, 0
+ spritePiece 0, $18, 2, 2, $52, 0, 0, 0, 0
+Map_obj2F_005E_End
+
+Map_obj2F_00B0: spriteHeader
+ spritePiece -$10, -$20, 2, 2, $4A, 0, 0, 0, 0
+ spritePiece 0, -$20, 2, 2, $4A, 0, 0, 0, 0
+ spritePiece -$10, -$10, 2, 2, $4E, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, $4E, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $52, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, $52, 0, 0, 0, 0
+ spritePiece -$10, $10, 2, 2, $52, 0, 0, 0, 0
+ spritePiece 0, $10, 2, 2, $52, 0, 0, 0, 0
+Map_obj2F_00B0_End
+
+Map_obj2F_00F2: spriteHeader
+ spritePiece -$10, -$18, 2, 2, $4E, 0, 0, 0, 0
+ spritePiece 0, -$18, 2, 2, $4E, 0, 0, 0, 0
+ spritePiece -$10, -8, 2, 2, $52, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, $52, 0, 0, 0, 0
+ spritePiece -$10, 8, 2, 2, $52, 0, 0, 0, 0
+ spritePiece 0, 8, 2, 2, $52, 0, 0, 0, 0
+Map_obj2F_00F2_End
+
+Map_obj2F_0124: spriteHeader
+ spritePiece -$10, -$10, 2, 2, $52, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, $52, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $52, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, $52, 0, 0, 0, 0
+Map_obj2F_0124_End
+
+Map_obj2F_0146: spriteHeader
+ spritePiece -$10, -8, 2, 2, $52, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, $52, 0, 0, 0, 0
+Map_obj2F_0146_End
+
+ even
diff --git a/mappings/sprite/obj2F.bin b/mappings/sprite/obj2F.bin
deleted file mode 100644
index d4228dc4..00000000
Binary files a/mappings/sprite/obj2F.bin and /dev/null differ
diff --git a/mappings/sprite/obj31_a.asm b/mappings/sprite/obj31_a.asm
new file mode 100644
index 00000000..c4dd0c40
--- /dev/null
+++ b/mappings/sprite/obj31_a.asm
@@ -0,0 +1,9 @@
+Map_obj31_a: mappingsTable
+ mappingsTableEntry.w Map_obj31_a_0006
+ mappingsTableEntry.w Map_obj31_a_0006
+ mappingsTableEntry.w Map_obj31_a_0006
+
+Map_obj31_a_0006: spriteHeader
+Map_obj31_a_0006_End
+
+ even
diff --git a/mappings/sprite/obj31_a.bin b/mappings/sprite/obj31_a.bin
deleted file mode 100644
index 388d9144..00000000
Binary files a/mappings/sprite/obj31_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj31_b.asm b/mappings/sprite/obj31_b.asm
new file mode 100644
index 00000000..eb8cd867
--- /dev/null
+++ b/mappings/sprite/obj31_b.asm
@@ -0,0 +1,27 @@
+Map_obj31_b: mappingsTable
+ mappingsTableEntry.w Map_obj31_b_0006
+ mappingsTableEntry.w Map_obj31_b_0028
+ mappingsTableEntry.w Map_obj31_b_004A
+
+Map_obj31_b_0006: spriteHeader
+ spritePiece -$20, -$20, 2, 2, $34, 0, 0, 0, 0
+ spritePiece $10, -$20, 2, 2, $34, 0, 0, 0, 0
+ spritePiece -$20, $10, 2, 2, $34, 0, 0, 0, 0
+ spritePiece $10, $10, 2, 2, $34, 0, 0, 0, 0
+Map_obj31_b_0006_End
+
+Map_obj31_b_0028: spriteHeader
+ spritePiece -$40, -$20, 2, 2, $34, 0, 0, 0, 0
+ spritePiece $30, -$20, 2, 2, $34, 0, 0, 0, 0
+ spritePiece -$40, $10, 2, 2, $34, 0, 0, 0, 0
+ spritePiece $30, $10, 2, 2, $34, 0, 0, 0, 0
+Map_obj31_b_0028_End
+
+Map_obj31_b_004A: spriteHeader
+ spritePiece -$80, -$20, 2, 2, $34, 0, 0, 0, 0
+ spritePiece $70, -$20, 2, 2, $34, 0, 0, 0, 0
+ spritePiece -$80, $10, 2, 2, $34, 0, 0, 0, 0
+ spritePiece $70, $10, 2, 2, $34, 0, 0, 0, 0
+Map_obj31_b_004A_End
+
+ even
diff --git a/mappings/sprite/obj31_b.bin b/mappings/sprite/obj31_b.bin
deleted file mode 100644
index e3d816f1..00000000
Binary files a/mappings/sprite/obj31_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj32_a.asm b/mappings/sprite/obj32_a.asm
new file mode 100644
index 00000000..f496e37a
--- /dev/null
+++ b/mappings/sprite/obj32_a.asm
@@ -0,0 +1,13 @@
+Map_obj32_a: mappingsTable
+ mappingsTableEntry.w Map_obj32_a_0002
+
+Map_obj32_a_0002: spriteHeader
+ spritePiece -$18, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, -$10, 2, 2, 4, 0, 0, 0, 0
+ spritePiece 8, -$10, 2, 2, 8, 0, 0, 0, 0
+ spritePiece -$18, 0, 2, 2, $C, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 2, $10, 0, 0, 0, 0
+ spritePiece 8, 0, 2, 2, $10, 0, 0, 0, 0
+Map_obj32_a_0002_End
+
+ even
diff --git a/mappings/sprite/obj32_a.bin b/mappings/sprite/obj32_a.bin
deleted file mode 100644
index 38c0ab16..00000000
Binary files a/mappings/sprite/obj32_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj32_b.asm b/mappings/sprite/obj32_b.asm
new file mode 100644
index 00000000..013bfe12
--- /dev/null
+++ b/mappings/sprite/obj32_b.asm
@@ -0,0 +1,11 @@
+Map_obj32_b: mappingsTable
+ mappingsTableEntry.w Map_obj32_b_0002
+
+Map_obj32_b_0002: spriteHeader
+ spritePiece -$10, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, 0, 1, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, 0, 1, 0, 0, 0
+Map_obj32_b_0002_End
+
+ even
diff --git a/mappings/sprite/obj32_b.bin b/mappings/sprite/obj32_b.bin
deleted file mode 100644
index 77fd8502..00000000
Binary files a/mappings/sprite/obj32_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj33_a.asm b/mappings/sprite/obj33_a.asm
new file mode 100644
index 00000000..59b71243
--- /dev/null
+++ b/mappings/sprite/obj33_a.asm
@@ -0,0 +1,9 @@
+Map_obj33_a: mappingsTable
+ mappingsTableEntry.w Map_obj33_a_0002
+
+Map_obj33_a_0002: spriteHeader
+ spritePiece -$18, -8, 3, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -8, 3, 2, 0, 1, 0, 0, 0
+Map_obj33_a_0002_End
+
+ even
diff --git a/mappings/sprite/obj33_a.bin b/mappings/sprite/obj33_a.bin
deleted file mode 100644
index 19cf7a7e..00000000
Binary files a/mappings/sprite/obj33_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj33_b.asm b/mappings/sprite/obj33_b.asm
new file mode 100644
index 00000000..15cb3faf
--- /dev/null
+++ b/mappings/sprite/obj33_b.asm
@@ -0,0 +1,21 @@
+Map_obj33_b: mappingsTable
+ mappingsTableEntry.w Map_obj33_b_0006
+ mappingsTableEntry.w Map_obj33_b_0018
+ mappingsTableEntry.w Map_obj33_b_002A
+
+Map_obj33_b_0006: spriteHeader
+ spritePiece -$10, -8, 2, 3, 0, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 3, 0, 1, 0, 0, 0
+Map_obj33_b_0006_End
+
+Map_obj33_b_0018: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 6, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 4, 6, 1, 0, 0, 0
+Map_obj33_b_0018_End
+
+Map_obj33_b_002A: spriteHeader
+ spritePiece -$10, 0, 2, 2, $E, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, $E, 1, 0, 0, 0
+Map_obj33_b_002A_End
+
+ even
diff --git a/mappings/sprite/obj33_b.bin b/mappings/sprite/obj33_b.bin
deleted file mode 100644
index 4d2623cf..00000000
Binary files a/mappings/sprite/obj33_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj35.asm b/mappings/sprite/obj35.asm
new file mode 100644
index 00000000..a5b6e7f8
--- /dev/null
+++ b/mappings/sprite/obj35.asm
@@ -0,0 +1,47 @@
+Map_obj35: mappingsTable
+ mappingsTableEntry.w Map_obj35_0012
+ mappingsTableEntry.w Map_obj35_0014
+ mappingsTableEntry.w Map_obj35_001E
+ mappingsTableEntry.w Map_obj35_0028
+ mappingsTableEntry.w Map_obj35_0032
+ mappingsTableEntry.w Map_obj35_003C
+ mappingsTableEntry.w Map_obj35_0046
+ mappingsTableEntry.w Map_obj35_0050
+ mappingsTableEntry.w Map_obj35_005A
+
+Map_obj35_0012: spriteHeader
+Map_obj35_0012_End
+
+Map_obj35_0014: spriteHeader
+ spritePiece -4, -8, 1, 2, 0, 0, 0, 0, 0
+Map_obj35_0014_End
+
+Map_obj35_001E: spriteHeader
+ spritePiece -4, -8, 1, 2, 2, 0, 0, 0, 0
+Map_obj35_001E_End
+
+Map_obj35_0028: spriteHeader
+ spritePiece -4, -8, 1, 2, 4, 0, 0, 0, 0
+Map_obj35_0028_End
+
+Map_obj35_0032: spriteHeader
+ spritePiece -4, -8, 1, 2, 6, 0, 0, 0, 0
+Map_obj35_0032_End
+
+Map_obj35_003C: spriteHeader
+ spritePiece -4, -8, 1, 2, 8, 0, 0, 0, 0
+Map_obj35_003C_End
+
+Map_obj35_0046: spriteHeader
+ spritePiece -8, -8, 2, 2, $A, 0, 0, 0, 0
+Map_obj35_0046_End
+
+Map_obj35_0050: spriteHeader
+ spritePiece -8, -8, 2, 2, $E, 0, 0, 0, 0
+Map_obj35_0050_End
+
+Map_obj35_005A: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $12, 0, 0, 0, 0
+Map_obj35_005A_End
+
+ even
diff --git a/mappings/sprite/obj35.bin b/mappings/sprite/obj35.bin
deleted file mode 100644
index 091259d6..00000000
Binary files a/mappings/sprite/obj35.bin and /dev/null differ
diff --git a/mappings/sprite/obj36.asm b/mappings/sprite/obj36.asm
new file mode 100644
index 00000000..fa637b2e
--- /dev/null
+++ b/mappings/sprite/obj36.asm
@@ -0,0 +1,75 @@
+Map_obj36: mappingsTable
+ mappingsTableEntry.w Map_obj36_0010
+ mappingsTableEntry.w Map_obj36_0022
+ mappingsTableEntry.w Map_obj36_0044
+ mappingsTableEntry.w Map_obj36_0076
+ mappingsTableEntry.w Map_obj36_00B8
+ mappingsTableEntry.w Map_obj36_00CA
+ mappingsTableEntry.w Map_obj36_00EC
+ mappingsTableEntry.w Map_obj36_011E
+
+Map_obj36_0010: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 4, 0, 0, 0, 0, 0
+Map_obj36_0010_End
+
+Map_obj36_0022: spriteHeader
+ spritePiece -$20, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece $10, -$10, 2, 4, 0, 0, 0, 0, 0
+Map_obj36_0022_End
+
+Map_obj36_0044: spriteHeader
+ spritePiece -$30, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -$20, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece $10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece $20, -$10, 2, 4, 0, 0, 0, 0, 0
+Map_obj36_0044_End
+
+Map_obj36_0076: spriteHeader
+ spritePiece -$40, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -$30, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -$20, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece $10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece $20, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece $30, -$10, 2, 4, 0, 0, 0, 0, 0
+Map_obj36_0076_End
+
+Map_obj36_00B8: spriteHeader
+ spritePiece -$10, -$10, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, 0, 0, 0, 0, 0
+Map_obj36_00B8_End
+
+Map_obj36_00CA: spriteHeader
+ spritePiece -$10, -$20, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$10, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, $10, 4, 2, 0, 0, 0, 0, 0
+Map_obj36_00CA_End
+
+Map_obj36_00EC: spriteHeader
+ spritePiece -$10, -$30, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$20, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$10, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, $10, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, $20, 4, 2, 0, 0, 0, 0, 0
+Map_obj36_00EC_End
+
+Map_obj36_011E: spriteHeader
+ spritePiece -$10, -$40, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$30, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$20, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$10, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, $10, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, $20, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, $30, 4, 2, 0, 0, 0, 0, 0
+Map_obj36_011E_End
+
+ even
diff --git a/mappings/sprite/obj36.bin b/mappings/sprite/obj36.bin
deleted file mode 100644
index 55102d19..00000000
Binary files a/mappings/sprite/obj36.bin and /dev/null differ
diff --git a/mappings/sprite/obj37_a.asm b/mappings/sprite/obj37_a.asm
new file mode 100644
index 00000000..70b19c7c
--- /dev/null
+++ b/mappings/sprite/obj37_a.asm
@@ -0,0 +1,47 @@
+Map_obj37_a: mappingsTable
+ mappingsTableEntry.w Map_obj37_a_0012
+ mappingsTableEntry.w Map_obj37_a_001C
+ mappingsTableEntry.w Map_obj37_a_0026
+ mappingsTableEntry.w Map_obj37_a_0030
+ mappingsTableEntry.w Map_obj37_a_003A
+ mappingsTableEntry.w Map_obj37_a_0044
+ mappingsTableEntry.w Map_obj37_a_004E
+ mappingsTableEntry.w Map_obj37_a_0058
+ mappingsTableEntry.w Map_obj37_a_0062
+
+Map_obj37_a_0012: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj37_a_0012_End
+
+Map_obj37_a_001C: spriteHeader
+ spritePiece -8, -8, 2, 2, 4, 0, 0, 0, 0
+Map_obj37_a_001C_End
+
+Map_obj37_a_0026: spriteHeader
+ spritePiece -4, -8, 1, 2, 8, 0, 0, 0, 0
+Map_obj37_a_0026_End
+
+Map_obj37_a_0030: spriteHeader
+ spritePiece -8, -8, 2, 2, 4, 1, 0, 0, 0
+Map_obj37_a_0030_End
+
+Map_obj37_a_003A: spriteHeader
+ spritePiece -8, -8, 2, 2, $A, 0, 0, 0, 0
+Map_obj37_a_003A_End
+
+Map_obj37_a_0044: spriteHeader
+ spritePiece -8, -8, 2, 2, $A, 1, 1, 0, 0
+Map_obj37_a_0044_End
+
+Map_obj37_a_004E: spriteHeader
+ spritePiece -8, -8, 2, 2, $A, 1, 0, 0, 0
+Map_obj37_a_004E_End
+
+Map_obj37_a_0058: spriteHeader
+ spritePiece -8, -8, 2, 2, $A, 0, 1, 0, 0
+Map_obj37_a_0058_End
+
+Map_obj37_a_0062: spriteHeader
+Map_obj37_a_0062_End
+
+ even
diff --git a/mappings/sprite/obj37_a.bin b/mappings/sprite/obj37_a.bin
deleted file mode 100644
index bd1a3929..00000000
Binary files a/mappings/sprite/obj37_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj37_b.asm b/mappings/sprite/obj37_b.asm
new file mode 100644
index 00000000..78a37354
--- /dev/null
+++ b/mappings/sprite/obj37_b.asm
@@ -0,0 +1,49 @@
+Map_obj37_b: mappingsTable
+ mappingsTableEntry.w Map_obj37_b_0008
+ mappingsTableEntry.w Map_obj37_b_005A
+ mappingsTableEntry.w Map_obj37_b_009C
+ mappingsTableEntry.w Map_obj37_b_00BE
+
+Map_obj37_b_0008: spriteHeader
+ spritePiece -$18, -$20, 3, 1, 0, 0, 0, 0, 0
+ spritePiece 0, -$20, 3, 1, 3, 0, 0, 0, 0
+ spritePiece -$20, -$18, 4, 1, 6, 0, 0, 0, 0
+ spritePiece 0, -$18, 4, 1, $A, 0, 0, 0, 0
+ spritePiece -$20, -$10, 2, 4, $E, 0, 0, 0, 0
+ spritePiece $10, -$10, 2, 4, $16, 0, 0, 0, 0
+ spritePiece -$20, $10, 4, 1, $1E, 0, 0, 0, 0
+ spritePiece 0, $10, 4, 1, $22, 0, 0, 0, 0
+ spritePiece -$18, $18, 3, 1, $26, 0, 0, 0, 0
+ spritePiece 0, $18, 3, 1, $29, 0, 0, 0, 0
+Map_obj37_b_0008_End
+
+Map_obj37_b_005A: spriteHeader
+ spritePiece -$10, -$20, 4, 1, $2C, 0, 0, 0, 0
+ spritePiece -$18, -$18, 3, 1, $30, 0, 0, 0, 0
+ spritePiece 0, -$18, 3, 2, $33, 0, 0, 0, 0
+ spritePiece -$18, -$10, 2, 4, $39, 0, 0, 0, 0
+ spritePiece 8, -8, 2, 2, $41, 0, 0, 0, 0
+ spritePiece 0, 8, 3, 2, $45, 0, 0, 0, 0
+ spritePiece -$18, $10, 3, 1, $4B, 0, 0, 0, 0
+ spritePiece -$10, $18, 4, 1, $4E, 0, 0, 0, 0
+Map_obj37_b_005A_End
+
+Map_obj37_b_009C: spriteHeader
+ spritePiece -$C, -$20, 2, 4, $52, 0, 0, 0, 0
+ spritePiece 4, -$20, 1, 4, $52, 1, 0, 0, 0
+ spritePiece -$C, 0, 2, 4, $5A, 0, 0, 0, 0
+ spritePiece 4, 0, 1, 4, $5A, 1, 0, 0, 0
+Map_obj37_b_009C_End
+
+Map_obj37_b_00BE: spriteHeader
+ spritePiece -$10, -$20, 4, 1, $2C, 1, 0, 0, 0
+ spritePiece 0, -$18, 3, 1, $30, 1, 0, 0, 0
+ spritePiece -$18, -$18, 3, 2, $33, 1, 0, 0, 0
+ spritePiece 8, -$10, 2, 4, $39, 1, 0, 0, 0
+ spritePiece -$18, -8, 2, 2, $41, 1, 0, 0, 0
+ spritePiece -$18, 8, 3, 2, $45, 1, 0, 0, 0
+ spritePiece 0, $10, 3, 1, $4B, 1, 0, 0, 0
+ spritePiece -$10, $18, 4, 1, $4E, 1, 0, 0, 0
+Map_obj37_b_00BE_End
+
+ even
diff --git a/mappings/sprite/obj37_b.bin b/mappings/sprite/obj37_b.bin
deleted file mode 100644
index 5f7fa1d7..00000000
Binary files a/mappings/sprite/obj37_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj37_c.asm b/mappings/sprite/obj37_c.asm
new file mode 100644
index 00000000..ba9a4fbc
--- /dev/null
+++ b/mappings/sprite/obj37_c.asm
@@ -0,0 +1,63 @@
+Map_obj37_c: mappingsTable
+ mappingsTableEntry.w Map_obj37_c_0010
+ mappingsTableEntry.w Map_obj37_c_0022
+ mappingsTableEntry.w Map_obj37_c_0044
+ mappingsTableEntry.w Map_obj37_c_0066
+ mappingsTableEntry.w Map_obj37_c_0088
+ mappingsTableEntry.w Map_obj37_c_00AA
+ mappingsTableEntry.w Map_obj37_c_00CC
+ mappingsTableEntry.w Map_obj37_c_00DE
+
+Map_obj37_c_0010: spriteHeader
+ spritePiece 0, -$20, 4, 4, 0, 0, 0, 0, 0
+ spritePiece 0, 0, 4, 4, 0, 0, 1, 0, 0
+Map_obj37_c_0010_End
+
+Map_obj37_c_0022: spriteHeader
+ spritePiece -$10, -$20, 4, 4, $10, 0, 0, 0, 0
+ spritePiece $10, -$20, 2, 4, $20, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 4, $10, 0, 1, 0, 0
+ spritePiece $10, 0, 2, 4, $20, 0, 1, 0, 0
+Map_obj37_c_0022_End
+
+Map_obj37_c_0044: spriteHeader
+ spritePiece -$18, -$20, 4, 4, $28, 0, 0, 0, 0
+ spritePiece 8, -$20, 3, 4, $38, 0, 0, 0, 0
+ spritePiece -$18, 0, 4, 4, $28, 0, 1, 0, 0
+ spritePiece 8, 0, 3, 4, $38, 0, 1, 0, 0
+Map_obj37_c_0044_End
+
+Map_obj37_c_0066: spriteHeader
+ spritePiece -$20, -$20, 4, 4, $34, 1, 0, 0, 0
+ spritePiece 0, -$20, 4, 4, $34, 0, 0, 0, 0
+ spritePiece -$20, 0, 4, 4, $34, 1, 1, 0, 0
+ spritePiece 0, 0, 4, 4, $34, 0, 1, 0, 0
+Map_obj37_c_0066_End
+
+Map_obj37_c_0088: spriteHeader
+ spritePiece -$20, -$20, 3, 4, $38, 1, 0, 0, 0
+ spritePiece -8, -$20, 4, 4, $28, 1, 0, 0, 0
+ spritePiece -$20, 0, 3, 4, $38, 1, 1, 0, 0
+ spritePiece -8, 0, 4, 4, $28, 1, 1, 0, 0
+Map_obj37_c_0088_End
+
+Map_obj37_c_00AA: spriteHeader
+ spritePiece -$20, -$20, 2, 4, $20, 1, 0, 0, 0
+ spritePiece -$10, -$20, 4, 4, $10, 1, 0, 0, 0
+ spritePiece -$20, 0, 2, 4, $20, 1, 1, 0, 0
+ spritePiece -$10, 0, 4, 4, $10, 1, 1, 0, 0
+Map_obj37_c_00AA_End
+
+Map_obj37_c_00CC: spriteHeader
+ spritePiece -$20, -$20, 4, 4, 0, 1, 0, 0, 0
+ spritePiece -$20, 0, 4, 4, 0, 1, 1, 0, 0
+Map_obj37_c_00CC_End
+
+Map_obj37_c_00DE: spriteHeader
+ spritePiece -$20, -$20, 4, 4, $44, 0, 0, 0, 0
+ spritePiece 0, -$20, 4, 4, $44, 1, 0, 0, 0
+ spritePiece -$20, 0, 4, 4, $44, 0, 1, 0, 0
+ spritePiece 0, 0, 4, 4, $44, 1, 1, 0, 0
+Map_obj37_c_00DE_End
+
+ even
diff --git a/mappings/sprite/obj37_c.bin b/mappings/sprite/obj37_c.bin
deleted file mode 100644
index dc894e02..00000000
Binary files a/mappings/sprite/obj37_c.bin and /dev/null differ
diff --git a/mappings/sprite/obj38.asm b/mappings/sprite/obj38.asm
new file mode 100644
index 00000000..fba8b045
--- /dev/null
+++ b/mappings/sprite/obj38.asm
@@ -0,0 +1,51 @@
+Map_obj38: mappingsTable
+ mappingsTableEntry.w Map_obj38_000C
+ mappingsTableEntry.w Map_obj38_002E
+ mappingsTableEntry.w Map_obj38_0050
+ mappingsTableEntry.w Map_obj38_0072
+ mappingsTableEntry.w Map_obj38_0094
+ mappingsTableEntry.w Map_obj38_00B6
+
+Map_obj38_000C: spriteHeader
+ spritePiece -$10, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, 0, 1, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, 0, 0, 1, 0, 0
+ spritePiece 0, 0, 2, 2, 0, 1, 1, 0, 0
+Map_obj38_000C_End
+
+Map_obj38_002E: spriteHeader
+ spritePiece -$10, -$10, 2, 2, 4, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, 4, 1, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, 4, 0, 1, 0, 0
+ spritePiece 0, 0, 2, 2, 4, 1, 1, 0, 0
+Map_obj38_002E_End
+
+Map_obj38_0050: spriteHeader
+ spritePiece -$10, -$10, 2, 2, 8, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, 8, 1, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, 8, 0, 1, 0, 0
+ spritePiece 0, 0, 2, 2, 8, 1, 1, 0, 0
+Map_obj38_0050_End
+
+Map_obj38_0072: spriteHeader
+ spritePiece -$10, -$10, 2, 2, $C, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, $C, 1, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $C, 0, 1, 0, 0
+ spritePiece 0, 0, 2, 2, $C, 1, 1, 0, 0
+Map_obj38_0072_End
+
+Map_obj38_0094: spriteHeader
+ spritePiece -$10, -$10, 2, 2, $10, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, $10, 1, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $10, 0, 1, 0, 0
+ spritePiece 0, 0, 2, 2, $10, 1, 1, 0, 0
+Map_obj38_0094_End
+
+Map_obj38_00B6: spriteHeader
+ spritePiece -$18, -$20, 3, 4, $14, 0, 0, 0, 0
+ spritePiece 0, -$20, 3, 4, $14, 1, 0, 0, 0
+ spritePiece -$18, 0, 3, 4, $14, 0, 1, 0, 0
+ spritePiece 0, 0, 3, 4, $14, 1, 1, 0, 0
+Map_obj38_00B6_End
+
+ even
diff --git a/mappings/sprite/obj38.bin b/mappings/sprite/obj38.bin
deleted file mode 100644
index d98c053e..00000000
Binary files a/mappings/sprite/obj38.bin and /dev/null differ
diff --git a/mappings/sprite/obj39.asm b/mappings/sprite/obj39.asm
new file mode 100644
index 00000000..d69d948b
--- /dev/null
+++ b/mappings/sprite/obj39.asm
@@ -0,0 +1,27 @@
+Map_obj39: mappingsTable
+ mappingsTableEntry.w Map_obj39_0008
+ mappingsTableEntry.w Map_obj39_001A
+ mappingsTableEntry.w Map_obj39_002C
+ mappingsTableEntry.w Map_obj39_003E
+
+Map_obj39_0008: spriteHeader
+ spritePiece -$48, -8, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$28, -8, 4, 2, 8, 0, 0, 0, 0
+Map_obj39_0008_End
+
+Map_obj39_001A: spriteHeader
+ spritePiece 8, -8, 4, 2, $14, 0, 0, 0, 0
+ spritePiece $28, -8, 4, 2, $C, 0, 0, 0, 0
+Map_obj39_001A_End
+
+Map_obj39_002C: spriteHeader
+ spritePiece -$3C, -8, 3, 2, $1C, 0, 0, 0, 0
+ spritePiece -$24, -8, 4, 2, 8, 0, 0, 0, 0
+Map_obj39_002C_End
+
+Map_obj39_003E: spriteHeader
+ spritePiece $C, -8, 4, 2, $14, 0, 0, 0, 0
+ spritePiece $2C, -8, 4, 2, $C, 0, 0, 0, 0
+Map_obj39_003E_End
+
+ even
diff --git a/mappings/sprite/obj39.bin b/mappings/sprite/obj39.bin
deleted file mode 100644
index 3c0debfe..00000000
Binary files a/mappings/sprite/obj39.bin and /dev/null differ
diff --git a/mappings/sprite/obj3B.asm b/mappings/sprite/obj3B.asm
new file mode 100644
index 00000000..c9133ea2
--- /dev/null
+++ b/mappings/sprite/obj3B.asm
@@ -0,0 +1,10 @@
+Map_obj3B: mappingsTable
+ mappingsTableEntry.w Map_obj3B_0002
+
+Map_obj3B_0002: spriteHeader
+ spritePiece -$18, -$10, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 3, 4, $C, 0, 0, 0, 0
+Map_obj3B_0002_End
+
+ dc.w 0
+ even
diff --git a/mappings/sprite/obj3B.bin b/mappings/sprite/obj3B.bin
deleted file mode 100644
index 66e8afca..00000000
Binary files a/mappings/sprite/obj3B.bin and /dev/null differ
diff --git a/mappings/sprite/obj3C.asm b/mappings/sprite/obj3C.asm
new file mode 100644
index 00000000..a39b0770
--- /dev/null
+++ b/mappings/sprite/obj3C.asm
@@ -0,0 +1,39 @@
+Map_obj3C: mappingsTable
+ mappingsTableEntry.w Map_obj3C_0006
+ mappingsTableEntry.w Map_obj3C_0048
+ mappingsTableEntry.w Map_obj3C_008A
+
+Map_obj3C_0006: spriteHeader
+ spritePiece -$10, -$20, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, $10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$20, 2, 2, 4, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, 4, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, 4, 0, 0, 0, 0
+ spritePiece 0, $10, 2, 2, 4, 0, 0, 0, 0
+Map_obj3C_0006_End
+
+Map_obj3C_0048: spriteHeader
+ spritePiece -$10, -$20, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$10, -$10, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$10, $10, 2, 2, 4, 0, 0, 0, 0
+ spritePiece 0, -$20, 2, 2, 4, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, 4, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, 4, 0, 0, 0, 0
+ spritePiece 0, $10, 2, 2, 4, 0, 0, 0, 0
+Map_obj3C_0048_End
+
+Map_obj3C_008A: spriteHeader
+ spritePiece -$10, -$20, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$10, -$10, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$10, $10, 2, 2, 4, 0, 0, 0, 0
+ spritePiece 0, -$20, 2, 2, 8, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, 8, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, 8, 0, 0, 0, 0
+ spritePiece 0, $10, 2, 2, 8, 0, 0, 0, 0
+Map_obj3C_008A_End
+
+ even
diff --git a/mappings/sprite/obj3C.bin b/mappings/sprite/obj3C.bin
deleted file mode 100644
index e9c1f62c..00000000
Binary files a/mappings/sprite/obj3C.bin and /dev/null differ
diff --git a/mappings/sprite/obj3D.asm b/mappings/sprite/obj3D.asm
new file mode 100644
index 00000000..764baab2
--- /dev/null
+++ b/mappings/sprite/obj3D.asm
@@ -0,0 +1,59 @@
+Map_obj3D: mappingsTable
+ mappingsTableEntry.w Map_obj3D_0008
+ mappingsTableEntry.w Map_obj3D_002A
+ mappingsTableEntry.w Map_obj3D_00AC
+ mappingsTableEntry.w Map_obj3D_00CE
+
+Map_obj3D_0008: spriteHeader
+ spritePiece -$10, -$10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -8, -$10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece 8, -$10, 1, 4, 0, 0, 0, 0, 0
+Map_obj3D_0008_End
+
+Map_obj3D_002A: spriteHeader
+ spritePiece -$10, -$10, 1, 1, 0, 0, 0, 0, 0
+ spritePiece -8, -$10, 1, 1, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 1, 1, 0, 0, 0, 0, 0
+ spritePiece 8, -$10, 1, 1, 0, 0, 0, 0, 0
+ spritePiece -$10, -8, 1, 1, 1, 0, 0, 0, 0
+ spritePiece -8, -8, 1, 1, 1, 0, 0, 0, 0
+ spritePiece 0, -8, 1, 1, 1, 0, 0, 0, 0
+ spritePiece 8, -8, 1, 1, 1, 0, 0, 0, 0
+ spritePiece -$10, 0, 1, 1, 2, 0, 0, 0, 0
+ spritePiece -8, 0, 1, 1, 2, 0, 0, 0, 0
+ spritePiece 0, 0, 1, 1, 2, 0, 0, 0, 0
+ spritePiece 8, 0, 1, 1, 2, 0, 0, 0, 0
+ spritePiece -$10, 8, 1, 1, 3, 0, 0, 0, 0
+ spritePiece -8, 8, 1, 1, 3, 0, 0, 0, 0
+ spritePiece 0, 8, 1, 1, 3, 0, 0, 0, 0
+ spritePiece 8, 8, 1, 1, 3, 0, 0, 0, 0
+Map_obj3D_002A_End
+
+Map_obj3D_00AC: spriteHeader
+ spritePiece -$10, -$10, 4, 1, 0, 0, 0, 0, 0
+ spritePiece -$10, -8, 4, 1, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 1, 0, 0, 0, 0, 0
+ spritePiece -$10, 8, 4, 1, 0, 0, 0, 0, 0
+Map_obj3D_00AC_End
+
+Map_obj3D_00CE: spriteHeader
+ spritePiece -$10, -$10, 1, 1, 0, 0, 0, 0, 0
+ spritePiece -8, -$10, 1, 1, 1, 0, 0, 0, 0
+ spritePiece 0, -$10, 1, 1, 2, 0, 0, 0, 0
+ spritePiece 8, -$10, 1, 1, 3, 0, 0, 0, 0
+ spritePiece -$10, -8, 1, 1, 0, 0, 0, 0, 0
+ spritePiece -8, -8, 1, 1, 1, 0, 0, 0, 0
+ spritePiece 0, -8, 1, 1, 2, 0, 0, 0, 0
+ spritePiece 8, -8, 1, 1, 3, 0, 0, 0, 0
+ spritePiece -$10, 0, 1, 1, 0, 0, 0, 0, 0
+ spritePiece -8, 0, 1, 1, 1, 0, 0, 0, 0
+ spritePiece 0, 0, 1, 1, 2, 0, 0, 0, 0
+ spritePiece 8, 0, 1, 1, 3, 0, 0, 0, 0
+ spritePiece -$10, 8, 1, 1, 0, 0, 0, 0, 0
+ spritePiece -8, 8, 1, 1, 1, 0, 0, 0, 0
+ spritePiece 0, 8, 1, 1, 2, 0, 0, 0, 0
+ spritePiece 8, 8, 1, 1, 3, 0, 0, 0, 0
+Map_obj3D_00CE_End
+
+ even
diff --git a/mappings/sprite/obj3D.bin b/mappings/sprite/obj3D.bin
deleted file mode 100644
index e0f2542c..00000000
Binary files a/mappings/sprite/obj3D.bin and /dev/null differ
diff --git a/mappings/sprite/obj3E.asm b/mappings/sprite/obj3E.asm
new file mode 100644
index 00000000..fa91a24a
--- /dev/null
+++ b/mappings/sprite/obj3E.asm
@@ -0,0 +1,58 @@
+Map_obj3E: mappingsTable
+ mappingsTableEntry.w Map_obj3E_000C
+ mappingsTableEntry.w Map_obj3E_0046
+ mappingsTableEntry.w Map_obj3E_0088
+ mappingsTableEntry.w Map_obj3E_00CA
+ mappingsTableEntry.w Map_obj3E_00F4
+ mappingsTableEntry.w Map_obj3E_0106
+
+Map_obj3E_000C: spriteHeader
+ spritePiece -$20, -$20, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$20, 4, 2, 0, 1, 0, 0, 0
+ spritePiece -$20, -$10, 3, 3, 8, 0, 0, 0, 0
+ spritePiece -8, -$10, 2, 3, $11, 0, 0, 0, 0
+ spritePiece 8, -$10, 3, 3, 8, 1, 0, 0, 0
+ spritePiece -$20, 8, 4, 3, $17, 0, 0, 0, 0
+ spritePiece 0, 8, 4, 3, $17, 1, 0, 0, 0
+Map_obj3E_000C_End
+
+Map_obj3E_0046: spriteHeader
+ spritePiece -$20, -$20, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$20, 4, 2, 0, 1, 0, 0, 0
+ spritePiece -$20, 8, 4, 3, $17, 0, 0, 0, 0
+ spritePiece 0, 8, 4, 3, $17, 1, 0, 0, 0
+ spritePiece -8, -$18, 2, 3, $11, 0, 0, 0, 0
+ spritePiece -$20, -8, 3, 3, 8, 0, 0, 0, 0
+ spritePiece 8, -8, 3, 3, 8, 1, 0, 0, 0
+Map_obj3E_0046_End
+ spritePiece -8, -$10, 2, 3, $23, 0, 0, 0, 0
+
+Map_obj3E_0088: spriteHeader
+ spritePiece -$20, -$20, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$20, 4, 2, 0, 1, 0, 0, 0
+ spritePiece -$20, 8, 4, 3, $17, 0, 0, 0, 0
+ spritePiece 0, 8, 4, 3, $17, 1, 0, 0, 0
+ spritePiece -8, -$20, 2, 3, $11, 0, 0, 0, 0
+ spritePiece -$20, 0, 3, 3, 8, 0, 0, 0, 0
+ spritePiece 8, 0, 3, 3, 8, 1, 0, 0, 0
+Map_obj3E_0088_End
+ spritePiece -8, -$10, 2, 3, $23, 0, 0, 0, 0
+
+Map_obj3E_00CA: spriteHeader
+ spritePiece -$20, -$20, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$20, 4, 2, 0, 1, 0, 0, 0
+ spritePiece -8, -$10, 2, 3, $23, 0, 0, 0, 0
+ spritePiece -$20, 8, 4, 3, $17, 0, 0, 0, 0
+ spritePiece 0, 8, 4, 3, $17, 1, 0, 0, 0
+Map_obj3E_00CA_End
+
+Map_obj3E_00F4: spriteHeader
+ spritePiece -$10, -8, 2, 2, $29, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, $29, 1, 0, 0, 0
+Map_obj3E_00F4_End
+
+Map_obj3E_0106: spriteHeader
+ spritePiece -8, -8, 2, 2, $2D, 0, 0, 0, 0
+Map_obj3E_0106_End
+
+ even
diff --git a/mappings/sprite/obj3E.bin b/mappings/sprite/obj3E.bin
deleted file mode 100644
index ea914115..00000000
Binary files a/mappings/sprite/obj3E.bin and /dev/null differ
diff --git a/mappings/sprite/obj3F_a.asm b/mappings/sprite/obj3F_a.asm
new file mode 100644
index 00000000..10e9d260
--- /dev/null
+++ b/mappings/sprite/obj3F_a.asm
@@ -0,0 +1,50 @@
+Map_obj3F_a: mappingsTable
+ mappingsTableEntry.w Map_obj3F_a_0016
+ mappingsTableEntry.w Map_obj3F_a_0030
+ mappingsTableEntry.w Map_obj3F_a_004A
+ mappingsTableEntry.w Map_obj3F_a_0064
+ mappingsTableEntry.w Map_obj3F_a_007E
+ mappingsTableEntry.w Map_obj3F_a_0098
+ mappingsTableEntry.w Map_obj3F_a_007E
+ mappingsTableEntry.w Map_obj3F_a_0064
+ mappingsTableEntry.w Map_obj3F_a_004A
+ mappingsTableEntry.w Map_obj3F_a_0030
+ mappingsTableEntry.w Map_obj3F_a_0016
+
+Map_obj3F_a_0016: spriteHeader
+ spritePiece -$C, -$D, 1, 3, 0, 0, 0, 0, 0
+ spritePiece -4, -$10, 2, 2, 7, 0, 0, 0, 0
+ spritePiece -4, 0, 2, 2, 7, 0, 1, 0, 0
+Map_obj3F_a_0016_End
+
+Map_obj3F_a_0030: spriteHeader
+ spritePiece -$C, -$B, 1, 3, 0, 0, 1, 0, 0
+ spritePiece -4, -$10, 2, 2, 7, 0, 0, 0, 0
+ spritePiece -4, 0, 2, 2, 7, 0, 1, 0, 0
+Map_obj3F_a_0030_End
+
+Map_obj3F_a_004A: spriteHeader
+ spritePiece -$C, -$10, 1, 4, 3, 0, 0, 0, 0
+ spritePiece -4, -$10, 2, 2, 7, 0, 0, 0, 0
+ spritePiece -4, 0, 2, 2, 7, 0, 1, 0, 0
+Map_obj3F_a_004A_End
+
+Map_obj3F_a_0064: spriteHeader
+ spritePiece -$C, -$D, 1, 3, 0, 0, 0, 0, 0
+ spritePiece -4, -$10, 2, 2, $B, 0, 0, 0, 0
+ spritePiece -4, 0, 2, 2, $B, 0, 1, 0, 0
+Map_obj3F_a_0064_End
+
+Map_obj3F_a_007E: spriteHeader
+ spritePiece -$C, -$B, 1, 3, 0, 0, 1, 0, 0
+ spritePiece -4, -$10, 2, 2, $B, 0, 0, 0, 0
+ spritePiece -4, 0, 2, 2, $B, 0, 1, 0, 0
+Map_obj3F_a_007E_End
+
+Map_obj3F_a_0098: spriteHeader
+ spritePiece -$C, -$10, 1, 4, 3, 0, 0, 0, 0
+ spritePiece -4, -$10, 2, 2, $B, 0, 0, 0, 0
+ spritePiece -4, 0, 2, 2, $B, 0, 1, 0, 0
+Map_obj3F_a_0098_End
+
+ even
diff --git a/mappings/sprite/obj3F_a.bin b/mappings/sprite/obj3F_a.bin
deleted file mode 100644
index c9eec5d9..00000000
Binary files a/mappings/sprite/obj3F_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj3F_b.asm b/mappings/sprite/obj3F_b.asm
new file mode 100644
index 00000000..f112c0a9
--- /dev/null
+++ b/mappings/sprite/obj3F_b.asm
@@ -0,0 +1,50 @@
+Map_obj3F_b: mappingsTable
+ mappingsTableEntry.w Map_obj3F_b_0016
+ mappingsTableEntry.w Map_obj3F_b_0030
+ mappingsTableEntry.w Map_obj3F_b_004A
+ mappingsTableEntry.w Map_obj3F_b_0064
+ mappingsTableEntry.w Map_obj3F_b_007E
+ mappingsTableEntry.w Map_obj3F_b_0098
+ mappingsTableEntry.w Map_obj3F_b_007E
+ mappingsTableEntry.w Map_obj3F_b_0064
+ mappingsTableEntry.w Map_obj3F_b_004A
+ mappingsTableEntry.w Map_obj3F_b_0030
+ mappingsTableEntry.w Map_obj3F_b_0016
+
+Map_obj3F_b_0016: spriteHeader
+ spritePiece -$D, -$C, 3, 1, $F, 0, 0, 0, 0
+ spritePiece -$10, -4, 2, 2, $16, 0, 0, 0, 0
+ spritePiece 0, -4, 2, 2, $16, 1, 0, 0, 0
+Map_obj3F_b_0016_End
+
+Map_obj3F_b_0030: spriteHeader
+ spritePiece -$B, -$C, 3, 1, $F, 1, 0, 0, 0
+ spritePiece -$10, -4, 2, 2, $16, 0, 0, 0, 0
+ spritePiece 0, -4, 2, 2, $16, 1, 0, 0, 0
+Map_obj3F_b_0030_End
+
+Map_obj3F_b_004A: spriteHeader
+ spritePiece -$10, -$C, 4, 1, $12, 0, 0, 0, 0
+ spritePiece -$10, -4, 2, 2, $16, 0, 0, 0, 0
+ spritePiece 0, -4, 2, 2, $16, 1, 0, 0, 0
+Map_obj3F_b_004A_End
+
+Map_obj3F_b_0064: spriteHeader
+ spritePiece -$D, -$C, 3, 1, $F, 0, 0, 0, 0
+ spritePiece -$10, -4, 2, 2, $1A, 0, 0, 0, 0
+ spritePiece 0, -4, 2, 2, $1A, 1, 0, 0, 0
+Map_obj3F_b_0064_End
+
+Map_obj3F_b_007E: spriteHeader
+ spritePiece -$B, -$C, 3, 1, $F, 1, 0, 0, 0
+ spritePiece -$10, -4, 2, 2, $1A, 0, 0, 0, 0
+ spritePiece 0, -4, 2, 2, $1A, 1, 0, 0, 0
+Map_obj3F_b_007E_End
+
+Map_obj3F_b_0098: spriteHeader
+ spritePiece -$10, -$C, 4, 1, $12, 0, 0, 0, 0
+ spritePiece -$10, -4, 2, 2, $1A, 0, 0, 0, 0
+ spritePiece 0, -4, 2, 2, $1A, 1, 0, 0, 0
+Map_obj3F_b_0098_End
+
+ even
diff --git a/mappings/sprite/obj3F_b.bin b/mappings/sprite/obj3F_b.bin
deleted file mode 100644
index e4bad3de..00000000
Binary files a/mappings/sprite/obj3F_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj40.asm b/mappings/sprite/obj40.asm
new file mode 100644
index 00000000..80a3f5eb
--- /dev/null
+++ b/mappings/sprite/obj40.asm
@@ -0,0 +1,15 @@
+Map_obj40: mappingsTable
+ mappingsTableEntry.w Map_obj40_0004
+ mappingsTableEntry.w Map_obj40_0016
+
+Map_obj40_0004: spriteHeader
+ spritePiece -$1C, -$18, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -4, -$18, 4, 2, 6, 0, 0, 0, 0
+Map_obj40_0004_End
+
+Map_obj40_0016: spriteHeader
+ spritePiece -$1C, -$18, 3, 2, $E, 0, 0, 0, 0
+ spritePiece -4, -$18, 4, 2, $14, 0, 0, 0, 0
+Map_obj40_0016_End
+
+ even
diff --git a/mappings/sprite/obj40.bin b/mappings/sprite/obj40.bin
deleted file mode 100644
index eb9210b3..00000000
Binary files a/mappings/sprite/obj40.bin and /dev/null differ
diff --git a/mappings/sprite/obj42.asm b/mappings/sprite/obj42.asm
new file mode 100644
index 00000000..aa810108
--- /dev/null
+++ b/mappings/sprite/obj42.asm
@@ -0,0 +1,49 @@
+Map_obj42: mappingsTable
+ mappingsTableEntry.w Map_obj42_0010
+ mappingsTableEntry.w Map_obj42_001A
+ mappingsTableEntry.w Map_obj42_0024
+ mappingsTableEntry.w Map_obj42_002E
+ mappingsTableEntry.w Map_obj42_0040
+ mappingsTableEntry.w Map_obj42_0052
+ mappingsTableEntry.w Map_obj42_006C
+ mappingsTableEntry.w Map_obj42_007E
+
+Map_obj42_0010: spriteHeader
+ spritePiece -$18, -1, 1, 1, 0, 0, 0, 0, 0
+Map_obj42_0010_End
+
+Map_obj42_001A: spriteHeader
+ spritePiece -$18, -1, 2, 1, 1, 0, 0, 0, 0
+Map_obj42_001A_End
+
+Map_obj42_0024: spriteHeader
+ spritePiece -$14, -4, 2, 2, 3, 0, 0, 0, 0
+Map_obj42_0024_End
+
+Map_obj42_002E: spriteHeader
+ spritePiece -8, -4, 2, 2, 7, 0, 0, 0, 0
+ spritePiece -$10, -4, 2, 2, 3, 0, 0, 0, 0
+Map_obj42_002E_End
+
+Map_obj42_0040: spriteHeader
+ spritePiece 0, -4, 2, 2, 7, 0, 1, 0, 0
+ spritePiece -8, -4, 1, 2, $B, 0, 1, 0, 0
+Map_obj42_0040_End
+
+Map_obj42_0052: spriteHeader
+ spritePiece $C, -4, 1, 2, $D, 0, 0, 0, 0
+ spritePiece 4, -4, 1, 2, $B, 0, 0, 0, 0
+ spritePiece -4, -4, 1, 2, $D, 1, 1, 0, 0
+Map_obj42_0052_End
+
+Map_obj42_006C: spriteHeader
+ spritePiece $10, -4, 1, 2, $D, 0, 0, 0, 0
+ spritePiece 8, -4, 1, 2, $D, 1, 1, 0, 0
+Map_obj42_006C_End
+
+Map_obj42_007E: spriteHeader
+ spritePiece -$10, -$10, 2, 4, $15, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 4, $1D, 0, 0, 0, 0
+Map_obj42_007E_End
+
+ even
diff --git a/mappings/sprite/obj42.bin b/mappings/sprite/obj42.bin
deleted file mode 100644
index 20e38889..00000000
Binary files a/mappings/sprite/obj42.bin and /dev/null differ
diff --git a/mappings/sprite/obj43.asm b/mappings/sprite/obj43.asm
new file mode 100644
index 00000000..af111cb0
--- /dev/null
+++ b/mappings/sprite/obj43.asm
@@ -0,0 +1,13 @@
+Map_obj43: mappingsTable
+ mappingsTableEntry.w Map_obj43_0002
+
+Map_obj43_0002: spriteHeader
+ spritePiece -$18, -$20, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, -$28, 4, 4, 4, 0, 0, 0, 0
+ spritePiece -$18, -8, 3, 2, $14, 0, 0, 0, 0
+ spritePiece 0, -8, 3, 2, $1A, 0, 0, 0, 0
+ spritePiece -$18, $10, 2, 2, 0, 0, 1, 0, 0
+ spritePiece -8, 8, 4, 4, 4, 0, 1, 0, 0
+Map_obj43_0002_End
+
+ even
diff --git a/mappings/sprite/obj43.bin b/mappings/sprite/obj43.bin
deleted file mode 100644
index 104aa3df..00000000
Binary files a/mappings/sprite/obj43.bin and /dev/null differ
diff --git a/mappings/sprite/obj44.asm b/mappings/sprite/obj44.asm
new file mode 100644
index 00000000..e8aaaf94
--- /dev/null
+++ b/mappings/sprite/obj44.asm
@@ -0,0 +1,17 @@
+Map_obj44: mappingsTable
+ mappingsTableEntry.w Map_obj44_0004
+ mappingsTableEntry.w Map_obj44_0016
+
+Map_obj44_0004: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 4, 0, 1, 0, 0, 0
+Map_obj44_0004_End
+
+Map_obj44_0016: spriteHeader
+ spritePiece -$18, -$14, 3, 4, 8, 0, 0, 0, 0
+ spritePiece 0, -$14, 3, 4, 8, 1, 0, 0, 0
+ spritePiece -$10, $C, 2, 2, $14, 0, 0, 0, 0
+ spritePiece 0, $C, 2, 2, $14, 1, 0, 0, 0
+Map_obj44_0016_End
+
+ even
diff --git a/mappings/sprite/obj44.bin b/mappings/sprite/obj44.bin
deleted file mode 100644
index 9f3feab9..00000000
Binary files a/mappings/sprite/obj44.bin and /dev/null differ
diff --git a/mappings/sprite/obj45.asm b/mappings/sprite/obj45.asm
new file mode 100644
index 00000000..24697e4b
--- /dev/null
+++ b/mappings/sprite/obj45.asm
@@ -0,0 +1,264 @@
+Map_obj45: mappingsTable
+ mappingsTableEntry.w Map_obj45_003A
+ mappingsTableEntry.w Map_obj45_0064
+ mappingsTableEntry.w Map_obj45_008E
+ mappingsTableEntry.w Map_obj45_00B8
+ mappingsTableEntry.w Map_obj45_00E2
+ mappingsTableEntry.w Map_obj45_010C
+ mappingsTableEntry.w Map_obj45_0136
+ mappingsTableEntry.w Map_obj45_0160
+ mappingsTableEntry.w Map_obj45_018A
+ mappingsTableEntry.w Map_obj45_01B4
+ mappingsTableEntry.w Map_obj45_01DE
+ mappingsTableEntry.w Map_obj45_0208
+ mappingsTableEntry.w Map_obj45_0232
+ mappingsTableEntry.w Map_obj45_025C
+ mappingsTableEntry.w Map_obj45_0286
+ mappingsTableEntry.w Map_obj45_02B0
+ mappingsTableEntry.w Map_obj45_02DA
+ mappingsTableEntry.w Map_obj45_0304
+ mappingsTableEntry.w Map_obj45_032E
+ mappingsTableEntry.w Map_obj45_0358
+ mappingsTableEntry.w Map_obj45_0382
+ mappingsTableEntry.w Map_obj45_03AC
+ mappingsTableEntry.w Map_obj45_03D6
+ mappingsTableEntry.w Map_obj45_0400
+ mappingsTableEntry.w Map_obj45_042A
+ mappingsTableEntry.w Map_obj45_0454
+ mappingsTableEntry.w Map_obj45_047E
+ mappingsTableEntry.w Map_obj45_04A8
+ mappingsTableEntry.w Map_obj45_04D2
+
+Map_obj45_003A: spriteHeader
+ spritePiece -$10, -$14, 4, 1, 0, 0, 1, 1, 0
+ spritePiece -$C, $C, 3, 1, 4, 0, 1, 1, 0
+ spritePiece -$C, 4, 3, 1, 7, 0, 1, 0, 0
+ spritePiece -$C, -4, 3, 1, $A, 0, 1, 1, 0
+ spritePiece -8, -$C, 2, 1, $D, 0, 1, 0, 0
+Map_obj45_003A_End
+
+Map_obj45_0064: spriteHeader
+ spritePiece -$10, -$12, 4, 1, 0, 0, 1, 1, 0
+ spritePiece -$C, $C, 3, 1, 4, 0, 1, 1, 0
+ spritePiece -$C, 4, 3, 1, 7, 0, 1, 0, 0
+ spritePiece -$C, -4, 3, 1, $A, 0, 1, 1, 0
+ spritePiece -8, -$A, 2, 1, $D, 0, 1, 0, 0
+Map_obj45_0064_End
+
+Map_obj45_008E: spriteHeader
+ spritePiece -$10, -$10, 4, 1, 0, 0, 1, 1, 0
+ spritePiece -$C, $C, 3, 1, 4, 0, 1, 1, 0
+ spritePiece -$C, 4, 3, 1, 7, 0, 1, 0, 0
+ spritePiece -$C, -2, 3, 1, $A, 0, 1, 1, 0
+ spritePiece -8, -8, 2, 1, $D, 0, 1, 0, 0
+Map_obj45_008E_End
+
+Map_obj45_00B8: spriteHeader
+ spritePiece -$10, -$E, 4, 1, 0, 0, 1, 1, 0
+ spritePiece -$C, $C, 3, 1, 4, 0, 1, 1, 0
+ spritePiece -$C, 6, 3, 1, 7, 0, 1, 0, 0
+ spritePiece -$C, 0, 3, 1, $A, 0, 1, 1, 0
+ spritePiece -8, -6, 2, 1, $D, 0, 1, 0, 0
+Map_obj45_00B8_End
+
+Map_obj45_00E2: spriteHeader
+ spritePiece -$10, -$C, 4, 1, 0, 0, 1, 1, 0
+ spritePiece -$C, $C, 3, 1, 4, 0, 1, 1, 0
+ spritePiece -$C, 6, 3, 1, 7, 0, 1, 0, 0
+ spritePiece -$C, 0, 3, 1, $A, 0, 1, 1, 0
+ spritePiece -8, -4, 2, 1, $D, 0, 1, 0, 0
+Map_obj45_00E2_End
+
+Map_obj45_010C: spriteHeader
+ spritePiece -$10, -$A, 4, 1, 0, 0, 1, 1, 0
+ spritePiece -$C, $C, 3, 1, 4, 0, 1, 1, 0
+ spritePiece -$C, 6, 3, 1, 7, 0, 1, 0, 0
+ spritePiece -$C, 2, 3, 1, $A, 0, 1, 1, 0
+ spritePiece -8, -2, 2, 1, $D, 0, 1, 0, 0
+Map_obj45_010C_End
+
+Map_obj45_0136: spriteHeader
+ spritePiece -$10, -8, 4, 1, 0, 0, 1, 1, 0
+ spritePiece -$C, $C, 3, 1, 4, 0, 1, 1, 0
+ spritePiece -$C, 8, 3, 1, 7, 0, 1, 0, 0
+ spritePiece -$C, 4, 3, 1, $A, 0, 1, 1, 0
+ spritePiece -8, 0, 2, 1, $D, 0, 1, 0, 0
+Map_obj45_0136_End
+
+Map_obj45_0160: spriteHeader
+ spritePiece -$10, -6, 4, 1, 0, 0, 1, 1, 0
+ spritePiece -$C, $C, 3, 1, 4, 0, 1, 1, 0
+ spritePiece -$C, 8, 3, 1, 7, 0, 1, 0, 0
+ spritePiece -$C, 4, 3, 1, $A, 0, 1, 1, 0
+ spritePiece -8, 2, 2, 1, $D, 0, 1, 0, 0
+Map_obj45_0160_End
+
+Map_obj45_018A: spriteHeader
+ spritePiece -$10, -4, 4, 1, 0, 0, 1, 1, 0
+ spritePiece -$C, $C, 3, 1, 4, 0, 1, 1, 0
+ spritePiece -$C, 8, 3, 1, 7, 0, 1, 0, 0
+ spritePiece -$C, 6, 3, 1, $A, 0, 1, 1, 0
+ spritePiece -8, 4, 2, 1, $D, 0, 1, 0, 0
+Map_obj45_018A_End
+
+Map_obj45_01B4: spriteHeader
+ spritePiece -$10, -2, 4, 1, 0, 0, 1, 1, 0
+ spritePiece -$C, $C, 3, 1, 4, 0, 1, 1, 0
+ spritePiece -$C, $A, 3, 1, 7, 0, 1, 0, 0
+ spritePiece -$C, 8, 3, 1, $A, 0, 1, 1, 0
+ spritePiece -8, 6, 2, 1, $D, 0, 1, 0, 0
+Map_obj45_01B4_End
+
+Map_obj45_01DE: spriteHeader
+ spritePiece $C, -$10, 1, 4, $F, 0, 0, 1, 0
+ spritePiece -$14, -$C, 1, 3, $13, 0, 0, 1, 0
+ spritePiece -$C, -$C, 1, 3, $16, 0, 0, 0, 0
+ spritePiece -4, -$C, 1, 3, $19, 0, 0, 1, 0
+ spritePiece 4, -8, 1, 2, $1C, 0, 0, 0, 0
+Map_obj45_01DE_End
+
+Map_obj45_0208: spriteHeader
+ spritePiece $C, -$10, 1, 4, $F, 0, 0, 1, 0
+ spritePiece -$13, -$C, 1, 3, $13, 0, 0, 1, 0
+ spritePiece -$B, -$C, 1, 3, $16, 0, 0, 0, 0
+ spritePiece -3, -$C, 1, 3, $19, 0, 0, 1, 0
+ spritePiece 4, -8, 1, 2, $1C, 0, 0, 0, 0
+Map_obj45_0208_End
+
+Map_obj45_0232: spriteHeader
+ spritePiece $C, -$10, 1, 4, $F, 0, 0, 1, 0
+ spritePiece -$12, -$C, 1, 3, $13, 0, 0, 1, 0
+ spritePiece -$A, -$C, 1, 3, $16, 0, 0, 0, 0
+ spritePiece -2, -$C, 1, 3, $19, 0, 0, 1, 0
+ spritePiece 4, -8, 1, 2, $1C, 0, 0, 0, 0
+Map_obj45_0232_End
+
+Map_obj45_025C: spriteHeader
+ spritePiece $C, -$10, 1, 4, $F, 0, 0, 1, 0
+ spritePiece -$11, -$C, 1, 3, $13, 0, 0, 1, 0
+ spritePiece -9, -$C, 1, 3, $16, 0, 0, 0, 0
+ spritePiece -1, -$C, 1, 3, $19, 0, 0, 1, 0
+ spritePiece 4, -8, 1, 2, $1C, 0, 0, 0, 0
+Map_obj45_025C_End
+
+Map_obj45_0286: spriteHeader
+ spritePiece $C, -$10, 1, 4, $F, 0, 0, 1, 0
+ spritePiece -$10, -$C, 1, 3, $13, 0, 0, 1, 0
+ spritePiece -8, -$C, 1, 3, $16, 0, 0, 0, 0
+ spritePiece -2, -$C, 1, 3, $19, 0, 0, 1, 0
+ spritePiece 4, -8, 1, 2, $1C, 0, 0, 0, 0
+Map_obj45_0286_End
+
+Map_obj45_02B0: spriteHeader
+ spritePiece $C, -$10, 1, 4, $F, 0, 0, 1, 0
+ spritePiece -$F, -$C, 1, 3, $13, 0, 0, 1, 0
+ spritePiece -7, -$C, 1, 3, $16, 0, 0, 0, 0
+ spritePiece -1, -$C, 1, 3, $19, 0, 0, 1, 0
+ spritePiece 4, -8, 1, 2, $1C, 0, 0, 0, 0
+Map_obj45_02B0_End
+
+Map_obj45_02DA: spriteHeader
+ spritePiece $C, -$10, 1, 4, $F, 0, 0, 1, 0
+ spritePiece -$E, -$C, 1, 3, $13, 0, 0, 1, 0
+ spritePiece -8, -$C, 1, 3, $16, 0, 0, 0, 0
+ spritePiece -2, -$C, 1, 3, $19, 0, 0, 1, 0
+ spritePiece 4, -8, 1, 2, $1C, 0, 0, 0, 0
+Map_obj45_02DA_End
+
+Map_obj45_0304: spriteHeader
+ spritePiece $C, -$10, 1, 4, $F, 0, 0, 1, 0
+ spritePiece -$D, -$C, 1, 3, $13, 0, 0, 1, 0
+ spritePiece -7, -$C, 1, 3, $16, 0, 0, 0, 0
+ spritePiece -1, -$C, 1, 3, $19, 0, 0, 1, 0
+ spritePiece 4, -8, 1, 2, $1C, 0, 0, 0, 0
+Map_obj45_0304_End
+
+Map_obj45_032E: spriteHeader
+ spritePiece $C, -$10, 1, 4, $F, 0, 0, 1, 0
+ spritePiece -$C, -$C, 1, 3, $13, 0, 0, 1, 0
+ spritePiece -6, -$C, 1, 3, $16, 0, 0, 0, 0
+ spritePiece 0, -$C, 1, 3, $19, 0, 0, 1, 0
+ spritePiece 4, -8, 1, 2, $1C, 0, 0, 0, 0
+Map_obj45_032E_End
+
+Map_obj45_0358: spriteHeader
+ spritePiece $C, -$10, 1, 4, $F, 0, 0, 1, 0
+ spritePiece -$B, -$C, 1, 3, $13, 0, 0, 1, 0
+ spritePiece -5, -$C, 1, 3, $16, 0, 0, 0, 0
+ spritePiece 1, -$C, 1, 3, $19, 0, 0, 1, 0
+ spritePiece 4, -8, 1, 2, $1C, 0, 0, 0, 0
+Map_obj45_0358_End
+
+Map_obj45_0382: spriteHeader
+ spritePiece $C, -$10, 1, 4, $F, 0, 0, 1, 0
+ spritePiece -$A, -$C, 1, 3, $13, 0, 0, 1, 0
+ spritePiece -4, -$C, 1, 3, $16, 0, 0, 0, 0
+ spritePiece 0, -$C, 1, 3, $19, 0, 0, 1, 0
+ spritePiece 4, -8, 1, 2, $1C, 0, 0, 0, 0
+Map_obj45_0382_End
+
+Map_obj45_03AC: spriteHeader
+ spritePiece $C, -$10, 1, 4, $F, 0, 0, 1, 0
+ spritePiece -9, -$C, 1, 3, $13, 0, 0, 1, 0
+ spritePiece -3, -$C, 1, 3, $16, 0, 0, 0, 0
+ spritePiece 1, -$C, 1, 3, $19, 0, 0, 1, 0
+ spritePiece 4, -8, 1, 2, $1C, 0, 0, 0, 0
+Map_obj45_03AC_End
+
+Map_obj45_03D6: spriteHeader
+ spritePiece $C, -$10, 1, 4, $F, 0, 0, 1, 0
+ spritePiece -8, -$C, 1, 3, $13, 0, 0, 1, 0
+ spritePiece -4, -$C, 1, 3, $16, 0, 0, 0, 0
+ spritePiece 0, -$C, 1, 3, $19, 0, 0, 1, 0
+ spritePiece 4, -8, 1, 2, $1C, 0, 0, 0, 0
+Map_obj45_03D6_End
+
+Map_obj45_0400: spriteHeader
+ spritePiece $C, -$10, 1, 4, $F, 0, 0, 1, 0
+ spritePiece -7, -$C, 1, 3, $13, 0, 0, 1, 0
+ spritePiece -3, -$C, 1, 3, $16, 0, 0, 0, 0
+ spritePiece 1, -$C, 1, 3, $19, 0, 0, 1, 0
+ spritePiece 4, -8, 1, 2, $1C, 0, 0, 0, 0
+Map_obj45_0400_End
+
+Map_obj45_042A: spriteHeader
+ spritePiece $C, -$10, 1, 4, $F, 0, 0, 1, 0
+ spritePiece -6, -$C, 1, 3, $13, 0, 0, 1, 0
+ spritePiece -2, -$C, 1, 3, $16, 0, 0, 0, 0
+ spritePiece 2, -$C, 1, 3, $19, 0, 0, 1, 0
+ spritePiece 4, -8, 1, 2, $1C, 0, 0, 0, 0
+Map_obj45_042A_End
+
+Map_obj45_0454: spriteHeader
+ spritePiece $C, -$10, 1, 4, $F, 0, 0, 1, 0
+ spritePiece -5, -$C, 1, 3, $13, 0, 0, 1, 0
+ spritePiece -1, -$C, 1, 3, $16, 0, 0, 0, 0
+ spritePiece 3, -$C, 1, 3, $19, 0, 0, 1, 0
+ spritePiece 4, -8, 1, 2, $1C, 0, 0, 0, 0
+Map_obj45_0454_End
+
+Map_obj45_047E: spriteHeader
+ spritePiece $C, -$10, 1, 4, $F, 0, 0, 1, 0
+ spritePiece -4, -$C, 1, 3, $13, 0, 0, 1, 0
+ spritePiece 0, -$C, 1, 3, $16, 0, 0, 0, 0
+ spritePiece 2, -$C, 1, 3, $19, 0, 0, 1, 0
+ spritePiece 4, -8, 1, 2, $1C, 0, 0, 0, 0
+Map_obj45_047E_End
+
+Map_obj45_04A8: spriteHeader
+ spritePiece $C, -$10, 1, 4, $F, 0, 0, 1, 0
+ spritePiece -3, -$C, 1, 3, $13, 0, 0, 1, 0
+ spritePiece 1, -$C, 1, 3, $16, 0, 0, 0, 0
+ spritePiece 3, -$C, 1, 3, $19, 0, 0, 1, 0
+ spritePiece 4, -8, 1, 2, $1C, 0, 0, 0, 0
+Map_obj45_04A8_End
+
+Map_obj45_04D2: spriteHeader
+ spritePiece $C, -$10, 1, 4, $F, 0, 0, 1, 0
+ spritePiece -2, -$C, 1, 3, $13, 0, 0, 1, 0
+ spritePiece 0, -$C, 1, 3, $16, 0, 0, 0, 0
+ spritePiece 2, -$C, 1, 3, $19, 0, 0, 1, 0
+ spritePiece 4, -8, 1, 2, $1C, 0, 0, 0, 0
+Map_obj45_04D2_End
+
+ even
diff --git a/mappings/sprite/obj45.bin b/mappings/sprite/obj45.bin
deleted file mode 100644
index d9dc6490..00000000
Binary files a/mappings/sprite/obj45.bin and /dev/null differ
diff --git a/mappings/sprite/obj46.asm b/mappings/sprite/obj46.asm
new file mode 100644
index 00000000..6f990a17
--- /dev/null
+++ b/mappings/sprite/obj46.asm
@@ -0,0 +1,31 @@
+Map_obj46: mappingsTable
+ mappingsTableEntry.w Map_obj46_0008
+ mappingsTableEntry.w Map_obj46_002A
+ mappingsTableEntry.w Map_obj46_004C
+ mappingsTableEntry.w Map_obj46_005E
+
+Map_obj46_0008: spriteHeader
+ spritePiece -$10, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, 4, 1, 1, 0, 0
+ spritePiece 0, 0, 2, 2, 4, 0, 1, 0, 0
+Map_obj46_0008_End
+
+Map_obj46_002A: spriteHeader
+ spritePiece -$10, -$10, 2, 2, 8, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, 8, 1, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, 8, 0, 1, 0, 0
+ spritePiece 0, 0, 2, 2, 8, 1, 1, 0, 0
+Map_obj46_002A_End
+
+Map_obj46_004C: spriteHeader
+ spritePiece -$10, -$10, 4, 2, $C, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, $C, 1, 1, 0, 0
+Map_obj46_004C_End
+
+Map_obj46_005E: spriteHeader
+ spritePiece -$10, -$10, 4, 2, $C, 1, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, $C, 0, 1, 0, 0
+Map_obj46_005E_End
+
+ even
diff --git a/mappings/sprite/obj46.bin b/mappings/sprite/obj46.bin
deleted file mode 100644
index 47504396..00000000
Binary files a/mappings/sprite/obj46.bin and /dev/null differ
diff --git a/mappings/sprite/obj47.asm b/mappings/sprite/obj47.asm
new file mode 100644
index 00000000..443b60d9
--- /dev/null
+++ b/mappings/sprite/obj47.asm
@@ -0,0 +1,18 @@
+Map_obj47: mappingsTable
+ mappingsTableEntry.w Map_obj47_0006
+ mappingsTableEntry.w Map_obj47_0010
+ mappingsTableEntry.w Map_obj47_001A
+
+Map_obj47_0006: spriteHeader
+ spritePiece -$10, -$C, 4, 2, 0, 0, 0, 0, 0
+Map_obj47_0006_End
+
+Map_obj47_0010: spriteHeader
+ spritePiece -$10, -$C, 4, 2, 8, 0, 0, 0, 0
+Map_obj47_0010_End
+
+Map_obj47_001A: spriteHeader
+ spritePiece -$10, -8, 4, 2, 0, 0, 0, 0, 0
+Map_obj47_001A_End
+
+ even
diff --git a/mappings/sprite/obj47.bin b/mappings/sprite/obj47.bin
deleted file mode 100644
index af2a5839..00000000
Binary files a/mappings/sprite/obj47.bin and /dev/null differ
diff --git a/mappings/sprite/obj48.asm b/mappings/sprite/obj48.asm
new file mode 100644
index 00000000..55cdce52
--- /dev/null
+++ b/mappings/sprite/obj48.asm
@@ -0,0 +1,79 @@
+Map_obj48: mappingsTable
+ mappingsTableEntry.w Map_obj48_0010
+ mappingsTableEntry.w Map_obj48_0052
+ mappingsTableEntry.w Map_obj48_0084
+ mappingsTableEntry.w Map_obj48_00A6
+ mappingsTableEntry.w Map_obj48_00C8
+ mappingsTableEntry.w Map_obj48_00EA
+ mappingsTableEntry.w Map_obj48_010C
+ mappingsTableEntry.w Map_obj48_013E
+
+Map_obj48_0010: spriteHeader
+ spritePiece -$10, -$28, 2, 1, 0, 0, 0, 0, 0
+ spritePiece 0, -$28, 2, 1, 0, 1, 0, 0, 0
+ spritePiece -$10, -$20, 2, 1, 2, 0, 0, 0, 0
+ spritePiece 0, -$20, 2, 1, 2, 1, 0, 0, 0
+ spritePiece -$18, -$18, 3, 3, $11, 0, 0, 0, 0
+ spritePiece 0, -$18, 3, 3, $11, 1, 0, 0, 0
+ spritePiece -$18, 0, 3, 3, 8, 0, 1, 0, 0
+ spritePiece 0, 0, 3, 3, 8, 1, 1, 0, 0
+Map_obj48_0010_End
+
+Map_obj48_0052: spriteHeader
+ spritePiece -$10, -$20, 2, 1, 0, 0, 0, 0, 0
+ spritePiece 0, -$20, 2, 1, 0, 1, 0, 0, 0
+ spritePiece -$18, -$18, 3, 3, $11, 0, 0, 0, 0
+ spritePiece 0, -$18, 3, 3, $11, 1, 0, 0, 0
+ spritePiece -$18, 0, 3, 3, 8, 0, 1, 0, 0
+ spritePiece 0, 0, 3, 3, 8, 1, 1, 0, 0
+Map_obj48_0052_End
+
+Map_obj48_0084: spriteHeader
+ spritePiece -$18, -$18, 3, 3, $11, 0, 0, 0, 0
+ spritePiece 0, -$18, 3, 3, $11, 1, 0, 0, 0
+ spritePiece -$18, 0, 3, 3, 8, 0, 1, 0, 0
+ spritePiece 0, 0, 3, 3, 8, 1, 1, 0, 0
+Map_obj48_0084_End
+
+Map_obj48_00A6: spriteHeader
+ spritePiece -$18, -$18, 3, 3, $1A, 0, 0, 0, 0
+ spritePiece 0, -$18, 3, 3, $23, 1, 1, 0, 0
+ spritePiece -$18, 0, 3, 3, $23, 0, 0, 0, 0
+ spritePiece 0, 0, 3, 3, $1A, 1, 1, 0, 0
+Map_obj48_00A6_End
+
+Map_obj48_00C8: spriteHeader
+ spritePiece -$18, -$18, 3, 3, $23, 0, 1, 0, 0
+ spritePiece 0, -$18, 3, 3, $1A, 1, 0, 0, 0
+ spritePiece -$18, 0, 3, 3, $1A, 0, 1, 0, 0
+ spritePiece 0, 0, 3, 3, $23, 1, 0, 0, 0
+Map_obj48_00C8_End
+
+Map_obj48_00EA: spriteHeader
+ spritePiece -$18, -$18, 3, 3, 8, 0, 0, 0, 0
+ spritePiece 0, -$18, 3, 3, $2C, 0, 1, 0, 0
+ spritePiece -$18, 0, 3, 3, 8, 0, 1, 0, 0
+ spritePiece 0, 0, 3, 3, $2C, 0, 0, 0, 0
+Map_obj48_00EA_End
+
+Map_obj48_010C: spriteHeader
+ spritePiece -$18, -$18, 3, 3, 8, 0, 0, 0, 0
+ spritePiece 0, -$18, 3, 3, $2C, 0, 1, 0, 0
+ spritePiece -$18, 0, 3, 3, 8, 0, 1, 0, 0
+ spritePiece 0, 0, 3, 3, $2C, 0, 0, 0, 0
+ spritePiece $18, -$10, 1, 2, 6, 0, 0, 0, 0
+ spritePiece $18, 0, 1, 2, 6, 0, 1, 0, 0
+Map_obj48_010C_End
+
+Map_obj48_013E: spriteHeader
+ spritePiece -$18, -$18, 3, 3, 8, 0, 0, 0, 0
+ spritePiece 0, -$18, 3, 3, $2C, 0, 1, 0, 0
+ spritePiece -$18, 0, 3, 3, 8, 0, 1, 0, 0
+ spritePiece 0, 0, 3, 3, $2C, 0, 0, 0, 0
+ spritePiece $18, -$10, 1, 2, 4, 0, 0, 0, 0
+ spritePiece $18, 0, 1, 2, 4, 0, 1, 0, 0
+ spritePiece $20, -$10, 1, 2, 6, 0, 0, 0, 0
+ spritePiece $20, 0, 1, 2, 6, 0, 1, 0, 0
+Map_obj48_013E_End
+
+ even
diff --git a/mappings/sprite/obj48.bin b/mappings/sprite/obj48.bin
deleted file mode 100644
index 44a479e0..00000000
Binary files a/mappings/sprite/obj48.bin and /dev/null differ
diff --git a/mappings/sprite/obj49.asm b/mappings/sprite/obj49.asm
new file mode 100644
index 00000000..b5f5cf8f
--- /dev/null
+++ b/mappings/sprite/obj49.asm
@@ -0,0 +1,77 @@
+Map_obj49: mappingsTable
+ mappingsTableEntry.w Map_obj49_0010
+ mappingsTableEntry.w Map_obj49_0022
+ mappingsTableEntry.w Map_obj49_00B4
+ mappingsTableEntry.w Map_obj49_00B6
+ mappingsTableEntry.w Map_obj49_00B4
+ mappingsTableEntry.w Map_obj49_00D8
+ mappingsTableEntry.w Map_obj49_0010
+ mappingsTableEntry.w Map_obj49_012A
+
+Map_obj49_0010: spriteHeader
+ spritePiece -$20, -$80, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$80, 4, 2, 0, 0, 0, 0, 0
+Map_obj49_0010_End
+
+Map_obj49_0022: spriteHeader
+ spritePiece -$20, -$80, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$80, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, -$80, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, -$80, 4, 4, 8, 0, 0, 0, 0
+ spritePiece -$20, -$60, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, -$60, 4, 4, 8, 0, 0, 0, 0
+ spritePiece -$20, -$40, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, -$40, 4, 4, 8, 0, 0, 0, 0
+ spritePiece -$20, -$20, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, -$20, 4, 4, 8, 0, 0, 0, 0
+ spritePiece -$20, 0, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, 0, 4, 4, 8, 0, 0, 0, 0
+ spritePiece -$20, $20, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, $20, 4, 4, 8, 0, 0, 0, 0
+ spritePiece -$20, $40, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, $40, 4, 4, 8, 0, 0, 0, 0
+ spritePiece -$20, $60, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, $60, 4, 4, 8, 0, 0, 0, 0
+Map_obj49_0022_End
+
+Map_obj49_00B4: spriteHeader
+Map_obj49_00B4_End
+
+Map_obj49_00B6: spriteHeader
+ spritePiece -$20, -$20, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, -$20, 4, 4, 8, 0, 0, 0, 0
+ spritePiece -$20, 0, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, 0, 4, 4, 8, 0, 0, 0, 0
+Map_obj49_00B6_End
+
+Map_obj49_00D8: spriteHeader
+ spritePiece -$20, -$40, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, -$40, 4, 4, 8, 0, 0, 0, 0
+ spritePiece -$20, -$20, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, -$20, 4, 4, 8, 0, 0, 0, 0
+ spritePiece -$20, 0, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, 0, 4, 4, 8, 0, 0, 0, 0
+ spritePiece -$20, $20, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, $20, 4, 4, 8, 0, 0, 0, 0
+ spritePiece -$20, $40, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, $40, 4, 4, 8, 0, 0, 0, 0
+Map_obj49_00D8_End
+
+Map_obj49_012A: spriteHeader
+ spritePiece -$20, -$80, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$80, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, -$80, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, -$80, 4, 4, 8, 0, 0, 0, 0
+ spritePiece -$20, -$60, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, -$60, 4, 4, 8, 0, 0, 0, 0
+ spritePiece -$20, -$40, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, -$40, 4, 4, 8, 0, 0, 0, 0
+ spritePiece -$20, -$20, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, -$20, 4, 4, 8, 0, 0, 0, 0
+ spritePiece -$20, 0, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, 0, 4, 4, 8, 0, 0, 0, 0
+ spritePiece -$20, $20, 4, 4, 8, 0, 0, 0, 0
+ spritePiece 0, $20, 4, 4, 8, 0, 0, 0, 0
+Map_obj49_012A_End
+
+ even
diff --git a/mappings/sprite/obj49.bin b/mappings/sprite/obj49.bin
deleted file mode 100644
index 20719a9f..00000000
Binary files a/mappings/sprite/obj49.bin and /dev/null differ
diff --git a/mappings/sprite/obj4A.asm b/mappings/sprite/obj4A.asm
new file mode 100644
index 00000000..104ecf3b
--- /dev/null
+++ b/mappings/sprite/obj4A.asm
@@ -0,0 +1,50 @@
+Map_obj4A: mappingsTable
+ mappingsTableEntry.w Map_obj4A_000E
+ mappingsTableEntry.w Map_obj4A_0020
+ mappingsTableEntry.w Map_obj4A_003A
+ mappingsTableEntry.w Map_obj4A_0054
+ mappingsTableEntry.w Map_obj4A_006E
+ mappingsTableEntry.w Map_obj4A_0090
+ mappingsTableEntry.w Map_obj4A_009A
+
+Map_obj4A_000E: spriteHeader
+ spritePiece -$10, -$15, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -5, 4, 2, 8, 0, 0, 0, 0
+Map_obj4A_000E_End
+
+Map_obj4A_0020: spriteHeader
+ spritePiece -$10, -$10, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$18, 0, 3, 2, $10, 0, 0, 0, 0
+ spritePiece 0, 0, 3, 2, $16, 0, 0, 0, 0
+Map_obj4A_0020_End
+
+Map_obj4A_003A: spriteHeader
+ spritePiece -$10, -$10, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$18, 0, 3, 2, $1C, 0, 0, 0, 0
+ spritePiece 0, 0, 3, 2, $22, 0, 0, 0, 0
+Map_obj4A_003A_End
+
+Map_obj4A_0054: spriteHeader
+ spritePiece -$10, -$10, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$18, 0, 3, 2, $28, 0, 0, 0, 0
+ spritePiece 0, 0, 3, 2, $2E, 0, 0, 0, 0
+Map_obj4A_0054_End
+
+Map_obj4A_006E: spriteHeader
+ spritePiece -9, -$10, 1, 2, $34, 0, 0, 0, 0
+ spritePiece -$10, -$10, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$18, 0, 3, 2, $10, 0, 0, 0, 0
+ spritePiece 0, 0, 3, 2, $16, 0, 0, 0, 0
+Map_obj4A_006E_End
+
+Map_obj4A_0090: spriteHeader
+ spritePiece -$10, -$E, 1, 2, $36, 0, 0, 0, 0
+Map_obj4A_0090_End
+
+Map_obj4A_009A: spriteHeader
+ spritePiece -$10, -$E, 1, 2, $38, 0, 0, 0, 0
+Map_obj4A_009A_End
+
+ dc.w 0
+
+ even
diff --git a/mappings/sprite/obj4A.bin b/mappings/sprite/obj4A.bin
deleted file mode 100644
index 22a17bdf..00000000
Binary files a/mappings/sprite/obj4A.bin and /dev/null differ
diff --git a/mappings/sprite/obj4B.asm b/mappings/sprite/obj4B.asm
new file mode 100644
index 00000000..67f4fa81
--- /dev/null
+++ b/mappings/sprite/obj4B.asm
@@ -0,0 +1,45 @@
+Map_obj4B: mappingsTable
+ mappingsTableEntry.w Map_obj4B_000E
+ mappingsTableEntry.w Map_obj4B_0020
+ mappingsTableEntry.w Map_obj4B_003A
+ mappingsTableEntry.w Map_obj4B_0054
+ mappingsTableEntry.w Map_obj4B_005E
+ mappingsTableEntry.w Map_obj4B_0068
+ mappingsTableEntry.w Map_obj4B_0072
+
+Map_obj4B_000E: spriteHeader
+ spritePiece -$18, -8, 3, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -8, 3, 2, 6, 0, 0, 0, 0
+Map_obj4B_000E_End
+
+Map_obj4B_0020: spriteHeader
+ spritePiece -$18, -8, 3, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, $C, 0, 0, 0, 0
+ spritePiece 2, 8, 2, 2, $10, 0, 0, 0, 0
+Map_obj4B_0020_End
+
+Map_obj4B_003A: spriteHeader
+ spritePiece -$18, -8, 3, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, $C, 0, 0, 0, 0
+ spritePiece 2, 8, 2, 2, $14, 0, 0, 0, 0
+Map_obj4B_003A_End
+
+Map_obj4B_0054: spriteHeader
+ spritePiece 4, -$10, 1, 2, $14, 0, 0, 0, 0
+Map_obj4B_0054_End
+
+Map_obj4B_005E: spriteHeader
+ spritePiece 4, -$10, 1, 2, $16, 0, 0, 0, 0
+Map_obj4B_005E_End
+
+Map_obj4B_0068: spriteHeader
+ spritePiece -$C, -8, 1, 2, $18, 0, 0, 0, 0
+Map_obj4B_0068_End
+
+Map_obj4B_0072: spriteHeader
+ spritePiece -$C, -8, 1, 2, $1A, 0, 0, 0, 0
+Map_obj4B_0072_End
+
+ dc.w 0
+
+ even
diff --git a/mappings/sprite/obj4B.bin b/mappings/sprite/obj4B.bin
deleted file mode 100644
index 4e9031a8..00000000
Binary files a/mappings/sprite/obj4B.bin and /dev/null differ
diff --git a/mappings/sprite/obj50.asm b/mappings/sprite/obj50.asm
new file mode 100644
index 00000000..b2ef8594
--- /dev/null
+++ b/mappings/sprite/obj50.asm
@@ -0,0 +1,54 @@
+Map_obj50: mappingsTable
+ mappingsTableEntry.w Map_obj50_0012
+ mappingsTableEntry.w Map_obj50_002C
+ mappingsTableEntry.w Map_obj50_0036
+ mappingsTableEntry.w Map_obj50_0040
+ mappingsTableEntry.w Map_obj50_005A
+ mappingsTableEntry.w Map_obj50_0074
+ mappingsTableEntry.w Map_obj50_007E
+ mappingsTableEntry.w Map_obj50_0088
+ mappingsTableEntry.w Map_obj50_0092
+
+Map_obj50_0012: spriteHeader
+ spritePiece -$10, -$18, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -8, -8, 3, 2, 8, 0, 0, 0, 0
+ spritePiece -8, 8, 2, 2, $E, 0, 0, 0, 0
+Map_obj50_0012_End
+
+Map_obj50_002C: spriteHeader
+ spritePiece -8, -8, 2, 2, $22, 0, 0, 0, 0
+Map_obj50_002C_End
+
+Map_obj50_0036: spriteHeader
+ spritePiece -8, -8, 2, 2, $26, 0, 0, 0, 0
+Map_obj50_0036_End
+
+Map_obj50_0040: spriteHeader
+ spritePiece -$10, -$18, 4, 2, $12, 0, 0, 0, 0
+ spritePiece -8, -8, 3, 2, 8, 0, 0, 0, 0
+ spritePiece -8, 8, 2, 2, $E, 0, 0, 0, 0
+Map_obj50_0040_End
+
+Map_obj50_005A: spriteHeader
+ spritePiece -$10, -$18, 4, 2, $1A, 0, 0, 0, 0
+ spritePiece -8, -8, 3, 2, 8, 0, 0, 0, 0
+ spritePiece -8, 8, 2, 2, $E, 0, 0, 0, 0
+Map_obj50_005A_End
+
+Map_obj50_0074: spriteHeader
+ spritePiece -4, -8, 1, 2, $2A, 0, 0, 0, 0
+Map_obj50_0074_End
+
+Map_obj50_007E: spriteHeader
+ spritePiece -4, -8, 1, 2, $2C, 0, 0, 0, 0
+Map_obj50_007E_End
+
+Map_obj50_0088: spriteHeader
+ spritePiece -4, -8, 1, 2, $2E, 0, 0, 0, 0
+Map_obj50_0088_End
+
+Map_obj50_0092: spriteHeader
+ spritePiece -$10, -8, 4, 2, $30, 0, 0, 0, 0
+Map_obj50_0092_End
+
+ even
diff --git a/mappings/sprite/obj50.bin b/mappings/sprite/obj50.bin
deleted file mode 100644
index 02d3c8e6..00000000
Binary files a/mappings/sprite/obj50.bin and /dev/null differ
diff --git a/mappings/sprite/obj51.asm b/mappings/sprite/obj51.asm
new file mode 100644
index 00000000..4ebbc481
--- /dev/null
+++ b/mappings/sprite/obj51.asm
@@ -0,0 +1,118 @@
+Map_obj51: mappingsTable
+ mappingsTableEntry.w Map_obj51
+ mappingsTableEntry.w Map_obj51_002A
+ mappingsTableEntry.w Map_obj51_0054
+ mappingsTableEntry.w Map_obj51_005E
+ mappingsTableEntry.w Map_obj51_0068
+ mappingsTableEntry.w Map_obj51_0072
+ mappingsTableEntry.w Map_obj51_0084
+ mappingsTableEntry.w Map_obj51_0096
+ mappingsTableEntry.w Map_obj51_00A8
+ mappingsTableEntry.w Map_obj51_00BA
+ mappingsTableEntry.w Map_obj51_00CC
+ mappingsTableEntry.w Map_obj51_00DE
+ mappingsTableEntry.w Map_obj51_00F0
+ mappingsTableEntry.w Map_obj51_00FA
+ mappingsTableEntry.w Map_obj51_0104
+ mappingsTableEntry.w Map_obj51_010E
+ mappingsTableEntry.w Map_obj51_0120
+ mappingsTableEntry.w Map_obj51_0132
+ mappingsTableEntry.w Map_obj51_0144
+ mappingsTableEntry.w Map_obj51_014E
+ mappingsTableEntry.w Map_obj51_0158
+
+Map_obj51_002A: spriteHeader
+ spritePiece $10, -$10, 2, 2, $17D, 0, 0, 0, 0
+ spritePiece -7, -$28, 4, 3, $60, 0, 0, 1, 0
+ spritePiece -$28, 0, 4, 4, $6C, 0, 0, 1, 0
+ spritePiece -8, 0, 4, 4, $7C, 0, 0, 1, 0
+ spritePiece $18, 0, 2, 3, $8C, 0, 0, 1, 0
+Map_obj51_002A_End
+
+Map_obj51_0054: spriteHeader
+ spritePiece -$1C, $18, 2, 3, $AA, 0, 0, 1, 0
+Map_obj51_0054_End
+
+Map_obj51_005E: spriteHeader
+ spritePiece -$25, $10, 2, 3, $B0, 0, 0, 1, 0
+Map_obj51_005E_End
+
+Map_obj51_0068: spriteHeader
+ spritePiece 8, $10, 3, 4, $92, 0, 0, 1, 0
+Map_obj51_0068_End
+
+Map_obj51_0072: spriteHeader
+ spritePiece 8, $10, 3, 2, $9E, 0, 0, 1, 0
+ spritePiece $20, $10, 2, 3, $A4, 0, 0, 1, 0
+Map_obj51_0072_End
+
+Map_obj51_0084: spriteHeader
+ spritePiece -$10, -$10, 4, 2, $189, 0, 0, 0, 0
+ spritePiece -$20, -$10, 2, 2, $181, 0, 0, 0, 0
+Map_obj51_0084_End
+
+Map_obj51_0096: spriteHeader
+ spritePiece -$10, -$10, 4, 2, $191, 0, 0, 0, 0
+ spritePiece -$20, -$10, 2, 2, $181, 0, 0, 0, 0
+Map_obj51_0096_End
+
+Map_obj51_00A8: spriteHeader
+ spritePiece -$10, -$10, 4, 2, $199, 0, 0, 0, 0
+ spritePiece -$20, -$10, 2, 2, $185, 0, 0, 0, 0
+Map_obj51_00A8_End
+
+Map_obj51_00BA: spriteHeader
+ spritePiece -$10, -$10, 4, 2, $1A1, 0, 0, 0, 0
+ spritePiece -$20, -$10, 2, 2, $185, 0, 0, 0, 0
+Map_obj51_00BA_End
+
+Map_obj51_00CC: spriteHeader
+ spritePiece -$10, -$10, 4, 2, $1A9, 0, 0, 0, 0
+ spritePiece -$20, -$10, 2, 2, $185, 0, 0, 0, 0
+Map_obj51_00CC_End
+
+Map_obj51_00DE: spriteHeader
+ spritePiece -$10, -$10, 4, 2, $1B1, 0, 0, 0, 0
+ spritePiece -$20, -$10, 2, 2, $185, 0, 0, 0, 0
+Map_obj51_00DE_End
+
+Map_obj51_00F0: spriteHeader
+ spritePiece -$10, $28, 4, 1, $B6, 0, 0, 1, 0
+Map_obj51_00F0_End
+
+Map_obj51_00FA: spriteHeader
+ spritePiece -$10, $28, 4, 1, $BA, 0, 0, 1, 0
+Map_obj51_00FA_End
+
+Map_obj51_0104: spriteHeader
+ spritePiece -$10, $28, 4, 1, $BE, 0, 0, 1, 0
+Map_obj51_0104_End
+
+Map_obj51_010E: spriteHeader
+ spritePiece -$1C, $20, 4, 1, $C2, 0, 0, 1, 0
+ spritePiece 4, $20, 4, 1, $C6, 0, 0, 1, 0
+Map_obj51_010E_End
+
+Map_obj51_0120: spriteHeader
+ spritePiece -$1C, $20, 4, 1, $CA, 0, 0, 1, 0
+ spritePiece 4, $20, 4, 1, $CE, 0, 0, 1, 0
+Map_obj51_0120_End
+
+Map_obj51_0132: spriteHeader
+ spritePiece -$1C, $20, 4, 1, $D2, 0, 0, 1, 0
+ spritePiece 4, $20, 4, 1, $D6, 0, 0, 1, 0
+Map_obj51_0132_End
+
+Map_obj51_0144: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $DA, 0, 0, 0, 0
+Map_obj51_0144_End
+
+Map_obj51_014E: spriteHeader
+ spritePiece -4, -4, 1, 1, $E3, 0, 0, 0, 0
+Map_obj51_014E_End
+
+Map_obj51_0158: spriteHeader
+ spritePiece -4, -4, 1, 1, $E4, 0, 0, 0, 0
+Map_obj51_0158_End
+
+ even
diff --git a/mappings/sprite/obj51.bin b/mappings/sprite/obj51.bin
deleted file mode 100644
index 32c85c12..00000000
Binary files a/mappings/sprite/obj51.bin and /dev/null differ
diff --git a/mappings/sprite/obj52_a.asm b/mappings/sprite/obj52_a.asm
new file mode 100644
index 00000000..d2bfcb68
--- /dev/null
+++ b/mappings/sprite/obj52_a.asm
@@ -0,0 +1,23 @@
+Map_obj52_a: mappingsTable
+ mappingsTableEntry.w Map_obj52_a_0008
+ mappingsTableEntry.w Map_obj52_a_0012
+ mappingsTableEntry.w Map_obj52_a_001C
+ mappingsTableEntry.w Map_obj52_a_0026
+
+Map_obj52_a_0008: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 1, 0
+Map_obj52_a_0008_End
+
+Map_obj52_a_0012: spriteHeader
+ spritePiece -8, -8, 2, 2, 4, 0, 0, 1, 0
+Map_obj52_a_0012_End
+
+Map_obj52_a_001C: spriteHeader
+ spritePiece -8, -8, 2, 2, 8, 0, 0, 1, 0
+Map_obj52_a_001C_End
+
+Map_obj52_a_0026: spriteHeader
+ spritePiece -8, -8, 2, 2, $C, 0, 0, 1, 0
+Map_obj52_a_0026_End
+
+ even
diff --git a/mappings/sprite/obj52_a.bin b/mappings/sprite/obj52_a.bin
deleted file mode 100644
index 81f7ea5d..00000000
Binary files a/mappings/sprite/obj52_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj52_b.asm b/mappings/sprite/obj52_b.asm
new file mode 100644
index 00000000..9086b91d
--- /dev/null
+++ b/mappings/sprite/obj52_b.asm
@@ -0,0 +1,108 @@
+Map_obj52_b: mappingsTable
+ mappingsTableEntry.w Map_obj52_b
+ mappingsTableEntry.w Map_obj52_b_0022
+ mappingsTableEntry.w Map_obj52_b_0064
+ mappingsTableEntry.w Map_obj52_b_006E
+ mappingsTableEntry.w Map_obj52_b_0078
+ mappingsTableEntry.w Map_obj52_b_0082
+ mappingsTableEntry.w Map_obj52_b_0094
+ mappingsTableEntry.w Map_obj52_b_00A6
+ mappingsTableEntry.w Map_obj52_b_00C0
+ mappingsTableEntry.w Map_obj52_b_00DA
+ mappingsTableEntry.w Map_obj52_b_00F4
+ mappingsTableEntry.w Map_obj52_b_0106
+ mappingsTableEntry.w Map_obj52_b_0110
+ mappingsTableEntry.w Map_obj52_b_011A
+ mappingsTableEntry.w Map_obj52_b_0124
+ mappingsTableEntry.w Map_obj52_b_012E
+ mappingsTableEntry.w Map_obj52_b_0138
+
+Map_obj52_b_0022: spriteHeader
+ spritePiece -$20, 4, 2, 2, 0, 0, 0, 1, 0
+ spritePiece -$20, $14, 2, 2, 4, 0, 0, 1, 0
+ spritePiece -$10, 4, 4, 4, 8, 0, 0, 1, 0
+ spritePiece $10, 4, 2, 4, $18, 0, 0, 1, 0
+ spritePiece -$20, -$C, 4, 2, $60, 0, 0, 0, 0
+ spritePiece 0, -$C, 4, 2, $68, 0, 0, 0, 0
+ spritePiece -$18, -$24, 3, 3, $70, 0, 0, 1, 0
+ spritePiece 0, -$24, 2, 3, $79, 0, 0, 1, 0
+Map_obj52_b_0022_End
+
+Map_obj52_b_0064: spriteHeader
+ spritePiece -$28, -$21, 2, 1, $83, 0, 0, 0, 0
+Map_obj52_b_0064_End
+
+Map_obj52_b_006E: spriteHeader
+ spritePiece -$28, -$21, 2, 1, $85, 0, 0, 0, 0
+Map_obj52_b_006E_End
+
+Map_obj52_b_0078: spriteHeader
+ spritePiece -$30, -$21, 3, 1, $87, 0, 0, 0, 0
+Map_obj52_b_0078_End
+
+Map_obj52_b_0082: spriteHeader
+ spritePiece -$40, -$21, 4, 1, $8A, 0, 0, 0, 0
+ spritePiece -$20, -$21, 1, 1, $8E, 0, 0, 0, 0
+Map_obj52_b_0082_End
+
+Map_obj52_b_0094: spriteHeader
+ spritePiece -$50, -$21, 4, 1, $8F, 0, 0, 0, 0
+ spritePiece -$30, -$21, 3, 1, $93, 0, 0, 0, 0
+Map_obj52_b_0094_End
+
+Map_obj52_b_00A6: spriteHeader
+ spritePiece -$60, -$21, 4, 1, $96, 0, 0, 0, 0
+ spritePiece -$40, -$21, 4, 1, $9A, 0, 0, 0, 0
+ spritePiece -$20, -$21, 1, 1, $9E, 0, 0, 0, 0
+Map_obj52_b_00A6_End
+
+Map_obj52_b_00C0: spriteHeader
+ spritePiece -$70, -$21, 4, 1, $9F, 0, 0, 0, 0
+ spritePiece -$50, -$21, 4, 1, $A3, 0, 0, 0, 0
+ spritePiece -$30, -$21, 3, 1, $A7, 0, 0, 0, 0
+Map_obj52_b_00C0_End
+
+Map_obj52_b_00DA: spriteHeader
+ spritePiece -$78, -$21, 4, 1, $AA, 0, 0, 0, 0
+ spritePiece -$58, -$21, 4, 1, $AE, 0, 0, 0, 0
+ spritePiece -$38, -$21, 3, 1, $B2, 0, 0, 0, 0
+Map_obj52_b_00DA_End
+
+Map_obj52_b_00F4: spriteHeader
+ spritePiece -$78, -$21, 4, 1, $B5, 0, 0, 0, 0
+ spritePiece -$58, -$21, 4, 1, $B9, 0, 0, 0, 0
+Map_obj52_b_00F4_End
+
+Map_obj52_b_0106: spriteHeader
+ spritePiece -$78, -$21, 4, 1, $BD, 0, 0, 0, 0
+Map_obj52_b_0106_End
+
+Map_obj52_b_0110: spriteHeader
+ spritePiece -4, -4, 1, 1, $61, 0, 0, 0, 0
+Map_obj52_b_0110_End
+
+Map_obj52_b_011A: spriteHeader
+ spritePiece -4, -4, 1, 1, $62, 0, 0, 0, 0
+Map_obj52_b_011A_End
+
+Map_obj52_b_0124: spriteHeader
+ spritePiece -8, -8, 2, 2, $63, 0, 0, 0, 0
+Map_obj52_b_0124_End
+
+Map_obj52_b_012E: spriteHeader
+ spritePiece -8, -8, 2, 2, $67, 0, 0, 0, 0
+Map_obj52_b_012E_End
+
+Map_obj52_b_0138: spriteHeader
+ spritePiece -$20, 4, 2, 2, 0, 0, 0, 1, 0
+ spritePiece -$20, $14, 2, 2, 4, 0, 0, 1, 0
+ spritePiece -$10, 4, 4, 4, 8, 0, 0, 1, 0
+ spritePiece $10, 4, 2, 4, $18, 0, 0, 1, 0
+ spritePiece -$20, -$C, 4, 2, $60, 0, 0, 0, 0
+ spritePiece 0, -$C, 4, 2, $68, 0, 0, 0, 0
+ spritePiece -$10, -$14, 4, 1, $7F, 0, 0, 1, 0
+Map_obj52_b_0138_End
+
+ dc.w 0
+
+ even
diff --git a/mappings/sprite/obj52_b.bin b/mappings/sprite/obj52_b.bin
deleted file mode 100644
index ea664758..00000000
Binary files a/mappings/sprite/obj52_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj54.asm b/mappings/sprite/obj54.asm
new file mode 100644
index 00000000..bc804e3d
--- /dev/null
+++ b/mappings/sprite/obj54.asm
@@ -0,0 +1,127 @@
+Map_obj54: mappingsTable
+ mappingsTableEntry.w Map_obj54_002A
+ mappingsTableEntry.w Map_obj54_0034
+ mappingsTableEntry.w Map_obj54_003E
+ mappingsTableEntry.w Map_obj54_0068
+ mappingsTableEntry.w Map_obj54_0072
+ mappingsTableEntry.w Map_obj54_007C
+ mappingsTableEntry.w Map_obj54_0086
+ mappingsTableEntry.w Map_obj54_0090
+ mappingsTableEntry.w Map_obj54_009A
+ mappingsTableEntry.w Map_obj54_00A4
+ mappingsTableEntry.w Map_obj54_00AE
+ mappingsTableEntry.w Map_obj54_00B8
+ mappingsTableEntry.w Map_obj54_00DA
+ mappingsTableEntry.w Map_obj54_00EC
+ mappingsTableEntry.w Map_obj54_00FE
+ mappingsTableEntry.w Map_obj54_0110
+ mappingsTableEntry.w Map_obj54_0122
+ mappingsTableEntry.w Map_obj54_0134
+ mappingsTableEntry.w Map_obj54_0146
+ mappingsTableEntry.w Map_obj54_0158
+ mappingsTableEntry.w Map_obj54_0162
+
+Map_obj54_002A: spriteHeader
+ spritePiece $1C, 0, 2, 2, $1E4, 0, 0, 0, 0
+Map_obj54_002A_End
+
+Map_obj54_0034: spriteHeader
+ spritePiece $1C, 0, 2, 2, $1E8, 0, 0, 0, 0
+Map_obj54_0034_End
+
+Map_obj54_003E: spriteHeader
+ spritePiece 2, -$28, 2, 2, $1A4, 0, 0, 0, 0
+ spritePiece $10, -$18, 2, 2, $1A8, 0, 0, 0, 0
+ spritePiece -$10, -8, 4, 4, $18C, 0, 0, 1, 0
+ spritePiece $10, -8, 2, 4, $19C, 0, 0, 1, 0
+ spritePiece -$18, -8, 1, 3, 3, 0, 0, 1, 0
+Map_obj54_003E_End
+
+Map_obj54_0068: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $E, 0, 0, 1, 0
+Map_obj54_0068_End
+
+Map_obj54_0072: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $6F, 0, 0, 1, 0
+Map_obj54_0072_End
+
+Map_obj54_007C: spriteHeader
+ spritePiece -8, -8, 2, 2, $78, 0, 0, 1, 0
+Map_obj54_007C_End
+
+Map_obj54_0086: spriteHeader
+ spritePiece -8, -$C, 2, 3, $17, 0, 0, 1, 0
+Map_obj54_0086_End
+
+Map_obj54_0090: spriteHeader
+ spritePiece -$C, -8, 3, 2, $1D, 0, 0, 1, 0
+Map_obj54_0090_End
+
+Map_obj54_009A: spriteHeader
+ spritePiece -8, -$C, 2, 3, $23, 0, 0, 1, 0
+Map_obj54_009A_End
+
+Map_obj54_00A4: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $29, 0, 0, 0, 0
+Map_obj54_00A4_End
+
+Map_obj54_00AE: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $32, 0, 0, 0, 0
+Map_obj54_00AE_End
+
+Map_obj54_00B8: spriteHeader
+ spritePiece -$18, -$18, 3, 3, $42, 0, 0, 0, 0
+ spritePiece 0, -$18, 3, 3, $4B, 0, 0, 0, 0
+ spritePiece -$18, 0, 3, 3, $54, 0, 0, 0, 0
+ spritePiece 0, 0, 3, 3, $5D, 0, 0, 0, 0
+Map_obj54_00B8_End
+
+Map_obj54_00DA: spriteHeader
+ spritePiece -$10, -$18, 4, 2, $1B4, 0, 0, 0, 0
+ spritePiece -$20, -$18, 2, 2, $1AC, 0, 0, 0, 0
+Map_obj54_00DA_End
+
+Map_obj54_00EC: spriteHeader
+ spritePiece -$10, -$18, 4, 2, $1BC, 0, 0, 0, 0
+ spritePiece -$20, -$18, 2, 2, $1AC, 0, 0, 0, 0
+Map_obj54_00EC_End
+
+Map_obj54_00FE: spriteHeader
+ spritePiece -$10, -$18, 4, 2, $1C4, 0, 0, 0, 0
+ spritePiece -$20, -$18, 2, 2, $1B0, 0, 0, 0, 0
+Map_obj54_00FE_End
+
+Map_obj54_0110: spriteHeader
+ spritePiece -$10, -$18, 4, 2, $1CC, 0, 0, 0, 0
+ spritePiece -$20, -$18, 2, 2, $1B0, 0, 0, 0, 0
+Map_obj54_0110_End
+
+Map_obj54_0122: spriteHeader
+ spritePiece -$10, -$18, 4, 2, $1D4, 0, 0, 0, 0
+ spritePiece -$20, -$18, 2, 2, $1B0, 0, 0, 0, 0
+Map_obj54_0122_End
+
+Map_obj54_0134: spriteHeader
+ spritePiece -$10, -$18, 4, 2, $1DC, 0, 0, 0, 0
+ spritePiece -$20, -$18, 2, 2, $1B0, 0, 0, 0, 0
+Map_obj54_0134_End
+
+Map_obj54_0146: spriteHeader
+ spritePiece -$20, -8, 4, 2, 6, 0, 0, 1, 0
+ spritePiece 0, -8, 4, 2, 6, 1, 0, 1, 0
+Map_obj54_0146_End
+
+Map_obj54_0158: spriteHeader
+ spritePiece -$20, -8, 1, 3, 0, 0, 0, 1, 0
+Map_obj54_0158_End
+
+Map_obj54_0162: spriteHeader
+ spritePiece -$18, -$18, 3, 3, $66, 0, 0, 0, 0
+ spritePiece 0, -$18, 3, 3, $66, 1, 0, 0, 0
+ spritePiece -$18, 0, 3, 3, $66, 0, 1, 0, 0
+ spritePiece 0, 0, 3, 3, $66, 1, 1, 0, 0
+Map_obj54_0162_End
+
+ dc.w 0
+
+ even
diff --git a/mappings/sprite/obj54.bin b/mappings/sprite/obj54.bin
deleted file mode 100644
index ec3bfcc1..00000000
Binary files a/mappings/sprite/obj54.bin and /dev/null differ
diff --git a/mappings/sprite/obj55.asm b/mappings/sprite/obj55.asm
new file mode 100644
index 00000000..65fbc273
--- /dev/null
+++ b/mappings/sprite/obj55.asm
@@ -0,0 +1,107 @@
+Map_obj55: mappingsTable
+ mappingsTableEntry.w Map_obj55
+ mappingsTableEntry.w Map_obj55_002C
+ mappingsTableEntry.w Map_obj55_0066
+ mappingsTableEntry.w Map_obj55_0078
+ mappingsTableEntry.w Map_obj55_0092
+ mappingsTableEntry.w Map_obj55_00BE
+ mappingsTableEntry.w Map_obj55_00D0
+ mappingsTableEntry.w Map_obj55_00E2
+ mappingsTableEntry.w Map_obj55_00EC
+ mappingsTableEntry.w Map_obj55_00F6
+ mappingsTableEntry.w Map_obj55_0100
+ mappingsTableEntry.w Map_obj55_010A
+ mappingsTableEntry.w Map_obj55_0114
+ mappingsTableEntry.w Map_obj55_011E
+ mappingsTableEntry.w Map_obj55_0128
+ mappingsTableEntry.w Map_obj55_0132
+ mappingsTableEntry.w Map_obj55_013C
+ mappingsTableEntry.w Map_obj55_011E
+ mappingsTableEntry.w Map_obj55_0128
+ mappingsTableEntry.w Map_obj55_0132
+ mappingsTableEntry.w Map_obj55_013C
+ mappingsTableEntry.w Map_obj55_00AC
+
+Map_obj55_002C: spriteHeader
+ spritePiece 0, -$20, 4, 2, 1, 0, 0, 1, 0
+ spritePiece -8, -$18, 1, 1, 0, 0, 0, 1, 0
+ spritePiece -$18, -$10, 4, 2, 9, 0, 0, 1, 0
+ spritePiece 8, -$10, 4, 2, $11, 0, 0, 1, 0
+ spritePiece -$30, 0, 4, 4, $19, 0, 0, 1, 0
+ spritePiece -$10, 0, 4, 4, $29, 0, 0, 1, 0
+ spritePiece $10, 0, 4, 4, $39, 0, 0, 1, 0
+Map_obj55_002C_End
+
+Map_obj55_0066: spriteHeader
+ spritePiece -$22, -8, 4, 2, $49, 0, 0, 1, 0
+ spritePiece -8, -8, 2, 2, $79, 0, 0, 1, 0
+Map_obj55_0066_End
+
+Map_obj55_0078: spriteHeader
+ spritePiece -$1E, -$1E, 3, 2, $51, 0, 0, 1, 0
+ spritePiece -$16, -$E, 3, 2, $57, 0, 0, 1, 0
+ spritePiece -8, -8, 2, 2, $79, 0, 0, 1, 0
+Map_obj55_0078_End
+
+Map_obj55_0092: spriteHeader
+ spritePiece -$1E, 6, 2, 3, $63, 0, 0, 1, 0
+ spritePiece -$E, -2, 2, 3, $5D, 0, 0, 1, 0
+ spritePiece -8, -8, 2, 2, $79, 0, 0, 1, 0
+Map_obj55_0092_End
+
+Map_obj55_00AC: spriteHeader
+ spritePiece -8, -$22, 2, 4, $AD, 0, 0, 1, 0
+ spritePiece -8, -8, 2, 2, $79, 0, 0, 1, 0
+Map_obj55_00AC_End
+
+Map_obj55_00BE: spriteHeader
+ spritePiece -$20, -8, 4, 2, $69, 0, 0, 1, 0
+ spritePiece -8, -8, 2, 2, $79, 0, 0, 1, 0
+Map_obj55_00BE_End
+
+Map_obj55_00D0: spriteHeader
+ spritePiece -$20, -8, 4, 2, $71, 0, 0, 1, 0
+ spritePiece -8, -8, 2, 2, $79, 0, 0, 1, 0
+Map_obj55_00D0_End
+
+Map_obj55_00E2: spriteHeader
+ spritePiece -8, -8, 2, 2, $79, 0, 0, 1, 0
+Map_obj55_00E2_End
+
+Map_obj55_00EC: spriteHeader
+ spritePiece -$C, -$10, 3, 2, $7D, 0, 0, 0, 0
+Map_obj55_00EC_End
+
+Map_obj55_00F6: spriteHeader
+ spritePiece -$C, -$10, 3, 2, $83, 0, 0, 0, 0
+Map_obj55_00F6_End
+
+Map_obj55_0100: spriteHeader
+ spritePiece -$C, -$10, 3, 2, $89, 0, 0, 0, 0
+Map_obj55_0100_End
+
+Map_obj55_010A: spriteHeader
+ spritePiece -$C, -$10, 3, 2, $8F, 0, 0, 0, 0
+Map_obj55_010A_End
+
+Map_obj55_0114: spriteHeader
+ spritePiece -$10, -4, 4, 1, $A9, 0, 0, 1, 0
+Map_obj55_0114_End
+
+Map_obj55_011E: spriteHeader
+ spritePiece -8, 8, 2, 1, $95, 0, 0, 1, 0
+Map_obj55_011E_End
+
+Map_obj55_0128: spriteHeader
+ spritePiece -8, 0, 2, 2, $97, 0, 0, 1, 0
+Map_obj55_0128_End
+
+Map_obj55_0132: spriteHeader
+ spritePiece -8, -8, 2, 3, $9B, 0, 0, 1, 0
+Map_obj55_0132_End
+
+Map_obj55_013C: spriteHeader
+ spritePiece -8, -$10, 2, 4, $A1, 0, 0, 1, 0
+Map_obj55_013C_End
+
+ even
diff --git a/mappings/sprite/obj55.bin b/mappings/sprite/obj55.bin
deleted file mode 100644
index d8b10abc..00000000
Binary files a/mappings/sprite/obj55.bin and /dev/null differ
diff --git a/mappings/sprite/obj56_a.asm b/mappings/sprite/obj56_a.asm
new file mode 100644
index 00000000..d5ef56fd
--- /dev/null
+++ b/mappings/sprite/obj56_a.asm
@@ -0,0 +1,54 @@
+Map_obj56_a: mappingsTable
+ mappingsTableEntry.w Map_obj56_a_000E
+ mappingsTableEntry.w Map_obj56_a_0018
+ mappingsTableEntry.w Map_obj56_a_0042
+ mappingsTableEntry.w Map_obj56_a_006C
+ mappingsTableEntry.w Map_obj56_a_0086
+ mappingsTableEntry.w Map_obj56_a_00A0
+ mappingsTableEntry.w Map_obj56_a_00BA
+
+Map_obj56_a_000E: spriteHeader
+ spritePiece 2, -$28, 2, 2, 0, 0, 0, 0, 0
+Map_obj56_a_000E_End
+
+Map_obj56_a_0018: spriteHeader
+ spritePiece 2, -$28, 2, 2, 4, 0, 0, 0, 0
+ spritePiece $12, -$28, 4, 2, $C, 0, 0, 0, 0
+ spritePiece $32, -$28, 4, 2, $C, 0, 0, 0, 0
+ spritePiece -$1E, -$28, 4, 2, $C, 0, 0, 0, 0
+ spritePiece -$3E, -$28, 4, 2, $C, 0, 0, 0, 0
+Map_obj56_a_0018_End
+
+Map_obj56_a_0042: spriteHeader
+ spritePiece 2, -$28, 2, 2, 4, 0, 0, 0, 0
+ spritePiece $12, -$28, 4, 2, $C, 0, 0, 0, 0
+ spritePiece $32, -$28, 2, 2, 8, 0, 0, 0, 0
+ spritePiece -$1E, -$28, 4, 2, $C, 0, 0, 0, 0
+ spritePiece -$2E, -$28, 2, 2, 8, 0, 0, 0, 0
+Map_obj56_a_0042_End
+
+Map_obj56_a_006C: spriteHeader
+ spritePiece 2, -$28, 2, 2, 4, 0, 0, 0, 0
+ spritePiece $12, -$28, 4, 2, $C, 0, 0, 0, 0
+ spritePiece -$1E, -$28, 4, 2, $C, 0, 0, 0, 0
+Map_obj56_a_006C_End
+
+Map_obj56_a_0086: spriteHeader
+ spritePiece 2, -$28, 2, 2, 4, 0, 0, 0, 0
+ spritePiece $12, -$28, 2, 2, 8, 0, 0, 0, 0
+ spritePiece -$E, -$28, 2, 2, 8, 0, 0, 0, 0
+Map_obj56_a_0086_End
+
+Map_obj56_a_00A0: spriteHeader
+ spritePiece 2, -$28, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $12, -$28, 4, 2, $C, 0, 0, 0, 0
+ spritePiece $32, -$28, 4, 2, $C, 0, 0, 0, 0
+Map_obj56_a_00A0_End
+
+Map_obj56_a_00BA: spriteHeader
+ spritePiece 2, -$28, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$1E, -$28, 4, 2, $C, 0, 0, 0, 0
+ spritePiece -$3E, -$28, 4, 2, $C, 0, 0, 0, 0
+Map_obj56_a_00BA_End
+
+ even
diff --git a/mappings/sprite/obj56_a.bin b/mappings/sprite/obj56_a.bin
deleted file mode 100644
index 9f4fc3b4..00000000
Binary files a/mappings/sprite/obj56_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj56_b.asm b/mappings/sprite/obj56_b.asm
new file mode 100644
index 00000000..89c46003
--- /dev/null
+++ b/mappings/sprite/obj56_b.asm
@@ -0,0 +1,45 @@
+Map_obj56_b: mappingsTable
+ mappingsTableEntry.w Map_obj56_b_0010
+ mappingsTableEntry.w Map_obj56_b_002A
+ mappingsTableEntry.w Map_obj56_b_0034
+ mappingsTableEntry.w Map_obj56_b_003E
+ mappingsTableEntry.w Map_obj56_b_0048
+ mappingsTableEntry.w Map_obj56_b_0052
+ mappingsTableEntry.w Map_obj56_b_005C
+ mappingsTableEntry.w Map_obj56_b_0066
+
+Map_obj56_b_0010: spriteHeader
+ spritePiece -$30, -$10, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$10, 4, 4, $10, 0, 0, 0, 0
+ spritePiece $10, -$10, 4, 4, $20, 0, 0, 0, 0
+Map_obj56_b_0010_End
+
+Map_obj56_b_002A: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $30, 0, 0, 0, 0
+Map_obj56_b_002A_End
+
+Map_obj56_b_0034: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $40, 0, 0, 0, 0
+Map_obj56_b_0034_End
+
+Map_obj56_b_003E: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $50, 0, 0, 0, 0
+Map_obj56_b_003E_End
+
+Map_obj56_b_0048: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $60, 0, 0, 0, 0
+Map_obj56_b_0048_End
+
+Map_obj56_b_0052: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $60, 0, 1, 0, 0
+Map_obj56_b_0052_End
+
+Map_obj56_b_005C: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $70, 0, 0, 0, 0
+Map_obj56_b_005C_End
+
+Map_obj56_b_0066: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $70, 0, 1, 0, 0
+Map_obj56_b_0066_End
+
+ even
diff --git a/mappings/sprite/obj56_b.bin b/mappings/sprite/obj56_b.bin
deleted file mode 100644
index d13ee973..00000000
Binary files a/mappings/sprite/obj56_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj56_c.asm b/mappings/sprite/obj56_c.asm
new file mode 100644
index 00000000..1610e57e
--- /dev/null
+++ b/mappings/sprite/obj56_c.asm
@@ -0,0 +1,59 @@
+Map_obj56_c: mappingsTable
+ mappingsTableEntry.w Map_obj56_c_000E
+ mappingsTableEntry.w Map_obj56_c_0030
+ mappingsTableEntry.w Map_obj56_c_0052
+ mappingsTableEntry.w Map_obj56_c_0074
+ mappingsTableEntry.w Map_obj56_c_0096
+ mappingsTableEntry.w Map_obj56_c_00B8
+ mappingsTableEntry.w Map_obj56_c_00DA
+
+Map_obj56_c_000E: spriteHeader
+ spritePiece -$20, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, 8, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$10, -8, 4, 4, 8, 0, 0, 0, 0
+ spritePiece $10, -8, 2, 4, $18, 0, 0, 0, 0
+Map_obj56_c_000E_End
+
+Map_obj56_c_0030: spriteHeader
+ spritePiece -$20, -$18, 2, 2, $28, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 2, $30, 0, 0, 0, 0
+ spritePiece $10, -$18, 2, 2, $24, 0, 0, 0, 0
+ spritePiece 2, -$28, 2, 2, $20, 0, 0, 0, 0
+Map_obj56_c_0030_End
+
+Map_obj56_c_0052: spriteHeader
+ spritePiece -$20, -$18, 2, 2, $28, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 2, $38, 0, 0, 0, 0
+ spritePiece $10, -$18, 2, 2, $24, 0, 0, 0, 0
+ spritePiece 2, -$28, 2, 2, $20, 0, 0, 0, 0
+Map_obj56_c_0052_End
+
+Map_obj56_c_0074: spriteHeader
+ spritePiece -$20, -$18, 2, 2, $28, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 2, $40, 0, 0, 0, 0
+ spritePiece $10, -$18, 2, 2, $24, 0, 0, 0, 0
+ spritePiece 2, -$28, 2, 2, $20, 0, 0, 0, 0
+Map_obj56_c_0074_End
+
+Map_obj56_c_0096: spriteHeader
+ spritePiece -$20, -$18, 2, 2, $28, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 2, $48, 0, 0, 0, 0
+ spritePiece $10, -$18, 2, 2, $24, 0, 0, 0, 0
+ spritePiece 2, -$28, 2, 2, $20, 0, 0, 0, 0
+Map_obj56_c_0096_End
+
+Map_obj56_c_00B8: spriteHeader
+ spritePiece -$20, -$18, 2, 2, $28, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 2, $50, 0, 0, 0, 0
+ spritePiece $10, -$18, 2, 2, $24, 0, 0, 0, 0
+ spritePiece 2, -$28, 2, 2, $20, 0, 0, 0, 0
+Map_obj56_c_00B8_End
+
+Map_obj56_c_00DA: spriteHeader
+ spritePiece -$20, -$18, 2, 2, $28, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 2, $58, 0, 0, 0, 0
+ spritePiece $10, -$18, 2, 2, $24, 0, 0, 0, 0
+ spritePiece 2, -$28, 2, 2, $20, 0, 0, 0, 0
+Map_obj56_c_00DA_End
+
+ even
diff --git a/mappings/sprite/obj56_c.bin b/mappings/sprite/obj56_c.bin
deleted file mode 100644
index 766200fd..00000000
Binary files a/mappings/sprite/obj56_c.bin and /dev/null differ
diff --git a/mappings/sprite/obj57.asm b/mappings/sprite/obj57.asm
new file mode 100644
index 00000000..55efd155
--- /dev/null
+++ b/mappings/sprite/obj57.asm
@@ -0,0 +1,134 @@
+Map_obj57: mappingsTable
+ mappingsTableEntry.w Map_obj57_002A
+ mappingsTableEntry.w Map_obj57_0054
+ mappingsTableEntry.w Map_obj57_007E
+ mappingsTableEntry.w Map_obj57_0090
+ mappingsTableEntry.w Map_obj57_00A2
+ mappingsTableEntry.w Map_obj57_00B4
+ mappingsTableEntry.w Map_obj57_00C6
+ mappingsTableEntry.w Map_obj57_00D8
+ mappingsTableEntry.w Map_obj57_00E2
+ mappingsTableEntry.w Map_obj57_010C
+ mappingsTableEntry.w Map_obj57_011E
+ mappingsTableEntry.w Map_obj57_0130
+ mappingsTableEntry.w Map_obj57_0142
+ mappingsTableEntry.w Map_obj57_014C
+ mappingsTableEntry.w Map_obj57_0156
+ mappingsTableEntry.w Map_obj57_0168
+ mappingsTableEntry.w Map_obj57_017A
+ mappingsTableEntry.w Map_obj57_018C
+ mappingsTableEntry.w Map_obj57_019E
+ mappingsTableEntry.w Map_obj57_01B0
+ mappingsTableEntry.w Map_obj57_01C2
+
+Map_obj57_002A: spriteHeader
+ spritePiece -$10, -8, 4, 4, $148, 0, 0, 1, 0
+ spritePiece $10, -8, 2, 4, $158, 0, 0, 1, 0
+ spritePiece $10, -$18, 2, 2, $164, 0, 0, 0, 0
+ spritePiece -$28, -8, 3, 3, 9, 0, 0, 1, 0
+ spritePiece -8, -$28, 3, 2, $21, 0, 0, 0, 0
+Map_obj57_002A_End
+
+Map_obj57_0054: spriteHeader
+ spritePiece -$10, -8, 4, 4, $148, 0, 0, 1, 0
+ spritePiece $10, -8, 2, 4, $158, 0, 0, 1, 0
+ spritePiece $10, -$18, 2, 2, $164, 0, 0, 0, 0
+ spritePiece -$28, -8, 3, 3, 0, 0, 0, 1, 0
+ spritePiece -8, -$28, 3, 2, $21, 0, 0, 0, 0
+Map_obj57_0054_End
+
+Map_obj57_007E: spriteHeader
+ spritePiece $C, -$30, 2, 4, $27, 0, 0, 1, 0
+ spritePiece 8, -$10, 3, 4, $3F, 0, 0, 1, 0
+Map_obj57_007E_End
+
+Map_obj57_0090: spriteHeader
+ spritePiece $C, -$30, 2, 4, $2F, 0, 0, 1, 0
+ spritePiece 8, -$10, 3, 4, $4B, 0, 0, 1, 0
+Map_obj57_0090_End
+
+Map_obj57_00A2: spriteHeader
+ spritePiece $C, -$30, 2, 4, $37, 0, 0, 1, 0
+ spritePiece 8, -$10, 3, 4, $57, 0, 0, 1, 0
+Map_obj57_00A2_End
+
+Map_obj57_00B4: spriteHeader
+ spritePiece -8, $12, 3, 1, $12, 0, 0, 0, 0
+ spritePiece -8, $1A, 3, 1, $15, 0, 0, 0, 0
+Map_obj57_00B4_End
+
+Map_obj57_00C6: spriteHeader
+ spritePiece -8, $12, 3, 1, $12, 0, 0, 0, 0
+ spritePiece -8, $1A, 3, 3, $18, 0, 0, 0, 0
+Map_obj57_00C6_End
+
+Map_obj57_00D8: spriteHeader
+ spritePiece -8, $12, 3, 1, $12, 0, 0, 0, 0
+Map_obj57_00D8_End
+
+Map_obj57_00E2: spriteHeader
+ spritePiece -8, -$20, 3, 2, $63, 0, 0, 1, 0
+ spritePiece 0, -$10, 1, 2, $69, 0, 0, 1, 0
+ spritePiece 8, -$10, 4, 4, $6B, 0, 0, 1, 0
+ spritePiece $28, -8, 1, 3, $7B, 0, 0, 1, 0
+ spritePiece $18, $10, 2, 1, $7E, 0, 0, 1, 0
+Map_obj57_00E2_End
+
+Map_obj57_010C: spriteHeader
+ spritePiece -$10, -4, 4, 2, $80, 0, 0, 1, 0
+ spritePiece $10, -8, 4, 3, $98, 0, 0, 1, 0
+Map_obj57_010C_End
+
+Map_obj57_011E: spriteHeader
+ spritePiece -$10, -4, 4, 2, $88, 0, 0, 1, 0
+ spritePiece $10, -8, 4, 3, $A4, 0, 0, 1, 0
+Map_obj57_011E_End
+
+Map_obj57_0130: spriteHeader
+ spritePiece -$10, -4, 4, 2, $90, 0, 0, 1, 0
+ spritePiece $10, -8, 4, 3, $B0, 0, 0, 1, 0
+Map_obj57_0130_End
+
+Map_obj57_0142: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $BC, 0, 0, 2, 0
+Map_obj57_0142_End
+
+Map_obj57_014C: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 2, 0
+Map_obj57_014C_End
+
+Map_obj57_0156: spriteHeader
+ spritePiece -$10, -$18, 4, 2, $170, 0, 0, 0, 0
+ spritePiece -$20, -$18, 2, 2, $168, 0, 0, 0, 0
+Map_obj57_0156_End
+
+Map_obj57_0168: spriteHeader
+ spritePiece -$10, -$18, 4, 2, $178, 0, 0, 0, 0
+ spritePiece -$20, -$18, 2, 2, $168, 0, 0, 0, 0
+Map_obj57_0168_End
+
+Map_obj57_017A: spriteHeader
+ spritePiece -$10, -$18, 4, 2, $180, 0, 0, 0, 0
+ spritePiece -$20, -$18, 2, 2, $16C, 0, 0, 0, 0
+Map_obj57_017A_End
+
+Map_obj57_018C: spriteHeader
+ spritePiece -$10, -$18, 4, 2, $188, 0, 0, 0, 0
+ spritePiece -$20, -$18, 2, 2, $16C, 0, 0, 0, 0
+Map_obj57_018C_End
+
+Map_obj57_019E: spriteHeader
+ spritePiece -$10, -$18, 4, 2, $190, 0, 0, 0, 0
+ spritePiece -$20, -$18, 2, 2, $16C, 0, 0, 0, 0
+Map_obj57_019E_End
+
+Map_obj57_01B0: spriteHeader
+ spritePiece -$10, -$18, 4, 2, $198, 0, 0, 0, 0
+ spritePiece -$20, -$18, 2, 2, $16C, 0, 0, 0, 0
+Map_obj57_01B0_End
+
+Map_obj57_01C2: spriteHeader
+ spritePiece -4, -$10, 1, 4, 4, 0, 0, 2, 0
+Map_obj57_01C2_End
+
+ even
diff --git a/mappings/sprite/obj57.bin b/mappings/sprite/obj57.bin
deleted file mode 100644
index e378a172..00000000
Binary files a/mappings/sprite/obj57.bin and /dev/null differ
diff --git a/mappings/sprite/obj58.asm b/mappings/sprite/obj58.asm
new file mode 100644
index 00000000..1d265ceb
--- /dev/null
+++ b/mappings/sprite/obj58.asm
@@ -0,0 +1,38 @@
+Map_obj58: mappingsTable
+ mappingsTableEntry.w Map_obj58_000E
+ mappingsTableEntry.w Map_obj58_0018
+ mappingsTableEntry.w Map_obj58_0022
+ mappingsTableEntry.w Map_obj58_002C
+ mappingsTableEntry.w Map_obj58_0036
+ mappingsTableEntry.w Map_obj58_0040
+ mappingsTableEntry.w Map_obj58_004A
+
+Map_obj58_000E: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj58_000E_End
+
+Map_obj58_0018: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 4, 0, 0, 0, 0
+Map_obj58_0018_End
+
+Map_obj58_0022: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $14, 0, 0, 0, 0
+Map_obj58_0022_End
+
+Map_obj58_002C: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $24, 0, 0, 0, 0
+Map_obj58_002C_End
+
+Map_obj58_0036: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $34, 0, 0, 0, 0
+Map_obj58_0036_End
+
+Map_obj58_0040: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $44, 0, 0, 0, 0
+Map_obj58_0040_End
+
+Map_obj58_004A: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $54, 0, 0, 0, 0
+Map_obj58_004A_End
+
+ even
diff --git a/mappings/sprite/obj58.bin b/mappings/sprite/obj58.bin
deleted file mode 100644
index 8387ae0d..00000000
Binary files a/mappings/sprite/obj58.bin and /dev/null differ
diff --git a/mappings/sprite/obj59.asm b/mappings/sprite/obj59.asm
new file mode 100644
index 00000000..8f55cdcf
--- /dev/null
+++ b/mappings/sprite/obj59.asm
@@ -0,0 +1,53 @@
+Map_obj59: mappingsTable
+ mappingsTableEntry.w Map_obj59_0014
+ mappingsTableEntry.w Map_obj59_001E
+ mappingsTableEntry.w Map_obj59_0028
+ mappingsTableEntry.w Map_obj59_0032
+ mappingsTableEntry.w Map_obj59_003C
+ mappingsTableEntry.w Map_obj59_0046
+ mappingsTableEntry.w Map_obj59_0050
+ mappingsTableEntry.w Map_obj59_005A
+ mappingsTableEntry.w Map_obj59_0064
+ mappingsTableEntry.w Map_obj59_006E
+
+Map_obj59_0014: spriteHeader
+ spritePiece -4, -4, 1, 1, 0, 0, 0, 0, 1
+Map_obj59_0014_End
+
+Map_obj59_001E: spriteHeader
+ spritePiece -4, -4, 1, 1, 1, 0, 0, 0, 1
+Map_obj59_001E_End
+
+Map_obj59_0028: spriteHeader
+ spritePiece -4, -4, 1, 1, 2, 0, 0, 0, 1
+Map_obj59_0028_End
+
+Map_obj59_0032: spriteHeader
+ spritePiece -8, -8, 2, 2, 3, 0, 0, 0, 1
+Map_obj59_0032_End
+
+Map_obj59_003C: spriteHeader
+ spritePiece -8, -8, 2, 2, 7, 0, 0, 0, 1
+Map_obj59_003C_End
+
+Map_obj59_0046: spriteHeader
+ spritePiece -8, -8, 2, 2, $B, 0, 0, 0, 1
+Map_obj59_0046_End
+
+Map_obj59_0050: spriteHeader
+ spritePiece -8, -8, 2, 2, $F, 0, 0, 0, 1
+Map_obj59_0050_End
+
+Map_obj59_005A: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $13, 0, 0, 0, 1
+Map_obj59_005A_End
+
+Map_obj59_0064: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $1C, 0, 0, 0, 1
+Map_obj59_0064_End
+
+Map_obj59_006E: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $25, 0, 0, 0, 1
+Map_obj59_006E_End
+
+ even
diff --git a/mappings/sprite/obj59.bin b/mappings/sprite/obj59.bin
deleted file mode 100644
index 0a10cc6a..00000000
Binary files a/mappings/sprite/obj59.bin and /dev/null differ
diff --git a/mappings/sprite/obj5A.asm b/mappings/sprite/obj5A.asm
new file mode 100644
index 00000000..cd602f46
--- /dev/null
+++ b/mappings/sprite/obj5A.asm
@@ -0,0 +1,123 @@
+Map_obj5A: mappingsTable
+ mappingsTableEntry.w Map_obj5A_002C
+ mappingsTableEntry.w Map_obj5A_0036
+ mappingsTableEntry.w Map_obj5A_0040
+ mappingsTableEntry.w Map_obj5A_004A
+ mappingsTableEntry.w Map_obj5A_0054
+ mappingsTableEntry.w Map_obj5A_005E
+ mappingsTableEntry.w Map_obj5A_0068
+ mappingsTableEntry.w Map_obj5A_0072
+ mappingsTableEntry.w Map_obj5A_007C
+ mappingsTableEntry.w Map_obj5A_0086
+ mappingsTableEntry.w Map_obj5A_0090
+ mappingsTableEntry.w Map_obj5A_009A
+ mappingsTableEntry.w Map_obj5A_00A4
+ mappingsTableEntry.w Map_obj5A_00AE
+ mappingsTableEntry.w Map_obj5A_00B8
+ mappingsTableEntry.w Map_obj5A_00C2
+ mappingsTableEntry.w Map_obj5A_00CC
+ mappingsTableEntry.w Map_obj5A_00D6
+ mappingsTableEntry.w Map_obj5A_00E0
+ mappingsTableEntry.w Map_obj5A_00EA
+ mappingsTableEntry.w Map_obj5A_00F4
+ mappingsTableEntry.w Map_obj5A_0136
+
+Map_obj5A_002C: spriteHeader
+ spritePiece -4, -8, 1, 2, 4, 0, 0, 0, 1
+Map_obj5A_002C_End
+
+Map_obj5A_0036: spriteHeader
+ spritePiece -4, -8, 1, 2, 2, 0, 0, 0, 1
+Map_obj5A_0036_End
+
+Map_obj5A_0040: spriteHeader
+ spritePiece -4, -8, 1, 2, $14, 0, 0, 0, 1
+Map_obj5A_0040_End
+
+Map_obj5A_004A: spriteHeader
+ spritePiece -4, -8, 1, 2, $10, 0, 0, 0, 1
+Map_obj5A_004A_End
+
+Map_obj5A_0054: spriteHeader
+ spritePiece -4, -8, 1, 2, 8, 0, 0, 0, 1
+Map_obj5A_0054_End
+
+Map_obj5A_005E: spriteHeader
+ spritePiece -4, -8, 1, 2, $C, 0, 0, 0, 1
+Map_obj5A_005E_End
+
+Map_obj5A_0068: spriteHeader
+ spritePiece -4, -8, 1, 2, $12, 0, 0, 0, 1
+Map_obj5A_0068_End
+
+Map_obj5A_0072: spriteHeader
+ spritePiece -4, -8, 1, 2, 0, 0, 0, 0, 1
+Map_obj5A_0072_End
+
+Map_obj5A_007C: spriteHeader
+ spritePiece -4, -8, 1, 2, $6A, 0, 0, 0, 1
+Map_obj5A_007C_End
+
+Map_obj5A_0086: spriteHeader
+ spritePiece -4, -8, 1, 2, $A, 0, 0, 0, 1
+Map_obj5A_0086_End
+
+Map_obj5A_0090: spriteHeader
+ spritePiece -4, -8, 1, 2, $16, 0, 0, 0, 1
+Map_obj5A_0090_End
+
+Map_obj5A_009A: spriteHeader
+ spritePiece -4, -8, 1, 2, 6, 0, 0, 0, 1
+Map_obj5A_009A_End
+
+Map_obj5A_00A4: spriteHeader
+ spritePiece -4, -8, 1, 2, $23D, 0, 0, 0, 1
+Map_obj5A_00A4_End
+
+Map_obj5A_00AE: spriteHeader
+ spritePiece -4, -8, 1, 2, $23F, 0, 0, 0, 1
+Map_obj5A_00AE_End
+
+Map_obj5A_00B8: spriteHeader
+ spritePiece -4, -8, 1, 2, $241, 0, 0, 0, 1
+Map_obj5A_00B8_End
+
+Map_obj5A_00C2: spriteHeader
+ spritePiece -4, -8, 1, 2, $243, 0, 0, 0, 1
+Map_obj5A_00C2_End
+
+Map_obj5A_00CC: spriteHeader
+ spritePiece -4, -8, 1, 2, $245, 0, 0, 0, 1
+Map_obj5A_00CC_End
+
+Map_obj5A_00D6: spriteHeader
+ spritePiece -4, -8, 1, 2, $18, 0, 0, 0, 1
+Map_obj5A_00D6_End
+
+Map_obj5A_00E0: spriteHeader
+ spritePiece -4, -8, 1, 2, $E, 0, 0, 0, 1
+Map_obj5A_00E0_End
+
+Map_obj5A_00EA: spriteHeader
+ spritePiece -8, -4, 2, 1, $247, 0, 0, 0, 1
+Map_obj5A_00EA_End
+
+Map_obj5A_00F4: spriteHeader
+ spritePiece -$30, -$1C, 1, 4, $1A, 0, 0, 0, 1
+ spritePiece -$28, -$14, 4, 4, $1E, 0, 0, 0, 1
+ spritePiece -8, -$14, 1, 4, $2E, 0, 0, 0, 1
+ spritePiece -$20, $C, 4, 2, $32, 0, 0, 0, 1
+ spritePiece 0, -$14, 1, 4, $2E, 1, 0, 0, 1
+ spritePiece 0, $C, 4, 2, $32, 1, 0, 0, 1
+ spritePiece 8, -$14, 4, 4, $1E, 1, 0, 0, 1
+ spritePiece $28, -$1C, 1, 4, $1A, 1, 0, 0, 1
+Map_obj5A_00F4_End
+
+Map_obj5A_0136: spriteHeader
+ spritePiece -$18, -$10, 3, 4, $3A, 0, 0, 0, 1
+ spritePiece -$18, $10, 3, 1, $46, 0, 0, 0, 1
+ spritePiece 0, 0, 3, 3, $49, 0, 0, 0, 1
+ spritePiece 0, -$18, 2, 3, $52, 0, 0, 0, 1
+Map_obj5A_0136_End
+
+ even
diff --git a/mappings/sprite/obj5A.bin b/mappings/sprite/obj5A.bin
deleted file mode 100644
index 54e1dca2..00000000
Binary files a/mappings/sprite/obj5A.bin and /dev/null differ
diff --git a/mappings/sprite/obj5A_5B_60.asm b/mappings/sprite/obj5A_5B_60.asm
new file mode 100644
index 00000000..b7670b24
--- /dev/null
+++ b/mappings/sprite/obj5A_5B_60.asm
@@ -0,0 +1,171 @@
+Map_obj5A_5B_60: mappingsTable
+ mappingsTableEntry.w Map_obj5A_5B_60_0042
+ mappingsTableEntry.w Map_obj5A_5B_60_004C
+ mappingsTableEntry.w Map_obj5A_5B_60_0056
+ mappingsTableEntry.w Map_obj5A_5B_60_0060
+ mappingsTableEntry.w Map_obj5A_5B_60_006A
+ mappingsTableEntry.w Map_obj5A_5B_60_0074
+ mappingsTableEntry.w Map_obj5A_5B_60_007E
+ mappingsTableEntry.w Map_obj5A_5B_60_0088
+ mappingsTableEntry.w Map_obj5A_5B_60_0092
+ mappingsTableEntry.w Map_obj5A_5B_60_009C
+ mappingsTableEntry.w Map_obj5A_5B_60_00A6
+ mappingsTableEntry.w Map_obj5A_5B_60_00B0
+ mappingsTableEntry.w Map_obj5A_5B_60_00BA
+ mappingsTableEntry.w Map_obj5A_5B_60_00C4
+ mappingsTableEntry.w Map_obj5A_5B_60_00CE
+ mappingsTableEntry.w Map_obj5A_5B_60_00D8
+ mappingsTableEntry.w Map_obj5A_5B_60_00E2
+ mappingsTableEntry.w Map_obj5A_5B_60_00EC
+ mappingsTableEntry.w Map_obj5A_5B_60_00F6
+ mappingsTableEntry.w Map_obj5A_5B_60_0100
+ mappingsTableEntry.w Map_obj5A_5B_60_010A
+ mappingsTableEntry.w Map_obj5A_5B_60_0114
+ mappingsTableEntry.w Map_obj5A_5B_60_011E
+ mappingsTableEntry.w Map_obj5A_5B_60_0128
+ mappingsTableEntry.w Map_obj5A_5B_60_0132
+ mappingsTableEntry.w Map_obj5A_5B_60_013C
+ mappingsTableEntry.w Map_obj5A_5B_60_0146
+ mappingsTableEntry.w Map_obj5A_5B_60_0150
+ mappingsTableEntry.w Map_obj5A_5B_60_015A
+ mappingsTableEntry.w Map_obj5A_5B_60_0164
+ mappingsTableEntry.w Map_obj5A_5B_60_016E
+ mappingsTableEntry.w Map_obj5A_5B_60_0180
+ mappingsTableEntry.w Map_obj5A_5B_60_0192
+
+Map_obj5A_5B_60_0042: spriteHeader
+ spritePiece -4, -4, 1, 1, 0, 0, 0, 0, 1
+Map_obj5A_5B_60_0042_End
+
+Map_obj5A_5B_60_004C: spriteHeader
+ spritePiece -4, -4, 1, 1, 1, 0, 0, 0, 1
+Map_obj5A_5B_60_004C_End
+
+Map_obj5A_5B_60_0056: spriteHeader
+ spritePiece -4, -4, 1, 1, 2, 0, 0, 0, 1
+Map_obj5A_5B_60_0056_End
+
+Map_obj5A_5B_60_0060: spriteHeader
+ spritePiece -8, -8, 2, 2, 3, 0, 0, 0, 1
+Map_obj5A_5B_60_0060_End
+
+Map_obj5A_5B_60_006A: spriteHeader
+ spritePiece -8, -8, 2, 2, 7, 0, 0, 0, 1
+Map_obj5A_5B_60_006A_End
+
+Map_obj5A_5B_60_0074: spriteHeader
+ spritePiece -8, -8, 2, 2, $B, 0, 0, 0, 1
+Map_obj5A_5B_60_0074_End
+
+Map_obj5A_5B_60_007E: spriteHeader
+ spritePiece -8, -8, 2, 2, $F, 0, 0, 0, 1
+Map_obj5A_5B_60_007E_End
+
+Map_obj5A_5B_60_0088: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $13, 0, 0, 0, 1
+Map_obj5A_5B_60_0088_End
+
+Map_obj5A_5B_60_0092: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $1C, 0, 0, 0, 1
+Map_obj5A_5B_60_0092_End
+
+Map_obj5A_5B_60_009C: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $25, 0, 0, 0, 1
+Map_obj5A_5B_60_009C_End
+
+Map_obj5A_5B_60_00A6: spriteHeader
+ spritePiece -4, -4, 1, 1, $2E, 0, 0, 0, 1
+Map_obj5A_5B_60_00A6_End
+
+Map_obj5A_5B_60_00B0: spriteHeader
+ spritePiece -4, -4, 1, 1, $2F, 0, 0, 0, 1
+Map_obj5A_5B_60_00B0_End
+
+Map_obj5A_5B_60_00BA: spriteHeader
+ spritePiece -4, -4, 1, 1, $30, 0, 0, 0, 1
+Map_obj5A_5B_60_00BA_End
+
+Map_obj5A_5B_60_00C4: spriteHeader
+ spritePiece -4, -8, 1, 2, $31, 0, 0, 0, 1
+Map_obj5A_5B_60_00C4_End
+
+Map_obj5A_5B_60_00CE: spriteHeader
+ spritePiece -8, -8, 2, 2, $33, 0, 0, 0, 1
+Map_obj5A_5B_60_00CE_End
+
+Map_obj5A_5B_60_00D8: spriteHeader
+ spritePiece -8, -8, 2, 2, $37, 0, 0, 0, 1
+Map_obj5A_5B_60_00D8_End
+
+Map_obj5A_5B_60_00E2: spriteHeader
+ spritePiece -8, -8, 2, 2, $3B, 0, 0, 0, 1
+Map_obj5A_5B_60_00E2_End
+
+Map_obj5A_5B_60_00EC: spriteHeader
+ spritePiece -8, -$C, 2, 3, $3F, 0, 0, 0, 1
+Map_obj5A_5B_60_00EC_End
+
+Map_obj5A_5B_60_00F6: spriteHeader
+ spritePiece -8, -$C, 2, 3, $45, 0, 0, 0, 1
+Map_obj5A_5B_60_00F6_End
+
+Map_obj5A_5B_60_0100: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $4B, 0, 0, 0, 1
+Map_obj5A_5B_60_0100_End
+
+Map_obj5A_5B_60_010A: spriteHeader
+ spritePiece -4, -4, 1, 1, $54, 0, 0, 0, 1
+Map_obj5A_5B_60_010A_End
+
+Map_obj5A_5B_60_0114: spriteHeader
+ spritePiece -4, -4, 1, 1, $55, 0, 0, 0, 1
+Map_obj5A_5B_60_0114_End
+
+Map_obj5A_5B_60_011E: spriteHeader
+ spritePiece -4, -4, 1, 1, $56, 0, 0, 0, 1
+Map_obj5A_5B_60_011E_End
+
+Map_obj5A_5B_60_0128: spriteHeader
+ spritePiece -4, -8, 1, 2, $57, 0, 0, 0, 1
+Map_obj5A_5B_60_0128_End
+
+Map_obj5A_5B_60_0132: spriteHeader
+ spritePiece -4, -8, 1, 2, $59, 0, 0, 0, 1
+Map_obj5A_5B_60_0132_End
+
+Map_obj5A_5B_60_013C: spriteHeader
+ spritePiece -4, -8, 1, 2, $5B, 0, 0, 0, 1
+Map_obj5A_5B_60_013C_End
+
+Map_obj5A_5B_60_0146: spriteHeader
+ spritePiece -4, -8, 1, 2, $5D, 0, 0, 0, 1
+Map_obj5A_5B_60_0146_End
+
+Map_obj5A_5B_60_0150: spriteHeader
+ spritePiece -4, -$C, 1, 3, $5F, 0, 0, 0, 1
+Map_obj5A_5B_60_0150_End
+
+Map_obj5A_5B_60_015A: spriteHeader
+ spritePiece -4, -$C, 1, 3, $62, 0, 0, 0, 1
+Map_obj5A_5B_60_015A_End
+
+Map_obj5A_5B_60_0164: spriteHeader
+ spritePiece -4, -$C, 1, 3, $65, 0, 0, 0, 1
+Map_obj5A_5B_60_0164_End
+
+Map_obj5A_5B_60_016E: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 1
+ spritePiece 0, -8, 2, 2, 8, 0, 0, 0, 1
+Map_obj5A_5B_60_016E_End
+
+Map_obj5A_5B_60_0180: spriteHeader
+ spritePiece -$10, -$10, 4, 3, $C, 0, 0, 0, 1
+ spritePiece -8, 8, 1, 1, $18, 0, 0, 0, 1
+Map_obj5A_5B_60_0180_End
+
+Map_obj5A_5B_60_0192: spriteHeader
+ spritePiece -$10, -$10, 1, 3, $19, 0, 0, 0, 1
+ spritePiece -8, -8, 3, 3, $1C, 0, 0, 0, 1
+Map_obj5A_5B_60_0192_End
+
+ even
diff --git a/mappings/sprite/obj5A_5B_60.bin b/mappings/sprite/obj5A_5B_60.bin
deleted file mode 100644
index 4fc5da0d..00000000
Binary files a/mappings/sprite/obj5A_5B_60.bin and /dev/null differ
diff --git a/mappings/sprite/obj5C.asm b/mappings/sprite/obj5C.asm
new file mode 100644
index 00000000..29ce3ef5
--- /dev/null
+++ b/mappings/sprite/obj5C.asm
@@ -0,0 +1,19 @@
+Map_obj5C: mappingsTable
+ mappingsTableEntry.w Map_obj5C_0004
+ mappingsTableEntry.w Map_obj5C_001E
+
+Map_obj5C_0004: spriteHeader
+ spritePiece -$C, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 4, -$10, 1, 2, 4, 0, 0, 0, 0
+ spritePiece -$C, 0, 3, 2, $A, 0, 0, 0, 0
+Map_obj5C_0004_End
+
+Map_obj5C_001E: spriteHeader
+ spritePiece -$C, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 2, -$10, 2, 2, 6, 0, 0, 0, 0
+ spritePiece -$C, 0, 3, 2, $10, 0, 0, 0, 0
+Map_obj5C_001E_End
+
+ dc.w 0
+
+ even
diff --git a/mappings/sprite/obj5C.bin b/mappings/sprite/obj5C.bin
deleted file mode 100644
index ac1c2801..00000000
Binary files a/mappings/sprite/obj5C.bin and /dev/null differ
diff --git a/mappings/sprite/obj5D_a.asm b/mappings/sprite/obj5D_a.asm
new file mode 100644
index 00000000..1991180c
--- /dev/null
+++ b/mappings/sprite/obj5D_a.asm
@@ -0,0 +1,223 @@
+Map_obj5D_a: mappingsTable
+ mappingsTableEntry.w Map_obj5D_a_0050
+ mappingsTableEntry.w Map_obj5D_a_006A
+ mappingsTableEntry.w Map_obj5D_a_0074
+ mappingsTableEntry.w Map_obj5D_a_007E
+ mappingsTableEntry.w Map_obj5D_a_0088
+ mappingsTableEntry.w Map_obj5D_a_0092
+ mappingsTableEntry.w Map_obj5D_a_009C
+ mappingsTableEntry.w Map_obj5D_a_00A6
+ mappingsTableEntry.w Map_obj5D_a_00B0
+ mappingsTableEntry.w Map_obj5D_a_00BA
+ mappingsTableEntry.w Map_obj5D_a_00C4
+ mappingsTableEntry.w Map_obj5D_a_00D6
+ mappingsTableEntry.w Map_obj5D_a_00E0
+ mappingsTableEntry.w Map_obj5D_a_00EA
+ mappingsTableEntry.w Map_obj5D_a_00F4
+ mappingsTableEntry.w Map_obj5D_a_00FE
+ mappingsTableEntry.w Map_obj5D_a_0108
+ mappingsTableEntry.w Map_obj5D_a_0112
+ mappingsTableEntry.w Map_obj5D_a_011C
+ mappingsTableEntry.w Map_obj5D_a_0126
+ mappingsTableEntry.w Map_obj5D_a_0130
+ mappingsTableEntry.w Map_obj5D_a_0142
+ mappingsTableEntry.w Map_obj5D_a_0154
+ mappingsTableEntry.w Map_obj5D_a_0166
+ mappingsTableEntry.w Map_obj5D_a_0178
+ mappingsTableEntry.w Map_obj5D_a_0192
+ mappingsTableEntry.w Map_obj5D_a_01AC
+ mappingsTableEntry.w Map_obj5D_a_01C6
+ mappingsTableEntry.w Map_obj5D_a_01E0
+ mappingsTableEntry.w Map_obj5D_a_01FA
+ mappingsTableEntry.w Map_obj5D_a_0204
+ mappingsTableEntry.w Map_obj5D_a_0226
+ mappingsTableEntry.w Map_obj5D_a_0230
+ mappingsTableEntry.w Map_obj5D_a_023A
+ mappingsTableEntry.w Map_obj5D_a_0244
+ mappingsTableEntry.w Map_obj5D_a_024E
+ mappingsTableEntry.w Map_obj5D_a_0258
+ mappingsTableEntry.w Map_obj5D_a_0262
+ mappingsTableEntry.w Map_obj5D_a_026C
+ mappingsTableEntry.w Map_obj5D_a_0276
+
+Map_obj5D_a_0050: spriteHeader
+ spritePiece -8, -$48, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 8, -$38, 3, 3, 8, 0, 0, 0, 0
+ spritePiece $10, -$20, 2, 2, $11, 0, 0, 0, 0
+Map_obj5D_a_0050_End
+
+Map_obj5D_a_006A: spriteHeader
+ spritePiece -4, -4, 1, 1, $24, 0, 0, 0, 0
+Map_obj5D_a_006A_End
+
+Map_obj5D_a_0074: spriteHeader
+ spritePiece -$B, -4, 2, 1, $25, 0, 0, 0, 0
+Map_obj5D_a_0074_End
+
+Map_obj5D_a_007E: spriteHeader
+ spritePiece -$A, -4, 2, 1, $27, 0, 0, 0, 0
+Map_obj5D_a_007E_End
+
+Map_obj5D_a_0088: spriteHeader
+ spritePiece -5, -$3C, 1, 1, $36, 0, 0, 0, 0
+Map_obj5D_a_0088_End
+
+Map_obj5D_a_0092: spriteHeader
+ spritePiece -5, -$3C, 1, 1, $37, 0, 0, 0, 0
+Map_obj5D_a_0092_End
+
+Map_obj5D_a_009C: spriteHeader
+ spritePiece -5, -$3C, 1, 1, $38, 0, 0, 0, 0
+Map_obj5D_a_009C_End
+
+Map_obj5D_a_00A6: spriteHeader
+ spritePiece -5, -$3C, 1, 2, $39, 0, 0, 0, 0
+Map_obj5D_a_00A6_End
+
+Map_obj5D_a_00B0: spriteHeader
+ spritePiece -5, -$3C, 1, 2, $3B, 0, 0, 0, 0
+Map_obj5D_a_00B0_End
+
+Map_obj5D_a_00BA: spriteHeader
+ spritePiece -4, -4, 1, 1, $3D, 0, 0, 0, 0
+Map_obj5D_a_00BA_End
+
+Map_obj5D_a_00C4: spriteHeader
+ spritePiece 0, 0, 4, 3, $15, 0, 0, 0, 0
+ spritePiece $18, 8, 3, 1, $21, 0, 0, 0, 0
+Map_obj5D_a_00C4_End
+
+Map_obj5D_a_00D6: spriteHeader
+ spritePiece 0, $18, 3, 1, $29, 0, 0, 0, 0
+Map_obj5D_a_00D6_End
+
+Map_obj5D_a_00E0: spriteHeader
+ spritePiece 0, $18, 3, 1, $2C, 0, 0, 0, 0
+Map_obj5D_a_00E0_End
+
+Map_obj5D_a_00EA: spriteHeader
+ spritePiece 8, $18, 3, 1, $2F, 0, 0, 0, 0
+Map_obj5D_a_00EA_End
+
+Map_obj5D_a_00F4: spriteHeader
+ spritePiece -4, $18, 2, 1, $32, 0, 0, 0, 0
+Map_obj5D_a_00F4_End
+
+Map_obj5D_a_00FE: spriteHeader
+ spritePiece -4, $18, 2, 1, $34, 0, 0, 0, 0
+Map_obj5D_a_00FE_End
+
+Map_obj5D_a_0108: spriteHeader
+ spritePiece 0, $10, 3, 1, $63, 0, 0, 0, 0
+Map_obj5D_a_0108_End
+
+Map_obj5D_a_0112: spriteHeader
+ spritePiece 0, $10, 3, 1, $66, 0, 0, 0, 0
+Map_obj5D_a_0112_End
+
+Map_obj5D_a_011C: spriteHeader
+ spritePiece 0, $10, 3, 1, $69, 0, 0, 0, 0
+Map_obj5D_a_011C_End
+
+Map_obj5D_a_0126: spriteHeader
+ spritePiece 0, $10, 3, 1, $6C, 0, 0, 0, 0
+Map_obj5D_a_0126_End
+
+Map_obj5D_a_0130: spriteHeader
+ spritePiece 0, $10, 3, 1, $6C, 0, 0, 0, 0
+ spritePiece 0, 8, 3, 1, $63, 0, 0, 0, 0
+Map_obj5D_a_0130_End
+
+Map_obj5D_a_0142: spriteHeader
+ spritePiece 0, $10, 3, 1, $6C, 0, 0, 0, 0
+ spritePiece 0, 8, 3, 1, $66, 0, 0, 0, 0
+Map_obj5D_a_0142_End
+
+Map_obj5D_a_0154: spriteHeader
+ spritePiece 0, $10, 3, 1, $6C, 0, 0, 0, 0
+ spritePiece 0, 8, 3, 1, $69, 0, 0, 0, 0
+Map_obj5D_a_0154_End
+
+Map_obj5D_a_0166: spriteHeader
+ spritePiece 0, $10, 3, 1, $6C, 0, 0, 0, 0
+ spritePiece 0, 8, 3, 1, $6C, 0, 0, 0, 0
+Map_obj5D_a_0166_End
+
+Map_obj5D_a_0178: spriteHeader
+ spritePiece 0, $10, 3, 1, $6C, 0, 0, 0, 0
+ spritePiece 0, 8, 3, 1, $6C, 0, 0, 0, 0
+ spritePiece 0, 0, 3, 1, $63, 0, 0, 0, 0
+Map_obj5D_a_0178_End
+
+Map_obj5D_a_0192: spriteHeader
+ spritePiece 0, $10, 3, 1, $6C, 0, 0, 0, 0
+ spritePiece 0, 8, 3, 1, $6C, 0, 0, 0, 0
+ spritePiece 0, 0, 3, 1, $66, 0, 0, 0, 0
+Map_obj5D_a_0192_End
+
+Map_obj5D_a_01AC: spriteHeader
+ spritePiece 0, $10, 3, 1, $6C, 0, 0, 0, 0
+ spritePiece 0, 8, 3, 1, $6C, 0, 0, 0, 0
+ spritePiece 0, 0, 3, 1, $69, 0, 0, 0, 0
+Map_obj5D_a_01AC_End
+
+Map_obj5D_a_01C6: spriteHeader
+ spritePiece 0, $10, 3, 1, $6C, 0, 0, 0, 0
+ spritePiece 0, 8, 3, 1, $6C, 0, 0, 0, 0
+ spritePiece 0, 0, 3, 1, $6C, 0, 0, 0, 0
+Map_obj5D_a_01C6_End
+
+Map_obj5D_a_01E0: spriteHeader
+ spritePiece 0, 0, 4, 3, $15, 0, 0, 0, 0
+ spritePiece $18, 8, 3, 1, $21, 0, 0, 0, 0
+ spritePiece $30, 8, 3, 1, $21, 0, 0, 0, 0
+Map_obj5D_a_01E0_End
+
+Map_obj5D_a_01FA: spriteHeader
+ spritePiece 0, 0, 3, 4, $3E, 0, 0, 0, 0
+Map_obj5D_a_01FA_End
+
+Map_obj5D_a_0204: spriteHeader
+ spritePiece 0, 0, 4, 3, $15, 0, 0, 0, 0
+ spritePiece $18, 8, 3, 1, $21, 0, 0, 0, 0
+ spritePiece $30, 8, 3, 1, $21, 0, 0, 0, 0
+ spritePiece $48, 8, 3, 1, $21, 0, 0, 0, 0
+Map_obj5D_a_0204_End
+
+Map_obj5D_a_0226: spriteHeader
+ spritePiece 0, 0, 3, 4, $3E, 1, 0, 0, 0
+Map_obj5D_a_0226_End
+
+Map_obj5D_a_0230: spriteHeader
+ spritePiece 0, 0, 4, 3, $15, 0, 0, 0, 0
+Map_obj5D_a_0230_End
+
+Map_obj5D_a_023A: spriteHeader
+ spritePiece 0, 0, 3, 1, $21, 0, 0, 0, 0
+Map_obj5D_a_023A_End
+
+Map_obj5D_a_0244: spriteHeader
+ spritePiece -8, -$48, 4, 2, 0, 0, 0, 0, 0
+Map_obj5D_a_0244_End
+
+Map_obj5D_a_024E: spriteHeader
+ spritePiece 8, -$38, 3, 3, 8, 0, 0, 0, 0
+Map_obj5D_a_024E_End
+
+Map_obj5D_a_0258: spriteHeader
+ spritePiece $10, -$20, 2, 2, $11, 0, 0, 0, 0
+Map_obj5D_a_0258_End
+
+Map_obj5D_a_0262: spriteHeader
+ spritePiece -$10, -$20, 3, 3, $4A, 0, 0, 0, 0
+Map_obj5D_a_0262_End
+
+Map_obj5D_a_026C: spriteHeader
+ spritePiece -$10, -$18, 4, 2, $53, 0, 0, 0, 0
+Map_obj5D_a_026C_End
+
+Map_obj5D_a_0276: spriteHeader
+ spritePiece -$10, -$18, 4, 2, $5B, 0, 0, 0, 0
+Map_obj5D_a_0276_End
+
+ even
diff --git a/mappings/sprite/obj5D_a.bin b/mappings/sprite/obj5D_a.bin
deleted file mode 100644
index 4c2f2fea..00000000
Binary files a/mappings/sprite/obj5D_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj5D_b.asm b/mappings/sprite/obj5D_b.asm
new file mode 100644
index 00000000..2d40ccc6
--- /dev/null
+++ b/mappings/sprite/obj5D_b.asm
@@ -0,0 +1,59 @@
+Map_obj5D_b: mappingsTable
+ mappingsTableEntry.w Map_obj5D_b_000E
+ mappingsTableEntry.w Map_obj5D_b_0030
+ mappingsTableEntry.w Map_obj5D_b_0052
+ mappingsTableEntry.w Map_obj5D_b_0074
+ mappingsTableEntry.w Map_obj5D_b_0096
+ mappingsTableEntry.w Map_obj5D_b_00B8
+ mappingsTableEntry.w Map_obj5D_b_00DA
+
+Map_obj5D_b_000E: spriteHeader
+ spritePiece -$20, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, 8, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$10, -8, 4, 4, 8, 0, 0, 0, 0
+ spritePiece $10, -8, 2, 4, $18, 0, 0, 0, 0
+Map_obj5D_b_000E_End
+
+Map_obj5D_b_0030: spriteHeader
+ spritePiece -$20, -$18, 2, 2, $28, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 2, $30, 0, 0, 0, 0
+ spritePiece $10, -$18, 2, 2, $24, 0, 0, 0, 0
+ spritePiece 2, -$28, 2, 2, $20, 0, 0, 0, 0
+Map_obj5D_b_0030_End
+
+Map_obj5D_b_0052: spriteHeader
+ spritePiece -$20, -$18, 2, 2, $28, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 2, $38, 0, 0, 0, 0
+ spritePiece $10, -$18, 2, 2, $24, 0, 0, 0, 0
+ spritePiece 2, -$28, 2, 2, $20, 0, 0, 0, 0
+Map_obj5D_b_0052_End
+
+Map_obj5D_b_0074: spriteHeader
+ spritePiece -$20, -$18, 2, 2, $28, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 2, $40, 0, 0, 0, 0
+ spritePiece $10, -$18, 2, 2, $24, 0, 0, 0, 0
+ spritePiece 2, -$28, 2, 2, $20, 0, 0, 0, 0
+Map_obj5D_b_0074_End
+
+Map_obj5D_b_0096: spriteHeader
+ spritePiece -$20, -$18, 2, 2, $28, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 2, $48, 0, 0, 0, 0
+ spritePiece $10, -$18, 2, 2, $24, 0, 0, 0, 0
+ spritePiece 2, -$28, 2, 2, $20, 0, 0, 0, 0
+Map_obj5D_b_0096_End
+
+Map_obj5D_b_00B8: spriteHeader
+ spritePiece -$20, -$18, 2, 2, $28, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 2, $50, 0, 0, 0, 0
+ spritePiece $10, -$18, 2, 2, $24, 0, 0, 0, 0
+ spritePiece 2, -$28, 2, 2, $20, 0, 0, 0, 0
+Map_obj5D_b_00B8_End
+
+Map_obj5D_b_00DA: spriteHeader
+ spritePiece -$20, -$18, 2, 2, $28, 0, 0, 0, 0
+ spritePiece -$10, -$18, 4, 2, $58, 0, 0, 0, 0
+ spritePiece $10, -$18, 2, 2, $24, 0, 0, 0, 0
+ spritePiece 2, -$28, 2, 2, $20, 0, 0, 0, 0
+Map_obj5D_b_00DA_End
+
+ even
diff --git a/mappings/sprite/obj5D_b.bin b/mappings/sprite/obj5D_b.bin
deleted file mode 100644
index 766200fd..00000000
Binary files a/mappings/sprite/obj5D_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj5D_c.asm b/mappings/sprite/obj5D_c.asm
new file mode 100644
index 00000000..fb7ee880
--- /dev/null
+++ b/mappings/sprite/obj5D_c.asm
@@ -0,0 +1,13 @@
+Map_obj5D_c: mappingsTable
+ mappingsTableEntry.w Map_obj5D_c_0004
+ mappingsTableEntry.w Map_obj5D_c_000E
+
+Map_obj5D_c_0004: spriteHeader
+ spritePiece $1C, 0, 2, 2, 0, 0, 0, 0, 0
+Map_obj5D_c_0004_End
+
+Map_obj5D_c_000E: spriteHeader
+ spritePiece $1C, 0, 2, 2, 4, 0, 0, 0, 0
+Map_obj5D_c_000E_End
+
+ even
diff --git a/mappings/sprite/obj5D_c.bin b/mappings/sprite/obj5D_c.bin
deleted file mode 100644
index 6ea641c2..00000000
Binary files a/mappings/sprite/obj5D_c.bin and /dev/null differ
diff --git a/mappings/sprite/obj5D_d.asm b/mappings/sprite/obj5D_d.asm
new file mode 100644
index 00000000..d0c67f9e
--- /dev/null
+++ b/mappings/sprite/obj5D_d.asm
@@ -0,0 +1,23 @@
+Map_obj5D_d: mappingsTable
+ mappingsTableEntry.w Map_obj5D_d_0008
+ mappingsTableEntry.w Map_obj5D_d_0012
+ mappingsTableEntry.w Map_obj5D_d_001C
+ mappingsTableEntry.w Map_obj5D_d_0026
+
+Map_obj5D_d_0008: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj5D_d_0008_End
+
+Map_obj5D_d_0012: spriteHeader
+ spritePiece -8, -8, 2, 2, 4, 0, 0, 0, 0
+Map_obj5D_d_0012_End
+
+Map_obj5D_d_001C: spriteHeader
+ spritePiece -8, -8, 2, 2, 8, 0, 0, 0, 0
+Map_obj5D_d_001C_End
+
+Map_obj5D_d_0026: spriteHeader
+ spritePiece -8, -8, 2, 2, $C, 0, 0, 0, 0
+Map_obj5D_d_0026_End
+
+ even
diff --git a/mappings/sprite/obj5D_d.bin b/mappings/sprite/obj5D_d.bin
deleted file mode 100644
index 1c096d3b..00000000
Binary files a/mappings/sprite/obj5D_d.bin and /dev/null differ
diff --git a/mappings/sprite/obj5E.asm b/mappings/sprite/obj5E.asm
new file mode 100644
index 00000000..99829b81
--- /dev/null
+++ b/mappings/sprite/obj5E.asm
@@ -0,0 +1,33 @@
+Map_obj5E: mappingsTable
+ mappingsTableEntry.w Map_obj5E_0008
+ mappingsTableEntry.w Map_obj5E_002A
+ mappingsTableEntry.w Map_obj5E_004C
+ mappingsTableEntry.w Map_obj5E_006E
+
+Map_obj5E_0008: spriteHeader
+ spritePiece -$60, $10, 4, 1, 0, 0, 0, 1, 1
+ spritePiece -$40, $10, 1, 1, 4, 0, 0, 1, 1
+ spritePiece -$68, $18, 4, 2, $A, 0, 0, 2, 1
+ spritePiece -$48, $18, 1, 2, $3C, 0, 0, 2, 1
+Map_obj5E_0008_End
+
+Map_obj5E_002A: spriteHeader
+ spritePiece $38, $10, 4, 1, 5, 0, 0, 2, 1
+ spritePiece $58, $10, 1, 1, 9, 0, 0, 2, 1
+ spritePiece $30, $18, 4, 2, $A, 0, 0, 2, 1
+ spritePiece $50, $18, 1, 2, $3C, 0, 0, 2, 1
+Map_obj5E_002A_End
+
+Map_obj5E_004C: spriteHeader
+ spritePiece $38, $10, 4, 1, $5AA, 0, 0, 2, 1
+ spritePiece $58, $10, 1, 1, $5AE, 0, 0, 2, 1
+ spritePiece $30, $18, 4, 2, $A, 0, 0, 2, 1
+ spritePiece $50, $18, 1, 2, $3C, 0, 0, 2, 1
+Map_obj5E_004C_End
+
+Map_obj5E_006E: spriteHeader
+ spritePiece -$14, $10, 4, 4, $26, 0, 0, 2, 1
+ spritePiece $C, $10, 1, 4, $36, 0, 0, 2, 1
+Map_obj5E_006E_End
+
+ even
diff --git a/mappings/sprite/obj5E.bin b/mappings/sprite/obj5E.bin
deleted file mode 100644
index 618ca5df..00000000
Binary files a/mappings/sprite/obj5E.bin and /dev/null differ
diff --git a/mappings/sprite/obj5F_a.asm b/mappings/sprite/obj5F_a.asm
new file mode 100644
index 00000000..3bde41c3
--- /dev/null
+++ b/mappings/sprite/obj5F_a.asm
@@ -0,0 +1,50 @@
+Map_obj5F_a: mappingsTable
+ mappingsTableEntry.w Map_obj5F_a_0012
+ mappingsTableEntry.w Map_obj5F_a_004C
+ mappingsTableEntry.w Map_obj5F_a_004C
+ mappingsTableEntry.w Map_obj5F_a_0056
+ mappingsTableEntry.w Map_obj5F_a_0060
+ mappingsTableEntry.w Map_obj5F_a_006A
+ mappingsTableEntry.w Map_obj5F_a_0074
+ mappingsTableEntry.w Map_obj5F_a_007E
+ mappingsTableEntry.w Map_obj5F_a_0088
+
+Map_obj5F_a_0012: spriteHeader
+ spritePiece -$48, 0, 4, 4, 0, 0, 0, 1, 1
+ spritePiece -$28, 0, 2, 4, $10, 0, 0, 1, 1
+ spritePiece -$18, 0, 2, 4, $18, 0, 0, 1, 1
+ spritePiece -8, 0, 2, 4, $20, 0, 0, 1, 1
+ spritePiece 8, 0, 2, 4, $28, 0, 0, 1, 1
+ spritePiece $18, 0, 2, 4, $18, 0, 0, 1, 1
+ spritePiece $28, 0, 4, 4, 0, 1, 0, 1, 1
+Map_obj5F_a_0012_End
+
+Map_obj5F_a_004C: spriteHeader
+ spritePiece -$48, 0, 4, 4, 0, 0, 0, 1, 1
+Map_obj5F_a_004C_End
+
+Map_obj5F_a_0056: spriteHeader
+ spritePiece -$28, 0, 2, 4, $10, 0, 0, 1, 1
+Map_obj5F_a_0056_End
+
+Map_obj5F_a_0060: spriteHeader
+ spritePiece -$18, 0, 2, 4, $18, 0, 0, 1, 1
+Map_obj5F_a_0060_End
+
+Map_obj5F_a_006A: spriteHeader
+ spritePiece -8, 0, 2, 4, $20, 0, 0, 1, 1
+Map_obj5F_a_006A_End
+
+Map_obj5F_a_0074: spriteHeader
+ spritePiece 8, 0, 2, 4, $28, 0, 0, 1, 1
+Map_obj5F_a_0074_End
+
+Map_obj5F_a_007E: spriteHeader
+ spritePiece $18, 0, 2, 4, $18, 0, 0, 1, 1
+Map_obj5F_a_007E_End
+
+Map_obj5F_a_0088: spriteHeader
+ spritePiece $28, 0, 4, 4, 0, 1, 0, 1, 1
+Map_obj5F_a_0088_End
+
+ even
diff --git a/mappings/sprite/obj5F_a.bin b/mappings/sprite/obj5F_a.bin
deleted file mode 100644
index 2a7efc7e..00000000
Binary files a/mappings/sprite/obj5F_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj5F_b.asm b/mappings/sprite/obj5F_b.asm
new file mode 100644
index 00000000..8321662b
--- /dev/null
+++ b/mappings/sprite/obj5F_b.asm
@@ -0,0 +1,58 @@
+Map_obj5F_b: mappingsTable
+ mappingsTableEntry.w Map_obj5F_b_0016
+ mappingsTableEntry.w Map_obj5F_b_0020
+ mappingsTableEntry.w Map_obj5F_b_002A
+ mappingsTableEntry.w Map_obj5F_b_0034
+ mappingsTableEntry.w Map_obj5F_b_003E
+ mappingsTableEntry.w Map_obj5F_b_0048
+ mappingsTableEntry.w Map_obj5F_b_0052
+ mappingsTableEntry.w Map_obj5F_b_005C
+ mappingsTableEntry.w Map_obj5F_b_0066
+ mappingsTableEntry.w Map_obj5F_b_0070
+ mappingsTableEntry.w Map_obj5F_b_007A
+
+Map_obj5F_b_0016: spriteHeader
+ spritePiece -4, -8, 1, 2, $12, 0, 0, 0, 1
+Map_obj5F_b_0016_End
+
+Map_obj5F_b_0020: spriteHeader
+ spritePiece -4, -8, 1, 2, $14, 0, 0, 0, 1
+Map_obj5F_b_0020_End
+
+Map_obj5F_b_002A: spriteHeader
+ spritePiece -4, -8, 1, 2, $16, 0, 0, 0, 1
+Map_obj5F_b_002A_End
+
+Map_obj5F_b_0034: spriteHeader
+ spritePiece -4, -8, 1, 2, $18, 0, 0, 0, 1
+Map_obj5F_b_0034_End
+
+Map_obj5F_b_003E: spriteHeader
+ spritePiece -4, -8, 1, 2, $1A, 0, 0, 0, 1
+Map_obj5F_b_003E_End
+
+Map_obj5F_b_0048: spriteHeader
+ spritePiece -4, -8, 1, 2, $1C, 0, 0, 0, 1
+Map_obj5F_b_0048_End
+
+Map_obj5F_b_0052: spriteHeader
+ spritePiece -4, -8, 1, 2, $1E, 0, 0, 0, 1
+Map_obj5F_b_0052_End
+
+Map_obj5F_b_005C: spriteHeader
+ spritePiece -4, -8, 1, 2, $20, 0, 0, 0, 1
+Map_obj5F_b_005C_End
+
+Map_obj5F_b_0066: spriteHeader
+ spritePiece -4, -8, 1, 2, $22, 0, 0, 0, 1
+Map_obj5F_b_0066_End
+
+Map_obj5F_b_0070: spriteHeader
+ spritePiece -4, -8, 1, 2, $24, 0, 0, 0, 1
+Map_obj5F_b_0070_End
+
+Map_obj5F_b_007A: spriteHeader
+ spritePiece -8, -4, 2, 1, $3A, 0, 0, 0, 1
+Map_obj5F_b_007A_End
+
+ even
diff --git a/mappings/sprite/obj5F_b.bin b/mappings/sprite/obj5F_b.bin
deleted file mode 100644
index e8eaf22e..00000000
Binary files a/mappings/sprite/obj5F_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj61.asm b/mappings/sprite/obj61.asm
new file mode 100644
index 00000000..973dc9ab
--- /dev/null
+++ b/mappings/sprite/obj61.asm
@@ -0,0 +1,71 @@
+Map_obj61: mappingsTable
+ mappingsTableEntry.w Map_obj61_001A
+ mappingsTableEntry.w Map_obj61_0024
+ mappingsTableEntry.w Map_obj61_002E
+ mappingsTableEntry.w Map_obj61_0038
+ mappingsTableEntry.w Map_obj61_0042
+ mappingsTableEntry.w Map_obj61_004C
+ mappingsTableEntry.w Map_obj61_0056
+ mappingsTableEntry.w Map_obj61_0060
+ mappingsTableEntry.w Map_obj61_006A
+ mappingsTableEntry.w Map_obj61_0074
+ mappingsTableEntry.w Map_obj61_007E
+ mappingsTableEntry.w Map_obj61_0088
+ mappingsTableEntry.w Map_obj61_009A
+
+Map_obj61_001A: spriteHeader
+ spritePiece -4, -4, 1, 1, 0, 0, 0, 0, 1
+Map_obj61_001A_End
+
+Map_obj61_0024: spriteHeader
+ spritePiece -4, -4, 1, 1, 1, 0, 0, 0, 1
+Map_obj61_0024_End
+
+Map_obj61_002E: spriteHeader
+ spritePiece -8, -8, 2, 2, 2, 0, 0, 0, 1
+Map_obj61_002E_End
+
+Map_obj61_0038: spriteHeader
+ spritePiece -8, -8, 2, 2, 6, 0, 0, 0, 1
+Map_obj61_0038_End
+
+Map_obj61_0042: spriteHeader
+ spritePiece -8, -8, 2, 2, $A, 0, 0, 0, 1
+Map_obj61_0042_End
+
+Map_obj61_004C: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $E, 0, 0, 0, 1
+Map_obj61_004C_End
+
+Map_obj61_0056: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $17, 0, 0, 0, 1
+Map_obj61_0056_End
+
+Map_obj61_0060: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $20, 0, 0, 0, 1
+Map_obj61_0060_End
+
+Map_obj61_006A: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $30, 0, 0, 0, 1
+Map_obj61_006A_End
+
+Map_obj61_0074: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $40, 0, 0, 0, 1
+Map_obj61_0074_End
+
+Map_obj61_007E: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 1
+Map_obj61_007E_End
+
+Map_obj61_0088: spriteHeader
+ spritePiece -$18, -$18, 4, 4, $10, 0, 0, 0, 1
+ spritePiece -8, -$18, 4, 4, $10, 0, 0, 0, 1
+Map_obj61_0088_End
+
+Map_obj61_009A: spriteHeader
+ spritePiece -$28, -$20, 4, 4, $20, 0, 0, 0, 1
+ spritePiece -$10, -$28, 4, 4, $20, 0, 1, 0, 1
+ spritePiece 8, -$20, 4, 4, $20, 1, 0, 0, 1
+Map_obj61_009A_End
+
+ even
diff --git a/mappings/sprite/obj61.bin b/mappings/sprite/obj61.bin
deleted file mode 100644
index 461e1f34..00000000
Binary files a/mappings/sprite/obj61.bin and /dev/null differ
diff --git a/mappings/sprite/obj63.asm b/mappings/sprite/obj63.asm
new file mode 100644
index 00000000..09c9c7f6
--- /dev/null
+++ b/mappings/sprite/obj63.asm
@@ -0,0 +1,153 @@
+Map_obj63: mappingsTable
+ mappingsTableEntry.w Map_obj63_0096
+ mappingsTableEntry.w Map_obj63_00FA
+ mappingsTableEntry.w Map_obj63_015E
+ mappingsTableEntry.w Map_obj63_008C
+ mappingsTableEntry.w Map_obj63_00F0
+ mappingsTableEntry.w Map_obj63_0154
+ mappingsTableEntry.w Map_obj63_0082
+ mappingsTableEntry.w Map_obj63_00E6
+ mappingsTableEntry.w Map_obj63_014A
+ mappingsTableEntry.w Map_obj63_0078
+ mappingsTableEntry.w Map_obj63_00DC
+ mappingsTableEntry.w Map_obj63_0140
+ mappingsTableEntry.w Map_obj63_006E
+ mappingsTableEntry.w Map_obj63_00D2
+ mappingsTableEntry.w Map_obj63_0136
+ mappingsTableEntry.w Map_obj63_0064
+ mappingsTableEntry.w Map_obj63_00C8
+ mappingsTableEntry.w Map_obj63_012C
+ mappingsTableEntry.w Map_obj63_005A
+ mappingsTableEntry.w Map_obj63_00BE
+ mappingsTableEntry.w Map_obj63_0122
+ mappingsTableEntry.w Map_obj63_0050
+ mappingsTableEntry.w Map_obj63_00B4
+ mappingsTableEntry.w Map_obj63_0118
+ mappingsTableEntry.w Map_obj63_0046
+ mappingsTableEntry.w Map_obj63_00AA
+ mappingsTableEntry.w Map_obj63_010E
+ mappingsTableEntry.w Map_obj63_003C
+ mappingsTableEntry.w Map_obj63_00A0
+ mappingsTableEntry.w Map_obj63_0104
+
+Map_obj63_003C: spriteHeader
+ spritePiece -4, -4, 1, 1, 0, 0, 0, 0, 1
+Map_obj63_003C_End
+
+Map_obj63_0046: spriteHeader
+ spritePiece -4, -4, 1, 1, 1, 0, 0, 0, 1
+Map_obj63_0046_End
+
+Map_obj63_0050: spriteHeader
+ spritePiece -8, -4, 2, 1, 2, 0, 0, 0, 1
+Map_obj63_0050_End
+
+Map_obj63_005A: spriteHeader
+ spritePiece -8, -4, 2, 1, 4, 0, 0, 0, 1
+Map_obj63_005A_End
+
+Map_obj63_0064: spriteHeader
+ spritePiece -8, -4, 2, 1, 6, 0, 0, 0, 1
+Map_obj63_0064_End
+
+Map_obj63_006E: spriteHeader
+ spritePiece -$C, -4, 3, 1, 8, 0, 0, 0, 1
+Map_obj63_006E_End
+
+Map_obj63_0078: spriteHeader
+ spritePiece -$C, -4, 3, 1, $B, 0, 0, 0, 1
+Map_obj63_0078_End
+
+Map_obj63_0082: spriteHeader
+ spritePiece -$10, -8, 4, 2, $E, 0, 0, 0, 1
+Map_obj63_0082_End
+
+Map_obj63_008C: spriteHeader
+ spritePiece -$10, -8, 4, 2, $16, 0, 0, 0, 1
+Map_obj63_008C_End
+
+Map_obj63_0096: spriteHeader
+ spritePiece -$10, -8, 4, 2, $1E, 0, 0, 0, 1
+Map_obj63_0096_End
+
+Map_obj63_00A0: spriteHeader
+ spritePiece -4, -4, 1, 1, 0, 0, 0, 0, 1
+Map_obj63_00A0_End
+
+Map_obj63_00AA: spriteHeader
+ spritePiece -4, -4, 1, 1, 1, 0, 0, 0, 1
+Map_obj63_00AA_End
+
+Map_obj63_00B4: spriteHeader
+ spritePiece -4, -4, 1, 1, 2, 0, 0, 0, 1
+Map_obj63_00B4_End
+
+Map_obj63_00BE: spriteHeader
+ spritePiece -8, -8, 2, 2, 3, 0, 0, 0, 1
+Map_obj63_00BE_End
+
+Map_obj63_00C8: spriteHeader
+ spritePiece -8, -8, 2, 2, 7, 0, 0, 0, 1
+Map_obj63_00C8_End
+
+Map_obj63_00D2: spriteHeader
+ spritePiece -4, -$C, 2, 2, $B, 0, 0, 0, 1
+Map_obj63_00D2_End
+
+Map_obj63_00DC: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $F, 0, 0, 0, 1
+Map_obj63_00DC_End
+
+Map_obj63_00E6: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $18, 0, 0, 0, 1
+Map_obj63_00E6_End
+
+Map_obj63_00F0: spriteHeader
+ spritePiece -8, -$10, 3, 3, $21, 0, 0, 0, 1
+Map_obj63_00F0_End
+
+Map_obj63_00FA: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $2A, 0, 0, 0, 1
+Map_obj63_00FA_End
+
+Map_obj63_0104: spriteHeader
+ spritePiece -4, -4, 1, 1, 0, 0, 0, 0, 1
+Map_obj63_0104_End
+
+Map_obj63_010E: spriteHeader
+ spritePiece -4, -4, 1, 1, 1, 0, 0, 0, 1
+Map_obj63_010E_End
+
+Map_obj63_0118: spriteHeader
+ spritePiece -4, -8, 1, 2, 2, 0, 0, 0, 1
+Map_obj63_0118_End
+
+Map_obj63_0122: spriteHeader
+ spritePiece -4, -8, 1, 2, 4, 0, 0, 0, 1
+Map_obj63_0122_End
+
+Map_obj63_012C: spriteHeader
+ spritePiece -4, -8, 1, 2, 6, 0, 0, 0, 1
+Map_obj63_012C_End
+
+Map_obj63_0136: spriteHeader
+ spritePiece -4, -$C, 1, 3, 8, 0, 0, 0, 1
+Map_obj63_0136_End
+
+Map_obj63_0140: spriteHeader
+ spritePiece -4, -$C, 1, 3, $B, 0, 0, 0, 1
+Map_obj63_0140_End
+
+Map_obj63_014A: spriteHeader
+ spritePiece -4, -$C, 1, 3, $E, 0, 0, 0, 1
+Map_obj63_014A_End
+
+Map_obj63_0154: spriteHeader
+ spritePiece -4, -$10, 1, 4, $11, 0, 0, 0, 1
+Map_obj63_0154_End
+
+Map_obj63_015E: spriteHeader
+ spritePiece -4, -$10, 1, 4, $15, 0, 0, 0, 1
+Map_obj63_015E_End
+
+ even
diff --git a/mappings/sprite/obj63.bin b/mappings/sprite/obj63.bin
deleted file mode 100644
index 6e3aa9b4..00000000
Binary files a/mappings/sprite/obj63.bin and /dev/null differ
diff --git a/mappings/sprite/obj64.asm b/mappings/sprite/obj64.asm
new file mode 100644
index 00000000..84f0bb5d
--- /dev/null
+++ b/mappings/sprite/obj64.asm
@@ -0,0 +1,25 @@
+Map_obj64: mappingsTable
+ mappingsTableEntry.w Map_obj64_0004
+ mappingsTableEntry.w Map_obj64_0056
+
+Map_obj64_0004: spriteHeader
+ spritePiece -$40, -$C, 4, 3, 1, 0, 0, 0, 0
+ spritePiece -$20, -$C, 4, 3, 1, 1, 0, 0, 0
+ spritePiece 0, -$C, 4, 3, 1, 0, 0, 0, 0
+ spritePiece $20, -$C, 4, 3, 1, 1, 0, 0, 0
+ spritePiece -$28, $C, 2, 4, $D, 0, 0, 0, 0
+ spritePiece -$28, $2C, 2, 4, $D, 0, 0, 0, 0
+ spritePiece -$28, $4C, 2, 4, $D, 0, 0, 0, 0
+ spritePiece $18, $C, 2, 4, $D, 0, 0, 0, 0
+ spritePiece $18, $2C, 2, 4, $D, 0, 0, 0, 0
+ spritePiece $18, $4C, 2, 4, $D, 0, 0, 0, 0
+Map_obj64_0004_End
+
+Map_obj64_0056: spriteHeader
+ spritePiece -$10, -$20, 2, 4, $57, 0, 0, 0, 0
+ spritePiece 0, -$20, 2, 4, $57, 1, 0, 0, 0
+ spritePiece -$10, 0, 2, 4, $57, 0, 1, 0, 0
+ spritePiece 0, 0, 2, 4, $57, 1, 1, 0, 0
+Map_obj64_0056_End
+
+ even
diff --git a/mappings/sprite/obj64.bin b/mappings/sprite/obj64.bin
deleted file mode 100644
index d1bae12f..00000000
Binary files a/mappings/sprite/obj64.bin and /dev/null differ
diff --git a/mappings/sprite/obj65_a.asm b/mappings/sprite/obj65_a.asm
new file mode 100644
index 00000000..4d5b3107
--- /dev/null
+++ b/mappings/sprite/obj65_a.asm
@@ -0,0 +1,19 @@
+Map_obj65_a: mappingsTable
+ mappingsTableEntry.w Map_obj65_a_0008
+ mappingsTableEntry.w Map_obj65_a_002A
+ mappingsTableEntry.w Map_obj65_a_0008
+ mappingsTableEntry.w Map_obj65_a_0008
+
+Map_obj65_a_0008: spriteHeader
+ spritePiece -$40, -$C, 4, 3, $4B, 0, 0, 0, 0
+ spritePiece -$20, -$C, 4, 3, $4B, 0, 0, 0, 0
+ spritePiece 0, -$C, 4, 3, $4B, 0, 0, 0, 0
+ spritePiece $20, -$C, 4, 3, $4B, 0, 0, 0, 0
+Map_obj65_a_0008_End
+
+Map_obj65_a_002A: spriteHeader
+ spritePiece -$20, -$C, 4, 3, $39, 0, 0, 0, 0
+ spritePiece 0, -$C, 4, 3, $39, 1, 0, 0, 0
+Map_obj65_a_002A_End
+
+ even
diff --git a/mappings/sprite/obj65_a.bin b/mappings/sprite/obj65_a.bin
deleted file mode 100644
index 2c575bcf..00000000
Binary files a/mappings/sprite/obj65_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj65_b.asm b/mappings/sprite/obj65_b.asm
new file mode 100644
index 00000000..912492a2
--- /dev/null
+++ b/mappings/sprite/obj65_b.asm
@@ -0,0 +1,21 @@
+Map_obj65_b: mappingsTable
+ mappingsTableEntry.w Map_obj65_b_0006
+ mappingsTableEntry.w Map_obj65_b_0018
+ mappingsTableEntry.w Map_obj65_b_002A
+
+Map_obj65_b_0006: spriteHeader
+ spritePiece -$10, -$C, 2, 3, 0, 0, 0, 0, 0
+ spritePiece 0, -$C, 2, 3, 0, 1, 0, 0, 0
+Map_obj65_b_0006_End
+
+Map_obj65_b_0018: spriteHeader
+ spritePiece -$10, -$C, 2, 3, 6, 0, 0, 0, 0
+ spritePiece 0, -$C, 2, 3, 6, 1, 1, 0, 0
+Map_obj65_b_0018_End
+
+Map_obj65_b_002A: spriteHeader
+ spritePiece -$10, -$C, 2, 3, 6, 0, 1, 0, 0
+ spritePiece 0, -$C, 2, 3, 6, 1, 0, 0, 0
+Map_obj65_b_002A_End
+
+ even
diff --git a/mappings/sprite/obj65_b.bin b/mappings/sprite/obj65_b.bin
deleted file mode 100644
index 4d785135..00000000
Binary files a/mappings/sprite/obj65_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj66.asm b/mappings/sprite/obj66.asm
new file mode 100644
index 00000000..c590a6b1
--- /dev/null
+++ b/mappings/sprite/obj66.asm
@@ -0,0 +1,15 @@
+Map_obj66: mappingsTable
+ mappingsTableEntry.w Map_obj66_0004
+ mappingsTableEntry.w Map_obj66_0016
+
+Map_obj66_0004: spriteHeader
+ spritePiece -8, -$40, 2, 2, $34, 0, 0, 0, 0
+ spritePiece -8, $30, 2, 2, $34, 0, 0, 0, 0
+Map_obj66_0004_End
+
+Map_obj66_0016: spriteHeader
+ spritePiece -8, -$80, 2, 2, $34, 0, 0, 0, 0
+ spritePiece -8, $70, 2, 2, $34, 0, 0, 0, 0
+Map_obj66_0016_End
+
+ even
diff --git a/mappings/sprite/obj66.bin b/mappings/sprite/obj66.bin
deleted file mode 100644
index 67080601..00000000
Binary files a/mappings/sprite/obj66.bin and /dev/null differ
diff --git a/mappings/sprite/obj67.asm b/mappings/sprite/obj67.asm
new file mode 100644
index 00000000..7a3ff827
--- /dev/null
+++ b/mappings/sprite/obj67.asm
@@ -0,0 +1,17 @@
+Map_obj67: mappingsTable
+ mappingsTableEntry.w Map_obj67_0004
+ mappingsTableEntry.w Map_obj67_0006
+
+Map_obj67_0004: spriteHeader
+Map_obj67_0004_End
+
+Map_obj67_0006: spriteHeader
+ spritePiece -$14, -$20, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, -$20, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$14, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$14, 0, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 2, 0, 0, 0, 0, 0
+Map_obj67_0006_End
+
+ even
diff --git a/mappings/sprite/obj67.bin b/mappings/sprite/obj67.bin
deleted file mode 100644
index 49be8138..00000000
Binary files a/mappings/sprite/obj67.bin and /dev/null differ
diff --git a/mappings/sprite/obj68.asm b/mappings/sprite/obj68.asm
new file mode 100644
index 00000000..32932c79
--- /dev/null
+++ b/mappings/sprite/obj68.asm
@@ -0,0 +1,29 @@
+Map_obj68: mappingsTable
+ mappingsTableEntry.w Map_obj68_000A
+ mappingsTableEntry.w Map_obj68_0014
+ mappingsTableEntry.w Map_obj68_001E
+ mappingsTableEntry.w Map_obj68_0028
+ mappingsTableEntry.w Map_obj68_0032
+
+Map_obj68_000A: spriteHeader
+ spritePiece -4, -$10, 1, 4, 0, 0, 1, 0, 0
+Map_obj68_000A_End
+
+Map_obj68_0014: spriteHeader
+ spritePiece -$10, -4, 4, 1, 4, 0, 0, 0, 0
+Map_obj68_0014_End
+
+Map_obj68_001E: spriteHeader
+ spritePiece -4, -$10, 1, 4, 0, 0, 0, 0, 0
+Map_obj68_001E_End
+
+Map_obj68_0028: spriteHeader
+ spritePiece -$10, -4, 4, 1, 4, 1, 0, 0, 0
+Map_obj68_0028_End
+
+Map_obj68_0032: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 4, 0, 1, 0, 0, 0
+Map_obj68_0032_End
+
+ even
diff --git a/mappings/sprite/obj68.bin b/mappings/sprite/obj68.bin
deleted file mode 100644
index 35a3ebf9..00000000
Binary files a/mappings/sprite/obj68.bin and /dev/null differ
diff --git a/mappings/sprite/obj69.asm b/mappings/sprite/obj69.asm
new file mode 100644
index 00000000..ebca0feb
--- /dev/null
+++ b/mappings/sprite/obj69.asm
@@ -0,0 +1,30 @@
+Map_obj69: mappingsTable
+ mappingsTableEntry.w Map_obj69_0008
+ mappingsTableEntry.w Map_obj69_001A
+ mappingsTableEntry.w Map_obj69_0034
+ mappingsTableEntry.w Map_obj69_004E
+
+Map_obj69_0008: spriteHeader
+ spritePiece -$20, -$C, 4, 3, 0, 0, 0, 0, 0
+ spritePiece 0, -$C, 4, 3, $C, 0, 0, 0, 0
+Map_obj69_0008_End
+
+Map_obj69_001A: spriteHeader
+ spritePiece -$20, -$C, 3, 3, 3, 0, 0, 0, 0
+ spritePiece -8, -$C, 4, 3, $C, 0, 0, 0, 0
+ spritePiece $18, -$C, 1, 3, 9, 1, 0, 0, 0
+Map_obj69_001A_End
+
+Map_obj69_0034: spriteHeader
+ spritePiece -$20, -$C, 2, 3, $24, 0, 0, 0, 0
+ spritePiece -$10, -$C, 4, 3, $2A, 0, 0, 0, 0
+ spritePiece $10, -$C, 2, 3, $18, 0, 0, 0, 0
+Map_obj69_0034_End
+
+Map_obj69_004E: spriteHeader
+ spritePiece -$20, -$C, 1, 3, $27, 0, 0, 0, 0
+ spritePiece -$18, -$C, 4, 3, $18, 0, 0, 0, 0
+ spritePiece 8, -$C, 3, 3, $2D, 1, 0, 0, 0
+Map_obj69_004E_End
+
+ even
diff --git a/mappings/sprite/obj69.bin b/mappings/sprite/obj69.bin
deleted file mode 100644
index faae6003..00000000
Binary files a/mappings/sprite/obj69.bin and /dev/null differ
diff --git a/mappings/sprite/obj6A.asm b/mappings/sprite/obj6A.asm
new file mode 100644
index 00000000..bed8d6c9
--- /dev/null
+++ b/mappings/sprite/obj6A.asm
@@ -0,0 +1,11 @@
+Map_obj6A: mappingsTable
+ mappingsTableEntry.w Map_obj6A_0002
+
+Map_obj6A_0002: spriteHeader
+ spritePiece -$20, -$20, 4, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$20, 4, 4, $10, 0, 0, 0, 0
+ spritePiece -$20, 0, 4, 4, $10, 1, 1, 0, 0
+ spritePiece 0, 0, 4, 4, 0, 1, 1, 0, 0
+Map_obj6A_0002_End
+
+ even
diff --git a/mappings/sprite/obj6A.bin b/mappings/sprite/obj6A.bin
deleted file mode 100644
index 2d5476dd..00000000
Binary files a/mappings/sprite/obj6A.bin and /dev/null differ
diff --git a/mappings/sprite/obj6B.asm b/mappings/sprite/obj6B.asm
new file mode 100644
index 00000000..e86f289b
--- /dev/null
+++ b/mappings/sprite/obj6B.asm
@@ -0,0 +1,8 @@
+Map_obj6B: mappingsTable
+ mappingsTableEntry.w Map_obj6B_0002
+
+Map_obj6B_0002: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+Map_obj6B_0002_End
+
+ even
diff --git a/mappings/sprite/obj6B.bin b/mappings/sprite/obj6B.bin
deleted file mode 100644
index 45cc3f78..00000000
Binary files a/mappings/sprite/obj6B.bin and /dev/null differ
diff --git a/mappings/sprite/obj6C.asm b/mappings/sprite/obj6C.asm
new file mode 100644
index 00000000..b07fefa7
--- /dev/null
+++ b/mappings/sprite/obj6C.asm
@@ -0,0 +1,9 @@
+Map_obj6C: mappingsTable
+ mappingsTableEntry.w Map_obj6C_0002
+
+Map_obj6C_0002: spriteHeader
+ spritePiece -$10, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, 0, 1, 0, 0, 0
+Map_obj6C_0002_End
+
+ even
diff --git a/mappings/sprite/obj6C.bin b/mappings/sprite/obj6C.bin
deleted file mode 100644
index e3a06fc3..00000000
Binary files a/mappings/sprite/obj6C.bin and /dev/null differ
diff --git a/mappings/sprite/obj6E.asm b/mappings/sprite/obj6E.asm
new file mode 100644
index 00000000..9b0c23f3
--- /dev/null
+++ b/mappings/sprite/obj6E.asm
@@ -0,0 +1,34 @@
+Map_obj6E: mappingsTable
+ mappingsTableEntry.w Map_obj6E_0008
+ mappingsTableEntry.w Map_obj6E_0012
+ mappingsTableEntry.w Map_obj6E_002C
+ mappingsTableEntry.w Map_obj6E_007E
+
+Map_obj6E_0008: spriteHeader
+ spritePiece -$10, -$C, 4, 3, $25, 0, 0, 0, 0
+Map_obj6E_0008_End
+
+Map_obj6E_0012: spriteHeader
+ spritePiece -$28, -8, 4, 2, $31, 0, 0, 0, 0
+ spritePiece -8, -8, 4, 2, $31, 0, 0, 0, 0
+ spritePiece $18, -8, 2, 2, $31, 0, 0, 0, 0
+Map_obj6E_0012_End
+
+Map_obj6E_002C: spriteHeader
+ spritePiece -$60, -$18, 4, 3, $39, 0, 0, 0, 0
+ spritePiece -$40, -$18, 4, 3, $39, 1, 0, 0, 0
+ spritePiece -$20, -$18, 4, 3, $39, 0, 0, 0, 0
+ spritePiece 0, -$18, 4, 3, $39, 1, 0, 0, 0
+ spritePiece $20, -$18, 4, 3, $39, 0, 0, 0, 0
+ spritePiece $40, -$18, 4, 3, $39, 1, 0, 0, 0
+ spritePiece -$60, 0, 2, 3, $45, 0, 0, 0, 0
+ spritePiece -$50, 0, 2, 3, $45, 1, 0, 0, 0
+ spritePiece $40, 0, 2, 3, $45, 0, 0, 0, 0
+ spritePiece $50, 0, 2, 3, $45, 1, 0, 0, 0
+Map_obj6E_002C_End
+
+Map_obj6E_007E: spriteHeader
+ spritePiece -$C, -$C, 3, 3, 0, 0, 0, 0, 0
+Map_obj6E_007E_End
+
+ even
diff --git a/mappings/sprite/obj6E.bin b/mappings/sprite/obj6E.bin
deleted file mode 100644
index a7a177de..00000000
Binary files a/mappings/sprite/obj6E.bin and /dev/null differ
diff --git a/mappings/sprite/obj6F.asm b/mappings/sprite/obj6F.asm
new file mode 100644
index 00000000..0ee0f6a2
--- /dev/null
+++ b/mappings/sprite/obj6F.asm
@@ -0,0 +1,319 @@
+Map_obj6F: mappingsTable
+ mappingsTableEntry.w Map_obj6F_003A
+ mappingsTableEntry.w Map_obj6F_009C
+ mappingsTableEntry.w Map_obj6F_00E6
+ mappingsTableEntry.w Map_obj6F_0130
+ mappingsTableEntry.w Map_obj6F_017A
+ mappingsTableEntry.w Map_obj6F_01DC
+ mappingsTableEntry.w Map_obj6F_01E6
+ mappingsTableEntry.w Map_obj6F_01F0
+ mappingsTableEntry.w Map_obj6F_01FA
+ mappingsTableEntry.w Map_obj6F_0204
+ mappingsTableEntry.w Map_obj6F_020E
+ mappingsTableEntry.w Map_obj6F_0218
+ mappingsTableEntry.w Map_obj6F_0222
+ mappingsTableEntry.w Map_obj6F_024C
+ mappingsTableEntry.w Map_obj6F_02B0
+ mappingsTableEntry.w Map_obj6F_02E2
+ mappingsTableEntry.w Map_obj6F_0378
+ mappingsTableEntry.w Map_obj6F_03AA
+ mappingsTableEntry.w Map_obj6F_027E
+ mappingsTableEntry.w Map_obj6F_0314
+ mappingsTableEntry.w Map_obj6F_0346
+ mappingsTableEntry.w Map_obj6F_03E4
+ mappingsTableEntry.w Map_obj6F_03F6
+ mappingsTableEntry.w Map_obj6F_0468
+ mappingsTableEntry.w Map_obj6F_04DA
+ mappingsTableEntry.w Map_obj6F_054C
+ mappingsTableEntry.w Map_obj6F_05B6
+ mappingsTableEntry.w Map_obj6F_0610
+ mappingsTableEntry.w Map_obj6F_0662
+
+Map_obj6F_003A: spriteHeader
+ spritePiece -$60, 0, 2, 2, $2A, 0, 0, 0, 1
+ spritePiece -$50, 0, 2, 2, $22, 0, 0, 0, 1
+ spritePiece -$40, 0, 2, 2, $580, 0, 0, 0, 1
+ spritePiece -$30, 0, 2, 2, 6, 0, 0, 0, 1
+ spritePiece -$20, 0, 1, 2, $16, 0, 0, 0, 1
+ spritePiece -$18, 0, 2, 2, 2, 0, 0, 0, 1
+ spritePiece -8, 0, 2, 2, $18, 0, 0, 0, 1
+ spritePiece $10, 0, 2, 2, $2A, 0, 0, 0, 1
+ spritePiece $20, 0, 2, 2, $2E, 0, 0, 0, 1
+ spritePiece $2C, 0, 2, 2, 2, 0, 0, 0, 1
+ spritePiece $3C, 0, 2, 2, $E, 0, 0, 0, 1
+ spritePiece $4C, 0, 2, 2, $580, 0, 0, 0, 1
+Map_obj6F_003A_End
+
+Map_obj6F_009C: spriteHeader
+ spritePiece -$48, 0, 2, 2, $2A, 0, 0, 0, 1
+ spritePiece -$38, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece -$28, 0, 2, 2, $584, 0, 0, 0, 1
+ spritePiece -$18, 0, 1, 2, $16, 0, 0, 0, 1
+ spritePiece -$10, 0, 2, 2, 6, 0, 0, 0, 1
+ spritePiece 8, 0, 2, 2, $E, 0, 0, 0, 1
+ spritePiece $18, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece $28, 0, 2, 2, $2E, 0, 0, 0, 1
+ spritePiece $40, 0, 2, 2, 2, 0, 0, 0, 1
+Map_obj6F_009C_End
+
+Map_obj6F_00E6: spriteHeader
+ spritePiece -$4C, 0, 3, 2, $1C, 0, 0, 0, 1
+ spritePiece -$34, 0, 1, 2, $16, 0, 0, 0, 1
+ spritePiece -$2C, 0, 2, 2, $18, 0, 0, 0, 1
+ spritePiece -$1C, 0, 2, 2, $580, 0, 0, 0, 1
+ spritePiece -$C, 0, 2, 2, $2A, 0, 0, 0, 1
+ spritePiece $C, 0, 2, 2, $E, 0, 0, 0, 1
+ spritePiece $1C, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece $2C, 0, 2, 2, $2E, 0, 0, 0, 1
+ spritePiece $44, 0, 2, 2, 2, 0, 0, 0, 1
+Map_obj6F_00E6_End
+
+Map_obj6F_0130: spriteHeader
+ spritePiece -$45, 0, 2, 2, $2E, 0, 0, 0, 1
+ spritePiece -$38, 0, 2, 2, 2, 0, 0, 0, 1
+ spritePiece -$28, 0, 1, 2, $16, 0, 0, 0, 1
+ spritePiece -$20, 0, 2, 2, $18, 0, 0, 0, 1
+ spritePiece -$10, 0, 2, 2, $2A, 0, 0, 0, 1
+ spritePiece 8, 0, 2, 2, $E, 0, 0, 0, 1
+ spritePiece $18, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece $28, 0, 2, 2, $2E, 0, 0, 0, 1
+ spritePiece $40, 0, 2, 2, 2, 0, 0, 0, 1
+Map_obj6F_0130_End
+
+Map_obj6F_017A: spriteHeader
+ spritePiece -$68, 0, 2, 2, 6, 0, 0, 0, 1
+ spritePiece -$58, 0, 2, 2, $12, 0, 0, 0, 1
+ spritePiece -$48, 0, 2, 2, 2, 0, 0, 0, 1
+ spritePiece -$38, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece -$28, 0, 2, 2, $2A, 0, 0, 0, 1
+ spritePiece -$D, 0, 2, 2, $580, 0, 0, 0, 1
+ spritePiece 0, 0, 3, 2, $1C, 0, 0, 0, 1
+ spritePiece $18, 0, 2, 2, $580, 0, 0, 0, 1
+ spritePiece $28, 0, 2, 2, $26, 0, 0, 0, 1
+ spritePiece $38, 0, 2, 2, 2, 0, 0, 0, 1
+ spritePiece $48, 0, 2, 2, $18, 0, 0, 0, 1
+ spritePiece $58, 0, 2, 2, $A, 0, 0, 0, 1
+Map_obj6F_017A_End
+
+Map_obj6F_01DC: spriteHeader
+ spritePiece 0, 0, 2, 2, $5A4, 0, 0, 2, 1
+Map_obj6F_01DC_End
+
+Map_obj6F_01E6: spriteHeader
+ spritePiece 0, 0, 2, 2, $5A4, 0, 0, 3, 1
+Map_obj6F_01E6_End
+
+Map_obj6F_01F0: spriteHeader
+ spritePiece 0, 0, 2, 2, $5AC, 0, 0, 2, 1
+Map_obj6F_01F0_End
+
+Map_obj6F_01FA: spriteHeader
+ spritePiece 0, 0, 2, 2, $5AC, 0, 0, 3, 1
+Map_obj6F_01FA_End
+
+Map_obj6F_0204: spriteHeader
+ spritePiece 0, 0, 2, 2, $5A8, 0, 0, 3, 1
+Map_obj6F_0204_End
+
+Map_obj6F_020E: spriteHeader
+ spritePiece 0, 0, 2, 2, $5A8, 0, 0, 2, 1
+Map_obj6F_020E_End
+
+Map_obj6F_0218: spriteHeader
+ spritePiece 0, 0, 2, 2, $5A8, 0, 0, 1, 1
+Map_obj6F_0218_End
+
+Map_obj6F_0222: spriteHeader
+ spritePiece -$60, 0, 4, 2, $6CA, 0, 0, 1, 1
+ spritePiece -$40, 0, 1, 2, $6E0, 0, 0, 1, 1
+ spritePiece -$44, 0, 2, 2, $5A0, 0, 0, 0, 1
+ spritePiece $28, 0, 3, 2, $6E4, 0, 0, 0, 1
+ spritePiece $40, 0, 4, 2, $6EA, 0, 0, 0, 1
+Map_obj6F_0222_End
+
+Map_obj6F_024C: spriteHeader
+ spritePiece -$60, 0, 1, 2, $6CA, 0, 0, 1, 1
+ spritePiece -$58, 0, 4, 2, $5B0, 0, 0, 1, 1
+ spritePiece -$30, 0, 4, 2, $6D2, 0, 0, 1, 1
+ spritePiece -$10, 0, 1, 2, $6CA, 0, 0, 1, 1
+ spritePiece -$14, 0, 2, 2, $5A0, 0, 0, 0, 1
+ spritePiece $40, 0, 4, 2, $528, 0, 0, 0, 1
+Map_obj6F_024C_End
+
+Map_obj6F_027E: spriteHeader
+ spritePiece -$60, 0, 1, 2, $6CA, 0, 0, 1, 1
+ spritePiece -$58, 0, 4, 2, $5B0, 0, 0, 1, 1
+ spritePiece -$30, 0, 4, 2, $6D2, 0, 0, 1, 1
+ spritePiece -$10, 0, 1, 2, $6CA, 0, 0, 1, 1
+ spritePiece -$14, 0, 2, 2, $5A0, 0, 0, 0, 1
+ spritePiece $58, 0, 1, 2, $6F0, 0, 0, 0, 1
+Map_obj6F_027E_End
+
+Map_obj6F_02B0: spriteHeader
+ spritePiece -$60, 0, 4, 2, $5B8, 0, 0, 1, 1
+ spritePiece -$40, 0, 1, 2, $6CA, 0, 0, 1, 1
+ spritePiece -$30, 0, 4, 2, $6D2, 0, 0, 1, 1
+ spritePiece -$10, 0, 1, 2, $6CA, 0, 0, 1, 1
+ spritePiece -$14, 0, 2, 2, $5A0, 0, 0, 0, 1
+ spritePiece $40, 0, 4, 2, $530, 0, 0, 0, 1
+Map_obj6F_02B0_End
+
+Map_obj6F_02E2: spriteHeader
+ spritePiece -$60, 0, 3, 2, $5CE, 0, 0, 1, 1
+ spritePiece -$48, 0, 2, 2, $5D4, 0, 0, 1, 1
+ spritePiece -$30, 0, 4, 2, $6D2, 0, 0, 1, 1
+ spritePiece -$10, 0, 1, 2, $6CA, 0, 0, 1, 1
+ spritePiece -$14, 0, 2, 2, $5A0, 0, 0, 0, 1
+ spritePiece $40, 0, 4, 2, $530, 0, 0, 0, 1
+Map_obj6F_02E2_End
+
+Map_obj6F_0314: spriteHeader
+ spritePiece -$60, 0, 4, 2, $5B8, 0, 0, 1, 1
+ spritePiece -$40, 0, 1, 2, $6CA, 0, 0, 1, 1
+ spritePiece -$30, 0, 4, 2, $6D2, 0, 0, 1, 1
+ spritePiece -$10, 0, 1, 2, $6CA, 0, 0, 1, 1
+ spritePiece -$14, 0, 2, 2, $5A0, 0, 0, 0, 1
+ spritePiece $58, 0, 1, 2, $6F0, 0, 0, 0, 1
+Map_obj6F_0314_End
+
+Map_obj6F_0346: spriteHeader
+ spritePiece -$60, 0, 3, 2, $5CE, 0, 0, 1, 1
+ spritePiece -$48, 0, 2, 2, $5D4, 0, 0, 1, 1
+ spritePiece -$30, 0, 4, 2, $6D2, 0, 0, 1, 1
+ spritePiece -$10, 0, 1, 2, $6CA, 0, 0, 1, 1
+ spritePiece -$14, 0, 2, 2, $5A0, 0, 0, 0, 1
+ spritePiece $58, 0, 1, 2, $6F0, 0, 0, 0, 1
+Map_obj6F_0346_End
+
+Map_obj6F_0378: spriteHeader
+ spritePiece -$60, 0, 4, 2, $598, 0, 0, 1, 1
+ spritePiece -$30, 0, 4, 2, $590, 0, 0, 1, 1
+ spritePiece -$10, 0, 1, 2, $6CA, 0, 0, 1, 1
+ spritePiece -$14, 0, 2, 2, $5A0, 0, 0, 0, 1
+ spritePiece $38, 0, 4, 2, $520, 0, 0, 0, 1
+ spritePiece $58, 0, 1, 2, $6F0, 0, 0, 0, 1
+Map_obj6F_0378_End
+
+Map_obj6F_03AA: spriteHeader
+ spritePiece -$70, 0, 4, 2, $5C0, 0, 0, 1, 1
+ spritePiece -$50, 0, 3, 2, $5C8, 0, 0, 1, 1
+ spritePiece -$30, 0, 4, 2, $590, 0, 0, 1, 1
+ spritePiece -$10, 0, 1, 2, $6CA, 0, 0, 1, 1
+ spritePiece -$14, 0, 2, 2, $5A0, 0, 0, 0, 1
+ spritePiece $38, 0, 4, 2, $528, 0, 0, 0, 1
+ spritePiece $58, 0, 1, 2, $6F0, 0, 0, 0, 1
+Map_obj6F_03AA_End
+
+Map_obj6F_03E4: spriteHeader
+ spritePiece $38, 0, 4, 2, $528, 0, 0, 0, 1
+ spritePiece $58, 0, 1, 2, $6F0, 0, 0, 0, 1
+Map_obj6F_03E4_End
+
+Map_obj6F_03F6: spriteHeader
+ spritePiece -$78, 0, 2, 2, $2A, 0, 0, 0, 1
+ spritePiece -$68, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece -$58, 0, 2, 2, $584, 0, 0, 0, 1
+ spritePiece -$48, 0, 1, 2, $16, 0, 0, 0, 1
+ spritePiece -$40, 0, 2, 2, 6, 0, 0, 0, 1
+ spritePiece -$28, 0, 2, 2, $12, 0, 0, 0, 1
+ spritePiece -$18, 0, 2, 2, 2, 0, 0, 0, 1
+ spritePiece -8, 0, 2, 2, $2A, 0, 0, 0, 1
+ spritePiece $10, 0, 2, 2, 2, 0, 0, 0, 1
+ spritePiece $20, 0, 2, 2, $18, 0, 0, 0, 1
+ spritePiece $30, 0, 2, 2, $18, 0, 0, 0, 1
+ spritePiece $48, 0, 2, 2, $2E, 0, 0, 0, 1
+ spritePiece $58, 0, 2, 2, $12, 0, 0, 0, 1
+ spritePiece $68, 0, 2, 2, $580, 0, 0, 0, 1
+Map_obj6F_03F6_End
+
+Map_obj6F_0468: spriteHeader
+ spritePiece -$7C, 0, 3, 2, $1C, 0, 0, 0, 1
+ spritePiece -$64, 0, 1, 2, $16, 0, 0, 0, 1
+ spritePiece -$5C, 0, 2, 2, $18, 0, 0, 0, 1
+ spritePiece -$4C, 0, 2, 2, $580, 0, 0, 0, 1
+ spritePiece -$3C, 0, 2, 2, $2A, 0, 0, 0, 1
+ spritePiece -$24, 0, 2, 2, $12, 0, 0, 0, 1
+ spritePiece -$14, 0, 2, 2, 2, 0, 0, 0, 1
+ spritePiece -4, 0, 2, 2, $2A, 0, 0, 0, 1
+ spritePiece $14, 0, 2, 2, 2, 0, 0, 0, 1
+ spritePiece $24, 0, 2, 2, $18, 0, 0, 0, 1
+ spritePiece $34, 0, 2, 2, $18, 0, 0, 0, 1
+ spritePiece $4C, 0, 2, 2, $2E, 0, 0, 0, 1
+ spritePiece $5C, 0, 2, 2, $12, 0, 0, 0, 1
+ spritePiece $6C, 0, 2, 2, $580, 0, 0, 0, 1
+Map_obj6F_0468_End
+
+Map_obj6F_04DA: spriteHeader
+ spritePiece -$75, 0, 2, 2, $2E, 0, 0, 0, 1
+ spritePiece -$68, 0, 2, 2, 2, 0, 0, 0, 1
+ spritePiece -$58, 0, 1, 2, $16, 0, 0, 0, 1
+ spritePiece -$50, 0, 2, 2, $18, 0, 0, 0, 1
+ spritePiece -$40, 0, 2, 2, $2A, 0, 0, 0, 1
+ spritePiece -$28, 0, 2, 2, $12, 0, 0, 0, 1
+ spritePiece -$18, 0, 2, 2, 2, 0, 0, 0, 1
+ spritePiece -8, 0, 2, 2, $2A, 0, 0, 0, 1
+ spritePiece $10, 0, 2, 2, 2, 0, 0, 0, 1
+ spritePiece $20, 0, 2, 2, $18, 0, 0, 0, 1
+ spritePiece $30, 0, 2, 2, $18, 0, 0, 0, 1
+ spritePiece $48, 0, 2, 2, $2E, 0, 0, 0, 1
+ spritePiece $58, 0, 2, 2, $12, 0, 0, 0, 1
+ spritePiece $68, 0, 2, 2, $580, 0, 0, 0, 1
+Map_obj6F_04DA_End
+
+Map_obj6F_054C: spriteHeader
+ spritePiece -$70, 0, 2, 2, 6, 0, 0, 0, 1
+ spritePiece -$60, 0, 2, 2, $12, 0, 0, 0, 1
+ spritePiece -$50, 0, 2, 2, 2, 0, 0, 0, 1
+ spritePiece -$40, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece -$30, 0, 2, 2, $2A, 0, 0, 0, 1
+ spritePiece -$15, 0, 2, 2, $580, 0, 0, 0, 1
+ spritePiece -8, 0, 3, 2, $1C, 0, 0, 0, 1
+ spritePiece $10, 0, 2, 2, $580, 0, 0, 0, 1
+ spritePiece $20, 0, 2, 2, $26, 0, 0, 0, 1
+ spritePiece $30, 0, 2, 2, 2, 0, 0, 0, 1
+ spritePiece $40, 0, 2, 2, $18, 0, 0, 0, 1
+ spritePiece $50, 0, 2, 2, $A, 0, 0, 0, 1
+ spritePiece $60, 0, 2, 2, $2A, 0, 0, 0, 1
+Map_obj6F_054C_End
+
+Map_obj6F_05B6: spriteHeader
+ spritePiece -$60, 0, 2, 2, $584, 0, 0, 0, 1
+ spritePiece -$50, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece -$40, 0, 3, 2, $36, 0, 0, 0, 1
+ spritePiece -$20, 0, 2, 2, $2A, 0, 0, 0, 1
+ spritePiece -$10, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece 0, 0, 2, 2, $584, 0, 0, 0, 1
+ spritePiece $10, 0, 1, 2, $16, 0, 0, 0, 1
+ spritePiece $18, 0, 2, 2, 6, 0, 0, 0, 1
+ spritePiece $30, 0, 2, 2, 6, 0, 0, 0, 1
+ spritePiece $40, 0, 2, 2, 2, 0, 0, 0, 1
+ spritePiece $50, 0, 2, 2, $584, 0, 0, 0, 1
+Map_obj6F_05B6_End
+
+Map_obj6F_0610: spriteHeader
+ spritePiece -$50, 0, 2, 2, 6, 0, 0, 0, 1
+ spritePiece -$40, 0, 2, 2, $12, 0, 0, 0, 1
+ spritePiece -$30, 0, 2, 2, 2, 0, 0, 0, 1
+ spritePiece -$20, 0, 2, 2, $584, 0, 0, 0, 1
+ spritePiece -$10, 0, 2, 2, $E, 0, 0, 0, 1
+ spritePiece 0, 0, 2, 2, $580, 0, 0, 0, 1
+ spritePiece $18, 0, 1, 2, $16, 0, 0, 0, 1
+ spritePiece $20, 0, 2, 2, $584, 0, 0, 0, 1
+ spritePiece $30, 0, 2, 2, $2E, 0, 0, 0, 1
+ spritePiece $40, 0, 2, 2, $588, 0, 0, 0, 1
+Map_obj6F_0610_End
+
+Map_obj6F_0662: spriteHeader
+ spritePiece -$50, 0, 2, 2, $2A, 0, 0, 0, 1
+ spritePiece -$40, 0, 2, 2, $32, 0, 0, 0, 1
+ spritePiece -$30, 0, 2, 2, $22, 0, 0, 0, 1
+ spritePiece -$20, 0, 2, 2, $580, 0, 0, 0, 1
+ spritePiece -$10, 0, 2, 2, $26, 0, 0, 0, 1
+ spritePiece 8, 0, 2, 2, $2A, 0, 0, 0, 1
+ spritePiece $18, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece $28, 0, 2, 2, $584, 0, 0, 0, 1
+ spritePiece $38, 0, 1, 2, $16, 0, 0, 0, 1
+ spritePiece $40, 0, 2, 2, 6, 0, 0, 0, 1
+Map_obj6F_0662_End
+
+ even
diff --git a/mappings/sprite/obj6F.bin b/mappings/sprite/obj6F.bin
deleted file mode 100644
index d4c0151b..00000000
Binary files a/mappings/sprite/obj6F.bin and /dev/null differ
diff --git a/mappings/sprite/obj70.asm b/mappings/sprite/obj70.asm
new file mode 100644
index 00000000..c29b64b7
--- /dev/null
+++ b/mappings/sprite/obj70.asm
@@ -0,0 +1,167 @@
+Map_obj70: mappingsTable
+ mappingsTableEntry.w Map_obj70_0040
+ mappingsTableEntry.w Map_obj70_0052
+ mappingsTableEntry.w Map_obj70_005C
+ mappingsTableEntry.w Map_obj70_0066
+ mappingsTableEntry.w Map_obj70_0070
+ mappingsTableEntry.w Map_obj70_007A
+ mappingsTableEntry.w Map_obj70_0084
+ mappingsTableEntry.w Map_obj70_008E
+ mappingsTableEntry.w Map_obj70_0098
+ mappingsTableEntry.w Map_obj70_00AA
+ mappingsTableEntry.w Map_obj70_00B4
+ mappingsTableEntry.w Map_obj70_00BE
+ mappingsTableEntry.w Map_obj70_00C8
+ mappingsTableEntry.w Map_obj70_00D2
+ mappingsTableEntry.w Map_obj70_00DC
+ mappingsTableEntry.w Map_obj70_00E6
+ mappingsTableEntry.w Map_obj70_00F0
+ mappingsTableEntry.w Map_obj70_0102
+ mappingsTableEntry.w Map_obj70_010C
+ mappingsTableEntry.w Map_obj70_0116
+ mappingsTableEntry.w Map_obj70_0120
+ mappingsTableEntry.w Map_obj70_012A
+ mappingsTableEntry.w Map_obj70_0134
+ mappingsTableEntry.w Map_obj70_013E
+ mappingsTableEntry.w Map_obj70_0148
+ mappingsTableEntry.w Map_obj70_015A
+ mappingsTableEntry.w Map_obj70_0164
+ mappingsTableEntry.w Map_obj70_016E
+ mappingsTableEntry.w Map_obj70_0178
+ mappingsTableEntry.w Map_obj70_0182
+ mappingsTableEntry.w Map_obj70_018C
+ mappingsTableEntry.w Map_obj70_0196
+
+Map_obj70_0040: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 4, 0, 1, 0, 0, 0
+Map_obj70_0040_End
+
+Map_obj70_0052: spriteHeader
+ spritePiece -$C, -$10, 3, 4, 8, 1, 0, 0, 0
+Map_obj70_0052_End
+
+Map_obj70_005C: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $14, 1, 0, 0, 0
+Map_obj70_005C_End
+
+Map_obj70_0066: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $24, 1, 0, 0, 0
+Map_obj70_0066_End
+
+Map_obj70_0070: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $34, 1, 0, 0, 0
+Map_obj70_0070_End
+
+Map_obj70_007A: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $44, 1, 0, 0, 0
+Map_obj70_007A_End
+
+Map_obj70_0084: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $54, 1, 0, 0, 0
+Map_obj70_0084_End
+
+Map_obj70_008E: spriteHeader
+ spritePiece -$10, -$C, 4, 3, $64, 1, 0, 0, 0
+Map_obj70_008E_End
+
+Map_obj70_0098: spriteHeader
+ spritePiece -$10, -$10, 4, 2, $70, 1, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, $70, 1, 1, 0, 0
+Map_obj70_0098_End
+
+Map_obj70_00AA: spriteHeader
+ spritePiece -$10, -$C, 4, 3, $64, 1, 1, 0, 0
+Map_obj70_00AA_End
+
+Map_obj70_00B4: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $54, 1, 1, 0, 0
+Map_obj70_00B4_End
+
+Map_obj70_00BE: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $44, 1, 1, 0, 0
+Map_obj70_00BE_End
+
+Map_obj70_00C8: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $34, 1, 1, 0, 0
+Map_obj70_00C8_End
+
+Map_obj70_00D2: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $24, 1, 1, 0, 0
+Map_obj70_00D2_End
+
+Map_obj70_00DC: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $14, 1, 1, 0, 0
+Map_obj70_00DC_End
+
+Map_obj70_00E6: spriteHeader
+ spritePiece -$C, -$10, 3, 4, 8, 1, 1, 0, 0
+Map_obj70_00E6_End
+
+Map_obj70_00F0: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 1, 0, 0
+ spritePiece 0, -$10, 2, 4, 0, 1, 1, 0, 0
+Map_obj70_00F0_End
+
+Map_obj70_0102: spriteHeader
+ spritePiece -$C, -$10, 3, 4, 8, 0, 1, 0, 0
+Map_obj70_0102_End
+
+Map_obj70_010C: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $14, 0, 1, 0, 0
+Map_obj70_010C_End
+
+Map_obj70_0116: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $24, 0, 1, 0, 0
+Map_obj70_0116_End
+
+Map_obj70_0120: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $34, 0, 1, 0, 0
+Map_obj70_0120_End
+
+Map_obj70_012A: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $44, 0, 1, 0, 0
+Map_obj70_012A_End
+
+Map_obj70_0134: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $54, 0, 1, 0, 0
+Map_obj70_0134_End
+
+Map_obj70_013E: spriteHeader
+ spritePiece -$10, -$C, 4, 3, $64, 0, 1, 0, 0
+Map_obj70_013E_End
+
+Map_obj70_0148: spriteHeader
+ spritePiece -$10, -$10, 4, 2, $70, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, $70, 0, 1, 0, 0
+Map_obj70_0148_End
+
+Map_obj70_015A: spriteHeader
+ spritePiece -$10, -$C, 4, 3, $64, 0, 0, 0, 0
+Map_obj70_015A_End
+
+Map_obj70_0164: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $54, 0, 0, 0, 0
+Map_obj70_0164_End
+
+Map_obj70_016E: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $44, 0, 0, 0, 0
+Map_obj70_016E_End
+
+Map_obj70_0178: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $34, 0, 0, 0, 0
+Map_obj70_0178_End
+
+Map_obj70_0182: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $24, 0, 0, 0, 0
+Map_obj70_0182_End
+
+Map_obj70_018C: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $14, 0, 0, 0, 0
+Map_obj70_018C_End
+
+Map_obj70_0196: spriteHeader
+ spritePiece -$C, -$10, 3, 4, 8, 0, 0, 0, 0
+Map_obj70_0196_End
+
+ even
diff --git a/mappings/sprite/obj70.bin b/mappings/sprite/obj70.bin
deleted file mode 100644
index 3c9e0a28..00000000
Binary files a/mappings/sprite/obj70.bin and /dev/null differ
diff --git a/mappings/sprite/obj71_a.asm b/mappings/sprite/obj71_a.asm
new file mode 100644
index 00000000..1179f8cb
--- /dev/null
+++ b/mappings/sprite/obj71_a.asm
@@ -0,0 +1,25 @@
+Map_obj71_a: mappingsTable
+ mappingsTableEntry.w Map_obj71_a_0008
+ mappingsTableEntry.w Map_obj71_a_0012
+ mappingsTableEntry.w Map_obj71_a_001C
+ mappingsTableEntry.w Map_obj71_a_002E
+
+Map_obj71_a_0008: spriteHeader
+ spritePiece -$C, -$C, 3, 3, 0, 0, 0, 0, 0
+Map_obj71_a_0008_End
+
+Map_obj71_a_0012: spriteHeader
+ spritePiece -$C, -$C, 3, 3, 9, 0, 0, 0, 0
+Map_obj71_a_0012_End
+
+Map_obj71_a_001C: spriteHeader
+ spritePiece -$10, -$10, 4, 2, $12, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, $12, 1, 1, 0, 0
+Map_obj71_a_001C_End
+
+Map_obj71_a_002E: spriteHeader
+ spritePiece -$10, -$10, 4, 2, $1A, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, $1A, 1, 1, 0, 0
+Map_obj71_a_002E_End
+
+ even
diff --git a/mappings/sprite/obj71_a.bin b/mappings/sprite/obj71_a.bin
deleted file mode 100644
index 027c7a26..00000000
Binary files a/mappings/sprite/obj71_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj71_b.asm b/mappings/sprite/obj71_b.asm
new file mode 100644
index 00000000..2a495082
--- /dev/null
+++ b/mappings/sprite/obj71_b.asm
@@ -0,0 +1,37 @@
+Map_obj71_b: mappingsTable
+ mappingsTableEntry.w Map_obj71_b_000E
+ mappingsTableEntry.w Map_obj71_b_0018
+ mappingsTableEntry.w Map_obj71_b_0022
+ mappingsTableEntry.w Map_obj71_b_002C
+ mappingsTableEntry.w Map_obj71_b_0036
+ mappingsTableEntry.w Map_obj71_b_0040
+ mappingsTableEntry.w Map_obj71_b_004A
+
+Map_obj71_b_000E: spriteHeader
+ spritePiece -8, 2, 2, 1, 0, 0, 0, 0, 0
+Map_obj71_b_000E_End
+
+Map_obj71_b_0018: spriteHeader
+ spritePiece -8, 0, 2, 1, 0, 0, 0, 0, 0
+Map_obj71_b_0018_End
+
+Map_obj71_b_0022: spriteHeader
+ spritePiece -8, -2, 2, 1, 0, 0, 0, 0, 0
+Map_obj71_b_0022_End
+
+Map_obj71_b_002C: spriteHeader
+ spritePiece -8, -4, 2, 1, 0, 0, 0, 0, 0
+Map_obj71_b_002C_End
+
+Map_obj71_b_0036: spriteHeader
+ spritePiece -$C, -4, 3, 1, 2, 0, 0, 0, 0
+Map_obj71_b_0036_End
+
+Map_obj71_b_0040: spriteHeader
+ spritePiece -$10, -4, 4, 1, 5, 0, 0, 0, 0
+Map_obj71_b_0040_End
+
+Map_obj71_b_004A: spriteHeader
+Map_obj71_b_004A_End
+
+ even
diff --git a/mappings/sprite/obj71_b.bin b/mappings/sprite/obj71_b.bin
deleted file mode 100644
index 860277c0..00000000
Binary files a/mappings/sprite/obj71_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj73.asm b/mappings/sprite/obj73.asm
new file mode 100644
index 00000000..4f9b9980
--- /dev/null
+++ b/mappings/sprite/obj73.asm
@@ -0,0 +1,8 @@
+Map_obj73: mappingsTable
+ mappingsTableEntry.w Map_obj73_0002
+
+Map_obj73_0002: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj73_0002_End
+
+ even
diff --git a/mappings/sprite/obj73.bin b/mappings/sprite/obj73.bin
deleted file mode 100644
index 56e3a1b6..00000000
Binary files a/mappings/sprite/obj73.bin and /dev/null differ
diff --git a/mappings/sprite/obj74.asm b/mappings/sprite/obj74.asm
new file mode 100644
index 00000000..44943ebe
--- /dev/null
+++ b/mappings/sprite/obj74.asm
@@ -0,0 +1,27 @@
+Map_obj74: mappingsTable
+ mappingsTableEntry.w Map_obj74_0006
+ mappingsTableEntry.w Map_obj74_0028
+ mappingsTableEntry.w Map_obj74_004A
+
+Map_obj74_0006: spriteHeader
+ spritePiece -$10, -$10, 2, 2, $1C, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, $1C, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $1C, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, $1C, 0, 0, 0, 0
+Map_obj74_0006_End
+
+Map_obj74_0028: spriteHeader
+ spritePiece -$40, -$20, 2, 2, $1C, 0, 0, 0, 0
+ spritePiece $30, -$20, 2, 2, $1C, 0, 0, 0, 0
+ spritePiece -$40, $10, 2, 2, $1C, 0, 0, 0, 0
+ spritePiece $30, $10, 2, 2, $1C, 0, 0, 0, 0
+Map_obj74_0028_End
+
+Map_obj74_004A: spriteHeader
+ spritePiece -$80, -$20, 2, 2, $1C, 0, 0, 0, 0
+ spritePiece $70, -$20, 2, 2, $1C, 0, 0, 0, 0
+ spritePiece -$80, $10, 2, 2, $1C, 0, 0, 0, 0
+ spritePiece $70, $10, 2, 2, $1C, 0, 0, 0, 0
+Map_obj74_004A_End
+
+ even
diff --git a/mappings/sprite/obj74.bin b/mappings/sprite/obj74.bin
deleted file mode 100644
index 9692d326..00000000
Binary files a/mappings/sprite/obj74.bin and /dev/null differ
diff --git a/mappings/sprite/obj75.asm b/mappings/sprite/obj75.asm
new file mode 100644
index 00000000..6486579c
--- /dev/null
+++ b/mappings/sprite/obj75.asm
@@ -0,0 +1,20 @@
+Map_obj75: mappingsTable
+ mappingsTableEntry.w Map_obj75_0006
+ mappingsTableEntry.w Map_obj75_0018
+ mappingsTableEntry.w Map_obj75_0022
+
+Map_obj75_0006: spriteHeader
+ spritePiece -$10, -$10, 4, 2, $7A, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, $7A, 1, 1, 0, 0
+Map_obj75_0006_End
+
+Map_obj75_0018: spriteHeader
+ spritePiece -8, -8, 2, 2, $66, 0, 0, 2, 0
+Map_obj75_0018_End
+
+Map_obj75_0022: spriteHeader
+ spritePiece -$10, -$10, 2, 4, $40, 0, 0, 2, 0
+ spritePiece 0, -$10, 2, 4, $40, 1, 0, 2, 0
+Map_obj75_0022_End
+
+ even
diff --git a/mappings/sprite/obj75.bin b/mappings/sprite/obj75.bin
deleted file mode 100644
index ca67e696..00000000
Binary files a/mappings/sprite/obj75.bin and /dev/null differ
diff --git a/mappings/sprite/obj76.asm b/mappings/sprite/obj76.asm
new file mode 100644
index 00000000..728faff8
--- /dev/null
+++ b/mappings/sprite/obj76.asm
@@ -0,0 +1,13 @@
+Map_obj76: mappingsTable
+ mappingsTableEntry.w Map_obj76_0002
+
+Map_obj76_0002: spriteHeader
+ spritePiece -$40, -$10, 2, 2, $42C, 0, 0, 1, 0
+ spritePiece -$40, 0, 2, 2, $42C, 0, 0, 1, 0
+ spritePiece -$30, -$10, 2, 4, $40, 0, 0, 3, 0
+ spritePiece -$20, -$10, 4, 4, $48, 0, 0, 3, 0
+ spritePiece 0, -$10, 4, 4, $48, 0, 0, 3, 0
+ spritePiece $20, -$10, 4, 4, $48, 0, 0, 3, 0
+Map_obj76_0002_End
+
+ even
diff --git a/mappings/sprite/obj76.bin b/mappings/sprite/obj76.bin
deleted file mode 100644
index 0d374525..00000000
Binary files a/mappings/sprite/obj76.bin and /dev/null differ
diff --git a/mappings/sprite/obj77.asm b/mappings/sprite/obj77.asm
new file mode 100644
index 00000000..fa7f2587
--- /dev/null
+++ b/mappings/sprite/obj77.asm
@@ -0,0 +1,63 @@
+Map_obj77: mappingsTable
+ mappingsTableEntry.w Map_obj77_000A
+ mappingsTableEntry.w Map_obj77_004C
+ mappingsTableEntry.w Map_obj77_008E
+ mappingsTableEntry.w Map_obj77_00D0
+ mappingsTableEntry.w Map_obj77_0112
+
+Map_obj77_000A: spriteHeader
+ spritePiece -$40, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$30, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $10, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $20, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $30, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj77_000A_End
+
+Map_obj77_004C: spriteHeader
+ spritePiece -$40, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$32, -2, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$23, 4, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$14, $A, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 4, $A, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $13, 4, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $22, -2, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $30, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj77_004C_End
+
+Map_obj77_008E: spriteHeader
+ spritePiece -$40, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$35, 3, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$2A, $E, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$1F, $19, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $F, $19, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $1A, $E, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $25, 3, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $30, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj77_008E_End
+
+Map_obj77_00D0: spriteHeader
+ spritePiece -$40, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$3A, 6, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$34, $15, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$2E, $24, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $1E, $24, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $24, $15, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $2A, 6, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $30, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj77_00D0_End
+
+Map_obj77_0112: spriteHeader
+ spritePiece -$40, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$40, 8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$40, $18, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$40, $28, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $30, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $30, 8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $30, $18, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $30, $28, 2, 2, 0, 0, 0, 0, 0
+Map_obj77_0112_End
+
+ even
diff --git a/mappings/sprite/obj77.bin b/mappings/sprite/obj77.bin
deleted file mode 100644
index a45fa757..00000000
Binary files a/mappings/sprite/obj77.bin and /dev/null differ
diff --git a/mappings/sprite/obj79_a.asm b/mappings/sprite/obj79_a.asm
new file mode 100644
index 00000000..bf195a5e
--- /dev/null
+++ b/mappings/sprite/obj79_a.asm
@@ -0,0 +1,36 @@
+Map_obj79_a: mappingsTable
+ mappingsTableEntry.w Map_obj79_a_000A
+ mappingsTableEntry.w Map_obj79_a_002C
+ mappingsTableEntry.w Map_obj79_a_0046
+ mappingsTableEntry.w Map_obj79_a_0050
+ mappingsTableEntry.w Map_obj79_a_005A
+
+Map_obj79_a_000A: spriteHeader
+ spritePiece -4, -$18, 1, 2, 4, 0, 0, 1, 0
+ spritePiece -8, -8, 1, 4, 6, 0, 0, 1, 0
+ spritePiece 0, -8, 1, 4, 6, 1, 0, 1, 0
+ spritePiece -8, -$28, 2, 2, 0, 0, 0, 0, 0
+Map_obj79_a_000A_End
+
+Map_obj79_a_002C: spriteHeader
+ spritePiece -4, -$18, 1, 2, 4, 0, 0, 1, 0
+ spritePiece -8, -8, 1, 4, 6, 0, 0, 1, 0
+ spritePiece 0, -8, 1, 4, 6, 1, 0, 1, 0
+Map_obj79_a_002C_End
+
+Map_obj79_a_0046: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj79_a_0046_End
+
+Map_obj79_a_0050: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 1, 0
+Map_obj79_a_0050_End
+
+Map_obj79_a_005A: spriteHeader
+ spritePiece -4, -$18, 1, 2, 4, 0, 0, 1, 0
+ spritePiece -8, -8, 1, 4, 6, 0, 0, 1, 0
+ spritePiece 0, -8, 1, 4, 6, 1, 0, 1, 0
+ spritePiece -8, -$28, 2, 2, 0, 0, 0, 1, 0
+Map_obj79_a_005A_End
+
+ even
diff --git a/mappings/sprite/obj79_a.bin b/mappings/sprite/obj79_a.bin
deleted file mode 100644
index 9cd88351..00000000
Binary files a/mappings/sprite/obj79_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj79_b.asm b/mappings/sprite/obj79_b.asm
new file mode 100644
index 00000000..b2346c00
--- /dev/null
+++ b/mappings/sprite/obj79_b.asm
@@ -0,0 +1,18 @@
+Map_obj79_b: mappingsTable
+ mappingsTableEntry.w Map_obj79_b_0006
+ mappingsTableEntry.w Map_obj79_b_0010
+ mappingsTableEntry.w Map_obj79_b_001A
+
+Map_obj79_b_0006: spriteHeader
+ spritePiece -8, -8, 2, 2, $A, 0, 0, 0, 0
+Map_obj79_b_0006_End
+
+Map_obj79_b_0010: spriteHeader
+ spritePiece -4, -4, 1, 1, $E, 0, 0, 0, 0
+Map_obj79_b_0010_End
+
+Map_obj79_b_001A: spriteHeader
+ spritePiece -4, -4, 1, 1, $F, 0, 0, 0, 0
+Map_obj79_b_001A_End
+
+ even
diff --git a/mappings/sprite/obj79_b.bin b/mappings/sprite/obj79_b.bin
deleted file mode 100644
index 62391491..00000000
Binary files a/mappings/sprite/obj79_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj7A.asm b/mappings/sprite/obj7A.asm
new file mode 100644
index 00000000..1c4f8c31
--- /dev/null
+++ b/mappings/sprite/obj7A.asm
@@ -0,0 +1,9 @@
+Map_obj7A: mappingsTable
+ mappingsTableEntry.w Map_obj7A_0002
+
+Map_obj7A_0002: spriteHeader
+ spritePiece -$18, -8, 3, 2, $10, 0, 0, 0, 0
+ spritePiece 0, -8, 3, 2, $10, 1, 0, 0, 0
+Map_obj7A_0002_End
+
+ even
diff --git a/mappings/sprite/obj7A.bin b/mappings/sprite/obj7A.bin
deleted file mode 100644
index 4f5d4805..00000000
Binary files a/mappings/sprite/obj7A.bin and /dev/null differ
diff --git a/mappings/sprite/obj7B.asm b/mappings/sprite/obj7B.asm
new file mode 100644
index 00000000..54c77a7e
--- /dev/null
+++ b/mappings/sprite/obj7B.asm
@@ -0,0 +1,26 @@
+Map_obj7B: mappingsTable
+ mappingsTableEntry.w Map_obj7B_000A
+ mappingsTableEntry.w Map_obj7B_0014
+ mappingsTableEntry.w Map_obj7B_0026
+ mappingsTableEntry.w Map_obj7B_0038
+ mappingsTableEntry.w Map_obj7B_0014
+
+Map_obj7B_000A: spriteHeader
+ spritePiece -$10, -$10, 4, 2, 0, 0, 0, 0, 0
+Map_obj7B_000A_End
+
+Map_obj7B_0014: spriteHeader
+ spritePiece -$10, -$20, 2, 4, 8, 0, 0, 0, 0
+ spritePiece 0, -$20, 2, 4, 8, 1, 0, 0, 0
+Map_obj7B_0014_End
+
+Map_obj7B_0026: spriteHeader
+ spritePiece -$10, -$20, 2, 4, $10, 0, 0, 0, 0
+ spritePiece 0, -$20, 2, 4, $10, 1, 0, 0, 0
+Map_obj7B_0026_End
+
+Map_obj7B_0038: spriteHeader
+ spritePiece -$10, -$10, 4, 2, $18, 0, 0, 0, 0
+Map_obj7B_0038_End
+
+ even
diff --git a/mappings/sprite/obj7B.bin b/mappings/sprite/obj7B.bin
deleted file mode 100644
index f22fa01e..00000000
Binary files a/mappings/sprite/obj7B.bin and /dev/null differ
diff --git a/mappings/sprite/obj7C.asm b/mappings/sprite/obj7C.asm
new file mode 100644
index 00000000..ecafff04
--- /dev/null
+++ b/mappings/sprite/obj7C.asm
@@ -0,0 +1,16 @@
+Map_obj7C: mappingsTable
+ mappingsTableEntry.w Map_obj7C_0002
+
+Map_obj7C_0002: spriteHeader
+ spritePiece -$10, -$80, 4, 4, 0, 0, 0, 1, 1
+ spritePiece -$10, -$60, 4, 4, 0, 0, 1, 1, 1
+ spritePiece -$10, -$40, 4, 4, 0, 0, 0, 1, 1
+ spritePiece -$10, -$20, 4, 4, 0, 0, 1, 1, 1
+ spritePiece -$10, 0, 4, 4, 0, 0, 0, 1, 1
+ spritePiece -$10, $20, 4, 4, 0, 0, 1, 1, 1
+ spritePiece -$10, $40, 4, 4, 0, 0, 0, 1, 1
+ spritePiece -$10, $60, 4, 4, 0, 0, 1, 1, 1
+ spritePiece -$10, $7F, 4, 4, 0, 0, 0, 1, 1
+Map_obj7C_0002_End
+
+ even
diff --git a/mappings/sprite/obj7C.bin b/mappings/sprite/obj7C.bin
deleted file mode 100644
index 5dd06377..00000000
Binary files a/mappings/sprite/obj7C.bin and /dev/null differ
diff --git a/mappings/sprite/obj7D.asm b/mappings/sprite/obj7D.asm
new file mode 100644
index 00000000..ccdc5fe3
--- /dev/null
+++ b/mappings/sprite/obj7D.asm
@@ -0,0 +1,22 @@
+Map_obj7D: mappingsTable
+ mappingsTableEntry.w Map_obj7D_0008
+ mappingsTableEntry.w Map_obj7D_000A
+ mappingsTableEntry.w Map_obj7D_0014
+ mappingsTableEntry.w Map_obj7D_001E
+
+Map_obj7D_0008: spriteHeader
+Map_obj7D_0008_End
+
+Map_obj7D_000A: spriteHeader
+ spritePiece -$10, -$C, 4, 3, 0, 0, 0, 0, 0
+Map_obj7D_000A_End
+
+Map_obj7D_0014: spriteHeader
+ spritePiece -$10, -$C, 4, 3, $C, 0, 0, 0, 0
+Map_obj7D_0014_End
+
+Map_obj7D_001E: spriteHeader
+ spritePiece -$10, -$C, 4, 3, $18, 0, 0, 0, 0
+Map_obj7D_001E_End
+
+ even
diff --git a/mappings/sprite/obj7D.bin b/mappings/sprite/obj7D.bin
deleted file mode 100644
index 71758d0b..00000000
Binary files a/mappings/sprite/obj7D.bin and /dev/null differ
diff --git a/mappings/sprite/obj7E.asm b/mappings/sprite/obj7E.asm
new file mode 100644
index 00000000..8cf7a713
--- /dev/null
+++ b/mappings/sprite/obj7E.asm
@@ -0,0 +1,33 @@
+Map_obj7E: mappingsTable
+ mappingsTableEntry.w Map_obj7E_000C
+ mappingsTableEntry.w Map_obj7E_002E
+ mappingsTableEntry.w Map_obj7E_0050
+ mappingsTableEntry.w Map_obj7E_002E
+ mappingsTableEntry.w Map_obj7E_000C
+ mappingsTableEntry.w Map_obj7E_0072
+
+Map_obj7E_000C: spriteHeader
+ spritePiece -8, -8, 1, 1, 0, 0, 0, 0, 0
+ spritePiece 0, -8, 1, 1, 0, 1, 0, 0, 0
+ spritePiece -8, 0, 1, 1, 0, 0, 1, 0, 0
+ spritePiece 0, 0, 1, 1, 0, 1, 1, 0, 0
+Map_obj7E_000C_End
+
+Map_obj7E_002E: spriteHeader
+ spritePiece -$10, -$10, 2, 2, 1, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, 1, 1, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, 1, 0, 1, 0, 0
+ spritePiece 0, 0, 2, 2, 1, 1, 1, 0, 0
+Map_obj7E_002E_End
+
+Map_obj7E_0050: spriteHeader
+ spritePiece -$18, -$18, 3, 3, 5, 0, 0, 0, 0
+ spritePiece 0, -$18, 3, 3, 5, 1, 0, 0, 0
+ spritePiece -$18, 0, 3, 3, 5, 0, 1, 0, 0
+ spritePiece 0, 0, 3, 3, 5, 1, 1, 0, 0
+Map_obj7E_0050_End
+
+Map_obj7E_0072: spriteHeader
+Map_obj7E_0072_End
+
+ even
diff --git a/mappings/sprite/obj7E.bin b/mappings/sprite/obj7E.bin
deleted file mode 100644
index 2e0c18e6..00000000
Binary files a/mappings/sprite/obj7E.bin and /dev/null differ
diff --git a/mappings/sprite/obj7F.asm b/mappings/sprite/obj7F.asm
new file mode 100644
index 00000000..28b9dac1
--- /dev/null
+++ b/mappings/sprite/obj7F.asm
@@ -0,0 +1,17 @@
+Map_obj7F: mappingsTable
+ mappingsTableEntry.w Map_obj7F_0004
+ mappingsTableEntry.w Map_obj7F_001E
+
+Map_obj7F_0004: spriteHeader
+ spritePiece -8, -$30, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -8, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -8, $10, 2, 4, 8, 0, 0, 0, 0
+Map_obj7F_0004_End
+
+Map_obj7F_001E: spriteHeader
+ spritePiece -8, -$2C, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -8, -$C, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -8, $14, 2, 4, 8, 0, 0, 0, 0
+Map_obj7F_001E_End
+
+ even
diff --git a/mappings/sprite/obj7F.bin b/mappings/sprite/obj7F.bin
deleted file mode 100644
index 89fa5986..00000000
Binary files a/mappings/sprite/obj7F.bin and /dev/null differ
diff --git a/mappings/sprite/obj80_a.asm b/mappings/sprite/obj80_a.asm
new file mode 100644
index 00000000..70b28dcf
--- /dev/null
+++ b/mappings/sprite/obj80_a.asm
@@ -0,0 +1,73 @@
+Map_obj80_a: mappingsTable
+ mappingsTableEntry.w Map_obj80_a_000E
+ mappingsTableEntry.w Map_obj80_a_0028
+ mappingsTableEntry.w Map_obj80_a_004A
+ mappingsTableEntry.w Map_obj80_a_0074
+ mappingsTableEntry.w Map_obj80_a_00A6
+ mappingsTableEntry.w Map_obj80_a_00E0
+ mappingsTableEntry.w Map_obj80_a_0122
+
+Map_obj80_a_000E: spriteHeader
+ spritePiece -4, $30, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $50, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, $70, 3, 2, 4, 0, 0, 0, 0
+Map_obj80_a_000E_End
+
+Map_obj80_a_0028: spriteHeader
+ spritePiece -4, $10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $30, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $50, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, $70, 3, 2, 4, 0, 0, 0, 0
+Map_obj80_a_0028_End
+
+Map_obj80_a_004A: spriteHeader
+ spritePiece -4, -$10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $30, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $50, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, $70, 3, 2, 4, 0, 0, 0, 0
+Map_obj80_a_004A_End
+
+Map_obj80_a_0074: spriteHeader
+ spritePiece -4, -$30, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $30, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $50, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, $70, 3, 2, 4, 0, 0, 0, 0
+Map_obj80_a_0074_End
+
+Map_obj80_a_00A6: spriteHeader
+ spritePiece -4, -$50, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$30, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $30, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $50, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, $70, 3, 2, 4, 0, 0, 0, 0
+Map_obj80_a_00A6_End
+
+Map_obj80_a_00E0: spriteHeader
+ spritePiece -4, -$70, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$50, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$30, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $30, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $50, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, $70, 3, 2, 4, 0, 0, 0, 0
+Map_obj80_a_00E0_End
+
+Map_obj80_a_0122: spriteHeader
+ spritePiece -4, -$80, 1, 2, 2, 0, 0, 0, 0
+ spritePiece -4, -$70, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$50, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$30, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $30, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $50, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, $70, 3, 2, 4, 0, 0, 0, 0
+Map_obj80_a_0122_End
+
+ even
diff --git a/mappings/sprite/obj80_a.bin b/mappings/sprite/obj80_a.bin
deleted file mode 100644
index 92ebfaf4..00000000
Binary files a/mappings/sprite/obj80_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj80_b.asm b/mappings/sprite/obj80_b.asm
new file mode 100644
index 00000000..48e2e23a
--- /dev/null
+++ b/mappings/sprite/obj80_b.asm
@@ -0,0 +1,117 @@
+Map_obj80_b: mappingsTable
+ mappingsTableEntry.w Map_obj80_b_001A
+ mappingsTableEntry.w Map_obj80_b_002C
+ mappingsTableEntry.w Map_obj80_b_003E
+ mappingsTableEntry.w Map_obj80_b_0058
+ mappingsTableEntry.w Map_obj80_b_0072
+ mappingsTableEntry.w Map_obj80_b_0094
+ mappingsTableEntry.w Map_obj80_b_00B6
+ mappingsTableEntry.w Map_obj80_b_00E0
+ mappingsTableEntry.w Map_obj80_b_010A
+ mappingsTableEntry.w Map_obj80_b_013C
+ mappingsTableEntry.w Map_obj80_b_016E
+ mappingsTableEntry.w Map_obj80_b_01A8
+ mappingsTableEntry.w Map_obj80_b_01E2
+
+Map_obj80_b_001A: spriteHeader
+ spritePiece -4, $50, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, $60, 3, 4, 4, 0, 0, 0, 0
+Map_obj80_b_001A_End
+
+Map_obj80_b_002C: spriteHeader
+ spritePiece -4, $40, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, $60, 3, 4, 4, 0, 0, 0, 0
+Map_obj80_b_002C_End
+
+Map_obj80_b_003E: spriteHeader
+ spritePiece -4, $30, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -4, $40, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, $60, 3, 4, 4, 0, 0, 0, 0
+Map_obj80_b_003E_End
+
+Map_obj80_b_0058: spriteHeader
+ spritePiece -4, $20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $40, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, $60, 3, 4, 4, 0, 0, 0, 0
+Map_obj80_b_0058_End
+
+Map_obj80_b_0072: spriteHeader
+ spritePiece -4, $10, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -4, $20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $40, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, $60, 3, 4, 4, 0, 0, 0, 0
+Map_obj80_b_0072_End
+
+Map_obj80_b_0094: spriteHeader
+ spritePiece -4, 0, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $40, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, $60, 3, 4, 4, 0, 0, 0, 0
+Map_obj80_b_0094_End
+
+Map_obj80_b_00B6: spriteHeader
+ spritePiece -4, -$10, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -4, 0, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $40, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, $60, 3, 4, 4, 0, 0, 0, 0
+Map_obj80_b_00B6_End
+
+Map_obj80_b_00E0: spriteHeader
+ spritePiece -4, -$20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, 0, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $40, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, $60, 3, 4, 4, 0, 0, 0, 0
+Map_obj80_b_00E0_End
+
+Map_obj80_b_010A: spriteHeader
+ spritePiece -4, -$30, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -4, -$20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, 0, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $40, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, $60, 3, 4, 4, 0, 0, 0, 0
+Map_obj80_b_010A_End
+
+Map_obj80_b_013C: spriteHeader
+ spritePiece -4, -$40, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, 0, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $40, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, $60, 3, 4, 4, 0, 0, 0, 0
+Map_obj80_b_013C_End
+
+Map_obj80_b_016E: spriteHeader
+ spritePiece -4, -$50, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -4, -$40, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, 0, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $40, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, $60, 3, 4, 4, 0, 0, 0, 0
+Map_obj80_b_016E_End
+
+Map_obj80_b_01A8: spriteHeader
+ spritePiece -4, -$60, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$40, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, 0, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $40, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, $60, 3, 4, 4, 0, 0, 0, 0
+Map_obj80_b_01A8_End
+
+Map_obj80_b_01E2: spriteHeader
+ spritePiece -4, -$70, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -4, -$60, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$40, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, 0, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $40, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -$C, $60, 3, 4, 4, 0, 0, 0, 0
+Map_obj80_b_01E2_End
+
+ even
diff --git a/mappings/sprite/obj80_b.bin b/mappings/sprite/obj80_b.bin
deleted file mode 100644
index b7f2f0cc..00000000
Binary files a/mappings/sprite/obj80_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj81.asm b/mappings/sprite/obj81.asm
new file mode 100644
index 00000000..8967dc30
--- /dev/null
+++ b/mappings/sprite/obj81.asm
@@ -0,0 +1,12 @@
+Map_obj81: mappingsTable
+ mappingsTableEntry.w Map_obj81_0004
+ mappingsTableEntry.w Map_obj81_0006
+
+Map_obj81_0004: spriteHeader
+Map_obj81_0004_End
+
+Map_obj81_0006: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
+Map_obj81_0006_End
+
+ even
diff --git a/mappings/sprite/obj81.bin b/mappings/sprite/obj81.bin
deleted file mode 100644
index 18fe080a..00000000
Binary files a/mappings/sprite/obj81.bin and /dev/null differ
diff --git a/mappings/sprite/obj82.asm b/mappings/sprite/obj82.asm
new file mode 100644
index 00000000..5998bf74
--- /dev/null
+++ b/mappings/sprite/obj82.asm
@@ -0,0 +1,22 @@
+Map_obj82: mappingsTable
+ mappingsTableEntry.w Map_obj82_0004
+ mappingsTableEntry.w Map_obj82_0016
+
+Map_obj82_0004: spriteHeader
+ spritePiece -$20, -8, 4, 2, $55, 0, 0, 3, 0
+ spritePiece 0, -8, 4, 2, $55, 0, 0, 3, 0
+Map_obj82_0004_End
+
+Map_obj82_0016: spriteHeader
+ spritePiece -$20, -$30, 2, 2, $5D, 0, 0, 1, 0
+ spritePiece $10, -$30, 2, 2, $5D, 1, 0, 1, 0
+ spritePiece -$10, -$30, 4, 2, $61, 0, 0, 1, 0
+ spritePiece -$10, -$20, 4, 2, $69, 0, 0, 1, 0
+ spritePiece -$10, -$10, 4, 2, $69, 0, 0, 1, 0
+ spritePiece -$10, 0, 4, 2, $71, 0, 0, 1, 0
+ spritePiece -$10, $10, 4, 2, $69, 0, 0, 1, 0
+ spritePiece -$10, $20, 4, 2, $79, 0, 0, 1, 0
+ spritePiece -$10, $30, 2, 1, $81, 0, 0, 1, 0
+Map_obj82_0016_End
+
+ even
diff --git a/mappings/sprite/obj82.bin b/mappings/sprite/obj82.bin
deleted file mode 100644
index 08fc69b5..00000000
Binary files a/mappings/sprite/obj82.bin and /dev/null differ
diff --git a/mappings/sprite/obj83.asm b/mappings/sprite/obj83.asm
new file mode 100644
index 00000000..a6e201e2
--- /dev/null
+++ b/mappings/sprite/obj83.asm
@@ -0,0 +1,24 @@
+Map_obj83: mappingsTable
+ mappingsTableEntry.w Map_obj83_0008
+ mappingsTableEntry.w Map_obj83_001A
+ mappingsTableEntry.w Map_obj83_0024
+ mappingsTableEntry.w Map_obj83_0036
+
+Map_obj83_0008: spriteHeader
+ spritePiece -$20, -8, 4, 2, $55, 0, 0, 3, 0
+ spritePiece 0, -8, 4, 2, $55, 0, 0, 3, 0
+Map_obj83_0008_End
+
+Map_obj83_001A: spriteHeader
+ spritePiece -8, -8, 2, 2, $51, 0, 0, 1, 0
+Map_obj83_001A_End
+
+Map_obj83_0024: spriteHeader
+ spritePiece -$10, -$10, 4, 3, $45, 0, 0, 2, 0
+ spritePiece -8, -8, 2, 2, $51, 0, 0, 1, 0
+Map_obj83_0024_End
+
+Map_obj83_0036: spriteHeader
+Map_obj83_0036_End
+
+ even
diff --git a/mappings/sprite/obj83.bin b/mappings/sprite/obj83.bin
deleted file mode 100644
index c6670f40..00000000
Binary files a/mappings/sprite/obj83.bin and /dev/null differ
diff --git a/mappings/sprite/obj85_a.asm b/mappings/sprite/obj85_a.asm
new file mode 100644
index 00000000..0325040a
--- /dev/null
+++ b/mappings/sprite/obj85_a.asm
@@ -0,0 +1,35 @@
+Map_obj85_a: mappingsTable
+ mappingsTableEntry.w Map_obj85_a_000C
+ mappingsTableEntry.w Map_obj85_a_002E
+ mappingsTableEntry.w Map_obj85_a_0038
+ mappingsTableEntry.w Map_obj85_a_0052
+ mappingsTableEntry.w Map_obj85_a_0064
+ mappingsTableEntry.w Map_obj85_a_0064
+
+Map_obj85_a_000C: spriteHeader
+ spritePiece -$C, -$38, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, -$28, 3, 2, 6, 0, 0, 0, 0
+ spritePiece -$C, -$18, 3, 2, 6, 0, 0, 0, 0
+ spritePiece -$C, -8, 3, 2, $C, 0, 0, 0, 0
+Map_obj85_a_000C_End
+
+Map_obj85_a_002E: spriteHeader
+ spritePiece -$C, -$20, 3, 2, 0, 0, 0, 0, 0
+Map_obj85_a_002E_End
+
+Map_obj85_a_0038: spriteHeader
+ spritePiece -$C, -$30, 3, 2, 6, 0, 0, 0, 0
+ spritePiece -$C, -$20, 3, 2, 6, 0, 0, 0, 0
+ spritePiece -$C, -$10, 3, 2, $C, 0, 0, 0, 0
+Map_obj85_a_0038_End
+
+Map_obj85_a_0052: spriteHeader
+ spritePiece -$C, -$20, 3, 2, 6, 0, 0, 0, 0
+ spritePiece -$C, -$10, 3, 2, $C, 0, 0, 0, 0
+Map_obj85_a_0052_End
+
+Map_obj85_a_0064: spriteHeader
+ spritePiece -$C, -$20, 3, 2, 0, 0, 0, 1, 0
+Map_obj85_a_0064_End
+
+ even
diff --git a/mappings/sprite/obj85_a.bin b/mappings/sprite/obj85_a.bin
deleted file mode 100644
index c9fb9641..00000000
Binary files a/mappings/sprite/obj85_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj85_b.asm b/mappings/sprite/obj85_b.asm
new file mode 100644
index 00000000..3a2137ba
--- /dev/null
+++ b/mappings/sprite/obj85_b.asm
@@ -0,0 +1,26 @@
+Map_obj85_b: mappingsTable
+ mappingsTableEntry.w Map_obj85_b_000C
+ mappingsTableEntry.w Map_obj85_b_001E
+ mappingsTableEntry.w Map_obj85_b_0028
+ mappingsTableEntry.w Map_obj85_b_0028
+ mappingsTableEntry.w Map_obj85_b_0032
+ mappingsTableEntry.w Map_obj85_b_0032
+
+Map_obj85_b_000C: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+ spritePiece -$20, 0, 4, 4, $10, 0, 0, 0, 0
+Map_obj85_b_000C_End
+
+Map_obj85_b_001E: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+Map_obj85_b_001E_End
+
+Map_obj85_b_0028: spriteHeader
+ spritePiece -$20, 0, 4, 4, $10, 0, 0, 0, 0
+Map_obj85_b_0028_End
+
+Map_obj85_b_0032: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 1, 0
+Map_obj85_b_0032_End
+
+ even
diff --git a/mappings/sprite/obj85_b.bin b/mappings/sprite/obj85_b.bin
deleted file mode 100644
index dda4c951..00000000
Binary files a/mappings/sprite/obj85_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj86.asm b/mappings/sprite/obj86.asm
new file mode 100644
index 00000000..ec7d649e
--- /dev/null
+++ b/mappings/sprite/obj86.asm
@@ -0,0 +1,45 @@
+Map_obj86: mappingsTable
+ mappingsTableEntry.w Map_obj86_000C
+ mappingsTableEntry.w Map_obj86_0026
+ mappingsTableEntry.w Map_obj86_0038
+ mappingsTableEntry.w Map_obj86_0052
+ mappingsTableEntry.w Map_obj86_006C
+ mappingsTableEntry.w Map_obj86_008E
+
+Map_obj86_000C: spriteHeader
+ spritePiece -$19, -9, 3, 4, $C, 0, 0, 0, 0
+ spritePiece -1, -2, 1, 2, $18, 0, 0, 0, 0
+ spritePiece 7, 1, 2, 2, $1A, 0, 0, 0, 0
+Map_obj86_000C_End
+
+Map_obj86_0026: spriteHeader
+ spritePiece -$18, -8, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 8, -8, 2, 2, 8, 0, 0, 0, 0
+Map_obj86_0026_End
+
+Map_obj86_0038: spriteHeader
+ spritePiece -$19, -$17, 3, 4, $C, 0, 1, 0, 0
+ spritePiece -1, -$E, 1, 2, $18, 0, 1, 0, 0
+ spritePiece 7, -$11, 2, 2, $1A, 0, 1, 0, 0
+Map_obj86_0038_End
+
+Map_obj86_0052: spriteHeader
+ spritePiece -$F, -$19, 3, 2, $24, 0, 0, 0, 0
+ spritePiece -$11, -9, 3, 2, $2A, 0, 0, 0, 0
+ spritePiece -$11, 7, 2, 2, $30, 0, 0, 0, 0
+Map_obj86_0052_End
+
+Map_obj86_006C: spriteHeader
+ spritePiece -8, -$18, 1, 4, $1E, 0, 0, 0, 0
+ spritePiece 0, -$18, 1, 4, $1E, 1, 0, 0, 0
+ spritePiece -8, 8, 1, 2, $22, 0, 0, 0, 0
+ spritePiece 0, 8, 1, 2, $22, 1, 0, 0, 0
+Map_obj86_006C_End
+
+Map_obj86_008E: spriteHeader
+ spritePiece -9, -$19, 3, 2, $24, 1, 0, 0, 0
+ spritePiece -7, -9, 3, 2, $2A, 1, 0, 0, 0
+ spritePiece 1, 7, 2, 2, $30, 1, 0, 0, 0
+Map_obj86_008E_End
+
+ even
diff --git a/mappings/sprite/obj86.bin b/mappings/sprite/obj86.bin
deleted file mode 100644
index 9a2572bf..00000000
Binary files a/mappings/sprite/obj86.bin and /dev/null differ
diff --git a/mappings/sprite/obj88.asm b/mappings/sprite/obj88.asm
new file mode 100644
index 00000000..ffbaae88
--- /dev/null
+++ b/mappings/sprite/obj88.asm
@@ -0,0 +1,108 @@
+Map_obj88: mappingsTable
+ mappingsTableEntry.w Map_obj88_002A
+ mappingsTableEntry.w Map_obj88_0034
+ mappingsTableEntry.w Map_obj88_003E
+ mappingsTableEntry.w Map_obj88_0048
+ mappingsTableEntry.w Map_obj88_0052
+ mappingsTableEntry.w Map_obj88_005C
+ mappingsTableEntry.w Map_obj88_0066
+ mappingsTableEntry.w Map_obj88_0070
+ mappingsTableEntry.w Map_obj88_007A
+ mappingsTableEntry.w Map_obj88_0084
+ mappingsTableEntry.w Map_obj88_008E
+ mappingsTableEntry.w Map_obj88_0098
+ mappingsTableEntry.w Map_obj88_00A2
+ mappingsTableEntry.w Map_obj88_00AC
+ mappingsTableEntry.w Map_obj88_00B6
+ mappingsTableEntry.w Map_obj88_00C0
+ mappingsTableEntry.w Map_obj88_00CA
+ mappingsTableEntry.w Map_obj88_00D4
+ mappingsTableEntry.w Map_obj88_00DE
+ mappingsTableEntry.w Map_obj88_00E8
+ mappingsTableEntry.w Map_obj88_00F2
+
+Map_obj88_002A: spriteHeader
+ spritePiece -6, -6, 2, 3, 0, 0, 0, 0, 1
+Map_obj88_002A_End
+
+Map_obj88_0034: spriteHeader
+ spritePiece -8, 0, 3, 3, 0, 0, 0, 0, 1
+Map_obj88_0034_End
+
+Map_obj88_003E: spriteHeader
+ spritePiece -8, 8, 3, 2, 0, 0, 0, 0, 1
+Map_obj88_003E_End
+
+Map_obj88_0048: spriteHeader
+ spritePiece -9, -1, 2, 3, 0, 0, 0, 0, 1
+Map_obj88_0048_End
+
+Map_obj88_0052: spriteHeader
+ spritePiece -$B, -9, 2, 4, 0, 0, 0, 0, 1
+Map_obj88_0052_End
+
+Map_obj88_005C: spriteHeader
+ spritePiece -$10, -9, 3, 3, 0, 0, 0, 0, 1
+Map_obj88_005C_End
+
+Map_obj88_0066: spriteHeader
+ spritePiece -$10, -9, 3, 3, 0, 0, 0, 0, 1
+Map_obj88_0066_End
+
+Map_obj88_0070: spriteHeader
+ spritePiece -$C, 0, 3, 3, 0, 0, 0, 0, 1
+Map_obj88_0070_End
+
+Map_obj88_007A: spriteHeader
+ spritePiece -$D, 8, 3, 2, 0, 0, 0, 0, 1
+Map_obj88_007A_End
+
+Map_obj88_0084: spriteHeader
+ spritePiece -$F, 0, 2, 3, 0, 0, 0, 0, 1
+Map_obj88_0084_End
+
+Map_obj88_008E: spriteHeader
+ spritePiece -$C, -8, 2, 4, 0, 0, 0, 0, 1
+Map_obj88_008E_End
+
+Map_obj88_0098: spriteHeader
+ spritePiece -$E, -8, 3, 4, 0, 0, 0, 0, 1
+Map_obj88_0098_End
+
+Map_obj88_00A2: spriteHeader
+ spritePiece -$D, -8, 3, 3, 0, 0, 0, 0, 1
+Map_obj88_00A2_End
+
+Map_obj88_00AC: spriteHeader
+ spritePiece -$C, -8, 3, 3, 0, 0, 0, 0, 1
+Map_obj88_00AC_End
+
+Map_obj88_00B6: spriteHeader
+ spritePiece -$16, -4, 3, 2, 0, 0, 0, 0, 1
+Map_obj88_00B6_End
+
+Map_obj88_00C0: spriteHeader
+ spritePiece -$13, -8, 3, 3, 0, 0, 0, 0, 1
+Map_obj88_00C0_End
+
+Map_obj88_00CA: spriteHeader
+ spritePiece -$13, -8, 2, 3, 0, 0, 0, 0, 1
+Map_obj88_00CA_End
+
+Map_obj88_00D4: spriteHeader
+ spritePiece -$13, -9, 3, 2, 0, 0, 0, 0, 1
+Map_obj88_00D4_End
+
+Map_obj88_00DE: spriteHeader
+ spritePiece -$1B, -$B, 4, 2, 0, 0, 0, 0, 1
+Map_obj88_00DE_End
+
+Map_obj88_00E8: spriteHeader
+ spritePiece -$13, -$10, 3, 3, 0, 0, 0, 0, 1
+Map_obj88_00E8_End
+
+Map_obj88_00F2: spriteHeader
+ spritePiece -$13, -$10, 3, 3, 0, 0, 0, 0, 1
+Map_obj88_00F2_End
+
+ even
diff --git a/mappings/sprite/obj88.bin b/mappings/sprite/obj88.bin
deleted file mode 100644
index 2e389bd5..00000000
Binary files a/mappings/sprite/obj88.bin and /dev/null differ
diff --git a/mappings/sprite/obj89_a.asm b/mappings/sprite/obj89_a.asm
new file mode 100644
index 00000000..b8253165
--- /dev/null
+++ b/mappings/sprite/obj89_a.asm
@@ -0,0 +1,34 @@
+Map_obj89_a: mappingsTable
+ mappingsTableEntry.w Map_obj89_a_000E
+ mappingsTableEntry.w Map_obj89_a_0038
+ mappingsTableEntry.w Map_obj89_a_0038
+ mappingsTableEntry.w Map_obj89_a_0042
+ mappingsTableEntry.w Map_obj89_a_0042
+ mappingsTableEntry.w Map_obj89_a_004C
+ mappingsTableEntry.w Map_obj89_a_0056
+
+Map_obj89_a_000E: spriteHeader
+ spritePiece 0, $28, 4, 4, $88, 0, 0, 1, 0
+ spritePiece 0, 8, 4, 4, $88, 0, 0, 1, 0
+ spritePiece 0, -$18, 4, 4, $88, 0, 0, 1, 0
+ spritePiece 0, -$38, 4, 4, $88, 0, 0, 1, 0
+ spritePiece 0, -$40, 4, 1, $84, 0, 0, 1, 0
+Map_obj89_a_000E_End
+
+Map_obj89_a_0038: spriteHeader
+ spritePiece -8, -4, 2, 1, $98, 0, 0, 1, 0
+Map_obj89_a_0038_End
+
+Map_obj89_a_0042: spriteHeader
+ spritePiece -$10, -4, 4, 1, $9A, 0, 0, 1, 0
+Map_obj89_a_0042_End
+
+Map_obj89_a_004C: spriteHeader
+ spritePiece -$10, -4, 4, 1, $9E, 0, 0, 1, 0
+Map_obj89_a_004C_End
+
+Map_obj89_a_0056: spriteHeader
+ spritePiece -$10, -4, 4, 1, $A2, 0, 0, 1, 0
+Map_obj89_a_0056_End
+
+ even
diff --git a/mappings/sprite/obj89_a.bin b/mappings/sprite/obj89_a.bin
deleted file mode 100644
index 679c9739..00000000
Binary files a/mappings/sprite/obj89_a.bin and /dev/null differ
diff --git a/mappings/sprite/obj89_b.asm b/mappings/sprite/obj89_b.asm
new file mode 100644
index 00000000..4a67b577
--- /dev/null
+++ b/mappings/sprite/obj89_b.asm
@@ -0,0 +1,87 @@
+Map_obj89_b: mappingsTable
+ mappingsTableEntry.w Map_obj89_b_0018
+ mappingsTableEntry.w Map_obj89_b_002A
+ mappingsTableEntry.w Map_obj89_b_003C
+ mappingsTableEntry.w Map_obj89_b_004E
+ mappingsTableEntry.w Map_obj89_b_0060
+ mappingsTableEntry.w Map_obj89_b_0072
+ mappingsTableEntry.w Map_obj89_b_0084
+ mappingsTableEntry.w Map_obj89_b_0096
+ mappingsTableEntry.w Map_obj89_b_00A8
+ mappingsTableEntry.w Map_obj89_b_00E2
+ mappingsTableEntry.w Map_obj89_b_010C
+ mappingsTableEntry.w Map_obj89_b_0136
+
+Map_obj89_b_0018: spriteHeader
+ spritePiece -$18, -$18, 4, 2, $150, 0, 0, 0, 0
+ spritePiece -$28, -$18, 2, 2, $148, 0, 0, 0, 0
+Map_obj89_b_0018_End
+
+Map_obj89_b_002A: spriteHeader
+ spritePiece -$18, -$18, 4, 2, $158, 0, 0, 0, 0
+ spritePiece -$28, -$18, 2, 2, $148, 0, 0, 0, 0
+Map_obj89_b_002A_End
+
+Map_obj89_b_003C: spriteHeader
+ spritePiece -$18, -$18, 4, 2, $160, 0, 0, 0, 0
+ spritePiece -$28, -$18, 2, 2, $14C, 0, 0, 0, 0
+Map_obj89_b_003C_End
+
+Map_obj89_b_004E: spriteHeader
+ spritePiece -$18, -$18, 4, 2, $168, 0, 0, 0, 0
+ spritePiece -$28, -$18, 2, 2, $14C, 0, 0, 0, 0
+Map_obj89_b_004E_End
+
+Map_obj89_b_0060: spriteHeader
+ spritePiece -$18, -$18, 4, 2, $170, 0, 0, 0, 0
+ spritePiece -$28, -$18, 2, 2, $14C, 0, 0, 0, 0
+Map_obj89_b_0060_End
+
+Map_obj89_b_0072: spriteHeader
+ spritePiece -$18, -$18, 4, 2, $178, 0, 0, 0, 0
+ spritePiece -$28, -$18, 2, 2, $14C, 0, 0, 0, 0
+Map_obj89_b_0072_End
+
+Map_obj89_b_0084: spriteHeader
+ spritePiece -$18, $18, 2, 2, $7E, 0, 0, 0, 0
+ spritePiece 8, $18, 2, 2, $7E, 0, 0, 0, 0
+Map_obj89_b_0084_End
+
+Map_obj89_b_0096: spriteHeader
+ spritePiece -$18, $18, 2, 1, $82, 0, 0, 0, 0
+ spritePiece 8, $18, 2, 1, $82, 0, 0, 0, 0
+Map_obj89_b_0096_End
+
+Map_obj89_b_00A8: spriteHeader
+ spritePiece -6, -$28, 2, 2, $140, 0, 0, 0, 0
+ spritePiece 8, -$18, 2, 2, $144, 0, 0, 0, 0
+ spritePiece -$30, 0, 1, 1, $6F, 0, 0, 1, 0
+ spritePiece -$28, -8, 2, 3, $70, 0, 0, 1, 0
+ spritePiece -$18, -8, 4, 4, $128, 0, 0, 1, 0
+ spritePiece -$18, -8, 2, 4, $76, 0, 0, 1, 0
+ spritePiece 8, -8, 2, 4, $76, 0, 0, 1, 0
+Map_obj89_b_00A8_End
+
+Map_obj89_b_00E2: spriteHeader
+ spritePiece -$64, -$16, 4, 4, 0, 0, 0, 1, 0
+ spritePiece -$5C, -$2E, 3, 3, $10, 0, 0, 1, 0
+ spritePiece -$44, -$2E, 3, 4, $19, 0, 0, 1, 0
+ spritePiece -$44, -$E, 2, 2, $25, 0, 0, 1, 0
+ spritePiece -$40, -8, 2, 2, $65, 0, 0, 1, 0
+Map_obj89_b_00E2_End
+
+Map_obj89_b_010C: spriteHeader
+ spritePiece -$63, -$F, 4, 4, $29, 0, 0, 1, 0
+ spritePiece -$5B, -$27, 3, 3, $39, 0, 0, 1, 0
+ spritePiece -$43, -$27, 2, 4, $42, 0, 0, 1, 0
+ spritePiece -$43, -7, 1, 3, $4A, 0, 0, 1, 0
+ spritePiece -$40, -8, 2, 2, $69, 0, 0, 1, 0
+Map_obj89_b_010C_End
+
+Map_obj89_b_0136: spriteHeader
+ spritePiece -$60, -$14, 4, 4, $4D, 0, 0, 1, 0
+ spritePiece -$60, $C, 4, 2, $5D, 0, 0, 1, 0
+ spritePiece -$40, 0, 2, 1, $6D, 0, 0, 1, 0
+Map_obj89_b_0136_End
+
+ even
diff --git a/mappings/sprite/obj89_b.bin b/mappings/sprite/obj89_b.bin
deleted file mode 100644
index 74d529d3..00000000
Binary files a/mappings/sprite/obj89_b.bin and /dev/null differ
diff --git a/mappings/sprite/obj8A.asm b/mappings/sprite/obj8A.asm
new file mode 100644
index 00000000..1376cc24
--- /dev/null
+++ b/mappings/sprite/obj8A.asm
@@ -0,0 +1,251 @@
+Map_obj8A: mappingsTable
+ mappingsTableEntry.w Map_obj8A_0016
+ mappingsTableEntry.w Map_obj8A_0088
+ mappingsTableEntry.w Map_obj8A_010A
+ mappingsTableEntry.w Map_obj8A_015C
+ mappingsTableEntry.w Map_obj8A_021E
+ mappingsTableEntry.w Map_obj8A_02C0
+ mappingsTableEntry.w Map_obj8A_0392
+ mappingsTableEntry.w Map_obj8A_044C
+ mappingsTableEntry.w Map_obj8A_0546
+ mappingsTableEntry.w Map_obj8A_05C0
+ mappingsTableEntry.w Map_obj8A_0602
+
+Map_obj8A_0016: spriteHeader
+ spritePiece -$78, -8, 2, 2, $2E, 0, 0, 0, 0
+ spritePiece -$68, -8, 2, 2, $26, 0, 0, 0, 0
+ spritePiece -$58, -8, 2, 2, $1A, 0, 0, 0, 0
+ spritePiece -$48, -8, 1, 2, $46, 0, 0, 0, 0
+ spritePiece -$40, -8, 2, 2, $1E, 0, 0, 0, 0
+ spritePiece -$28, -8, 2, 2, $3E, 0, 0, 0, 0
+ spritePiece -$18, -8, 2, 2, $E, 0, 0, 0, 0
+ spritePiece -8, -8, 2, 2, 4, 0, 0, 0, 0
+ spritePiece 8, -8, 3, 2, 8, 0, 0, 0, 0
+ spritePiece $28, -8, 2, 2, $2E, 0, 0, 0, 0
+ spritePiece $38, -8, 2, 2, $3E, 0, 0, 0, 0
+ spritePiece $48, -8, 2, 2, 4, 0, 0, 0, 0
+ spritePiece $58, -8, 2, 2, $5C, 0, 0, 0, 0
+ spritePiece $68, -8, 2, 2, $5C, 0, 0, 0, 0
+Map_obj8A_0016_End
+
+Map_obj8A_0088: spriteHeader
+ spritePiece -$80, -$28, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$70, -$28, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$60, -$28, 3, 2, 8, 0, 0, 0, 0
+ spritePiece -$4C, -$28, 2, 2, $E, 0, 0, 0, 0
+ spritePiece -$30, -$28, 2, 2, $12, 0, 0, 0, 0
+ spritePiece -$20, -$28, 2, 2, $16, 0, 0, 0, 0
+ spritePiece -$10, -$28, 2, 2, 4, 0, 0, 0, 0
+ spritePiece 0, -$28, 2, 2, $1A, 0, 0, 0, 0
+ spritePiece -$38, 8, 2, 2, $1E, 0, 0, 0, 0
+ spritePiece -$28, 8, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$18, 8, 2, 2, $22, 0, 0, 0, 0
+ spritePiece -8, 8, 2, 2, $26, 0, 0, 0, 0
+ spritePiece 8, 8, 2, 2, $16, 0, 0, 0, 0
+ spritePiece $20, 8, 2, 2, $2A, 0, 0, 0, 0
+ spritePiece $30, 8, 2, 2, 4, 0, 0, 0, 0
+ spritePiece $44, 8, 2, 2, $2E, 0, 0, 0, 0
+Map_obj8A_0088_End
+
+Map_obj8A_010A: spriteHeader
+ spritePiece -$80, -$28, 2, 2, $12, 0, 0, 0, 0
+ spritePiece -$70, -$28, 2, 2, $22, 0, 0, 0, 0
+ spritePiece -$60, -$28, 2, 2, $26, 0, 0, 0, 0
+ spritePiece -$50, -$28, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$40, -$28, 2, 2, $22, 0, 0, 0, 0
+ spritePiece -$30, -$28, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$20, -$28, 3, 2, 8, 0, 0, 0, 0
+ spritePiece -$18, 8, 2, 2, $2A, 0, 0, 0, 0
+ spritePiece -8, 8, 2, 2, $32, 0, 0, 0, 0
+ spritePiece 8, 8, 2, 2, $36, 0, 0, 0, 0
+Map_obj8A_010A_End
+
+Map_obj8A_015C: spriteHeader
+ spritePiece -$78, -$28, 2, 2, $1E, 0, 0, 0, 0
+ spritePiece -$68, -$28, 2, 2, $3A, 0, 0, 0, 0
+ spritePiece -$58, -$28, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$48, -$28, 2, 2, $22, 0, 0, 0, 0
+ spritePiece -$38, -$28, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$28, -$28, 2, 2, $1E, 0, 0, 0, 0
+ spritePiece -$18, -$28, 2, 2, $3E, 0, 0, 0, 0
+ spritePiece -8, -$28, 2, 2, $E, 0, 0, 0, 0
+ spritePiece 8, -$28, 2, 2, $22, 0, 0, 0, 0
+ spritePiece $20, -$28, 2, 2, $42, 0, 0, 0, 0
+ spritePiece $30, -$28, 2, 2, $E, 0, 0, 0, 0
+ spritePiece $40, -$28, 2, 2, $2E, 0, 0, 0, 0
+ spritePiece $50, -$28, 1, 2, $46, 0, 0, 0, 0
+ spritePiece $58, -$28, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $68, -$28, 2, 2, $1A, 0, 0, 0, 0
+ spritePiece -$40, 8, 2, 2, $48, 0, 0, 0, 0
+ spritePiece -$30, 8, 1, 2, $46, 0, 0, 0, 0
+ spritePiece -$28, 8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$18, 8, 1, 2, $46, 0, 0, 0, 0
+ spritePiece -$10, 8, 2, 2, $2E, 0, 0, 0, 0
+ spritePiece 0, 8, 2, 2, $16, 0, 0, 0, 0
+ spritePiece $10, 8, 2, 2, 4, 0, 0, 0, 0
+ spritePiece $20, 8, 2, 2, $1A, 0, 0, 0, 0
+ spritePiece $30, 8, 2, 2, $42, 0, 0, 0, 0
+Map_obj8A_015C_End
+
+Map_obj8A_021E: spriteHeader
+ spritePiece -$60, -$30, 2, 2, $42, 0, 0, 0, 0
+ spritePiece -$50, -$30, 2, 2, $E, 0, 0, 0, 0
+ spritePiece -$40, -$30, 2, 2, $2E, 0, 0, 0, 0
+ spritePiece -$30, -$30, 1, 2, $46, 0, 0, 0, 0
+ spritePiece -$28, -$30, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$18, -$30, 2, 2, $1A, 0, 0, 0, 0
+ spritePiece -$18, 0, 2, 2, $4C, 0, 0, 0, 0
+ spritePiece -8, 0, 1, 2, $46, 0, 0, 0, 0
+ spritePiece 4, 0, 2, 2, $1A, 0, 0, 0, 0
+ spritePiece $14, 0, 2, 2, $2A, 0, 0, 0, 0
+ spritePiece $24, 0, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$30, $20, 2, 2, $12, 0, 0, 0, 0
+ spritePiece -$20, $20, 2, 2, $3A, 0, 0, 0, 0
+ spritePiece -$10, $20, 2, 2, $E, 0, 0, 0, 0
+ spritePiece 0, $20, 2, 2, $1A, 0, 0, 0, 0
+ spritePiece $10, $20, 1, 2, $46, 0, 0, 0, 0
+ spritePiece $18, $20, 2, 2, $50, 0, 0, 0, 0
+ spritePiece $30, $20, 2, 2, $22, 0, 0, 0, 0
+ spritePiece $40, $20, 1, 2, $46, 0, 0, 0, 0
+ spritePiece $48, $20, 2, 2, $E, 0, 0, 0, 0
+Map_obj8A_021E_End
+
+Map_obj8A_02C0: spriteHeader
+ spritePiece -$68, -$28, 2, 2, $2E, 0, 0, 0, 0
+ spritePiece -$58, -$28, 2, 2, $26, 0, 0, 0, 0
+ spritePiece -$48, -$28, 2, 2, $32, 0, 0, 0, 0
+ spritePiece -$38, -$28, 2, 2, $1A, 0, 0, 0, 0
+ spritePiece -$28, -$28, 2, 2, $54, 0, 0, 0, 0
+ spritePiece -8, -$28, 2, 2, $12, 0, 0, 0, 0
+ spritePiece 8, -$28, 2, 2, $22, 0, 0, 0, 0
+ spritePiece $18, -$28, 2, 2, $26, 0, 0, 0, 0
+ spritePiece $28, -$28, 2, 2, $42, 0, 0, 0, 0
+ spritePiece $38, -$28, 2, 2, $32, 0, 0, 0, 0
+ spritePiece $48, -$28, 2, 2, $1E, 0, 0, 0, 0
+ spritePiece $58, -$28, 2, 2, $E, 0, 0, 0, 0
+ spritePiece -$78, 8, 3, 2, 8, 0, 0, 0, 0
+ spritePiece -$64, 8, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$54, 8, 2, 2, $2E, 0, 0, 0, 0
+ spritePiece -$44, 8, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$34, 8, 2, 2, $3E, 0, 0, 0, 0
+ spritePiece -$24, 8, 2, 2, $26, 0, 0, 0, 0
+ spritePiece -8, 8, 2, 2, $1A, 0, 0, 0, 0
+ spritePiece 8, 8, 2, 2, 4, 0, 0, 0, 0
+ spritePiece $18, 8, 2, 2, $58, 0, 0, 0, 0
+ spritePiece $28, 8, 2, 2, 4, 0, 0, 0, 0
+ spritePiece $38, 8, 3, 2, 8, 0, 0, 0, 0
+ spritePiece $4C, 8, 2, 2, $32, 0, 0, 0, 0
+ spritePiece $5C, 8, 2, 2, $22, 0, 0, 0, 0
+ spritePiece $6C, 8, 2, 2, 4, 0, 0, 0, 0
+Map_obj8A_02C0_End
+
+Map_obj8A_0392: spriteHeader
+ spritePiece -$68, -$30, 2, 2, $2E, 0, 0, 0, 0
+ spritePiece -$58, -$30, 2, 2, $26, 0, 0, 0, 0
+ spritePiece -$48, -$30, 2, 2, $32, 0, 0, 0, 0
+ spritePiece -$38, -$30, 2, 2, $1A, 0, 0, 0, 0
+ spritePiece -$28, -$30, 2, 2, $54, 0, 0, 0, 0
+ spritePiece -8, -$30, 2, 2, $12, 0, 0, 0, 0
+ spritePiece 8, -$30, 2, 2, $22, 0, 0, 0, 0
+ spritePiece $18, -$30, 2, 2, $26, 0, 0, 0, 0
+ spritePiece $28, -$30, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $38, -$30, 2, 2, $22, 0, 0, 0, 0
+ spritePiece $48, -$30, 2, 2, 4, 0, 0, 0, 0
+ spritePiece $58, -$30, 3, 2, 8, 0, 0, 0, 0
+ spritePiece -$30, 0, 2, 2, $4C, 0, 0, 0, 0
+ spritePiece -$20, 0, 1, 2, $46, 0, 0, 0, 0
+ spritePiece -$18, 0, 3, 2, 8, 0, 0, 0, 0
+ spritePiece -4, 0, 1, 2, $46, 0, 0, 0, 0
+ spritePiece 4, 0, 2, 2, $3E, 0, 0, 0, 0
+ spritePiece $14, 0, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$30, $20, 3, 2, 8, 0, 0, 0, 0
+ spritePiece -$1C, $20, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$C, $20, 2, 2, $1E, 0, 0, 0, 0
+ spritePiece 4, $20, 2, 2, $58, 0, 0, 0, 0
+ spritePiece $14, $20, 2, 2, $2A, 0, 0, 0, 0
+Map_obj8A_0392_End
+
+Map_obj8A_044C: spriteHeader
+ spritePiece -$80, -$28, 2, 2, $2E, 0, 0, 0, 0
+ spritePiece -$70, -$28, 2, 2, $12, 0, 0, 0, 0
+ spritePiece -$60, -$28, 2, 2, $E, 0, 0, 0, 0
+ spritePiece -$50, -$28, 2, 2, $1E, 0, 0, 0, 0
+ spritePiece -$40, -$28, 1, 2, $46, 0, 0, 0, 0
+ spritePiece -$38, -$28, 2, 2, 4, 0, 0, 0, 0
+ spritePiece -$28, -$28, 2, 2, $16, 0, 0, 0, 0
+ spritePiece -8, -$28, 2, 2, $3E, 0, 0, 0, 0
+ spritePiece 8, -$28, 2, 2, $3A, 0, 0, 0, 0
+ spritePiece $18, -$28, 2, 2, 4, 0, 0, 0, 0
+ spritePiece $28, -$28, 2, 2, $1A, 0, 0, 0, 0
+ spritePiece $38, -$28, 2, 2, $58, 0, 0, 0, 0
+ spritePiece $48, -$28, 2, 2, $2E, 0, 0, 0, 0
+ spritePiece -$50, 0, 2, 2, $5C, 0, 0, 0, 0
+ spritePiece -$40, 0, 2, 2, $32, 0, 0, 0, 0
+ spritePiece -$30, 0, 2, 2, $4C, 0, 0, 0, 0
+ spritePiece -$20, 0, 1, 2, $46, 0, 0, 0, 0
+ spritePiece -$18, 0, 2, 2, $26, 0, 0, 0, 0
+ spritePiece 0, 0, 3, 2, 8, 0, 0, 0, 0
+ spritePiece $14, 0, 1, 2, $46, 0, 0, 0, 0
+ spritePiece $1C, 0, 2, 2, $1A, 0, 0, 0, 0
+ spritePiece $2C, 0, 2, 2, $E, 0, 0, 0, 0
+ spritePiece $3C, 0, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $4C, 0, 1, 2, $46, 0, 0, 0, 0
+ spritePiece $54, 0, 2, 2, $2E, 0, 0, 0, 0
+ spritePiece $64, 0, 2, 2, $3A, 0, 0, 0, 0
+ spritePiece $74, 0, 1, 2, $46, 0, 0, 0, 0
+ spritePiece -8, $20, 2, 2, $12, 0, 0, 0, 0
+ spritePiece 8, $20, 2, 2, 4, 0, 0, 0, 0
+ spritePiece $18, $20, 2, 2, $12, 0, 0, 0, 0
+ spritePiece $28, $20, 2, 2, 4, 0, 0, 0, 0
+Map_obj8A_044C_End
+
+Map_obj8A_0546: spriteHeader
+ spritePiece -$80, -8, 2, 2, $12, 0, 0, 0, 0
+ spritePiece -$70, -8, 2, 2, $22, 0, 0, 0, 0
+ spritePiece -$60, -8, 2, 2, $E, 0, 0, 0, 0
+ spritePiece -$50, -8, 2, 2, $2E, 0, 0, 0, 0
+ spritePiece -$40, -8, 2, 2, $E, 0, 0, 0, 0
+ spritePiece -$30, -8, 2, 2, $1A, 0, 0, 0, 0
+ spritePiece -$20, -8, 2, 2, $3E, 0, 0, 0, 0
+ spritePiece -$10, -8, 2, 2, $E, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, $42, 0, 0, 0, 0
+ spritePiece $18, -8, 2, 2, $48, 0, 0, 0, 0
+ spritePiece $28, -8, 2, 2, $2A, 0, 0, 0, 0
+ spritePiece $40, -8, 2, 2, $2E, 0, 0, 0, 0
+ spritePiece $50, -8, 2, 2, $E, 0, 0, 0, 0
+ spritePiece $60, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $70, -8, 2, 2, 4, 0, 0, 0, 0
+Map_obj8A_0546_End
+
+Map_obj8A_05C0: spriteHeader
+ spritePiece -$40, $30, 2, 2, $3E, 0, 0, 0, 0
+ spritePiece -$30, $30, 2, 2, $22, 0, 0, 0, 0
+ spritePiece -$20, $30, 2, 2, $2A, 0, 0, 0, 0
+ spritePiece -8, $30, 2, 2, 4, 0, 0, 0, 0
+ spritePiece 8, $30, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $18, $30, 2, 2, 4, 0, 0, 0, 0
+ spritePiece $28, $30, 1, 2, $46, 0, 0, 0, 0
+ spritePiece $30, $30, 2, 2, $1A, 0, 0, 0, 0
+Map_obj8A_05C0_End
+
+Map_obj8A_0602: spriteHeader
+ spritePiece -$4C, -$18, 2, 2, $2E, 0, 0, 0, 0
+ spritePiece -$3C, -$18, 2, 2, $26, 0, 0, 0, 0
+ spritePiece -$2C, -$18, 2, 2, $1A, 0, 0, 0, 0
+ spritePiece -$1C, -$18, 1, 2, $46, 0, 0, 0, 0
+ spritePiece -$14, -$18, 2, 2, $1E, 0, 0, 0, 0
+ spritePiece 4, -$18, 2, 2, $3E, 0, 0, 0, 0
+ spritePiece $14, -$18, 2, 2, $E, 0, 0, 0, 0
+ spritePiece $24, -$18, 2, 2, 4, 0, 0, 0, 0
+ spritePiece $34, -$18, 3, 2, 8, 0, 0, 0, 0
+ spritePiece -$40, 0, 2, 2, $12, 0, 0, 0, 0
+ spritePiece -$30, 0, 2, 2, $22, 0, 0, 0, 0
+ spritePiece -$20, 0, 2, 2, $E, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $2E, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, $E, 0, 0, 0, 0
+ spritePiece $10, 0, 2, 2, $1A, 0, 0, 0, 0
+ spritePiece $20, 0, 2, 2, $3E, 0, 0, 0, 0
+ spritePiece $30, 0, 2, 2, $2E, 0, 0, 0, 0
+Map_obj8A_0602_End
+
+ even
diff --git a/mappings/sprite/obj8A.bin b/mappings/sprite/obj8A.bin
deleted file mode 100644
index bef3b77e..00000000
Binary files a/mappings/sprite/obj8A.bin and /dev/null differ
diff --git a/mappings/sprite/obj8C.asm b/mappings/sprite/obj8C.asm
new file mode 100644
index 00000000..472dbb57
--- /dev/null
+++ b/mappings/sprite/obj8C.asm
@@ -0,0 +1,15 @@
+Map_obj8C: mappingsTable
+ mappingsTableEntry.w Map_obj8C_0004
+ mappingsTableEntry.w Map_obj8C_0016
+
+Map_obj8C_0004: spriteHeader
+ spritePiece -$C, -8, 3, 1, 0, 0, 0, 0, 0
+ spritePiece -$C, 0, 3, 1, 3, 0, 0, 0, 0
+Map_obj8C_0004_End
+
+Map_obj8C_0016: spriteHeader
+ spritePiece -$C, -8, 3, 1, 6, 0, 0, 0, 0
+ spritePiece -$C, 0, 3, 1, 3, 0, 0, 0, 0
+Map_obj8C_0016_End
+
+ even
diff --git a/mappings/sprite/obj8C.bin b/mappings/sprite/obj8C.bin
deleted file mode 100644
index 1a7e7964..00000000
Binary files a/mappings/sprite/obj8C.bin and /dev/null differ
diff --git a/mappings/sprite/obj91.asm b/mappings/sprite/obj91.asm
new file mode 100644
index 00000000..f7c0a5ef
--- /dev/null
+++ b/mappings/sprite/obj91.asm
@@ -0,0 +1,13 @@
+Map_obj91: mappingsTable
+ mappingsTableEntry.w Map_obj91_0004
+ mappingsTableEntry.w Map_obj91_000E
+
+Map_obj91_0004: spriteHeader
+ spritePiece -$10, -$C, 4, 3, 0, 0, 0, 0, 0
+Map_obj91_0004_End
+
+Map_obj91_000E: spriteHeader
+ spritePiece -$10, -$C, 4, 3, $C, 0, 0, 0, 0
+Map_obj91_000E_End
+
+ even
diff --git a/mappings/sprite/obj91.bin b/mappings/sprite/obj91.bin
deleted file mode 100644
index 07d92762..00000000
Binary files a/mappings/sprite/obj91.bin and /dev/null differ
diff --git a/mappings/sprite/obj93.asm b/mappings/sprite/obj93.asm
new file mode 100644
index 00000000..b19a719e
--- /dev/null
+++ b/mappings/sprite/obj93.asm
@@ -0,0 +1,34 @@
+Map_obj93: mappingsTable
+ mappingsTableEntry.w Map_obj93_000A
+ mappingsTableEntry.w Map_obj93_0024
+ mappingsTableEntry.w Map_obj93_003E
+ mappingsTableEntry.w Map_obj93_0050
+ mappingsTableEntry.w Map_obj93_0062
+
+Map_obj93_000A: spriteHeader
+ spritePiece -$C, 8, 3, 2, $520, 0, 0, 0, 0
+ spritePiece -8, -$18, 2, 4, $52C, 0, 0, 1, 0
+ spritePiece -8, 0, 2, 2, $3DE, 0, 0, 0, 0
+Map_obj93_000A_End
+
+Map_obj93_0024: spriteHeader
+ spritePiece -$C, 8, 3, 2, $526, 0, 0, 0, 0
+ spritePiece -8, -$18, 2, 4, $52C, 0, 0, 1, 0
+ spritePiece -8, 0, 2, 2, $3DE, 0, 0, 0, 0
+Map_obj93_0024_End
+
+Map_obj93_003E: spriteHeader
+ spritePiece -$C, 8, 3, 2, $520, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 2, $3DE, 0, 0, 0, 0
+Map_obj93_003E_End
+
+Map_obj93_0050: spriteHeader
+ spritePiece -$C, 8, 3, 2, $526, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 2, $3DE, 0, 0, 0, 0
+Map_obj93_0050_End
+
+Map_obj93_0062: spriteHeader
+ spritePiece -8, -$14, 2, 4, $52C, 0, 0, 1, 0
+Map_obj93_0062_End
+
+ even
diff --git a/mappings/sprite/obj93.bin b/mappings/sprite/obj93.bin
deleted file mode 100644
index c885437d..00000000
Binary files a/mappings/sprite/obj93.bin and /dev/null differ
diff --git a/mappings/sprite/obj95.asm b/mappings/sprite/obj95.asm
new file mode 100644
index 00000000..967069fe
--- /dev/null
+++ b/mappings/sprite/obj95.asm
@@ -0,0 +1,28 @@
+Map_obj95: mappingsTable
+ mappingsTableEntry.w Map_obj95_000A
+ mappingsTableEntry.w Map_obj95_0014
+ mappingsTableEntry.w Map_obj95_001E
+ mappingsTableEntry.w Map_obj95_0028
+ mappingsTableEntry.w Map_obj95_0032
+
+Map_obj95_000A: spriteHeader
+ spritePiece -8, -8, 2, 2, $3DE, 0, 0, 0, 0
+Map_obj95_000A_End
+
+Map_obj95_0014: spriteHeader
+ spritePiece -8, -8, 2, 2, $3DE, 0, 0, 0, 0
+Map_obj95_0014_End
+
+Map_obj95_001E: spriteHeader
+ spritePiece -8, -8, 2, 2, $3DE, 0, 0, 0, 0
+Map_obj95_001E_End
+
+Map_obj95_0028: spriteHeader
+ spritePiece -8, -8, 2, 2, $3AE, 0, 0, 0, 1
+Map_obj95_0028_End
+
+Map_obj95_0032: spriteHeader
+ spritePiece -8, -8, 2, 2, $3AE, 1, 0, 0, 1
+Map_obj95_0032_End
+
+ even
diff --git a/mappings/sprite/obj95.bin b/mappings/sprite/obj95.bin
deleted file mode 100644
index 07d26e5b..00000000
Binary files a/mappings/sprite/obj95.bin and /dev/null differ
diff --git a/mappings/sprite/obj97.asm b/mappings/sprite/obj97.asm
new file mode 100644
index 00000000..f003fbbe
--- /dev/null
+++ b/mappings/sprite/obj97.asm
@@ -0,0 +1,23 @@
+Map_obj97: mappingsTable
+ mappingsTableEntry.w Map_obj97_0008
+ mappingsTableEntry.w Map_obj97_0012
+ mappingsTableEntry.w Map_obj97_001C
+ mappingsTableEntry.w Map_obj97_0026
+
+Map_obj97_0008: spriteHeader
+ spritePiece -$14, -6, 3, 2, 0, 0, 0, 0, 0
+Map_obj97_0008_End
+
+Map_obj97_0012: spriteHeader
+ spritePiece -8, -8, 2, 2, 6, 0, 0, 0, 0
+Map_obj97_0012_End
+
+Map_obj97_001C: spriteHeader
+ spritePiece -$10, -8, 4, 2, $A, 0, 0, 0, 0
+Map_obj97_001C_End
+
+Map_obj97_0026: spriteHeader
+ spritePiece -4, -4, 1, 1, $12, 0, 0, 0, 0
+Map_obj97_0026_End
+
+ even
diff --git a/mappings/sprite/obj97.bin b/mappings/sprite/obj97.bin
deleted file mode 100644
index 6883b7c4..00000000
Binary files a/mappings/sprite/obj97.bin and /dev/null differ
diff --git a/mappings/sprite/obj99.asm b/mappings/sprite/obj99.asm
new file mode 100644
index 00000000..2f4f2fd2
--- /dev/null
+++ b/mappings/sprite/obj99.asm
@@ -0,0 +1,40 @@
+Map_obj99: mappingsTable
+ mappingsTableEntry.w Map_obj99_000A
+ mappingsTableEntry.w Map_obj99_002C
+ mappingsTableEntry.w Map_obj99_004E
+ mappingsTableEntry.w Map_obj99_0070
+ mappingsTableEntry.w Map_obj99_0092
+
+Map_obj99_000A: spriteHeader
+ spritePiece -$18, -$14, 3, 1, $12, 0, 0, 0, 0
+ spritePiece 0, -$14, 3, 1, $12, 1, 1, 0, 0
+ spritePiece -8, -$14, 2, 1, 0, 0, 0, 0, 0
+ spritePiece -$10, -$C, 4, 4, 2, 0, 0, 0, 0
+Map_obj99_000A_End
+
+Map_obj99_002C: spriteHeader
+ spritePiece -$10, -$14, 2, 1, $15, 0, 0, 0, 0
+ spritePiece 0, -$14, 2, 1, $15, 1, 1, 0, 0
+ spritePiece -8, -$14, 2, 1, 0, 0, 0, 0, 0
+ spritePiece -$10, -$C, 4, 4, 2, 0, 0, 0, 0
+Map_obj99_002C_End
+
+Map_obj99_004E: spriteHeader
+ spritePiece -8, -$14, 1, 1, $17, 0, 0, 0, 0
+ spritePiece 0, -$14, 1, 1, $17, 1, 0, 0, 0
+ spritePiece -8, -$14, 2, 1, 0, 0, 0, 0, 0
+ spritePiece -$10, -$C, 4, 4, 2, 0, 0, 0, 0
+Map_obj99_004E_End
+
+Map_obj99_0070: spriteHeader
+ spritePiece -$10, -$14, 2, 1, $15, 0, 1, 0, 0
+ spritePiece 0, -$14, 2, 1, $15, 1, 0, 0, 0
+ spritePiece -8, -$14, 2, 1, 0, 0, 0, 0, 0
+ spritePiece -$10, -$C, 4, 4, 2, 0, 0, 0, 0
+Map_obj99_0070_End
+
+Map_obj99_0092: spriteHeader
+ spritePiece -8, -8, 2, 2, $18, 0, 0, 0, 0
+Map_obj99_0092_End
+
+ even
diff --git a/mappings/sprite/obj99.bin b/mappings/sprite/obj99.bin
deleted file mode 100644
index 2c1fd465..00000000
Binary files a/mappings/sprite/obj99.bin and /dev/null differ
diff --git a/mappings/sprite/obj9C.asm b/mappings/sprite/obj9C.asm
new file mode 100644
index 00000000..9a18c3bf
--- /dev/null
+++ b/mappings/sprite/obj9C.asm
@@ -0,0 +1,57 @@
+Map_obj9C: mappingsTable
+ mappingsTableEntry.w Map_obj9C_0014
+ mappingsTableEntry.w Map_obj9C_002E
+ mappingsTableEntry.w Map_obj9C_0048
+ mappingsTableEntry.w Map_obj9C_0052
+ mappingsTableEntry.w Map_obj9C_005C
+ mappingsTableEntry.w Map_obj9C_0066
+ mappingsTableEntry.w Map_obj9C_0070
+ mappingsTableEntry.w Map_obj9C_007A
+ mappingsTableEntry.w Map_obj9C_0084
+ mappingsTableEntry.w Map_obj9C_008E
+
+Map_obj9C_0014: spriteHeader
+ spritePiece -$1C, -$10, 3, 2, 0, 0, 0, 1, 1
+ spritePiece -4, -$10, 4, 4, 6, 0, 0, 1, 1
+ spritePiece -$1C, 0, 3, 2, $16, 0, 0, 1, 1
+Map_obj9C_0014_End
+
+Map_obj9C_002E: spriteHeader
+ spritePiece -$1C, -$10, 3, 2, 0, 0, 0, 1, 1
+ spritePiece -$1C, 0, 3, 2, $1C, 0, 0, 1, 1
+ spritePiece -4, -$10, 4, 4, 6, 0, 0, 1, 1
+Map_obj9C_002E_End
+
+Map_obj9C_0048: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $22, 0, 0, 1, 1
+Map_obj9C_0048_End
+
+Map_obj9C_0052: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $2B, 0, 0, 1, 1
+Map_obj9C_0052_End
+
+Map_obj9C_005C: spriteHeader
+ spritePiece -4, -4, 1, 1, $34, 0, 0, 0, 1
+Map_obj9C_005C_End
+
+Map_obj9C_0066: spriteHeader
+ spritePiece -4, -4, 1, 1, $35, 0, 0, 0, 1
+Map_obj9C_0066_End
+
+Map_obj9C_0070: spriteHeader
+ spritePiece $1C, 6, 2, 1, $36, 0, 0, 0, 1
+Map_obj9C_0070_End
+
+Map_obj9C_007A: spriteHeader
+ spritePiece $1C, 6, 1, 1, $38, 0, 0, 0, 1
+Map_obj9C_007A_End
+
+Map_obj9C_0084: spriteHeader
+ spritePiece $1B, -5, 2, 1, $36, 0, 0, 0, 1
+Map_obj9C_0084_End
+
+Map_obj9C_008E: spriteHeader
+ spritePiece $1B, -5, 1, 1, $38, 0, 0, 0, 1
+Map_obj9C_008E_End
+
+ even
diff --git a/mappings/sprite/obj9C.bin b/mappings/sprite/obj9C.bin
deleted file mode 100644
index dd5351e9..00000000
Binary files a/mappings/sprite/obj9C.bin and /dev/null differ
diff --git a/mappings/sprite/obj9D.asm b/mappings/sprite/obj9D.asm
new file mode 100644
index 00000000..755bb3f2
--- /dev/null
+++ b/mappings/sprite/obj9D.asm
@@ -0,0 +1,33 @@
+Map_obj9D: mappingsTable
+ mappingsTableEntry.w Map_obj9D_0008
+ mappingsTableEntry.w Map_obj9D_002A
+ mappingsTableEntry.w Map_obj9D_004C
+ mappingsTableEntry.w Map_obj9D_006E
+
+Map_obj9D_0008: spriteHeader
+ spritePiece -2, 0, 2, 2, $1A, 0, 0, 0, 0
+ spritePiece -4, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, 0, 4, 2, 6, 0, 0, 0, 0
+ spritePiece $C, $10, 1, 2, $E, 0, 0, 0, 0
+Map_obj9D_0008_End
+
+Map_obj9D_002A: spriteHeader
+ spritePiece -2, 0, 2, 2, $1E, 0, 0, 0, 0
+ spritePiece -4, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, 0, 4, 2, $10, 0, 0, 0, 0
+ spritePiece $C, $10, 1, 2, $18, 0, 0, 0, 0
+Map_obj9D_002A_End
+
+Map_obj9D_004C: spriteHeader
+ spritePiece 7, -8, 1, 2, $22, 0, 0, 0, 0
+ spritePiece -4, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$C, 0, 4, 2, $10, 0, 0, 0, 0
+ spritePiece $C, $10, 1, 2, $18, 0, 0, 0, 0
+Map_obj9D_004C_End
+
+Map_obj9D_006E: spriteHeader
+ spritePiece -8, -8, 1, 2, $24, 0, 0, 2, 0
+ spritePiece 0, -8, 1, 2, $24, 1, 0, 2, 0
+Map_obj9D_006E_End
+
+ even
diff --git a/mappings/sprite/obj9D.bin b/mappings/sprite/obj9D.bin
deleted file mode 100644
index 63f86f37..00000000
Binary files a/mappings/sprite/obj9D.bin and /dev/null differ
diff --git a/mappings/sprite/obj9E.asm b/mappings/sprite/obj9E.asm
new file mode 100644
index 00000000..8375bcc1
--- /dev/null
+++ b/mappings/sprite/obj9E.asm
@@ -0,0 +1,14 @@
+Map_obj9E: mappingsTable
+ mappingsTableEntry.w Map_obj9E_0006
+ mappingsTableEntry.w Map_obj9E_0006
+ mappingsTableEntry.w Map_obj9E_0010
+
+Map_obj9E_0006: spriteHeader
+ spritePiece -$10, -8, 3, 2, 0, 0, 0, 0, 0
+Map_obj9E_0006_End
+
+Map_obj9E_0010: spriteHeader
+ spritePiece -8, -8, 2, 2, 6, 0, 0, 0, 0
+Map_obj9E_0010_End
+
+ even
diff --git a/mappings/sprite/obj9E.bin b/mappings/sprite/obj9E.bin
deleted file mode 100644
index a717aba1..00000000
Binary files a/mappings/sprite/obj9E.bin and /dev/null differ
diff --git a/mappings/sprite/objA0.asm b/mappings/sprite/objA0.asm
new file mode 100644
index 00000000..60b3e1c0
--- /dev/null
+++ b/mappings/sprite/objA0.asm
@@ -0,0 +1,44 @@
+Map_objA0: mappingsTable
+ mappingsTableEntry.w Map_objA0_000C
+ mappingsTableEntry.w Map_objA0_002E
+ mappingsTableEntry.w Map_objA0_0050
+ mappingsTableEntry.w Map_objA0_0072
+ mappingsTableEntry.w Map_objA0_008C
+ mappingsTableEntry.w Map_objA0_0096
+
+Map_objA0_000C: spriteHeader
+ spritePiece -$20, -$14, 3, 3, $18, 0, 0, 0, 0
+ spritePiece 8, -8, 2, 1, $21, 0, 0, 0, 0
+ spritePiece -$18, -$C, 3, 3, 0, 0, 0, 0, 0
+ spritePiece 0, -$C, 3, 3, 0, 1, 0, 0, 0
+Map_objA0_000C_End
+
+Map_objA0_002E: spriteHeader
+ spritePiece -$20, -$14, 3, 3, $18, 0, 0, 0, 0
+ spritePiece 8, -8, 2, 1, $21, 0, 0, 0, 0
+ spritePiece -$10, -$C, 2, 3, $12, 1, 0, 0, 0
+ spritePiece 0, -$C, 3, 3, 9, 1, 0, 0, 0
+Map_objA0_002E_End
+
+Map_objA0_0050: spriteHeader
+ spritePiece -$20, -$14, 3, 3, $18, 0, 0, 0, 0
+ spritePiece 8, -8, 2, 1, $21, 0, 0, 0, 0
+ spritePiece -$18, -$C, 3, 3, 9, 0, 0, 0, 0
+ spritePiece 0, -$C, 2, 3, $12, 0, 0, 0, 0
+Map_objA0_0050_End
+
+Map_objA0_0072: spriteHeader
+ spritePiece 8, -8, 2, 1, $21, 0, 0, 0, 0
+ spritePiece -$18, -$C, 3, 3, 0, 0, 0, 0, 0
+ spritePiece 0, -$C, 3, 3, 0, 1, 0, 0, 0
+Map_objA0_0072_End
+
+Map_objA0_008C: spriteHeader
+ spritePiece -4, -4, 1, 1, $23, 0, 0, 0, 0
+Map_objA0_008C_End
+
+Map_objA0_0096: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $18, 0, 0, 0, 0
+Map_objA0_0096_End
+
+ even
diff --git a/mappings/sprite/objA0.bin b/mappings/sprite/objA0.bin
deleted file mode 100644
index 5efc7f93..00000000
Binary files a/mappings/sprite/objA0.bin and /dev/null differ
diff --git a/mappings/sprite/objA2.asm b/mappings/sprite/objA2.asm
new file mode 100644
index 00000000..a4ad56fc
--- /dev/null
+++ b/mappings/sprite/objA2.asm
@@ -0,0 +1,78 @@
+Map_objA2: mappingsTable
+ mappingsTableEntry.w Map_objA2_0012
+ mappingsTableEntry.w Map_objA2_004C
+ mappingsTableEntry.w Map_objA2_0086
+ mappingsTableEntry.w Map_objA2_00C0
+ mappingsTableEntry.w Map_objA2_00FA
+ mappingsTableEntry.w Map_objA2_0114
+ mappingsTableEntry.w Map_objA2_0126
+ mappingsTableEntry.w Map_objA2_0138
+ mappingsTableEntry.w Map_objA2_014A
+
+Map_objA2_0012: spriteHeader
+ spritePiece -$C, -7, 2, 1, $1A, 0, 0, 0, 0
+ spritePiece -$C, 1, 1, 1, $1C, 0, 0, 0, 0
+ spritePiece -$10, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 3, 2, 6, 0, 0, 0, 0
+ spritePiece 8, 0, 1, 2, $C, 0, 0, 0, 0
+ spritePiece -$20, -9, 2, 1, $1A, 0, 0, 0, 0
+ spritePiece -$20, -1, 1, 1, $1C, 0, 0, 0, 0
+Map_objA2_0012_End
+
+Map_objA2_004C: spriteHeader
+ spritePiece -$C, -8, 2, 1, $1A, 0, 0, 0, 0
+ spritePiece -$C, 0, 1, 1, $1C, 0, 0, 0, 0
+ spritePiece -$10, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 3, 2, $E, 0, 0, 0, 0
+ spritePiece 8, 0, 1, 2, $C, 0, 0, 0, 0
+ spritePiece -$20, -8, 2, 1, $1A, 0, 0, 0, 0
+ spritePiece -$20, 0, 1, 1, $1C, 0, 0, 0, 0
+Map_objA2_004C_End
+
+Map_objA2_0086: spriteHeader
+ spritePiece -$C, -9, 2, 1, $1A, 0, 0, 0, 0
+ spritePiece -$C, -1, 1, 1, $1C, 0, 0, 0, 0
+ spritePiece -$10, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 3, 2, $14, 0, 0, 0, 0
+ spritePiece 8, 0, 1, 2, $C, 0, 0, 0, 0
+ spritePiece -$20, -7, 2, 1, $1A, 0, 0, 0, 0
+ spritePiece -$20, 1, 1, 1, $1C, 0, 0, 0, 0
+Map_objA2_0086_End
+
+Map_objA2_00C0: spriteHeader
+ spritePiece -$C, -$20, 2, 1, $1E, 1, 1, 0, 0
+ spritePiece -4, -$18, 1, 1, $1D, 1, 1, 0, 0
+ spritePiece -$10, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 3, 2, 6, 0, 0, 0, 0
+ spritePiece 8, 0, 1, 2, $C, 0, 0, 0, 0
+ spritePiece -$20, -$20, 2, 1, $1E, 1, 1, 0, 0
+ spritePiece -$18, -$18, 1, 1, $1D, 1, 1, 0, 0
+Map_objA2_00C0_End
+
+Map_objA2_00FA: spriteHeader
+ spritePiece -$10, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 3, 2, 6, 0, 0, 0, 0
+ spritePiece 8, 0, 1, 2, $C, 0, 0, 0, 0
+Map_objA2_00FA_End
+
+Map_objA2_0114: spriteHeader
+ spritePiece -$10, -$10, 2, 1, $1A, 0, 0, 0, 0
+ spritePiece -$10, -8, 1, 1, $1C, 0, 0, 0, 0
+Map_objA2_0114_End
+
+Map_objA2_0126: spriteHeader
+ spritePiece -$10, 0, 1, 1, $1D, 0, 0, 0, 0
+ spritePiece -$10, 8, 2, 1, $1E, 0, 0, 0, 0
+Map_objA2_0126_End
+
+Map_objA2_0138: spriteHeader
+ spritePiece 8, 0, 1, 1, $1C, 1, 1, 0, 0
+ spritePiece 0, 8, 2, 1, $1A, 1, 1, 0, 0
+Map_objA2_0138_End
+
+Map_objA2_014A: spriteHeader
+ spritePiece 0, -$10, 2, 1, $1E, 1, 1, 0, 0
+ spritePiece 8, -8, 1, 1, $1D, 1, 1, 0, 0
+Map_objA2_014A_End
+
+ even
diff --git a/mappings/sprite/objA2.bin b/mappings/sprite/objA2.bin
deleted file mode 100644
index 96616afd..00000000
Binary files a/mappings/sprite/objA2.bin and /dev/null differ
diff --git a/mappings/sprite/objA3.asm b/mappings/sprite/objA3.asm
new file mode 100644
index 00000000..6246bd3d
--- /dev/null
+++ b/mappings/sprite/objA3.asm
@@ -0,0 +1,42 @@
+Map_objA3: mappingsTable
+ mappingsTableEntry.w Map_objA3_000A
+ mappingsTableEntry.w Map_objA3_0014
+ mappingsTableEntry.w Map_objA3_0026
+ mappingsTableEntry.w Map_objA3_0048
+ mappingsTableEntry.w Map_objA3_007A
+
+Map_objA3_000A: spriteHeader
+ spritePiece -$10, -8, 3, 2, 0, 0, 0, 0, 0
+Map_objA3_000A_End
+
+Map_objA3_0014: spriteHeader
+ spritePiece -8, -8, 2, 2, 6, 0, 0, 1, 0
+ spritePiece -$10, -8, 3, 2, 0, 0, 0, 0, 0
+Map_objA3_0014_End
+
+Map_objA3_0026: spriteHeader
+ spritePiece -8, -8, 1, 2, $A, 0, 0, 1, 0
+ spritePiece 0, -8, 1, 2, $A, 1, 0, 1, 0
+ spritePiece -8, -8, 2, 2, 6, 0, 0, 1, 0
+ spritePiece -$10, -8, 3, 2, 0, 0, 0, 0, 0
+Map_objA3_0026_End
+
+Map_objA3_0048: spriteHeader
+ spritePiece -$10, -$10, 2, 2, $C, 0, 0, 1, 0
+ spritePiece 0, -$10, 2, 2, $C, 1, 0, 1, 0
+ spritePiece -$10, 0, 2, 2, $C, 0, 1, 1, 0
+ spritePiece 0, 0, 2, 2, $C, 1, 1, 1, 0
+ spritePiece -8, -8, 2, 2, 6, 0, 0, 1, 0
+ spritePiece -$10, -8, 3, 2, 0, 0, 0, 0, 0
+Map_objA3_0048_End
+
+Map_objA3_007A: spriteHeader
+ spritePiece -$10, -$10, 2, 2, $10, 0, 0, 1, 0
+ spritePiece 0, -$10, 2, 2, $10, 1, 0, 1, 0
+ spritePiece -$10, 0, 2, 2, $10, 0, 1, 1, 0
+ spritePiece 0, 0, 2, 2, $10, 1, 1, 1, 0
+ spritePiece -8, -8, 2, 2, 6, 0, 0, 1, 0
+ spritePiece -$10, -8, 3, 2, 0, 0, 0, 0, 0
+Map_objA3_007A_End
+
+ even
diff --git a/mappings/sprite/objA3.bin b/mappings/sprite/objA3.bin
deleted file mode 100644
index 395ac522..00000000
Binary files a/mappings/sprite/objA3.bin and /dev/null differ
diff --git a/mappings/sprite/objA4.asm b/mappings/sprite/objA4.asm
new file mode 100644
index 00000000..fbb2ca02
--- /dev/null
+++ b/mappings/sprite/objA4.asm
@@ -0,0 +1,31 @@
+Map_objA4: mappingsTable
+ mappingsTableEntry.w Map_objA4_000A
+ mappingsTableEntry.w Map_objA4_001C
+ mappingsTableEntry.w Map_objA4_0036
+ mappingsTableEntry.w Map_objA4_0040
+ mappingsTableEntry.w Map_objA4_004A
+
+Map_objA4_000A: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 4, 0, 1, 0, 0, 0
+Map_objA4_000A_End
+
+Map_objA4_001C: spriteHeader
+ spritePiece -4, -3, 1, 1, $E, 0, 0, 1, 0
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 4, 0, 1, 0, 0, 0
+Map_objA4_001C_End
+
+Map_objA4_0036: spriteHeader
+ spritePiece -4, -8, 1, 2, 8, 0, 0, 0, 0
+Map_objA4_0036_End
+
+Map_objA4_0040: spriteHeader
+ spritePiece -8, -4, 2, 1, $A, 0, 0, 0, 0
+Map_objA4_0040_End
+
+Map_objA4_004A: spriteHeader
+ spritePiece -4, -8, 1, 2, $C, 0, 0, 0, 0
+Map_objA4_004A_End
+
+ even
diff --git a/mappings/sprite/objA4.bin b/mappings/sprite/objA4.bin
deleted file mode 100644
index df19d60b..00000000
Binary files a/mappings/sprite/objA4.bin and /dev/null differ
diff --git a/mappings/sprite/objA6.asm b/mappings/sprite/objA6.asm
new file mode 100644
index 00000000..ddfaa347
--- /dev/null
+++ b/mappings/sprite/objA6.asm
@@ -0,0 +1,61 @@
+Map_objA6: mappingsTable
+ mappingsTableEntry.w Map_objA6_0010
+ mappingsTableEntry.w Map_objA6_0032
+ mappingsTableEntry.w Map_objA6_0054
+ mappingsTableEntry.w Map_objA6_0076
+ mappingsTableEntry.w Map_objA6_0098
+ mappingsTableEntry.w Map_objA6_00BA
+ mappingsTableEntry.w Map_objA6_00DC
+ mappingsTableEntry.w Map_objA6_00E6
+
+Map_objA6_0010: spriteHeader
+ spritePiece -8, -$C, 1, 1, 0, 0, 0, 0, 0
+ spritePiece -$18, -4, 3, 2, 1, 0, 0, 0, 0
+ spritePiece 0, -$C, 1, 1, 0, 1, 0, 0, 0
+ spritePiece 0, -4, 3, 2, 1, 1, 0, 0, 0
+Map_objA6_0010_End
+
+Map_objA6_0032: spriteHeader
+ spritePiece -8, -$C, 1, 1, 0, 0, 0, 0, 0
+ spritePiece -$18, -4, 3, 2, 7, 0, 0, 0, 0
+ spritePiece 0, -$C, 1, 1, 0, 1, 0, 0, 0
+ spritePiece 0, -4, 3, 2, 7, 1, 0, 0, 0
+Map_objA6_0032_End
+
+Map_objA6_0054: spriteHeader
+ spritePiece -$10, -$C, 2, 1, $D, 0, 0, 0, 0
+ spritePiece -$18, -4, 3, 2, 1, 0, 0, 0, 0
+ spritePiece 0, -$C, 2, 1, $D, 1, 0, 0, 0
+ spritePiece 0, -4, 3, 2, 1, 1, 0, 0, 0
+Map_objA6_0054_End
+
+Map_objA6_0076: spriteHeader
+ spritePiece -$C, -$18, 2, 3, $F, 0, 0, 0, 0
+ spritePiece 4, -8, 1, 1, $15, 0, 0, 0, 0
+ spritePiece -$C, 0, 2, 3, $F, 0, 1, 0, 0
+ spritePiece 4, 0, 1, 1, $15, 0, 1, 0, 0
+Map_objA6_0076_End
+
+Map_objA6_0098: spriteHeader
+ spritePiece -$C, -$18, 2, 3, $16, 0, 0, 0, 0
+ spritePiece 4, -8, 1, 1, $15, 0, 0, 0, 0
+ spritePiece -$C, 0, 2, 3, $16, 0, 1, 0, 0
+ spritePiece 4, 0, 1, 1, $15, 0, 1, 0, 0
+Map_objA6_0098_End
+
+Map_objA6_00BA: spriteHeader
+ spritePiece -$C, -$18, 2, 3, $F, 0, 0, 0, 0
+ spritePiece 4, -$10, 1, 2, $1C, 0, 0, 0, 0
+ spritePiece -$C, 0, 2, 3, $F, 0, 1, 0, 0
+ spritePiece 4, 0, 1, 2, $1C, 0, 1, 0, 0
+Map_objA6_00BA_End
+
+Map_objA6_00DC: spriteHeader
+ spritePiece -4, -4, 1, 1, $1E, 0, 0, 0, 0
+Map_objA6_00DC_End
+
+Map_objA6_00E6: spriteHeader
+ spritePiece -4, -4, 1, 1, $1F, 0, 0, 0, 0
+Map_objA6_00E6_End
+
+ even
diff --git a/mappings/sprite/objA6.bin b/mappings/sprite/objA6.bin
deleted file mode 100644
index 525fb4bc..00000000
Binary files a/mappings/sprite/objA6.bin and /dev/null differ
diff --git a/mappings/sprite/objAC.asm b/mappings/sprite/objAC.asm
new file mode 100644
index 00000000..d63f1581
--- /dev/null
+++ b/mappings/sprite/objAC.asm
@@ -0,0 +1,20 @@
+Map_objAC: mappingsTable
+ mappingsTableEntry.w Map_objAC_0004
+ mappingsTableEntry.w Map_objAC_0026
+
+Map_objAC_0004: spriteHeader
+ spritePiece -$24, -$C, 4, 2, 0, 0, 0, 0, 1
+ spritePiece $C, -$14, 2, 1, 8, 0, 0, 0, 1
+ spritePiece -4, -$C, 4, 2, $A, 0, 0, 0, 1
+ spritePiece -4, 4, 3, 1, $12, 0, 0, 0, 1
+Map_objAC_0004_End
+
+Map_objAC_0026: spriteHeader
+ spritePiece -$24, -$C, 4, 2, 0, 0, 0, 0, 1
+ spritePiece $C, -$14, 2, 1, 8, 0, 0, 0, 1
+ spritePiece -4, -$C, 4, 2, $A, 0, 0, 0, 1
+ spritePiece $C, 4, 3, 1, $15, 0, 0, 0, 1
+ spritePiece $1C, $C, 1, 1, $18, 0, 0, 0, 1
+Map_objAC_0026_End
+
+ even
diff --git a/mappings/sprite/objAC.bin b/mappings/sprite/objAC.bin
deleted file mode 100644
index 54fa19e4..00000000
Binary files a/mappings/sprite/objAC.bin and /dev/null differ
diff --git a/mappings/sprite/objAE.asm b/mappings/sprite/objAE.asm
new file mode 100644
index 00000000..7610bb70
--- /dev/null
+++ b/mappings/sprite/objAE.asm
@@ -0,0 +1,127 @@
+Map_objAE: mappingsTable
+ mappingsTableEntry.w Map_objAE_002C
+ mappingsTableEntry.w Map_objAE_0036
+ mappingsTableEntry.w Map_objAE_0040
+ mappingsTableEntry.w Map_objAE_004A
+ mappingsTableEntry.w Map_objAE_005C
+ mappingsTableEntry.w Map_objAE_006E
+ mappingsTableEntry.w Map_objAE_0080
+ mappingsTableEntry.w Map_objAE_0092
+ mappingsTableEntry.w Map_objAE_00A4
+ mappingsTableEntry.w Map_objAE_00BE
+ mappingsTableEntry.w Map_objAE_00D8
+ mappingsTableEntry.w Map_objAE_00F2
+ mappingsTableEntry.w Map_objAE_010C
+ mappingsTableEntry.w Map_objAE_011E
+ mappingsTableEntry.w Map_objAE_0128
+ mappingsTableEntry.w Map_objAE_0132
+ mappingsTableEntry.w Map_objAE_013C
+ mappingsTableEntry.w Map_objAE_0146
+ mappingsTableEntry.w Map_objAE_0150
+ mappingsTableEntry.w Map_objAE_015A
+ mappingsTableEntry.w Map_objAE_0164
+ mappingsTableEntry.w Map_objAE_016E
+
+Map_objAE_002C: spriteHeader
+ spritePiece -$10, $C, 4, 2, 0, 0, 0, 1, 0
+Map_objAE_002C_End
+
+Map_objAE_0036: spriteHeader
+ spritePiece -$10, 8, 4, 2, 0, 0, 0, 1, 0
+Map_objAE_0036_End
+
+Map_objAE_0040: spriteHeader
+ spritePiece -$10, 4, 4, 2, 0, 0, 0, 1, 0
+Map_objAE_0040_End
+
+Map_objAE_004A: spriteHeader
+ spritePiece -$10, 0, 4, 2, 0, 0, 0, 1, 0
+ spritePiece -$10, $10, 4, 2, 8, 0, 0, 1, 0
+Map_objAE_004A_End
+
+Map_objAE_005C: spriteHeader
+ spritePiece -$10, -4, 4, 2, 0, 0, 0, 1, 0
+ spritePiece -$10, $C, 4, 2, 8, 0, 0, 1, 0
+Map_objAE_005C_End
+
+Map_objAE_006E: spriteHeader
+ spritePiece -$10, -8, 4, 2, 0, 0, 0, 1, 0
+ spritePiece -$10, 8, 4, 2, 8, 0, 0, 1, 0
+Map_objAE_006E_End
+
+Map_objAE_0080: spriteHeader
+ spritePiece -$10, -$C, 4, 2, 0, 0, 0, 1, 0
+ spritePiece -$10, 4, 4, 2, 8, 0, 0, 1, 0
+Map_objAE_0080_End
+
+Map_objAE_0092: spriteHeader
+ spritePiece -$10, -$10, 4, 2, 0, 0, 0, 1, 0
+ spritePiece -$10, 0, 4, 2, 8, 0, 0, 1, 0
+Map_objAE_0092_End
+
+Map_objAE_00A4: spriteHeader
+ spritePiece -$10, -$10, 4, 2, 0, 0, 0, 1, 0
+ spritePiece -$10, 0, 4, 2, 8, 0, 0, 1, 0
+ spritePiece -$12, 7, 1, 1, $10, 0, 0, 1, 0
+Map_objAE_00A4_End
+
+Map_objAE_00BE: spriteHeader
+ spritePiece -$10, -$10, 4, 2, 0, 0, 0, 1, 0
+ spritePiece -$10, 0, 4, 2, 8, 0, 0, 1, 0
+ spritePiece -$14, 7, 1, 1, $10, 0, 0, 1, 0
+Map_objAE_00BE_End
+
+Map_objAE_00D8: spriteHeader
+ spritePiece -$10, -$10, 4, 2, 0, 0, 0, 1, 0
+ spritePiece -$10, 0, 4, 2, 8, 0, 0, 1, 0
+ spritePiece -$16, 7, 1, 1, $10, 0, 0, 1, 0
+Map_objAE_00D8_End
+
+Map_objAE_00F2: spriteHeader
+ spritePiece -$10, -$10, 4, 2, 0, 0, 0, 1, 0
+ spritePiece -$10, 0, 4, 2, 8, 0, 0, 1, 0
+ spritePiece -$18, 7, 1, 1, $10, 0, 0, 1, 0
+Map_objAE_00F2_End
+
+Map_objAE_010C: spriteHeader
+ spritePiece -$18, -8, 3, 2, $11, 0, 0, 3, 0
+ spritePiece 0, -8, 3, 2, $11, 1, 0, 3, 0
+Map_objAE_010C_End
+
+Map_objAE_011E: spriteHeader
+ spritePiece -4, -4, 1, 1, $17, 0, 0, 0, 0
+Map_objAE_011E_End
+
+Map_objAE_0128: spriteHeader
+ spritePiece -4, -4, 1, 1, $18, 0, 0, 0, 0
+Map_objAE_0128_End
+
+Map_objAE_0132: spriteHeader
+ spritePiece -4, -4, 1, 1, $19, 0, 0, 0, 0
+Map_objAE_0132_End
+
+Map_objAE_013C: spriteHeader
+ spritePiece -4, -4, 1, 1, $18, 0, 1, 0, 0
+Map_objAE_013C_End
+
+Map_objAE_0146: spriteHeader
+ spritePiece -4, -4, 1, 1, $17, 0, 1, 0, 0
+Map_objAE_0146_End
+
+Map_objAE_0150: spriteHeader
+ spritePiece -4, -4, 1, 1, $18, 1, 1, 0, 0
+Map_objAE_0150_End
+
+Map_objAE_015A: spriteHeader
+ spritePiece -4, -4, 1, 1, $19, 1, 0, 0, 0
+Map_objAE_015A_End
+
+Map_objAE_0164: spriteHeader
+ spritePiece -4, -4, 1, 1, $18, 1, 0, 0, 0
+Map_objAE_0164_End
+
+Map_objAE_016E: spriteHeader
+ spritePiece -$10, $10, 4, 2, 0, 0, 0, 1, 0
+Map_objAE_016E_End
+
+ even
diff --git a/mappings/sprite/objAE.bin b/mappings/sprite/objAE.bin
deleted file mode 100644
index c89f9d20..00000000
Binary files a/mappings/sprite/objAE.bin and /dev/null differ
diff --git a/mappings/sprite/objAF_a.asm b/mappings/sprite/objAF_a.asm
new file mode 100644
index 00000000..c3a6b5ae
--- /dev/null
+++ b/mappings/sprite/objAF_a.asm
@@ -0,0 +1,152 @@
+Map_objAF_a: mappingsTable
+ mappingsTableEntry.w Map_objAF_a_002E
+ mappingsTableEntry.w Map_objAF_a_0058
+ mappingsTableEntry.w Map_objAF_a_0082
+ mappingsTableEntry.w Map_objAF_a_00AC
+ mappingsTableEntry.w Map_objAF_a_00CE
+ mappingsTableEntry.w Map_objAF_a_00F0
+ mappingsTableEntry.w Map_objAF_a_0112
+ mappingsTableEntry.w Map_objAF_a_0134
+ mappingsTableEntry.w Map_objAF_a_0156
+ mappingsTableEntry.w Map_objAF_a_0178
+ mappingsTableEntry.w Map_objAF_a_018A
+ mappingsTableEntry.w Map_objAF_a_019C
+ mappingsTableEntry.w Map_objAF_a_01AE
+ mappingsTableEntry.w Map_objAF_a_01C0
+ mappingsTableEntry.w Map_objAF_a_01CA
+ mappingsTableEntry.w Map_objAF_a_01D4
+ mappingsTableEntry.w Map_objAF_a_01DE
+ mappingsTableEntry.w Map_objAF_a_01E8
+ mappingsTableEntry.w Map_objAF_a_01F2
+ mappingsTableEntry.w Map_objAF_a_01FC
+ mappingsTableEntry.w Map_objAF_a_0206
+ mappingsTableEntry.w Map_objAF_a_0210
+ mappingsTableEntry.w Map_objAF_a_021A
+
+Map_objAF_a_002E: spriteHeader
+ spritePiece -$D, -$1C, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$11, -$C, 4, 4, 6, 0, 0, 0, 0
+ spritePiece -$14, $14, 4, 1, $16, 0, 0, 0, 0
+ spritePiece -$C, -$1C, 2, 1, $6F, 0, 0, 0, 0
+ spritePiece 4, -$1C, 2, 4, $71, 0, 0, 0, 0
+Map_objAF_a_002E_End
+
+Map_objAF_a_0058: spriteHeader
+ spritePiece -$D, -$1C, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$11, -$C, 4, 4, 6, 0, 0, 0, 0
+ spritePiece -$14, $14, 4, 1, $16, 0, 0, 0, 0
+ spritePiece -$C, -$1C, 2, 1, $79, 0, 0, 0, 0
+ spritePiece 4, -$1C, 2, 4, $7B, 0, 0, 0, 0
+Map_objAF_a_0058_End
+
+Map_objAF_a_0082: spriteHeader
+ spritePiece -$D, -$1C, 3, 2, 0, 0, 0, 0, 0
+ spritePiece -$11, -$C, 4, 4, 6, 0, 0, 0, 0
+ spritePiece -$14, $14, 4, 1, $16, 0, 0, 0, 0
+ spritePiece -$C, -$1C, 2, 1, $83, 0, 0, 0, 0
+ spritePiece 4, -$1C, 2, 4, $85, 0, 0, 0, 0
+Map_objAF_a_0082_End
+
+Map_objAF_a_00AC: spriteHeader
+ spritePiece -$14, -$1C, 4, 4, $1A, 0, 0, 0, 0
+ spritePiece $C, -$1C, 1, 4, $2A, 0, 0, 0, 0
+ spritePiece -$C, 4, 4, 3, $2E, 0, 0, 0, 0
+ spritePiece -$14, $14, 1, 1, $3A, 0, 0, 0, 0
+Map_objAF_a_00AC_End
+
+Map_objAF_a_00CE: spriteHeader
+ spritePiece -$10, -$1C, 4, 3, $3B, 0, 0, 0, 0
+ spritePiece -$18, 4, 1, 2, $47, 0, 0, 0, 0
+ spritePiece -$10, -4, 4, 4, $49, 0, 0, 0, 0
+ spritePiece $10, -4, 1, 4, $59, 0, 0, 0, 0
+Map_objAF_a_00CE_End
+
+Map_objAF_a_00F0: spriteHeader
+ spritePiece -$10, -$1C, 2, 3, $5D, 0, 0, 0, 0
+ spritePiece 0, -$1C, 2, 3, $5D, 1, 0, 0, 0
+ spritePiece -$18, -4, 3, 4, $63, 0, 0, 0, 0
+ spritePiece 0, -4, 3, 4, $63, 1, 0, 0, 0
+Map_objAF_a_00F0_End
+
+Map_objAF_a_0112: spriteHeader
+ spritePiece -$18, -$12, 3, 3, $8D, 0, 0, 0, 0
+ spritePiece 0, -$12, 3, 3, $96, 0, 0, 0, 0
+ spritePiece -$18, 6, 3, 3, $96, 1, 1, 0, 0
+ spritePiece 0, 6, 3, 3, $8D, 1, 1, 0, 0
+Map_objAF_a_0112_End
+
+Map_objAF_a_0134: spriteHeader
+ spritePiece -$18, -$12, 3, 3, $9F, 0, 0, 0, 0
+ spritePiece 0, -$12, 3, 3, $A8, 0, 0, 0, 0
+ spritePiece -$18, 6, 3, 3, $A8, 1, 1, 0, 0
+ spritePiece 0, 6, 3, 3, $9F, 1, 1, 0, 0
+Map_objAF_a_0134_End
+
+Map_objAF_a_0156: spriteHeader
+ spritePiece -$18, -$12, 3, 3, $B1, 0, 0, 0, 0
+ spritePiece 0, -$12, 3, 3, $BA, 0, 0, 0, 0
+ spritePiece -$18, 6, 3, 3, $BA, 1, 1, 0, 0
+ spritePiece 0, 6, 3, 3, $B1, 1, 1, 0, 0
+Map_objAF_a_0156_End
+
+Map_objAF_a_0178: spriteHeader
+ spritePiece $E, 4, 1, 1, $C3, 0, 0, 0, 0
+ spritePiece $12, $14, 3, 1, $CB, 0, 0, 0, 0
+Map_objAF_a_0178_End
+
+Map_objAF_a_018A: spriteHeader
+ spritePiece $E, 4, 3, 1, $C4, 0, 0, 0, 0
+ spritePiece $12, $14, 3, 1, $CE, 0, 0, 0, 0
+Map_objAF_a_018A_End
+
+Map_objAF_a_019C: spriteHeader
+ spritePiece -$C, $1C, 1, 1, $C7, 0, 0, 0, 0
+ spritePiece -4, $1C, 1, 1, $C7, 0, 0, 0, 0
+Map_objAF_a_019C_End
+
+Map_objAF_a_01AE: spriteHeader
+ spritePiece -$C, $1C, 1, 3, $C8, 0, 0, 0, 0
+ spritePiece -4, $1C, 1, 3, $C8, 0, 0, 0, 0
+Map_objAF_a_01AE_End
+
+Map_objAF_a_01C0: spriteHeader
+ spritePiece $12, $14, 3, 1, $CB, 0, 0, 0, 0
+Map_objAF_a_01C0_End
+
+Map_objAF_a_01CA: spriteHeader
+ spritePiece $12, $14, 3, 1, $CE, 0, 0, 0, 0
+Map_objAF_a_01CA_End
+
+Map_objAF_a_01D4: spriteHeader
+ spritePiece -4, -8, 1, 2, $D1, 0, 0, 0, 0
+Map_objAF_a_01D4_End
+
+Map_objAF_a_01DE: spriteHeader
+ spritePiece -8, -8, 2, 2, $D3, 0, 0, 0, 0
+Map_objAF_a_01DE_End
+
+Map_objAF_a_01E8: spriteHeader
+ spritePiece -8, -4, 2, 1, $D7, 0, 0, 0, 0
+Map_objAF_a_01E8_End
+
+Map_objAF_a_01F2: spriteHeader
+ spritePiece -8, -8, 2, 2, $D3, 0, 1, 0, 0
+Map_objAF_a_01F2_End
+
+Map_objAF_a_01FC: spriteHeader
+ spritePiece -4, -8, 1, 2, $D1, 0, 1, 0, 0
+Map_objAF_a_01FC_End
+
+Map_objAF_a_0206: spriteHeader
+ spritePiece -8, -8, 2, 2, $D3, 1, 1, 0, 0
+Map_objAF_a_0206_End
+
+Map_objAF_a_0210: spriteHeader
+ spritePiece -8, -4, 2, 1, $D7, 1, 0, 0, 0
+Map_objAF_a_0210_End
+
+Map_objAF_a_021A: spriteHeader
+ spritePiece -8, -8, 2, 2, $D3, 1, 0, 0, 0
+Map_objAF_a_021A_End
+
+ even
diff --git a/mappings/sprite/objAF_a.bin b/mappings/sprite/objAF_a.bin
deleted file mode 100644
index 07d4706b..00000000
Binary files a/mappings/sprite/objAF_a.bin and /dev/null differ
diff --git a/mappings/sprite/objAF_b.asm b/mappings/sprite/objAF_b.asm
new file mode 100644
index 00000000..5e65633b
--- /dev/null
+++ b/mappings/sprite/objAF_b.asm
@@ -0,0 +1,73 @@
+Map_objAF_b: mappingsTable
+ mappingsTableEntry.w Map_objAF_b_0010
+ mappingsTableEntry.w Map_objAF_b_003A
+ mappingsTableEntry.w Map_objAF_b_0064
+ mappingsTableEntry.w Map_objAF_b_008E
+ mappingsTableEntry.w Map_objAF_b_00C8
+ mappingsTableEntry.w Map_objAF_b_0102
+ mappingsTableEntry.w Map_objAF_b_011C
+ mappingsTableEntry.w Map_objAF_b_0136
+
+Map_objAF_b_0010: spriteHeader
+ spritePiece -$10, -$C, 2, 3, 0, 0, 0, 1, 0
+ spritePiece 0, -$C, 2, 3, 0, 1, 0, 1, 0
+ spritePiece -$10, 4, 2, 1, 6, 0, 0, 1, 0
+ spritePiece 0, 4, 2, 1, 6, 0, 0, 1, 0
+ spritePiece -$10, -8, 4, 2, $190, 0, 0, 0, 0
+Map_objAF_b_0010_End
+
+Map_objAF_b_003A: spriteHeader
+ spritePiece -$10, -$C, 2, 3, 0, 0, 0, 1, 0
+ spritePiece 0, -$C, 2, 3, 0, 1, 0, 1, 0
+ spritePiece -$10, 0, 2, 1, 6, 0, 0, 1, 0
+ spritePiece 0, 0, 2, 1, 6, 0, 0, 1, 0
+ spritePiece -$10, -8, 4, 2, $190, 0, 0, 0, 0
+Map_objAF_b_003A_End
+
+Map_objAF_b_0064: spriteHeader
+ spritePiece -$10, -$C, 2, 3, 0, 0, 0, 1, 0
+ spritePiece 0, -$C, 2, 3, 0, 1, 0, 1, 0
+ spritePiece -$10, -4, 2, 1, 6, 0, 0, 1, 0
+ spritePiece 0, -4, 2, 1, 6, 0, 0, 1, 0
+ spritePiece -$10, -8, 4, 2, $190, 0, 0, 0, 0
+Map_objAF_b_0064_End
+
+Map_objAF_b_008E: spriteHeader
+ spritePiece -$10, -$C, 2, 3, 0, 0, 0, 1, 0
+ spritePiece 0, -$C, 2, 3, 0, 1, 0, 1, 0
+ spritePiece -$10, -8, 2, 1, 6, 0, 0, 1, 0
+ spritePiece 0, -8, 2, 1, 6, 0, 0, 1, 0
+ spritePiece -$10, 0, 2, 1, 6, 0, 0, 1, 0
+ spritePiece 0, 0, 2, 1, 6, 0, 0, 1, 0
+ spritePiece -$10, -8, 4, 2, $190, 0, 0, 0, 0
+Map_objAF_b_008E_End
+
+Map_objAF_b_00C8: spriteHeader
+ spritePiece -$10, -$C, 2, 3, 0, 0, 0, 1, 0
+ spritePiece 0, -$C, 2, 3, 0, 1, 0, 1, 0
+ spritePiece -$10, -$C, 2, 1, 6, 0, 0, 1, 0
+ spritePiece 0, -$C, 2, 1, 6, 0, 0, 1, 0
+ spritePiece -$10, -4, 2, 1, 6, 0, 0, 1, 0
+ spritePiece 0, -4, 2, 1, 6, 0, 0, 1, 0
+ spritePiece -$10, -8, 4, 2, $190, 0, 0, 0, 0
+Map_objAF_b_00C8_End
+
+Map_objAF_b_0102: spriteHeader
+ spritePiece -$10, -$C, 2, 3, 0, 0, 0, 1, 0
+ spritePiece 0, -$C, 2, 3, 0, 1, 0, 1, 0
+ spritePiece -$10, -8, 4, 2, $190, 0, 0, 0, 0
+Map_objAF_b_0102_End
+
+Map_objAF_b_011C: spriteHeader
+ spritePiece -$10, -$C, 2, 3, 0, 0, 0, 1, 0
+ spritePiece 0, -$C, 2, 3, 0, 1, 0, 1, 0
+ spritePiece -$10, -7, 4, 2, $190, 0, 0, 0, 0
+Map_objAF_b_011C_End
+
+Map_objAF_b_0136: spriteHeader
+ spritePiece -$10, -$C, 2, 3, 0, 0, 0, 1, 0
+ spritePiece 0, -$C, 2, 3, 0, 1, 0, 1, 0
+ spritePiece -$10, -8, 4, 2, $198, 0, 0, 0, 0
+Map_objAF_b_0136_End
+
+ even
diff --git a/mappings/sprite/objAF_b.bin b/mappings/sprite/objAF_b.bin
deleted file mode 100644
index 11f3d54f..00000000
Binary files a/mappings/sprite/objAF_b.bin and /dev/null differ
diff --git a/mappings/sprite/objB1.asm b/mappings/sprite/objB1.asm
new file mode 100644
index 00000000..55a9013d
--- /dev/null
+++ b/mappings/sprite/objB1.asm
@@ -0,0 +1,49 @@
+Map_objB1: mappingsTable
+ mappingsTableEntry.w Map_objB1_000A
+ mappingsTableEntry.w Map_objB1_003C
+ mappingsTableEntry.w Map_objB1_006E
+ mappingsTableEntry.w Map_objB1_00A0
+ mappingsTableEntry.w Map_objB1_00D2
+
+Map_objB1_000A: spriteHeader
+ spritePiece -$10, -$28, 4, 4, 0, 0, 0, 0, 0
+ spritePiece $10, -$28, 2, 4, $10, 0, 0, 0, 0
+ spritePiece -$20, -8, 4, 4, $18, 0, 0, 0, 0
+ spritePiece -$20, $18, 4, 4, $28, 0, 0, 0, 0
+ spritePiece 0, -8, 4, 4, $38, 0, 0, 0, 0
+ spritePiece 0, $18, 4, 4, $48, 0, 0, 0, 0
+Map_objB1_000A_End
+
+Map_objB1_003C: spriteHeader
+ spritePiece -$10, -$28, 4, 4, $58, 0, 0, 0, 0
+ spritePiece $10, -$28, 2, 4, $68, 0, 0, 0, 0
+ spritePiece -$20, -8, 4, 4, $70, 0, 0, 0, 0
+ spritePiece -$20, $18, 4, 4, $80, 0, 0, 0, 0
+ spritePiece 0, -8, 4, 4, $90, 0, 0, 0, 0
+ spritePiece 0, $18, 4, 4, $A0, 0, 0, 0, 0
+Map_objB1_003C_End
+
+Map_objB1_006E: spriteHeader
+ spritePiece -$10, -$28, 4, 4, $B0, 0, 0, 0, 0
+ spritePiece $10, -$28, 2, 4, $C0, 0, 0, 0, 0
+ spritePiece -$20, -8, 4, 4, $C8, 0, 0, 0, 0
+ spritePiece -$20, $18, 4, 4, $D8, 0, 0, 0, 0
+ spritePiece 0, -8, 4, 4, $E8, 0, 0, 0, 0
+ spritePiece 0, $18, 4, 4, $F8, 0, 0, 0, 0
+Map_objB1_006E_End
+
+Map_objB1_00A0: spriteHeader
+ spritePiece -$10, -$28, 4, 4, $108, 0, 0, 0, 0
+ spritePiece $10, -$28, 2, 4, $118, 0, 0, 0, 0
+ spritePiece -$20, -8, 4, 4, $120, 0, 0, 0, 0
+ spritePiece -$20, $18, 4, 4, $130, 0, 0, 0, 0
+ spritePiece 0, -8, 4, 4, $140, 0, 0, 0, 0
+ spritePiece 0, $18, 4, 4, $150, 0, 0, 0, 0
+Map_objB1_00A0_End
+
+Map_objB1_00D2: spriteHeader
+ spritePiece -8, -4, 1, 1, 0, 0, 0, 0, 0
+ spritePiece 0, -4, 1, 1, 0, 0, 0, 0, 0
+Map_objB1_00D2_End
+
+ even
diff --git a/mappings/sprite/objB1.bin b/mappings/sprite/objB1.bin
deleted file mode 100644
index a84afb94..00000000
Binary files a/mappings/sprite/objB1.bin and /dev/null differ
diff --git a/mappings/sprite/objB2_a.asm b/mappings/sprite/objB2_a.asm
new file mode 100644
index 00000000..91148b5f
--- /dev/null
+++ b/mappings/sprite/objB2_a.asm
@@ -0,0 +1,115 @@
+Map_objB2_a: mappingsTable
+ mappingsTableEntry.w Map_objB2_a_0010
+ mappingsTableEntry.w Map_objB2_a_0062
+ mappingsTableEntry.w Map_objB2_a_00B4
+ mappingsTableEntry.w Map_objB2_a_0106
+ mappingsTableEntry.w Map_objB2_a_0158
+ mappingsTableEntry.w Map_objB2_a_01AA
+ mappingsTableEntry.w Map_objB2_a_01FC
+ mappingsTableEntry.w Map_objB2_a_024E
+
+Map_objB2_a_0010: spriteHeader
+ spritePiece -$60, -$10, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -$60, $10, 3, 1, $C, 0, 0, 0, 0
+ spritePiece -$48, 3, 3, 3, $F, 0, 0, 0, 0
+ spritePiece -$30, -8, 3, 2, $2A0, 0, 0, 0, 0
+ spritePiece -$30, 8, 4, 3, $1E, 0, 0, 0, 0
+ spritePiece -$18, -8, 4, 2, $2A, 0, 0, 0, 0
+ spritePiece 8, -8, 1, 1, $32, 0, 0, 0, 0
+ spritePiece -$10, 8, 4, 3, $33, 0, 0, 0, 0
+ spritePiece $10, 8, 1, 3, $3F, 0, 0, 0, 0
+ spritePiece -$C, $20, 2, 2, $42, 0, 0, 0, 0
+Map_objB2_a_0010_End
+
+Map_objB2_a_0062: spriteHeader
+ spritePiece -$60, -$10, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -$60, $10, 3, 1, $C, 0, 0, 0, 0
+ spritePiece -$48, 3, 3, 3, $F, 0, 0, 0, 0
+ spritePiece -$30, -8, 3, 2, $2A0, 0, 0, 0, 0
+ spritePiece -$30, 8, 4, 3, $1E, 0, 0, 0, 0
+ spritePiece -$18, -8, 4, 2, $2A, 0, 0, 0, 0
+ spritePiece 8, -8, 1, 1, $32, 0, 0, 0, 0
+ spritePiece -$10, 8, 4, 3, $33, 0, 0, 0, 0
+ spritePiece $10, 8, 1, 3, $46, 0, 0, 0, 0
+ spritePiece -$C, $20, 2, 2, $42, 0, 0, 0, 0
+Map_objB2_a_0062_End
+
+Map_objB2_a_00B4: spriteHeader
+ spritePiece -$60, -$10, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -$60, $10, 3, 1, $C, 0, 0, 0, 0
+ spritePiece -$48, 3, 3, 3, $F, 0, 0, 0, 0
+ spritePiece -$30, -8, 3, 2, $2A0, 0, 0, 0, 0
+ spritePiece -$30, 8, 4, 3, $1E, 0, 0, 0, 0
+ spritePiece -$18, -8, 4, 2, $2A, 0, 0, 0, 0
+ spritePiece 8, -8, 1, 1, $32, 0, 0, 0, 0
+ spritePiece -$10, 8, 4, 3, $33, 0, 0, 0, 0
+ spritePiece $10, 8, 1, 3, $49, 0, 0, 0, 0
+ spritePiece -$C, $20, 2, 2, $42, 0, 0, 0, 0
+Map_objB2_a_00B4_End
+
+Map_objB2_a_0106: spriteHeader
+ spritePiece -$60, -$10, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -$60, $10, 3, 1, $C, 0, 0, 0, 0
+ spritePiece -$48, 3, 3, 3, $F, 0, 0, 0, 0
+ spritePiece -$30, -8, 3, 2, $2A0, 0, 0, 0, 0
+ spritePiece -$30, 8, 4, 3, $1E, 0, 0, 0, 0
+ spritePiece -$18, -8, 4, 2, $2A, 0, 0, 0, 0
+ spritePiece 8, -8, 1, 1, $32, 0, 0, 0, 0
+ spritePiece -$10, 8, 4, 3, $33, 0, 0, 0, 0
+ spritePiece $10, 8, 1, 3, $4C, 0, 0, 0, 0
+ spritePiece -$C, $20, 2, 2, $42, 0, 0, 0, 0
+Map_objB2_a_0106_End
+
+Map_objB2_a_0158: spriteHeader
+ spritePiece -$60, -$10, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -$60, $10, 3, 1, $C, 0, 0, 0, 0
+ spritePiece -$48, 3, 3, 3, $F, 0, 0, 0, 0
+ spritePiece -$32, -8, 3, 2, $280, 0, 0, 0, 0
+ spritePiece -$30, 8, 4, 3, $1E, 0, 0, 0, 0
+ spritePiece -$18, -8, 4, 2, $2A, 0, 0, 0, 0
+ spritePiece 8, -8, 1, 1, $32, 0, 0, 0, 0
+ spritePiece -$10, 8, 4, 3, $33, 0, 0, 0, 0
+ spritePiece $10, 8, 1, 3, $3F, 0, 0, 0, 0
+ spritePiece -$C, $20, 2, 2, $42, 0, 0, 0, 0
+Map_objB2_a_0158_End
+
+Map_objB2_a_01AA: spriteHeader
+ spritePiece -$60, -$10, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -$60, $10, 3, 1, $C, 0, 0, 0, 0
+ spritePiece -$48, 3, 3, 3, $F, 0, 0, 0, 0
+ spritePiece -$32, -8, 3, 2, $280, 0, 0, 0, 0
+ spritePiece -$30, 8, 4, 3, $1E, 0, 0, 0, 0
+ spritePiece -$18, -8, 4, 2, $2A, 0, 0, 0, 0
+ spritePiece 8, -8, 1, 1, $32, 0, 0, 0, 0
+ spritePiece -$10, 8, 4, 3, $33, 0, 0, 0, 0
+ spritePiece $10, 8, 1, 3, $46, 0, 0, 0, 0
+ spritePiece -$C, $20, 2, 2, $42, 0, 0, 0, 0
+Map_objB2_a_01AA_End
+
+Map_objB2_a_01FC: spriteHeader
+ spritePiece -$60, -$10, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -$60, $10, 3, 1, $C, 0, 0, 0, 0
+ spritePiece -$48, 3, 3, 3, $F, 0, 0, 0, 0
+ spritePiece -$32, -8, 3, 2, $280, 0, 0, 0, 0
+ spritePiece -$30, 8, 4, 3, $1E, 0, 0, 0, 0
+ spritePiece -$18, -8, 4, 2, $2A, 0, 0, 0, 0
+ spritePiece 8, -8, 1, 1, $32, 0, 0, 0, 0
+ spritePiece -$10, 8, 4, 3, $33, 0, 0, 0, 0
+ spritePiece $10, 8, 1, 3, $49, 0, 0, 0, 0
+ spritePiece -$C, $20, 2, 2, $42, 0, 0, 0, 0
+Map_objB2_a_01FC_End
+
+Map_objB2_a_024E: spriteHeader
+ spritePiece -$60, -$10, 3, 4, 0, 0, 0, 0, 0
+ spritePiece -$60, $10, 3, 1, $C, 0, 0, 0, 0
+ spritePiece -$48, 3, 3, 3, $F, 0, 0, 0, 0
+ spritePiece -$32, -8, 3, 2, $280, 0, 0, 0, 0
+ spritePiece -$30, 8, 4, 3, $1E, 0, 0, 0, 0
+ spritePiece -$18, -8, 4, 2, $2A, 0, 0, 0, 0
+ spritePiece 8, -8, 1, 1, $32, 0, 0, 0, 0
+ spritePiece -$10, 8, 4, 3, $33, 0, 0, 0, 0
+ spritePiece $10, 8, 1, 3, $4C, 0, 0, 0, 0
+ spritePiece -$C, $20, 2, 2, $42, 0, 0, 0, 0
+Map_objB2_a_024E_End
+
+ even
diff --git a/mappings/sprite/objB2_a.bin b/mappings/sprite/objB2_a.bin
deleted file mode 100644
index 3fb43739..00000000
Binary files a/mappings/sprite/objB2_a.bin and /dev/null differ
diff --git a/mappings/sprite/objB2_b.asm b/mappings/sprite/objB2_b.asm
new file mode 100644
index 00000000..107c9418
--- /dev/null
+++ b/mappings/sprite/objB2_b.asm
@@ -0,0 +1,23 @@
+Map_objB2_b: mappingsTable
+ mappingsTableEntry.w Map_objB2_b_0006
+ mappingsTableEntry.w Map_objB2_b_0018
+ mappingsTableEntry.w Map_objB2_b_0032
+
+Map_objB2_b_0006: spriteHeader
+ spritePiece -$1C, -8, 3, 2, 0, 0, 0, 1, 0
+ spritePiece -4, -8, 4, 2, 6, 0, 0, 1, 0
+Map_objB2_b_0006_End
+
+Map_objB2_b_0018: spriteHeader
+ spritePiece -$1C, -8, 3, 2, 0, 0, 0, 1, 0
+ spritePiece -4, -8, 4, 2, 6, 0, 0, 1, 0
+ spritePiece -$3C, -8, 4, 2, $E, 0, 0, 2, 0
+Map_objB2_b_0018_End
+
+Map_objB2_b_0032: spriteHeader
+ spritePiece -$1C, -8, 3, 2, 0, 0, 0, 1, 0
+ spritePiece -4, -8, 4, 2, 6, 0, 0, 1, 0
+ spritePiece -$2C, -8, 2, 2, $16, 0, 0, 2, 0
+Map_objB2_b_0032_End
+
+ even
diff --git a/mappings/sprite/objB2_b.bin b/mappings/sprite/objB2_b.bin
deleted file mode 100644
index d48b4af7..00000000
Binary files a/mappings/sprite/objB2_b.bin and /dev/null differ
diff --git a/mappings/sprite/objB3.asm b/mappings/sprite/objB3.asm
new file mode 100644
index 00000000..0e0c37fc
--- /dev/null
+++ b/mappings/sprite/objB3.asm
@@ -0,0 +1,22 @@
+Map_objB3: mappingsTable
+ mappingsTableEntry.w Map_objB3_0008
+ mappingsTableEntry.w Map_objB3_0022
+ mappingsTableEntry.w Map_objB3_0034
+ mappingsTableEntry.w Map_objB3_0008
+
+Map_objB3_0008: spriteHeader
+ spritePiece -$28, -4, 4, 1, 0, 0, 0, 0, 0
+ spritePiece -8, -4, 4, 1, 4, 0, 0, 0, 0
+ spritePiece $18, -4, 2, 1, 8, 0, 0, 0, 0
+Map_objB3_0008_End
+
+Map_objB3_0022: spriteHeader
+ spritePiece -$18, -4, 4, 1, $A, 0, 0, 0, 0
+ spritePiece 8, -4, 2, 1, $E, 0, 0, 0, 0
+Map_objB3_0022_End
+
+Map_objB3_0034: spriteHeader
+ spritePiece -8, -4, 2, 1, $10, 0, 0, 0, 0
+Map_objB3_0034_End
+
+ even
diff --git a/mappings/sprite/objB3.bin b/mappings/sprite/objB3.bin
deleted file mode 100644
index 8eb9c40d..00000000
Binary files a/mappings/sprite/objB3.bin and /dev/null differ
diff --git a/mappings/sprite/objB4.asm b/mappings/sprite/objB4.asm
new file mode 100644
index 00000000..cadecfb0
--- /dev/null
+++ b/mappings/sprite/objB4.asm
@@ -0,0 +1,21 @@
+Map_objB4: mappingsTable
+ mappingsTableEntry.w Map_objB4_0006
+ mappingsTableEntry.w Map_objB4_0018
+ mappingsTableEntry.w Map_objB4_002A
+
+Map_objB4_0006: spriteHeader
+ spritePiece -4, -$40, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, -$20, 1, 4, 0, 0, 1, 0, 0
+Map_objB4_0006_End
+
+Map_objB4_0018: spriteHeader
+ spritePiece -4, -$20, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, 0, 1, 4, 0, 0, 1, 0, 0
+Map_objB4_0018_End
+
+Map_objB4_002A: spriteHeader
+ spritePiece -4, 0, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -4, $20, 1, 4, 0, 0, 1, 0, 0
+Map_objB4_002A_End
+
+ even
diff --git a/mappings/sprite/objB4.bin b/mappings/sprite/objB4.bin
deleted file mode 100644
index 4cefdef8..00000000
Binary files a/mappings/sprite/objB4.bin and /dev/null differ
diff --git a/mappings/sprite/objB5.asm b/mappings/sprite/objB5.asm
new file mode 100644
index 00000000..5edd37a5
--- /dev/null
+++ b/mappings/sprite/objB5.asm
@@ -0,0 +1,41 @@
+Map_objB5: mappingsTable
+ mappingsTableEntry.w Map_objB5_000C
+ mappingsTableEntry.w Map_objB5_002E
+ mappingsTableEntry.w Map_objB5_0040
+ mappingsTableEntry.w Map_objB5_0052
+ mappingsTableEntry.w Map_objB5_0064
+ mappingsTableEntry.w Map_objB5_0076
+
+Map_objB5_000C: spriteHeader
+ spritePiece -$40, -4, 4, 1, 0, 0, 0, 0, 0
+ spritePiece -$20, -4, 3, 1, 4, 0, 0, 0, 0
+ spritePiece 8, -4, 3, 1, 7, 0, 0, 0, 0
+ spritePiece $20, -4, 4, 1, $A, 0, 0, 0, 0
+Map_objB5_000C_End
+
+Map_objB5_002E: spriteHeader
+ spritePiece -$28, -4, 4, 1, $E, 0, 0, 0, 0
+ spritePiece 8, -4, 4, 1, $12, 0, 0, 0, 0
+Map_objB5_002E_End
+
+Map_objB5_0040: spriteHeader
+ spritePiece -$18, -4, 3, 1, $16, 0, 0, 0, 0
+ spritePiece 8, -4, 2, 1, $19, 0, 0, 0, 0
+Map_objB5_0040_End
+
+Map_objB5_0052: spriteHeader
+ spritePiece -$10, -4, 2, 1, $1B, 0, 0, 0, 0
+ spritePiece 0, -4, 2, 1, $1B, 1, 0, 0, 0
+Map_objB5_0052_End
+
+Map_objB5_0064: spriteHeader
+ spritePiece -$18, -4, 2, 1, $19, 1, 0, 0, 0
+ spritePiece 0, -4, 3, 1, $16, 1, 0, 0, 0
+Map_objB5_0064_End
+
+Map_objB5_0076: spriteHeader
+ spritePiece -$28, -4, 4, 1, $12, 1, 0, 0, 0
+ spritePiece 8, -4, 4, 1, $E, 1, 0, 0, 0
+Map_objB5_0076_End
+
+ even
diff --git a/mappings/sprite/objB5.bin b/mappings/sprite/objB5.bin
deleted file mode 100644
index 636af233..00000000
Binary files a/mappings/sprite/objB5.bin and /dev/null differ
diff --git a/mappings/sprite/objB6.asm b/mappings/sprite/objB6.asm
new file mode 100644
index 00000000..a2205639
--- /dev/null
+++ b/mappings/sprite/objB6.asm
@@ -0,0 +1,27 @@
+Map_objB6: mappingsTable
+ mappingsTableEntry.w Map_objB6_0008
+ mappingsTableEntry.w Map_objB6_001A
+ mappingsTableEntry.w Map_objB6_002C
+ mappingsTableEntry.w Map_objB6_003E
+
+Map_objB6_0008: spriteHeader
+ spritePiece -$18, -4, 3, 1, 0, 0, 0, 0, 0
+ spritePiece 0, -4, 3, 1, 0, 1, 0, 0, 0
+Map_objB6_0008_End
+
+Map_objB6_001A: spriteHeader
+ spritePiece -$10, -$14, 2, 3, 3, 0, 0, 0, 0
+ spritePiece 0, -4, 2, 3, 3, 1, 1, 0, 0
+Map_objB6_001A_End
+
+Map_objB6_002C: spriteHeader
+ spritePiece -4, -$18, 1, 3, 9, 0, 0, 0, 0
+ spritePiece -4, 0, 1, 3, 9, 0, 1, 0, 0
+Map_objB6_002C_End
+
+Map_objB6_003E: spriteHeader
+ spritePiece 0, -$14, 2, 3, 3, 1, 0, 0, 0
+ spritePiece -$10, -4, 2, 3, 3, 0, 1, 0, 0
+Map_objB6_003E_End
+
+ even
diff --git a/mappings/sprite/objB6.bin b/mappings/sprite/objB6.bin
deleted file mode 100644
index b5b06d4b..00000000
Binary files a/mappings/sprite/objB6.bin and /dev/null differ
diff --git a/mappings/sprite/objB7.asm b/mappings/sprite/objB7.asm
new file mode 100644
index 00000000..41cd0faa
--- /dev/null
+++ b/mappings/sprite/objB7.asm
@@ -0,0 +1,23 @@
+Map_objB7: mappingsTable
+ mappingsTableEntry.w Map_objB7_0002
+
+Map_objB7_0002: spriteHeader
+ spritePiece -$18, -$70, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$70, 3, 4, 0, 1, 0, 0, 0
+ spritePiece -$18, -$50, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$50, 3, 4, 0, 1, 0, 0, 0
+ spritePiece -$18, -$30, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$30, 3, 4, 0, 1, 0, 0, 0
+ spritePiece -$18, -$10, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 3, 4, 0, 1, 0, 0, 0
+ spritePiece -$18, $10, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 0, $10, 3, 4, 0, 1, 0, 0, 0
+ spritePiece -$18, $30, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 0, $30, 3, 4, 0, 1, 0, 0, 0
+ spritePiece -$18, $50, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 0, $50, 3, 4, 0, 1, 0, 0, 0
+ spritePiece -$18, $70, 3, 4, 0, 0, 0, 0, 0
+ spritePiece 0, $70, 3, 4, 0, 1, 0, 0, 0
+Map_objB7_0002_End
+
+ even
diff --git a/mappings/sprite/objB7.bin b/mappings/sprite/objB7.bin
deleted file mode 100644
index 73d964b1..00000000
Binary files a/mappings/sprite/objB7.bin and /dev/null differ
diff --git a/mappings/sprite/objB8.asm b/mappings/sprite/objB8.asm
new file mode 100644
index 00000000..bd297955
--- /dev/null
+++ b/mappings/sprite/objB8.asm
@@ -0,0 +1,35 @@
+Map_objB8: mappingsTable
+ mappingsTableEntry.w Map_objB8_000A
+ mappingsTableEntry.w Map_objB8_002C
+ mappingsTableEntry.w Map_objB8_0046
+ mappingsTableEntry.w Map_objB8_0060
+ mappingsTableEntry.w Map_objB8_006A
+
+Map_objB8_000A: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 3, 1
+ spritePiece 0, -$10, 2, 4, 8, 0, 0, 3, 1
+ spritePiece -8, $E, 1, 1, $10, 0, 0, 3, 1
+ spritePiece 0, $E, 1, 1, $11, 0, 0, 3, 1
+Map_objB8_000A_End
+
+Map_objB8_002C: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 3, 1
+ spritePiece 0, -$10, 2, 4, 8, 0, 0, 3, 1
+ spritePiece -$15, 4, 2, 2, $12, 0, 0, 3, 1
+Map_objB8_002C_End
+
+Map_objB8_0046: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 3, 1
+ spritePiece 0, -$10, 2, 4, 8, 0, 0, 3, 1
+ spritePiece 5, 4, 2, 2, $12, 1, 0, 3, 1
+Map_objB8_0046_End
+
+Map_objB8_0060: spriteHeader
+ spritePiece -4, -4, 1, 1, $16, 0, 0, 0, 1
+Map_objB8_0060_End
+
+Map_objB8_006A: spriteHeader
+ spritePiece -4, -4, 1, 1, $17, 0, 0, 0, 1
+Map_objB8_006A_End
+
+ even
diff --git a/mappings/sprite/objB8.bin b/mappings/sprite/objB8.bin
deleted file mode 100644
index cec9d3e8..00000000
Binary files a/mappings/sprite/objB8.bin and /dev/null differ
diff --git a/mappings/sprite/objB9.asm b/mappings/sprite/objB9.asm
new file mode 100644
index 00000000..e2add8ca
--- /dev/null
+++ b/mappings/sprite/objB9.asm
@@ -0,0 +1,13 @@
+Map_objB9: mappingsTable
+ mappingsTableEntry.w Map_objB9_0002
+
+Map_objB9_0002: spriteHeader
+ spritePiece -$48, -8, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$40, -8, 4, 2, 2, 0, 0, 0, 0
+ spritePiece -$20, -8, 4, 2, 2, 0, 0, 0, 0
+ spritePiece 0, -8, 4, 2, 2, 0, 0, 0, 0
+ spritePiece $20, -8, 4, 2, 2, 0, 0, 0, 0
+ spritePiece $40, -8, 1, 2, 0, 1, 0, 0, 0
+Map_objB9_0002_End
+
+ even
diff --git a/mappings/sprite/objB9.bin b/mappings/sprite/objB9.bin
deleted file mode 100644
index 201f31c1..00000000
Binary files a/mappings/sprite/objB9.bin and /dev/null differ
diff --git a/mappings/sprite/objBA.asm b/mappings/sprite/objBA.asm
new file mode 100644
index 00000000..17bd204d
--- /dev/null
+++ b/mappings/sprite/objBA.asm
@@ -0,0 +1,8 @@
+Map_objBA: mappingsTable
+ mappingsTableEntry.w Map_objBA_0002
+
+Map_objBA_0002: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+Map_objBA_0002_End
+
+ even
diff --git a/mappings/sprite/objBA.bin b/mappings/sprite/objBA.bin
deleted file mode 100644
index 45cc3f78..00000000
Binary files a/mappings/sprite/objBA.bin and /dev/null differ
diff --git a/mappings/sprite/objBB.asm b/mappings/sprite/objBB.asm
new file mode 100644
index 00000000..efe3b6ec
--- /dev/null
+++ b/mappings/sprite/objBB.asm
@@ -0,0 +1,10 @@
+Map_objBB: mappingsTable
+ mappingsTableEntry.w Map_objBB_0002
+
+Map_objBB_0002: spriteHeader
+ spritePiece -$C, -$40, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -4, -$30, 1, 4, 4, 0, 0, 0, 0
+ spritePiece -$C, -$10, 3, 4, 8, 0, 0, 0, 0
+Map_objBB_0002_End
+
+ even
diff --git a/mappings/sprite/objBB.bin b/mappings/sprite/objBB.bin
deleted file mode 100644
index ae12bdcc..00000000
Binary files a/mappings/sprite/objBB.bin and /dev/null differ
diff --git a/mappings/sprite/objBC.asm b/mappings/sprite/objBC.asm
new file mode 100644
index 00000000..b41257a5
--- /dev/null
+++ b/mappings/sprite/objBC.asm
@@ -0,0 +1,9 @@
+Map_objBC: mappingsTable
+ mappingsTableEntry.w Map_objBC_0002
+
+Map_objBC_0002: spriteHeader
+ spritePiece -$10, -$10, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 4, 2, 0, 0, 1, 0, 0
+Map_objBC_0002_End
+
+ even
diff --git a/mappings/sprite/objBC.bin b/mappings/sprite/objBC.bin
deleted file mode 100644
index 1d733d98..00000000
Binary files a/mappings/sprite/objBC.bin and /dev/null differ
diff --git a/mappings/sprite/objBD.asm b/mappings/sprite/objBD.asm
new file mode 100644
index 00000000..3cff83b0
--- /dev/null
+++ b/mappings/sprite/objBD.asm
@@ -0,0 +1,21 @@
+Map_objBD: mappingsTable
+ mappingsTableEntry.w Map_objBD_0006
+ mappingsTableEntry.w Map_objBD_0018
+ mappingsTableEntry.w Map_objBD_002A
+
+Map_objBD_0006: spriteHeader
+ spritePiece -$18, -4, 3, 1, 0, 0, 0, 0, 0
+ spritePiece 0, -4, 3, 1, 3, 0, 0, 0, 0
+Map_objBD_0006_End
+
+Map_objBD_0018: spriteHeader
+ spritePiece -$18, -4, 3, 1, 6, 0, 0, 0, 0
+ spritePiece 0, -4, 3, 1, 6, 1, 0, 0, 0
+Map_objBD_0018_End
+
+Map_objBD_002A: spriteHeader
+ spritePiece -$18, -4, 3, 1, 9, 0, 0, 0, 0
+ spritePiece 0, -4, 3, 1, 9, 1, 0, 0, 0
+Map_objBD_002A_End
+
+ even
diff --git a/mappings/sprite/objBD.bin b/mappings/sprite/objBD.bin
deleted file mode 100644
index 48012234..00000000
Binary files a/mappings/sprite/objBD.bin and /dev/null differ
diff --git a/mappings/sprite/objBE.asm b/mappings/sprite/objBE.asm
new file mode 100644
index 00000000..cdf9414c
--- /dev/null
+++ b/mappings/sprite/objBE.asm
@@ -0,0 +1,33 @@
+Map_objBE: mappingsTable
+ mappingsTableEntry.w Map_objBE_000A
+ mappingsTableEntry.w Map_objBE_001C
+ mappingsTableEntry.w Map_objBE_002E
+ mappingsTableEntry.w Map_objBE_0040
+ mappingsTableEntry.w Map_objBE_0052
+
+Map_objBE_000A: spriteHeader
+ spritePiece -$18, -$18, 3, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$18, 3, 2, 6, 0, 0, 0, 0
+Map_objBE_000A_End
+
+Map_objBE_001C: spriteHeader
+ spritePiece -$18, -$18, 3, 2, $C, 0, 0, 0, 0
+ spritePiece 0, -$18, 3, 2, $12, 0, 0, 0, 0
+Map_objBE_001C_End
+
+Map_objBE_002E: spriteHeader
+ spritePiece -$18, -$18, 3, 2, $18, 0, 0, 0, 0
+ spritePiece 0, -$18, 3, 2, $18, 1, 0, 0, 0
+Map_objBE_002E_End
+
+Map_objBE_0040: spriteHeader
+ spritePiece -$20, -$18, 4, 3, $1E, 0, 0, 0, 0
+ spritePiece 0, -$18, 4, 3, $1E, 1, 0, 0, 0
+Map_objBE_0040_End
+
+Map_objBE_0052: spriteHeader
+ spritePiece -$20, -$18, 4, 3, $2A, 0, 0, 0, 0
+ spritePiece 0, -$18, 4, 3, $2A, 1, 0, 0, 0
+Map_objBE_0052_End
+
+ even
diff --git a/mappings/sprite/objBE.bin b/mappings/sprite/objBE.bin
deleted file mode 100644
index 39175e0e..00000000
Binary files a/mappings/sprite/objBE.bin and /dev/null differ
diff --git a/mappings/sprite/objBF.asm b/mappings/sprite/objBF.asm
new file mode 100644
index 00000000..62735aa7
--- /dev/null
+++ b/mappings/sprite/objBF.asm
@@ -0,0 +1,18 @@
+Map_objBF: mappingsTable
+ mappingsTableEntry.w Map_objBF_0006
+ mappingsTableEntry.w Map_objBF_0010
+ mappingsTableEntry.w Map_objBF_001A
+
+Map_objBF_0006: spriteHeader
+ spritePiece -4, -$10, 1, 4, 0, 0, 0, 0, 0
+Map_objBF_0006_End
+
+Map_objBF_0010: spriteHeader
+ spritePiece -4, -$10, 1, 4, 4, 0, 0, 0, 0
+Map_objBF_0010_End
+
+Map_objBF_001A: spriteHeader
+ spritePiece -4, -$10, 1, 4, 8, 0, 0, 0, 0
+Map_objBF_001A_End
+
+ even
diff --git a/mappings/sprite/objBF.bin b/mappings/sprite/objBF.bin
deleted file mode 100644
index 95ce6b5e..00000000
Binary files a/mappings/sprite/objBF.bin and /dev/null differ
diff --git a/mappings/sprite/objC0.asm b/mappings/sprite/objC0.asm
new file mode 100644
index 00000000..e2c768e8
--- /dev/null
+++ b/mappings/sprite/objC0.asm
@@ -0,0 +1,9 @@
+Map_objC0: mappingsTable
+ mappingsTableEntry.w Map_objC0_0002
+
+Map_objC0_0002: spriteHeader
+ spritePiece -$10, -$17, 3, 1, 0, 0, 0, 0, 0
+ spritePiece 8, -$1F, 1, 2, 3, 0, 0, 0, 0
+Map_objC0_0002_End
+
+ even
diff --git a/mappings/sprite/objC0.bin b/mappings/sprite/objC0.bin
deleted file mode 100644
index eef98a75..00000000
Binary files a/mappings/sprite/objC0.bin and /dev/null differ
diff --git a/mappings/sprite/objC1.asm b/mappings/sprite/objC1.asm
new file mode 100644
index 00000000..e8e7046c
--- /dev/null
+++ b/mappings/sprite/objC1.asm
@@ -0,0 +1,45 @@
+Map_objC1: mappingsTable
+ mappingsTableEntry.w Map_objC1_000C
+ mappingsTableEntry.w Map_objC1_004E
+ mappingsTableEntry.w Map_objC1_0060
+ mappingsTableEntry.w Map_objC1_0072
+ mappingsTableEntry.w Map_objC1_0084
+ mappingsTableEntry.w Map_objC1_0096
+
+Map_objC1_000C: spriteHeader
+ spritePiece -$20, -$20, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, -$20, 2, 4, 0, 1, 0, 0, 0
+ spritePiece -$20, 0, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 4, 0, 1, 0, 0, 0
+ spritePiece -$40, -$20, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -$30, -$20, 2, 4, 0, 1, 0, 0, 0
+ spritePiece -$40, 0, 2, 4, 0, 0, 0, 0, 0
+ spritePiece -$30, 0, 2, 4, 0, 1, 0, 0, 0
+Map_objC1_000C_End
+
+Map_objC1_004E: spriteHeader
+ spritePiece -$10, -$10, 2, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 4, 0, 1, 0, 0, 0
+Map_objC1_004E_End
+
+Map_objC1_0060: spriteHeader
+ spritePiece -8, -$10, 2, 2, 8, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 2, 8, 0, 1, 0, 0
+Map_objC1_0060_End
+
+Map_objC1_0072: spriteHeader
+ spritePiece -4, -$10, 1, 2, $C, 0, 0, 0, 0
+ spritePiece -4, 0, 1, 2, $C, 0, 1, 0, 0
+Map_objC1_0072_End
+
+Map_objC1_0084: spriteHeader
+ spritePiece -4, -$10, 1, 2, $C, 1, 0, 0, 0
+ spritePiece -4, 0, 1, 2, $C, 1, 1, 0, 0
+Map_objC1_0084_End
+
+Map_objC1_0096: spriteHeader
+ spritePiece -8, -$10, 2, 2, 8, 1, 0, 0, 0
+ spritePiece -8, 0, 2, 2, 8, 1, 1, 0, 0
+Map_objC1_0096_End
+
+ even
diff --git a/mappings/sprite/objC1.bin b/mappings/sprite/objC1.bin
deleted file mode 100644
index beb5280d..00000000
Binary files a/mappings/sprite/objC1.bin and /dev/null differ
diff --git a/mappings/sprite/objC2.asm b/mappings/sprite/objC2.asm
new file mode 100644
index 00000000..56a57888
--- /dev/null
+++ b/mappings/sprite/objC2.asm
@@ -0,0 +1,9 @@
+Map_objC2: mappingsTable
+ mappingsTableEntry.w Map_objC2_0002
+
+Map_objC2_0002: spriteHeader
+ spritePiece -$10, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, 0, 1, 0, 0, 0
+Map_objC2_0002_End
+
+ even
diff --git a/mappings/sprite/objC2.bin b/mappings/sprite/objC2.bin
deleted file mode 100644
index e3a06fc3..00000000
Binary files a/mappings/sprite/objC2.bin and /dev/null differ
diff --git a/mappings/sprite/objC5_a.asm b/mappings/sprite/objC5_a.asm
new file mode 100644
index 00000000..b8aa0db1
--- /dev/null
+++ b/mappings/sprite/objC5_a.asm
@@ -0,0 +1,130 @@
+Map_objC5_a: mappingsTable
+ mappingsTableEntry.w Map_objC5_a_0026
+ mappingsTableEntry.w Map_objC5_a_0048
+ mappingsTableEntry.w Map_objC5_a_006A
+ mappingsTableEntry.w Map_objC5_a_008C
+ mappingsTableEntry.w Map_objC5_a_00AE
+ mappingsTableEntry.w Map_objC5_a_00C0
+ mappingsTableEntry.w Map_objC5_a_00D2
+ mappingsTableEntry.w Map_objC5_a_00DC
+ mappingsTableEntry.w Map_objC5_a_00E6
+ mappingsTableEntry.w Map_objC5_a_00F0
+ mappingsTableEntry.w Map_objC5_a_00FA
+ mappingsTableEntry.w Map_objC5_a_0104
+ mappingsTableEntry.w Map_objC5_a_010E
+ mappingsTableEntry.w Map_objC5_a_0130
+ mappingsTableEntry.w Map_objC5_a_013A
+ mappingsTableEntry.w Map_objC5_a_014C
+ mappingsTableEntry.w Map_objC5_a_0166
+ mappingsTableEntry.w Map_objC5_a_0188
+ mappingsTableEntry.w Map_objC5_a_01B2
+
+Map_objC5_a_0026: spriteHeader
+ spritePiece -$20, -8, 4, 1, 0, 0, 0, 1, 0
+ spritePiece 0, -8, 4, 1, 4, 0, 0, 1, 0
+ spritePiece -$18, 0, 3, 2, 8, 0, 0, 1, 0
+ spritePiece 0, 0, 3, 2, 8, 1, 0, 1, 0
+Map_objC5_a_0026_End
+
+Map_objC5_a_0048: spriteHeader
+ spritePiece -$20, -8, 4, 1, 0, 0, 0, 1, 0
+ spritePiece 0, -8, 4, 1, 0, 1, 0, 1, 0
+ spritePiece -$18, 0, 3, 2, $E, 0, 0, 1, 0
+ spritePiece 0, 0, 3, 2, $E, 1, 0, 1, 0
+Map_objC5_a_0048_End
+
+Map_objC5_a_006A: spriteHeader
+ spritePiece -$20, -8, 4, 1, 0, 0, 0, 1, 0
+ spritePiece 0, -8, 4, 1, 0, 1, 0, 1, 0
+ spritePiece -$18, 0, 3, 2, $14, 0, 0, 1, 0
+ spritePiece 0, 0, 3, 2, $14, 1, 0, 1, 0
+Map_objC5_a_006A_End
+
+Map_objC5_a_008C: spriteHeader
+ spritePiece -$20, -8, 4, 1, 0, 0, 0, 1, 0
+ spritePiece 0, -8, 4, 1, 0, 1, 0, 1, 0
+ spritePiece -$18, 0, 3, 1, $1A, 0, 0, 1, 0
+ spritePiece 0, 0, 3, 1, $1A, 1, 0, 1, 0
+Map_objC5_a_008C_End
+
+Map_objC5_a_00AE: spriteHeader
+ spritePiece -$10, -8, 2, 2, $1D, 0, 0, 2, 0
+ spritePiece 0, -8, 2, 2, $1D, 1, 0, 2, 0
+Map_objC5_a_00AE_End
+
+Map_objC5_a_00C0: spriteHeader
+ spritePiece -$20, -8, 4, 2, $21, 0, 0, 1, 0
+ spritePiece 0, -8, 4, 2, $21, 1, 0, 1, 0
+Map_objC5_a_00C0_End
+
+Map_objC5_a_00D2: spriteHeader
+ spritePiece -$10, -8, 4, 3, $29, 0, 0, 1, 0
+Map_objC5_a_00D2_End
+
+Map_objC5_a_00DC: spriteHeader
+ spritePiece -$10, -8, 4, 3, $35, 0, 0, 1, 0
+Map_objC5_a_00DC_End
+
+Map_objC5_a_00E6: spriteHeader
+ spritePiece -$10, -8, 4, 3, $41, 0, 0, 1, 0
+Map_objC5_a_00E6_End
+
+Map_objC5_a_00F0: spriteHeader
+ spritePiece -$10, -8, 4, 3, $4D, 0, 0, 1, 0
+Map_objC5_a_00F0_End
+
+Map_objC5_a_00FA: spriteHeader
+ spritePiece -$10, -8, 4, 3, $41, 1, 0, 1, 0
+Map_objC5_a_00FA_End
+
+Map_objC5_a_0104: spriteHeader
+ spritePiece -$10, -8, 4, 3, $35, 1, 0, 1, 0
+Map_objC5_a_0104_End
+
+Map_objC5_a_010E: spriteHeader
+ spritePiece -8, -$40, 2, 4, $59, 0, 0, 1, 0
+ spritePiece -8, -$20, 2, 4, $59, 0, 0, 1, 0
+ spritePiece -8, 0, 2, 4, $59, 0, 0, 1, 0
+ spritePiece -8, $20, 2, 4, $59, 0, 0, 1, 0
+Map_objC5_a_010E_End
+
+Map_objC5_a_0130: spriteHeader
+ spritePiece -$10, 0, 4, 1, $71, 0, 0, 2, 0
+Map_objC5_a_0130_End
+
+Map_objC5_a_013A: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $61, 0, 0, 2, 0
+ spritePiece -$10, $10, 4, 1, $71, 0, 0, 2, 0
+Map_objC5_a_013A_End
+
+Map_objC5_a_014C: spriteHeader
+ spritePiece -$10, -$20, 4, 4, $61, 0, 0, 2, 0
+ spritePiece -$10, 0, 4, 4, $61, 0, 0, 2, 0
+ spritePiece -$10, $20, 4, 1, $71, 0, 0, 2, 0
+Map_objC5_a_014C_End
+
+Map_objC5_a_0166: spriteHeader
+ spritePiece -$10, -$30, 4, 4, $61, 0, 0, 2, 0
+ spritePiece -$10, -$10, 4, 4, $61, 0, 0, 2, 0
+ spritePiece -$10, $10, 4, 4, $61, 0, 0, 2, 0
+ spritePiece -$10, $30, 4, 1, $71, 0, 0, 2, 0
+Map_objC5_a_0166_End
+
+Map_objC5_a_0188: spriteHeader
+ spritePiece -$10, -$40, 4, 4, $61, 0, 0, 2, 0
+ spritePiece -$10, -$20, 4, 4, $61, 0, 0, 2, 0
+ spritePiece -$10, 0, 4, 4, $61, 0, 0, 2, 0
+ spritePiece -$10, $20, 4, 4, $61, 0, 0, 2, 0
+ spritePiece -$10, $40, 4, 1, $71, 0, 0, 2, 0
+Map_objC5_a_0188_End
+
+Map_objC5_a_01B2: spriteHeader
+ spritePiece -$10, -$50, 4, 4, $61, 0, 0, 2, 0
+ spritePiece -$10, -$30, 4, 4, $61, 0, 0, 2, 0
+ spritePiece -$10, -$10, 4, 4, $61, 0, 0, 2, 0
+ spritePiece -$10, $10, 4, 4, $61, 0, 0, 2, 0
+ spritePiece -$10, $30, 4, 4, $61, 0, 0, 2, 0
+ spritePiece -$10, $50, 4, 1, $71, 0, 0, 2, 0
+Map_objC5_a_01B2_End
+
+ even
diff --git a/mappings/sprite/objC5_a.bin b/mappings/sprite/objC5_a.bin
deleted file mode 100644
index b5d9b41c..00000000
Binary files a/mappings/sprite/objC5_a.bin and /dev/null differ
diff --git a/mappings/sprite/objC5_b.asm b/mappings/sprite/objC5_b.asm
new file mode 100644
index 00000000..e5056b72
--- /dev/null
+++ b/mappings/sprite/objC5_b.asm
@@ -0,0 +1,9 @@
+Map_objC5_b: mappingsTable
+ mappingsTableEntry.w Map_objC5_b_0002
+
+Map_objC5_b_0002: spriteHeader
+ spritePiece -$20, -$C, 4, 3, 0, 0, 0, 0, 0
+ spritePiece 0, -$C, 4, 3, 0, 1, 0, 0, 0
+Map_objC5_b_0002_End
+
+ even
diff --git a/mappings/sprite/objC5_b.bin b/mappings/sprite/objC5_b.bin
deleted file mode 100644
index 6e7d71b9..00000000
Binary files a/mappings/sprite/objC5_b.bin and /dev/null differ
diff --git a/mappings/sprite/objC6_a.asm b/mappings/sprite/objC6_a.asm
new file mode 100644
index 00000000..50fbbbda
--- /dev/null
+++ b/mappings/sprite/objC6_a.asm
@@ -0,0 +1,61 @@
+Map_objC6_a: mappingsTable
+ mappingsTableEntry.w Map_objC6_a_0010
+ mappingsTableEntry.w Map_objC6_a_002A
+ mappingsTableEntry.w Map_objC6_a_0044
+ mappingsTableEntry.w Map_objC6_a_006E
+ mappingsTableEntry.w Map_objC6_a_0090
+ mappingsTableEntry.w Map_objC6_a_00B2
+ mappingsTableEntry.w Map_objC6_a_00BC
+ mappingsTableEntry.w Map_objC6_a_00D6
+
+Map_objC6_a_0010: spriteHeader
+ spritePiece -$10, -$1A, 4, 2, $500, 0, 0, 0, 0
+ spritePiece -$10, -$A, 4, 3, $564, 0, 0, 0, 0
+ spritePiece -$10, $E, 4, 2, $570, 0, 0, 0, 0
+Map_objC6_a_0010_End
+
+Map_objC6_a_002A: spriteHeader
+ spritePiece -$10, -$1A, 4, 2, $510, 0, 0, 0, 0
+ spritePiece -$10, -$A, 4, 3, $564, 0, 0, 0, 0
+ spritePiece -$10, $E, 4, 2, $570, 0, 0, 0, 0
+Map_objC6_a_002A_End
+
+Map_objC6_a_0044: spriteHeader
+ spritePiece -$20, -$14, 2, 1, $518, 0, 0, 0, 0
+ spritePiece -$10, -$1C, 4, 2, $51A, 0, 0, 0, 0
+ spritePiece -$10, -$C, 4, 3, $522, 0, 0, 0, 0
+ spritePiece -$18, 4, 1, 2, $52E, 0, 0, 0, 0
+ spritePiece $10, 4, 2, 2, $530, 0, 0, 0, 0
+Map_objC6_a_0044_End
+
+Map_objC6_a_006E: spriteHeader
+ spritePiece -$20, -$14, 2, 1, $518, 0, 0, 0, 0
+ spritePiece -$10, -$1C, 4, 2, $51A, 0, 0, 0, 0
+ spritePiece -$10, -$C, 4, 3, $534, 0, 0, 0, 0
+ spritePiece -8, $C, 2, 2, $540, 0, 0, 0, 0
+Map_objC6_a_006E_End
+
+Map_objC6_a_0090: spriteHeader
+ spritePiece -$20, -$14, 2, 1, $518, 0, 0, 0, 0
+ spritePiece -$10, -$1C, 4, 3, $544, 0, 0, 0, 0
+ spritePiece -$10, -4, 4, 4, $550, 0, 0, 0, 0
+ spritePiece $10, $C, 1, 2, $560, 0, 0, 0, 0
+Map_objC6_a_0090_End
+
+Map_objC6_a_00B2: spriteHeader
+ spritePiece -8, -4, 2, 1, $562, 0, 0, 0, 0
+Map_objC6_a_00B2_End
+
+Map_objC6_a_00BC: spriteHeader
+ spritePiece -$10, -$1A, 4, 2, $508, 0, 0, 0, 0
+ spritePiece -$10, -$A, 4, 3, $564, 0, 0, 0, 0
+ spritePiece -$10, $E, 4, 2, $570, 0, 0, 0, 0
+Map_objC6_a_00BC_End
+
+Map_objC6_a_00D6: spriteHeader
+ spritePiece -$10, -$19, 4, 2, $508, 0, 0, 0, 0
+ spritePiece -$10, -9, 4, 3, $564, 0, 0, 0, 0
+ spritePiece -$10, $F, 4, 2, $578, 0, 0, 0, 0
+Map_objC6_a_00D6_End
+
+ even
diff --git a/mappings/sprite/objC6_a.bin b/mappings/sprite/objC6_a.bin
deleted file mode 100644
index 6b211019..00000000
Binary files a/mappings/sprite/objC6_a.bin and /dev/null differ
diff --git a/mappings/sprite/objC6_b.asm b/mappings/sprite/objC6_b.asm
new file mode 100644
index 00000000..ef01a243
--- /dev/null
+++ b/mappings/sprite/objC6_b.asm
@@ -0,0 +1,29 @@
+Map_objC6_b: mappingsTable
+ mappingsTableEntry.w Map_objC6_b_0008
+ mappingsTableEntry.w Map_objC6_b_002A
+ mappingsTableEntry.w Map_objC6_b_0044
+ mappingsTableEntry.w Map_objC6_b_0056
+
+Map_objC6_b_0008: spriteHeader
+ spritePiece -8, -$20, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, $10, 2, 2, 0, 0, 0, 0, 0
+Map_objC6_b_0008_End
+
+Map_objC6_b_002A: spriteHeader
+ spritePiece -8, -$20, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 2, 0, 0, 0, 0, 0
+Map_objC6_b_002A_End
+
+Map_objC6_b_0044: spriteHeader
+ spritePiece -8, -$20, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, -$10, 2, 2, 0, 0, 0, 0, 0
+Map_objC6_b_0044_End
+
+Map_objC6_b_0056: spriteHeader
+ spritePiece -8, -$20, 2, 2, 0, 0, 0, 0, 0
+Map_objC6_b_0056_End
+
+ even
diff --git a/mappings/sprite/objC6_b.bin b/mappings/sprite/objC6_b.bin
deleted file mode 100644
index 02a55917..00000000
Binary files a/mappings/sprite/objC6_b.bin and /dev/null differ
diff --git a/mappings/sprite/objC7.asm b/mappings/sprite/objC7.asm
new file mode 100644
index 00000000..f8caebca
--- /dev/null
+++ b/mappings/sprite/objC7.asm
@@ -0,0 +1,160 @@
+Map_objC7: mappingsTable
+ mappingsTableEntry.w Map_objC7_002E
+ mappingsTableEntry.w Map_objC7_0038
+ mappingsTableEntry.w Map_objC7_0052
+ mappingsTableEntry.w Map_objC7_006C
+ mappingsTableEntry.w Map_objC7_00BE
+ mappingsTableEntry.w Map_objC7_00C8
+ mappingsTableEntry.w Map_objC7_00D2
+ mappingsTableEntry.w Map_objC7_00E4
+ mappingsTableEntry.w Map_objC7_00E4
+ mappingsTableEntry.w Map_objC7_00E4
+ mappingsTableEntry.w Map_objC7_00E4
+ mappingsTableEntry.w Map_objC7_00EE
+ mappingsTableEntry.w Map_objC7_0120
+ mappingsTableEntry.w Map_objC7_012A
+ mappingsTableEntry.w Map_objC7_0134
+ mappingsTableEntry.w Map_objC7_013E
+ mappingsTableEntry.w Map_objC7_0148
+ mappingsTableEntry.w Map_objC7_018A
+ mappingsTableEntry.w Map_objC7_01CC
+ mappingsTableEntry.w Map_objC7_020E
+ mappingsTableEntry.w Map_objC7_0250
+ mappingsTableEntry.w Map_objC7_025A
+ mappingsTableEntry.w Map_objC7_0264
+
+Map_objC7_002E: spriteHeader
+ spritePiece $C, -$10, 3, 4, 0, 0, 0, 0, 0
+Map_objC7_002E_End
+
+Map_objC7_0038: spriteHeader
+ spritePiece -$14, -$10, 4, 2, $C, 0, 0, 0, 0
+ spritePiece -$C, 0, 3, 2, $14, 0, 0, 0, 0
+ spritePiece $C, -8, 3, 3, $1A, 0, 0, 0, 0
+Map_objC7_0038_End
+
+Map_objC7_0052: spriteHeader
+ spritePiece -$24, 8, 1, 1, $23, 0, 0, 0, 0
+ spritePiece -$1C, -8, 4, 3, $24, 0, 0, 0, 0
+ spritePiece 4, -8, 4, 3, $30, 0, 0, 0, 0
+Map_objC7_0052_End
+
+Map_objC7_006C: spriteHeader
+ spritePiece -$2C, -$24, 4, 4, $3C, 0, 0, 1, 0
+ spritePiece -$C, -$24, 4, 4, $4C, 0, 0, 1, 0
+ spritePiece $14, -$24, 3, 4, $5C, 0, 0, 1, 0
+ spritePiece $2C, -$24, 3, 4, $68, 0, 0, 1, 0
+ spritePiece -$2C, -4, 4, 4, $74, 0, 0, 1, 0
+ spritePiece -$C, -4, 4, 4, $84, 0, 0, 1, 0
+ spritePiece $14, -4, 3, 4, $94, 0, 0, 1, 0
+ spritePiece $2C, -4, 3, 2, $A0, 0, 0, 1, 0
+ spritePiece -$1C, $1C, 4, 1, $A6, 0, 0, 1, 0
+ spritePiece 4, $1C, 4, 1, $AA, 0, 0, 1, 0
+Map_objC7_006C_End
+
+Map_objC7_00BE: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $AE, 0, 0, 1, 0
+Map_objC7_00BE_End
+
+Map_objC7_00C8: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $BE, 0, 0, 1, 0
+Map_objC7_00C8_End
+
+Map_objC7_00D2: spriteHeader
+ spritePiece 0, -$C, 4, 3, $C7, 0, 0, 1, 0
+ spritePiece -$20, -$C, 4, 3, $D3, 0, 0, 1, 0
+Map_objC7_00D2_End
+
+Map_objC7_00E4: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $E2, 0, 0, 1, 0
+Map_objC7_00E4_End
+
+Map_objC7_00EE: spriteHeader
+ spritePiece -$15, -$20, 2, 3, $F2, 0, 0, 1, 0
+ spritePiece -5, -$18, 3, 2, $F8, 0, 0, 1, 0
+ spritePiece -$12, -8, 2, 3, $FE, 0, 0, 1, 0
+ spritePiece -$20, $10, 4, 2, $104, 0, 0, 1, 0
+ spritePiece -2, -8, 4, 3, $10C, 0, 0, 1, 0
+ spritePiece 0, $10, 4, 2, $118, 0, 0, 1, 0
+Map_objC7_00EE_End
+
+Map_objC7_0120: spriteHeader
+ spritePiece -8, -$C, 2, 3, $120, 0, 0, 1, 0
+Map_objC7_0120_End
+
+Map_objC7_012A: spriteHeader
+ spritePiece -8, -$C, 2, 2, $126, 0, 0, 1, 0
+Map_objC7_012A_End
+
+Map_objC7_0134: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $12B, 0, 0, 0, 0
+Map_objC7_0134_End
+
+Map_objC7_013E: spriteHeader
+ spritePiece -4, -4, 1, 1, $13B, 0, 0, 0, 0
+Map_objC7_013E_End
+
+Map_objC7_0148: spriteHeader
+ spritePiece -$10, -$10, 2, 2, $13C, 0, 0, 1, 0
+ spritePiece 0, -$10, 2, 2, $13C, 1, 0, 1, 0
+ spritePiece -$10, 0, 2, 2, $13C, 0, 1, 1, 0
+ spritePiece 0, 0, 2, 2, $13C, 1, 1, 1, 0
+ spritePiece -$20, -$20, 1, 1, $144, 0, 0, 1, 0
+ spritePiece $18, -$20, 1, 1, $144, 1, 0, 1, 0
+ spritePiece -$20, $18, 1, 1, $144, 0, 1, 1, 0
+ spritePiece $18, $18, 1, 1, $144, 1, 1, 1, 0
+Map_objC7_0148_End
+
+Map_objC7_018A: spriteHeader
+ spritePiece -$10, -$10, 2, 2, $13C, 0, 0, 1, 0
+ spritePiece 0, -$10, 2, 2, $13C, 1, 0, 1, 0
+ spritePiece -$10, 0, 2, 2, $13C, 0, 1, 1, 0
+ spritePiece 0, 0, 2, 2, $13C, 1, 1, 1, 0
+ spritePiece -$28, -$28, 1, 1, $145, 0, 0, 1, 0
+ spritePiece $20, -$28, 1, 1, $145, 1, 0, 1, 0
+ spritePiece -$28, $20, 1, 1, $145, 0, 1, 1, 0
+ spritePiece $20, $20, 1, 1, $145, 1, 1, 1, 0
+Map_objC7_018A_End
+
+Map_objC7_01CC: spriteHeader
+ spritePiece -$10, -$10, 2, 2, $13C, 0, 0, 1, 0
+ spritePiece 0, -$10, 2, 2, $13C, 1, 0, 1, 0
+ spritePiece -$10, 0, 2, 2, $13C, 0, 1, 1, 0
+ spritePiece 0, 0, 2, 2, $13C, 1, 1, 1, 0
+ spritePiece -$30, -$30, 1, 1, $146, 0, 0, 1, 0
+ spritePiece $28, -$30, 1, 1, $146, 1, 0, 1, 0
+ spritePiece -$30, $28, 1, 1, $146, 0, 1, 1, 0
+ spritePiece $28, $28, 1, 1, $146, 1, 1, 1, 0
+Map_objC7_01CC_End
+
+Map_objC7_020E: spriteHeader
+ spritePiece -$10, -$10, 2, 2, $13C, 0, 0, 1, 0
+ spritePiece 0, -$10, 2, 2, $13C, 1, 0, 1, 0
+ spritePiece -$10, 0, 2, 2, $13C, 0, 1, 1, 0
+ spritePiece 0, 0, 2, 2, $13C, 1, 1, 1, 0
+ spritePiece -$38, -$38, 1, 1, $12A, 0, 0, 1, 0
+ spritePiece $30, -$38, 1, 1, $12A, 1, 0, 1, 0
+ spritePiece -$38, $30, 1, 1, $12A, 0, 1, 1, 0
+ spritePiece $30, $30, 1, 1, $12A, 1, 1, 1, 0
+Map_objC7_020E_End
+
+Map_objC7_0250: spriteHeader
+ spritePiece -8, -8, 2, 2, $140, 0, 0, 0, 0
+Map_objC7_0250_End
+
+Map_objC7_025A: spriteHeader
+ spritePiece 0, 0, 1, 1, 4, 0, 0, 0, 0
+Map_objC7_025A_End
+
+Map_objC7_0264: spriteHeader
+ spritePiece -$10, -$10, 2, 2, $13C, 0, 0, 1, 0
+ spritePiece 0, -$10, 2, 2, $13C, 1, 0, 1, 0
+ spritePiece -$10, 0, 2, 2, $13C, 0, 1, 1, 0
+ spritePiece 0, 0, 2, 2, $13C, 1, 1, 1, 0
+ spritePiece -$18, -$18, 1, 1, $144, 0, 0, 1, 0
+ spritePiece $10, -$18, 1, 1, $144, 1, 0, 1, 0
+ spritePiece -$18, $10, 1, 1, $144, 0, 1, 1, 0
+ spritePiece $10, $10, 1, 1, $144, 1, 1, 1, 0
+Map_objC7_0264_End
+
+ even
diff --git a/mappings/sprite/objC7.bin b/mappings/sprite/objC7.bin
deleted file mode 100644
index ae8883c2..00000000
Binary files a/mappings/sprite/objC7.bin and /dev/null differ
diff --git a/mappings/sprite/objC8.asm b/mappings/sprite/objC8.asm
new file mode 100644
index 00000000..9c8b5605
--- /dev/null
+++ b/mappings/sprite/objC8.asm
@@ -0,0 +1,32 @@
+Map_objC8: mappingsTable
+ mappingsTableEntry.w Map_objC8_0008
+ mappingsTableEntry.w Map_objC8_0022
+ mappingsTableEntry.w Map_objC8_003C
+ mappingsTableEntry.w Map_objC8_0056
+
+Map_objC8_0008: spriteHeader
+ spritePiece 0, -$10, 3, 4, $10, 0, 0, 1, 0
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 1, 0
+ spritePiece -$18, 0, 3, 2, $24, 0, 0, 1, 0
+Map_objC8_0008_End
+
+Map_objC8_0022: spriteHeader
+ spritePiece 4, -$10, 3, 4, $10, 0, 0, 1, 0
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 1, 0
+ spritePiece -$20, 0, 3, 2, $24, 0, 0, 1, 0
+Map_objC8_0022_End
+
+Map_objC8_003C: spriteHeader
+ spritePiece -$18, -$10, 3, 4, $10, 0, 0, 1, 0
+ spritePiece -$10, 0, 3, 2, $24, 0, 0, 1, 0
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 1, 0
+Map_objC8_003C_End
+
+Map_objC8_0056: spriteHeader
+ spritePiece -$10, -$10, 4, 2, $1C, 0, 0, 1, 0
+ spritePiece -8, 0, 3, 2, $24, 0, 0, 1, 0
+ spritePiece -$20, 0, 3, 2, $24, 1, 0, 1, 0
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 1, 0
+Map_objC8_0056_End
+
+ even
diff --git a/mappings/sprite/objC8.bin b/mappings/sprite/objC8.bin
deleted file mode 100644
index 1d91dfd7..00000000
Binary files a/mappings/sprite/objC8.bin and /dev/null differ
diff --git a/mappings/sprite/objCF.asm b/mappings/sprite/objCF.asm
new file mode 100644
index 00000000..1fb83815
--- /dev/null
+++ b/mappings/sprite/objCF.asm
@@ -0,0 +1,241 @@
+Map_objCF: mappingsTable
+ mappingsTableEntry.w Map_objCF_0034
+ mappingsTableEntry.w Map_objCF_006E
+ mappingsTableEntry.w Map_objCF_0090
+ mappingsTableEntry.w Map_objCF_00A2
+ mappingsTableEntry.w Map_objCF_00B4
+ mappingsTableEntry.w Map_objCF_00CE
+ mappingsTableEntry.w Map_objCF_0100
+ mappingsTableEntry.w Map_objCF_0132
+ mappingsTableEntry.w Map_objCF_0174
+ mappingsTableEntry.w Map_objCF_019E
+ mappingsTableEntry.w Map_objCF_01C0
+ mappingsTableEntry.w Map_objCF_01E2
+ mappingsTableEntry.w Map_objCF_0204
+ mappingsTableEntry.w Map_objCF_021E
+ mappingsTableEntry.w Map_objCF_0240
+ mappingsTableEntry.w Map_objCF_02A2
+ mappingsTableEntry.w Map_objCF_02C4
+ mappingsTableEntry.w Map_objCF_02DE
+ mappingsTableEntry.w Map_objCF_0378
+ mappingsTableEntry.w Map_objCF_038A
+ mappingsTableEntry.w Map_objCF_0394
+ mappingsTableEntry.w Map_objCF_039E
+ mappingsTableEntry.w Map_objCF_03A8
+ mappingsTableEntry.w Map_objCF_03B2
+ mappingsTableEntry.w Map_objCF_042C
+ mappingsTableEntry.w Map_objCF_046E
+
+Map_objCF_0034: spriteHeader
+ spritePiece -$20, -$10, 2, 1, $493, 0, 0, 0, 0
+ spritePiece -$20, -8, 3, 2, $495, 0, 0, 0, 0
+ spritePiece -8, -$10, 2, 2, $49B, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 1, $49F, 0, 0, 0, 0
+ spritePiece 8, -$10, 2, 1, $4A1, 0, 0, 0, 0
+ spritePiece 8, -8, 3, 2, $4A3, 0, 0, 0, 0
+ spritePiece 8, 8, 1, 1, $4A9, 0, 0, 0, 0
+Map_objCF_0034_End
+
+Map_objCF_006E: spriteHeader
+ spritePiece -$18, -$C, 2, 2, $4AA, 0, 0, 0, 0
+ spritePiece -8, -$C, 2, 2, $4AE, 0, 0, 0, 0
+ spritePiece -8, 4, 2, 1, $4B2, 0, 0, 0, 0
+ spritePiece 8, -$C, 2, 3, $4B4, 0, 0, 0, 0
+Map_objCF_006E_End
+
+Map_objCF_0090: spriteHeader
+ spritePiece -$14, -$C, 4, 3, $4BA, 0, 0, 0, 0
+ spritePiece $C, -$C, 1, 3, $4C6, 0, 0, 0, 0
+Map_objCF_0090_End
+
+Map_objCF_00A2: spriteHeader
+ spritePiece -$14, -$C, 4, 3, $4C9, 0, 0, 0, 0
+ spritePiece $C, -$C, 1, 1, $4D5, 0, 0, 0, 0
+Map_objCF_00A2_End
+
+Map_objCF_00B4: spriteHeader
+ spritePiece -$14, -4, 2, 2, $4D6, 0, 0, 0, 0
+ spritePiece -4, -$C, 3, 2, $4DA, 0, 0, 0, 0
+ spritePiece -4, 4, 2, 1, $4E0, 0, 0, 0, 0
+Map_objCF_00B4_End
+
+Map_objCF_00CE: spriteHeader
+ spritePiece -$10, -8, 1, 1, $4E2, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 1, $4E3, 0, 0, 0, 0
+ spritePiece -$10, 8, 3, 1, $4E5, 0, 0, 0, 0
+ spritePiece -8, -$10, 3, 1, $4E8, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 1, $4EB, 0, 0, 0, 0
+ spritePiece 8, 0, 1, 1, $4ED, 0, 0, 0, 0
+Map_objCF_00CE_End
+
+Map_objCF_0100: spriteHeader
+ spritePiece 8, 0, 1, 1, $4E2, 1, 1, 0, 0
+ spritePiece 0, -8, 2, 1, $4E3, 1, 1, 0, 0
+ spritePiece -8, -$10, 3, 1, $4E5, 1, 1, 0, 0
+ spritePiece -$10, 8, 3, 1, $4E8, 1, 1, 0, 0
+ spritePiece -$10, 0, 2, 1, $4EB, 1, 1, 0, 0
+ spritePiece -$10, -8, 1, 1, $4ED, 1, 1, 0, 0
+Map_objCF_0100_End
+
+Map_objCF_0132: spriteHeader
+ spritePiece 6, -$20, 2, 3, $19, 0, 0, 1, 0
+ spritePiece -$20, -$10, 2, 1, $493, 0, 0, 0, 0
+ spritePiece -$20, -8, 3, 2, $495, 0, 0, 0, 0
+ spritePiece -8, -$10, 2, 2, $49B, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 1, $49F, 0, 0, 0, 0
+ spritePiece 8, -$10, 2, 1, $4A1, 0, 0, 0, 0
+ spritePiece 8, -8, 3, 2, $4A3, 0, 0, 0, 0
+ spritePiece 8, 8, 1, 1, $4A9, 0, 0, 0, 0
+Map_objCF_0132_End
+
+Map_objCF_0174: spriteHeader
+ spritePiece 4, -$19, 1, 2, $1F, 0, 0, 1, 0
+ spritePiece -$18, -$C, 2, 2, $4AA, 0, 0, 0, 0
+ spritePiece -8, -$C, 2, 2, $4AE, 0, 0, 0, 0
+ spritePiece -8, 4, 2, 1, $4B2, 0, 0, 0, 0
+ spritePiece 8, -$C, 2, 3, $4B4, 0, 0, 0, 0
+Map_objCF_0174_End
+
+Map_objCF_019E: spriteHeader
+ spritePiece -5, -$13, 1, 2, $21, 0, 0, 1, 0
+ spritePiece 5, -$B, 1, 1, $23, 0, 0, 1, 0
+ spritePiece -$14, -$C, 4, 3, $4BA, 0, 0, 0, 0
+ spritePiece $C, -$C, 1, 3, $4C6, 0, 0, 0, 0
+Map_objCF_019E_End
+
+Map_objCF_01C0: spriteHeader
+ spritePiece -8, -$13, 1, 2, $24, 0, 0, 1, 0
+ spritePiece 0, -$B, 1, 1, $26, 0, 0, 1, 0
+ spritePiece -$14, -$C, 4, 3, $4C9, 0, 0, 0, 0
+ spritePiece $C, -$C, 1, 1, $4D5, 0, 0, 0, 0
+Map_objCF_01C0_End
+
+Map_objCF_01E2: spriteHeader
+ spritePiece -9, -$F, 2, 2, $27, 0, 0, 1, 0
+ spritePiece -$14, -4, 2, 2, $4D6, 0, 0, 0, 0
+ spritePiece -4, -$C, 3, 2, $4DA, 0, 0, 0, 0
+ spritePiece -4, 4, 2, 1, $4E0, 0, 0, 0, 0
+Map_objCF_01E2_End
+
+Map_objCF_0204: spriteHeader
+ spritePiece 0, 0, 3, 4, $2B, 0, 0, 0, 0
+ spritePiece $18, 8, 1, 3, $37, 0, 0, 0, 0
+ spritePiece 8, $20, 2, 1, $3A, 0, 0, 0, 0
+Map_objCF_0204_End
+
+Map_objCF_021E: spriteHeader
+ spritePiece 0, 0, 3, 1, $3C, 0, 0, 0, 0
+ spritePiece 0, 8, 4, 3, $3F, 0, 0, 0, 0
+ spritePiece 8, $20, 3, 1, $4B, 0, 0, 0, 0
+ spritePiece $10, $28, 2, 1, $4E, 0, 0, 0, 0
+Map_objCF_021E_End
+
+Map_objCF_0240: spriteHeader
+ spritePiece 8, 0, 3, 1, $50, 0, 0, 0, 0
+ spritePiece 0, 8, 4, 4, $53, 0, 0, 0, 0
+ spritePiece $20, 8, 3, 4, $63, 0, 0, 0, 0
+ spritePiece $38, $10, 2, 3, $6F, 0, 0, 0, 0
+ spritePiece 0, $28, 2, 1, $75, 0, 0, 0, 0
+ spritePiece $10, $28, 2, 3, $77, 0, 0, 0, 0
+ spritePiece $20, $28, 4, 4, $7D, 0, 0, 0, 0
+ spritePiece $40, $28, 1, 1, $8D, 0, 0, 0, 0
+ spritePiece $40, $30, 2, 3, $8E, 0, 0, 0, 0
+ spritePiece $28, $48, 4, 1, $94, 0, 0, 0, 0
+ spritePiece $38, $50, 3, 2, $98, 0, 0, 0, 0
+ spritePiece $40, $60, 2, 1, $9E, 0, 0, 0, 0
+Map_objCF_0240_End
+
+Map_objCF_02A2: spriteHeader
+ spritePiece 8, 0, 2, 1, $2B, 0, 0, 0, 0
+ spritePiece 0, 8, 1, 2, $2D, 0, 0, 0, 0
+ spritePiece 8, 8, 3, 3, $2F, 0, 0, 0, 0
+ spritePiece 8, $20, 2, 1, $38, 0, 0, 0, 0
+Map_objCF_02A2_End
+
+Map_objCF_02C4: spriteHeader
+ spritePiece 8, 8, 3, 1, $3A, 0, 0, 0, 0
+ spritePiece 0, $10, 4, 3, $3D, 0, 0, 0, 0
+ spritePiece 8, $28, 3, 1, $49, 0, 0, 0, 0
+Map_objCF_02C4_End
+
+Map_objCF_02DE: spriteHeader
+ spritePiece $30, 0, 3, 1, $4C, 0, 0, 0, 0
+ spritePiece $28, 8, 4, 4, $4F, 0, 0, 0, 0
+ spritePiece $48, $18, 3, 1, $5F, 0, 0, 0, 0
+ spritePiece $48, $20, 4, 4, $62, 0, 0, 0, 0
+ spritePiece $68, $18, 1, 4, $72, 0, 0, 0, 0
+ spritePiece $68, $38, 1, 4, $76, 0, 0, 0, 0
+ spritePiece $48, $40, 4, 4, $7A, 0, 0, 0, 0
+ spritePiece 0, $10, 1, 1, $8A, 0, 0, 0, 0
+ spritePiece 0, $20, 1, 1, $8B, 0, 0, 0, 0
+ spritePiece 8, $10, 4, 3, $8C, 0, 0, 0, 0
+ spritePiece 8, $28, 1, 1, $98, 0, 0, 0, 0
+ spritePiece 0, $38, 1, 3, $99, 0, 0, 0, 0
+ spritePiece $28, $28, 4, 4, $9C, 0, 0, 0, 0
+ spritePiece $18, $28, 2, 2, $AC, 0, 0, 0, 0
+ spritePiece $10, $38, 3, 2, $B0, 0, 0, 0, 0
+ spritePiece 8, $40, 1, 3, $B6, 0, 0, 0, 0
+ spritePiece $10, $48, 3, 3, $B9, 0, 0, 0, 0
+ spritePiece $28, $48, 2, 2, $C2, 0, 0, 0, 0
+ spritePiece $38, $48, 2, 4, $C6, 0, 0, 0, 0
+Map_objCF_02DE_End
+
+Map_objCF_0378: spriteHeader
+ spritePiece -4, -8, 2, 1, $19, 0, 0, 0, 0
+ spritePiece -$C, 0, 3, 1, $1B, 0, 0, 0, 0
+Map_objCF_0378_End
+
+Map_objCF_038A: spriteHeader
+ spritePiece -8, -8, 2, 2, $1E, 0, 0, 0, 0
+Map_objCF_038A_End
+
+Map_objCF_0394: spriteHeader
+ spritePiece -8, -8, 2, 2, $22, 0, 0, 0, 0
+Map_objCF_0394_End
+
+Map_objCF_039E: spriteHeader
+ spritePiece -8, -8, 2, 2, $26, 0, 0, 0, 0
+Map_objCF_039E_End
+
+Map_objCF_03A8: spriteHeader
+ spritePiece -8, -8, 2, 2, $2A, 0, 0, 0, 0
+Map_objCF_03A8_End
+
+Map_objCF_03B2: spriteHeader
+ spritePiece $28, 0, 1, 1, $2E, 0, 0, 0, 1
+ spritePiece $20, 8, 3, 1, $2F, 0, 0, 0, 1
+ spritePiece $18, $10, 4, 4, $32, 0, 0, 0, 1
+ spritePiece $38, $10, 2, 2, $42, 0, 0, 0, 1
+ spritePiece $38, $20, 3, 4, $46, 0, 0, 0, 1
+ spritePiece $50, $28, 4, 4, $52, 0, 0, 0, 1
+ spritePiece $18, $30, 4, 4, $62, 0, 0, 0, 1
+ spritePiece $38, $40, 3, 1, $72, 0, 0, 0, 1
+ spritePiece 0, $48, 3, 3, $75, 0, 0, 0, 1
+ spritePiece $18, $50, 2, 1, $7E, 0, 0, 0, 1
+ spritePiece $18, $58, 1, 1, $80, 0, 0, 0, 1
+ spritePiece $38, $48, 4, 1, $81, 0, 0, 0, 1
+ spritePiece $30, $50, 2, 2, $85, 0, 0, 0, 1
+ spritePiece $40, $50, 3, 1, $89, 0, 0, 0, 1
+ spritePiece $48, $58, 2, 1, $8C, 0, 0, 0, 1
+Map_objCF_03B2_End
+
+Map_objCF_042C: spriteHeader
+ spritePiece 6, -$20, 2, 3, $19, 0, 0, 1, 0
+ spritePiece -$20, -$10, 2, 1, $493, 0, 0, 0, 0
+ spritePiece -$20, -8, 3, 2, $4EE, 0, 0, 0, 0
+ spritePiece -8, -$10, 2, 2, $4F4, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 1, $49F, 0, 0, 0, 0
+ spritePiece 8, -$10, 2, 1, $4A1, 0, 0, 0, 0
+ spritePiece 8, -8, 3, 2, $4A3, 0, 0, 0, 0
+ spritePiece 8, 8, 1, 1, $4A9, 0, 0, 0, 0
+Map_objCF_042C_End
+
+Map_objCF_046E: spriteHeader
+ spritePiece 4, -$19, 1, 2, $1F, 0, 0, 1, 0
+ spritePiece -$18, -$C, 2, 2, $4F8, 0, 0, 0, 0
+ spritePiece -8, -$C, 2, 2, $4FC, 0, 0, 0, 0
+ spritePiece -8, 4, 2, 1, $4B2, 0, 0, 0, 0
+ spritePiece 8, -$C, 2, 3, $4B4, 0, 0, 0, 0
+Map_objCF_046E_End
+
+ even
diff --git a/mappings/sprite/objCF.bin b/mappings/sprite/objCF.bin
deleted file mode 100644
index 2e42eb1d..00000000
Binary files a/mappings/sprite/objCF.bin and /dev/null differ
diff --git a/mappings/sprite/objD2.asm b/mappings/sprite/objD2.asm
new file mode 100644
index 00000000..ee72c692
--- /dev/null
+++ b/mappings/sprite/objD2.asm
@@ -0,0 +1,97 @@
+Map_objD2: mappingsTable
+ mappingsTableEntry.w Map_objD2_0020
+ mappingsTableEntry.w Map_objD2_002A
+ mappingsTableEntry.w Map_objD2_003C
+ mappingsTableEntry.w Map_objD2_0056
+ mappingsTableEntry.w Map_objD2_0078
+ mappingsTableEntry.w Map_objD2_00A2
+ mappingsTableEntry.w Map_objD2_00CC
+ mappingsTableEntry.w Map_objD2_00F6
+ mappingsTableEntry.w Map_objD2_00F6
+ mappingsTableEntry.w Map_objD2_0120
+ mappingsTableEntry.w Map_objD2_014A
+ mappingsTableEntry.w Map_objD2_0174
+ mappingsTableEntry.w Map_objD2_0056
+ mappingsTableEntry.w Map_objD2_003C
+ mappingsTableEntry.w Map_objD2_002A
+ mappingsTableEntry.w Map_objD2_0020
+
+Map_objD2_0020: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
+Map_objD2_0020_End
+
+Map_objD2_002A: spriteHeader
+ spritePiece -8, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 2, 0, 0, 0, 0, 0
+Map_objD2_002A_End
+
+Map_objD2_003C: spriteHeader
+ spritePiece -8, -$18, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, 8, 2, 2, 0, 0, 0, 0, 0
+Map_objD2_003C_End
+
+Map_objD2_0056: spriteHeader
+ spritePiece -8, -$20, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, $10, 2, 2, 0, 0, 0, 0, 0
+Map_objD2_0056_End
+
+Map_objD2_0078: spriteHeader
+ spritePiece 0, -$20, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$20, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, $10, 2, 2, 0, 0, 0, 0, 0
+Map_objD2_0078_End
+
+Map_objD2_00A2: spriteHeader
+ spritePiece 8, -$18, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, -$18, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$18, -$18, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$18, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$18, 8, 2, 2, 0, 0, 0, 0, 0
+Map_objD2_00A2_End
+
+Map_objD2_00CC: spriteHeader
+ spritePiece $10, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, 0, 2, 2, 0, 0, 0, 0, 0
+Map_objD2_00CC_End
+
+Map_objD2_00F6: spriteHeader
+ spritePiece $18, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 8, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$18, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$28, -8, 2, 2, 0, 0, 0, 0, 0
+Map_objD2_00F6_End
+
+Map_objD2_0120: spriteHeader
+ spritePiece $10, 0, 2, 2, 0, 0, 0, 0, 0
+ spritePiece $10, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$20, -$10, 2, 2, 0, 0, 0, 0, 0
+Map_objD2_0120_End
+
+Map_objD2_014A: spriteHeader
+ spritePiece 8, 8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 8, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 8, -$18, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -8, -$18, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$18, -$18, 2, 2, 0, 0, 0, 0, 0
+Map_objD2_014A_End
+
+Map_objD2_0174: spriteHeader
+ spritePiece 0, $10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$20, 2, 2, 0, 0, 0, 0, 0
+ spritePiece -$10, -$20, 2, 2, 0, 0, 0, 0, 0
+Map_objD2_0174_End
+
+ even
diff --git a/mappings/sprite/objD2.bin b/mappings/sprite/objD2.bin
deleted file mode 100644
index 31f976f5..00000000
Binary files a/mappings/sprite/objD2.bin and /dev/null differ
diff --git a/mappings/sprite/objD4.asm b/mappings/sprite/objD4.asm
new file mode 100644
index 00000000..5819f65d
--- /dev/null
+++ b/mappings/sprite/objD4.asm
@@ -0,0 +1,11 @@
+Map_objD4: mappingsTable
+ mappingsTableEntry.w Map_objD4_0002
+
+Map_objD4_0002: spriteHeader
+ spritePiece -$20, -$20, 4, 4, 0, 0, 0, 0, 0
+ spritePiece 0, -$20, 4, 4, 0, 1, 0, 0, 0
+ spritePiece -$20, 0, 4, 4, 0, 0, 1, 0, 0
+ spritePiece 0, 0, 4, 4, 0, 1, 1, 0, 0
+Map_objD4_0002_End
+
+ even
diff --git a/mappings/sprite/objD4.bin b/mappings/sprite/objD4.bin
deleted file mode 100644
index 34e5bad8..00000000
Binary files a/mappings/sprite/objD4.bin and /dev/null differ
diff --git a/mappings/sprite/objD5.asm b/mappings/sprite/objD5.asm
new file mode 100644
index 00000000..d0886baf
--- /dev/null
+++ b/mappings/sprite/objD5.asm
@@ -0,0 +1,9 @@
+Map_objD5: mappingsTable
+ mappingsTableEntry.w Map_objD5_0002
+
+Map_objD5_0002: spriteHeader
+ spritePiece -$10, -8, 2, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -8, 2, 2, 0, 1, 0, 0, 0
+Map_objD5_0002_End
+
+ even
diff --git a/mappings/sprite/objD5.bin b/mappings/sprite/objD5.bin
deleted file mode 100644
index e3a06fc3..00000000
Binary files a/mappings/sprite/objD5.bin and /dev/null differ
diff --git a/mappings/sprite/objD6_a.asm b/mappings/sprite/objD6_a.asm
new file mode 100644
index 00000000..62cb6621
--- /dev/null
+++ b/mappings/sprite/objD6_a.asm
@@ -0,0 +1,8 @@
+Map_objD6_a: mappingsTable
+ mappingsTableEntry.w Map_objD6_a_0002
+
+Map_objD6_a_0002: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
+Map_objD6_a_0002_End
+
+ even
diff --git a/mappings/sprite/objD6_a.bin b/mappings/sprite/objD6_a.bin
deleted file mode 100644
index 56e3a1b6..00000000
Binary files a/mappings/sprite/objD6_a.bin and /dev/null differ
diff --git a/mappings/sprite/objD6_b.asm b/mappings/sprite/objD6_b.asm
new file mode 100644
index 00000000..d020b88a
--- /dev/null
+++ b/mappings/sprite/objD6_b.asm
@@ -0,0 +1,23 @@
+Map_objD6_b: mappingsTable
+ mappingsTableEntry.w Map_objD6_b_0004
+ mappingsTableEntry.w Map_objD6_b_0036
+
+Map_objD6_b_0004: spriteHeader
+ spritePiece -$18, -$14, 3, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$14, 3, 2, 0, 1, 0, 0, 0
+ spritePiece -$18, -4, 3, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -4, 3, 2, 0, 1, 0, 0, 0
+ spritePiece -$18, $C, 3, 2, 0, 0, 0, 0, 0
+ spritePiece 0, $C, 3, 2, 0, 1, 0, 0, 0
+Map_objD6_b_0004_End
+
+Map_objD6_b_0036: spriteHeader
+ spritePiece -$18, -$14, 3, 2, 6, 0, 0, 1, 0
+ spritePiece 0, -$14, 3, 2, 6, 1, 0, 1, 0
+ spritePiece -$18, -4, 3, 2, 6, 0, 0, 1, 0
+ spritePiece 0, -4, 3, 2, 6, 1, 0, 1, 0
+ spritePiece -$18, $C, 3, 2, 6, 0, 0, 1, 0
+ spritePiece 0, $C, 3, 2, 6, 1, 0, 1, 0
+Map_objD6_b_0036_End
+
+ even
diff --git a/mappings/sprite/objD6_b.bin b/mappings/sprite/objD6_b.bin
deleted file mode 100644
index c814f13b..00000000
Binary files a/mappings/sprite/objD6_b.bin and /dev/null differ
diff --git a/mappings/sprite/objD7.asm b/mappings/sprite/objD7.asm
new file mode 100644
index 00000000..860da13b
--- /dev/null
+++ b/mappings/sprite/objD7.asm
@@ -0,0 +1,27 @@
+Map_objD7: mappingsTable
+ mappingsTableEntry.w Map_objD7_0006
+ mappingsTableEntry.w Map_objD7_0028
+ mappingsTableEntry.w Map_objD7_004A
+
+Map_objD7_0006: spriteHeader
+ spritePiece -$18, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$10, 3, 2, 0, 1, 0, 0, 0
+ spritePiece -$18, 0, 3, 2, 0, 0, 1, 0, 0
+ spritePiece 0, 0, 3, 2, 0, 1, 1, 0, 0
+Map_objD7_0006_End
+
+Map_objD7_0028: spriteHeader
+ spritePiece -$18, -$C, 3, 2, 0, 0, 0, 0, 0
+ spritePiece 0, -$C, 3, 2, 0, 1, 0, 0, 0
+ spritePiece -$18, 4, 3, 2, 0, 0, 1, 0, 0
+ spritePiece 0, 4, 3, 2, 0, 1, 1, 0, 0
+Map_objD7_0028_End
+
+Map_objD7_004A: spriteHeader
+ spritePiece -$14, -$10, 3, 2, 0, 0, 0, 0, 0
+ spritePiece 4, -$10, 3, 2, 0, 1, 0, 0, 0
+ spritePiece -$14, 0, 3, 2, 0, 0, 1, 0, 0
+ spritePiece 4, 0, 3, 2, 0, 1, 1, 0, 0
+Map_objD7_004A_End
+
+ even
diff --git a/mappings/sprite/objD7.bin b/mappings/sprite/objD7.bin
deleted file mode 100644
index 6339d563..00000000
Binary files a/mappings/sprite/objD7.bin and /dev/null differ
diff --git a/mappings/sprite/objD8.asm b/mappings/sprite/objD8.asm
new file mode 100644
index 00000000..c5205a87
--- /dev/null
+++ b/mappings/sprite/objD8.asm
@@ -0,0 +1,33 @@
+Map_objD8: mappingsTable
+ mappingsTableEntry.w Map_objD8_000C
+ mappingsTableEntry.w Map_objD8_0016
+ mappingsTableEntry.w Map_objD8_0020
+ mappingsTableEntry.w Map_objD8_002A
+ mappingsTableEntry.w Map_objD8_0034
+ mappingsTableEntry.w Map_objD8_003E
+
+Map_objD8_000C: spriteHeader
+ spritePiece -$10, -8, 4, 2, 0, 0, 0, 0, 0
+Map_objD8_000C_End
+
+Map_objD8_0016: spriteHeader
+ spritePiece -$C, -$10, 3, 4, 8, 0, 0, 0, 0
+Map_objD8_0016_End
+
+Map_objD8_0020: spriteHeader
+ spritePiece -8, -$10, 2, 4, $14, 0, 0, 0, 0
+Map_objD8_0020_End
+
+Map_objD8_002A: spriteHeader
+ spritePiece -$10, -6, 4, 2, 0, 0, 0, 0, 0
+Map_objD8_002A_End
+
+Map_objD8_0034: spriteHeader
+ spritePiece -$E, -$E, 3, 4, 8, 0, 0, 0, 0
+Map_objD8_0034_End
+
+Map_objD8_003E: spriteHeader
+ spritePiece -$A, -$10, 2, 4, $14, 0, 0, 0, 0
+Map_objD8_003E_End
+
+ even
diff --git a/mappings/sprite/objD8.bin b/mappings/sprite/objD8.bin
deleted file mode 100644
index c69ea11d..00000000
Binary files a/mappings/sprite/objD8.bin and /dev/null differ
diff --git a/mappings/sprite/objDA.asm b/mappings/sprite/objDA.asm
new file mode 100644
index 00000000..be6fca6f
--- /dev/null
+++ b/mappings/sprite/objDA.asm
@@ -0,0 +1,39 @@
+Map_objDA: mappingsTable
+ mappingsTableEntry.w Map_objDA_000C
+ mappingsTableEntry.w Map_objDA_000C
+ mappingsTableEntry.w Map_objDA_0066
+ mappingsTableEntry.w Map_objDA_0070
+ mappingsTableEntry.w Map_objDA_007A
+ mappingsTableEntry.w Map_objDA_0084
+
+Map_objDA_000C: spriteHeader
+ spritePiece -$3C, -8, 2, 2, $90, 0, 0, 0, 0
+ spritePiece -$2C, -8, 2, 2, $88, 0, 0, 0, 0
+ spritePiece -$1C, -8, 2, 2, $84, 0, 0, 0, 0
+ spritePiece -$C, -8, 2, 2, $94, 0, 0, 0, 0
+ spritePiece 4, -8, 1, 2, $98, 0, 0, 0, 0
+ spritePiece $C, -8, 2, 2, $84, 0, 0, 0, 0
+ spritePiece $1C, -8, 2, 2, $9A, 0, 0, 0, 0
+ spritePiece $2C, -8, 2, 2, $80, 0, 0, 0, 0
+ spritePiece -$18, $38, 2, 2, $20, 0, 0, 1, 0
+ spritePiece 8, $38, 2, 2, $20, 0, 0, 1, 0
+ spritePiece -8, $36, 2, 2, $1FC, 0, 0, 0, 0
+Map_objDA_000C_End
+
+Map_objDA_0066: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 0, 0, 0, 0, 0
+Map_objDA_0066_End
+
+Map_objDA_0070: spriteHeader
+ spritePiece -$10, -$10, 4, 4, $10, 0, 0, 0, 0
+Map_objDA_0070_End
+
+Map_objDA_007A: spriteHeader
+ spritePiece 0, 0, 2, 3, 0, 0, 0, 0, 0
+Map_objDA_007A_End
+
+Map_objDA_0084: spriteHeader
+ spritePiece 0, 0, 2, 3, 6, 0, 0, 0, 0
+Map_objDA_0084_End
+
+ even
diff --git a/mappings/sprite/objDA.bin b/mappings/sprite/objDA.bin
deleted file mode 100644
index 2638e66f..00000000
Binary files a/mappings/sprite/objDA.bin and /dev/null differ
diff --git a/mappings/spriteDPLC/Sonic.asm b/mappings/spriteDPLC/Sonic.asm
new file mode 100644
index 00000000..304a6080
--- /dev/null
+++ b/mappings/spriteDPLC/Sonic.asm
@@ -0,0 +1,1540 @@
+.offsets: mappingsTable
+ mappingsTableEntry.w .frame0
+ mappingsTableEntry.w .frame1
+ mappingsTableEntry.w .frame2
+ mappingsTableEntry.w .frame3
+ mappingsTableEntry.w .frame4
+ mappingsTableEntry.w .frame5
+ mappingsTableEntry.w .frame6
+ mappingsTableEntry.w .frame7
+ mappingsTableEntry.w .frame8
+ mappingsTableEntry.w .frame9
+ mappingsTableEntry.w .frame10
+ mappingsTableEntry.w .frame11
+ mappingsTableEntry.w .frame12
+ mappingsTableEntry.w .frame13
+ mappingsTableEntry.w .frame14
+ mappingsTableEntry.w .frame15
+ mappingsTableEntry.w .frame16
+ mappingsTableEntry.w .frame17
+ mappingsTableEntry.w .frame18
+ mappingsTableEntry.w .frame19
+ mappingsTableEntry.w .frame20
+ mappingsTableEntry.w .frame21
+ mappingsTableEntry.w .frame22
+ mappingsTableEntry.w .frame23
+ mappingsTableEntry.w .frame24
+ mappingsTableEntry.w .frame25
+ mappingsTableEntry.w .frame26
+ mappingsTableEntry.w .frame27
+ mappingsTableEntry.w .frame28
+ mappingsTableEntry.w .frame29
+ mappingsTableEntry.w .frame30
+ mappingsTableEntry.w .frame31
+ mappingsTableEntry.w .frame32
+ mappingsTableEntry.w .frame33
+ mappingsTableEntry.w .frame34
+ mappingsTableEntry.w .frame35
+ mappingsTableEntry.w .frame36
+ mappingsTableEntry.w .frame37
+ mappingsTableEntry.w .frame38
+ mappingsTableEntry.w .frame39
+ mappingsTableEntry.w .frame40
+ mappingsTableEntry.w .frame41
+ mappingsTableEntry.w .frame42
+ mappingsTableEntry.w .frame43
+ mappingsTableEntry.w .frame44
+ mappingsTableEntry.w .frame45
+ mappingsTableEntry.w .frame46
+ mappingsTableEntry.w .frame47
+ mappingsTableEntry.w .frame48
+ mappingsTableEntry.w .frame49
+ mappingsTableEntry.w .frame50
+ mappingsTableEntry.w .frame51
+ mappingsTableEntry.w .frame52
+ mappingsTableEntry.w .frame53
+ mappingsTableEntry.w .frame54
+ mappingsTableEntry.w .frame55
+ mappingsTableEntry.w .frame56
+ mappingsTableEntry.w .frame57
+ mappingsTableEntry.w .frame58
+ mappingsTableEntry.w .frame59
+ mappingsTableEntry.w .frame60
+ mappingsTableEntry.w .frame61
+ mappingsTableEntry.w .frame62
+ mappingsTableEntry.w .frame63
+ mappingsTableEntry.w .frame64
+ mappingsTableEntry.w .frame65
+ mappingsTableEntry.w .frame66
+ mappingsTableEntry.w .frame67
+ mappingsTableEntry.w .frame68
+ mappingsTableEntry.w .frame69
+ mappingsTableEntry.w .frame70
+ mappingsTableEntry.w .frame71
+ mappingsTableEntry.w .frame72
+ mappingsTableEntry.w .frame73
+ mappingsTableEntry.w .frame74
+ mappingsTableEntry.w .frame75
+ mappingsTableEntry.w .frame76
+ mappingsTableEntry.w .frame77
+ mappingsTableEntry.w .frame78
+ mappingsTableEntry.w .frame79
+ mappingsTableEntry.w .frame80
+ mappingsTableEntry.w .frame81
+ mappingsTableEntry.w .frame82
+ mappingsTableEntry.w .frame83
+ mappingsTableEntry.w .frame84
+ mappingsTableEntry.w .frame85
+ mappingsTableEntry.w .frame86
+ mappingsTableEntry.w .frame87
+ mappingsTableEntry.w .frame88
+ mappingsTableEntry.w .frame89
+ mappingsTableEntry.w .frame90
+ mappingsTableEntry.w .frame91
+ mappingsTableEntry.w .frame92
+ mappingsTableEntry.w .frame93
+ mappingsTableEntry.w .frame94
+ mappingsTableEntry.w .frame95
+ mappingsTableEntry.w .frame96
+ mappingsTableEntry.w .frame97
+ mappingsTableEntry.w .frame98
+ mappingsTableEntry.w .frame99
+ mappingsTableEntry.w .frame100
+ mappingsTableEntry.w .frame101
+ mappingsTableEntry.w .frame102
+ mappingsTableEntry.w .frame103
+ mappingsTableEntry.w .frame104
+ mappingsTableEntry.w .frame105
+ mappingsTableEntry.w .frame106
+ mappingsTableEntry.w .frame107
+ mappingsTableEntry.w .frame108
+ mappingsTableEntry.w .frame109
+ mappingsTableEntry.w .frame110
+ mappingsTableEntry.w .frame111
+ mappingsTableEntry.w .frame112
+ mappingsTableEntry.w .frame113
+ mappingsTableEntry.w .frame114
+ mappingsTableEntry.w .frame115
+ mappingsTableEntry.w .frame116
+ mappingsTableEntry.w .frame117
+ mappingsTableEntry.w .frame118
+ mappingsTableEntry.w .frame119
+ mappingsTableEntry.w .frame120
+ mappingsTableEntry.w .frame121
+ mappingsTableEntry.w .frame122
+ mappingsTableEntry.w .frame123
+ mappingsTableEntry.w .frame124
+ mappingsTableEntry.w .frame125
+ mappingsTableEntry.w .frame126
+ mappingsTableEntry.w .frame127
+ mappingsTableEntry.w .frame128
+ mappingsTableEntry.w .frame129
+ mappingsTableEntry.w .frame130
+ mappingsTableEntry.w .frame131
+ mappingsTableEntry.w .frame132
+ mappingsTableEntry.w .frame133
+ mappingsTableEntry.w .frame134
+ mappingsTableEntry.w .frame135
+ mappingsTableEntry.w .frame136
+ mappingsTableEntry.w .frame137
+ mappingsTableEntry.w .frame138
+ mappingsTableEntry.w .frame139
+ mappingsTableEntry.w .frame140
+ mappingsTableEntry.w .frame141
+ mappingsTableEntry.w .frame142
+ mappingsTableEntry.w .frame143
+ mappingsTableEntry.w .frame144
+ mappingsTableEntry.w .frame145
+ mappingsTableEntry.w .frame146
+ mappingsTableEntry.w .frame147
+ mappingsTableEntry.w .frame148
+ mappingsTableEntry.w .frame149
+ mappingsTableEntry.w .frame150
+ mappingsTableEntry.w .frame151
+ mappingsTableEntry.w .frame152
+ mappingsTableEntry.w .frame153
+ mappingsTableEntry.w .frame154
+ mappingsTableEntry.w .frame155
+ mappingsTableEntry.w .frame156
+ mappingsTableEntry.w .frame157
+ mappingsTableEntry.w .frame158
+ mappingsTableEntry.w .frame159
+ mappingsTableEntry.w .frame160
+ mappingsTableEntry.w .frame161
+ mappingsTableEntry.w .frame162
+ mappingsTableEntry.w .frame163
+ mappingsTableEntry.w .frame164
+ mappingsTableEntry.w .frame165
+ mappingsTableEntry.w .frame166
+ mappingsTableEntry.w .frame167
+ mappingsTableEntry.w .frame168
+ mappingsTableEntry.w .frame169
+ mappingsTableEntry.w .frame170
+ mappingsTableEntry.w .frame171
+ mappingsTableEntry.w .frame172
+ mappingsTableEntry.w .frame173
+ mappingsTableEntry.w .frame174
+ mappingsTableEntry.w .frame175
+ mappingsTableEntry.w .frame176
+ mappingsTableEntry.w .frame177
+ mappingsTableEntry.w .frame178
+ mappingsTableEntry.w .frame179
+ mappingsTableEntry.w .frame180
+ mappingsTableEntry.w .frame181
+ mappingsTableEntry.w .frame182
+ mappingsTableEntry.w .frame183
+ mappingsTableEntry.w .frame184
+ mappingsTableEntry.w .frame185
+ mappingsTableEntry.w .frame186
+ mappingsTableEntry.w .frame187
+ mappingsTableEntry.w .frame188
+ mappingsTableEntry.w .frame189
+ mappingsTableEntry.w .frame190
+ mappingsTableEntry.w .frame191
+ mappingsTableEntry.w .frame192
+ mappingsTableEntry.w .frame193
+ mappingsTableEntry.w .frame194
+ mappingsTableEntry.w .frame195
+ mappingsTableEntry.w .frame196
+ mappingsTableEntry.w .frame197
+ mappingsTableEntry.w .frame198
+ mappingsTableEntry.w .frame199
+ mappingsTableEntry.w .frame200
+ mappingsTableEntry.w .frame201
+ mappingsTableEntry.w .frame202
+ mappingsTableEntry.w .frame203
+ mappingsTableEntry.w .frame204
+ mappingsTableEntry.w .frame205
+ mappingsTableEntry.w .frame206
+ mappingsTableEntry.w .frame207
+ mappingsTableEntry.w .frame208
+ mappingsTableEntry.w .frame209
+ mappingsTableEntry.w .frame210
+ mappingsTableEntry.w .frame211
+ mappingsTableEntry.w .frame212
+ mappingsTableEntry.w .frame213
+
+.frame0: dplcHeader
+.frame0_End
+
+.frame1: dplcHeader
+ dplcEntry 4, 0
+ dplcEntry 4, 4
+ dplcEntry 6, 8
+ dplcEntry 6, $E
+.frame1_End
+
+.frame2: dplcHeader
+ dplcEntry $C, $14
+ dplcEntry 6, $20
+.frame2_End
+
+.frame3: dplcHeader
+ dplcEntry 4, $26
+ dplcEntry 4, $2A
+ dplcEntry 4, $2E
+ dplcEntry 6, $32
+.frame3_End
+
+.frame4: dplcHeader
+ dplcEntry 4, $26
+ dplcEntry 4, $38
+ dplcEntry 4, $2E
+ dplcEntry 6, $32
+.frame4_End
+
+.frame5: dplcHeader
+ dplcEntry 4, $26
+ dplcEntry 4, $38
+ dplcEntry 4, $2E
+ dplcEntry 2, $32
+ dplcEntry 4, $3C
+.frame5_End
+
+.frame6: dplcHeader
+ dplcEntry 4, $26
+ dplcEntry 8, $40
+ dplcEntry 6, $32
+.frame6_End
+
+.frame7: dplcHeader
+ dplcEntry $C, $48
+ dplcEntry 2, $54
+.frame7_End
+
+.frame8: dplcHeader
+ dplcEntry $C, $56
+ dplcEntry 4, $62
+.frame8_End
+
+.frame9: dplcHeader
+ dplcEntry $C, $56
+ dplcEntry 4, $66
+.frame9_End
+
+.frame10: dplcHeader
+ dplcEntry $C, $6A
+ dplcEntry 8, $76
+.frame10_End
+
+.frame11: dplcHeader
+ dplcEntry 4, $7E
+ dplcEntry 4, $82
+ dplcEntry 6, $86
+ dplcEntry 6, $E
+.frame11_End
+
+.frame12: dplcHeader
+ dplcEntry 4, $8C
+ dplcEntry 4, $90
+ dplcEntry 4, $94
+ dplcEntry 6, $E
+.frame12_End
+
+.frame13: dplcHeader
+ dplcEntry 8, $98
+ dplcEntry 2, $A0
+ dplcEntry $10, $A2
+.frame13_End
+
+.frame14: dplcHeader
+ dplcEntry 8, $98
+ dplcEntry 2, $B2
+ dplcEntry $C, $B4
+ dplcEntry 2, $C0
+.frame14_End
+
+.frame15: dplcHeader
+ dplcEntry 8, $C2
+ dplcEntry 6, $CA
+ dplcEntry 4, $D0
+.frame15_End
+
+.frame16: dplcHeader
+ dplcEntry 6, $D4
+ dplcEntry $10, $DA
+.frame16_End
+
+.frame17: dplcHeader
+ dplcEntry 6, $D4
+ dplcEntry $10, $EA
+ dplcEntry 2, $FA
+.frame17_End
+
+.frame18: dplcHeader
+ dplcEntry 6, $D4
+ dplcEntry 2, $FC
+ dplcEntry $C, $FE
+ dplcEntry 2, $10A
+.frame18_End
+
+.frame19: dplcHeader
+ dplcEntry 8, $C2
+ dplcEntry 6, $10C
+ dplcEntry 4, $112
+.frame19_End
+
+.frame20: dplcHeader
+ dplcEntry 8, $98
+ dplcEntry $C, $116
+.frame20_End
+
+.frame21: dplcHeader
+ dplcEntry 6, $122
+ dplcEntry 6, $128
+ dplcEntry 4, $12E
+ dplcEntry 2, $132
+.frame21_End
+
+.frame22: dplcHeader
+ dplcEntry 6, $122
+ dplcEntry 2, $134
+ dplcEntry 8, $136
+ dplcEntry 4, $13E
+ dplcEntry 2, $142
+.frame22_End
+
+.frame23: dplcHeader
+ dplcEntry 8, $144
+ dplcEntry 4, $14C
+ dplcEntry 2, $150
+ dplcEntry 4, $152
+.frame23_End
+
+.frame24: dplcHeader
+ dplcEntry 6, $156
+ dplcEntry 2, $15C
+ dplcEntry 4, $15E
+ dplcEntry $C, $162
+.frame24_End
+
+.frame25: dplcHeader
+ dplcEntry 6, $156
+ dplcEntry 2, $16E
+ dplcEntry 8, $170
+ dplcEntry 2, $178
+ dplcEntry 4, $17A
+.frame25_End
+
+.frame26: dplcHeader
+ dplcEntry 6, $156
+ dplcEntry 2, $17E
+ dplcEntry 8, $180
+ dplcEntry 4, $188
+ dplcEntry 2, $18C
+.frame26_End
+
+.frame27: dplcHeader
+ dplcEntry 8, $144
+ dplcEntry 4, $18E
+ dplcEntry 2, $192
+ dplcEntry 4, $194
+.frame27_End
+
+.frame28: dplcHeader
+ dplcEntry 6, $122
+ dplcEntry 6, $198
+ dplcEntry 2, $19E
+ dplcEntry 2, $1A0
+ dplcEntry 4, $1A2
+.frame28_End
+
+.frame29: dplcHeader
+ dplcEntry 8, $1A6
+ dplcEntry $C, $1AE
+ dplcEntry 4, $1BA
+.frame29_End
+
+.frame30: dplcHeader
+ dplcEntry 8, $1A6
+ dplcEntry $C, $1BE
+ dplcEntry 4, $1CA
+.frame30_End
+
+.frame31: dplcHeader
+ dplcEntry 8, $1CE
+ dplcEntry 4, $1D6
+ dplcEntry 4, $1DA
+.frame31_End
+
+.frame32: dplcHeader
+ dplcEntry 8, $1DE
+ dplcEntry $C, $1E6
+.frame32_End
+
+.frame33: dplcHeader
+ dplcEntry 8, $1DE
+ dplcEntry 4, $1F2
+ dplcEntry $C, $1F6
+.frame33_End
+
+.frame34: dplcHeader
+ dplcEntry 8, $1DE
+ dplcEntry $C, $202
+ dplcEntry 4, $20E
+.frame34_End
+
+.frame35: dplcHeader
+ dplcEntry 8, $1CE
+ dplcEntry 4, $212
+ dplcEntry 4, $216
+.frame35_End
+
+.frame36: dplcHeader
+ dplcEntry 8, $1A6
+ dplcEntry $C, $21A
+.frame36_End
+
+.frame37: dplcHeader
+ dplcEntry 4, $226
+ dplcEntry 8, $22A
+ dplcEntry 8, $232
+ dplcEntry 2, $23A
+.frame37_End
+
+.frame38: dplcHeader
+ dplcEntry 4, $23C
+ dplcEntry 6, $240
+ dplcEntry 8, $22A
+ dplcEntry 8, $246
+ dplcEntry 2, $23A
+.frame38_End
+
+.frame39: dplcHeader
+ dplcEntry 8, $24E
+ dplcEntry 8, $256
+ dplcEntry 4, $25E
+ dplcEntry 2, $262
+.frame39_End
+
+.frame40: dplcHeader
+ dplcEntry 8, $264
+ dplcEntry 8, $26C
+ dplcEntry 6, $274
+ dplcEntry 2, $27A
+.frame40_End
+
+.frame41: dplcHeader
+ dplcEntry 6, $27C
+ dplcEntry 8, $26C
+ dplcEntry 8, $282
+ dplcEntry 2, $27A
+.frame41_End
+
+.frame42: dplcHeader
+ dplcEntry 4, $28A
+ dplcEntry 6, $28E
+ dplcEntry 8, $26C
+ dplcEntry 8, $294
+ dplcEntry 2, $27A
+.frame42_End
+
+.frame43: dplcHeader
+ dplcEntry 8, $29C
+ dplcEntry 8, $256
+ dplcEntry 4, $2A4
+ dplcEntry 2, $262
+.frame43_End
+
+.frame44: dplcHeader
+ dplcEntry 8, $2A8
+ dplcEntry 8, $22A
+ dplcEntry 6, $2B0
+ dplcEntry 2, $23A
+.frame44_End
+
+.frame45: dplcHeader
+ dplcEntry 6, $2B6
+ dplcEntry $10, $2BC
+.frame45_End
+
+.frame46: dplcHeader
+ dplcEntry 6, $2CC
+ dplcEntry $10, $2D2
+.frame46_End
+
+.frame47: dplcHeader
+ dplcEntry 6, $2B6
+ dplcEntry $10, $2E2
+.frame47_End
+
+.frame48: dplcHeader
+ dplcEntry 6, $2CC
+ dplcEntry $10, $2F2
+.frame48_End
+
+.frame49: dplcHeader
+ dplcEntry 6, $302
+ dplcEntry 2, $308
+ dplcEntry 8, $30A
+ dplcEntry 6, $312
+.frame49_End
+
+.frame50: dplcHeader
+ dplcEntry 8, $318
+ dplcEntry 8, $320
+ dplcEntry 6, $328
+.frame50_End
+
+.frame51: dplcHeader
+ dplcEntry 6, $302
+ dplcEntry 2, $32E
+ dplcEntry 8, $330
+ dplcEntry 6, $338
+.frame51_End
+
+.frame52: dplcHeader
+ dplcEntry 8, $318
+ dplcEntry 8, $33E
+ dplcEntry 6, $346
+.frame52_End
+
+.frame53: dplcHeader
+ dplcEntry 8, $34C
+ dplcEntry $C, $354
+.frame53_End
+
+.frame54: dplcHeader
+ dplcEntry 8, $360
+ dplcEntry $C, $368
+.frame54_End
+
+.frame55: dplcHeader
+ dplcEntry 8, $34C
+ dplcEntry $C, $374
+.frame55_End
+
+.frame56: dplcHeader
+ dplcEntry 8, $360
+ dplcEntry $C, $380
+.frame56_End
+
+.frame57: dplcHeader
+ dplcEntry 2, $38C
+ dplcEntry 8, $38E
+ dplcEntry $C, $396
+.frame57_End
+
+.frame58: dplcHeader
+ dplcEntry 8, $3A2
+ dplcEntry $C, $3AA
+.frame58_End
+
+.frame59: dplcHeader
+ dplcEntry 2, $3B6
+ dplcEntry 8, $38E
+ dplcEntry $C, $3C0
+.frame59_End
+
+.frame60: dplcHeader
+ dplcEntry 8, $3A2
+ dplcEntry $C, $3CC
+.frame60_End
+
+.frame61: dplcHeader
+ dplcEntry $10, $400
+.frame61_End
+
+.frame62: dplcHeader
+ dplcEntry $10, $410
+.frame62_End
+
+.frame63: dplcHeader
+ dplcEntry $10, $420
+.frame63_End
+
+.frame64: dplcHeader
+ dplcEntry $10, $430
+.frame64_End
+
+.frame65: dplcHeader
+ dplcEntry $10, $440
+.frame65_End
+
+.frame66: dplcHeader
+ dplcEntry $10, $450
+.frame66_End
+
+.frame67: dplcHeader
+ dplcEntry $10, $460
+.frame67_End
+
+.frame68: dplcHeader
+ dplcEntry $10, $470
+.frame68_End
+
+.frame69: dplcHeader
+ dplcEntry $10, $480
+.frame69_End
+
+.frame70: dplcHeader
+ dplcEntry $10, $490
+.frame70_End
+
+.frame71: dplcHeader
+ dplcEntry $10, $4A0
+.frame71_End
+
+.frame72: dplcHeader
+ dplcEntry 6, $3D8
+ dplcEntry 6, $3DE
+ dplcEntry 8, $3E4
+.frame72_End
+
+.frame73: dplcHeader
+ dplcEntry 6, $3D8
+ dplcEntry 6, $3EC
+ dplcEntry 6, $3F2
+.frame73_End
+
+.frame74: dplcHeader
+ dplcEntry 6, $3D8
+ dplcEntry 6, $3DE
+ dplcEntry 8, $3B8
+.frame74_End
+
+.frame75: dplcHeader
+ dplcEntry 6, $3D8
+ dplcEntry 6, $3EC
+ dplcEntry 6, $4B0
+.frame75_End
+
+.frame76: dplcHeader
+ dplcEntry $C, $4B6
+.frame76_End
+
+.frame77: dplcHeader
+ dplcEntry $10, $4C2
+.frame77_End
+
+.frame78: dplcHeader
+ dplcEntry 2, $4D2
+ dplcEntry $10, $4D4
+.frame78_End
+
+.frame79: dplcHeader
+ dplcEntry 4, $4E4
+ dplcEntry $10, $4E8
+.frame79_End
+
+.frame80: dplcHeader
+ dplcEntry $10, $4F8
+ dplcEntry 2, $508
+ dplcEntry 4, $50A
+.frame80_End
+
+.frame81: dplcHeader
+ dplcEntry $10, $50E
+ dplcEntry 2, $51E
+ dplcEntry 4, $520
+.frame81_End
+
+.frame82: dplcHeader
+ dplcEntry $C, $524
+ dplcEntry 6, $530
+.frame82_End
+
+.frame83: dplcHeader
+ dplcEntry $C, $536
+ dplcEntry 6, $542
+.frame83_End
+
+.frame86:
+.frame84: dplcHeader
+ dplcEntry 4, $548
+ dplcEntry $C, $54C
+ dplcEntry 2, $558
+.frame84_End
+
+.frame85: dplcHeader
+ dplcEntry 2, $55A
+ dplcEntry 8, $55C
+.frame85_End
+
+.frame88:
+.frame87: dplcHeader
+ dplcEntry 2, $564
+ dplcEntry $C, $566
+ dplcEntry 2, $572
+.frame87_End
+
+.frame89: dplcHeader
+ dplcEntry 4, $574
+ dplcEntry $C, $578
+ dplcEntry 2, $584
+.frame89_End
+
+.frame90: dplcHeader
+ dplcEntry 6, $586
+ dplcEntry $10, $58C
+ dplcEntry 2, $59C
+.frame90_End
+
+.frame91: dplcHeader
+ dplcEntry $C, $59E
+ dplcEntry 4, $5AA
+.frame91_End
+
+.frame92: dplcHeader
+ dplcEntry 2, $5AE
+ dplcEntry $C, $5B0
+ dplcEntry 2, $5BC
+ dplcEntry 8, $5BE
+.frame92_End
+
+.frame93: dplcHeader
+ dplcEntry 2, $5AE
+ dplcEntry $C, $5C6
+ dplcEntry 2, $5BC
+ dplcEntry 8, $5BE
+.frame93_End
+
+.frame94: dplcHeader
+ dplcEntry 8, $5D2
+ dplcEntry 2, $5DA
+ dplcEntry $C, $5DC
+.frame94_End
+
+.frame95: dplcHeader
+ dplcEntry 6, $5E8
+ dplcEntry $C, $5EE
+ dplcEntry 2, $5FA
+.frame95_End
+
+.frame96: dplcHeader
+ dplcEntry $C, $5FC
+ dplcEntry 2, $608
+ dplcEntry 4, $60A
+.frame96_End
+
+.frame97: dplcHeader
+ dplcEntry $C, $60E
+ dplcEntry 2, $61A
+.frame97_End
+
+.frame98: dplcHeader
+ dplcEntry $10, $61C
+.frame98_End
+
+.frame99: dplcHeader
+ dplcEntry $C, $62C
+ dplcEntry 2, $638
+.frame99_End
+
+.frame100: dplcHeader
+ dplcEntry 2, $63A
+ dplcEntry $C, $63C
+ dplcEntry 2, $648
+.frame100_End
+
+.frame101: dplcHeader
+ dplcEntry 6, $64A
+ dplcEntry $C, $650
+ dplcEntry 4, $65C
+.frame101_End
+
+.frame102: dplcHeader
+ dplcEntry 4, $660
+ dplcEntry $C, $664
+ dplcEntry 2, $670
+.frame102_End
+
+.frame103: dplcHeader
+ dplcEntry $C, $672
+ dplcEntry 2, $67E
+.frame103_End
+
+.frame104: dplcHeader
+ dplcEntry 2, $680
+ dplcEntry $C, $682
+.frame104_End
+
+.frame105: dplcHeader
+ dplcEntry 4, $68E
+ dplcEntry $C, $692
+ dplcEntry 2, $69E
+.frame105_End
+
+.frame106: dplcHeader
+ dplcEntry 4, $6A0
+ dplcEntry $10, $6A4
+.frame106_End
+
+.frame107: dplcHeader
+ dplcEntry 8, $6B4
+ dplcEntry 4, $6BC
+ dplcEntry 6, $6C0
+.frame107_End
+
+.frame108: dplcHeader
+ dplcEntry 8, $6C6
+ dplcEntry 4, $6BC
+ dplcEntry 6, $6CE
+.frame108_End
+
+.frame109: dplcHeader
+ dplcEntry $C, $7D6
+.frame109_End
+
+.frame110: dplcHeader
+ dplcEntry $C, $7E2
+ dplcEntry 2, $7EE
+ dplcEntry 6, $7F0
+.frame110_End
+
+.frame111: dplcHeader
+ dplcEntry 9, $7F6
+ dplcEntry 1, $A18
+ dplcEntry 9, $800
+.frame111_End
+
+.frame112: dplcHeader
+ dplcEntry 3, $809
+ dplcEntry 2, $80C
+ dplcEntry 4, $80E
+ dplcEntry 9, $812
+ dplcEntry 1, $81B
+.frame112_End
+
+.frame113: dplcHeader
+ dplcEntry 3, $81C
+ dplcEntry 2, $81F
+ dplcEntry 4, $80E
+ dplcEntry 9, $812
+ dplcEntry 1, $81B
+.frame113_End
+
+.frame114: dplcHeader
+ dplcEntry 9, $821
+ dplcEntry 9, $82A
+.frame114_End
+
+.frame115: dplcHeader
+ dplcEntry 9, $833
+ dplcEntry 9, $82A
+.frame115_End
+
+.frame116: dplcHeader
+ dplcEntry 9, $83C
+ dplcEntry 9, $82A
+.frame116_End
+
+.frame117: dplcHeader
+ dplcEntry $C, $6D4
+ dplcEntry 2, $A0
+ dplcEntry $10, $A2
+.frame117_End
+
+.frame118: dplcHeader
+ dplcEntry $C, $6D4
+ dplcEntry 2, $B2
+ dplcEntry $C, $B4
+ dplcEntry 2, $C0
+.frame118_End
+
+.frame119: dplcHeader
+ dplcEntry $C, $6E0
+ dplcEntry 6, $CA
+ dplcEntry 4, $D0
+.frame119_End
+
+.frame120: dplcHeader
+ dplcEntry 9, $6EC
+ dplcEntry $10, $DA
+.frame120_End
+
+.frame121: dplcHeader
+ dplcEntry 9, $6EC
+ dplcEntry $10, $EA
+ dplcEntry 2, $FA
+.frame121_End
+
+.frame122: dplcHeader
+ dplcEntry 9, $6EC
+ dplcEntry 2, $FC
+ dplcEntry $C, $FE
+ dplcEntry 2, $10A
+.frame122_End
+
+.frame123: dplcHeader
+ dplcEntry $C, $6E0
+ dplcEntry 6, $10C
+ dplcEntry 4, $112
+.frame123_End
+
+.frame124: dplcHeader
+ dplcEntry $C, $6D4
+ dplcEntry $C, $116
+.frame124_End
+
+.frame125: dplcHeader
+ dplcEntry 8, $6F5
+ dplcEntry 4, $12E
+ dplcEntry 6, $128
+ dplcEntry 2, $132
+.frame125_End
+
+.frame126: dplcHeader
+ dplcEntry 8, $6F5
+ dplcEntry 2, $134
+ dplcEntry 8, $136
+ dplcEntry 4, $13E
+ dplcEntry 2, $142
+.frame126_End
+
+.frame127: dplcHeader
+ dplcEntry 9, $6FD
+ dplcEntry 4, $14C
+ dplcEntry 1, $706
+ dplcEntry 2, $150
+ dplcEntry 4, $152
+.frame127_End
+
+.frame128: dplcHeader
+ dplcEntry 1, $707
+ dplcEntry 8, $708
+ dplcEntry 2, $15C
+ dplcEntry 4, $15E
+ dplcEntry $C, $162
+.frame128_End
+
+.frame129: dplcHeader
+ dplcEntry 1, $707
+ dplcEntry 8, $708
+ dplcEntry 2, $16E
+ dplcEntry 2, $178
+ dplcEntry 8, $170
+ dplcEntry 4, $17A
+.frame129_End
+
+.frame130: dplcHeader
+ dplcEntry 1, $707
+ dplcEntry 8, $708
+ dplcEntry 2, $17E
+ dplcEntry 8, $180
+ dplcEntry 4, $188
+ dplcEntry 2, $18C
+.frame130_End
+
+.frame131: dplcHeader
+ dplcEntry 9, $6FD
+ dplcEntry 4, $18E
+ dplcEntry 1, $706
+ dplcEntry 2, $192
+ dplcEntry 4, $194
+.frame131_End
+
+.frame132: dplcHeader
+ dplcEntry 8, $6F5
+ dplcEntry 2, $19E
+ dplcEntry 6, $198
+ dplcEntry 1, $1A0
+ dplcEntry 4, $1A2
+.frame132_End
+
+.frame133: dplcHeader
+ dplcEntry $C, $710
+ dplcEntry $C, $1AE
+ dplcEntry 4, $1BA
+.frame133_End
+
+.frame134: dplcHeader
+ dplcEntry $C, $710
+ dplcEntry $C, $1BE
+ dplcEntry 4, $1CA
+.frame134_End
+
+.frame135: dplcHeader
+ dplcEntry $C, $71C
+ dplcEntry 4, $1D6
+ dplcEntry 4, $1DA
+.frame135_End
+
+.frame136: dplcHeader
+ dplcEntry 9, $728
+ dplcEntry $C, $1E6
+.frame136_End
+
+.frame137: dplcHeader
+ dplcEntry 9, $728
+ dplcEntry 4, $1F2
+ dplcEntry $C, $1F6
+.frame137_End
+
+.frame138: dplcHeader
+ dplcEntry 9, $728
+ dplcEntry $C, $202
+ dplcEntry 4, $20E
+.frame138_End
+
+.frame139: dplcHeader
+ dplcEntry $C, $71C
+ dplcEntry 4, $212
+ dplcEntry 4, $216
+.frame139_End
+
+.frame140: dplcHeader
+ dplcEntry $C, $710
+ dplcEntry $C, $21A
+.frame140_End
+
+.frame141: dplcHeader
+ dplcEntry 4, $226
+ dplcEntry 8, $731
+ dplcEntry 8, $232
+ dplcEntry 1, $739
+.frame141_End
+
+.frame142: dplcHeader
+ dplcEntry 4, $23C
+ dplcEntry 6, $240
+ dplcEntry 8, $731
+ dplcEntry 8, $246
+ dplcEntry 1, $739
+.frame142_End
+
+.frame143: dplcHeader
+ dplcEntry 8, $24E
+ dplcEntry 8, $73A
+ dplcEntry 4, $25E
+ dplcEntry 2, $742
+.frame143_End
+
+.frame144: dplcHeader
+ dplcEntry 8, $264
+ dplcEntry $C, $744
+ dplcEntry 6, $274
+ dplcEntry 1, $750
+.frame144_End
+
+.frame145: dplcHeader
+ dplcEntry 6, $27C
+ dplcEntry $C, $744
+ dplcEntry 8, $282
+ dplcEntry 1, $750
+.frame145_End
+
+.frame146: dplcHeader
+ dplcEntry 4, $28A
+ dplcEntry 6, $28E
+ dplcEntry $C, $744
+ dplcEntry 8, $294
+ dplcEntry 1, $750
+.frame146_End
+
+.frame147: dplcHeader
+ dplcEntry 8, $29C
+ dplcEntry 8, $73A
+ dplcEntry 4, $2A4
+ dplcEntry 2, $742
+.frame147_End
+
+.frame148: dplcHeader
+ dplcEntry 8, $2A8
+ dplcEntry 8, $731
+ dplcEntry 6, $2B0
+ dplcEntry 1, $739
+.frame148_End
+
+.frame149: dplcHeader
+ dplcEntry $C, $751
+ dplcEntry 2, $A0
+ dplcEntry $10, $A2
+.frame149_End
+
+.frame150: dplcHeader
+ dplcEntry $C, $751
+ dplcEntry 2, $B2
+ dplcEntry $C, $B4
+ dplcEntry 2, $C0
+.frame150_End
+
+.frame151: dplcHeader
+ dplcEntry $C, $75D
+ dplcEntry 6, $CA
+ dplcEntry 4, $D0
+.frame151_End
+
+.frame152: dplcHeader
+ dplcEntry 9, $769
+ dplcEntry $10, $DA
+.frame152_End
+
+.frame153: dplcHeader
+ dplcEntry 9, $769
+ dplcEntry $10, $EA
+ dplcEntry 2, $FA
+.frame153_End
+
+.frame154: dplcHeader
+ dplcEntry 9, $769
+ dplcEntry 2, $FC
+ dplcEntry $C, $FE
+ dplcEntry 2, $10A
+.frame154_End
+
+.frame155: dplcHeader
+ dplcEntry $C, $75D
+ dplcEntry 6, $10C
+ dplcEntry 4, $112
+.frame155_End
+
+.frame156: dplcHeader
+ dplcEntry $C, $751
+ dplcEntry $C, $116
+.frame156_End
+
+.frame157: dplcHeader
+ dplcEntry 2, $772
+ dplcEntry 8, $774
+ dplcEntry 6, $128
+ dplcEntry 4, $12E
+ dplcEntry 2, $132
+.frame157_End
+
+.frame158: dplcHeader
+ dplcEntry 2, $772
+ dplcEntry 8, $774
+ dplcEntry 2, $134
+ dplcEntry 8, $136
+ dplcEntry 4, $13E
+ dplcEntry 2, $142
+.frame158_End
+
+.frame159: dplcHeader
+ dplcEntry 6, $77C
+ dplcEntry 4, $782
+ dplcEntry 4, $14C
+ dplcEntry 2, $150
+ dplcEntry 4, $152
+.frame159_End
+
+.frame160: dplcHeader
+ dplcEntry 2, $786
+ dplcEntry 8, $788
+ dplcEntry 2, $15C
+ dplcEntry 4, $15E
+ dplcEntry $C, $162
+.frame160_End
+
+.frame161: dplcHeader
+ dplcEntry 2, $786
+ dplcEntry 8, $788
+ dplcEntry 2, $16E
+ dplcEntry 2, $178
+ dplcEntry 8, $170
+ dplcEntry 4, $17A
+.frame161_End
+
+.frame162: dplcHeader
+ dplcEntry 2, $786
+ dplcEntry 8, $788
+ dplcEntry 2, $17E
+ dplcEntry 8, $180
+ dplcEntry 4, $188
+ dplcEntry 2, $18C
+.frame162_End
+
+.frame163: dplcHeader
+ dplcEntry 6, $77C
+ dplcEntry 4, $782
+ dplcEntry 4, $18E
+ dplcEntry 2, $192
+ dplcEntry 4, $194
+.frame163_End
+
+.frame164: dplcHeader
+ dplcEntry 2, $772
+ dplcEntry 8, $774
+ dplcEntry 6, $198
+ dplcEntry 2, $19E
+ dplcEntry 4, $1A2
+ dplcEntry 2, $1A0
+.frame164_End
+
+.frame165: dplcHeader
+ dplcEntry $C, $790
+ dplcEntry $C, $1AE
+ dplcEntry 4, $1BA
+.frame165_End
+
+.frame166: dplcHeader
+ dplcEntry $C, $790
+ dplcEntry $C, $1BE
+ dplcEntry 4, $1CA
+.frame166_End
+
+.frame167: dplcHeader
+ dplcEntry $C, $79C
+ dplcEntry 4, $1D6
+ dplcEntry 4, $1DA
+.frame167_End
+
+.frame168: dplcHeader
+ dplcEntry 9, $7A8
+ dplcEntry $C, $1E6
+.frame168_End
+
+.frame169: dplcHeader
+ dplcEntry 9, $7A8
+ dplcEntry 4, $1F2
+ dplcEntry $C, $1F6
+.frame169_End
+
+.frame170: dplcHeader
+ dplcEntry 9, $7A8
+ dplcEntry $C, $202
+ dplcEntry 4, $20E
+.frame170_End
+
+.frame171: dplcHeader
+ dplcEntry $C, $79C
+ dplcEntry 4, $212
+ dplcEntry 4, $216
+.frame171_End
+
+.frame172: dplcHeader
+ dplcEntry $C, $790
+ dplcEntry $C, $21A
+.frame172_End
+
+.frame173: dplcHeader
+ dplcEntry 4, $226
+ dplcEntry $C, $7B1
+ dplcEntry 8, $232
+ dplcEntry 1, $7BD
+.frame173_End
+
+.frame174: dplcHeader
+ dplcEntry 4, $23C
+ dplcEntry 6, $240
+ dplcEntry $C, $7B1
+ dplcEntry 8, $246
+ dplcEntry 1, $7BD
+.frame174_End
+
+.frame175: dplcHeader
+ dplcEntry 8, $24E
+ dplcEntry 2, $7BE
+ dplcEntry 8, $7C0
+ dplcEntry 4, $25E
+ dplcEntry 1, $7C8
+.frame175_End
+
+.frame176: dplcHeader
+ dplcEntry 8, $264
+ dplcEntry $C, $7C9
+ dplcEntry 6, $274
+ dplcEntry 1, $7D5
+.frame176_End
+
+.frame177: dplcHeader
+ dplcEntry 6, $27C
+ dplcEntry $C, $7C9
+ dplcEntry 8, $282
+ dplcEntry 1, $7D5
+.frame177_End
+
+.frame178: dplcHeader
+ dplcEntry 4, $28A
+ dplcEntry 6, $28E
+ dplcEntry $C, $7C9
+ dplcEntry 8, $294
+ dplcEntry 1, $7D5
+.frame178_End
+
+.frame179: dplcHeader
+ dplcEntry 8, $29C
+ dplcEntry 2, $7BE
+ dplcEntry 8, $7C0
+ dplcEntry 4, $2A4
+ dplcEntry 1, $7C8
+.frame179_End
+
+.frame180: dplcHeader
+ dplcEntry 8, $2A8
+ dplcEntry 2, $7B2
+ dplcEntry 8, $7B5
+ dplcEntry 6, $2B0
+ dplcEntry 1, $7BD
+.frame180_End
+
+.frame181: dplcHeader
+ dplcEntry 3, $845
+ dplcEntry 1, $848
+ dplcEntry 4, $849
+ dplcEntry 6, $84D
+.frame181_End
+
+.frame182: dplcHeader
+ dplcEntry 2, $853
+ dplcEntry $C, $855
+ dplcEntry 3, $861
+ dplcEntry 2, $864
+.frame182_End
+
+.frame183: dplcHeader
+ dplcEntry 3, $866
+ dplcEntry 4, $869
+ dplcEntry 3, $86D
+ dplcEntry 4, $870
+.frame183_End
+
+.frame184: dplcHeader
+ dplcEntry 3, $874
+ dplcEntry 8, $877
+ dplcEntry 4, $87F
+ dplcEntry 2, $883
+ dplcEntry 1, $885
+.frame184_End
+
+.frame185: dplcHeader
+ dplcEntry 6, $886
+ dplcEntry 1, $88C
+ dplcEntry 4, $849
+ dplcEntry 6, $88D
+.frame185_End
+
+.frame186: dplcHeader
+ dplcEntry 2, $893
+ dplcEntry $C, $895
+ dplcEntry 3, $861
+ dplcEntry 1, $8A1
+.frame186_End
+
+.frame187: dplcHeader
+ dplcEntry 6, $8A2
+ dplcEntry 4, $869
+ dplcEntry 1, $8A8
+ dplcEntry 6, $8A9
+.frame187_End
+
+.frame188: dplcHeader
+ dplcEntry 3, $874
+ dplcEntry 8, $8AF
+ dplcEntry 4, $8B7
+ dplcEntry 2, $8BB
+ dplcEntry 1, $885
+.frame188_End
+
+.frame189: dplcHeader
+ dplcEntry 6, $8BD
+ dplcEntry 4, $8C3
+ dplcEntry 4, $8C7
+ dplcEntry 8, $8CB
+.frame189_End
+
+.frame190: dplcHeader
+ dplcEntry 6, $8D3
+ dplcEntry 4, $8D9
+ dplcEntry 4, $8C7
+ dplcEntry 8, $8DD
+.frame190_End
+
+.frame191: dplcHeader
+ dplcEntry 6, $8BD
+ dplcEntry 4, $8C3
+ dplcEntry 4, $8C7
+ dplcEntry 8, $8E5
+.frame191_End
+
+.frame192: dplcHeader
+ dplcEntry 6, $8D3
+ dplcEntry 4, $8D9
+ dplcEntry 4, $8C7
+ dplcEntry 8, $8ED
+.frame192_End
+
+.frame193: dplcHeader
+ dplcEntry 3, $8F5
+ dplcEntry $C, $8F8
+.frame193_End
+
+.frame194: dplcHeader
+ dplcEntry 9, $904
+ dplcEntry 3, $90D
+ dplcEntry 4, $910
+.frame194_End
+
+.frame195: dplcHeader
+ dplcEntry 9, $833
+ dplcEntry 3, $90D
+ dplcEntry 4, $910
+.frame195_End
+
+.frame196: dplcHeader
+ dplcEntry 9, $83C
+ dplcEntry 3, $90D
+ dplcEntry 4, $910
+.frame196_End
+
+.frame197: dplcHeader
+ dplcEntry 9, $904
+ dplcEntry 3, $90D
+ dplcEntry 4, $914
+.frame197_End
+
+.frame198: dplcHeader
+ dplcEntry 9, $833
+ dplcEntry 3, $90D
+ dplcEntry 4, $914
+.frame198_End
+
+.frame199: dplcHeader
+ dplcEntry 9, $83C
+ dplcEntry 3, $90D
+ dplcEntry 4, $914
+.frame199_End
+
+.frame200: dplcHeader
+ dplcEntry $C, $918
+ dplcEntry 4, $924
+ dplcEntry 4, $928
+.frame200_End
+
+.frame201: dplcHeader
+ dplcEntry $C, $92C
+ dplcEntry 4, $938
+ dplcEntry 4, $928
+.frame201_End
+
+.frame202: dplcHeader
+ dplcEntry $C, $93C
+ dplcEntry 4, $948
+ dplcEntry 4, $928
+.frame202_End
+
+.frame203: dplcHeader
+ dplcEntry $C, $94C
+ dplcEntry 2, $924
+ dplcEntry 2, $958
+ dplcEntry 2, $93A
+ dplcEntry 4, $928
+.frame203_End
+
+.frame204: dplcHeader
+ dplcEntry 8, $95A
+ dplcEntry 6, $962
+ dplcEntry 4, $968
+ dplcEntry 6, $96C
+.frame204_End
+
+.frame205: dplcHeader
+ dplcEntry 8, $972
+ dplcEntry 6, $962
+ dplcEntry 4, $97A
+ dplcEntry 6, $97E
+.frame205_End
+
+.frame206: dplcHeader
+ dplcEntry 8, $984
+ dplcEntry 6, $962
+ dplcEntry 6, $98C
+ dplcEntry 6, $992
+.frame206_End
+
+.frame207: dplcHeader
+ dplcEntry 4, $998
+ dplcEntry $C, $99C
+ dplcEntry 4, $9A8
+.frame207_End
+
+.frame208: dplcHeader
+ dplcEntry 4, $9AC
+ dplcEntry $C, $9B0
+ dplcEntry 4, $9BC
+.frame208_End
+
+.frame209: dplcHeader
+ dplcEntry 4, $9C0
+ dplcEntry $C, $9C4
+ dplcEntry 4, $9BC
+.frame209_End
+
+.frame210: dplcHeader
+ dplcEntry 8, $9D0
+ dplcEntry 8, $9D8
+ dplcEntry 2, $9E0
+ dplcEntry 4, $9E2
+.frame210_End
+
+.frame211: dplcHeader
+ dplcEntry 8, $9E6
+ dplcEntry 8, $9EE
+ dplcEntry 2, $9E0
+ dplcEntry 4, $9E2
+.frame211_End
+
+.frame212: dplcHeader
+ dplcEntry 8, $9F6
+ dplcEntry 8, $9FE
+ dplcEntry 2, $9E0
+ dplcEntry 4, $9E2
+.frame212_End
+
+.frame213: dplcHeader
+ dplcEntry 6, $A06
+ dplcEntry $C, $A0C
+.frame213_End
+
+ even
diff --git a/mappings/spriteDPLC/Sonic.bin b/mappings/spriteDPLC/Sonic.bin
deleted file mode 100644
index bbad7c22..00000000
Binary files a/mappings/spriteDPLC/Sonic.bin and /dev/null differ
diff --git a/mappings/spriteDPLC/Tails.asm b/mappings/spriteDPLC/Tails.asm
new file mode 100644
index 00000000..ec0a0339
--- /dev/null
+++ b/mappings/spriteDPLC/Tails.asm
@@ -0,0 +1,772 @@
+DPLC_Tails: mappingsTable
+ mappingsTableEntry.w DPLC_Tails_0116
+ mappingsTableEntry.w DPLC_Tails_0118
+ mappingsTableEntry.w DPLC_Tails_011E
+ mappingsTableEntry.w DPLC_Tails_0124
+ mappingsTableEntry.w DPLC_Tails_012A
+ mappingsTableEntry.w DPLC_Tails_0130
+ mappingsTableEntry.w DPLC_Tails_0134
+ mappingsTableEntry.w DPLC_Tails_0138
+ mappingsTableEntry.w DPLC_Tails_013E
+ mappingsTableEntry.w DPLC_Tails_0144
+ mappingsTableEntry.w DPLC_Tails_0148
+ mappingsTableEntry.w DPLC_Tails_014C
+ mappingsTableEntry.w DPLC_Tails_0150
+ mappingsTableEntry.w DPLC_Tails_0154
+ mappingsTableEntry.w DPLC_Tails_0158
+ mappingsTableEntry.w DPLC_Tails_0160
+ mappingsTableEntry.w DPLC_Tails_0168
+ mappingsTableEntry.w DPLC_Tails_0170
+ mappingsTableEntry.w DPLC_Tails_0178
+ mappingsTableEntry.w DPLC_Tails_0180
+ mappingsTableEntry.w DPLC_Tails_0188
+ mappingsTableEntry.w DPLC_Tails_0190
+ mappingsTableEntry.w DPLC_Tails_0198
+ mappingsTableEntry.w DPLC_Tails_01A0
+ mappingsTableEntry.w DPLC_Tails_01A8
+ mappingsTableEntry.w DPLC_Tails_01B0
+ mappingsTableEntry.w DPLC_Tails_01B8
+ mappingsTableEntry.w DPLC_Tails_01C0
+ mappingsTableEntry.w DPLC_Tails_01C8
+ mappingsTableEntry.w DPLC_Tails_01D0
+ mappingsTableEntry.w DPLC_Tails_01D8
+ mappingsTableEntry.w DPLC_Tails_01E0
+ mappingsTableEntry.w DPLC_Tails_01E8
+ mappingsTableEntry.w DPLC_Tails_01F0
+ mappingsTableEntry.w DPLC_Tails_01F8
+ mappingsTableEntry.w DPLC_Tails_0200
+ mappingsTableEntry.w DPLC_Tails_0208
+ mappingsTableEntry.w DPLC_Tails_0210
+ mappingsTableEntry.w DPLC_Tails_0218
+ mappingsTableEntry.w DPLC_Tails_021E
+ mappingsTableEntry.w DPLC_Tails_0226
+ mappingsTableEntry.w DPLC_Tails_022C
+ mappingsTableEntry.w DPLC_Tails_0234
+ mappingsTableEntry.w DPLC_Tails_023A
+ mappingsTableEntry.w DPLC_Tails_0242
+ mappingsTableEntry.w DPLC_Tails_0248
+ mappingsTableEntry.w DPLC_Tails_0250
+ mappingsTableEntry.w DPLC_Tails_0256
+ mappingsTableEntry.w DPLC_Tails_025C
+ mappingsTableEntry.w DPLC_Tails_0256
+ mappingsTableEntry.w DPLC_Tails_0262
+ mappingsTableEntry.w DPLC_Tails_0268
+ mappingsTableEntry.w DPLC_Tails_026E
+ mappingsTableEntry.w DPLC_Tails_0276
+ mappingsTableEntry.w DPLC_Tails_027E
+ mappingsTableEntry.w DPLC_Tails_0286
+ mappingsTableEntry.w DPLC_Tails_028E
+ mappingsTableEntry.w DPLC_Tails_0296
+ mappingsTableEntry.w DPLC_Tails_029E
+ mappingsTableEntry.w DPLC_Tails_02A6
+ mappingsTableEntry.w DPLC_Tails_02AE
+ mappingsTableEntry.w DPLC_Tails_02A6
+ mappingsTableEntry.w DPLC_Tails_02B6
+ mappingsTableEntry.w DPLC_Tails_02BE
+ mappingsTableEntry.w DPLC_Tails_02C6
+ mappingsTableEntry.w DPLC_Tails_02CE
+ mappingsTableEntry.w DPLC_Tails_02D6
+ mappingsTableEntry.w DPLC_Tails_02DE
+ mappingsTableEntry.w DPLC_Tails_02E6
+ mappingsTableEntry.w DPLC_Tails_02EE
+ mappingsTableEntry.w DPLC_Tails_02F6
+ mappingsTableEntry.w DPLC_Tails_02FA
+ mappingsTableEntry.w DPLC_Tails_02FE
+ mappingsTableEntry.w DPLC_Tails_0302
+ mappingsTableEntry.w DPLC_Tails_0306
+ mappingsTableEntry.w DPLC_Tails_030A
+ mappingsTableEntry.w DPLC_Tails_030E
+ mappingsTableEntry.w DPLC_Tails_0312
+ mappingsTableEntry.w DPLC_Tails_0316
+ mappingsTableEntry.w DPLC_Tails_031A
+ mappingsTableEntry.w DPLC_Tails_031E
+ mappingsTableEntry.w DPLC_Tails_0322
+ mappingsTableEntry.w DPLC_Tails_0326
+ mappingsTableEntry.w DPLC_Tails_032A
+ mappingsTableEntry.w DPLC_Tails_032E
+ mappingsTableEntry.w DPLC_Tails_0332
+ mappingsTableEntry.w DPLC_Tails_0336
+ mappingsTableEntry.w DPLC_Tails_033A
+ mappingsTableEntry.w DPLC_Tails_033E
+ mappingsTableEntry.w DPLC_Tails_0342
+ mappingsTableEntry.w DPLC_Tails_0348
+ mappingsTableEntry.w DPLC_Tails_034E
+ mappingsTableEntry.w DPLC_Tails_0352
+ mappingsTableEntry.w DPLC_Tails_0356
+ mappingsTableEntry.w DPLC_Tails_035A
+ mappingsTableEntry.w DPLC_Tails_035A
+ mappingsTableEntry.w DPLC_Tails_0360
+ mappingsTableEntry.w DPLC_Tails_0364
+ mappingsTableEntry.w DPLC_Tails_0368
+ mappingsTableEntry.w DPLC_Tails_036C
+ mappingsTableEntry.w DPLC_Tails_0372
+ mappingsTableEntry.w DPLC_Tails_0378
+ mappingsTableEntry.w DPLC_Tails_037E
+ mappingsTableEntry.w DPLC_Tails_0384
+ mappingsTableEntry.w DPLC_Tails_038A
+ mappingsTableEntry.w DPLC_Tails_0390
+ mappingsTableEntry.w DPLC_Tails_0396
+ mappingsTableEntry.w DPLC_Tails_039C
+ mappingsTableEntry.w DPLC_Tails_03A0
+ mappingsTableEntry.w DPLC_Tails_03A6
+ mappingsTableEntry.w DPLC_Tails_03AC
+ mappingsTableEntry.w DPLC_Tails_03B2
+ mappingsTableEntry.w DPLC_Tails_03AC
+ mappingsTableEntry.w DPLC_Tails_03B8
+ mappingsTableEntry.w DPLC_Tails_03B8
+ mappingsTableEntry.w DPLC_Tails_03BE
+ mappingsTableEntry.w DPLC_Tails_03C4
+ mappingsTableEntry.w DPLC_Tails_03C8
+ mappingsTableEntry.w DPLC_Tails_03CC
+ mappingsTableEntry.w DPLC_Tails_03D2
+ mappingsTableEntry.w DPLC_Tails_03D6
+ mappingsTableEntry.w DPLC_Tails_03DA
+ mappingsTableEntry.w DPLC_Tails_03DE
+ mappingsTableEntry.w DPLC_Tails_03E2
+ mappingsTableEntry.w DPLC_Tails_03E6
+ mappingsTableEntry.w DPLC_Tails_03EA
+ mappingsTableEntry.w DPLC_Tails_03EE
+ mappingsTableEntry.w DPLC_Tails_03F2
+ mappingsTableEntry.w DPLC_Tails_03F8
+ mappingsTableEntry.w DPLC_Tails_0302
+ mappingsTableEntry.w DPLC_Tails_0306
+ mappingsTableEntry.w DPLC_Tails_030A
+ mappingsTableEntry.w DPLC_Tails_030E
+ mappingsTableEntry.w DPLC_Tails_03FE
+ mappingsTableEntry.w DPLC_Tails_0404
+ mappingsTableEntry.w DPLC_Tails_0302
+ mappingsTableEntry.w DPLC_Tails_0306
+ mappingsTableEntry.w DPLC_Tails_030A
+ mappingsTableEntry.w DPLC_Tails_030E
+
+DPLC_Tails_0116: dplcHeader
+DPLC_Tails_0116_End
+
+DPLC_Tails_0118: dplcHeader
+ dplcEntry 6, 0
+ dplcEntry 6, 6
+DPLC_Tails_0118_End
+
+DPLC_Tails_011E: dplcHeader
+ dplcEntry 6, $C
+ dplcEntry 6, 6
+DPLC_Tails_011E_End
+
+DPLC_Tails_0124: dplcHeader
+ dplcEntry 6, $12
+ dplcEntry 6, 6
+DPLC_Tails_0124_End
+
+DPLC_Tails_012A: dplcHeader
+ dplcEntry 6, $18
+ dplcEntry 6, 6
+DPLC_Tails_012A_End
+
+DPLC_Tails_0130: dplcHeader
+ dplcEntry $C, $1E
+DPLC_Tails_0130_End
+
+DPLC_Tails_0134: dplcHeader
+ dplcEntry $C, $2A
+DPLC_Tails_0134_End
+
+DPLC_Tails_0138: dplcHeader
+ dplcEntry 6, $36
+ dplcEntry 6, $3C
+DPLC_Tails_0138_End
+
+DPLC_Tails_013E: dplcHeader
+ dplcEntry 6, $36
+ dplcEntry 6, $42
+DPLC_Tails_013E_End
+
+DPLC_Tails_0144: dplcHeader
+ dplcEntry 8, $48
+DPLC_Tails_0144_End
+
+DPLC_Tails_0148: dplcHeader
+ dplcEntry $C, $50
+DPLC_Tails_0148_End
+
+DPLC_Tails_014C: dplcHeader
+ dplcEntry $C, $5C
+DPLC_Tails_014C_End
+
+DPLC_Tails_0150: dplcHeader
+ dplcEntry 6, $68
+DPLC_Tails_0150_End
+
+DPLC_Tails_0154: dplcHeader
+ dplcEntry $C, $6E
+DPLC_Tails_0154_End
+
+DPLC_Tails_0158: dplcHeader
+ dplcEntry 6, $7A
+ dplcEntry 8, $80
+ dplcEntry 6, $CA
+DPLC_Tails_0158_End
+
+DPLC_Tails_0160: dplcHeader
+ dplcEntry 6, $88
+ dplcEntry 8, $8E
+ dplcEntry 6, $D0
+DPLC_Tails_0160_End
+
+DPLC_Tails_0168: dplcHeader
+ dplcEntry 6, $96
+ dplcEntry 6, $9C
+ dplcEntry 6, $D6
+DPLC_Tails_0168_End
+
+DPLC_Tails_0170: dplcHeader
+ dplcEntry 6, $A2
+ dplcEntry 6, $A8
+ dplcEntry 6, $DC
+DPLC_Tails_0170_End
+
+DPLC_Tails_0178: dplcHeader
+ dplcEntry 6, $7A
+ dplcEntry 8, $AE
+ dplcEntry 6, $CA
+DPLC_Tails_0178_End
+
+DPLC_Tails_0180: dplcHeader
+ dplcEntry 6, $88
+ dplcEntry 8, $B6
+ dplcEntry 6, $D0
+DPLC_Tails_0180_End
+
+DPLC_Tails_0188: dplcHeader
+ dplcEntry 6, $96
+ dplcEntry 6, $BE
+ dplcEntry 6, $D6
+DPLC_Tails_0188_End
+
+DPLC_Tails_0190: dplcHeader
+ dplcEntry 6, $A2
+ dplcEntry 6, $C4
+ dplcEntry 6, $DC
+DPLC_Tails_0190_End
+
+DPLC_Tails_0198: dplcHeader
+ dplcEntry 2, $E2
+ dplcEntry 4, $E4
+ dplcEntry $C, $E8
+DPLC_Tails_0198_End
+
+DPLC_Tails_01A0: dplcHeader
+ dplcEntry 4, $F4
+ dplcEntry $C, $F8
+ dplcEntry 4, $104
+DPLC_Tails_01A0_End
+
+DPLC_Tails_01A8: dplcHeader
+ dplcEntry 4, $108
+ dplcEntry 4, $10C
+ dplcEntry $C, $110
+DPLC_Tails_01A8_End
+
+DPLC_Tails_01B0: dplcHeader
+ dplcEntry 2, $11C
+ dplcEntry $10, $11E
+ dplcEntry 2, $12E
+DPLC_Tails_01B0_End
+
+DPLC_Tails_01B8: dplcHeader
+ dplcEntry 2, $E2
+ dplcEntry 4, $E4
+ dplcEntry $C, $130
+DPLC_Tails_01B8_End
+
+DPLC_Tails_01C0: dplcHeader
+ dplcEntry 4, $F4
+ dplcEntry $C, $13C
+ dplcEntry 4, $148
+DPLC_Tails_01C0_End
+
+DPLC_Tails_01C8: dplcHeader
+ dplcEntry 4, $108
+ dplcEntry 4, $10C
+ dplcEntry $C, $14C
+DPLC_Tails_01C8_End
+
+DPLC_Tails_01D0: dplcHeader
+ dplcEntry 2, $11C
+ dplcEntry $10, $158
+ dplcEntry 2, $168
+DPLC_Tails_01D0_End
+
+DPLC_Tails_01D8: dplcHeader
+ dplcEntry 8, $16A
+ dplcEntry 8, $172
+ dplcEntry 8, $1CA
+DPLC_Tails_01D8_End
+
+DPLC_Tails_01E0: dplcHeader
+ dplcEntry 8, $17A
+ dplcEntry 8, $182
+ dplcEntry 8, $1D2
+DPLC_Tails_01E0_End
+
+DPLC_Tails_01E8: dplcHeader
+ dplcEntry 8, $18A
+ dplcEntry 8, $192
+ dplcEntry 8, $1DA
+DPLC_Tails_01E8_End
+
+DPLC_Tails_01F0: dplcHeader
+ dplcEntry 8, $19A
+ dplcEntry 8, $1A2
+ dplcEntry 8, $5BE
+DPLC_Tails_01F0_End
+
+DPLC_Tails_01F8: dplcHeader
+ dplcEntry 8, $16A
+ dplcEntry 8, $1AA
+ dplcEntry 8, $1CA
+DPLC_Tails_01F8_End
+
+DPLC_Tails_0200: dplcHeader
+ dplcEntry 8, $17A
+ dplcEntry 8, $1B2
+ dplcEntry 8, $1D2
+DPLC_Tails_0200_End
+
+DPLC_Tails_0208: dplcHeader
+ dplcEntry 8, $18A
+ dplcEntry 8, $1BA
+ dplcEntry 8, $1DA
+DPLC_Tails_0208_End
+
+DPLC_Tails_0210: dplcHeader
+ dplcEntry 8, $19A
+ dplcEntry 8, $1C2
+ dplcEntry 8, $5BE
+DPLC_Tails_0210_End
+
+DPLC_Tails_0218: dplcHeader
+ dplcEntry 2, $1EA
+ dplcEntry $10, $1EC
+DPLC_Tails_0218_End
+
+DPLC_Tails_021E: dplcHeader
+ dplcEntry 4, $1FC
+ dplcEntry 2, $200
+ dplcEntry $10, $202
+DPLC_Tails_021E_End
+
+DPLC_Tails_0226: dplcHeader
+ dplcEntry 2, $212
+ dplcEntry $10, $214
+DPLC_Tails_0226_End
+
+DPLC_Tails_022C: dplcHeader
+ dplcEntry 2, $224
+ dplcEntry 2, $226
+ dplcEntry $10, $228
+DPLC_Tails_022C_End
+
+DPLC_Tails_0234: dplcHeader
+ dplcEntry 2, $1EA
+ dplcEntry $10, $238
+DPLC_Tails_0234_End
+
+DPLC_Tails_023A: dplcHeader
+ dplcEntry 2, $248
+ dplcEntry 2, $200
+ dplcEntry $10, $24A
+DPLC_Tails_023A_End
+
+DPLC_Tails_0242: dplcHeader
+ dplcEntry 2, $212
+ dplcEntry $10, $25A
+DPLC_Tails_0242_End
+
+DPLC_Tails_0248: dplcHeader
+ dplcEntry 2, $26A
+ dplcEntry 2, $224
+ dplcEntry $10, $26C
+DPLC_Tails_0248_End
+
+DPLC_Tails_0250: dplcHeader
+ dplcEntry $10, $27C
+ dplcEntry 8, $29C
+DPLC_Tails_0250_End
+
+DPLC_Tails_0256: dplcHeader
+ dplcEntry $10, $28C
+ dplcEntry 4, $2A4
+DPLC_Tails_0256_End
+
+DPLC_Tails_025C: dplcHeader
+ dplcEntry $10, $27C
+ dplcEntry 4, $2A8
+DPLC_Tails_025C_End
+
+DPLC_Tails_0262: dplcHeader
+ dplcEntry $10, $27C
+ dplcEntry 8, $2AC
+DPLC_Tails_0262_End
+
+DPLC_Tails_0268: dplcHeader
+ dplcEntry $10, $28C
+ dplcEntry 8, $2AC
+DPLC_Tails_0268_End
+
+DPLC_Tails_026E: dplcHeader
+ dplcEntry 2, $2B4
+ dplcEntry $C, $2B6
+ dplcEntry $C, $2D2
+DPLC_Tails_026E_End
+
+DPLC_Tails_0276: dplcHeader
+ dplcEntry 4, $2C2
+ dplcEntry $C, $2C6
+ dplcEntry 4, $2DE
+DPLC_Tails_0276_End
+
+DPLC_Tails_027E: dplcHeader
+ dplcEntry 2, $2B4
+ dplcEntry $C, $2B6
+ dplcEntry 4, $2E2
+DPLC_Tails_027E_End
+
+DPLC_Tails_0286: dplcHeader
+ dplcEntry 4, $2C2
+ dplcEntry $C, $2C6
+ dplcEntry 4, $2E6
+DPLC_Tails_0286_End
+
+DPLC_Tails_028E: dplcHeader
+ dplcEntry 2, $2B4
+ dplcEntry $C, $2B6
+ dplcEntry $C, $2EA
+DPLC_Tails_028E_End
+
+DPLC_Tails_0296: dplcHeader
+ dplcEntry 4, $2C2
+ dplcEntry $C, $2C6
+ dplcEntry $C, $2EA
+DPLC_Tails_0296_End
+
+DPLC_Tails_029E: dplcHeader
+ dplcEntry 6, $2F6
+ dplcEntry 8, $2FC
+ dplcEntry 8, $312
+DPLC_Tails_029E_End
+
+DPLC_Tails_02A6: dplcHeader
+ dplcEntry 6, $304
+ dplcEntry 8, $30A
+ dplcEntry 4, $31E
+DPLC_Tails_02A6_End
+
+DPLC_Tails_02AE: dplcHeader
+ dplcEntry 6, $2F6
+ dplcEntry 8, $2FC
+ dplcEntry 4, $31A
+DPLC_Tails_02AE_End
+
+DPLC_Tails_02B6: dplcHeader
+ dplcEntry 6, $2F6
+ dplcEntry 8, $2FC
+ dplcEntry 8, $322
+DPLC_Tails_02B6_End
+
+DPLC_Tails_02BE: dplcHeader
+ dplcEntry 6, $304
+ dplcEntry 8, $30A
+ dplcEntry 8, $322
+DPLC_Tails_02BE_End
+
+DPLC_Tails_02C6: dplcHeader
+ dplcEntry $C, $32A
+ dplcEntry 4, $336
+ dplcEntry $C, $2D2
+DPLC_Tails_02C6_End
+
+DPLC_Tails_02CE: dplcHeader
+ dplcEntry $C, $33A
+ dplcEntry 4, $346
+ dplcEntry 4, $2DE
+DPLC_Tails_02CE_End
+
+DPLC_Tails_02D6: dplcHeader
+ dplcEntry $C, $32A
+ dplcEntry 4, $336
+ dplcEntry 4, $2E2
+DPLC_Tails_02D6_End
+
+DPLC_Tails_02DE: dplcHeader
+ dplcEntry $C, $33A
+ dplcEntry 4, $346
+ dplcEntry 4, $2E6
+DPLC_Tails_02DE_End
+
+DPLC_Tails_02E6: dplcHeader
+ dplcEntry $C, $32A
+ dplcEntry 4, $336
+ dplcEntry $C, $2EA
+DPLC_Tails_02E6_End
+
+DPLC_Tails_02EE: dplcHeader
+ dplcEntry $C, $33A
+ dplcEntry 4, $346
+ dplcEntry $C, $2EA
+DPLC_Tails_02EE_End
+
+DPLC_Tails_02F6: dplcHeader
+ dplcEntry $10, $34A
+DPLC_Tails_02F6_End
+
+DPLC_Tails_02FA: dplcHeader
+ dplcEntry $10, $35A
+DPLC_Tails_02FA_End
+
+DPLC_Tails_02FE: dplcHeader
+ dplcEntry $10, $36A
+DPLC_Tails_02FE_End
+
+DPLC_Tails_0302: dplcHeader
+ dplcEntry 6, $CA
+DPLC_Tails_0302_End
+
+DPLC_Tails_0306: dplcHeader
+ dplcEntry 6, $D0
+DPLC_Tails_0306_End
+
+DPLC_Tails_030A: dplcHeader
+ dplcEntry 6, $D6
+DPLC_Tails_030A_End
+
+DPLC_Tails_030E: dplcHeader
+ dplcEntry 6, $DC
+DPLC_Tails_030E_End
+
+DPLC_Tails_0312: dplcHeader
+ dplcEntry 6, $37A
+DPLC_Tails_0312_End
+
+DPLC_Tails_0316: dplcHeader
+ dplcEntry 6, $380
+DPLC_Tails_0316_End
+
+DPLC_Tails_031A: dplcHeader
+ dplcEntry 6, $386
+DPLC_Tails_031A_End
+
+DPLC_Tails_031E: dplcHeader
+ dplcEntry 6, $38C
+DPLC_Tails_031E_End
+
+DPLC_Tails_0322: dplcHeader
+ dplcEntry 8, $1CA
+DPLC_Tails_0322_End
+
+DPLC_Tails_0326: dplcHeader
+ dplcEntry 8, $1D2
+DPLC_Tails_0326_End
+
+DPLC_Tails_032A: dplcHeader
+ dplcEntry 8, $1DA
+DPLC_Tails_032A_End
+
+DPLC_Tails_032E: dplcHeader
+ dplcEntry 8, $5BE
+DPLC_Tails_032E_End
+
+DPLC_Tails_0332: dplcHeader
+ dplcEntry 8, $392
+DPLC_Tails_0332_End
+
+DPLC_Tails_0336: dplcHeader
+ dplcEntry 8, $39A
+DPLC_Tails_0336_End
+
+DPLC_Tails_033A: dplcHeader
+ dplcEntry 8, $3A2
+DPLC_Tails_033A_End
+
+DPLC_Tails_033E: dplcHeader
+ dplcEntry 8, $3AA
+DPLC_Tails_033E_End
+
+DPLC_Tails_0342: dplcHeader
+ dplcEntry 4, $3B2
+ dplcEntry $C, $3B6
+DPLC_Tails_0342_End
+
+DPLC_Tails_0348: dplcHeader
+ dplcEntry 4, $3B2
+ dplcEntry $C, $3C2
+DPLC_Tails_0348_End
+
+DPLC_Tails_034E: dplcHeader
+ dplcEntry $C, $3CE
+DPLC_Tails_034E_End
+
+DPLC_Tails_0352: dplcHeader
+ dplcEntry $10, $3DA
+DPLC_Tails_0352_End
+
+DPLC_Tails_0356: dplcHeader
+ dplcEntry $10, $3EA
+DPLC_Tails_0356_End
+
+DPLC_Tails_035A: dplcHeader
+ dplcEntry $10, $3FA
+ dplcEntry 8, $40A
+DPLC_Tails_035A_End
+
+DPLC_Tails_0360: dplcHeader
+ dplcEntry $10, $412
+DPLC_Tails_0360_End
+
+DPLC_Tails_0364: dplcHeader
+ dplcEntry $10, $422
+DPLC_Tails_0364_End
+
+DPLC_Tails_0368: dplcHeader
+ dplcEntry $10, $432
+DPLC_Tails_0368_End
+
+DPLC_Tails_036C: dplcHeader
+ dplcEntry 6, $442
+ dplcEntry 8, $448
+DPLC_Tails_036C_End
+
+DPLC_Tails_0372: dplcHeader
+ dplcEntry 6, $442
+ dplcEntry 6, $450
+DPLC_Tails_0372_End
+
+DPLC_Tails_0378: dplcHeader
+ dplcEntry 6, $442
+ dplcEntry 6, $456
+DPLC_Tails_0378_End
+
+DPLC_Tails_037E: dplcHeader
+ dplcEntry 6, $442
+ dplcEntry 6, $45C
+DPLC_Tails_037E_End
+
+DPLC_Tails_0384: dplcHeader
+ dplcEntry 6, $462
+ dplcEntry 8, $468
+DPLC_Tails_0384_End
+
+DPLC_Tails_038A: dplcHeader
+ dplcEntry 6, $470
+ dplcEntry 8, $476
+DPLC_Tails_038A_End
+
+DPLC_Tails_0390: dplcHeader
+ dplcEntry 2, $47E
+ dplcEntry $C, $480
+DPLC_Tails_0390_End
+
+DPLC_Tails_0396: dplcHeader
+ dplcEntry 6, $48C
+ dplcEntry 8, $492
+DPLC_Tails_0396_End
+
+DPLC_Tails_039C: dplcHeader
+ dplcEntry $10, $49A
+DPLC_Tails_039C_End
+
+DPLC_Tails_03A0: dplcHeader
+ dplcEntry $10, $4AA
+ dplcEntry 4, $4BA
+DPLC_Tails_03A0_End
+
+DPLC_Tails_03A6: dplcHeader
+ dplcEntry $10, $4BE
+ dplcEntry 4, $4CE
+DPLC_Tails_03A6_End
+
+DPLC_Tails_03AC: dplcHeader
+ dplcEntry 4, $4D2
+ dplcEntry $C, $4D6
+DPLC_Tails_03AC_End
+
+DPLC_Tails_03B2: dplcHeader
+ dplcEntry 8, $4E2
+ dplcEntry 8, $4E2
+DPLC_Tails_03B2_End
+
+DPLC_Tails_03B8: dplcHeader
+ dplcEntry 8, $4EA
+ dplcEntry 4, $4F2
+DPLC_Tails_03B8_End
+
+DPLC_Tails_03BE: dplcHeader
+ dplcEntry 4, $4F6
+ dplcEntry $C, $4FA
+DPLC_Tails_03BE_End
+
+DPLC_Tails_03C4: dplcHeader
+ dplcEntry $10, $506
+DPLC_Tails_03C4_End
+
+DPLC_Tails_03C8: dplcHeader
+ dplcEntry $C, $516
+DPLC_Tails_03C8_End
+
+DPLC_Tails_03CC: dplcHeader
+ dplcEntry 4, $522
+ dplcEntry $C, $526
+DPLC_Tails_03CC_End
+
+DPLC_Tails_03D2: dplcHeader
+ dplcEntry $C, $532
+DPLC_Tails_03D2_End
+
+DPLC_Tails_03D6: dplcHeader
+ dplcEntry $C, $53E
+DPLC_Tails_03D6_End
+
+DPLC_Tails_03DA: dplcHeader
+ dplcEntry $C, $54A
+DPLC_Tails_03DA_End
+
+DPLC_Tails_03DE: dplcHeader
+ dplcEntry $C, $556
+DPLC_Tails_03DE_End
+
+DPLC_Tails_03E2: dplcHeader
+ dplcEntry $C, $562
+DPLC_Tails_03E2_End
+
+DPLC_Tails_03E6: dplcHeader
+ dplcEntry $C, $56E
+DPLC_Tails_03E6_End
+
+DPLC_Tails_03EA: dplcHeader
+ dplcEntry $C, $57A
+DPLC_Tails_03EA_End
+
+DPLC_Tails_03EE: dplcHeader
+ dplcEntry $C, $586
+DPLC_Tails_03EE_End
+
+DPLC_Tails_03F2: dplcHeader
+ dplcEntry 6, $592
+ dplcEntry 4, $598
+DPLC_Tails_03F2_End
+
+DPLC_Tails_03F8: dplcHeader
+ dplcEntry 8, $59C
+ dplcEntry 4, $5A4
+DPLC_Tails_03F8_End
+
+DPLC_Tails_03FE: dplcHeader
+ dplcEntry 6, $5A8
+ dplcEntry 8, $5AE
+DPLC_Tails_03FE_End
+
+DPLC_Tails_0404: dplcHeader
+ dplcEntry 6, $5A8
+ dplcEntry 8, $5B6
+DPLC_Tails_0404_End
+
+ even
diff --git a/mappings/spriteDPLC/Tails.bin b/mappings/spriteDPLC/Tails.bin
deleted file mode 100644
index 2cf2990d..00000000
Binary files a/mappings/spriteDPLC/Tails.bin and /dev/null differ
diff --git a/mappings/spriteDPLC/obj08.asm b/mappings/spriteDPLC/obj08.asm
new file mode 100644
index 00000000..655b1ebe
--- /dev/null
+++ b/mappings/spriteDPLC/obj08.asm
@@ -0,0 +1,103 @@
+DPLC_obj08: mappingsTable
+ mappingsTableEntry.w DPLC_obj08_002C
+ mappingsTableEntry.w DPLC_obj08_002E
+ mappingsTableEntry.w DPLC_obj08_0032
+ mappingsTableEntry.w DPLC_obj08_0036
+ mappingsTableEntry.w DPLC_obj08_003A
+ mappingsTableEntry.w DPLC_obj08_003E
+ mappingsTableEntry.w DPLC_obj08_0042
+ mappingsTableEntry.w DPLC_obj08_0046
+ mappingsTableEntry.w DPLC_obj08_004A
+ mappingsTableEntry.w DPLC_obj08_004E
+ mappingsTableEntry.w DPLC_obj08_0052
+ mappingsTableEntry.w DPLC_obj08_0056
+ mappingsTableEntry.w DPLC_obj08_005A
+ mappingsTableEntry.w DPLC_obj08_005E
+ mappingsTableEntry.w DPLC_obj08_0064
+ mappingsTableEntry.w DPLC_obj08_006A
+ mappingsTableEntry.w DPLC_obj08_0070
+ mappingsTableEntry.w DPLC_obj08_0076
+ mappingsTableEntry.w DPLC_obj08_0076
+ mappingsTableEntry.w DPLC_obj08_0076
+ mappingsTableEntry.w DPLC_obj08_0076
+ mappingsTableEntry.w DPLC_obj08_0078
+
+DPLC_obj08_002C: dplcHeader
+DPLC_obj08_002C_End
+
+DPLC_obj08_002E: dplcHeader
+ dplcEntry 8, 0
+DPLC_obj08_002E_End
+
+DPLC_obj08_0032: dplcHeader
+ dplcEntry $10, 8
+DPLC_obj08_0032_End
+
+DPLC_obj08_0036: dplcHeader
+ dplcEntry $10, $18
+DPLC_obj08_0036_End
+
+DPLC_obj08_003A: dplcHeader
+ dplcEntry $10, $28
+DPLC_obj08_003A_End
+
+DPLC_obj08_003E: dplcHeader
+ dplcEntry $10, $38
+DPLC_obj08_003E_End
+
+DPLC_obj08_0042: dplcHeader
+ dplcEntry $10, $48
+DPLC_obj08_0042_End
+
+DPLC_obj08_0046: dplcHeader
+ dplcEntry 8, $58
+DPLC_obj08_0046_End
+
+DPLC_obj08_004A: dplcHeader
+ dplcEntry 8, $60
+DPLC_obj08_004A_End
+
+DPLC_obj08_004E: dplcHeader
+ dplcEntry 8, $68
+DPLC_obj08_004E_End
+
+DPLC_obj08_0052: dplcHeader
+ dplcEntry 8, $70
+DPLC_obj08_0052_End
+
+DPLC_obj08_0056: dplcHeader
+ dplcEntry 8, $78
+DPLC_obj08_0056_End
+
+DPLC_obj08_005A: dplcHeader
+ dplcEntry 8, $80
+DPLC_obj08_005A_End
+
+DPLC_obj08_005E: dplcHeader
+ dplcEntry 2, $88
+ dplcEntry 8, $8A
+DPLC_obj08_005E_End
+
+DPLC_obj08_0064: dplcHeader
+ dplcEntry 4, $92
+ dplcEntry 8, $96
+DPLC_obj08_0064_End
+
+DPLC_obj08_006A: dplcHeader
+ dplcEntry 6, $9E
+ dplcEntry 8, $A4
+DPLC_obj08_006A_End
+
+DPLC_obj08_0070: dplcHeader
+ dplcEntry 6, $AC
+ dplcEntry 8, $B2
+DPLC_obj08_0070_End
+
+DPLC_obj08_0076: dplcHeader
+DPLC_obj08_0076_End
+
+DPLC_obj08_0078: dplcHeader
+ dplcEntry $10, $BA
+DPLC_obj08_0078_End
+
+ even
diff --git a/mappings/spriteDPLC/obj08.bin b/mappings/spriteDPLC/obj08.bin
deleted file mode 100644
index ebf74141..00000000
Binary files a/mappings/spriteDPLC/obj08.bin and /dev/null differ
diff --git a/mappings/spriteDPLC/obj0D.asm b/mappings/spriteDPLC/obj0D.asm
new file mode 100644
index 00000000..ef4206b8
--- /dev/null
+++ b/mappings/spriteDPLC/obj0D.asm
@@ -0,0 +1,33 @@
+DPLC_obj0D: mappingsTable
+ mappingsTableEntry.w DPLC_obj0D_000C
+ mappingsTableEntry.w DPLC_obj0D_0012
+ mappingsTableEntry.w DPLC_obj0D_001A
+ mappingsTableEntry.w DPLC_obj0D_0020
+ mappingsTableEntry.w DPLC_obj0D_0024
+ mappingsTableEntry.w DPLC_obj0D_0020
+
+DPLC_obj0D_000C: dplcHeader
+ dplcEntry $C, $22
+ dplcEntry $C, $2E
+DPLC_obj0D_000C_End
+
+DPLC_obj0D_0012: dplcHeader
+ dplcEntry 4, $3A
+ dplcEntry $10, $3E
+ dplcEntry 4, $3A
+DPLC_obj0D_0012_End
+
+DPLC_obj0D_001A: dplcHeader
+ dplcEntry $C, 0
+ dplcEntry $C, 0
+DPLC_obj0D_001A_End
+
+DPLC_obj0D_0020: dplcHeader
+ dplcEntry $10, $C
+DPLC_obj0D_0020_End
+
+DPLC_obj0D_0024: dplcHeader
+ dplcEntry 4, $1C
+DPLC_obj0D_0024_End
+
+ even
diff --git a/mappings/spriteDPLC/obj0D.bin b/mappings/spriteDPLC/obj0D.bin
deleted file mode 100644
index be84031a..00000000
Binary files a/mappings/spriteDPLC/obj0D.bin and /dev/null differ
diff --git a/s2.asm b/s2.asm
index 8857ab37..8bc121e7 100644
--- a/s2.asm
+++ b/s2.asm
@@ -9542,7 +9542,7 @@ SSHUD_SonicTails:
; -----------------------------------------------------------------------------------
; sprite mappings
; -----------------------------------------------------------------------------------
-Obj5E_MapUnc_7070: BINCLUDE "mappings/sprite/obj5E.bin"
+Obj5E_MapUnc_7070: include "mappings/sprite/obj5E.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object 5F - Start banner/"Ending controller" from Special Stage
@@ -9624,8 +9624,7 @@ loc_71B4:
endif
moveq #6,d6
-; WARNING: the build script needs editing if you rename this label
-word_728C_user: lea (Obj5F_MapUnc_7240+$4C).l,a2 ; word_728C
+ lea (Map_obj5F_a_004C).l,a2
moveq #2,d3
move.w #8,objoff_14(a0)
@@ -9689,13 +9688,11 @@ return_723E:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-; WARNING: the build script needs editing if you rename this label
-; or if you change the meaning of frame 2 in these mappings
-Obj5F_MapUnc_7240: BINCLUDE "mappings/sprite/obj5F_a.bin"
+Obj5F_MapUnc_7240: include "mappings/sprite/obj5F_a.asm"
; -----------------------------------------------------------------------------------
; sprite mappings
; -----------------------------------------------------------------------------------
-Obj5F_MapUnc_72D2: BINCLUDE "mappings/sprite/obj5F_b.bin"
+Obj5F_MapUnc_72D2: include "mappings/sprite/obj5F_b.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object 87 - Number of rings in Special Stage
@@ -10644,7 +10641,7 @@ Ani_objDB: offsetTable
; Sprite mappings for text, countdown, stars, and Tails on the continue screen
; Art starts at $A000 in VRAM
; -------------------------------------------------------------------------------
-ObjDA_MapUnc_7CB6: BINCLUDE "mappings/sprite/objDA.bin"
+ObjDA_MapUnc_7CB6: include "mappings/sprite/objDA.asm"
if ~~removeJmpTos
JmpTo_Adjust2PArtPointer2 ; JmpTo
@@ -11001,7 +10998,7 @@ JmpTo4_DisplaySprite ; JmpTo
; --------------------------------------------------------------------------
; sprite mappings
; --------------------------------------------------------------------------
-Obj21_MapUnc_8146: BINCLUDE "mappings/sprite/obj21.bin"
+Obj21_MapUnc_8146: include "mappings/sprite/obj21.asm"
; ===========================================================================
; loc_819A:
@@ -14325,7 +14322,7 @@ byte_AD9E: dc.b 1, 5, 6,$FF
; -----------------------------------------------------------------------------
; sprite mappings
; -----------------------------------------------------------------------------
-ObjCF_MapUnc_ADA2: BINCLUDE "mappings/sprite/objCF.bin"
+ObjCF_MapUnc_ADA2: include "mappings/sprite/objCF.asm"
; --------------------------------------------------------------------------------------
; Enigma compressed art mappings
; "Sonic the Hedgehog 2" mappings ; MapEng_B23A:
@@ -22374,12 +22371,12 @@ byte_FB28:
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj11_MapUnc_FC28: BINCLUDE "mappings/sprite/obj11_a.bin"
+Obj11_MapUnc_FC28: include "mappings/sprite/obj11_a.asm"
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj11_MapUnc_FC70: BINCLUDE "mappings/sprite/obj11_b.bin"
+Obj11_MapUnc_FC70: include "mappings/sprite/obj11_b.asm"
; ||||||||||||||| S U B R O U T I N E |||||||||||||||||||||||||||||||||||||||
@@ -22876,51 +22873,66 @@ Obj15_State7:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj15_MapUnc_101E8: BINCLUDE "mappings/sprite/obj15_a.bin"
+Obj15_MapUnc_101E8: include "mappings/sprite/obj15_a.asm"
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj15_Obj83_MapUnc_1021E: BINCLUDE "mappings/sprite/obj83.bin"
+Obj15_Obj83_MapUnc_1021E: include "mappings/sprite/obj83.asm"
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj15_Obj7A_MapUnc_10256: offsetTable
- offsetTableEntry.w word_1025E
- offsetTableEntry.w word_10270
- offsetTableEntry.w word_1027A
- offsetTableEntry.w word_1028C
-word_1025E: dc.w 2
- dc.w $F809, $6060, $6030, $FFE8
- dc.w $F809, $6860, $6830, 0
-word_10270: dc.w 1
- dc.w $F805, $6066, $6033, $FFF8
-word_1027A: dc.w 2
- dc.w $E805, $406A, $4035, $FFF4
- dc.w $F80B, $406E, $4037, $FFF4
-word_1028C: dc.w $A
- dc.w $A805, $406A, $4035, $FFF4
- dc.w $B80B, $406E, $4037, $FFF4
- dc.w $C805, $6066, $6033, $FFF8
- dc.w $D805, $6066, $6033, $FFF8
- dc.w $E805, $6066, $6033, $FFF8
- dc.w $F805, $6066, $6033, $FFF8
- dc.w $805, $6066, $6033, $FFF8
- dc.w $1805, $6066, $6033, $FFF8
- dc.w $2805, $6066, $6033, $FFF8
- dc.w $3805, $6066, $6033, $FFF8
+
+Obj15_Obj7A_MapUnc_10256: mappingsTable
+ mappingsTableEntry.w Map_obj7A_a_0008
+ mappingsTableEntry.w Map_obj7A_a_001A
+ mappingsTableEntry.w Map_obj7A_a_0024
+ mappingsTableEntry.w Map_obj7A_a_0036
+
+Map_obj7A_a_0008: spriteHeader
+ spritePiece -$18, -8, 3, 2, $60, 0, 0, 3, 0
+ spritePiece 0, -8, 3, 2, $60, 1, 0, 3, 0
+Map_obj7A_a_0008_End
+
+Map_obj7A_a_001A: spriteHeader
+ spritePiece -8, -8, 2, 2, $66, 0, 0, 3, 0
+Map_obj7A_a_001A_End
+
+Map_obj7A_a_0024: spriteHeader
+ spritePiece -$C, -$18, 2, 2, $6A, 0, 0, 2, 0
+ spritePiece -$C, -8, 3, 4, $6E, 0, 0, 2, 0
+Map_obj7A_a_0024_End
+
+Map_obj7A_a_0036: spriteHeader
+ spritePiece -$C, -$58, 2, 2, $6A, 0, 0, 2, 0
+ spritePiece -$C, -$48, 3, 4, $6E, 0, 0, 2, 0
+ spritePiece -8, -$38, 2, 2, $66, 0, 0, 3, 0
+ spritePiece -8, -$28, 2, 2, $66, 0, 0, 3, 0
+ spritePiece -8, -$18, 2, 2, $66, 0, 0, 3, 0
+ spritePiece -8, -8, 2, 2, $66, 0, 0, 3, 0
+ spritePiece -8, 8, 2, 2, $66, 0, 0, 3, 0
+ spritePiece -8, $18, 2, 2, $66, 0, 0, 3, 0
+ spritePiece -8, $28, 2, 2, $66, 0, 0, 3, 0
+ spritePiece -8, $38, 2, 2, $66, 0, 0, 3, 0
+Map_obj7A_a_0036_End
+
+ even
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj15_MapUnc_102DE: offsetTable
- offsetTableEntry.w word_102E4
- offsetTableEntry.w word_10270
- offsetTableEntry.w word_1027A
-word_102E4: dc.w 2
- dc.w $F80D, $6058, $602C, $FFE0
- dc.w $F80D, $6858, $682C, 0
+Obj15_MapUnc_102DE: mappingsTable
+ mappingsTableEntry.w Map_obj15_b_0006
+ mappingsTableEntry.w Map_obj7A_a_001A
+ mappingsTableEntry.w Map_obj7A_a_0024
+
+Map_obj15_b_0006: spriteHeader
+ spritePiece -$20, -8, 4, 2, $58, 0, 0, 3, 0
+ spritePiece 0, -8, 4, 2, $58, 1, 0, 3, 0
+Map_obj15_b_0006_End
+
+ even
; ===========================================================================
@@ -23083,7 +23095,7 @@ Obj17_Display:
; -----------------------------------------------------------------------------
; sprite mappings - helix of spikes on a pole (GHZ) (unused)
; -----------------------------------------------------------------------------
-Obj17_MapUnc_10452: BINCLUDE "mappings/sprite/obj17.bin"
+Obj17_MapUnc_10452: include "mappings/sprite/obj17.asm"
; ===========================================================================
if gameRevision<2
@@ -23465,11 +23477,11 @@ loc_107EE:
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj18_MapUnc_107F6: BINCLUDE "mappings/sprite/obj18_a.bin"
+Obj18_MapUnc_107F6: include "mappings/sprite/obj18_a.asm"
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj18_MapUnc_1084E: BINCLUDE "mappings/sprite/obj18_b.bin"
+Obj18_MapUnc_1084E: include "mappings/sprite/obj18_b.asm"
; ===========================================================================
if gameRevision<2
@@ -23832,11 +23844,11 @@ Obj1A_GHZ_SlopeData:
; -------------------------------------------------------------------------------
; unused sprite mappings (GHZ)
; -------------------------------------------------------------------------------
-Obj1A_MapUnc_10C6C: BINCLUDE "mappings/sprite/obj1A_a.bin"
+Obj1A_MapUnc_10C6C: include "mappings/sprite/obj1A_a.asm"
; ----------------------------------------------------------------------------
; unused sprite mappings (MZ, SLZ, SBZ)
; ----------------------------------------------------------------------------
-Obj1F_MapUnc_10F0C: BINCLUDE "mappings/sprite/obj1F_a.bin"
+Obj1F_MapUnc_10F0C: include "mappings/sprite/obj1F_a.asm"
; Slope data for platforms.
;byte_10FDC:
@@ -23851,19 +23863,19 @@ Obj1A_HPZ_SlopeData
; ----------------------------------------------------------------------------
; sprite mappings (HPZ)
; ----------------------------------------------------------------------------
-Obj1A_MapUnc_1101C: BINCLUDE "mappings/sprite/obj1A_b.bin"
+Obj1A_MapUnc_1101C: include "mappings/sprite/obj1A_b.asm"
; ----------------------------------------------------------------------------
; sprite mappings (OOZ)
; ----------------------------------------------------------------------------
-Obj1F_MapUnc_110C6: BINCLUDE "mappings/sprite/obj1F_b.bin"
+Obj1F_MapUnc_110C6: include "mappings/sprite/obj1F_b.asm"
; -------------------------------------------------------------------------------
; sprite mappings (MCZ)
; -------------------------------------------------------------------------------
-Obj1F_MapUnc_11106: BINCLUDE "mappings/sprite/obj1F_c.bin"
+Obj1F_MapUnc_11106: include "mappings/sprite/obj1F_c.asm"
; -------------------------------------------------------------------------------
; sprite mappings (ARZ)
; -------------------------------------------------------------------------------
-Obj1F_MapUnc_1115E: BINCLUDE "mappings/sprite/obj1F_d.bin"
+Obj1F_MapUnc_1115E: include "mappings/sprite/obj1F_d.asm"
; ===========================================================================
if gameRevision<2
@@ -24051,31 +24063,31 @@ byte_11392: dc.b $7F, 6,$FD, 2
; --------------------------------------------------------------------------------
; sprite mappings
; --------------------------------------------------------------------------------
-Obj71_MapUnc_11396: BINCLUDE "mappings/sprite/obj71_a.bin"
+Obj71_MapUnc_11396: include "mappings/sprite/obj71_a.asm"
; ----------------------------------------------------------------------------------------
; Unknown sprite mappings
; ----------------------------------------------------------------------------------------
-Obj1C_MapUnc_113D6: BINCLUDE "mappings/sprite/obj1C_a.bin"
+Obj1C_MapUnc_113D6: include "mappings/sprite/obj1C_a.asm"
; --------------------------------------------------------------------------------
; Unknown sprite mappings
; --------------------------------------------------------------------------------
-Obj1C_MapUnc_113EE: BINCLUDE "mappings/sprite/obj1C_b.bin"
+Obj1C_MapUnc_113EE: include "mappings/sprite/obj1C_b.asm"
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj1C_MapUnc_11406: BINCLUDE "mappings/sprite/obj1C_c.bin"
+Obj1C_MapUnc_11406: include "mappings/sprite/obj1C_c.asm"
; --------------------------------------------------------------------------------
; sprite mappings
; --------------------------------------------------------------------------------
-Obj1C_MapUnc_114AE: BINCLUDE "mappings/sprite/obj1C_d.bin"
+Obj1C_MapUnc_114AE: include "mappings/sprite/obj1C_d.asm"
; --------------------------------------------------------------------------------
; sprite mappings
; --------------------------------------------------------------------------------
-Obj1C_MapUnc_11552: BINCLUDE "mappings/sprite/obj1C_e.bin"
+Obj1C_MapUnc_11552: include "mappings/sprite/obj1C_e.asm"
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj71_MapUnc_11576: BINCLUDE "mappings/sprite/obj71_b.bin"
+Obj71_MapUnc_11576: include "mappings/sprite/obj71_b.asm"
; ===========================================================================
if gameRevision<2
@@ -24144,7 +24156,7 @@ Obj2A_Main:
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj2A_MapUnc_11666: BINCLUDE "mappings/sprite/obj2A.bin"
+Obj2A_MapUnc_11666: include "mappings/sprite/obj2A.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
@@ -24288,7 +24300,7 @@ return_11820:
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj2D_MapUnc_11822: BINCLUDE "mappings/sprite/obj2D.bin"
+Obj2D_MapUnc_11822: include "mappings/sprite/obj2D.asm"
; ===========================================================================
if gameRevision<2
@@ -24813,27 +24825,27 @@ Obj29_Main:
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj28_MapUnc_11E1C: BINCLUDE "mappings/sprite/obj28_a.bin"
+Obj28_MapUnc_11E1C: include "mappings/sprite/obj28_a.asm"
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj28_MapUnc_11E40: BINCLUDE "mappings/sprite/obj28_b.bin"
+Obj28_MapUnc_11E40: include "mappings/sprite/obj28_b.asm"
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj28_MapUnc_11E64: BINCLUDE "mappings/sprite/obj28_c.bin"
+Obj28_MapUnc_11E64: include "mappings/sprite/obj28_c.asm"
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj28_MapUnc_11E88: BINCLUDE "mappings/sprite/obj28_d.bin"
+Obj28_MapUnc_11E88: include "mappings/sprite/obj28_d.asm"
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj28_MapUnc_11EAC: BINCLUDE "mappings/sprite/obj28_e.bin"
+Obj28_MapUnc_11EAC: include "mappings/sprite/obj28_e.asm"
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj29_MapUnc_11ED0: BINCLUDE "mappings/sprite/obj29.bin"
+Obj29_MapUnc_11ED0: include "mappings/sprite/obj29.asm"
if ~~removeJmpTos
JmpTo_RandomNumber ; JmpTo
@@ -25272,16 +25284,16 @@ Ani_Ring: offsetTable
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj25_MapUnc_12382: BINCLUDE "mappings/sprite/obj37_a.bin"
+Obj25_MapUnc_12382: include "mappings/sprite/obj37_a.asm"
; -------------------------------------------------------------------------------
; Unused sprite mappings
; -------------------------------------------------------------------------------
-Obj37_MapUnc_123E6: BINCLUDE "mappings/sprite/obj37_b.bin"
+Obj37_MapUnc_123E6: include "mappings/sprite/obj37_b.asm"
; -------------------------------------------------------------------------------
; Unused sprite mappings
; -------------------------------------------------------------------------------
-Obj37_MapUnc_124E6: BINCLUDE "mappings/sprite/obj37_c.bin"
+Obj37_MapUnc_124E6: include "mappings/sprite/obj37_c.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
@@ -26103,7 +26115,7 @@ Ani_obj26_Broken:
; Sprite Mappings - Sprite table for monitor and monitor contents (26, ??)
; ---------------------------------------------------------------------------------
; MapUnc_12D36: MapUnc_obj26:
-Obj26_MapUnc_12D36: BINCLUDE "mappings/sprite/obj26.bin"
+Obj26_MapUnc_12D36: include "mappings/sprite/obj26.asm"
; ===========================================================================
if gameRevision<2
@@ -27095,11 +27107,11 @@ Ani_obj0E_FallingStar:
; -----------------------------------------------------------------------------
; Sprite Mappings - Flashing stars from intro (Obj0E)
; -----------------------------------------------------------------------------
-Obj0E_MapUnc_136A8: BINCLUDE "mappings/sprite/obj0E.bin"
+Obj0E_MapUnc_136A8: include "mappings/sprite/obj0E.asm"
; -----------------------------------------------------------------------------
; sprite mappings
; -----------------------------------------------------------------------------
-Obj0F_MapUnc_13B70: BINCLUDE "mappings/sprite/obj0F.bin"
+Obj0F_MapUnc_13B70: include "mappings/sprite/obj0F.asm"
if ~~removeJmpTos
JmpTo4_PlaySound ; JmpTo
@@ -28358,7 +28370,7 @@ Obj6F_SubObjectMetaData_End:
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj34_MapUnc_147BA: offsetTable
+Obj34_MapUnc_147BA: mappingsTable
.zone_names: zoneOrderedOffsetTable 2,1
zoneOffsetTableEntry.w word_147E8 ; EHZ
zoneOffsetTableEntry.w word_147E8 ; Zone 1
@@ -28378,268 +28390,332 @@ Obj34_MapUnc_147BA: offsetTable
zoneOffsetTableEntry.w word_14A88 ; ARZ
zoneOffsetTableEntry.w word_14AE2 ; SCZ
zoneTableEnd
- offsetTableEntry.w word_14BC8
- offsetTableEntry.w word_14BEA
- offsetTableEntry.w word_14BF4
- offsetTableEntry.w word_14BFE
- offsetTableEntry.w word_14C08
- offsetTableEntry.w word_14C32
-word_147E8: dc.w $B
- dc.w 5, $8580, $82C0, $FFC3
- dc.w 9, $85DE, $82EF, $FFD0
- dc.w 5, $8580, $82C0, $FFE8
- dc.w 5, $85E4, $82F2, $FFF8
- dc.w 5, $85E8, $82F4, 8
- dc.w 5, $85EC, $82F6, $18
- dc.w 5, $85F0, $82F8, $28
- dc.w 5, $85F4, $82FA, $48
- dc.w 1, $85F8, $82FC, $58
- dc.w 5, $85EC, $82F6, $60
- dc.w 5, $85EC, $82F6, $70
-word_14842: dc.w $A
- dc.w 9, $85DE, $82EF, $FFE0
- dc.w 5, $8580, $82C0, $FFF8
- dc.w 5, $85E4, $82F2, 8
- dc.w 5, $85E8, $82F4, $18
- dc.w 5, $8588, $82C4, $28
- dc.w 5, $85EC, $82F6, $38
- dc.w 5, $8588, $82C4, $48
- dc.w 5, $85F0, $82F8, $58
- dc.w 1, $85F4, $82FA, $68
- dc.w 5, $85F6, $82FB, $70
-word_14894: dc.w 7
- dc.w 5, $85DE, $82EF, 8
- dc.w 1, $85E2, $82F1, $18
- dc.w 5, $85E4, $82F2, $20
- dc.w 5, $85E4, $82F2, $30
- dc.w 5, $85E8, $82F4, $51
- dc.w 5, $8588, $82C4, $60
- dc.w 5, $85EC, $82F6, $70
-word_148CE: dc.w $C
- dc.w 5, $85DE, $82EF, $FFB8
- dc.w 1, $85E2, $82F1, $FFC8
- dc.w 5, $85E4, $82F2, $FFD0
- dc.w 5, $85E4, $82F2, $FFE0
- dc.w 5, $8580, $82C0, $FFF0
- dc.w 5, $8584, $82C2, 0
- dc.w 5, $85E8, $82F4, $20
- dc.w 5, $85EC, $82F6, $30
- dc.w 5, $85F0, $82F8, $40
- dc.w 5, $85EC, $82F6, $50
- dc.w 5, $85F4, $82FA, $60
- dc.w 5, $8580, $82C0, $70
-word_14930: dc.w 8
- dc.w 5, $8588, $82C4, $FFFB
- dc.w 1, $85DE, $82EF, $B
- dc.w 5, $85E0, $82F0, $13
- dc.w 5, $8588, $82C4, $33
- dc.w 5, $85E4, $82F2, $43
- dc.w 5, $8580, $82C0, $53
- dc.w 5, $85E8, $82F4, $60
- dc.w 5, $8584, $82C2, $70
-word_14972: dc.w $A
- dc.w 9, $85DE, $82EF, $FFD0
- dc.w 5, $85E4, $82F2, $FFE8
- dc.w 5, $85E8, $82F4, $FFF8
- dc.w 5, $85EC, $82F6, 8
- dc.w 1, $85F0, $82F8, $18
- dc.w 5, $85F2, $82F9, $20
- dc.w 5, $85F2, $82F9, $41
- dc.w 5, $85F6, $82FB, $50
- dc.w 5, $85FA, $82FD, $60
- dc.w 5, $8580, $82C0, $70
-word_149C4: dc.w $B
- dc.w 5, $85DE, $82EF, $FFD1
- dc.w 5, $85E2, $82F1, $FFE0
- dc.w 5, $85E6, $82F3, $FFF0
- dc.w 1, $85EA, $82F5, 0
- dc.w 5, $8584, $82C2, 8
- dc.w 5, $8588, $82C4, $18
- dc.w 5, $8584, $82C2, $38
- dc.w 1, $85EA, $82F5, $48
- dc.w 5, $85EC, $82F6, $50
- dc.w 5, $85F0, $82F8, $60
- dc.w 5, $85F4, $82FA, $70
-word_14A1E: dc.w $D
- dc.w 5, $85DE, $82EF, $FFA4
- dc.w 5, $85E2, $82F1, $FFB4
- dc.w 5, $8580, $82C0, $FFC4
- dc.w 9, $85E6, $82F3, $FFD1
- dc.w 1, $85EC, $82F6, $FFE9
- dc.w 5, $85DE, $82EF, $FFF1
- dc.w 5, $85EE, $82F7, 0
- dc.w 5, $85F2, $82F9, $10
- dc.w 5, $85F6, $82FB, $31
- dc.w 5, $85F2, $82F9, $41
- dc.w 5, $85EE, $82F7, $50
- dc.w 5, $8584, $82C2, $60
- dc.w 5, $85FA, $82FD, $70
-word_14A88: dc.w $B
- dc.w 5, $85DE, $82EF, $FFD2
- dc.w 5, $85E2, $82F1, $FFE2
- dc.w 5, $85E6, $82F3, $FFF2
- dc.w 5, $85DE, $82EF, 0
- dc.w 5, $85EA, $82F5, $10
- dc.w 1, $85EE, $82F7, $20
- dc.w 5, $85F0, $82F8, $28
- dc.w 5, $85F4, $82FA, $48
- dc.w 5, $85E6, $82F3, $58
- dc.w 1, $85EE, $82F7, $68
- dc.w 5, $8584, $82C2, $70
-word_14AE2: dc.w 8
- dc.w 5, $85DE, $82EF, $FFF0
- dc.w 5, $85E2, $82F1, 0
- dc.w 5, $85E6, $82F3, $10
- dc.w 5, $85EA, $82F5, $30
- dc.w 5, $85EE, $82F7, $40
- dc.w 5, $85F2, $82F9, $50
- dc.w 5, $85DE, $82EF, $60
- dc.w 5, $8580, $82C0, $70
-word_14B24: dc.w $C
- dc.w 9, $85DE, $82EF, $FFB1
- dc.w 1, $85E4, $82F2, $FFC8
- dc.w 5, $8584, $82C2, $FFD0
- dc.w 5, $85E6, $82F3, $FFE0
- dc.w 5, $85EA, $82F5, 1
- dc.w 5, $8588, $82C4, $10
- dc.w 5, $85EE, $82F7, $20
- dc.w 5, $85F2, $82F9, $30
- dc.w 5, $85EE, $82F7, $40
- dc.w 5, $8580, $82C0, $50
- dc.w 5, $85F6, $82FB, $5F
- dc.w 5, $85F6, $82FB, $6F
-word_14B86: dc.w 8
- dc.w 5, $85DE, $82EF, $FFF2
- dc.w 5, $8580, $82C0, 2
- dc.w 5, $85E2, $82F1, $10
- dc.w 5, $85E6, $82F3, $20
- dc.w 5, $85EA, $82F5, $30
- dc.w 5, $8580, $82C0, $51
- dc.w 5, $85EE, $82F7, $60
- dc.w 5, $85EE, $82F7, $70
-word_14BC8: dc.w 4
- dc.w 5, $858C, $82C6, 1
- dc.w 5, $8588, $82C4, $10
- dc.w 5, $8584, $82C2, $20
- dc.w 5, $8580, $82C0, $30
-word_14BEA: dc.w 1
- dc.w 7, $A590, $A2C8, 0
-word_14BF4: dc.w 1
- dc.w $B, $A598, $A2CC, 0
-word_14BFE: dc.w 1
- dc.w $B, $A5A4, $A2D2, 0
-word_14C08: dc.w 5
- dc.w $D, $85B0, $82D8, $FFB8
- dc.w $D, $85B8, $82DC, $FFD8
- dc.w $D, $85C0, $82E0, $FFF8
- dc.w $D, $85C8, $82E4, $18
- dc.w 5, $85D0, $82E8, $38
-word_14C32: dc.w 7
- dc.w $9003, $85D4, $82EA, 0
- dc.w $B003, $85D4, $82EA, 0
- dc.w $D003, $85D4, $82EA, 0
- dc.w $F003, $85D4, $82EA, 0
- dc.w $1003, $85D4, $82EA, 0
- dc.w $3003, $85D4, $82EA, 0
- dc.w $5003, $85D4, $82EA, 0
+ mappingsTableEntry.w word_14BC8
+ mappingsTableEntry.w word_14BEA
+ mappingsTableEntry.w word_14BF4
+ mappingsTableEntry.w word_14BFE
+ mappingsTableEntry.w word_14C08
+ mappingsTableEntry.w word_14C32
+
+word_147E8: spriteHeader
+ spritePiece -$3D, 0, 2, 2, $580, 0, 0, 0, 1
+ spritePiece -$30, 0, 3, 2, $5DE, 0, 0, 0, 1
+ spritePiece -$18, 0, 2, 2, $580, 0, 0, 0, 1
+ spritePiece -8, 0, 2, 2, $5E4, 0, 0, 0, 1
+ spritePiece 8, 0, 2, 2, $5E8, 0, 0, 0, 1
+ spritePiece $18, 0, 2, 2, $5EC, 0, 0, 0, 1
+ spritePiece $28, 0, 2, 2, $5F0, 0, 0, 0, 1
+ spritePiece $48, 0, 2, 2, $5F4, 0, 0, 0, 1
+ spritePiece $58, 0, 1, 2, $5F8, 0, 0, 0, 1
+ spritePiece $60, 0, 2, 2, $5EC, 0, 0, 0, 1
+ spritePiece $70, 0, 2, 2, $5EC, 0, 0, 0, 1
+word_147E8_End
+
+word_14842: spriteHeader
+ spritePiece -$20, 0, 3, 2, $5DE, 0, 0, 0, 1
+ spritePiece -8, 0, 2, 2, $580, 0, 0, 0, 1
+ spritePiece 8, 0, 2, 2, $5E4, 0, 0, 0, 1
+ spritePiece $18, 0, 2, 2, $5E8, 0, 0, 0, 1
+ spritePiece $28, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece $38, 0, 2, 2, $5EC, 0, 0, 0, 1
+ spritePiece $48, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece $58, 0, 2, 2, $5F0, 0, 0, 0, 1
+ spritePiece $68, 0, 1, 2, $5F4, 0, 0, 0, 1
+ spritePiece $70, 0, 2, 2, $5F6, 0, 0, 0, 1
+word_14842_End
+
+word_14894: spriteHeader
+ spritePiece 8, 0, 2, 2, $5DE, 0, 0, 0, 1
+ spritePiece $18, 0, 1, 2, $5E2, 0, 0, 0, 1
+ spritePiece $20, 0, 2, 2, $5E4, 0, 0, 0, 1
+ spritePiece $30, 0, 2, 2, $5E4, 0, 0, 0, 1
+ spritePiece $51, 0, 2, 2, $5E8, 0, 0, 0, 1
+ spritePiece $60, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece $70, 0, 2, 2, $5EC, 0, 0, 0, 1
+word_14894_End
+
+word_148CE: spriteHeader
+ spritePiece -$48, 0, 2, 2, $5DE, 0, 0, 0, 1
+ spritePiece -$38, 0, 1, 2, $5E2, 0, 0, 0, 1
+ spritePiece -$30, 0, 2, 2, $5E4, 0, 0, 0, 1
+ spritePiece -$20, 0, 2, 2, $5E4, 0, 0, 0, 1
+ spritePiece -$10, 0, 2, 2, $580, 0, 0, 0, 1
+ spritePiece 0, 0, 2, 2, $584, 0, 0, 0, 1
+ spritePiece $20, 0, 2, 2, $5E8, 0, 0, 0, 1
+ spritePiece $30, 0, 2, 2, $5EC, 0, 0, 0, 1
+ spritePiece $40, 0, 2, 2, $5F0, 0, 0, 0, 1
+ spritePiece $50, 0, 2, 2, $5EC, 0, 0, 0, 1
+ spritePiece $60, 0, 2, 2, $5F4, 0, 0, 0, 1
+ spritePiece $70, 0, 2, 2, $580, 0, 0, 0, 1
+word_148CE_End
+
+word_14930: spriteHeader
+ spritePiece -5, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece $B, 0, 1, 2, $5DE, 0, 0, 0, 1
+ spritePiece $13, 0, 2, 2, $5E0, 0, 0, 0, 1
+ spritePiece $33, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece $43, 0, 2, 2, $5E4, 0, 0, 0, 1
+ spritePiece $53, 0, 2, 2, $580, 0, 0, 0, 1
+ spritePiece $60, 0, 2, 2, $5E8, 0, 0, 0, 1
+ spritePiece $70, 0, 2, 2, $584, 0, 0, 0, 1
+word_14930_End
+
+word_14972: spriteHeader
+ spritePiece -$30, 0, 3, 2, $5DE, 0, 0, 0, 1
+ spritePiece -$18, 0, 2, 2, $5E4, 0, 0, 0, 1
+ spritePiece -8, 0, 2, 2, $5E8, 0, 0, 0, 1
+ spritePiece 8, 0, 2, 2, $5EC, 0, 0, 0, 1
+ spritePiece $18, 0, 1, 2, $5F0, 0, 0, 0, 1
+ spritePiece $20, 0, 2, 2, $5F2, 0, 0, 0, 1
+ spritePiece $41, 0, 2, 2, $5F2, 0, 0, 0, 1
+ spritePiece $50, 0, 2, 2, $5F6, 0, 0, 0, 1
+ spritePiece $60, 0, 2, 2, $5FA, 0, 0, 0, 1
+ spritePiece $70, 0, 2, 2, $580, 0, 0, 0, 1
+word_14972_End
+
+word_149C4: spriteHeader
+ spritePiece -$2F, 0, 2, 2, $5DE, 0, 0, 0, 1
+ spritePiece -$20, 0, 2, 2, $5E2, 0, 0, 0, 1
+ spritePiece -$10, 0, 2, 2, $5E6, 0, 0, 0, 1
+ spritePiece 0, 0, 1, 2, $5EA, 0, 0, 0, 1
+ spritePiece 8, 0, 2, 2, $584, 0, 0, 0, 1
+ spritePiece $18, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece $38, 0, 2, 2, $584, 0, 0, 0, 1
+ spritePiece $48, 0, 1, 2, $5EA, 0, 0, 0, 1
+ spritePiece $50, 0, 2, 2, $5EC, 0, 0, 0, 1
+ spritePiece $60, 0, 2, 2, $5F0, 0, 0, 0, 1
+ spritePiece $70, 0, 2, 2, $5F4, 0, 0, 0, 1
+word_149C4_End
+
+word_14A1E: spriteHeader
+ spritePiece -$5C, 0, 2, 2, $5DE, 0, 0, 0, 1
+ spritePiece -$4C, 0, 2, 2, $5E2, 0, 0, 0, 1
+ spritePiece -$3C, 0, 2, 2, $580, 0, 0, 0, 1
+ spritePiece -$2F, 0, 3, 2, $5E6, 0, 0, 0, 1
+ spritePiece -$17, 0, 1, 2, $5EC, 0, 0, 0, 1
+ spritePiece -$F, 0, 2, 2, $5DE, 0, 0, 0, 1
+ spritePiece 0, 0, 2, 2, $5EE, 0, 0, 0, 1
+ spritePiece $10, 0, 2, 2, $5F2, 0, 0, 0, 1
+ spritePiece $31, 0, 2, 2, $5F6, 0, 0, 0, 1
+ spritePiece $41, 0, 2, 2, $5F2, 0, 0, 0, 1
+ spritePiece $50, 0, 2, 2, $5EE, 0, 0, 0, 1
+ spritePiece $60, 0, 2, 2, $584, 0, 0, 0, 1
+ spritePiece $70, 0, 2, 2, $5FA, 0, 0, 0, 1
+word_14A1E_End
+
+word_14A88: spriteHeader
+ spritePiece -$2E, 0, 2, 2, $5DE, 0, 0, 0, 1
+ spritePiece -$1E, 0, 2, 2, $5E2, 0, 0, 0, 1
+ spritePiece -$E, 0, 2, 2, $5E6, 0, 0, 0, 1
+ spritePiece 0, 0, 2, 2, $5DE, 0, 0, 0, 1
+ spritePiece $10, 0, 2, 2, $5EA, 0, 0, 0, 1
+ spritePiece $20, 0, 1, 2, $5EE, 0, 0, 0, 1
+ spritePiece $28, 0, 2, 2, $5F0, 0, 0, 0, 1
+ spritePiece $48, 0, 2, 2, $5F4, 0, 0, 0, 1
+ spritePiece $58, 0, 2, 2, $5E6, 0, 0, 0, 1
+ spritePiece $68, 0, 1, 2, $5EE, 0, 0, 0, 1
+ spritePiece $70, 0, 2, 2, $584, 0, 0, 0, 1
+word_14A88_End
+
+word_14AE2: spriteHeader
+ spritePiece -$10, 0, 2, 2, $5DE, 0, 0, 0, 1
+ spritePiece 0, 0, 2, 2, $5E2, 0, 0, 0, 1
+ spritePiece $10, 0, 2, 2, $5E6, 0, 0, 0, 1
+ spritePiece $30, 0, 2, 2, $5EA, 0, 0, 0, 1
+ spritePiece $40, 0, 2, 2, $5EE, 0, 0, 0, 1
+ spritePiece $50, 0, 2, 2, $5F2, 0, 0, 0, 1
+ spritePiece $60, 0, 2, 2, $5DE, 0, 0, 0, 1
+ spritePiece $70, 0, 2, 2, $580, 0, 0, 0, 1
+word_14AE2_End
+
+word_14B24: spriteHeader
+ spritePiece -$4F, 0, 3, 2, $5DE, 0, 0, 0, 1
+ spritePiece -$38, 0, 1, 2, $5E4, 0, 0, 0, 1
+ spritePiece -$30, 0, 2, 2, $584, 0, 0, 0, 1
+ spritePiece -$20, 0, 2, 2, $5E6, 0, 0, 0, 1
+ spritePiece 1, 0, 2, 2, $5EA, 0, 0, 0, 1
+ spritePiece $10, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece $20, 0, 2, 2, $5EE, 0, 0, 0, 1
+ spritePiece $30, 0, 2, 2, $5F2, 0, 0, 0, 1
+ spritePiece $40, 0, 2, 2, $5EE, 0, 0, 0, 1
+ spritePiece $50, 0, 2, 2, $580, 0, 0, 0, 1
+ spritePiece $5F, 0, 2, 2, $5F6, 0, 0, 0, 1
+ spritePiece $6F, 0, 2, 2, $5F6, 0, 0, 0, 1
+word_14B24_End
+
+word_14B86: spriteHeader
+ spritePiece -$E, 0, 2, 2, $5DE, 0, 0, 0, 1
+ spritePiece 2, 0, 2, 2, $580, 0, 0, 0, 1
+ spritePiece $10, 0, 2, 2, $5E2, 0, 0, 0, 1
+ spritePiece $20, 0, 2, 2, $5E6, 0, 0, 0, 1
+ spritePiece $30, 0, 2, 2, $5EA, 0, 0, 0, 1
+ spritePiece $51, 0, 2, 2, $580, 0, 0, 0, 1
+ spritePiece $60, 0, 2, 2, $5EE, 0, 0, 0, 1
+ spritePiece $70, 0, 2, 2, $5EE, 0, 0, 0, 1
+word_14B86_End
+
+word_14BC8: spriteHeader
+ spritePiece 1, 0, 2, 2, $58C, 0, 0, 0, 1
+ spritePiece $10, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece $20, 0, 2, 2, $584, 0, 0, 0, 1
+ spritePiece $30, 0, 2, 2, $580, 0, 0, 0, 1
+word_14BC8_End
+
+word_14BEA: spriteHeader
+ spritePiece 0, 0, 2, 4, $590, 0, 0, 1, 1
+word_14BEA_End
+
+word_14BF4: spriteHeader
+ spritePiece 0, 0, 3, 4, $598, 0, 0, 1, 1
+word_14BF4_End
+
+word_14BFE: spriteHeader
+ spritePiece 0, 0, 3, 4, $5A4, 0, 0, 1, 1
+word_14BFE_End
+
+word_14C08: spriteHeader
+ spritePiece -$48, 0, 4, 2, $5B0, 0, 0, 0, 1
+ spritePiece -$28, 0, 4, 2, $5B8, 0, 0, 0, 1
+ spritePiece -8, 0, 4, 2, $5C0, 0, 0, 0, 1
+ spritePiece $18, 0, 4, 2, $5C8, 0, 0, 0, 1
+ spritePiece $38, 0, 2, 2, $5D0, 0, 0, 0, 1
+word_14C08_End
+
+word_14C32: spriteHeader
+ spritePiece 0, -$70, 1, 4, $5D4, 0, 0, 0, 1
+ spritePiece 0, -$50, 1, 4, $5D4, 0, 0, 0, 1
+ spritePiece 0, -$30, 1, 4, $5D4, 0, 0, 0, 1
+ spritePiece 0, -$10, 1, 4, $5D4, 0, 0, 0, 1
+ spritePiece 0, $10, 1, 4, $5D4, 0, 0, 0, 1
+ spritePiece 0, $30, 1, 4, $5D4, 0, 0, 0, 1
+ spritePiece 0, $50, 1, 4, $5D4, 0, 0, 0, 1
+word_14C32_End
+
+ even
+
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj39_MapUnc_14C6C: BINCLUDE "mappings/sprite/obj39.bin"
+Obj39_MapUnc_14C6C: include "mappings/sprite/obj39.asm"
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj3A_MapUnc_14CBC: offsetTable
- offsetTableEntry.w word_14CDA
- offsetTableEntry.w word_14D1C
- offsetTableEntry.w word_14D5E
- offsetTableEntry.w word_14DA0
- offsetTableEntry.w word_14DDA
- offsetTableEntry.w word_14BC8
- offsetTableEntry.w word_14BEA
- offsetTableEntry.w word_14BF4
- offsetTableEntry.w word_14BFE
- offsetTableEntry.w word_14DF4
- offsetTableEntry.w word_14E1E
- offsetTableEntry.w word_14E50
- offsetTableEntry.w word_14E82
- offsetTableEntry.w word_14E8C
- offsetTableEntry.w word_14E96
-word_14CDA: dc.w 8
- dc.w 5, $85D0, $82E8, $FFC0
- dc.w 5, $8588, $82C4, $FFD0
- dc.w 5, $8584, $82C2, $FFE0
- dc.w 1, $85C0, $82E0, $FFF0
- dc.w 5, $85B4, $82DA, $FFF8
- dc.w 5, $85B8, $82DC, $10
- dc.w 5, $8588, $82C4, $20
- dc.w 5, $85D4, $82EA, $2F
-word_14D1C: dc.w 8
- dc.w 9, $85C6, $82E3, $FFBC
- dc.w 1, $85C0, $82E0, $FFD4
- dc.w 5, $85C2, $82E1, $FFDC
- dc.w 5, $8580, $82C0, $FFEC
- dc.w 5, $85D0, $82E8, $FFFC
- dc.w 5, $85B8, $82DC, $14
- dc.w 5, $8588, $82C4, $24
- dc.w 5, $85D4, $82EA, $33
-word_14D5E: dc.w 8
- dc.w 5, $85D4, $82EA, $FFC3
- dc.w 5, $85B0, $82D8, $FFD0
- dc.w 1, $85C0, $82E0, $FFE0
- dc.w 5, $85C2, $82E1, $FFE8
- dc.w 5, $85D0, $82E8, $FFF8
- dc.w 5, $85B8, $82DC, $10
- dc.w 5, $8588, $82C4, $20
- dc.w 5, $85D4, $82EA, $2F
-word_14DA0: dc.w 7
- dc.w 5, $85D4, $82EA, $FFC8
- dc.w 5, $85BC, $82DE, $FFD8
- dc.w 5, $85CC, $82E6, $FFE8
- dc.w 5, $8588, $82C4, $FFF8
- dc.w 5, $85D8, $82EC, 8
- dc.w 5, $85B8, $82DC, $18
- dc.w 5, $85BC, $82DE, $28
-word_14DDA: dc.w 3
- dc.w 5, $85B0, $82D8, 0
- dc.w 5, $85B4, $82DA, $10
- dc.w 5, $85D4, $82EA, $1F
-word_14DF4: dc.w 5
- dc.w 9, $A5E6, $A2F3, $FFB8
- dc.w 5, $A5EC, $A2F6, $FFD0
- dc.w 5, $85F0, $82F8, $FFD4
- dc.w $D, $8520, $8290, $38
- dc.w 1, $86F0, $8378, $58
-word_14E1E: dc.w 6
- dc.w $D, $A6DA, $A36D, $FFA4
- dc.w $D, $A5DE, $A2EF, $FFCC
- dc.w 1, $A6CA, $A365, $FFEC
- dc.w 5, $85F0, $82F8, $FFE8
- dc.w $D, $8528, $8294, $38
- dc.w 1, $86F0, $8378, $58
-word_14E50: dc.w 6
- dc.w $D, $A6D2, $A369, $FFA4
- dc.w $D, $A5DE, $A2EF, $FFCC
- dc.w 1, $A6CA, $A365, $FFEC
- dc.w 5, $85F0, $82F8, $FFE8
- dc.w $D, $8530, $8298, $38
- dc.w 1, $86F0, $8378, $58
-word_14E82: dc.w 1
- dc.w 6, $85F4, $82FA, 0
-word_14E8C: dc.w 1
- dc.w 6, $85FA, $82FD, 0
-word_14E96: dc.w 7
- dc.w $D, $A540, $A2A0, $FF98
- dc.w 9, $A548, $A2A4, $FFB8
- dc.w $D, $A5DE, $A2EF, $FFD8
- dc.w 1, $A6CA, $A365, $FFF8
- dc.w 5, $85F0, $82F8, $FFF4
- dc.w $D, $8538, $829C, $38
- dc.w 1, $86F0, $8378, $58
+Obj3A_MapUnc_14CBC: mappingsTable
+ mappingsTableEntry.w word_14CDA
+ mappingsTableEntry.w word_14D1C
+ mappingsTableEntry.w word_14D5E
+ mappingsTableEntry.w word_14DA0
+ mappingsTableEntry.w word_14DDA
+ mappingsTableEntry.w word_14BC8
+ mappingsTableEntry.w word_14BEA
+ mappingsTableEntry.w word_14BF4
+ mappingsTableEntry.w word_14BFE
+ mappingsTableEntry.w word_14DF4
+ mappingsTableEntry.w word_14E1E
+ mappingsTableEntry.w word_14E50
+ mappingsTableEntry.w word_14E82
+ mappingsTableEntry.w word_14E8C
+ mappingsTableEntry.w word_14E96
+
+word_14CDA: spriteHeader
+ spritePiece -$40, 0, 2, 2, $5D0, 0, 0, 0, 1
+ spritePiece -$30, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece -$20, 0, 2, 2, $584, 0, 0, 0, 1
+ spritePiece -$10, 0, 1, 2, $5C0, 0, 0, 0, 1
+ spritePiece -8, 0, 2, 2, $5B4, 0, 0, 0, 1
+ spritePiece $10, 0, 2, 2, $5B8, 0, 0, 0, 1
+ spritePiece $20, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece $2F, 0, 2, 2, $5D4, 0, 0, 0, 1
+word_14CDA_End
+
+word_14D1C: spriteHeader
+ spritePiece -$44, 0, 3, 2, $5C6, 0, 0, 0, 1
+ spritePiece -$2C, 0, 1, 2, $5C0, 0, 0, 0, 1
+ spritePiece -$24, 0, 2, 2, $5C2, 0, 0, 0, 1
+ spritePiece -$14, 0, 2, 2, $580, 0, 0, 0, 1
+ spritePiece -4, 0, 2, 2, $5D0, 0, 0, 0, 1
+ spritePiece $14, 0, 2, 2, $5B8, 0, 0, 0, 1
+ spritePiece $24, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece $33, 0, 2, 2, $5D4, 0, 0, 0, 1
+word_14D1C_End
+
+word_14D5E: spriteHeader
+ spritePiece -$3D, 0, 2, 2, $5D4, 0, 0, 0, 1
+ spritePiece -$30, 0, 2, 2, $5B0, 0, 0, 0, 1
+ spritePiece -$20, 0, 1, 2, $5C0, 0, 0, 0, 1
+ spritePiece -$18, 0, 2, 2, $5C2, 0, 0, 0, 1
+ spritePiece -8, 0, 2, 2, $5D0, 0, 0, 0, 1
+ spritePiece $10, 0, 2, 2, $5B8, 0, 0, 0, 1
+ spritePiece $20, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece $2F, 0, 2, 2, $5D4, 0, 0, 0, 1
+word_14D5E_End
+
+word_14DA0: spriteHeader
+ spritePiece -$38, 0, 2, 2, $5D4, 0, 0, 0, 1
+ spritePiece -$28, 0, 2, 2, $5BC, 0, 0, 0, 1
+ spritePiece -$18, 0, 2, 2, $5CC, 0, 0, 0, 1
+ spritePiece -8, 0, 2, 2, $588, 0, 0, 0, 1
+ spritePiece 8, 0, 2, 2, $5D8, 0, 0, 0, 1
+ spritePiece $18, 0, 2, 2, $5B8, 0, 0, 0, 1
+ spritePiece $28, 0, 2, 2, $5BC, 0, 0, 0, 1
+word_14DA0_End
+
+word_14DDA: spriteHeader
+ spritePiece 0, 0, 2, 2, $5B0, 0, 0, 0, 1
+ spritePiece $10, 0, 2, 2, $5B4, 0, 0, 0, 1
+ spritePiece $1F, 0, 2, 2, $5D4, 0, 0, 0, 1
+word_14DDA_End
+
+word_14DF4: spriteHeader
+ spritePiece -$48, 0, 3, 2, $5E6, 0, 0, 1, 1
+ spritePiece -$30, 0, 2, 2, $5EC, 0, 0, 1, 1
+ spritePiece -$2C, 0, 2, 2, $5F0, 0, 0, 0, 1
+ spritePiece $38, 0, 4, 2, $520, 0, 0, 0, 1
+ spritePiece $58, 0, 1, 2, $6F0, 0, 0, 0, 1
+word_14DF4_End
+
+word_14E1E: spriteHeader
+ spritePiece -$5C, 0, 4, 2, $6DA, 0, 0, 1, 1
+ spritePiece -$34, 0, 4, 2, $5DE, 0, 0, 1, 1
+ spritePiece -$14, 0, 1, 2, $6CA, 0, 0, 1, 1
+ spritePiece -$18, 0, 2, 2, $5F0, 0, 0, 0, 1
+ spritePiece $38, 0, 4, 2, $528, 0, 0, 0, 1
+ spritePiece $58, 0, 1, 2, $6F0, 0, 0, 0, 1
+word_14E1E_End
+
+word_14E50: spriteHeader
+ spritePiece -$5C, 0, 4, 2, $6D2, 0, 0, 1, 1
+ spritePiece -$34, 0, 4, 2, $5DE, 0, 0, 1, 1
+ spritePiece -$14, 0, 1, 2, $6CA, 0, 0, 1, 1
+ spritePiece -$18, 0, 2, 2, $5F0, 0, 0, 0, 1
+ spritePiece $38, 0, 4, 2, $530, 0, 0, 0, 1
+ spritePiece $58, 0, 1, 2, $6F0, 0, 0, 0, 1
+word_14E50_End
+
+word_14E82: spriteHeader
+ spritePiece 0, 0, 2, 3, $5F4, 0, 0, 0, 1
+word_14E82_End
+
+word_14E8C: spriteHeader
+ spritePiece 0, 0, 2, 3, $5FA, 0, 0, 0, 1
+word_14E8C_End
+
+word_14E96: spriteHeader
+ spritePiece -$68, 0, 4, 2, $540, 0, 0, 1, 1
+ spritePiece -$48, 0, 3, 2, $548, 0, 0, 1, 1
+ spritePiece -$28, 0, 4, 2, $5DE, 0, 0, 1, 1
+ spritePiece -8, 0, 1, 2, $6CA, 0, 0, 1, 1
+ spritePiece -$C, 0, 2, 2, $5F0, 0, 0, 0, 1
+ spritePiece $38, 0, 4, 2, $538, 0, 0, 0, 1
+ spritePiece $58, 0, 1, 2, $6F0, 0, 0, 0, 1
+word_14E96_End
+
+ even
+
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj6F_MapUnc_14ED0: BINCLUDE "mappings/sprite/obj6F.bin"
+Obj6F_MapUnc_14ED0: include "mappings/sprite/obj6F.asm"
; ===========================================================================
;loc_15584: ; level title card drawing function called from Vint
@@ -29291,7 +29367,7 @@ MoveSpikes_Retract:
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj36_MapUnc_15B68: BINCLUDE "mappings/sprite/obj36.bin"
+Obj36_MapUnc_15B68: include "mappings/sprite/obj36.asm"
@@ -29344,7 +29420,7 @@ Obj3B_Main:
; -------------------------------------------------------------------------------
; Unused sprite mappings
; -------------------------------------------------------------------------------
-Obj3B_MapUnc_15D2E: BINCLUDE "mappings/sprite/obj3B.bin"
+Obj3B_MapUnc_15D2E: include "mappings/sprite/obj3B.asm"
if ~~removeJmpTos
align 4
@@ -29484,7 +29560,7 @@ Obj3C_FragmentSpeeds_RightToLeft:
; -------------------------------------------------------------------------------
; Unused sprite mappings
; -------------------------------------------------------------------------------
-Obj3C_MapUnc_15ECC: BINCLUDE "mappings/sprite/obj3C.bin"
+Obj3C_MapUnc_15ECC: include "mappings/sprite/obj3C.asm"
; ===========================================================================
bra.w ObjNull
@@ -32025,71 +32101,39 @@ RingsMgr_SortRings:
; This was customised even further in Sonic 3 & Knuckles.
; off_1736A:
-MapUnc_Rings: offsetTable
- offsetTableEntry.w .frame1
- offsetTableEntry.w .frame2
- offsetTableEntry.w .frame3
- offsetTableEntry.w .frame4
- offsetTableEntry.w .frame5
- offsetTableEntry.w .frame6
- offsetTableEntry.w .frame7
- offsetTableEntry.w .frame8
+MapUnc_Rings: mappingsTable
+ mappingsTableEntry.w .frame1
+ mappingsTableEntry.w .frame2
+ mappingsTableEntry.w .frame3
+ mappingsTableEntry.w .frame4
+ mappingsTableEntry.w .frame5
+ mappingsTableEntry.w .frame6
+ mappingsTableEntry.w .frame7
+ mappingsTableEntry.w .frame8
.frame1:
- dc.b -8
- dc.b 5
- dc.w make_block_tile(0,0,0,0,0)
- dc.w make_block_tile_2p(0,0,0,0,0)
- dc.w -8
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
.frame2:
- dc.b -8
- dc.b 5
- dc.w make_block_tile(4,0,0,0,0)
- dc.w make_block_tile_2p(4,0,0,0,0)
- dc.w -8
+ spritePiece -8, -8, 2, 2, 4, 0, 0, 0, 0
.frame3:
- dc.b -8
- dc.b 1
- dc.w make_block_tile(8,0,0,0,0)
- dc.w make_block_tile_2p(8,0,0,0,0)
- dc.w -4
+ spritePiece -4, -8, 1, 2, 8, 0, 0, 0, 0
.frame4:
- dc.b -8
- dc.b 5
- dc.w make_block_tile(4,1,0,0,0)
- dc.w make_block_tile_2p(4,1,0,0,0)
- dc.w -8
+ spritePiece -8, -8, 2, 2, 4, 1, 0, 0, 0
.frame5:
- dc.b -8
- dc.b 5
- dc.w make_block_tile(10,0,0,0,0)
- dc.w make_block_tile_2p(10,0,0,0,0)
- dc.w -8
+ spritePiece -8, -8, 2, 2, $A, 0, 0, 0, 0
.frame6:
- dc.b -8
- dc.b 5
- dc.w make_block_tile(10,1,1,0,0)
- dc.w make_block_tile_2p(10,1,1,0,0)
- dc.w -8
+ spritePiece -8, -8, 2, 2, $A, 1, 1, 0, 0
.frame7:
- dc.b -8
- dc.b 5
- dc.w make_block_tile(10,1,0,0,0)
- dc.w make_block_tile_2p(10,1,0,0,0)
- dc.w -8
+ spritePiece -8, -8, 2, 2, $A, 1, 0, 0, 0
.frame8:
- dc.b -8
- dc.b 5
- dc.w make_block_tile(10,0,1,0,0)
- dc.w make_block_tile_2p(10,0,1,0,0)
- dc.w -8
+ spritePiece -8, -8, 2, 2, $A, 0, 1, 0, 0
if ~~removeJmpTos
align 4
@@ -34224,106 +34268,124 @@ byte_1900F:
; ----------------------------------------------------------------------------
; Primary sprite mappings for springs
; ----------------------------------------------------------------------------
-Obj41_MapUnc_1901C: offsetTable
- offsetTableEntry.w word_19048 ; 0
- offsetTableEntry.w word_1905A ; 1
- offsetTableEntry.w word_19064 ; 2
- offsetTableEntry.w word_19076 ; 3
- offsetTableEntry.w word_19088 ; 4
- offsetTableEntry.w word_19092 ; 5
- offsetTableEntry.w word_190A4 ; 6
- offsetTableEntry.w word_190B6 ; 7
- offsetTableEntry.w word_190D8 ; 8
- offsetTableEntry.w word_190F2 ; 9
- offsetTableEntry.w word_19114 ; $A
+Obj41_MapUnc_1901C: mappingsTable
+ mappingsTableEntry.w word_19048
+ mappingsTableEntry.w word_1905A
+ mappingsTableEntry.w word_19064
+ mappingsTableEntry.w word_19076
+ mappingsTableEntry.w word_19088
+ mappingsTableEntry.w word_19092
+ mappingsTableEntry.w word_190A4
+ mappingsTableEntry.w word_190B6
+ mappingsTableEntry.w word_190D8
+ mappingsTableEntry.w word_190F2
+ mappingsTableEntry.w word_19114
; -------------------------------------------------------------------------------
; Secondary sprite mappings for springs
; merged with the above mappings; can't split to file in a useful way...
; -------------------------------------------------------------------------------
-Obj41_MapUnc_19032: offsetTable
- offsetTableEntry.w word_19048 ; 0
- offsetTableEntry.w word_1905A ; 1
- offsetTableEntry.w word_19064 ; 2
- offsetTableEntry.w word_19076 ; 3
- offsetTableEntry.w word_19088 ; 4
- offsetTableEntry.w word_19092 ; 5
- offsetTableEntry.w word_190A4 ; 6
- offsetTableEntry.w word_19136 ; 7
- offsetTableEntry.w word_19158 ; 8
- offsetTableEntry.w word_19172 ; 9
- offsetTableEntry.w word_19194 ; $A
-word_19048:
- dc.w 2
- dc.w $F00D, 0, 0,$FFF0
- dc.w 5, 8, 4,$FFF8; 4
-word_1905A:
- dc.w 1
- dc.w $F80D, 0, 0,$FFF0
-word_19064:
- dc.w 2
- dc.w $E00D, 0, 0,$FFF0
- dc.w $F007, $C, 6,$FFF8; 4
-word_19076:
- dc.w 2
- dc.w $F003, 0, 0, 0
- dc.w $F801, 4, 2,$FFF8; 4
-word_19088:
- dc.w 1
- dc.w $F003, 0, 0,$FFF8
-word_19092:
- dc.w 2
- dc.w $F003, 0, 0, $10
- dc.w $F809, 6, 3,$FFF8; 4
-word_190A4:
- dc.w 2
- dc.w $D,$1000,$1000,$FFF0
- dc.w $F005,$1008,$1004,$FFF8; 4
-word_190B6:
- dc.w 4
- dc.w $F00D, 0, 0,$FFF0
- dc.w 5, 8, 4, 0; 4
- dc.w $FB05, $C, 6,$FFF6; 8
- dc.w 5,$201C,$200E,$FFF0; 12
-word_190D8:
- dc.w 3
- dc.w $F60D, 0, 0,$FFEA
- dc.w $605, 8, 4,$FFFA; 4
- dc.w 5,$201C,$200E,$FFF0; 8
-word_190F2:
- dc.w 4
- dc.w $E60D, 0, 0,$FFFB
- dc.w $F605, 8, 4, $B; 4
- dc.w $F30B, $10, 8,$FFF6; 8
- dc.w 5,$201C,$200E,$FFF0; 12
-word_19114:
- dc.w 4
- dc.w $D,$1000,$1000,$FFF0
- dc.w $F005,$1008,$1004, 0; 4
- dc.w $F505,$100C,$1006,$FFF6; 8
- dc.w $F005,$301C,$300E,$FFF0; 12
-word_19136:
- dc.w 4
- dc.w $F00D, 0, 0,$FFF0
- dc.w 5, 8, 4, 0; 4
- dc.w $FB05, $C, 6,$FFF6; 8
- dc.w 5, $1C, $E,$FFF0; 12
-word_19158:
- dc.w 3
- dc.w $F60D, 0, 0,$FFEA
- dc.w $605, 8, 4,$FFFA; 4
- dc.w 5, $1C, $E,$FFF0; 8
-word_19172:
- dc.w 4
- dc.w $E60D, 0, 0,$FFFB
- dc.w $F605, 8, 4, $B; 4
- dc.w $F30B, $10, 8,$FFF6; 8
- dc.w 5, $1C, $E,$FFF0; 12
-word_19194:
- dc.w 4
- dc.w $D,$1000,$1000,$FFF0
- dc.w $F005,$1008,$1004, 0; 4
- dc.w $F505,$100C,$1006,$FFF6; 8
- dc.w $F005,$101C,$100E,$FFF0; 12
+Obj41_MapUnc_19032: mappingsTable
+ mappingsTableEntry.w word_19048
+ mappingsTableEntry.w word_1905A
+ mappingsTableEntry.w word_19064
+ mappingsTableEntry.w word_19076
+ mappingsTableEntry.w word_19088
+ mappingsTableEntry.w word_19092
+ mappingsTableEntry.w word_190A4
+ mappingsTableEntry.w word_19136
+ mappingsTableEntry.w word_19158
+ mappingsTableEntry.w word_19172
+ mappingsTableEntry.w word_19194
+
+word_19048: spriteHeader
+ spritePiece -$10, -$10, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -8, 0, 2, 2, 8, 0, 0, 0, 0
+word_19048_End
+
+word_1905A: spriteHeader
+ spritePiece -$10, -8, 4, 2, 0, 0, 0, 0, 0
+word_1905A_End
+
+word_19064: spriteHeader
+ spritePiece -$10, -$20, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -8, -$10, 2, 4, $C, 0, 0, 0, 0
+word_19064_End
+
+word_19076: spriteHeader
+ spritePiece 0, -$10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -8, -8, 1, 2, 4, 0, 0, 0, 0
+word_19076_End
+
+word_19088: spriteHeader
+ spritePiece -8, -$10, 1, 4, 0, 0, 0, 0, 0
+word_19088_End
+
+word_19092: spriteHeader
+ spritePiece $10, -$10, 1, 4, 0, 0, 0, 0, 0
+ spritePiece -8, -8, 3, 2, 6, 0, 0, 0, 0
+word_19092_End
+
+word_190A4: spriteHeader
+ spritePiece -$10, 0, 4, 2, 0, 0, 1, 0, 0
+ spritePiece -8, -$10, 2, 2, 8, 0, 1, 0, 0
+word_190A4_End
+
+word_190B6: spriteHeader
+ spritePiece -$10, -$10, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, 8, 0, 0, 0, 0
+ spritePiece -$A, -5, 2, 2, $C, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $1C, 0, 0, 1, 0
+word_190B6_End
+
+word_190D8: spriteHeader
+ spritePiece -$16, -$A, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -6, 6, 2, 2, 8, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $1C, 0, 0, 1, 0
+word_190D8_End
+
+word_190F2: spriteHeader
+ spritePiece -5, -$1A, 4, 2, 0, 0, 0, 0, 0
+ spritePiece $B, -$A, 2, 2, 8, 0, 0, 0, 0
+ spritePiece -$A, -$D, 3, 4, $10, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $1C, 0, 0, 1, 0
+word_190F2_End
+
+word_19114: spriteHeader
+ spritePiece -$10, 0, 4, 2, 0, 0, 1, 0, 0
+ spritePiece 0, -$10, 2, 2, 8, 0, 1, 0, 0
+ spritePiece -$A, -$B, 2, 2, $C, 0, 1, 0, 0
+ spritePiece -$10, -$10, 2, 2, $1C, 0, 1, 1, 0
+word_19114_End
+
+word_19136: spriteHeader
+ spritePiece -$10, -$10, 4, 2, 0, 0, 0, 0, 0
+ spritePiece 0, 0, 2, 2, 8, 0, 0, 0, 0
+ spritePiece -$A, -5, 2, 2, $C, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $1C, 0, 0, 0, 0
+word_19136_End
+
+word_19158: spriteHeader
+ spritePiece -$16, -$A, 4, 2, 0, 0, 0, 0, 0
+ spritePiece -6, 6, 2, 2, 8, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $1C, 0, 0, 0, 0
+word_19158_End
+
+word_19172: spriteHeader
+ spritePiece -5, -$1A, 4, 2, 0, 0, 0, 0, 0
+ spritePiece $B, -$A, 2, 2, 8, 0, 0, 0, 0
+ spritePiece -$A, -$D, 3, 4, $10, 0, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $1C, 0, 0, 0, 0
+word_19172_End
+
+word_19194: spriteHeader
+ spritePiece -$10, 0, 4, 2, 0, 0, 1, 0, 0
+ spritePiece 0, -$10, 2, 2, 8, 0, 1, 0, 0
+ spritePiece -$A, -$B, 2, 2, $C, 0, 1, 0, 0
+ spritePiece -$10, -$10, 2, 2, $1C, 0, 1, 0, 0
+word_19194_End
+
+ even
+
; ===========================================================================
if gameRevision<2
@@ -34701,16 +34763,16 @@ byte_195BA: dc.b $0F, $01, $FF
; sprite mappings - Primary sprite table for object 0D (signpost)
; -------------------------------------------------------------------------------
; SprTbl_0D_Primary:
-Obj0D_MapUnc_195BE: BINCLUDE "mappings/sprite/obj0D_a.bin"
+Obj0D_MapUnc_195BE: include "mappings/sprite/obj0D_a.asm"
; -------------------------------------------------------------------------------
; sprite mappings - Secondary sprite table for object 0D (signpost)
; -------------------------------------------------------------------------------
; SprTbl_0D_Scndary:
-Obj0D_MapUnc_19656: BINCLUDE "mappings/sprite/obj0D_b.bin"
+Obj0D_MapUnc_19656: include "mappings/sprite/obj0D_b.asm"
; -------------------------------------------------------------------------------
; dynamic pattern loading cues
; -------------------------------------------------------------------------------
-Obj0D_MapRUnc_196EE: BINCLUDE "mappings/spriteDPLC/obj0D.bin"
+Obj0D_MapRUnc_196EE: include "mappings/spriteDPLC/obj0D.asm"
; ===========================================================================
if gameRevision<2
@@ -42202,11 +42264,11 @@ Ani_obj38: offsetTable
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj38_MapUnc_1DBE4: BINCLUDE "mappings/sprite/obj38.bin"
+Obj38_MapUnc_1DBE4: include "mappings/sprite/obj38.asm"
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj35_MapUnc_1DCBC: BINCLUDE "mappings/sprite/obj35.bin"
+Obj35_MapUnc_1DCBC: include "mappings/sprite/obj35.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
@@ -42417,11 +42479,11 @@ Obj08Ani_Skid: dc.b 3,$11,$12,$13,$14,$FC
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj08_MapUnc_1DF5E: BINCLUDE "mappings/sprite/obj08.bin"
+Obj08_MapUnc_1DF5E: include "mappings/sprite/obj08.asm"
; -------------------------------------------------------------------------------
; dynamic pattern loading cues
; -------------------------------------------------------------------------------
-Obj08_MapRUnc_1E074: BINCLUDE "mappings/spriteDPLC/obj08.bin"
+Obj08_MapRUnc_1E074: include "mappings/spriteDPLC/obj08.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object 7E - Super Sonic's stars
@@ -42503,7 +42565,7 @@ JmpTo8_DeleteObject ; JmpTo
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj7E_MapUnc_1E1BE: BINCLUDE "mappings/sprite/obj7E.bin"
+Obj7E_MapUnc_1E1BE: include "mappings/sprite/obj7E.asm"
; ===========================================================================
if gameRevision<2
@@ -44350,11 +44412,11 @@ byte_1F420:
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj79_MapUnc_1F424: BINCLUDE "mappings/sprite/obj79_a.bin"
+Obj79_MapUnc_1F424: include "mappings/sprite/obj79_a.asm"
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj79_MapUnc_1F4A0: BINCLUDE "mappings/sprite/obj79_b.bin"
+Obj79_MapUnc_1F4A0: include "mappings/sprite/obj79_b.asm"
; ===========================================================================
; loc_1F4C4:
@@ -44592,7 +44654,7 @@ JmpTo12_DeleteObject ; JmpTo
; -------------------------------------------------------------------------------
; Unused sprite mappings
; -------------------------------------------------------------------------------
-Obj7D_MapUnc_1F6FE: BINCLUDE "mappings/sprite/obj7D.bin"
+Obj7D_MapUnc_1F6FE: include "mappings/sprite/obj7D.asm"
; ===========================================================================
if gameRevision<2
@@ -44716,7 +44778,7 @@ byte_1F853: dc.b 3, 1, 0, 1,$FD, 0
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj44_MapUnc_1F85A: BINCLUDE "mappings/sprite/obj44.bin"
+Obj44_MapUnc_1F85A: include "mappings/sprite/obj44.asm"
; ===========================================================================
if gameRevision<2
@@ -45055,84 +45117,99 @@ byte_1FBF2: dc.b $F, $E, $F,$FF
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj24_MapUnc_1FBF6: offsetTable
- offsetTableEntry.w word_1FC3A ; 0
- offsetTableEntry.w word_1FC44 ; 1
- offsetTableEntry.w word_1FC44 ; 2
- offsetTableEntry.w word_1FC4E ; 3
- offsetTableEntry.w word_1FC58 ; 4
- offsetTableEntry.w word_1FC62 ; 5
- offsetTableEntry.w word_1FC6C ; 6
- offsetTableEntry.w word_1FC76 ; 7
- offsetTableEntry.w word_1FC98 ; 8
- offsetTableEntry.w word_1FC98 ; 9
- offsetTableEntry.w word_1FC98 ; $A
- offsetTableEntry.w word_1FC98 ; $B
- offsetTableEntry.w word_1FC98 ; $C
- offsetTableEntry.w word_1FC98 ; $D
- offsetTableEntry.w word_1FCA2 ; $E
- offsetTableEntry.w word_1FCAC ; $F
- offsetTableEntry.w word_1FCB6 ; $10
+Obj24_MapUnc_1FBF6: mappingsTable
+ mappingsTableEntry.w word_1FC3A
+ mappingsTableEntry.w word_1FC44
+ mappingsTableEntry.w word_1FC44
+ mappingsTableEntry.w word_1FC4E
+ mappingsTableEntry.w word_1FC58
+ mappingsTableEntry.w word_1FC62
+ mappingsTableEntry.w word_1FC6C
+ mappingsTableEntry.w word_1FC76
+ mappingsTableEntry.w word_1FC98
+ mappingsTableEntry.w word_1FC98
+ mappingsTableEntry.w word_1FC98
+ mappingsTableEntry.w word_1FC98
+ mappingsTableEntry.w word_1FC98
+ mappingsTableEntry.w word_1FC98
+ mappingsTableEntry.w word_1FCA2
+ mappingsTableEntry.w word_1FCAC
+ mappingsTableEntry.w word_1FCB6
; -------------------------------------------------------------------------------
; sprite mappings
; merged with the above mappings, can't split to file in a useful way...
; -------------------------------------------------------------------------------
-Obj24_MapUnc_1FC18: offsetTable
- offsetTableEntry.w word_1FC3A ; 0
- offsetTableEntry.w word_1FC44 ; 1
- offsetTableEntry.w word_1FC44 ; 2
- offsetTableEntry.w word_1FC4E ; 3
- offsetTableEntry.w word_1FC58 ; 4
- offsetTableEntry.w word_1FC62 ; 5
- offsetTableEntry.w word_1FC6C ; 6
- offsetTableEntry.w word_1FC76 ; 7
- offsetTableEntry.w word_1FCB8 ; 8
- offsetTableEntry.w word_1FCB8 ; 9
- offsetTableEntry.w word_1FCB8 ; $A
- offsetTableEntry.w word_1FCB8 ; $B
- offsetTableEntry.w word_1FCB8 ; $C
- offsetTableEntry.w word_1FCB8 ; $D
- offsetTableEntry.w word_1FCA2 ; $E
- offsetTableEntry.w word_1FCAC ; $F
- offsetTableEntry.w word_1FCB6 ; $10
-word_1FC3A:
- dc.w 1
- dc.w $FC00, $008D, $0046, $FFFC
-word_1FC44:
- dc.w 1
- dc.w $FC00, $008E, $0047, $FFFC
-word_1FC4E:
- dc.w 1
- dc.w $F805, $008F, $0047, $FFF8
-word_1FC58:
- dc.w 1
- dc.w $F805, $0093, $0049, $FFF8
-word_1FC62:
- dc.w 1
- dc.w $F40A, $001C, $000E, $FFF4
-word_1FC6C:
- dc.w 1
- dc.w $F00F, $0008, $0004, $FFF0
-word_1FC76:
- dc.w 4
- dc.w $F005, $0018, $000C, $FFF0
- dc.w $F005, $0818, $080C, $0000
- dc.w $0005, $1018, $100C, $FFF0
- dc.w $0005, $1818, $180C, $0000
-word_1FC98:
- dc.w 1
- dc.w $F406, $1F41, $1BA0, $FFF8
-word_1FCA2:
- dc.w 1
- dc.w $F805, $0000, $0000, $FFF8
-word_1FCAC:
- dc.w 1
- dc.w $F805, $0004, $0002, $FFF8
-word_1FCB6:
- dc.w 0
-word_1FCB8:
- dc.w 1
- dc.w $F406, $1F31, $1B98, $FFF8
+Obj24_MapUnc_1FC18: mappingsTable
+ mappingsTableEntry.w word_1FC3A
+ mappingsTableEntry.w word_1FC44
+ mappingsTableEntry.w word_1FC44
+ mappingsTableEntry.w word_1FC4E
+ mappingsTableEntry.w word_1FC58
+ mappingsTableEntry.w word_1FC62
+ mappingsTableEntry.w word_1FC6C
+ mappingsTableEntry.w word_1FC76
+ mappingsTableEntry.w word_1FCB8
+ mappingsTableEntry.w word_1FCB8
+ mappingsTableEntry.w word_1FCB8
+ mappingsTableEntry.w word_1FCB8
+ mappingsTableEntry.w word_1FCB8
+ mappingsTableEntry.w word_1FCB8
+ mappingsTableEntry.w word_1FCA2
+ mappingsTableEntry.w word_1FCAC
+ mappingsTableEntry.w word_1FCB6
+
+word_1FC3A: spriteHeader
+ spritePiece -4, -4, 1, 1, $8D, 0, 0, 0, 0
+word_1FC3A_End
+
+word_1FC44: spriteHeader
+ spritePiece -4, -4, 1, 1, $8E, 0, 0, 0, 0
+word_1FC44_End
+
+word_1FC4E: spriteHeader
+ spritePiece -8, -8, 2, 2, $8F, 0, 0, 0, 0
+word_1FC4E_End
+
+word_1FC58: spriteHeader
+ spritePiece -8, -8, 2, 2, $93, 0, 0, 0, 0
+word_1FC58_End
+
+word_1FC62: spriteHeader
+ spritePiece -$C, -$C, 3, 3, $1C, 0, 0, 0, 0
+word_1FC62_End
+
+word_1FC6C: spriteHeader
+ spritePiece -$10, -$10, 4, 4, 8, 0, 0, 0, 0
+word_1FC6C_End
+
+word_1FC76: spriteHeader
+ spritePiece -$10, -$10, 2, 2, $18, 0, 0, 0, 0
+ spritePiece 0, -$10, 2, 2, $18, 1, 0, 0, 0
+ spritePiece -$10, 0, 2, 2, $18, 0, 1, 0, 0
+ spritePiece 0, 0, 2, 2, $18, 1, 1, 0, 0
+word_1FC76_End
+
+word_1FC98: spriteHeader
+ spritePiece -8, -$C, 2, 3, $741, 1, 1, 0, 0
+word_1FC98_End
+
+word_1FCA2: spriteHeader
+ spritePiece -8, -8, 2, 2, 0, 0, 0, 0, 0
+word_1FCA2_End
+
+word_1FCAC: spriteHeader
+ spritePiece -8, -8, 2, 2, 4, 0, 0, 0, 0
+word_1FCAC_End
+
+word_1FCB6: spriteHeader
+word_1FCB6_End
+
+word_1FCB8: spriteHeader
+ spritePiece -8, -$C, 2, 3, $731, 1, 1, 0, 0
+word_1FCB8_End
+
+ even
+
; ===========================================================================
if gameRevision<2
@@ -45397,7 +45474,7 @@ return_1FFB6:
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj03_MapUnc_1FFB8: BINCLUDE "mappings/sprite/obj03.bin"
+Obj03_MapUnc_1FFB8: include "mappings/sprite/obj03.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -45516,7 +45593,7 @@ byte_20198:
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj0B_MapUnc_201A0: BINCLUDE "mappings/sprite/obj0B.bin"
+Obj0B_MapUnc_201A0: include "mappings/sprite/obj0B.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -45626,7 +45703,7 @@ loc_202E6:
; ----------------------------------------------------------------------------
; Unused sprite mappings
; ----------------------------------------------------------------------------
-Obj0C_MapUnc_202FA: BINCLUDE "mappings/sprite/obj0C.bin"
+Obj0C_MapUnc_202FA: include "mappings/sprite/obj0C.asm"
; ===========================================================================
if gameRevision<2
@@ -45689,7 +45766,7 @@ Obj12_Main:
; -------------------------------------------------------------------------------
; sprite mappings (unused)
; -------------------------------------------------------------------------------
-Obj12_MapUnc_20382: BINCLUDE "mappings/sprite/obj12.bin"
+Obj12_MapUnc_20382: include "mappings/sprite/obj12.asm"
; ===========================================================================
if gameRevision<2
@@ -45843,7 +45920,7 @@ Obj13_ChkDel:
; -------------------------------------------------------------------------------
; sprite mappings (unused)
; -------------------------------------------------------------------------------
-Obj13_MapUnc_20528: BINCLUDE "mappings/sprite/obj13.bin"
+Obj13_MapUnc_20528: include "mappings/sprite/obj13.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -45976,11 +46053,11 @@ BranchTo_JmpTo10_DisplaySprite ; BranchTo
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj04_MapUnc_20A0E: BINCLUDE "mappings/sprite/obj04_a.bin"
+Obj04_MapUnc_20A0E: include "mappings/sprite/obj04_a.asm"
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj04_MapUnc_20AFE: BINCLUDE "mappings/sprite/obj04_b.bin"
+Obj04_MapUnc_20AFE: include "mappings/sprite/obj04_b.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object 49 - Waterfall from EHZ
@@ -46050,7 +46127,7 @@ Obj49_Display:
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj49_MapUnc_20C50: BINCLUDE "mappings/sprite/obj49.bin"
+Obj49_MapUnc_20C50: include "mappings/sprite/obj49.asm"
@@ -46127,12 +46204,12 @@ Obj31_Main:
; -------------------------------------------------------------------------------
; sprite non-mappings
; -------------------------------------------------------------------------------
-Obj31_MapUnc_20E6C: BINCLUDE "mappings/sprite/obj31_a.bin"
+Obj31_MapUnc_20E6C: include "mappings/sprite/obj31_a.asm"
endif
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj31_MapUnc_20E74: BINCLUDE "mappings/sprite/obj31_b.bin"
+Obj31_MapUnc_20E74: include "mappings/sprite/obj31_b.asm"
; ===========================================================================
@@ -46202,7 +46279,7 @@ Obj74_Main:
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj74_MapUnc_20F66: BINCLUDE "mappings/sprite/obj74.bin"
+Obj74_MapUnc_20F66: include "mappings/sprite/obj74.asm"
@@ -46257,7 +46334,7 @@ Obj7C_Main:
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj7C_MapUnc_2103C: BINCLUDE "mappings/sprite/obj7C.bin"
+Obj7C_MapUnc_2103C: include "mappings/sprite/obj7C.asm"
@@ -46318,7 +46395,7 @@ Obj27_Main:
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj27_MapUnc_21120: BINCLUDE "mappings/sprite/obj27.bin"
+Obj27_MapUnc_21120: include "mappings/sprite/obj27.asm"
@@ -47374,11 +47451,11 @@ byte_21CBF:
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj14_MapUnc_21CF0: BINCLUDE "mappings/sprite/obj14_a.bin"
+Obj14_MapUnc_21CF0: include "mappings/sprite/obj14_a.asm"
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj14_MapUnc_21D7C: BINCLUDE "mappings/sprite/obj14_b.bin"
+Obj14_MapUnc_21D7C: include "mappings/sprite/obj14_b.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -47522,7 +47599,7 @@ Obj16_Fall:
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj16_MapUnc_21F14: BINCLUDE "mappings/sprite/obj16.bin"
+Obj16_MapUnc_21F14: include "mappings/sprite/obj16.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -47789,7 +47866,7 @@ Obj19_MoveRoutine8:
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj19_MapUnc_2222A: BINCLUDE "mappings/sprite/obj19.bin"
+Obj19_MapUnc_2222A: include "mappings/sprite/obj19.asm"
; ===========================================================================
if gameRevision<2
@@ -47931,7 +48008,7 @@ Obj1B_GiveBoost_Done:
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj1B_MapUnc_223E2: BINCLUDE "mappings/sprite/obj1B.bin"
+Obj1B_MapUnc_223E2: include "mappings/sprite/obj1B.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -48082,7 +48159,7 @@ BranchTo3_JmpTo7_MarkObjGone
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj1D_MapUnc_22576: BINCLUDE "mappings/sprite/obj1D.bin"
+Obj1D_MapUnc_22576: include "mappings/sprite/obj1D.asm"
; ===========================================================================
if gameRevision<2
@@ -48745,11 +48822,11 @@ byte_23246: dc.b 5, 4, 5, 2, 3, 0, 1, 0, 1, 2, 3, 4, 5,$FC
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj20_MapUnc_23254: BINCLUDE "mappings/sprite/obj20_a.bin"
+Obj20_MapUnc_23254: include "mappings/sprite/obj20_a.asm"
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj20_MapUnc_23294: BINCLUDE "mappings/sprite/obj20_b.bin"
+Obj20_MapUnc_23294: include "mappings/sprite/obj20_b.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -49177,15 +49254,15 @@ SmashableObject_ScoreBonus:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj2F_MapUnc_236FA: BINCLUDE "mappings/sprite/obj2F.bin"
+Obj2F_MapUnc_236FA: include "mappings/sprite/obj2F.asm"
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj32_MapUnc_23852: BINCLUDE "mappings/sprite/obj32_a.bin"
+Obj32_MapUnc_23852: include "mappings/sprite/obj32_a.asm"
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj32_MapUnc_23886: BINCLUDE "mappings/sprite/obj32_b.bin"
+Obj32_MapUnc_23886: include "mappings/sprite/obj32_b.asm"
; ===========================================================================
if gameRevision<2
@@ -49635,11 +49712,11 @@ Ani_obj33: offsetTable
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj33_MapUnc_23DDC: BINCLUDE "mappings/sprite/obj33_a.bin"
+Obj33_MapUnc_23DDC: include "mappings/sprite/obj33_a.asm"
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj33_MapUnc_23DF0: BINCLUDE "mappings/sprite/obj33_b.bin"
+Obj33_MapUnc_23DF0: include "mappings/sprite/obj33_b.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -49833,7 +49910,7 @@ return_23FDE:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj43_MapUnc_23FE0: BINCLUDE "mappings/sprite/obj43.bin"
+Obj43_MapUnc_23FE0: include "mappings/sprite/obj43.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -50379,7 +50456,7 @@ byte_244F8:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj45_MapUnc_2451A: BINCLUDE "mappings/sprite/obj45.bin"
+Obj45_MapUnc_2451A: include "mappings/sprite/obj45.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object 46 - Ball from OOZ (unused, beta leftover)
@@ -50590,7 +50667,7 @@ loc_24C32:
; ----------------------------------------------------------------------------
; Unused sprite mappings
; ----------------------------------------------------------------------------
-Obj46_MapUnc_24C52: BINCLUDE "mappings/sprite/obj46.bin"
+Obj46_MapUnc_24C52: include "mappings/sprite/obj46.asm"
; ===========================================================================
if gameRevision<2
@@ -50689,7 +50766,7 @@ BranchTo_JmpTo12_MarkObjGone ; BranchTo
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj47_MapUnc_24D96: BINCLUDE "mappings/sprite/obj47.bin"
+Obj47_MapUnc_24D96: include "mappings/sprite/obj47.asm"
; ===========================================================================
if gameRevision<2
@@ -50985,7 +51062,7 @@ word_2507A:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj3D_MapUnc_250BA: BINCLUDE "mappings/sprite/obj3D.bin"
+Obj3D_MapUnc_250BA: include "mappings/sprite/obj3D.asm"
; ===========================================================================
if gameRevision<2
@@ -51297,7 +51374,7 @@ loc_254F2:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj48_MapUnc_254FE: BINCLUDE "mappings/sprite/obj48.bin"
+Obj48_MapUnc_254FE: include "mappings/sprite/obj48.asm"
; ===========================================================================
if gameRevision<2
@@ -51457,7 +51534,7 @@ byte_257FB: dc.b 7, 3, 4,$FC, 4, 3, 1,$FD, 0
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj22_MapUnc_25804: BINCLUDE "mappings/sprite/obj22.bin"
+Obj22_MapUnc_25804: include "mappings/sprite/obj22.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -51620,7 +51697,7 @@ loc_259B8:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj23_MapUnc_259E6: BINCLUDE "mappings/sprite/obj23.bin"
+Obj23_MapUnc_259E6: include "mappings/sprite/obj23.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object 2B - Rising pillar from ARZ
@@ -51831,7 +51908,7 @@ loc_25C64:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj2B_MapUnc_25C6E: BINCLUDE "mappings/sprite/obj2B.bin"
+Obj2B_MapUnc_25C6E: include "mappings/sprite/obj2B.asm"
; ===========================================================================
if gameRevision<2
@@ -52074,7 +52151,7 @@ JmpTo29_DeleteObject ; JmpTo
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj2C_MapUnc_2631E: BINCLUDE "mappings/sprite/obj2C.bin"
+Obj2C_MapUnc_2631E: include "mappings/sprite/obj2C.asm"
; ===========================================================================
if gameRevision<2
@@ -52310,7 +52387,7 @@ byte_265EF: dc.b 3, 1, 0,$FD, 0
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj40_MapUnc_265F4: BINCLUDE "mappings/sprite/obj40.bin"
+Obj40_MapUnc_265F4: include "mappings/sprite/obj40.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -52523,7 +52600,7 @@ JmpTo30_DeleteObject ; JmpTo
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj42_MapUnc_2686C: BINCLUDE "mappings/sprite/obj42.bin"
+Obj42_MapUnc_2686C: include "mappings/sprite/obj42.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -52684,7 +52761,7 @@ loc_26A50:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj64_MapUnc_26A5C: BINCLUDE "mappings/sprite/obj64.bin"
+Obj64_MapUnc_26A5C: include "mappings/sprite/obj64.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -53102,11 +53179,11 @@ loc_26EC2:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj65_Obj6A_Obj6B_MapUnc_26EC8: BINCLUDE "mappings/sprite/obj65_a.bin"
+Obj65_Obj6A_Obj6B_MapUnc_26EC8: include "mappings/sprite/obj65_a.asm"
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj65_MapUnc_26F04: BINCLUDE "mappings/sprite/obj65_b.bin"
+Obj65_MapUnc_26F04: include "mappings/sprite/obj65_b.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -53293,7 +53370,7 @@ loc_270DC:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj66_MapUnc_27120: BINCLUDE "mappings/sprite/obj66.bin"
+Obj66_MapUnc_27120: include "mappings/sprite/obj66.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -53588,7 +53665,7 @@ byte_27535:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj67_MapUnc_27548: BINCLUDE "mappings/sprite/obj67.bin"
+Obj67_MapUnc_27548: include "mappings/sprite/obj67.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -53780,7 +53857,7 @@ Obj68_CollisionFlags:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj68_Obj6D_MapUnc_27750: BINCLUDE "mappings/sprite/obj68.bin"
+Obj68_Obj6D_MapUnc_27750: include "mappings/sprite/obj68.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object 6D - Floor spike from MTZ
@@ -54054,7 +54131,7 @@ loc_279FC:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj69_MapUnc_27A26: BINCLUDE "mappings/sprite/obj69.bin"
+Obj69_MapUnc_27A26: include "mappings/sprite/obj69.asm"
; ===========================================================================
if gameRevision<2
@@ -54278,7 +54355,7 @@ byte_27D12:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj6A_MapUnc_27D30: BINCLUDE "mappings/sprite/obj6A.bin"
+Obj6A_MapUnc_27D30: include "mappings/sprite/obj6A.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -54599,7 +54676,7 @@ loc_27FF8:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj6B_MapUnc_2800E: BINCLUDE "mappings/sprite/obj6B.bin"
+Obj6B_MapUnc_2800E: include "mappings/sprite/obj6B.asm"
; ===========================================================================
if gameRevision<2
@@ -54877,7 +54954,7 @@ byte_28340:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj6C_MapUnc_28372: BINCLUDE "mappings/sprite/obj6C.bin"
+Obj6C_MapUnc_28372: include "mappings/sprite/obj6C.asm"
; ===========================================================================
if gameRevision<2
@@ -55050,7 +55127,7 @@ loc_284BC:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj6E_MapUnc_2852C: BINCLUDE "mappings/sprite/obj6E.bin"
+Obj6E_MapUnc_2852C: include "mappings/sprite/obj6E.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -55246,7 +55323,7 @@ Obj70_Positions:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj70_MapUnc_28786: BINCLUDE "mappings/sprite/obj70.bin"
+Obj70_MapUnc_28786: include "mappings/sprite/obj70.asm"
; ===========================================================================
if gameRevision<2
@@ -55527,7 +55604,7 @@ Obj73_SubObject:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj73_MapUnc_28B9C: BINCLUDE "mappings/sprite/obj73.bin"
+Obj73_MapUnc_28B9C: include "mappings/sprite/obj73.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -55704,7 +55781,7 @@ loc_28D6C:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj75_MapUnc_28D8A: BINCLUDE "mappings/sprite/obj75.bin"
+Obj75_MapUnc_28D8A: include "mappings/sprite/obj75.asm"
; ===========================================================================
if gameRevision<2
@@ -55865,7 +55942,7 @@ Obj76_SlideOut:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj76_MapUnc_28F3A: BINCLUDE "mappings/sprite/obj76.bin"
+Obj76_MapUnc_28F3A: include "mappings/sprite/obj76.asm"
; ===========================================================================
if gameRevision<2
@@ -55981,7 +56058,7 @@ Ani_obj77_Open:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj77_MapUnc_29064: BINCLUDE "mappings/sprite/obj77.bin"
+Obj77_MapUnc_29064: include "mappings/sprite/obj77.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -56407,7 +56484,7 @@ loc_2953E:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj7A_MapUnc_29564: BINCLUDE "mappings/sprite/obj7A.bin"
+Obj7A_MapUnc_29564: include "mappings/sprite/obj7A.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -56605,7 +56682,7 @@ byte_29777: dc.b 5, 1, 2, 2, 2, 4,$FD, 0
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj7B_MapUnc_29780: BINCLUDE "mappings/sprite/obj7B.bin"
+Obj7B_MapUnc_29780: include "mappings/sprite/obj7B.asm"
; ===========================================================================
if gameRevision<2
@@ -56742,7 +56819,7 @@ return_29936:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj7F_MapUnc_29938: BINCLUDE "mappings/sprite/obj7F.bin"
+Obj7F_MapUnc_29938: include "mappings/sprite/obj7F.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -57025,11 +57102,11 @@ loc_29C42:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj80_MapUnc_29C64: BINCLUDE "mappings/sprite/obj80_a.bin"
+Obj80_MapUnc_29C64: include "mappings/sprite/obj80_a.asm"
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj80_MapUnc_29DD0: BINCLUDE "mappings/sprite/obj80_b.bin"
+Obj80_MapUnc_29DD0: include "mappings/sprite/obj80_b.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -57246,7 +57323,7 @@ return_2A24C:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj81_MapUnc_2A24E: BINCLUDE "mappings/sprite/obj81.bin"
+Obj81_MapUnc_2A24E: include "mappings/sprite/obj81.asm"
; ===========================================================================
if gameRevision<2
@@ -57502,7 +57579,7 @@ return_2A474:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj82_MapUnc_2A476: BINCLUDE "mappings/sprite/obj82.bin"
+Obj82_MapUnc_2A476: include "mappings/sprite/obj82.asm"
; ===========================================================================
if gameRevision<2
@@ -58033,9 +58110,9 @@ return_2AA10:
; sprite mappings
; ----------------------------------------------------------------------------
; sidefacing fan
-Obj3F_MapUnc_2AA12: BINCLUDE "mappings/sprite/obj3F_a.bin"
+Obj3F_MapUnc_2AA12: include "mappings/sprite/obj3F_a.asm"
; upfacing fan
-Obj3F_MapUnc_2AAC4: BINCLUDE "mappings/sprite/obj3F_b.bin"
+Obj3F_MapUnc_2AAC4: include "mappings/sprite/obj3F_b.asm"
; ===========================================================================
if gameRevision<2
@@ -58473,8 +58550,8 @@ loc_2B068:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj85_MapUnc_2B07E: BINCLUDE "mappings/sprite/obj85_a.bin"
-Obj85_MapUnc_2B0EC: BINCLUDE "mappings/sprite/obj85_b.bin"
+Obj85_MapUnc_2B07E: include "mappings/sprite/obj85_a.asm"
+Obj85_MapUnc_2B0EC: include "mappings/sprite/obj85_b.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -58756,7 +58833,7 @@ byte_2B451: dc.b 0, 3, 4, 5, 5, 5, 5,$FD, 2
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj86_MapUnc_2B45A: BINCLUDE "mappings/sprite/obj86.bin"
+Obj86_MapUnc_2B45A: include "mappings/sprite/obj86.asm"
; ===========================================================================
if gameRevision<2
@@ -58903,7 +58980,7 @@ byte_2B654:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjD2_MapUnc_2B694: BINCLUDE "mappings/sprite/objD2.bin"
+ObjD2_MapUnc_2B694: include "mappings/sprite/objD2.asm"
; ===========================================================================
if gameRevision<2
@@ -58986,7 +59063,7 @@ JmpTo28_DisplaySprite ; JmpTo
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjD3_MapUnc_2B8D4: BINCLUDE "mappings/sprite/objD6_a.bin"
+ObjD3_MapUnc_2B8D4: include "mappings/sprite/objD6_a.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -59090,7 +59167,7 @@ ObjD4_Vertical:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjD4_MapUnc_2B9CA: BINCLUDE "mappings/sprite/objD4.bin"
+ObjD4_MapUnc_2B9CA: include "mappings/sprite/objD4.asm"
; ===========================================================================
if gameRevision<2
@@ -59241,7 +59318,7 @@ loc_2BB08:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjD5_MapUnc_2BB40: BINCLUDE "mappings/sprite/objD5.bin"
+ObjD5_MapUnc_2BB40: include "mappings/sprite/objD5.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -59526,7 +59603,7 @@ byte_2BEB7: dc.b 1, 1, 0,$FF
; ------------------------------------------------------------------------------
; sprite mappings
; ------------------------------------------------------------------------------
-ObjD6_MapUnc_2BEBC: BINCLUDE "mappings/sprite/objD6_b.bin"
+ObjD6_MapUnc_2BEBC: include "mappings/sprite/objD6_b.asm"
; ===========================================================================
@@ -60283,7 +60360,7 @@ byte_2C61F: dc.b 3, 2, 0, 2,$FD, 0
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjD7_MapUnc_2C626: BINCLUDE "mappings/sprite/objD7.bin"
+ObjD7_MapUnc_2C626: include "mappings/sprite/objD7.asm"
; ===========================================================================
if gameRevision<2
@@ -60527,7 +60604,7 @@ byte_2C8BD: dc.b 3, 5, 2, 5,$FD, 2
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjD8_MapUnc_2C8C4: BINCLUDE "mappings/sprite/objD8.bin"
+ObjD8_MapUnc_2C8C4: include "mappings/sprite/objD8.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -60841,7 +60918,7 @@ byte_2CBF8: dc.b 7, 0, 1,$FD, 1
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj4A_MapUnc_2CBFE: BINCLUDE "mappings/sprite/obj4A.bin"
+Obj4A_MapUnc_2CBFE: include "mappings/sprite/obj4A.asm"
if ~~removeJmpTos
align 4
@@ -61145,7 +61222,7 @@ byte_2CF90: dc.b $E, 8,$FF
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj50_MapUnc_2CF94: BINCLUDE "mappings/sprite/obj50.bin"
+Obj50_MapUnc_2CF94: include "mappings/sprite/obj50.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -61426,7 +61503,7 @@ byte_2D2E1: dc.b $09, $01, $01, $01, $01, $01, $FD, $00
; sprite mappings -- Buzz Bomber Sprite Table
; ----------------------------------------------------------------------------
; MapUnc_2D2EA: SprTbl_Buzzer:
-Obj4B_MapUnc_2D2EA: BINCLUDE "mappings/sprite/obj4B.bin"
+Obj4B_MapUnc_2D2EA: include "mappings/sprite/obj4B.asm"
if ~~removeJmpTos
align 4
@@ -61531,7 +61608,7 @@ byte_2D43E: dc.b 7, 0,$FF
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj5C_MapUnc_2D442: BINCLUDE "mappings/sprite/obj5C.bin"
+Obj5C_MapUnc_2D442: include "mappings/sprite/obj5C.asm"
if ~~removeJmpTos
align 4
@@ -61607,7 +61684,7 @@ JmpTo50_DeleteObject ; JmpTo
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj58_MapUnc_2D50A: BINCLUDE "mappings/sprite/obj58.bin"
+Obj58_MapUnc_2D50A: include "mappings/sprite/obj58.asm"
; ===========================================================================
; Unused - a little dead code here (until the next label)
@@ -63561,7 +63638,7 @@ byte_2EAD9: dc.b $F,$1E,$FF
; ----------------------------------------------------------------------------
; sprite mappings - uses ArtNem_CPZBoss
; ----------------------------------------------------------------------------
-Obj5D_MapUnc_2EADC: BINCLUDE "mappings/sprite/obj5D_a.bin"
+Obj5D_MapUnc_2EADC: include "mappings/sprite/obj5D_a.asm"
; animation script
; off_2ED5C:
@@ -63585,15 +63662,15 @@ byte_2ED7F: dc.b $F, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,$FD, 1
; ----------------------------------------------------------------------------
; sprite mappings - uses ArtNem_Eggpod
; ----------------------------------------------------------------------------
-Obj5D_MapUnc_2ED8C: BINCLUDE "mappings/sprite/obj5D_b.bin"
+Obj5D_MapUnc_2ED8C: include "mappings/sprite/obj5D_b.asm"
; ----------------------------------------------------------------------------
; sprite mappings - uses ArtNem_EggpodJets
; ----------------------------------------------------------------------------
-Obj5D_MapUnc_2EE88: BINCLUDE "mappings/sprite/obj5D_c.bin"
+Obj5D_MapUnc_2EE88: include "mappings/sprite/obj5D_c.asm"
; ----------------------------------------------------------------------------
; sprite mappings - uses ArtNem_BossSmoke
; ----------------------------------------------------------------------------
-Obj5D_MapUnc_2EEA0: BINCLUDE "mappings/sprite/obj5D_d.bin"
+Obj5D_MapUnc_2EEA0: include "mappings/sprite/obj5D_d.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -64467,7 +64544,7 @@ byte_2F956:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj56_MapUnc_2F970: BINCLUDE "mappings/sprite/obj56_a.bin"
+Obj56_MapUnc_2F970: include "mappings/sprite/obj56_a.asm"
; propeller
; 7 frames
@@ -64490,7 +64567,7 @@ byte_2FA53:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj56_MapUnc_2FA58: BINCLUDE "mappings/sprite/obj56_b.bin"
+Obj56_MapUnc_2FA58: include "mappings/sprite/obj56_b.asm"
; ground vehicle
; frame 0 = vehicle itself
; frame 1-3 = spike
@@ -64519,7 +64596,7 @@ byte_2FAEB: dc.b $F, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,$FD, 1 ; top, when
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj56_MapUnc_2FAF8: BINCLUDE "mappings/sprite/obj56_c.bin"
+Obj56_MapUnc_2FAF8: include "mappings/sprite/obj56_c.asm"
; flying vehicle
; frame 0 = bottom
; frame 1-2 = top, normal
@@ -65129,7 +65206,7 @@ loc_3022A:
; ----------------------------------------------------------------------------
; sprite mappings - uses ArtNem_BossSmoke
; ----------------------------------------------------------------------------
-Obj52_MapUnc_30258: BINCLUDE "mappings/sprite/obj52_a.bin"
+Obj52_MapUnc_30258: include "mappings/sprite/obj52_a.asm"
; animation script
; off_30288:
@@ -65161,7 +65238,7 @@ byte_302B7: dc.b 3, $E, $F,$FF
; ----------------------------------------------------------------------------
; sprite mappings - uses ArtNem_Eggpod + ?
; ----------------------------------------------------------------------------
-Obj52_MapUnc_302BC: BINCLUDE "mappings/sprite/obj52_b.bin"
+Obj52_MapUnc_302BC: include "mappings/sprite/obj52_b.asm"
if ~~removeJmpTos
align 4
@@ -66126,7 +66203,7 @@ byte_30D47: dc.b $F, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj89_MapUnc_30D68: BINCLUDE "mappings/sprite/obj89_a.bin"
+Obj89_MapUnc_30D68: include "mappings/sprite/obj89_a.asm"
; animation script
; off_30DC8:
@@ -66153,7 +66230,7 @@ byte_30E00: dc.b 7, 5,$FF
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj89_MapUnc_30E04: BINCLUDE "mappings/sprite/obj89_b.bin"
+Obj89_MapUnc_30E04: include "mappings/sprite/obj89_b.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -66829,7 +66906,7 @@ byte_316E8: dc.b 7,$12,$FF
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj57_MapUnc_316EC: BINCLUDE "mappings/sprite/obj57.bin"
+Obj57_MapUnc_316EC: include "mappings/sprite/obj57.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -67583,7 +67660,7 @@ byte_320E4: dc.b 1, $F,$10,$11,$FF
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj51_MapUnc_320EA: BINCLUDE "mappings/sprite/obj51.bin"
+Obj51_MapUnc_320EA: include "mappings/sprite/obj51.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -68618,7 +68695,7 @@ byte_32DC3: dc.b 7,$11,$FF
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj54_MapUnc_32DC6: BINCLUDE "mappings/sprite/obj54.bin"
+Obj54_MapUnc_32DC6: include "mappings/sprite/obj54.asm"
if ~~removeJmpTos
align 4
@@ -69450,7 +69527,7 @@ byte_33753:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj55_MapUnc_33756: BINCLUDE "mappings/sprite/obj55.bin"
+Obj55_MapUnc_33756: include "mappings/sprite/obj55.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -70361,11 +70438,11 @@ byte_34208:
; ----------------------------------------------------------------------------
; sprite mappings - uses ArtNem_SpecialSonicAndTails
; ----------------------------------------------------------------------------
-Obj09_MapUnc_34212: BINCLUDE "mappings/sprite/obj09.bin"
+Obj09_MapUnc_34212: include "mappings/sprite/obj09.asm"
; ----------------------------------------------------------------------------
; sprite mappings for special stage shadows
; ----------------------------------------------------------------------------
-Obj63_MapUnc_34492: BINCLUDE "mappings/sprite/obj63.bin"
+Obj63_MapUnc_34492: include "mappings/sprite/obj63.asm"
; ----------------------------------------------------------------------------
; custom dynamic pattern loading cues for special stage Sonic, Tails and
; Tails' tails
@@ -70694,7 +70771,7 @@ byte_34B3A:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj10_MapUnc_34B3E: BINCLUDE "mappings/sprite/obj10.bin"
+Obj10_MapUnc_34B3E: include "mappings/sprite/obj10.asm"
; animation script
; off_34D86:
@@ -70711,7 +70788,7 @@ byte_34D9E: dc.b 3, $E, $F,$10,$11,$12,$13,$14,$FF
; ----------------------------------------------------------------------------
; sprite mappings for Tails' tails in special stage
; ----------------------------------------------------------------------------
-Obj88_MapUnc_34DA8: BINCLUDE "mappings/sprite/obj88.bin"
+Obj88_MapUnc_34DA8: include "mappings/sprite/obj88.asm"
; ===========================================================================
if ~~removeJmpTos
@@ -72339,7 +72416,7 @@ byte_35E19: dc.b 2,$24,$26,$1C,$FF ; RINGS ?? ?? !
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj5A_MapUnc_35E1E: BINCLUDE "mappings/sprite/obj5A.bin"
+Obj5A_MapUnc_35E1E: include "mappings/sprite/obj5A.asm"
; ===========================================================================
loc_35F76:
@@ -72656,7 +72733,7 @@ byte_36257:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj59_MapUnc_3625A: BINCLUDE "mappings/sprite/obj59.bin"
+Obj59_MapUnc_3625A: include "mappings/sprite/obj59.asm"
; animation script:
; off_362D2:
@@ -72697,7 +72774,7 @@ byte_36324: dc.b 1,$1E,$1F,$20,$FF
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj5A_Obj5B_Obj60_MapUnc_3632A: BINCLUDE "mappings/sprite/obj5A_5B_60.bin"
+Obj5A_Obj5B_Obj60_MapUnc_3632A: include "mappings/sprite/obj5A_5B_60.asm"
; animation script:
; off_364CE:
@@ -72738,7 +72815,7 @@ byte_36502: dc.b 2, $A, $B, $C,$FF
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj61_MapUnc_36508: BINCLUDE "mappings/sprite/obj61.bin"
+Obj61_MapUnc_36508: include "mappings/sprite/obj61.asm"
; ===========================================================================
JmpTo44_DisplaySprite ; JmpTo
@@ -73394,7 +73471,7 @@ Ani_obj8C: offsetTable
; ------------------------------------------------------------------------
; sprite mappings
; ------------------------------------------------------------------------
-Obj8C_MapUnc_36A4E: BINCLUDE "mappings/sprite/obj8C.bin"
+Obj8C_MapUnc_36A4E: include "mappings/sprite/obj8C.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object 8D - Grounder in wall, from ARZ
@@ -73690,61 +73767,73 @@ Ani_obj8D_b: offsetTable
; -----------------------------------------------------------------------------
; sprite mappings (obj8D)
; -----------------------------------------------------------------------------
-Obj8D_MapUnc_36CF0: offsetTable
- offsetTableEntry.w word_36D02 ; 0
- offsetTableEntry.w word_36D24 ; 2
- offsetTableEntry.w word_36D46 ; 4
- offsetTableEntry.w word_36D58 ; 6
- offsetTableEntry.w word_36D6A ; 8
+Obj8D_MapUnc_36CF0: mappingsTable
+ mappingsTableEntry.w word_36D02
+ mappingsTableEntry.w word_36D24
+ mappingsTableEntry.w word_36D46
+ mappingsTableEntry.w word_36D58
+ mappingsTableEntry.w word_36D6A
; -----------------------------------------------------------------------------
; sprite mappings (obj90)
; -----------------------------------------------------------------------------
-Obj90_MapUnc_36CFA: offsetTable
- offsetTableEntry.w word_36D7C ; 0
- offsetTableEntry.w word_36D86 ; 2
- offsetTableEntry.w word_36D90 ; 4
+Obj90_MapUnc_36CFA: mappingsTable
+ mappingsTableEntry.w word_36D7C
+ mappingsTableEntry.w word_36D86
+ mappingsTableEntry.w word_36D90
; -----------------------------------------------------------------------------
; sprite mappings (obj90)
; -----------------------------------------------------------------------------
-Obj90_MapUnc_36D00: offsetTable
- offsetTableEntry.w word_36D9A ; 0
-word_36D02:
- dc.w 4
- dc.w $F400, 0, 0,$FFF8
- dc.w $FC06, 1, 0,$FFF0 ; 4
- dc.w $F400, $800, $800, 0 ; 8
- dc.w $FC06, $801, $800, 0 ; 12
-word_36D24:
- dc.w 4
- dc.w $EC00, 7, 3,$FFF8
- dc.w $F407, 8, 4,$FFF0 ; 4
- dc.w $EC00, $807, $803, 0 ; 8
- dc.w $F407, $808, $804, 0 ; 12
-word_36D46:
- dc.w 2
- dc.w $EC0F, $10, 8,$FFF0
- dc.w $C0C, $20, $10,$FFF0 ; 4
-word_36D58:
- dc.w 2
- dc.w $EC0F, $10, 8,$FFF0
- dc.w $C0C, $24, $12,$FFF0 ; 4
-word_36D6A:
- dc.w 2
- dc.w $EC0F, $10, 8,$FFF0
- dc.w $C0C, $28, $14,$FFF0 ; 4
-word_36D7C:
- dc.w 1
- dc.w $F805, $2C, $16,$FFF8
-word_36D86:
- dc.w 1
- dc.w $FC00, $30, $18,$FFFC
-word_36D90:
- dc.w 1
- dc.w $FC00, $31, $18,$FFFC
-word_36D9A:
- dc.w 2
- dc.w $F805,$4093,$4049,$FFF0
- dc.w $F805,$4097,$404B, 0 ; 4
+Obj90_MapUnc_36D00: mappingsTable
+ mappingsTableEntry.w word_36D9A
+
+word_36D02: spriteHeader
+ spritePiece -8, -$C, 1, 1, 0, 0, 0, 0, 0
+ spritePiece -$10, -4, 2, 3, 1, 0, 0, 0, 0
+ spritePiece 0, -$C, 1, 1, 0, 1, 0, 0, 0
+ spritePiece 0, -4, 2, 3, 1, 1, 0, 0, 0
+word_36D02_End
+
+word_36D24: spriteHeader
+ spritePiece -8, -$14, 1, 1, 7, 0, 0, 0, 0
+ spritePiece -$10, -$C, 2, 4, 8, 0, 0, 0, 0
+ spritePiece 0, -$14, 1, 1, 7, 1, 0, 0, 0
+ spritePiece 0, -$C, 2, 4, 8, 1, 0, 0, 0
+word_36D24_End
+
+word_36D46: spriteHeader
+ spritePiece -$10, -$14, 4, 4, $10, 0, 0, 0, 0
+ spritePiece -$10, $C, 4, 1, $20, 0, 0, 0, 0
+word_36D46_End
+
+word_36D58: spriteHeader
+ spritePiece -$10, -$14, 4, 4, $10, 0, 0, 0, 0
+ spritePiece -$10, $C, 4, 1, $24, 0, 0, 0, 0
+word_36D58_End
+
+word_36D6A: spriteHeader
+ spritePiece -$10, -$14, 4, 4, $10, 0, 0, 0, 0
+ spritePiece -$10, $C, 4, 1, $28, 0, 0, 0, 0
+word_36D6A_End
+
+word_36D7C: spriteHeader
+ spritePiece -8, -8, 2, 2, $2C, 0, 0, 0, 0
+word_36D7C_End
+
+word_36D86: spriteHeader
+ spritePiece -4, -4, 1, 1, $30, 0, 0, 0, 0
+word_36D86_End
+
+word_36D90: spriteHeader
+ spritePiece -4, -4, 1, 1, $31, 0, 0, 0, 0
+word_36D90_End
+
+word_36D9A: spriteHeader
+ spritePiece -$10, -8, 2, 2, $93, 0, 0, 2, 0
+ spritePiece 0, -8, 2, 2, $97, 0, 0, 2, 0
+word_36D9A_End
+
+ even
+
; ===========================================================================
; ----------------------------------------------------------------------------
; Object 91 - Chop Chop (piranha/shark badnik) from ARZ
@@ -73912,7 +74001,7 @@ Ani_obj91: offsetTable
; --------------------------------------------------------------------------
; sprite mappings
; --------------------------------------------------------------------------
-Obj91_MapUnc_36EF6: BINCLUDE "mappings/sprite/obj91.bin"
+Obj91_MapUnc_36EF6: include "mappings/sprite/obj91.asm"
@@ -74086,7 +74175,7 @@ byte_3708E: dc.b 9, 2, 3,$FF
; ---------------------------------------------------------------------------
; sprite mappings
; ---------------------------------------------------------------------------
-Obj92_Obj93_MapUnc_37092: BINCLUDE "mappings/sprite/obj93.bin"
+Obj92_Obj93_MapUnc_37092: include "mappings/sprite/obj93.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object 95 - Sol (fireball-throwing orbit badnik) from HTZ
@@ -74276,7 +74365,7 @@ Ani_obj95_b: offsetTable
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj95_MapUnc_372E6: BINCLUDE "mappings/sprite/obj95.bin"
+Obj95_MapUnc_372E6: include "mappings/sprite/obj95.asm"
Invalid_SubObjData:
@@ -74675,7 +74764,7 @@ Obj94_SubObjData:
; ------------------------------------------------------------------------
; sprite mappings
; ------------------------------------------------------------------------
-Obj94_Obj98_MapUnc_37678: BINCLUDE "mappings/sprite/obj97.bin"
+Obj94_Obj98_MapUnc_37678: include "mappings/sprite/obj97.asm"
; seems to be a lookup table for oscillating horizontal position offset
byte_376A8:
@@ -74918,7 +75007,7 @@ Ani_obj99: offsetTable
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj99_Obj98_MapUnc_3789A: BINCLUDE "mappings/sprite/obj99.bin"
+Obj99_Obj98_MapUnc_3789A: include "mappings/sprite/obj99.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object 9A - Turtloid (turtle badnik) from Sky Chase Zone
@@ -75166,7 +75255,7 @@ Ani_obj9C: offsetTable
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj9A_Obj98_MapUnc_37B62: BINCLUDE "mappings/sprite/obj9C.bin"
+Obj9A_Obj98_MapUnc_37B62: include "mappings/sprite/obj9C.asm"
@@ -75352,7 +75441,7 @@ byte_37D90: dc.b 9, 1, 2, 1,$FF
; ------------------------------------------------------------------------
; sprite mappings
; ------------------------------------------------------------------------
-Obj9D_Obj98_MapUnc_37D96: BINCLUDE "mappings/sprite/obj9D.bin"
+Obj9D_Obj98_MapUnc_37D96: include "mappings/sprite/obj9D.asm"
@@ -75534,7 +75623,7 @@ Obj9E_SubObjData:
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-Obj9E_MapUnc_37FF2: BINCLUDE "mappings/sprite/obj9E.bin"
+Obj9E_MapUnc_37FF2: include "mappings/sprite/obj9E.asm"
@@ -75905,7 +75994,7 @@ byte_3830E: dc.b $E, 0, 2, 1,$FF
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-Obj9F_MapUnc_38314: BINCLUDE "mappings/sprite/objA0.bin"
+Obj9F_MapUnc_38314: include "mappings/sprite/objA0.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object A1 - Slicer (praying mantis dude) from MTZ
@@ -76149,7 +76238,7 @@ Ani_objA2: offsetTable
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjA1_MapUnc_385E2: BINCLUDE "mappings/sprite/objA2.bin"
+ObjA1_MapUnc_385E2: include "mappings/sprite/objA2.asm"
@@ -76344,7 +76433,7 @@ Ani_objA3_c: offsetTable
; -------------------------------------------------------------------------------
; sprite mappings
; -------------------------------------------------------------------------------
-ObjA3_MapUnc_388F0: BINCLUDE "mappings/sprite/objA3.bin"
+ObjA3_MapUnc_388F0: include "mappings/sprite/objA3.asm"
@@ -76473,7 +76562,7 @@ Ani_objA4: offsetTable
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjA4_Obj98_MapUnc_38A96: BINCLUDE "mappings/sprite/objA4.bin"
+ObjA4_Obj98_MapUnc_38A96: include "mappings/sprite/objA4.asm"
@@ -76687,7 +76776,7 @@ Ani_SpinyShot: offsetTable
; ------------------------------------------------------------------------------
; sprite mappings
; ------------------------------------------------------------------------------
-ObjA5_ObjA6_Obj98_MapUnc_38CCA: BINCLUDE "mappings/sprite/objA6.bin"
+ObjA5_ObjA6_Obj98_MapUnc_38CCA: include "mappings/sprite/objA6.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object A7 - Grabber (spider badnik) from CPZ
@@ -77196,99 +77285,115 @@ byte_39216:
; ----------------------------------------------------------------------------
; sprite mappings - objA7,objA8,objA9
; ----------------------------------------------------------------------------
-ObjA7_ObjA8_ObjA9_Obj98_MapUnc_3921A: offsetTable
- offsetTableEntry.w word_3923A ; 0
- offsetTableEntry.w word_39254 ; 1
- offsetTableEntry.w word_3926E ; 2
- offsetTableEntry.w word_39278 ; 3
- offsetTableEntry.w word_39282 ; 4
- offsetTableEntry.w word_3928C ; 5
- offsetTableEntry.w word_39296 ; 6
+ObjA7_ObjA8_ObjA9_Obj98_MapUnc_3921A: mappingsTable
+ mappingsTableEntry.w word_3923A
+ mappingsTableEntry.w word_39254
+ mappingsTableEntry.w word_3926E
+ mappingsTableEntry.w word_39278
+ mappingsTableEntry.w word_39282
+ mappingsTableEntry.w word_3928C
+ mappingsTableEntry.w word_39296
; -------------------------------------------------------------------------------
; sprite mappings - objAA (string of various lengths)
; -------------------------------------------------------------------------------
-ObjAA_MapUnc_39228: offsetTable
- offsetTableEntry.w word_392A0 ; 0
- offsetTableEntry.w word_392AA ; 1
- offsetTableEntry.w word_392B4 ; 2
- offsetTableEntry.w word_392C6 ; 3
- offsetTableEntry.w word_392D8 ; 4
+ObjAA_MapUnc_39228: mappingsTable
+ mappingsTableEntry.w word_392A0 ; 0
+ mappingsTableEntry.w word_392AA ; 1
+ mappingsTableEntry.w word_392B4 ; 2
+ mappingsTableEntry.w word_392C6 ; 3
+ mappingsTableEntry.w word_392D8 ; 4
; Unused - The spider badnik never goes down enough for these to appear
- offsetTableEntry.w word_3930C ; 5 ; This is in the wrong place - this should be frame 6
- offsetTableEntry.w word_392F2 ; 6 ; This is in the wrong place - this should be frame 5
- offsetTableEntry.w word_3932E ; 7
- offsetTableEntry.w word_3932E ; 8 ; This should point to word_39350
-word_3923A:
- dc.w 3
- dc.w $F801, 0, 0,$FFE5
- dc.w $F80D, 2, 1,$FFED; 4
- dc.w $809, $1D, $E,$FFF1; 8
-word_39254:
- dc.w 3
- dc.w $F801, 0, 0,$FFE5
- dc.w $F80D, 2, 1,$FFED; 4
- dc.w $80D, $23, $11,$FFF1; 8
-word_3926E:
- dc.w 1
- dc.w $FC00, $A, 5,$FFFC
-word_39278:
- dc.w 1
- dc.w $F809, $F, 7,$FFF9
-word_39282:
- dc.w 1
- dc.w $F80D, $15, $A,$FFF9
-word_3928C:
- dc.w 1
- dc.w $FC00, $2B, $15,$FFFC
-word_39296:
- dc.w 1
- dc.w $FC00, $2C, $16,$FFFC
-word_392A0:
- dc.w 1
- dc.w 1, $B, 5,$FFFC
-word_392AA:
- dc.w 1
- dc.w 3, $B, 5,$FFFC
-word_392B4:
- dc.w 2
- dc.w 1, $B, 5,$FFFC
- dc.w $1003, $B, 5,$FFFC; 4
-word_392C6:
- dc.w 2
- dc.w 3, $B, 5,$FFFC
- dc.w $2003, $B, 5,$FFFC; 4
-word_392D8:
- dc.w 3
- dc.w 1, $B, 5,$FFFC
- dc.w $1003, $B, 5,$FFFC; 4
- dc.w $3003, $B, 5,$FFFC; 8
-word_392F2:
- dc.w 3
- dc.w 3, $B, 5,$FFFC
- dc.w $2003, $B, 5,$FFFC; 4
- dc.w $4003, $B, 5,$FFFC; 8
-word_3930C:
- dc.w 4
- dc.w 1, $B, 5,$FFFC
- dc.w $1003, $B, 5,$FFFC; 4
- dc.w $3003, $B, 5,$FFFC; 8
- dc.w $5003, $B, 5,$FFFC; 12
-word_3932E:
- dc.w 4
- dc.w 3, $B, 5,$FFFC
- dc.w $2003, $B, 5,$FFFC; 4
- dc.w $4003, $B, 5,$FFFC; 8
- dc.w $6003, $B, 5,$FFFC; 12
-; Unused frame
-;word_39350:
- dc.w 5
- dc.w 1, $B, 5,$FFFC
- dc.w $1003, $B, 5,$FFFC; 4
- dc.w $3003, $B, 5,$FFFC; 8
- dc.w $5003, $B, 5,$FFFC; 12
- dc.w $7003, $B, 5,$FFFC; 16
+ mappingsTableEntry.w word_3930C ; 5 ; This is in the wrong place - this should be frame 6
+ mappingsTableEntry.w word_392F2 ; 6 ; This is in the wrong place - this should be frame 5
+ mappingsTableEntry.w word_3932E ; 7
+ mappingsTableEntry.w word_3932E ; 8 ; This should point to word_39350
+
+word_3923A: spriteHeader
+ spritePiece -$1B, -8, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$13, -8, 4, 2, 2, 0, 0, 0, 0
+ spritePiece -$F, 8, 3, 2, $1D, 0, 0, 0, 0
+word_3923A_End
+
+word_39254: spriteHeader
+ spritePiece -$1B, -8, 1, 2, 0, 0, 0, 0, 0
+ spritePiece -$13, -8, 4, 2, 2, 0, 0, 0, 0
+ spritePiece -$F, 8, 4, 2, $23, 0, 0, 0, 0
+word_39254_End
+
+word_3926E: spriteHeader
+ spritePiece -4, -4, 1, 1, $A, 0, 0, 0, 0
+word_3926E_End
+
+word_39278: spriteHeader
+ spritePiece -7, -8, 3, 2, $F, 0, 0, 0, 0
+word_39278_End
+
+word_39282: spriteHeader
+ spritePiece -7, -8, 4, 2, $15, 0, 0, 0, 0
+word_39282_End
+
+word_3928C: spriteHeader
+ spritePiece -4, -4, 1, 1, $2B, 0, 0, 0, 0
+word_3928C_End
+
+word_39296: spriteHeader
+ spritePiece -4, -4, 1, 1, $2C, 0, 0, 0, 0
+word_39296_End
+
+word_392A0: spriteHeader
+ spritePiece -4, 0, 1, 2, $B, 0, 0, 0, 0
+word_392A0_End
+
+word_392AA: spriteHeader
+ spritePiece -4, 0, 1, 4, $B, 0, 0, 0, 0
+word_392AA_End
+
+word_392B4: spriteHeader
+ spritePiece -4, 0, 1, 2, $B, 0, 0, 0, 0
+ spritePiece -4, $10, 1, 4, $B, 0, 0, 0, 0
+word_392B4_End
+
+word_392C6: spriteHeader
+ spritePiece -4, 0, 1, 4, $B, 0, 0, 0, 0
+ spritePiece -4, $20, 1, 4, $B, 0, 0, 0, 0
+word_392C6_End
+
+word_392D8: spriteHeader
+ spritePiece -4, 0, 1, 2, $B, 0, 0, 0, 0
+ spritePiece -4, $10, 1, 4, $B, 0, 0, 0, 0
+ spritePiece -4, $30, 1, 4, $B, 0, 0, 0, 0
+word_392D8_End
+
+word_392F2: spriteHeader
+ spritePiece -4, 0, 1, 4, $B, 0, 0, 0, 0
+ spritePiece -4, $20, 1, 4, $B, 0, 0, 0, 0
+ spritePiece -4, $40, 1, 4, $B, 0, 0, 0, 0
+word_392F2_End
+
+word_3930C: spriteHeader
+ spritePiece -4, 0, 1, 2, $B, 0, 0, 0, 0
+ spritePiece -4, $10, 1, 4, $B, 0, 0, 0, 0
+ spritePiece -4, $30, 1, 4, $B, 0, 0, 0, 0
+ spritePiece -4, $50, 1, 4, $B, 0, 0, 0, 0
+word_3930C_End
+
+word_3932E: spriteHeader
+ spritePiece -4, 0, 1, 4, $B, 0, 0, 0, 0
+ spritePiece -4, $20, 1, 4, $B, 0, 0, 0, 0
+ spritePiece -4, $40, 1, 4, $B, 0, 0, 0, 0
+ spritePiece -4, $60, 1, 4, $B, 0, 0, 0, 0
+word_3932E_End
+; Unused frame
+word_39350: spriteHeader
+ spritePiece -4, 0, 1, 2, $B, 0, 0, 0, 0
+ spritePiece -4, $10, 1, 4, $B, 0, 0, 0, 0
+ spritePiece -4, $30, 1, 4, $B, 0, 0, 0, 0
+ spritePiece -4, $50, 1, 4, $B, 0, 0, 0, 0
+ spritePiece -4, $70, 1, 4, $B, 0, 0, 0, 0
+word_39350_End
+ even
; ===========================================================================
@@ -77332,7 +77437,7 @@ ObjAC_SubObjData:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjAC_MapUnc_393CC: BINCLUDE "mappings/sprite/objAC.bin"
+ObjAC_MapUnc_393CC: include "mappings/sprite/objAC.asm"
@@ -77521,7 +77626,7 @@ Ani_CluckerShot:offsetTable
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjAD_Obj98_MapUnc_395B4: BINCLUDE "mappings/sprite/objAE.bin"
+ObjAD_Obj98_MapUnc_395B4: include "mappings/sprite/objAE.asm"
@@ -78264,11 +78369,11 @@ byte_39E64: dc.b 3, 7, 7,$FF
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjAF_Obj98_MapUnc_39E68: BINCLUDE "mappings/sprite/objAF_a.bin"
+ObjAF_Obj98_MapUnc_39E68: include "mappings/sprite/objAF_a.asm"
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjAF_MapUnc_3A08C: BINCLUDE "mappings/sprite/objAF_b.bin"
+ObjAF_MapUnc_3A08C: include "mappings/sprite/objAF_b.asm"
@@ -78366,18 +78471,11 @@ ObjB0_Init:
rts
; ===========================================================================
- ; These next four things are pointers to Sonic's dereferenced
- ; DPLC entries of his "running animation" frames for the SEGA screen.
- ; I want that DPLC data split into a binary file for use with editors,
- ; but unfortunately there's no way to refer to BINCLUDE'd bytes
- ; from within AS, so I put an educated guess (default) here and
- ; run an external program (fixpointer.exe) to fix it later.
-; WARNING: the build script needs editing if you rename this label
off_3A294:
- dc.l (MapRUnc_Sonic+$33A) ;dc.l word_7181A
- dc.l (MapRUnc_Sonic+$340) ;dc.l word_71820
- dc.l (MapRUnc_Sonic+$346) ;dc.l word_71826
- dc.l (MapRUnc_Sonic+$34C) ;dc.l word_7182C
+ dc.l MapRUnc_Sonic.frame45
+ dc.l MapRUnc_Sonic.frame46
+ dc.l MapRUnc_Sonic.frame47
+ dc.l MapRUnc_Sonic.frame48
map_piece macro width,height
dc.l copysrc,copydst
@@ -78649,7 +78747,7 @@ Ani_objB0: offsetTable
; Gigantic Sonic (2x size) mappings for the SEGA screen
; also has the "trademark hider" mappings
; ------------------------------------------------------------------------------
-ObjB1_MapUnc_3A5A6: BINCLUDE "mappings/sprite/objB1.bin"
+ObjB1_MapUnc_3A5A6: include "mappings/sprite/objB1.asm"
; ===========================================================================
;loc_3A68A
SegaScr_VInt:
@@ -79629,11 +79727,11 @@ Ani_objB2_b: offsetTable
; -----------------------------------------------------------------------------
; sprite mappings
; -----------------------------------------------------------------------------
-ObjB2_MapUnc_3AFF2: BINCLUDE "mappings/sprite/objB2_a.bin"
+ObjB2_MapUnc_3AFF2: include "mappings/sprite/objB2_a.asm"
; -----------------------------------------------------------------------------
; sprite mappings
; -----------------------------------------------------------------------------
-ObjB2_MapUnc_3B292: BINCLUDE "mappings/sprite/objB2_b.bin"
+ObjB2_MapUnc_3B292: include "mappings/sprite/objB2_b.asm"
; ===========================================================================
@@ -79682,7 +79780,7 @@ ObjB3_SubObjData:
; -----------------------------------------------------------------------------
; sprite mappings
; -----------------------------------------------------------------------------
-ObjB3_MapUnc_3B32C: BINCLUDE "mappings/sprite/objB3.bin"
+ObjB3_MapUnc_3B32C: include "mappings/sprite/objB3.asm"
@@ -79736,7 +79834,7 @@ Ani_objB4: offsetTable
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjB4_MapUnc_3B3BE: BINCLUDE "mappings/sprite/objB4.bin"
+ObjB4_MapUnc_3B3BE: include "mappings/sprite/objB4.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object B5 - Horizontal propeller from WFZ
@@ -79858,7 +79956,7 @@ byte_3B544: dc.b $7E, 0,$FF
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjB5_MapUnc_3B548: BINCLUDE "mappings/sprite/objB5.bin"
+ObjB5_MapUnc_3B548: include "mappings/sprite/objB5.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object B6 - Tilting platform from WFZ
@@ -80149,7 +80247,7 @@ byte_3B850: dc.b 3, 0, 1, 2,$FA, 0
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjB6_MapUnc_3B856: BINCLUDE "mappings/sprite/objB6.bin"
+ObjB6_MapUnc_3B856: include "mappings/sprite/objB6.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object B7 - Unused huge vertical laser from WFZ
@@ -80183,7 +80281,7 @@ ObjB7_Main:
; off_3B8DA:
ObjB7_SubObjData:
subObjData ObjB7_MapUnc_3B8E4,make_art_tile(ArtTile_ArtNem_WfzVrtclLazer,2,1),4,4,$18,$A9
-ObjB7_MapUnc_3B8E4: BINCLUDE "mappings/sprite/objB7.bin"
+ObjB7_MapUnc_3B8E4: include "mappings/sprite/objB7.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
@@ -80296,7 +80394,7 @@ Ani_WallTurretShot: offsetTable
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjB8_Obj98_MapUnc_3BA46: BINCLUDE "mappings/sprite/objB8.bin"
+ObjB8_Obj98_MapUnc_3BA46: include "mappings/sprite/objB8.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object B9 - Laser from WFZ that shoots down the Tornado
@@ -80349,7 +80447,7 @@ ObjB9_SubObjData:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjB9_MapUnc_3BB18: BINCLUDE "mappings/sprite/objB9.bin"
+ObjB9_MapUnc_3BB18: include "mappings/sprite/objB9.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object BA - Wheel from WFZ
@@ -80380,7 +80478,7 @@ ObjBA_SubObjData:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjBA_MapUnc_3BB70: BINCLUDE "mappings/sprite/objBA.bin"
+ObjBA_MapUnc_3BB70: include "mappings/sprite/objBA.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object BB - Removed object (unknown, unused)
@@ -80411,7 +80509,7 @@ ObjBB_SubObjData:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjBB_MapUnc_3BBA0: BINCLUDE "mappings/sprite/objBB.bin"
+ObjBB_MapUnc_3BBA0: include "mappings/sprite/objBB.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object BC - Fire coming out of Robotnik's ship in WFZ
@@ -80452,7 +80550,7 @@ ObjBC_SubObjData2:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjBC_MapUnc_3BC08: BINCLUDE "mappings/sprite/objBC.bin"
+ObjBC_MapUnc_3BC08: include "mappings/sprite/objBC.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object BD - Ascending/descending metal platforms from WFZ
@@ -80594,7 +80692,7 @@ byte_3BD38: dc.b 1, 0, 1, 2,$FA
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjBD_MapUnc_3BD3E: BINCLUDE "mappings/sprite/objBD.bin"
+ObjBD_MapUnc_3BD3E: include "mappings/sprite/objBD.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object BE - Lateral cannon (temporary platform that pops in/out) from WFZ
@@ -80690,7 +80788,7 @@ byte_3BE40: dc.b 5, 3, 2, 1, 0,$FC
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjBE_MapUnc_3BE46: BINCLUDE "mappings/sprite/objBE.bin"
+ObjBE_MapUnc_3BE46: include "mappings/sprite/objBE.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object BF - Rotaty-stick badnik from WFZ
@@ -80729,7 +80827,7 @@ Ani_objBF: offsetTable
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjBF_MapUnc_3BEE0: BINCLUDE "mappings/sprite/objBF.bin"
+ObjBF_MapUnc_3BEE0: include "mappings/sprite/objBF.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object C0 - Speed launcher from WFZ
@@ -80901,7 +80999,7 @@ ObjC0_SubObjData:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjC0_MapUnc_3C098: BINCLUDE "mappings/sprite/objC0.bin"
+ObjC0_MapUnc_3C098: include "mappings/sprite/objC0.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object C1 - Breakable plating from WFZ
@@ -81085,7 +81183,7 @@ ObjC1_SubObjData:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjC1_MapUnc_3C280: BINCLUDE "mappings/sprite/objC1.bin"
+ObjC1_MapUnc_3C280: include "mappings/sprite/objC1.asm"
; ===========================================================================
; ----------------------------------------------------------------------------
; Object C2 - Rivet thing you bust to get into ship at the end of WFZ
@@ -81145,7 +81243,7 @@ ObjC2_SubObjData:
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjC2_MapUnc_3C3C2: BINCLUDE "mappings/sprite/objC2.bin"
+ObjC2_MapUnc_3C3C2: include "mappings/sprite/objC2.asm"
Invalid_SubObjData2:
@@ -82074,11 +82172,11 @@ byte_3CCD0: dc.b 3, 7, 8, 9, $A, $B,$FF
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjC5_MapUnc_3CCD8: BINCLUDE "mappings/sprite/objC5_a.bin"
+ObjC5_MapUnc_3CCD8: include "mappings/sprite/objC5_a.asm"
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjC5_MapUnc_3CEBC: BINCLUDE "mappings/sprite/objC5_b.bin"
+ObjC5_MapUnc_3CEBC: include "mappings/sprite/objC5_b.asm"
@@ -82300,11 +82398,11 @@ Ani_objC6: offsetTable
; ----------------------------------------------------------------------------
; sprite mappings ; Robotnik running
; ----------------------------------------------------------------------------
-ObjC6_MapUnc_3D0EE: BINCLUDE "mappings/sprite/objC6_a.bin"
+ObjC6_MapUnc_3D0EE: include "mappings/sprite/objC6_a.asm"
; ----------------------------------------------------------------------------
; sprite mappings
; ----------------------------------------------------------------------------
-ObjC6_MapUnc_3D1DE: BINCLUDE "mappings/sprite/objC6_b.bin"
+ObjC6_MapUnc_3D1DE: include "mappings/sprite/objC6_b.asm"
@@ -82507,7 +82605,7 @@ Ani_objC8: offsetTable
; ----------------------------------------------------------------------------
; sprite mappings ; Crawl CNZ
; ----------------------------------------------------------------------------
-ObjC8_MapUnc_3D450: BINCLUDE "mappings/sprite/objC8.bin"
+ObjC8_MapUnc_3D450: include "mappings/sprite/objC8.asm"
@@ -84092,7 +84190,7 @@ c7ani macro pieceOffset,deltax,deltay
dc.b pieceOffset,deltax,deltay
endm
-ObjC7_GroupAni_3E318: offsetTable ;BINCLUDE "mappings/sprite/objC7_a.bin"
+ObjC7_GroupAni_3E318: offsetTable ;include "mappings/sprite/objC7_a.asm"
offsetTableEntry.w byte_3E32A
offsetTableEntry.w byte_3E33E
offsetTableEntry.w byte_3E352
@@ -84186,7 +84284,7 @@ off_3E3D0:
; -----------------------------------------------------------------------------
; Custom animation
; -----------------------------------------------------------------------------
-ObjC7_GroupAni_3E3D8: offsetTable ;BINCLUDE "mappings/sprite/objC7_b.bin"
+ObjC7_GroupAni_3E3D8: offsetTable ;include "mappings/sprite/objC7_b.asm"
offsetTableEntry.w byte_3E3DE
offsetTableEntry.w byte_3E3F2
offsetTableEntry.w byte_3E3F8
@@ -84227,7 +84325,7 @@ off_3E42C:
; -----------------------------------------------------------------------------
; Custom animation
; -----------------------------------------------------------------------------
-ObjC7_GroupAni_3E438: offsetTable ;BINCLUDE "mappings/sprite/objC7_c.bin"
+ObjC7_GroupAni_3E438: offsetTable ;include "mappings/sprite/objC7_c.asm"
offsetTableEntry.w byte_3E450
offsetTableEntry.w byte_3E468
offsetTableEntry.w byte_3E480
@@ -84456,7 +84554,7 @@ byte_3E5F0: dc.b 3,$13,$12,$11,$10,$16,$FF
; ------------------------------------------------------------------------------
; sprite mappings
; ------------------------------------------------------------------------------
-ObjC7_MapUnc_3E5F8: BINCLUDE "mappings/sprite/objC7.bin"
+ObjC7_MapUnc_3E5F8: include "mappings/sprite/objC7.asm"
; ===========================================================================
; ---------------------------------------------------------------------------
@@ -84816,7 +84914,7 @@ Obj8A_Display:
; ----------------------------------------------------------------------------
; sprite mappings (unused?)
; ----------------------------------------------------------------------------
-Obj8A_MapUnc_3EB4E: BINCLUDE "mappings/sprite/obj8A.bin"
+Obj8A_MapUnc_3EB4E: include "mappings/sprite/obj8A.asm"
; ===========================================================================
if gameRevision<2
@@ -85061,7 +85159,7 @@ byte_3F42F: dc.b 3, 0, 1, 2, 3,$FE, 1
; their 'total sprite pieces' value set too low by one, causing the last
; sprite piece to not be displayed.
; ----------------------------------------------------------------------------
-Obj3E_MapUnc_3F436: BINCLUDE "mappings/sprite/obj3E.bin"
+Obj3E_MapUnc_3F436: include "mappings/sprite/obj3E.asm"
; ===========================================================================
if gameRevision<2
@@ -87717,13 +87815,13 @@ BuildHUD_P2_Continued:
; sprite mappings for the HUD
; uses the art in VRAM from $D940 - $FC00
-HUD_MapUnc_40A9A: BINCLUDE "mappings/sprite/hud_a.bin"
+HUD_MapUnc_40A9A: include "mappings/sprite/hud_a.asm"
-HUD_MapUnc_40BEA: BINCLUDE "mappings/sprite/hud_b.bin"
+HUD_MapUnc_40BEA: include "mappings/sprite/hud_b.asm"
-HUD_MapUnc_40C82: BINCLUDE "mappings/sprite/hud_c.bin"
+HUD_MapUnc_40C82: include "mappings/sprite/hud_c.asm"
; ---------------------------------------------------------------------------
; Add points subroutine
@@ -90464,10 +90562,9 @@ ArtUnc_Sonic: BINCLUDE "art/uncompressed/Sonic's art.bin"
align $20
ArtUnc_Tails: BINCLUDE "art/uncompressed/Tails's art.bin"
-MapUnc_Sonic: BINCLUDE "mappings/sprite/Sonic.bin"
-; WARNING: the build script needs editing if you rename this label
-; or if you move Sonic's running frame to somewhere else than frame $2D
-MapRUnc_Sonic: BINCLUDE "mappings/spriteDPLC/Sonic.bin"
+MapUnc_Sonic: include "mappings/sprite/Sonic.asm"
+
+MapRUnc_Sonic: include "mappings/spriteDPLC/Sonic.asm"
ArtNem_Shield: BINCLUDE "art/nemesis/Shield.bin"
even
@@ -90477,9 +90574,9 @@ ArtUnc_SplashAndDust: BINCLUDE "art/uncompressed/Splash and skid dust.bin"
ArtNem_SuperSonic_stars: BINCLUDE "art/nemesis/Super Sonic stars.bin"
even
-MapUnc_Tails: BINCLUDE "mappings/sprite/Tails.bin"
+MapUnc_Tails: include "mappings/sprite/Tails.asm"
-MapRUnc_Tails: BINCLUDE "mappings/spriteDPLC/Tails.bin"
+MapRUnc_Tails: include "mappings/spriteDPLC/Tails.asm"
;---------------------------------------------------------------------------------------
; Sega Screen Assets
@@ -92002,6 +92099,6 @@ paddingSoFar := paddingSoFar+1
message "ROM size is $\{*} bytes (\{*/1024.0} kb). About $\{paddingSoFar} bytes are padding. "
endif
; share these symbols externally (WARNING: don't rename, move or remove these labels!)
- shared word_728C_user,Obj5F_MapUnc_7240,off_3A294,MapRUnc_Sonic,movewZ80CompSize
+ shared movewZ80CompSize
EndOfRom:
END
diff --git a/s2.macros.asm b/s2.macros.asm
index ac6d1a6a..91a5166b 100644
--- a/s2.macros.asm
+++ b/s2.macros.asm
@@ -167,32 +167,32 @@ offsetTableEntry macro ptr
zoneOrderedTable macro entryLen,zoneEntries,{INTLABEL}
__LABEL__ label *
; set some global variables
-zone_table_name := "__LABEL__"
-zone_table_addr := *
-zone_entry_len := entryLen
-zone_entries := zoneEntries
-zone_entries_left := 0
-cur_zone_id := 0
-cur_zone_str := "0"
+.zone_table_name := "__LABEL__"
+.zone_table_addr := *
+.zone_entry_len := entryLen
+.zone_entries := zoneEntries
+.zone_entries_left := 0
+.cur_zone_id := 0
+.cur_zone_str := "0"
endm
zoneOrderedOffsetTable macro entryLen,zoneEntries,{INTLABEL}
-current_offset_table := __LABEL__
__LABEL__ zoneOrderedTable entryLen,zoneEntries
+.current_offset_table := __LABEL__
endm
; macro to declare one or more entries in a zone-ordered table
zoneTableEntry macro value
if "value"<>""
- if zone_entries_left
+ if .zone_entries_left
dc.ATTRIBUTE value
-zone_entries_left := zone_entries_left-1
+.zone_entries_left := .zone_entries_left-1
else
- !org zone_table_addr+zone_id_{cur_zone_str}*zone_entry_len*zone_entries
+ !org .zone_table_addr+zone_id_{.cur_zone_str}*.zone_entry_len*.zone_entries
dc.ATTRIBUTE value
-zone_entries_left := zone_entries-1
-cur_zone_id := cur_zone_id+1
-cur_zone_str := "\{cur_zone_id}"
+.zone_entries_left := .zone_entries-1
+.cur_zone_id := .cur_zone_id+1
+.cur_zone_str := "\{.cur_zone_id}"
endif
shift
zoneTableEntry.ATTRIBUTE ALLARGS
@@ -201,30 +201,30 @@ cur_zone_str := "\{cur_zone_id}"
; macro to declare one or more BINCLUDE entries in a zone-ordered table
zoneTableBinEntry macro numEntries,path
- if zone_entries_left
+ if .zone_entries_left
BINCLUDE path
-zone_entries_left := zone_entries_left-numEntries
+.zone_entries_left := .zone_entries_left-numEntries
else
- !org zone_table_addr+zone_id_{cur_zone_str}*zone_entry_len*zone_entries
+ !org .zone_table_addr+zone_id_{.cur_zone_str}*.zone_entry_len*.zone_entries
BINCLUDE path
-zone_entries_left := zone_entries-numEntries
-cur_zone_id := cur_zone_id+1
-cur_zone_str := "\{cur_zone_id}"
+.zone_entries_left := .zone_entries-numEntries
+.cur_zone_id := .cur_zone_id+1
+.cur_zone_str := "\{.cur_zone_id}"
endif
endm
; macro to declare one entry in a zone-ordered offset table
zoneOffsetTableEntry macro value
- zoneTableEntry.ATTRIBUTE value-current_offset_table
+ zoneTableEntry.ATTRIBUTE value-.current_offset_table
endm
; macro which sets the PC to the correct value at the end of a zone offset table and checks if the correct
; number of entries were declared
zoneTableEnd macro
- if (cur_zone_id<>no_of_zones)&&(MOMPASS=1)
- message "Warning: Table \{zone_table_name} has \{cur_zone_id/1.0} entries, but it should have \{(no_of_zones)/1.0} entries"
+ if (.cur_zone_id<>no_of_zones)&&(MOMPASS=1)
+ message "Warning: Table \{.zone_table_name} has \{.cur_zone_id/1.0} entries, but it should have \{(no_of_zones)/1.0} entries"
endif
- !org zone_table_addr+cur_zone_id*zone_entry_len*zone_entries
+ !org .zone_table_addr+.cur_zone_id*.zone_entry_len*.zone_entries
endm
; macro to declare sub-object data
@@ -282,3 +282,6 @@ childObjectData macro objoff, objectID, subtype
dc.w objoff
dc.b objectID, subtype
endm
+
+SonicMappingsVer = 2
+ include "MapMacros.asm"