Redid all the boss and custom sprite junk, effect list, saved 25 kb - but bosses break

1 files changed, 93 insertions, 93 deletions

diff --git a/src/levelspecial.cpp b/src/levelspecial.cpp
index 75d7ecc..3ce6aab 100644
--- a/src/levelspecial.cpp
+++ b/src/levelspecial.cpp
@@ -26,8 +26,8 @@ struct EventTable_t {
 
 extern EventTable_t *EventTable;
 
-extern u16 TimeStopFlag;
-extern u32 TimerBranch;
+// extern u16 TimeStopFlag;
+// extern u32 TimerBranch;
 extern u32 AlwaysDrawFlag;
 extern u32 AlwaysDrawBranch;
 
@@ -35,7 +35,7 @@ extern float MarioDescentRate;
 extern float MarioJumpMax;
 extern float MarioJumpArc;
 extern float MiniMarioJumpArc;
-extern float MarioSize;
+// extern float MarioSize;
 
 extern float GlobalSpriteSize;
 extern float GlobalSpriteSpeed;
@@ -61,13 +61,13 @@ fBase_c *FindActorByID(u32 id);
 
 
 bool ResetAfterLevel(void) {
-	TimeStopFlag = 0;
-	TimerBranch = 0x3403FFA4;
+	// TimeStopFlag = 0;
+	// TimerBranch = 0x3403FFA4;
 	MarioDescentRate = -4;
 	MarioJumpMax = 3.628;
 	MarioJumpArc = 2.5;
 	MiniMarioJumpArc = 2.5;
-	MarioSize = 1.0;
+	// MarioSize = 1.0;
 	GlobalSpriteSize = 1.0;
 	GlobalSpriteSpeed = 1.0;
 	GlobalRiderSize = 1.0;
@@ -121,13 +121,13 @@ void LevelSpecial_Update(LevelSpecial *self) {
 		OSReport("Activate Special Event!", offState);
 
 		switch (self->type) {
-			case 1:											// Time Freeze
-				TimeStopFlag = self->effect * 0x100;
-				break;
+			// case 1:											// Time Freeze
+			// 	TimeStopFlag = self->effect * 0x100;
+			// 	break;
 				
-			case 2:											// Stop Timer
-				TimerBranch = 0x7C601B78;
-				break;
+			// case 2:											// Stop Timer
+			// 	TimerBranch = 0x7C601B78;
+			// 	break;
 		
 	
 			case 3:											// Mario Gravity
@@ -147,80 +147,80 @@ void LevelSpecial_Update(LevelSpecial *self) {
 				}
 				break;
 	
-			case 4:											// Mario Size
-				dAc_Py_c *Mario;
-				if (self->effect == 0)							//Super Size
-					{
-					MarioSize = 4.0;
+// 			case 4:											// Mario Size
+// 				dAc_Py_c *Mario;
+// 				if (self->effect == 0)							//Super Size
+// 					{
+// 					MarioSize = 4.0;
 					
-					for(int n=0; n<4; n++) {
-						OSReport("Changing Physics for Player %d\n", n);
-						Mario = GetSpecificPlayerActor(n);
-						OSReport("Player Actor at %08x\n", Mario);
-						if(Mario == 0)
-							continue;
-//						Mario->aPhysics.info.xDistToCenter = Mario->aPhysics.info.xDistToCenter * 4.0;
-//						Mario->aPhysics.info.xDistToEdge = Mario->aPhysics.info.xDistToEdge * 4.0;
-//						Mario->aPhysics.info.yDistToCenter = Mario->aPhysics.info.yDistToCenter * 4.0;
-//						Mario->aPhysics.info.yDistToEdge = Mario->aPhysics.info.yDistToEdge * 4.0;
-//
-						Mario->bPhysics.info.xDistToCenter = Mario->bPhysics.info.xDistToCenter * 4.0;
-						Mario->bPhysics.info.xDistToEdge = Mario->bPhysics.info.xDistToEdge * 4.0;
-						Mario->bPhysics.info.yDistToCenter = Mario->bPhysics.info.yDistToCenter * 4.0;
-						Mario->bPhysics.info.yDistToEdge = Mario->bPhysics.info.yDistToEdge * 4.0;
-//
-//						Mario->cPhysics.info.xDistToCenter = Mario->cPhysics.info.xDistToCenter * 4.0;
-//						Mario->cPhysics.info.xDistToEdge = Mario->cPhysics.info.xDistToEdge * 4.0;
-//						Mario->cPhysics.info.yDistToCenter = Mario->cPhysics.info.yDistToCenter * 4.0;
-//						Mario->cPhysics.info.yDistToEdge = Mario->cPhysics.info.yDistToEdge * 4.0;
-//
-//						Mario->dPhysics.info.xDistToCenter = Mario->dPhysics.info.xDistToCenter * 4.0;
-//						Mario->dPhysics.info.xDistToEdge = Mario->dPhysics.info.xDistToEdge * 4.0;
-//						Mario->dPhysics.info.yDistToCenter = Mario->dPhysics.info.yDistToCenter * 4.0;
-//						Mario->dPhysics.info.yDistToEdge = Mario->dPhysics.info.yDistToEdge * 4.0;
-//
-//						Mario->ePhysics.info.xDistToCenter = Mario->ePhysics.info.xDistToCenter * 4.0;
-//						Mario->ePhysics.info.xDistToEdge = Mario->ePhysics.info.xDistToEdge * 4.0;
-//						Mario->ePhysics.info.yDistToCenter = Mario->ePhysics.info.yDistToCenter * 4.0;
-//						Mario->ePhysics.info.yDistToEdge = Mario->ePhysics.info.yDistToEdge * 4.0;
-					}
-					}
+// 					for(int n=0; n<4; n++) {
+// 						OSReport("Changing Physics for Player %d\n", n);
+// 						Mario = GetSpecificPlayerActor(n);
+// 						OSReport("Player Actor at %08x\n", Mario);
+// 						if(Mario == 0)
+// 							continue;
+// //						Mario->aPhysics.info.xDistToCenter = Mario->aPhysics.info.xDistToCenter * 4.0;
+// //						Mario->aPhysics.info.xDistToEdge = Mario->aPhysics.info.xDistToEdge * 4.0;
+// //						Mario->aPhysics.info.yDistToCenter = Mario->aPhysics.info.yDistToCenter * 4.0;
+// //						Mario->aPhysics.info.yDistToEdge = Mario->aPhysics.info.yDistToEdge * 4.0;
+// //
+// 						Mario->bPhysics.info.xDistToCenter = Mario->bPhysics.info.xDistToCenter * 4.0;
+// 						Mario->bPhysics.info.xDistToEdge = Mario->bPhysics.info.xDistToEdge * 4.0;
+// 						Mario->bPhysics.info.yDistToCenter = Mario->bPhysics.info.yDistToCenter * 4.0;
+// 						Mario->bPhysics.info.yDistToEdge = Mario->bPhysics.info.yDistToEdge * 4.0;
+// //
+// //						Mario->cPhysics.info.xDistToCenter = Mario->cPhysics.info.xDistToCenter * 4.0;
+// //						Mario->cPhysics.info.xDistToEdge = Mario->cPhysics.info.xDistToEdge * 4.0;
+// //						Mario->cPhysics.info.yDistToCenter = Mario->cPhysics.info.yDistToCenter * 4.0;
+// //						Mario->cPhysics.info.yDistToEdge = Mario->cPhysics.info.yDistToEdge * 4.0;
+// //
+// //						Mario->dPhysics.info.xDistToCenter = Mario->dPhysics.info.xDistToCenter * 4.0;
+// //						Mario->dPhysics.info.xDistToEdge = Mario->dPhysics.info.xDistToEdge * 4.0;
+// //						Mario->dPhysics.info.yDistToCenter = Mario->dPhysics.info.yDistToCenter * 4.0;
+// //						Mario->dPhysics.info.yDistToEdge = Mario->dPhysics.info.yDistToEdge * 4.0;
+// //
+// //						Mario->ePhysics.info.xDistToCenter = Mario->ePhysics.info.xDistToCenter * 4.0;
+// //						Mario->ePhysics.info.xDistToEdge = Mario->ePhysics.info.xDistToEdge * 4.0;
+// //						Mario->ePhysics.info.yDistToCenter = Mario->ePhysics.info.yDistToCenter * 4.0;
+// //						Mario->ePhysics.info.yDistToEdge = Mario->ePhysics.info.yDistToEdge * 4.0;
+// 					}
+// 					}
 					
-				else											//Half-Pint
-					{
-					MarioSize = 0.25;
-
-					for(int n=0; n<4; n++) {
-						Mario = GetSpecificPlayerActor(n);
-						if(Mario == 0)
-							continue;
-						Mario->aPhysics.info.xDistToCenter = Mario->aPhysics.info.xDistToCenter * 0.25;
-						Mario->aPhysics.info.xDistToEdge = Mario->aPhysics.info.xDistToEdge * 0.25;
-						Mario->aPhysics.info.yDistToCenter = Mario->aPhysics.info.yDistToCenter * 0.25;
-						Mario->aPhysics.info.yDistToEdge = Mario->aPhysics.info.yDistToEdge * 0.25;
-
-						Mario->bPhysics.info.xDistToCenter = Mario->bPhysics.info.xDistToCenter * 0.25;
-						Mario->bPhysics.info.xDistToEdge = Mario->bPhysics.info.xDistToEdge * 0.25;
-						Mario->bPhysics.info.yDistToCenter = Mario->bPhysics.info.yDistToCenter * 0.25;
-						Mario->bPhysics.info.yDistToEdge = Mario->bPhysics.info.yDistToEdge * 0.25;
-
-						Mario->cPhysics.info.xDistToCenter = Mario->cPhysics.info.xDistToCenter * 0.25;
-						Mario->cPhysics.info.xDistToEdge = Mario->cPhysics.info.xDistToEdge * 0.25;
-						Mario->cPhysics.info.yDistToCenter = Mario->cPhysics.info.yDistToCenter * 0.25;
-						Mario->cPhysics.info.yDistToEdge = Mario->cPhysics.info.yDistToEdge * 0.25;
-
-						Mario->dPhysics.info.xDistToCenter = Mario->dPhysics.info.xDistToCenter * 0.25;
-						Mario->dPhysics.info.xDistToEdge = Mario->dPhysics.info.xDistToEdge * 0.25;
-						Mario->dPhysics.info.yDistToCenter = Mario->dPhysics.info.yDistToCenter * 0.25;
-						Mario->dPhysics.info.yDistToEdge = Mario->dPhysics.info.yDistToEdge * 0.25;
-
-						Mario->ePhysics.info.xDistToCenter = Mario->ePhysics.info.xDistToCenter * 0.25;
-						Mario->ePhysics.info.xDistToEdge = Mario->ePhysics.info.xDistToEdge * 0.25;
-						Mario->ePhysics.info.yDistToCenter = Mario->ePhysics.info.yDistToCenter * 0.25;
-						Mario->ePhysics.info.yDistToEdge = Mario->ePhysics.info.yDistToEdge * 0.25;
-					}
-					}
-				break;
+// 				else											//Half-Pint
+// 					{
+// 					MarioSize = 0.25;
+
+// 					for(int n=0; n<4; n++) {
+// 						Mario = GetSpecificPlayerActor(n);
+// 						if(Mario == 0)
+// 							continue;
+// 						Mario->aPhysics.info.xDistToCenter = Mario->aPhysics.info.xDistToCenter * 0.25;
+// 						Mario->aPhysics.info.xDistToEdge = Mario->aPhysics.info.xDistToEdge * 0.25;
+// 						Mario->aPhysics.info.yDistToCenter = Mario->aPhysics.info.yDistToCenter * 0.25;
+// 						Mario->aPhysics.info.yDistToEdge = Mario->aPhysics.info.yDistToEdge * 0.25;
+
+// 						Mario->bPhysics.info.xDistToCenter = Mario->bPhysics.info.xDistToCenter * 0.25;
+// 						Mario->bPhysics.info.xDistToEdge = Mario->bPhysics.info.xDistToEdge * 0.25;
+// 						Mario->bPhysics.info.yDistToCenter = Mario->bPhysics.info.yDistToCenter * 0.25;
+// 						Mario->bPhysics.info.yDistToEdge = Mario->bPhysics.info.yDistToEdge * 0.25;
+
+// 						Mario->cPhysics.info.xDistToCenter = Mario->cPhysics.info.xDistToCenter * 0.25;
+// 						Mario->cPhysics.info.xDistToEdge = Mario->cPhysics.info.xDistToEdge * 0.25;
+// 						Mario->cPhysics.info.yDistToCenter = Mario->cPhysics.info.yDistToCenter * 0.25;
+// 						Mario->cPhysics.info.yDistToEdge = Mario->cPhysics.info.yDistToEdge * 0.25;
+
+// 						Mario->dPhysics.info.xDistToCenter = Mario->dPhysics.info.xDistToCenter * 0.25;
+// 						Mario->dPhysics.info.xDistToEdge = Mario->dPhysics.info.xDistToEdge * 0.25;
+// 						Mario->dPhysics.info.yDistToCenter = Mario->dPhysics.info.yDistToCenter * 0.25;
+// 						Mario->dPhysics.info.yDistToEdge = Mario->dPhysics.info.yDistToEdge * 0.25;
+
+// 						Mario->ePhysics.info.xDistToCenter = Mario->ePhysics.info.xDistToCenter * 0.25;
+// 						Mario->ePhysics.info.xDistToEdge = Mario->ePhysics.info.xDistToEdge * 0.25;
+// 						Mario->ePhysics.info.yDistToCenter = Mario->ePhysics.info.yDistToCenter * 0.25;
+// 						Mario->ePhysics.info.yDistToEdge = Mario->ePhysics.info.yDistToEdge * 0.25;
+// 					}
+// 					}
+// 				break;
 
 
 			case 5:											// Global Enemy Size
@@ -263,13 +263,13 @@ void LevelSpecial_Update(LevelSpecial *self) {
 		OSReport("Deactivate Special Event", offState);
 
 		switch (self->type) {
-			case 1:											// Time Freeze
-				TimeStopFlag = 0;
-				break;
+			// case 1:											// Time Freeze
+			// 	TimeStopFlag = 0;
+			// 	break;
 				
-			case 2:											// Stop Timer
-				TimerBranch = 0x3403FFA4;
-				break;
+			// case 2:											// Stop Timer
+			// 	TimerBranch = 0x3403FFA4;
+			// 	break;
 		
 	
 			case 3:											// Mario Gravity
@@ -279,8 +279,8 @@ void LevelSpecial_Update(LevelSpecial *self) {
 				MarioJumpMax = 3.628;
 				break;
 	
-			case 4:											// Mario Size
-				dAc_Py_c *Mario;
+			// case 4:											// Mario Size
+			// 	dAc_Py_c *Mario;
 //				if (self->effect == 0)							//Super Size
 //					{
 //					MarioSize = 4.0;
@@ -352,7 +352,7 @@ void LevelSpecial_Update(LevelSpecial *self) {
 //						Mario->ePhysics.info.yDistToEdge = Mario->ePhysics.info.yDistToEdge / 0.25;
 //					}
 //					}
-				break;
+				// break;
 		
 			case 5:											// Global Enemy Size
 				SizerOn = 0;