Don't Use Party Flags For PSI Menu

This fixes an issue with chaos mode removing party members without setting the flags.
ShrineFox · Aug 3, 2024 · 9e51319 · 9e51319
1 parent c3e6b8a
commit 9e51319
Show file tree

Hide file tree

Showing 3 changed files with 281 additions and 274 deletions.
diff --git a/CoilsnakeProj/ccscript/_scripts/mainmenu/chaosmode.ccs b/CoilsnakeProj/ccscript/_scripts/mainmenu/chaosmode.ccs
@@ -12,17 +12,17 @@ ChaosMode:
 
     random(255)
 	store_registers_global
-    load_registers_global if result_is_greaterthan_orequal(220) { goto(RandomPalette) }
+    load_registers_global if result_is_greaterthan_orequal(215) { goto(RandomPalette) }
 	load_registers_global if result_is_greaterthan_orequal(200) { goto(RandomBattle) }
 	load_registers_global if result_is_greaterthan_orequal(160) { goto(RandomWarp) }
 	load_registers_global if result_is_greaterthan_orequal(140) { goto(RandomFloatSprite) }
-	load_registers_global if result_is_greaterthan_orequal(90) { goto(RandomBGM) }
-	load_registers_global if result_is_greaterthan_orequal(45) { goto(RandomSound) }
-	load_registers_global if result_is_greaterthan_orequal(30) { goto(RandomizeNpcParty) }
-	load_registers_global if result_is_greaterthan_orequal(10) { goto(RandomizeMainParty) }
-	load_registers_global if result_is_greaterthan_orequal(4) { goto(BacktrackWarp) }
-	load_registers_global if result_is_greaterthan_orequal(3) { goto(CorruptMap) }
-	load_registers_global if result_is_greaterthan_orequal(2) { goto(RandomDistortion) }
+	load_registers_global if result_is_greaterthan_orequal(100) { goto(RandomBGM) }
+	load_registers_global if result_is_greaterthan_orequal(75) { goto(RandomSound) }
+	load_registers_global if result_is_greaterthan_orequal(60) { goto(RandomizeNpcParty) }
+	load_registers_global if result_is_greaterthan_orequal(40) { goto(RandomizeMainParty) }
+	load_registers_global if result_is_greaterthan_orequal(35) { goto(BacktrackWarp) }
+	load_registers_global if result_is_greaterthan_orequal(5) { goto(RandomDistortion) }
+	load_registers_global if result_is_greaterthan_orequal(2) { goto(CorruptMap) }
 	load_registers_global if result_is_greaterthan_orequal(1) { goto(RandomBBG) }
 eob
 

diff --git a/CoilsnakeProj/ccscript/_scripts/mainmenu/mainmenu.ccs b/CoilsnakeProj/ccscript/_scripts/mainmenu/mainmenu.ccs
@@ -40,7 +40,14 @@ MainMenu:
 	// Options
 	MenuOptionWithCallback("Goods", Selected_Goods)
 	if flg_KeyItems { MenuOptionWithCallback("Key Items", Selected_KeyItems) }
-	if flag flg_LearnedPSI { if flag flg_Ness or flag flg_Poo { MenuOptionWithCallback("PSI", Selected_PSI) } }
+	if flag flg_LearnedPSI 
+	{
+		CheckIfCharacterInParty(1) if result_is(1) { MenuOptionWithCallback("PSI", Selected_PSI) }
+		else
+		{
+			CheckIfCharacterInParty(4) if result_is(1) { MenuOptionWithCallback("PSI", Selected_PSI) }
+		}
+	}
 	MenuOptionWithCallback("Equip", Selected_Equip)
 	if flg_ModMenu { MenuOptionWithCallback("Mod Menu", Selected_ModMenu) }
 	if not flg_ModMenu { MenuOptionWithCallback("Config", Selected_ModMenu) }