Fixed Crash: Removed Amy AI Casinopolis, changed Back ring for Gamma …

…stage, removed last story flag
Sora-yx · Oct 25, 2021 · 708ebe3 · 708ebe3
1 parent e629e52
commit 708ebe3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 39 deletions.
diff --git a/sadx-randomizer/05_RedMountain.cpp b/sadx-randomizer/05_RedMountain.cpp
@@ -18,7 +18,7 @@ void RedMountain_Layout() {
 	if (CurrentAct == 1)
 		CurrentStageVersion = GammaVersion;
 
-	if (CurrentStageVersion == KnucklesVersion || CurrentAct == 2)
+	if (CurrentAct == 2)
 	{
 		CurrentStageVersion = KnucklesVersion;
 	}

diff --git a/sadx-randomizer/AISettings.cpp b/sadx-randomizer/AISettings.cpp
@@ -85,7 +85,7 @@ int CheckTailsAI_R(void) { //restriction and bug fixes.
 					return 0;
 				break;
 			case LevelIDs_Casinopolis:
-				if (CurrentAct >= 1 || CurrentAct == 0 && CurrentMission < 1 && (CurrentAI == Characters_Amy || CurrentCharacter == Characters_Amy)) //cutscene + pinball issue
+				if (CurrentAct >= 1 || CurrentAct == 0 && (CurrentAI == Characters_Amy || CurrentCharacter == Characters_Amy)) //cutscene + pinball issue
 					return 0;
 				break;
 			case LevelIDs_Chaos0:

diff --git a/sadx-randomizer/BackRing.cpp b/sadx-randomizer/BackRing.cpp
@@ -145,11 +145,8 @@ void BackRingObj_Main(ObjectMaster* obj) {
 				if (CurrentStageVersion == TailsVersion || CurrentStageVersion == AmyVersion)
 					GameState = 0xc;
 
-				if (CurrentLevel == LevelIDs_HotShelter && CurrentAct == 2)
-				{
-					GameMode = GameModes_StartAdventure;
-				}
-				else if (CurrentStageVersion == GammaVersion && (CurrentLevel == LevelIDs_RedMountain || CurrentLevel == LevelIDs_WindyValley && CurrentAct == 0))
+
+				if (CurrentStageVersion == GammaVersion)
 				{
 					CurrentLevel = LevelCopy;
 					CurrentAct = ActCopy;

diff --git a/sadx-randomizer/Cutscene.cpp b/sadx-randomizer/Cutscene.cpp
@@ -4,17 +4,7 @@ uint8_t cutsceneAllowedCount = 0;
 Trampoline* LoadMRNPC_t = nullptr;
 Trampoline* StartCutscene_t;
 
-int EventDayTime[8] = {
-	6, 11, 21, 57, 98, 157, 159, 249
-};
-
-int EventNightTime[6] = {
-	80, 81, 110, 197, 208, 75
-};
 
-int EventEveningTime[4] = {
-	17, 35, 64, 66
-};
 
 //play a random cutscene every 2 levels/bosses.
 void CutsceneAllowedCount_Check() {
@@ -30,27 +20,10 @@ void set_event_flags(long cutsceneID)
 {
 	SeqRun();
 
-	if (cutsceneID >= 240 && cutsceneID <= 255 || cutsceneID == 355)
-		LastStoryFlag = 1;
+	//randomize time of day
 
-
-	for (int i = 0; i < 7; i++) //fix time of day
-	{
-		if (EventDayTime[i] == cutsceneID) {
-			SetTimeOfDay_Day();
-			break;
-		}
-
-		if (EventNightTime[i] == cutsceneID) {
-			SetTimeOfDay_Night();
-			break;
-		}
-
-		if (EventEveningTime[i] == cutsceneID) {
-			SetTimeOfDay_Evening();
-			break;
-		}
-	}
+	uint8_t rng = rand() % 3;
+	SetTimeOfDay(rng);
 
 	switch (cutsceneID)  //Credits: PKR
 	{

diff --git a/sadx-randomizer/Missions.cpp b/sadx-randomizer/Missions.cpp
@@ -257,8 +257,6 @@ void StageMissionImage_result() {
 
 int LoadTitleCardTexture_r(int minDispTime) {
 
-	if (CreditCheck || GetBackRing)
-		return 0;
 
 	if (!isRandoLevel() || CurrentLevel > 14) {
 
@@ -294,6 +292,10 @@ int LoadTitleCardTexture_r(int minDispTime) {
 
 void DisplayTitleCard_r() {
 
+	if (CreditCheck || GetBackRing) {
+		return;
+	}
+
 	if (!isRandoLevel()) {
 		return DisplayScreenTexture(0x4000000, HorizontalStretch * 320.00000000 + 32.00000000,
 			VerticalStretch * 240.00000000, 1.00000000);