Merge upstream

AS/s3p2bin/clowncommon.h

@@ -0,0 +1,39 @@
+/*
+	(C) 2021 Clownacy
+
+	This software is provided 'as-is', without any express or implied
+	warranty.  In no event will the authors be held liable for any damages
+	arising from the use of this software.
+
+	Permission is granted to anyone to use this software for any purpose,
+	including commercial applications, and to alter it and redistribute it
+	freely, subject to the following restrictions:
+
+	1. The origin of this software must not be misrepresented; you must not
+	   claim that you wrote the original software. If you use this software
+	   in a product, an acknowledgment in the product documentation would be
+	   appreciated but is not required.
+	2. Altered source versions must be plainly marked as such, and must not be
+	   misrepresented as being the original software.
+	3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef CLOWNCOMMON_H
+#define CLOWNCOMMON_H
+
+/* Boolean */
+typedef unsigned char cc_bool_small;
+typedef unsigned int cc_bool_fast;
+enum
+{
+	CC_FALSE = 0,
+	CC_TRUE = 1
+};
+
+/* Common macros */
+#define CC_MIN(a, b) ((a) < (b) ? (a) : (b))
+#define CC_MAX(a, b) ((a) > (b) ? (a) : (b))
+#define CC_CLAMP(x, min, max) (CC_MIN((max), CC_MAX((min), (x))))
+#define CC_COUNT_OF(array) (sizeof(array) / sizeof(*array))
+
+#endif /* CLOWNCOMMON_H */

Build Scripts/build.py

@@ -66,19 +66,24 @@ def build(targetName, def0, def1, accurate):
 
 	assembleCommand = [asBinary, "-x", "-xx", "-n", "-c", "-A", "-L"];
 
+	basedir = os.path.relpath(os.getcwd())
 	if def0 is None:
 		assembleCommand.append("-o");
 		assembleCommand.append("sonic3k.p");
 		assembleCommand.append("-olist");
 		assembleCommand.append("sonic3k.lst");
 		assembleCommand.append("-shareout");
 		assembleCommand.append("sonic3k.h");
+		assembleCommand.append("-i");
+		assembleCommand.append(basedir);
 
 		# Input asm file
 		assembleCommand.append("s3.asm");
 	else:
 		assembleCommand.append(def0);
 		assembleCommand.append(def1);
+		assembleCommand.append("-i");
+		assembleCommand.append(basedir);
 
 		# Input asm file
 		assembleCommand.append("sonic3k.asm");

Build Scripts/buildS3.bat

@@ -26,7 +26,7 @@ set AS_MSGPATH=AS\Win32
 set USEANSI=n
 
 REM // allow the user to choose to output error messages to file by supplying the -logerrors parameter
-IF "%1"=="-logerrors" ( "AS\Win32\asw.exe" -xx -q -c -o sonic3k.p -olist sonic3k.lst -shareout sonic3k.h -E sonic3k.log -A -L s3.asm ) ELSE "AS\Win32\asw.exe" -xx -q -c -o sonic3k.p -olist sonic3k.lst -shareout sonic3k.h -A -L s3.asm
+IF "%1"=="-logerrors" ( "AS\Win32\asw.exe" -xx -q -c -o sonic3k.p -olist sonic3k.lst -shareout sonic3k.h -E sonic3k.log -A -L -i "%cd%" s3.asm ) ELSE "AS\Win32\asw.exe" -xx -q -c -o sonic3k.p -olist sonic3k.lst -shareout sonic3k.h -A -L -i "%cd%" s3.asm
 
 REM // if there were errors, a log file is produced
 IF "%1"=="-logerrors" ( IF EXIST sonic3k.log goto LABLERROR3 )

Build Scripts/buildS3Complete.bat

@@ -26,7 +26,7 @@ set AS_MSGPATH=AS\Win32
 set USEANSI=n
 
 REM // allow the user to choose to output error messages to file by supplying the -logerrors parameter
-IF "%1"=="-logerrors" ( "AS\Win32\asw.exe" -xx -q -c -D Sonic3_Complete=1 -E -A -L sonic3k.asm ) ELSE "AS\Win32\asw.exe" -xx -q -c -D Sonic3_Complete=1 -A -L sonic3k.asm
+IF "%1"=="-logerrors" ( "AS\Win32\asw.exe" -xx -q -c -D Sonic3_Complete=1 -E -A -L -i "%cd%" sonic3k.asm ) ELSE "AS\Win32\asw.exe" -xx -q -c -D Sonic3_Complete=1 -A -L -i "%cd%" sonic3k.asm
 
 REM // if there were errors, a log file is produced
 IF "%1"=="-logerrors" ( IF EXIST sonic3k.log goto LABLERROR3 )

Build Scripts/buildSK.bat

@@ -26,7 +26,7 @@ set AS_MSGPATH=AS\Win32
 set USEANSI=n
 
 REM // allow the user to choose to output error messages to file by supplying the -logerrors parameter
-IF "%1"=="-logerrors" ( "AS\Win32\asw.exe" -xx -q -c -D Sonic3_Complete=0 -E -A -L sonic3k.asm ) ELSE "AS\Win32\asw.exe" -xx -q -c -D Sonic3_Complete=0 -A -L sonic3k.asm
+IF "%1"=="-logerrors" ( "AS\Win32\asw.exe" -xx -q -c -D Sonic3_Complete=0 -E -A -L -i "%cd%" sonic3k.asm ) ELSE "AS\Win32\asw.exe" -xx -q -c -D Sonic3_Complete=0 -A -L -i "%cd%" sonic3k.asm
 
 REM // if there were errors, a log file is produced
 IF "%1"=="-logerrors" ( IF EXIST sonic3k.log goto LABLERROR3 )

Build Scripts/s3.txt

@@ -1,5 +1,6 @@
 /* Miscellaneous */
 #split	0x00000000,0x00000200,Lockon S3\Header.bin
+#split	0x0001AF6A,0x0001AFC2,Levels\LRZ\Misc\Rock Sprite Attribute Data S3.bin
 #split	0x0006A0E0,0x0006A4E8,General\Special Stage\Layout\S3 1.bin
 #split	0x0006A4E8,0x0006A8F0,General\Special Stage\Layout\S3 2.bin
 #split	0x0006A8F0,0x0006ACF8,General\Special Stage\Layout\S3 3.bin
@@ -10,7 +11,6 @@
 #split	0x0006BD18,0x0006C120,General\Special Stage\Layout\S3 8.bin
 #split	0x0006D000,0x0006F460,Levels\HCZ\Misc\HCZ Waterline Scroll Data.bin
 #split	0x0006F460,0x000704A0,Levels\LBZ\Misc\LBZ Waterline Scroll Data.bin
-#split	0x00093240,0x00098100,General\Special Stage\Layout\S3 Plane Map.bin
 #split	0x0009A7DA,0x0009FC3A,General\Special Stage\Layout\S3 Perspective Maps.bin
 #split	0x00144E80,0x00144F48,Levels\ICZ\Misc\ICZ Snowboard Slope 1.bin
 #split	0x00144F48,0x00145010,Levels\ICZ\Misc\ICZ Snowboard Slope 2.bin
@@ -19,6 +19,7 @@
 #split	0x001CBBB4,0x001CCC34,Levels\MGZ\Misc\Act 2 Quake Chunks.bin
 
 /* Demo data */
+#split	0x00005A20,0x00005E20,Levels\AIZ\Demodata\1 Proto.bin
 #split	0x000C5624,0x000C5DA4,Levels\AIZ\Demodata\1.bin
 #split	0x000C5DA4,0x000C6524,Levels\HCZ\Demodata\1.bin
 #split	0x000C6524,0x000C6CA4,Levels\MGZ\Demodata\1.bin
@@ -36,6 +37,8 @@
 #split	0x0000BCB6,0x0000BCD6,General\Save Menu\Palettes\Zone Card 8 S3.bin
 #split	0x000236AC,0x000236CC,General\Special Stage\Palettes\Eosian Spheres.bin
 #split	0x0002D39E,0x0002D41E,General\Special Stage\Palettes\Results S3.bin
+#split	0x0003C05A,0x0003C07A,Levels\AIZ\Palettes\Battleship.bin
+#split	0x0003C07A,0x0003C096,Levels\AIZ\Palettes\Boss Small.bin
 #split	0x0003F698,0x0003F718,General\Sprites\Continue\Palette S3.bin
 #split	0x0004160A,0x0004164A,General\Ending\Palettes\S3 Ending.bin
 #split	0x0004164A,0x0004168A,General\Ending\Palettes\S3 Logo.bin
@@ -45,11 +48,11 @@
 #split	0x00043470,0x000434E0,General\Sprites\S2Menu\Palettes\Sega Screen 3.bin
 #split	0x0004D520,0x0004D540,Levels\FBZ\Palettes\S3 Miniboss.bin
 #split	0x0005215C,0x0005217C,General\Ending\Palettes\S3 Super Sonic End Pose.bin
-#split	0x0008C1B4,0x0008C1D4,Levels\Misc\Palettes\Unknown 2 S3.bin
-#split	0x0008C1D4,0x0008C234,Levels\Misc\Palettes\Unknown 3 S3.bin
+#split	0x0008C1B4,0x0008C1D4,General\Sprites\S2Menu\Palettes\Title Screen.bin
+#split	0x0008C1D4,0x0008C234,General\Sprites\S2Menu\Palettes\Proto Level Select.bin
 #split	0x0008CDB4,0x0008CE14,Levels\Pachinko\Palettes\S3.bin
 #split	0x0008CE14,0x0008CE74,Levels\Slots\Palettes\S3.bin
-#split	0x00164896,0x00164A96,Levels\Misc\Palettes\MGZ Fade to CNZ.bin
+#split	0x00164896,0x00164A96,Levels\MGZ\Palettes\Fade to CNZ.bin
 #split	0x0019D262,0x0019D282,General\Save Menu\Palettes\BG.bin
 #split	0x0019D282,0x0019D2A2,General\Competition Menu\Palettes\BG.bin
 
@@ -123,11 +126,11 @@
 #split	0x0013DB60,0x00140FE0,General\Sprites\Knuckles\Art\Knuckles 2P.bin
 #split	0x00145010,0x00147850,General\Sprites\Sonic\Art\Sonic Snowboarding.bin
 #split	0x00147850,0x00147E30,General\Sprites\Snowboard\Snowboard.bin
-#split	0x0016732A,0x00167DCA,General\Sprites\Rhino\Rhino.bin
+#split	0x0016732A,0x00167DCA,General\Sprites\Rhinobot\Rhinobot.bin
 #split	0x0016D6A4,0x0016E0C4,General\Sprites\Bubbles Badnik\Bubbles Badnik.bin
 #split	0x0016EF18,0x00170058,General\Sprites\Clamer\Clamer.bin
 #split	0x00174154,0x00175134,General\Sprites\Penguinator\Penguinator.bin
-#split	0x00177EBE,0x001791DE,General\Sprites\Flybot\Flybot.bin
+#split	0x00177EBE,0x001791DE,General\Sprites\Flybot767\Flybot767.bin
 #split	0x00182DC6,0x00187CA6,General\Sprites\Knuckles\Cutscene\Cutscene Main.bin
 #split	0x00192394,0x00192B14,Levels\HCZ\Animated Tiles\Water Splash 2.bin
 #split	0x00192B14,0x00193714,Levels\HCZ\Animated Tiles\Water Splash.bin
@@ -153,6 +156,7 @@
 #split	0x0015D794,0x0015D7FC,General\Sprites\Level Misc\Horizontal Spikes.bin
 #split	0x0015D7FC,0x0015D8A2,General\Sprites\Enemy Misc\Enemy Points.bin
 #split	0x0015D8A2,0x0015DA5A,General\Sprites\Starpost\Starpost.bin
+#split	0x0015EEB4,0x0015EFFC,General\Sprites\S2Menu\Tails Continue Icon.bin
 #split	0x00164BF2,0x00165260,Levels\AIZ\Nemesis Art\Miniboss.bin
 #split	0x001671A2,0x0016732A,Levels\AIZ\Nemesis Art\Miniboss Small.bin
 #split	0x00168400,0x0016929E,Levels\HCZ\Nemesis Art\Miniboss.bin
@@ -185,8 +189,8 @@
 #split	0x0018FD88,0x00190348,Levels\HCZ\Nemesis Art\Misc Art.bin
 #split	0x00190348,0x00190900,Levels\HCZ\Nemesis Art\Water Rush.bin
 #split	0x00191B36,0x0019204C,Levels\HCZ\Nemesis Art\Act 2 Slide.bin
-#split	0x0019204C,0x00192394,Levels\HCZ\Nemesis Art\Act 2  Block Platform.bin
-#split	0x00193714,0x0019382E,Levels\HCZ\Nemesis Art\Act 2  Knuckles Wall.bin
+#split	0x0019204C,0x00192394,Levels\HCZ\Nemesis Art\Act 2 Block Platform.bin
+#split	0x00193714,0x0019382E,Levels\HCZ\Nemesis Art\Act 2 Knuckles Wall.bin
 #split	0x0019382E,0x0019426C,Levels\MGZ\Nemesis Art\Misc Art 1.bin
 #split	0x0019426C,0x0019487C,Levels\MGZ\Nemesis Art\Misc Art 2.bin
 #split	0x0019487C,0x00194AB6,Levels\MGZ\Nemesis Art\Direction Signs.bin
@@ -227,7 +231,7 @@
 
 /* Kosinski-Moduled-Compressed Art */
 #split	0x00165260,0x001671A2,Levels\AIZ\KosinskiM Art\End Boss.bin
-#split	0x00167DCA,0x0016800C,General\Sprites\Tulipon\Tulipon.bin
+#split	0x00167DCA,0x0016800C,General\Sprites\Bloominator\Bloominator.bin
 #split	0x0016800C,0x001681FE,General\Sprites\Monkey Dude\Monkey Dude.bin
 #split	0x001681FE,0x00168400,General\Sprites\Caterkiller Jr\Caterkiller Jr.bin
 #split	0x0016A552,0x0016A6C4,General\Sprites\Jawz\Jawz.bin
@@ -250,7 +254,7 @@
 #split	0x0017567A,0x0017599C,Levels\LBZ\KosinskiM Art\Miniboss Box.bin
 #split	0x00176542,0x00176874,Levels\LBZ\KosinskiM Art\End Boss.bin
 #split	0x00176874,0x00177996,Levels\LBZ\KosinskiM Art\Final Boss 2.bin
-#split	0x00177996,0x00177BE8,General\Sprites\Snail Blaster\Snail Blaster.bin
+#split	0x00177996,0x00177BE8,General\Sprites\Snale Blaster\Snale Blaster.bin
 #split	0x00177BE8,0x00177D1A,General\Sprites\Ribot\Ribot.bin
 #split	0x00177D1A,0x00177DFC,General\Sprites\Orbinaut\Orbinaut.bin
 #split	0x00177DFC,0x00177EBE,General\Sprites\Corkey\Corkey.bin
@@ -332,6 +336,31 @@
 #split	0x000DFABE,0x000DFBFE,Sound\Music\Countdown.bin
 #split	0x000DFBFE,0x000DFEAC,Sound\Music\Sonic 3\Sonic 3 Game Complete.bin
 
+/* Uncompressed plane mappings */
+#split	0x0000A130,0x0000A164,General\Competition Menu\Uncompressed Map\Numbers.bin
+#split	0x0000AE7C,0x0000AEA4,General\Competition Menu\Uncompressed Map\Results Letters.bin
+#split	0x0000AEA4,0x0000AEF4,General\Competition Menu\Uncompressed Map\Results Dividers.bin
+#split	0x0000AEF4,0x0000AF08,General\Competition Menu\Uncompressed Map\Results TOTAL.bin
+#split	0x0000AF08,0x0000AF10,General\Competition Menu\Uncompressed Map\Results Win.bin
+#split	0x0000AF10,0x0000AF18,General\Competition Menu\Uncompressed Map\Results Lose.bin
+#split	0x0000AF18,0x0000AF20,General\Competition Menu\Uncompressed Map\Results Tie.bin
+#split	0x0000B326,0x0000B38A,General\Competition Menu\Uncompressed Map\LAP.bin
+#split	0x0000B38A,0x0000B3A6,General\Competition Menu\Uncompressed Map\RECORDS.bin
+#split	0x0000B3A6,0x0000B3D6,General\Competition Menu\Uncompressed Map\1ST 2ND 3RD.bin
+#split	0x0000B3EA,0x0000B41E,General\Competition Menu\Uncompressed Map\AZURE LAKE.bin
+#split	0x0000B41E,0x0000B452,General\Competition Menu\Uncompressed Map\BALLOON PARK.bin
+#split	0x0000B452,0x0000B486,General\Competition Menu\Uncompressed Map\CHROME GADGET.bin
+#split	0x0000B486,0x0000B4BA,General\Competition Menu\Uncompressed Map\DESERT PALACE.bin
+#split	0x0000B4BA,0x0000B4EE,General\Competition Menu\Uncompressed Map\ENDLESS MINE.bin
+#split	0x00093240,0x00098100,General\Special Stage\Uncompressed Map\Layout S3.bin
+#split	0x0019F150,0x0019F228,General\Competition Menu\Uncompressed Map\Time Border.bin
+#split	0x0019F228,0x0019F24C,General\Competition Menu\Uncompressed Map\Time Text.bin
+#split	0x001A20DE,0x001A216A,General\Save Menu\Uncompressed Map\NEW.bin
+#split	0x001A217A,0x001A2206,General\Save Menu\Uncompressed Map\Static 1.bin
+#split	0x001A2206,0x001A2292,General\Save Menu\Uncompressed Map\Static 2.bin
+#split	0x001A2292,0x001A231E,General\Save Menu\Uncompressed Map\Static 3.bin
+#split	0x001A231E,0x001A23AA,General\Save Menu\Uncompressed Map\Static 4.bin
+
 /* Enigma Mappings */
 #split	0x0000729C,0x000072EE,General\Sprites\S2Menu\Enigma Map\Level Select 2P.bin
 #split	0x000072EE,0x0000731A,General\Sprites\S2Menu\Enigma Map\Options Screen.bin
@@ -352,7 +381,7 @@
 #split	0x0014FF48,0x00150018,General\Title\Enigma Map\S3 Sonic C.bin
 #split	0x00150018,0x00150112,General\Title\Enigma Map\S3 Sonic D.bin
 #split	0x00150112,0x001501E0,General\Title\Enigma Map\S3 BG.bin
-#split	0x0019D2A2,0x0019D4A4,General\Title\Enigma Map\S3 Menu BG.bin
+#split	0x0019D2A2,0x0019D4A4,General\Save Menu\Enigma Map\Menu BG.bin
 #split	0x0019F104,0x0019F150,General\Competition Menu\Enigma Map\Level Border.bin
 #split	0x0019F24C,0x0019F36C,General\Competition Menu\Enigma Map\Level Images.bin
 #split	0x0019F36C,0x0019F46E,General\Competition Menu\Enigma Map\Level Names.bin