Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge branch 'master' into MapMacros
- Loading branch information
Showing
28 changed files
with
1,450 additions
and
251 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
Type: Level | ||
|
||
Zone ID: C | ||
Act ID: 0 | ||
|
||
Object Def: objdef\s2obj | ||
Object Palette: objdef\s2obj1.pcx | ||
|
||
8x8 Compression: 1 | ||
Num 8x8 Pages: 1 | ||
8x8 Tiles Page 0: ..\art\kosinski\CNZ.bin | ||
|
||
16x16 Compression: 1 | ||
Num 16x16 Pages: 1 | ||
Page0 8x8 Page: 0 | ||
16x16 Tiles Page 0: ..\mappings\16x16\CNZ.bin | ||
|
||
Metatile Size: 128 | ||
Metatile Compression: 1 | ||
Num Metatile Pages: 1 | ||
Page0 16x16 Page: 0 | ||
Metatile Tiles Page 0: ..\mappings\128x128\CNZ.bin | ||
|
||
Layout Format: 1 | ||
Layout Compression: 1 | ||
BG 128x128 Page: 0 | ||
Level Layout: ..\level\layout\CNZ_1.bin | ||
|
||
Objects Format: 3 | ||
Objects: ..\level\objects\CNZ_1 (REV00).bin | ||
Rings Format: 1 | ||
Objects: ..\level\rings\CNZ_1.bin | ||
Misc Format: 1 | ||
Objects: ..\level\objects\CNZ 1 Bumpers.bin | ||
Num Start Positions: 1 | ||
Start Position 0: ..\startpos\CNZ_1.bin | ||
|
||
Palettes- | ||
|
||
Number of files: 2 | ||
|
||
Palette 1- | ||
|
||
Start index: 0 | ||
Number of entries: 16 | ||
File: ..\art\palettes\SonicAndTails.bin | ||
|
||
Palette 2- | ||
|
||
Start index: 16 | ||
Number of entries: 48 | ||
File: ..\art\palettes\CNZ.bin | ||
|
||
Collision Map Format: 0 | ||
Collision Array: ..\collision\Collision array 1.bin | ||
Rotated Collision Array: ..\collision\Collision array 2.bin | ||
Angle Array: ..\collision\Curve and resistance mapping.bin | ||
|
||
Collision Index Format: 1 | ||
Collision Index Compression: 1 | ||
Collision Index 1: ..\collision\CNZ primary 16x16 collision index.bin | ||
Collision Index 2: ..\collision\CNZ secondary 16x16 collision index.bin | ||
|
||
Game Name: Sonic 2 | ||
|
||
-EOF- |
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,66 @@ | ||
Type: Level | ||
|
||
Zone ID: C | ||
Act ID: 0 | ||
|
||
Object Def: objdef\s2obj | ||
Object Palette: objdef\s2obj1.pcx | ||
|
||
8x8 Compression: 1 | ||
Num 8x8 Pages: 1 | ||
8x8 Tiles Page 0: ..\art\kosinski\CNZ.bin | ||
|
||
16x16 Compression: 1 | ||
Num 16x16 Pages: 1 | ||
Page0 8x8 Page: 0 | ||
16x16 Tiles Page 0: ..\mappings\16x16\CNZ.bin | ||
|
||
Metatile Size: 128 | ||
Metatile Compression: 1 | ||
Num Metatile Pages: 1 | ||
Page0 16x16 Page: 0 | ||
Metatile Tiles Page 0: ..\mappings\128x128\CNZ.bin | ||
|
||
Layout Format: 1 | ||
Layout Compression: 1 | ||
BG 128x128 Page: 0 | ||
Level Layout: ..\level\layout\CNZ_1.bin | ||
|
||
Objects Format: 3 | ||
Objects: ..\level\objects\CNZ_1_2P (REV00).bin | ||
Rings Format: 1 | ||
Objects: ..\level\rings\CNZ_1.bin | ||
Misc Format: 1 | ||
Objects: ..\level\objects\CNZ 1 Bumpers.bin | ||
Num Start Positions: 1 | ||
Start Position 0: ..\startpos\CNZ_1.bin | ||
|
||
Palettes- | ||
|
||
Number of files: 2 | ||
|
||
Palette 1- | ||
|
||
Start index: 0 | ||
Number of entries: 16 | ||
File: ..\art\palettes\SonicAndTails.bin | ||
|
||
Palette 2- | ||
|
||
Start index: 16 | ||
Number of entries: 48 | ||
File: ..\art\palettes\CNZ.bin | ||
|
||
Collision Map Format: 0 | ||
Collision Array: ..\collision\Collision array 1.bin | ||
Rotated Collision Array: ..\collision\Collision array 2.bin | ||
Angle Array: ..\collision\Curve and resistance mapping.bin | ||
|
||
Collision Index Format: 1 | ||
Collision Index Compression: 1 | ||
Collision Index 1: ..\collision\CNZ primary 16x16 collision index.bin | ||
Collision Index 2: ..\collision\CNZ secondary 16x16 collision index.bin | ||
|
||
Game Name: Sonic 2 | ||
|
||
-EOF- |
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,66 @@ | ||
Type: Level | ||
|
||
Zone ID: C | ||
Act ID: 1 | ||
|
||
Object Def: objdef\s2obj | ||
Object Palette: objdef\s2obj1.pcx | ||
|
||
8x8 Compression: 1 | ||
Num 8x8 Pages: 1 | ||
8x8 Tiles Page 0: ..\art\kosinski\CNZ.bin | ||
|
||
16x16 Compression: 1 | ||
Num 16x16 Pages: 1 | ||
Page0 8x8 Page: 0 | ||
16x16 Tiles Page 0: ..\mappings\16x16\CNZ.bin | ||
|
||
Metatile Size: 128 | ||
Metatile Compression: 1 | ||
Num Metatile Pages: 1 | ||
Page0 16x16 Page: 0 | ||
Metatile Tiles Page 0: ..\mappings\128x128\CNZ.bin | ||
|
||
Layout Format: 1 | ||
Layout Compression: 1 | ||
BG 128x128 Page: 0 | ||
Level Layout: ..\level\layout\CNZ_2.bin | ||
|
||
Objects Format: 3 | ||
Objects: ..\level\objects\CNZ_2 (REV00).bin | ||
Rings Format: 1 | ||
Objects: ..\level\rings\CNZ_2.bin | ||
Misc Format: 1 | ||
Objects: ..\level\objects\CNZ 2 Bumpers.bin | ||
Num Start Positions: 1 | ||
Start Position 0: ..\startpos\CNZ_2.bin | ||
|
||
Palettes- | ||
|
||
Number of files: 2 | ||
|
||
Palette 1- | ||
|
||
Start index: 0 | ||
Number of entries: 16 | ||
File: ..\art\palettes\SonicAndTails.bin | ||
|
||
Palette 2- | ||
|
||
Start index: 16 | ||
Number of entries: 48 | ||
File: ..\art\palettes\CNZ.bin | ||
|
||
Collision Map Format: 0 | ||
Collision Array: ..\collision\Collision array 1.bin | ||
Rotated Collision Array: ..\collision\Collision array 2.bin | ||
Angle Array: ..\collision\Curve and resistance mapping.bin | ||
|
||
Collision Index Format: 1 | ||
Collision Index Compression: 1 | ||
Collision Index 1: ..\collision\CNZ primary 16x16 collision index.bin | ||
Collision Index 2: ..\collision\CNZ secondary 16x16 collision index.bin | ||
|
||
Game Name: Sonic 2 | ||
|
||
-EOF- |
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,66 @@ | ||
Type: Level | ||
|
||
Zone ID: C | ||
Act ID: 1 | ||
|
||
Object Def: objdef\s2obj | ||
Object Palette: objdef\s2obj1.pcx | ||
|
||
8x8 Compression: 1 | ||
Num 8x8 Pages: 1 | ||
8x8 Tiles Page 0: ..\art\kosinski\CNZ.bin | ||
|
||
16x16 Compression: 1 | ||
Num 16x16 Pages: 1 | ||
Page0 8x8 Page: 0 | ||
16x16 Tiles Page 0: ..\mappings\16x16\CNZ.bin | ||
|
||
Metatile Size: 128 | ||
Metatile Compression: 1 | ||
Num Metatile Pages: 1 | ||
Page0 16x16 Page: 0 | ||
Metatile Tiles Page 0: ..\mappings\128x128\CNZ.bin | ||
|
||
Layout Format: 1 | ||
Layout Compression: 1 | ||
BG 128x128 Page: 0 | ||
Level Layout: ..\level\layout\CNZ_2.bin | ||
|
||
Objects Format: 3 | ||
Objects: ..\level\objects\CNZ_2_2P (REV00).bin | ||
Rings Format: 1 | ||
Objects: ..\level\rings\CNZ_2.bin | ||
Misc Format: 1 | ||
Objects: ..\level\objects\CNZ 2 Bumpers.bin | ||
Num Start Positions: 1 | ||
Start Position 0: ..\startpos\CNZ_2.bin | ||
|
||
Palettes- | ||
|
||
Number of files: 2 | ||
|
||
Palette 1- | ||
|
||
Start index: 0 | ||
Number of entries: 16 | ||
File: ..\art\palettes\SonicAndTails.bin | ||
|
||
Palette 2- | ||
|
||
Start index: 16 | ||
Number of entries: 48 | ||
File: ..\art\palettes\CNZ.bin | ||
|
||
Collision Map Format: 0 | ||
Collision Array: ..\collision\Collision array 1.bin | ||
Rotated Collision Array: ..\collision\Collision array 2.bin | ||
Angle Array: ..\collision\Curve and resistance mapping.bin | ||
|
||
Collision Index Format: 1 | ||
Collision Index Compression: 1 | ||
Collision Index 1: ..\collision\CNZ primary 16x16 collision index.bin | ||
Collision Index 2: ..\collision\CNZ secondary 16x16 collision index.bin | ||
|
||
Game Name: Sonic 2 | ||
|
||
-EOF- |
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,65 @@ | ||
Type: Level | ||
|
||
Zone ID: 0 | ||
Act ID: 1 | ||
|
||
Object Def: objdef\s2obj | ||
Object Palette: objdef\s2obj1.pcx | ||
|
||
8x8 Compression: 1 | ||
Num 8x8 Pages: 1 | ||
8x8 Tiles Page 0: ..\art\kosinski\EHZ_HTZ.bin | ||
|
||
16x16 Compression: 1 | ||
Num 16x16 Pages: 1 | ||
Page0 8x8 Page: 0 | ||
16x16 Tiles Page 0: ..\mappings\16x16\EHZ.bin | ||
|
||
Metatile Size: 128 | ||
Metatile Compression: 1 | ||
Num Metatile Pages: 1 | ||
Page0 16x16 Page: 0 | ||
Metatile Tiles Page 0: ..\mappings\128x128\EHZ_HTZ.bin | ||
|
||
Layout Format: 1 | ||
Layout Compression: 1 | ||
BG 128x128 Page: 0 | ||
Level Layout: ..\level\layout\EHZ_2.bin | ||
|
||
Objects Format: 3 | ||
Objects: ..\level\objects\EHZ_2 (REV00).bin | ||
Rings Format: 1 | ||
Objects: ..\level\rings\EHZ_2.bin | ||
Misc Format: 0 | ||
Num Start Positions: 1 | ||
Start Position 0: ..\startpos\EHZ_2.bin | ||
|
||
Palettes- | ||
|
||
Number of files: 2 | ||
|
||
Palette 1- | ||
|
||
Start index: 0 | ||
Number of entries: 16 | ||
File: ..\art\palettes\SonicAndTails.bin | ||
|
||
Palette 2- | ||
|
||
Start index: 16 | ||
Number of entries: 48 | ||
File: ..\art\palettes\EHZ.bin | ||
|
||
Collision Map Format: 0 | ||
Collision Array: ..\collision\Collision array 1.bin | ||
Rotated Collision Array: ..\collision\Collision array 2.bin | ||
Angle Array: ..\collision\Curve and resistance mapping.bin | ||
|
||
Collision Index Format: 1 | ||
Collision Index Compression: 1 | ||
Collision Index 1: ..\collision\EHZ and HTZ primary 16x16 collision index.bin | ||
Collision Index 2: ..\collision\EHZ and HTZ secondary 16x16 collision index.bin | ||
|
||
Game Name: Sonic 2 | ||
|
||
-EOF- |
Oops, something went wrong.