Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into ProjectSonic1TwoEight
- Loading branch information
Showing
40 changed files
with
1,071 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <ObjDef xmlns="http://www.sonicretro.org" Name="Invisible lava marker" Image="img1" RememberState="false"> | ||
| <Images> | ||
| <ImageFromMappings id="img1"> | ||
| <ArtFile filename=".../artnem/Monitors.bin" /> | ||
| <MapFile type="Binary" filename="Common/Invisible lava marker map.bin" frame="0" startpal="0" /> | ||
| </ImageFromMappings> | ||
| <ImageFromMappings id="img2"> | ||
| <ArtFile filename=".../artnem/Monitors.bin" /> | ||
| <MapFile type="Binary" filename="Common/Invisible lava marker map.bin" frame="1" startpal="0" /> | ||
| </ImageFromMappings> | ||
| <ImageFromMappings id="img3"> | ||
| <ArtFile filename=".../artnem/Monitors.bin" /> | ||
| <MapFile type="Binary" filename="Common/Invisible lava marker map.bin" frame="2" startpal="0" /> | ||
| </ImageFromMappings> | ||
| </Images> | ||
| <Subtypes> | ||
| <Subtype id="00" name="Small" image="img1" /> | ||
| <Subtype id="01" name="Medium" image="img2" /> | ||
| <Subtype id="02" name="Large" image="img3" /> | ||
| </Subtypes> | ||
| </ObjDef> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| <?xml version="1.0"?> | ||
| <ObjDef xmlns="http://www.sonicretro.org" Name="Block/Cork" Image="cork" DefaultSubtype="27"> | ||
| <Images> | ||
| <ImageFromMappings id="fallingplatform"> | ||
| <ArtFile filename="../artnem/LZ Horizontal Door.bin"/> | ||
| <MapFile type="ASM" filename="../_maps/LZ Blocks.asm" frame="0" startpal="2"/> | ||
| </ImageFromMappings> | ||
| <ImageFromMappings id="wideplatform"> | ||
| <ArtFile filename="../artnem/LZ Rising Platform.bin" offset="3360"/> | ||
| <MapFile type="ASM" filename="../_maps/LZ Blocks.asm" frame="1" startpal="2"/> | ||
| </ImageFromMappings> | ||
| <ImageFromMappings id="cork"> | ||
| <ArtFile filename="../artnem/LZ Cork.bin" offset="9024"/> | ||
| <MapFile type="ASM" filename="../_maps/LZ Blocks.asm" frame="2" startpal="2"/> | ||
| </ImageFromMappings> | ||
| <ImageFromMappings id="staticplatform"> | ||
| <ArtFile filename="../artnem/LZ 32x32 Block.bin" offset="48960" /> | ||
| <MapFile type="ASM" filename="../_maps/LZ Blocks.asm" frame="3" startpal="3"/> | ||
| </ImageFromMappings> | ||
| </Images> | ||
| <Subtypes> | ||
| <Subtype id="01" name="Falling Platform" image="fallingplatform"/> | ||
| <Subtype id="13" name="Rising Platform" image="wideplatform"/> | ||
| <Subtype id="27" name="Cork" image="cork"/> | ||
| <Subtype id="30" name="Block" image="staticplatform"/> | ||
| </Subtypes> | ||
| </ObjDef> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <ObjDef xmlns="http://www.sonicretro.org" Namespace="S1ObjectDefinitions.LZ" TypeName="Bubbles" Language="cs" Name="Bubbles" Image="img1" DefaultSubtype="80"> | ||
| <Images> | ||
| <ImageFromMappings id="img1"> | ||
| <ArtFile filename="../artnem/LZ Bubbles & Countdown.bin"/> | ||
| <MapFile type="ASM" filename="../_maps/Bubbles.asm" frame="19" startpal="0" /> | ||
| </ImageFromMappings> | ||
| </Images> | ||
| <Properties> | ||
| <CustomProperty name="Delay" displayname="Bubble-Making Delay" type="int"> | ||
| <get><![CDATA[return obj.SubType & 0x7F;]]></get> | ||
| <set><![CDATA[obj.SubType = (byte)(System.Math.Min(0x7F, value) | 0x80);]]></set> | ||
| </CustomProperty> | ||
| </Properties> | ||
| <Display> | ||
| <DisplayOption> | ||
| <ImageRef image="img1" /> | ||
| </DisplayOption> | ||
| </Display> | ||
| </ObjDef> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <?xml version="1.0"?> | ||
| <ObjDef xmlns="http://www.sonicretro.org" Name="Conveyor Belt" Image="wheel"> | ||
| <Images> | ||
| <ImageFromMappings id="wheel"> | ||
| <ArtFile filename="../artnem/LZ Wheel.bin"/> | ||
| <MapFile type="ASM" filename="../_maps/LZ Conveyor.asm" frame="0" startpal="0"/> | ||
| </ImageFromMappings> | ||
| <ImageFromMappings id="platform"> | ||
| <ArtFile filename="../artnem/LZ Wheel.bin"/> | ||
| <MapFile type="ASM" filename="../_maps/LZ Conveyor.asm" frame="4" startpal="2"/> | ||
| </ImageFromMappings> | ||
| </Images> | ||
| <Subtypes> | ||
| <Subtype id="80" name="Spawner (Group 0)" image="platform"/> | ||
| <Subtype id="81" name="Spawner (Group 1)" image="platform"/> | ||
| <Subtype id="82" name="Spawner (Group 2)" image="platform"/> | ||
| <Subtype id="83" name="Spawner (Group 3)" image="platform"/> | ||
| <Subtype id="84" name="Spawner (Group 4)" image="platform"/> | ||
| <Subtype id="85" name="Spawner (Group 5)" image="platform"/> | ||
| <Subtype id="7F" name="Wheel" image="wheel"/> | ||
| </Subtypes> | ||
| </ObjDef> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| <?xml version="1.0"?> | ||
| <ObjDef xmlns="http://www.sonicretro.org" Name="Door" Image="vertical" RememberState="true"> | ||
| <Images> | ||
| <ImageFromMappings id="vertical"> | ||
| <ArtFile filename="../artnem/LZ Vertical Door.bin"/> | ||
| <MapFile type="ASM" filename="../_maps/Floating Blocks and Doors.asm" frame="6" startpal="2"/> | ||
| </ImageFromMappings> | ||
| <ImageFromMappings id="horizontal"> | ||
| <ArtFile filename="../artnem/LZ Horizontal Door.bin" offset="1088"/> | ||
| <MapFile type="ASM" filename="../_maps/Floating Blocks and Doors.asm" frame="7" startpal="2"/> | ||
| </ImageFromMappings> | ||
| </Images> | ||
| <Properties> | ||
| <BitsProperty name="SwitchID" displayname="Switch ID" type="SwitchID" startbit="0" length="4" /> | ||
| <BitsProperty name="Type" type="DoorType" startbit="4" length="4" /> | ||
| </Properties> | ||
| <Enums> | ||
| <Enum name="DoorType"> | ||
| <EnumMember name="Vertical" value="14" /> | ||
| <EnumMember name="Horizontal" value="15" /> | ||
| </Enum> | ||
| <Enum name="SwitchID"> | ||
| <EnumMember name="Switch 00" /> | ||
| <EnumMember name="Switch 01" /> | ||
| <EnumMember name="Switch 02" /> | ||
| <EnumMember name="Switch 03" /> | ||
| <EnumMember name="Switch 04" /> | ||
| <EnumMember name="Switch 05" /> | ||
| <EnumMember name="Switch 06" /> | ||
| <EnumMember name="Switch 07" /> | ||
| <EnumMember name="Switch 08" /> | ||
| <EnumMember name="Switch 09" /> | ||
| <EnumMember name="Switch 0A" /> | ||
| <EnumMember name="Switch 0B" /> | ||
| <EnumMember name="Switch 0C" /> | ||
| <EnumMember name="Switch 0D" /> | ||
| <EnumMember name="Switch 0E" /> | ||
| <EnumMember name="Switch 0F" /> | ||
| </Enum> | ||
| </Enums> | ||
| <Display> | ||
| <DisplayOption> | ||
| <Condition property="Type" value="Vertical" /> | ||
| <ImageRef image="vertical" /> | ||
| </DisplayOption> | ||
| <DisplayOption> | ||
| <Condition property="Type" value="Horizontal" /> | ||
| <ImageRef image="horizontal" xflip="NeverFlip" /> | ||
| </DisplayOption> | ||
| </Display> | ||
| </ObjDef> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <?xml version="1.0"?> | ||
| <ObjDef xmlns="http://www.sonicretro.org" Name="Flapping Door" Image="img1" RememberState="true"> | ||
| <Images> | ||
| <ImageFromMappings id="img1"> | ||
| <ArtFile filename="../artnem/LZ Flapping Door.bin"/> | ||
| <MapFile type="ASM" filename="../_maps/Flapping Door.asm" frame="0" startpal="2"/> | ||
| </ImageFromMappings> | ||
| </Images> | ||
| <Properties> | ||
| <BitsProperty name="Delay" displayname="Delay (Seconds)" type="int" startbit="0" length="8" /> | ||
| </Properties> | ||
| <Display> | ||
| <DisplayOption> | ||
| <ImageRef image="img1" /> | ||
| </DisplayOption> | ||
| </Display> | ||
| </ObjDef> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <?xml version="1.0"?> | ||
| <ObjDef xmlns="http://www.sonicretro.org" Name="Harpoon" Image="vertical" RememberState="true"> | ||
| <Images> | ||
| <ImageFromMappings id="horizontal"> | ||
| <ArtFile filename="../artnem/LZ Harpoon.bin"/> | ||
| <MapFile type="ASM" filename="../_maps/Harpoon.asm" frame="0" startpal="0"/> | ||
| </ImageFromMappings> | ||
| <ImageFromMappings id="vertical"> | ||
| <ArtFile filename="../artnem/LZ Harpoon.bin"/> | ||
| <MapFile type="ASM" filename="../_maps/Harpoon.asm" frame="3" startpal="0"/> | ||
| </ImageFromMappings> | ||
| </Images> | ||
| <Subtypes> | ||
| <Subtype id="00" name="Horizontal" image="horizontal"/> | ||
| <Subtype id="02" name="Vertical" image="vertical"/> | ||
| </Subtypes> | ||
| </ObjDef> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <ObjDef xmlns="http://www.sonicretro.org" Name="Orbinaut" RememberState="true"> | ||
| <Images> | ||
| <ImageFromMappings id="spikeball"> | ||
| <ArtFile filename="../artnem/Enemy Orbinaut.bin"/> | ||
| <MapFile type="ASM" filename="../_maps/Orbinaut.asm" frame="3" startpal="0" /> | ||
| </ImageFromMappings> | ||
| <ImageFromMappings id="body"> | ||
| <ArtFile filename="../artnem/Enemy Orbinaut.bin"/> | ||
| <MapFile type="ASM" filename="../_maps/Orbinaut.asm" frame="0" startpal="0" /> | ||
| </ImageFromMappings> | ||
| </Images> | ||
| <DefaultImage> | ||
| <ImageRef image="spikeball"> | ||
| <Offset X="-7" Y="-15" /> | ||
| </ImageRef> | ||
| <ImageRef image="spikeball"> | ||
| <Offset X="6" Y="14" /> | ||
| </ImageRef> | ||
| <ImageRef image="spikeball"> | ||
| <Offset X="-15" Y="6" /> | ||
| </ImageRef> | ||
| <ImageRef image="spikeball"> | ||
| <Offset X="14" Y="-7" /> | ||
| </ImageRef> | ||
| <ImageRef image="body" /> | ||
| </DefaultImage> | ||
| <Display> | ||
| <DisplayOption> | ||
| <ImageRef image="spikeball"> | ||
| <Offset X="-7" Y="-15" /> | ||
| </ImageRef> | ||
| <ImageRef image="spikeball"> | ||
| <Offset X="6" Y="14" /> | ||
| </ImageRef> | ||
| <ImageRef image="spikeball"> | ||
| <Offset X="-15" Y="6" /> | ||
| </ImageRef> | ||
| <ImageRef image="spikeball"> | ||
| <Offset X="14" Y="-7" /> | ||
| </ImageRef> | ||
| <ImageRef image="body" /> | ||
| </DisplayOption> | ||
| </Display> | ||
| </ObjDef> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <?xml version="1.0"?> | ||
| <ObjDef xmlns="http://www.sonicretro.org" Name="Pole" Image="img1"> | ||
| <Images> | ||
| <ImageFromMappings id="img1"> | ||
| <ArtFile filename="../artnem/LZ Breakable Pole.bin"/> | ||
| <MapFile type="ASM" filename="../_maps/Pole that Breaks.asm" frame="0" startpal="2"/> | ||
| </ImageFromMappings> | ||
| </Images> | ||
| <Properties> | ||
| <BitsProperty name="Delay" displayname="Delay (Seconds)" type="int" startbit="0" length="8" /> | ||
| </Properties> | ||
| <Display> | ||
| <DisplayOption> | ||
| <ImageRef image="img1" /> | ||
| </DisplayOption> | ||
| </Display> | ||
| </ObjDef> |
Oops, something went wrong.