Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
37970c6
Start deprecating ObjXX labels
AlexField442 Aug 17, 2025
3f2471c
Updated rings and restored historical labels/addresses
AlexField442 Aug 17, 2025
ea7c253
Noted these two programming oddities
AlexField442 Aug 17, 2025
1e5e45b
Do monitors and pathswappers, begin renaming mapping files
AlexField442 Aug 18, 2025
d5dbfd2
Added explanation for jmpTos for its first instance
AlexField442 Aug 18, 2025
079769c
Update this
AlexField442 Aug 19, 2025
1d5c252
More objects renamed
AlexField442 Aug 19, 2025
f7e39a7
Merge branch 'sonicretro:master' into master
AlexField442 Aug 19, 2025
b6690fc
FORGOT FLEX2, OOPS
AlexField442 Aug 19, 2025
1c7987b
Obj06, Obj34, ObjAB, ObjB3, ObjBB, ObjD9, ObjDA, ObjDB, and ObjDC
AlexField442 Aug 22, 2025
8cacafe
Obj0C, Obj12, Obj13, Obj74
AlexField442 Aug 23, 2025
28e3712
Obj28, Obj29, Obj35, Obj38, Obj79, Obj7D, Obj7E
AlexField442 Aug 23, 2025
f4a1d3a
Obj07, Obj0B, Obj31, Obj44, Obj45, Obj46, Obj7C
AlexField442 Aug 24, 2025
0cb6052
ObjCE, ObjCF, and Obj1C (partial)
AlexField442 Aug 26, 2025
d7cae3d
Merge branch 'sonicretro:master' into master
AlexField442 Aug 29, 2025
4b130b9
Obj08, Obj09, Obj0A
AlexField442 Sep 11, 2025
094232b
Obj0D, Obj0E (partial), Obj1C (partial)
AlexField442 Sep 12, 2025
b3e9b53
Finished renaming Obj1C
AlexField442 Sep 16, 2025
632ef48
Obj0E
AlexField442 Sep 18, 2025
7287f35
Fix some build errors.
Clownacy Sep 18, 2025
980128d
Fixed broken SonLVL INIs
AlexField442 Sep 19, 2025
902ee7a
Merge branch 'sonicretro:master' into master
AlexField442 Dec 18, 2025
040df43
Seesaws, title screen palette changer, and title menu
AlexField442 Dec 30, 2025
035274c
Object 39
AlexField442 Jan 8, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions SonLVL INI Files/ARZ/Leaves.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<Images>
<ImageFromMappings id="imgsmall">
<ArtFile filename="../art/nemesis/Monitor and contents.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj31_b.asm" frame="0" startpal="0" />
<MapFile type="ASM" filename="../mappings/sprite/Lava marker.asm" frame="0" startpal="0" />
</ImageFromMappings>
<ImageFromMappings id="imgmedium">
<ArtFile filename="../art/nemesis/Monitor and contents.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj31_b.asm" frame="1" startpal="0" />
<MapFile type="ASM" filename="../mappings/sprite/Lava marker.asm" frame="1" startpal="0" />
</ImageFromMappings>
<ImageFromMappings id="imglarge">
<ArtFile filename="../art/nemesis/Monitor and contents.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj31_b.asm" frame="2" startpal="0" />
<MapFile type="ASM" filename="../mappings/sprite/Lava marker.asm" frame="2" startpal="0" />
</ImageFromMappings>
</Images>
<Subtypes>
Expand Down
16 changes: 8 additions & 8 deletions SonLVL INI Files/CNZ/Pinball mode.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,35 @@
<Images>
<ImageFromMappings id="img1">
<ArtFile filename="../art/nemesis/Ring.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj03.asm" frame="0" startpal="1" />
<MapFile type="ASM" filename="../mappings/sprite/Pathswapper.asm" frame="0" startpal="1" />
</ImageFromMappings>
<ImageFromMappings id="img2">
<ArtFile filename="../art/nemesis/Ring.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj03.asm" frame="1" startpal="1" />
<MapFile type="ASM" filename="../mappings/sprite/Pathswapper.asm" frame="1" startpal="1" />
</ImageFromMappings>
<ImageFromMappings id="img3">
<ArtFile filename="../art/nemesis/Ring.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj03.asm" frame="2" startpal="1" />
<MapFile type="ASM" filename="../mappings/sprite/Pathswapper.asm" frame="2" startpal="1" />
</ImageFromMappings>
<ImageFromMappings id="img4">
<ArtFile filename="../art/nemesis/Ring.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj03.asm" frame="3" startpal="1" />
<MapFile type="ASM" filename="../mappings/sprite/Pathswapper.asm" frame="3" startpal="1" />
</ImageFromMappings>
<ImageFromMappings id="img5">
<ArtFile filename="../art/nemesis/Ring.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj03.asm" frame="4" startpal="1" />
<MapFile type="ASM" filename="../mappings/sprite/Pathswapper.asm" frame="4" startpal="1" />
</ImageFromMappings>
<ImageFromMappings id="img6">
<ArtFile filename="../art/nemesis/Ring.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj03.asm" frame="5" startpal="1" />
<MapFile type="ASM" filename="../mappings/sprite/Pathswapper.asm" frame="5" startpal="1" />
</ImageFromMappings>
<ImageFromMappings id="img7">
<ArtFile filename="../art/nemesis/Ring.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj03.asm" frame="6" startpal="1" />
<MapFile type="ASM" filename="../mappings/sprite/Pathswapper.asm" frame="6" startpal="1" />
</ImageFromMappings>
<ImageFromMappings id="img8">
<ArtFile filename="../art/nemesis/Ring.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj03.asm" frame="7" startpal="1" />
<MapFile type="ASM" filename="../mappings/sprite/Pathswapper.asm" frame="7" startpal="1" />
</ImageFromMappings>
</Images>
<Subtypes>
Expand Down
2 changes: 1 addition & 1 deletion SonLVL INI Files/CPZ/Section of Pipe.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Images>
<ImageFromMappings id="section">
<ArtFile filename="../art/nemesis/Small yellow moving platform from CPZ.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj0B.asm" frame="0" startpal="3" />
<MapFile type="ASM" filename="../mappings/sprite/Small yellow moving platform from CPZ.asm" frame="0" startpal="3" />
</ImageFromMappings>
</Images>
<Properties>
Expand Down
6 changes: 3 additions & 3 deletions SonLVL INI Files/Common/Invisible lava marker.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<Images>
<ImageFromMappings id="imgsmall">
<ArtFile filename="../art/nemesis/Monitor and contents.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj31_b.asm" frame="0" startpal="0" />
<MapFile type="ASM" filename="../mappings/sprite/Lava marker.asm" frame="0" startpal="0" />
</ImageFromMappings>
<ImageFromMappings id="imgmedium">
<ArtFile filename="../art/nemesis/Monitor and contents.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj31_b.asm" frame="1" startpal="0" />
<MapFile type="ASM" filename="../mappings/sprite/Lava marker.asm" frame="1" startpal="0" />
</ImageFromMappings>
<ImageFromMappings id="imglarge">
<ArtFile filename="../art/nemesis/Monitor and contents.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj31_b.asm" frame="2" startpal="0" />
<MapFile type="ASM" filename="../mappings/sprite/Lava marker.asm" frame="2" startpal="0" />
</ImageFromMappings>
</Images>
<Subtypes>
Expand Down
2 changes: 1 addition & 1 deletion SonLVL INI Files/Common/InvisibleBlock.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class InvisibleBlock : ObjectDefinition
public override void Init(ObjectData data)
{
byte[] artfile = ObjectHelper.OpenArtFile("../art/nemesis/Monitor and contents.nem", CompressionType.Nemesis);
string mapfile = "../mappings/sprite/obj74.asm";
string mapfile = "../mappings/sprite/Invisible block.asm";
img = ObjectHelper.MapASMToBmp(artfile, mapfile, 0, 0);
}

Expand Down
22 changes: 11 additions & 11 deletions SonLVL INI Files/Common/Monitor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,48 +3,48 @@
<Images>
<ImageFromMappings id="static">
<ArtFile filename="../art/nemesis/Monitor and contents.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj26.asm" frame="1" startpal="0" />
<MapFile type="ASM" filename="../mappings/sprite/Monitor.asm" frame="1" startpal="0" />
</ImageFromMappings>
<ImageFromMappings id="sonic">
<ArtFile filename="../art/nemesis/Monitor and contents.nem" />
<ArtFile filename="../art/nemesis/Sonic lives counter.nem" offset="10880" />
<MapFile type="ASM" filename="../mappings/sprite/obj26.asm" frame="2" startpal="0" />
<MapFile type="ASM" filename="../mappings/sprite/Monitor.asm" frame="2" startpal="0" />
</ImageFromMappings>
<ImageFromMappings id="tails">
<ArtFile filename="../art/nemesis/Monitor and contents.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj26.asm" frame="3" startpal="0" />
<MapFile type="ASM" filename="../mappings/sprite/Monitor.asm" frame="3" startpal="0" />
</ImageFromMappings>
<ImageFromMappings id="eggman">
<ArtFile filename="../art/nemesis/Monitor and contents.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj26.asm" frame="4" startpal="0" />
<MapFile type="ASM" filename="../mappings/sprite/Monitor.asm" frame="4" startpal="0" />
</ImageFromMappings>
<ImageFromMappings id="rings">
<ArtFile filename="../art/nemesis/Monitor and contents.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj26.asm" frame="5" startpal="0" />
<MapFile type="ASM" filename="../mappings/sprite/Monitor.asm" frame="5" startpal="0" />
</ImageFromMappings>
<ImageFromMappings id="shoes">
<ArtFile filename="../art/nemesis/Monitor and contents.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj26.asm" frame="6" startpal="0" />
<MapFile type="ASM" filename="../mappings/sprite/Monitor.asm" frame="6" startpal="0" />
</ImageFromMappings>
<ImageFromMappings id="shield">
<ArtFile filename="../art/nemesis/Monitor and contents.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj26.asm" frame="7" startpal="0" />
<MapFile type="ASM" filename="../mappings/sprite/Monitor.asm" frame="7" startpal="0" />
</ImageFromMappings>
<ImageFromMappings id="invincibility">
<ArtFile filename="../art/nemesis/Monitor and contents.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj26.asm" frame="8" startpal="0" />
<MapFile type="ASM" filename="../mappings/sprite/Monitor.asm" frame="8" startpal="0" />
</ImageFromMappings>
<ImageFromMappings id="teleport">
<ArtFile filename="../art/nemesis/Monitor and contents.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj26.asm" frame="9" startpal="0" />
<MapFile type="ASM" filename="../mappings/sprite/Monitor.asm" frame="9" startpal="0" />
</ImageFromMappings>
<ImageFromMappings id="random">
<ArtFile filename="../art/nemesis/Monitor and contents.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj26.asm" frame="10" startpal="0" />
<MapFile type="ASM" filename="../mappings/sprite/Monitor.asm" frame="10" startpal="0" />
</ImageFromMappings>
<ImageFromMappings id="broken">
<ArtFile filename="../art/nemesis/Monitor and contents.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj26.asm" frame="11" startpal="0" />
<MapFile type="ASM" filename="../mappings/sprite/Monitor.asm" frame="11" startpal="0" />
</ImageFromMappings>
</Images>
<Subtypes>
Expand Down
2 changes: 1 addition & 1 deletion SonLVL INI Files/Common/PathSwapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public override void Init(ObjectData data)
{
List<byte> tmpartfile = new List<byte>();
tmpartfile.AddRange(ObjectHelper.OpenArtFile("Common/pathswapper-art.bin", CompressionType.Nemesis));
string mapfile = "../mappings/sprite/obj03.asm";
string mapfile = "../mappings/sprite/Pathswapper.asm";
byte[] artfile1 = tmpartfile.ToArray();
img = ObjectHelper.MapASMToBmp(artfile1, mapfile, 0, 0);
Point off;
Expand Down
8 changes: 4 additions & 4 deletions SonLVL INI Files/EHZ/Waterfall.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
<Images>
<ImageFromMappings id="img1">
<ArtFile filename="../art/nemesis/Waterfall tiles.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj49.asm" frame="1" startpal="1" />
<MapFile type="ASM" filename="../mappings/sprite/Waterfall from EHZ.asm" frame="1" startpal="1" />
</ImageFromMappings>
<ImageFromMappings id="img2">
<ArtFile filename="../art/nemesis/Waterfall tiles.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj49.asm" frame="3" startpal="1" />
<MapFile type="ASM" filename="../mappings/sprite/Waterfall from EHZ.asm" frame="3" startpal="1" />
</ImageFromMappings>
<ImageFromMappings id="img3">
<ArtFile filename="../art/nemesis/Waterfall tiles.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj49.asm" frame="5" startpal="1" />
<MapFile type="ASM" filename="../mappings/sprite/Waterfall from EHZ.asm" frame="5" startpal="1" />
</ImageFromMappings>
<ImageFromMappings id="img4">
<ArtFile filename="../art/nemesis/Waterfall tiles.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj49.asm" frame="6" startpal="1" />
<MapFile type="ASM" filename="../mappings/sprite/Waterfall from EHZ.asm" frame="6" startpal="1" />
</ImageFromMappings>
</Images>
<Subtypes>
Expand Down
4 changes: 2 additions & 2 deletions SonLVL INI Files/HTZ/Lift stake.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
</ImageFromMappings>
<ImageFromMappings id="groundleft">
<ArtFile filename="LevelArt" />
<MapFile type="ASM" filename="../mappings/sprite/obj1C_a.asm" frame="0" startpal="2" />
<MapFile type="ASM" filename="../mappings/sprite/Edge of ground from EHZ and HTZ.asm" frame="0" startpal="2" />
</ImageFromMappings>
<ImageFromMappings id="groundright">
<ArtFile filename="LevelArt" />
<MapFile type="ASM" filename="../mappings/sprite/obj1C_a.asm" frame="1" startpal="2" />
<MapFile type="ASM" filename="../mappings/sprite/Edge of ground from EHZ and HTZ.asm" frame="1" startpal="2" />
</ImageFromMappings>
</Images>
<Subtypes>
Expand Down
2 changes: 1 addition & 1 deletion SonLVL INI Files/HTZ/Seesaw.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Images>
<ImageFromMappings id="seesaw">
<ArtFile filename="../art/nemesis/See-saw in HTZ.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj14_a.asm" frame="0" startpal="0" />
<MapFile type="ASM" filename="../mappings/sprite/Seesaw.asm" frame="0" startpal="0" />
</ImageFromMappings>
</Images>
<Subtypes>
Expand Down
6 changes: 3 additions & 3 deletions SonLVL INI Files/MTZ/Bolt end and rope.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<Images>
<ImageFromMappings id="roperight">
<ArtFile filename="../art/nemesis/Bolt end and rope from MTZ.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj1C_e.asm" frame="0" startpal="2" />
<MapFile type="ASM" filename="../mappings/sprite/Bolt end and rope from MTZ.asm" frame="0" startpal="2" />
</ImageFromMappings>
<ImageFromMappings id="ropeleft">
<ArtFile filename="../art/nemesis/Bolt end and rope from MTZ.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj1C_e.asm" frame="1" startpal="2" />
<MapFile type="ASM" filename="../mappings/sprite/Bolt end and rope from MTZ.asm" frame="1" startpal="2" />
</ImageFromMappings>
<ImageFromMappings id="boltend">
<ArtFile filename="../art/nemesis/Bolt end and rope from MTZ.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj1C_e.asm" frame="2" startpal="1" />
<MapFile type="ASM" filename="../mappings/sprite/Bolt end and rope from MTZ.asm" frame="2" startpal="1" />
</ImageFromMappings>
</Images>
<Subtypes>
Expand Down
18 changes: 9 additions & 9 deletions SonLVL INI Files/OOZ/Falling oil.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,39 @@
<Images>
<ImageFromMappings id="img1">
<ArtFile filename="../art/nemesis/Cascading oil from OOZ.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj1C_c.asm" frame="0" startpal="2" />
<MapFile type="ASM" filename="../mappings/sprite/Cascading oil from OOZ.asm" frame="0" startpal="2" />
</ImageFromMappings>
<ImageFromMappings id="img2">
<ArtFile filename="../art/nemesis/Cascading oil from OOZ.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj1C_c.asm" frame="2" startpal="2" />
<MapFile type="ASM" filename="../mappings/sprite/Cascading oil from OOZ.asm" frame="2" startpal="2" />
</ImageFromMappings>
<ImageFromMappings id="img3">
<ArtFile filename="../art/nemesis/Cascading oil from OOZ.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj1C_c.asm" frame="4" startpal="2" />
<MapFile type="ASM" filename="../mappings/sprite/Cascading oil from OOZ.asm" frame="4" startpal="2" />
</ImageFromMappings>
<ImageFromMappings id="img4">
<ArtFile filename="../art/nemesis/Cascading oil from OOZ.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj1C_c.asm" frame="5" startpal="2" />
<MapFile type="ASM" filename="../mappings/sprite/Cascading oil from OOZ.asm" frame="5" startpal="2" />
</ImageFromMappings>
<ImageFromMappings id="img5">
<ArtFile filename="../art/nemesis/Cascading oil from OOZ.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj1C_d.asm" frame="0" startpal="2" />
<MapFile type="ASM" filename="../mappings/sprite/Cascading oil from OOZ 2.asm" frame="0" startpal="2" />
</ImageFromMappings>
<ImageFromMappings id="img6">
<ArtFile filename="../art/nemesis/Cascading oil from OOZ.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj1C_d.asm" frame="1" startpal="2" />
<MapFile type="ASM" filename="../mappings/sprite/Cascading oil from OOZ 2.asm" frame="1" startpal="2" />
</ImageFromMappings>
<ImageFromMappings id="img7">
<ArtFile filename="../art/nemesis/Cascading oil from OOZ.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj1C_d.asm" frame="2" startpal="2" />
<MapFile type="ASM" filename="../mappings/sprite/Cascading oil from OOZ 2.asm" frame="2" startpal="2" />
</ImageFromMappings>
<ImageFromMappings id="img8">
<ArtFile filename="../art/nemesis/Cascading oil from OOZ.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj1C_d.asm" frame="3" startpal="2" />
<MapFile type="ASM" filename="../mappings/sprite/Cascading oil from OOZ 2.asm" frame="3" startpal="2" />
</ImageFromMappings>
<ImageFromMappings id="img9">
<ArtFile filename="../art/nemesis/Cascading oil from OOZ.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj1C_d.asm" frame="4" startpal="2" />
<MapFile type="ASM" filename="../mappings/sprite/Cascading oil from OOZ 2.asm" frame="4" startpal="2" />
</ImageFromMappings>
</Images>
<Subtypes>
Expand Down
4 changes: 2 additions & 2 deletions SonLVL INI Files/OOZ/PushSpring.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<Images>
<ImageFromMappings id="Vertical">
<ArtFile filename="../art/nemesis/Push spring from OOZ.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj45.asm" frame="0" startpal="2" />
<MapFile type="ASM" filename="../mappings/sprite/Push spring from OOZ.asm" frame="0" startpal="2" />
</ImageFromMappings>
<ImageFromMappings id="Horizontal">
<ArtFile filename="../art/nemesis/Push spring from OOZ.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj45.asm" frame="10" startpal="2" />
<MapFile type="ASM" filename="../mappings/sprite/Push spring from OOZ.asm" frame="10" startpal="2" />
</ImageFromMappings>
</Images>
<Properties>
Expand Down
6 changes: 3 additions & 3 deletions SonLVL INI Files/SCZ/Clouds.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<Images>
<ImageFromMappings id="img1">
<ArtFile filename="../art/nemesis/Clouds.nem" />
<MapFile type="Binary" filename="../mappings/sprite/objB3.bin" frame="0" startpal="2" />
<MapFile type="ASM" filename="../mappings/sprite/Clouds from SCZ.asm" frame="0" startpal="2" />
</ImageFromMappings>
<ImageFromMappings id="img2">
<ArtFile filename="../art/nemesis/Clouds.nem" />
<MapFile type="Binary" filename="../mappings/sprite/objB3.bin" frame="1" startpal="2" />
<MapFile type="ASM" filename="../mappings/sprite/Clouds from SCZ.asm" frame="1" startpal="2" />
</ImageFromMappings>
<ImageFromMappings id="img3">
<ArtFile filename="../art/nemesis/Clouds.nem" />
<MapFile type="Binary" filename="../mappings/sprite/objB3.bin" frame="2" startpal="2" />
<MapFile type="ASM" filename="../mappings/sprite/Clouds from SCZ.asm" frame="2" startpal="2" />
</ImageFromMappings>
</Images>
<Subtypes>
Expand Down
8 changes: 4 additions & 4 deletions SonLVL INI Files/WFZ/Cycling palette switcher.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
<Images>
<ImageFromMappings id="imgsmall">
<ArtFile filename="../art/nemesis/Ring.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj03.asm" frame="0" startpal="1" />
<MapFile type="ASM" filename="../mappings/sprite/Pathswapper.asm" frame="0" startpal="1" />
</ImageFromMappings>
<ImageFromMappings id="imgmedium">
<ArtFile filename="../art/nemesis/Ring.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj03.asm" frame="1" startpal="1" />
<MapFile type="ASM" filename="../mappings/sprite/Pathswapper.asm" frame="1" startpal="1" />
</ImageFromMappings>
<ImageFromMappings id="imglarge">
<ArtFile filename="../art/nemesis/Ring.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj03.asm" frame="2" startpal="1" />
<MapFile type="ASM" filename="../mappings/sprite/Pathswapper.asm" frame="2" startpal="1" />
</ImageFromMappings>
<ImageFromMappings id="imgxlarge">
<ArtFile filename="../art/nemesis/Ring.nem" />
<MapFile type="ASM" filename="../mappings/sprite/obj03.asm" frame="3" startpal="1" />
<MapFile type="ASM" filename="../mappings/sprite/Pathswapper.asm" frame="3" startpal="1" />
</ImageFromMappings>
</Images>
<Subtypes>
Expand Down
6 changes: 3 additions & 3 deletions SonLVL INI Files/obj.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
codefile=Common/RingGroup.cs
codetype=S2ObjectDefinitions.Common.RingGroup
art=../art/nemesis/Ring.nem
mapasm=../mappings/sprite/obj37_a.asm
mapasm=../mappings/sprite/Ring.asm
pal=1
spacing=24
[Sonic]
Expand All @@ -17,7 +17,7 @@ codetype=S2ObjectDefinitions.Common.PathSwapper
[0D]
name=Signpost
art=../art/nemesis/Signpost.nem
mapasm=../mappings/sprite/obj0D_a.asm
mapasm=../mappings/sprite/1P signpost.asm
frame=2
[26]
xmlfile=Common/Monitor.xml
Expand All @@ -35,5 +35,5 @@ codetype=S2ObjectDefinitions.Common.InvisibleBlock
[79]
name=Star Post
art=../art/nemesis/Star pole.nem
mapasm=../mappings/sprite/obj79_a.asm
mapasm=../mappings/sprite/Starpost.asm
rememberstate=True
4 changes: 2 additions & 2 deletions SonLVL INI Files/objCNZ.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[44]
name=Round Bumper
art=../art/nemesis/Round bumper from CNZ.nem
mapasm=../mappings/sprite/obj44.asm
mapasm=../mappings/sprite/Round bumper from CNZ.asm
frame=0
pal=2
rememberstate=True
Expand Down Expand Up @@ -46,6 +46,6 @@ xmlfile=CNZ/Bumper.xml
[D8]
name=Colored Point Block
art=../art/nemesis/Drop target from CNZ.nem
mapasm=../mappings/sprite/objD8.asm
mapasm=../mappings/sprite/Drop target from CNZ.asm
frame=0
pal=2
Loading