diff --git a/GBA/~Hack~ Pokemblem [Subset - Challenge Runs].rascript b/GBA/~Hack~ Pokemblem [Subset - Challenge Runs].rascript index 5db4f16..cb83773 100644 --- a/GBA/~Hack~ Pokemblem [Subset - Challenge Runs].rascript +++ b/GBA/~Hack~ Pokemblem [Subset - Challenge Runs].rascript @@ -140,6 +140,10 @@ GrowthRando = bit4(0x5265) BossRando = bit5(0x5265) TrainerRando = bit6(0x5265) MoveRando = bit7(0x5265) +NoExpFlag = bit4(0x5261) // flag 0xF1 +NuzlockeFlag = bit3(0x5262) // flag 0xF8 +PlusFlag = bit4(0x5262) // flag 0xF9 +CheaterFlag = bit5(0x5262) // flag 0xFA /// Prog Flags BoulderBadgeFlag = bit7(0x5254) @@ -182,14 +186,18 @@ ZapdosFlag = bit7(0x525d) MewTruck = bit0(0x525e) function LoadCheck() => MapID == prev(MapID) && MusicID != 0 +//function DebugProtect() => BoulderBadgeFlag != 2 // this was for testing purposes function DebugProtect() => DebuggerFlag == 1 && CheatFlagSave1 != 1 && CheatFlagSave2 != 1 && CheatFlagSave3 != 1 /// SUBSET function ChallengeAsh() => CharName1 == 0x00687341 && CharName2 == 0x00 function ChallengeGary() => CharName1 == 0x79726147 && CharName2 == 0x00 +function ChallengeLeaf() => CharName1 == 0x6661654c && CharName2 == 0x00 function ChallengeOak() => CharName1 == 0x006b614f && CharName2 == 0x00 function ChallengeBill() => CharName1 == 0x6c6c6942 && CharName2 == 0x00 +function ChallengeJames() => CharName1 == 0x656d614a && CharName2 == 0x00000073 +function ChallengeJessie() => CharName1 == 0x7373654a && CharName2 == 0x00006569 function ChallengeBrock() => CharName1 == 0x636f7242 && CharName2 == 0x0000006b function ChallengeMisty() => CharName1 == 0x7473694d && CharName2 == 0x00000079 function ChallengeSurge() => CharName1 == 0x202e744c && CharName2 == 0x67727553 @@ -204,7 +212,11 @@ function ChallengeAgatha() => CharName1 == 0x74616741 && CharName2 == 0x0000616 function ChallengeLance() => CharName1 == 0x636e614c && CharName2 == 0x00000065 function ChallengeVesly() => CharName1 == 0x6c736556 && CharName2 == 0x00000079 && CantEvolve == 1 && CantCapture == 1 function ChallengeLittleCup() => CantEvolve == 1 && CantCapture == 0 +function ChallengeVoid() => NoExpFlag == 1 function ChallengeFullChaos() => WildPkmnRando == 1 && SkillRando == 1 && StatRando == 1 && ItemRando == 1 && GrowthRando == 1 && BossRando == 1 && TrainerRando == 1 && MoveRando == 1 +function ChallengePlus() => PlusFlag == 1 +function ChallengeNuzlocke() => NuzlockeFlag == 1 +function ChallengeCheater() => CheaterFlag == 1 badges = [ @@ -219,10 +231,18 @@ badges = [ ] challengers = [ + ["LittleCup", ChallengeLittleCup()], + ["Void", ChallengeVoid()], + ["Chaos", ChallengeFullChaos()], + ["Plus", ChallengePlus()], + ["Nuzlocke", ChallengeNuzlocke()], ["Ash", ChallengeAsh()], ["Gary", ChallengeGary()], + ["Leaf", ChallengeLeaf()], ["Oak", ChallengeOak()], ["Bill", ChallengeBill()], + ["James", ChallengeJames()], + ["Jessie", ChallengeJessie()], ["Brock", ChallengeBrock()], ["Misty", ChallengeMisty()], ["Surge", ChallengeSurge()], @@ -236,8 +256,7 @@ challengers = [ ["Agatha", ChallengeAgatha()], ["Lance", ChallengeLance()], ["Vesly", ChallengeVesly()], - ["LittleCup", ChallengeLittleCup()], - ["FullChaos", ChallengeFullChaos()], + ["Cheater", ChallengeCheater()], ] for challenger in challengers { @@ -264,4 +283,4 @@ for challenger in challengers { && GaryCheatFlag == 1 && prev(GaryCheatFlag) == 0 ) -} \ No newline at end of file +} diff --git a/GBA/~Hack~ Pokemblem.rascript b/GBA/~Hack~ Pokemblem.rascript index 9ac5678..dae4695 100644 --- a/GBA/~Hack~ Pokemblem.rascript +++ b/GBA/~Hack~ Pokemblem.rascript @@ -135,6 +135,7 @@ CharName1 = dword(0x33d10) // to check special modes CharName2 = dword(0x033d14) RNGSeed = dword(0x477c4) +FaintsCounter = word(0x48050) CheatFlagSave1 = byte(0x48054) CheatFlagSave2 = byte(0x48058) CheatFlagSave3 = byte(0x4805c) @@ -153,6 +154,10 @@ GrowthRando = bit4(0x5265) BossRando = bit5(0x5265) TrainerRando = bit6(0x5265) MoveRando = bit7(0x5265) +NoExpFlag = bit4(0x5261) // flag 0xF1 +NuzlockeFlag = bit3(0x5262) // flag 0xF8 +PlusFlag = bit4(0x5262) // flag 0xF9 +CheaterFlag = bit5(0x5262) // flag 0xFA /// Prog Flags BoulderBadgeFlag = bit7(0x5254) @@ -163,13 +168,28 @@ SoulBadgeFlag = bit0(0x5257) MarshBadgeFlag = bit7(0x5259) VolcanoBadgeFlag = bit5(0x525c) EarthBadgeFlag = bit3(0x525d) - LoreleiFlag = bit1(0x525e) BrunoFlag = bit2(0x525e) AgathaFlag = bit3(0x525e) LanceFlag = bit4(0x525e) GaryCheatFlag = bit6(0x525e) // WinCon +PewterGymRematchedFlag = bit7(0x5267) // flag 0x124 +CeruleanGymRematchedFlag = bit6(0x5267) // flag 0x123 +VermilionGymRematchedFlag = bit5(0x5267) // flag 0x122 +FuschiaGymRematchedFlag = bit4(0x5267) // flag 0x121 +CeladonGymRematchedFlag = bit3(0x5267) // flag 0x120 +SaffronGymRematchedFlag = bit2(0x5267) // flag 0x11F +CinnabarGymRematchedFlag = bit1(0x5267) // flag 0x11E +ViridianGymRematchedFlag = bit0(0x5267) // flag 0x11D + + + + + + + + SSAnneTicketFlag = bit5(0x5255) PkmnTowerClearFlag = bit4(0x5256) @@ -194,11 +214,12 @@ ArticunoFlag = bit6(0x525d) ZapdosFlag = bit7(0x525d) MewTruck = bit0(0x525e) +//function DebugProtect() => BoulderBadgeFlag != 2 // this was for testing purposes function LoadCheck() => MapID == prev(MapID) && MusicID != 0 function DebugProtect() => DebuggerFlag == 1 && CheatFlagSave1 != 1 && CheatFlagSave2 != 1 && CheatFlagSave3 != 1 -function NoRandoNoChallengeRun() => WildPkmnRando == 0 && CantCapture == 0 && CantEvolve == 0 && SkillRando == 0 && StatRando == 0 && ItemRando == 0 && GrowthRando == 0 && BossRando == 0 && TrainerRando == 0 && MoveRando == 0 && CharName1 != 0x006b614f && (CharName1 != 0x6c736556 && CharName2 != 0x00000079) +function NoRandoNoChallengeRun() => WildPkmnRando == 0 && CantCapture == 0 && CantEvolve == 0 && SkillRando == 0 && StatRando == 0 && ItemRando == 0 && GrowthRando == 0 && BossRando == 0 && TrainerRando == 0 && MoveRando == 0 && NoExpFlag == 0 && NuzlockeFlag == 0 && PlusFlag == 0 && CheaterFlag == 0 && CharName1 != 0x006b614f && (CharName1 != 0x6c736556 && CharName2 != 0x00000079) function PokedexCount() => bitcount(0x47708) - bit0(0x47708) + bitcount(0x47709) + bit0(0x4770a) + bit1(0x4770a) + bit2(0x4770a) + bit7(0x4770a) + bitcount(0x4770b) + bitcount(0x4770c) + bitcount(0x4770d) + bitcount(0x4770e) - bit4(0x4770e) + bitcount(0x4770f) + bitcount(0x47710) + bitcount(0x47711) + bitcount(0x47712) - bit1(0x47712) + bitcount(0x47713) - bit7(0x47713) + bitcount(0x47718) + bitcount(0x47719) + bitcount(0x4771a) + bitcount(0x4771b) + bitcount(0x4771c) + bitcount(0x4771d) + bitcount(0x4771e) + bitcount(0x4771f) - bit7(0x4771f) - +function FaintsCount() => ((FaintsCounter+1) & 0xFFFF) function PokedexCheck(target) => PokedexCount() == target && prev(PokedexCount()) == target - 1 @@ -536,8 +557,8 @@ function PokedexCheck(target) => PokedexCount() == target && LoadCheck() && DebugProtect() && NoRandoNoChallengeRun() - && ascii_string_equals(0x0326b6, "Every town") - && byte(0x0326b6) != prev(byte(0x0326b6)) + && PewterGymRematchedFlag == 1 + && prev(PewterGymRematchedFlag) == 0 ) @@ -548,8 +569,8 @@ function PokedexCheck(target) => PokedexCount() == target && LoadCheck() && DebugProtect() && NoRandoNoChallengeRun() - && ascii_string_equals(0x0326b5, "Hey, did you hear") - && byte(0x0326b5) != prev(byte(0x0326b5)) + && CeruleanGymRematchedFlag == 1 + && prev(CeruleanGymRematchedFlag) == 0 ) @@ -560,8 +581,8 @@ function PokedexCheck(target) => PokedexCount() == target && LoadCheck() && DebugProtect() && NoRandoNoChallengeRun() - && ascii_string_equals(0x0326b5, "Where'd you train") - && byte(0x0326b5) != prev(byte(0x0326b5)) + && VermilionGymRematchedFlag == 1 + && prev(VermilionGymRematchedFlag) == 0 ) @@ -572,8 +593,8 @@ function PokedexCheck(target) => PokedexCount() == target && LoadCheck() && DebugProtect() && NoRandoNoChallengeRun() - && ascii_string_equals(0x0326b5, "The shadows") - && byte(0x0326b5) != prev(byte(0x0326b5)) + && FuschiaGymRematchedFlag == 1 + && prev(FuschiaGymRematchedFlag) == 0 ) @@ -584,8 +605,8 @@ function PokedexCheck(target) => PokedexCount() == target && LoadCheck() && DebugProtect() && NoRandoNoChallengeRun() - && ascii_string_equals(0x0326b6, "Nobody") - && byte(0x0326b6) != prev(byte(0x0326b6)) + && CeladonGymRematchedFlag == 1 + && prev(CeladonGymRematchedFlag) == 0 ) @@ -596,8 +617,8 @@ function PokedexCheck(target) => PokedexCount() == target && LoadCheck() && DebugProtect() && NoRandoNoChallengeRun() - && ascii_string_equals(0x0326b5, "I envy you") - && byte(0x0326b5) != prev(byte(0x0326b5)) + && SaffronGymRematchedFlag == 1 + && prev(SaffronGymRematchedFlag) == 0 ) @@ -608,8 +629,8 @@ function PokedexCheck(target) => PokedexCount() == target && LoadCheck() && DebugProtect() && NoRandoNoChallengeRun() - && ascii_string_equals(0x0326b5, "I've put") - && byte(0x0326b5) != prev(byte(0x0326b5)) + && CinnabarGymRematchedFlag == 1 + && prev(CinnabarGymRematchedFlag) == 0 ) @@ -620,8 +641,8 @@ function PokedexCheck(target) => PokedexCount() == target && LoadCheck() && DebugProtect() && NoRandoNoChallengeRun() - && ascii_string_equals(0x0326b5, "Tcch") - && byte(0x0326b5) != prev(byte(0x0326b5)) + && ViridianGymRematchedFlag == 1 + && prev(ViridianGymRematchedFlag) == 0 ) @@ -821,8 +842,11 @@ function PokedexCheck(target) => PokedexCount() == target /// SUBSET function ChallengeAsh() => CharName1 == 0x00687341 && CharName2 == 0x00 function ChallengeGary() => CharName1 == 0x79726147 && CharName2 == 0x00 +function ChallengeLeaf() => CharName1 == 0x6661654c && CharName2 == 0x00 function ChallengeOak() => CharName1 == 0x006b614f && CharName2 == 0x00 function ChallengeBill() => CharName1 == 0x6c6c6942 && CharName2 == 0x00 +function ChallengeJames() => CharName1 == 0x656d614a && CharName2 == 0x00000073 +function ChallengeJessie() => CharName1 == 0x7373654a && CharName2 == 0x00006569 function ChallengeBrock() => CharName1 == 0x636f7242 && CharName2 == 0x0000006b function ChallengeMisty() => CharName1 == 0x7473694d && CharName2 == 0x00000079 function ChallengeSurge() => CharName1 == 0x202e744c && CharName2 == 0x67727553 @@ -837,177 +861,261 @@ function ChallengeAgatha() => CharName1 == 0x74616741 && CharName2 == 0x0000616 function ChallengeLance() => CharName1 == 0x636e614c && CharName2 == 0x00000065 function ChallengeVesly() => CharName1 == 0x6c736556 && CharName2 == 0x00000079 && CantEvolve == 1 && CantCapture == 1 function ChallengeLittleCup() => CantEvolve == 1 && CantCapture == 0 -function ChallengeFullChaos() => WildPkmnRando == 1 && SkillRando == 1 && StatRando == 1 && ItemRando == 1 && GrowthRando == 1 && BossRando == 1 && TrainerRando == 1 && MoveRando == 1 +function ChallengeVoid() => NoExpFlag == 1 +function ChallengeChaos() => WildPkmnRando == 1 && SkillRando == 1 && StatRando == 1 && ItemRando == 1 && GrowthRando == 1 && BossRando == 1 && TrainerRando == 1 && MoveRando == 1 +function ChallengePlus() => PlusFlag == 1 +function ChallengeNuzlocke() => NuzlockeFlag == 1 +function ChallengeCheater() => CheaterFlag == 1 // ---- Rich Presence Display ---- rich_presence_conditional_display(NoRandoNoChallengeRun() && DebugProtect() && FemaleChar == 0 && LunaticDifficulty == 1, - "• Red is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • Lunatic •", + "• Red is in {0} • Pokédex: {1}/151 • Faints: {2} • Lunatic • RNG Seed: {3} •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(NoRandoNoChallengeRun() && DebugProtect() && FemaleChar == 1 && LunaticDifficulty == 1, - "• Leaf is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • Lunatic •", + "• Leaf is in {0} • Pokédex: {1}/151 • Faints: {2} • Lunatic • RNG Seed: {3} •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(NoRandoNoChallengeRun() && DebugProtect() && FemaleChar == 0, - "• Red is in {0} • Pokédex: {1}/151 • RNG Seed: {2} •", + "• Red is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(NoRandoNoChallengeRun() && DebugProtect() && FemaleChar == 1, - "• Leaf is in {0} • Pokédex: {1}/151 • RNG Seed: {2} •", + "• Leaf is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(DebugProtect() && ChallengeAsh(), - "• Challenger Ash is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! •", + "• Challenger Ash is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(DebugProtect() && ChallengeGary(), - "• Challenger Gary is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! •", + "• Challenger Gary is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), + rich_presence_value("Seed", RNGSeed) +) + +rich_presence_conditional_display(DebugProtect() && ChallengeLeaf(), + "• Challenger Leaf is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", + rich_presence_lookup("MapID", MapID, RPMapID), + rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(DebugProtect() && ChallengeOak(), - "• Challenger Oak is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! •", + "• Challenger Oak is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(DebugProtect() && ChallengeBill(), - "• Challenger Bill is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! •", + "• Challenger Bill is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", + rich_presence_lookup("MapID", MapID, RPMapID), + rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), + rich_presence_value("Seed", RNGSeed) +) + +rich_presence_conditional_display(DebugProtect() && ChallengeJames(), + "• Challenger James is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), + rich_presence_value("Seed", RNGSeed) +) + +rich_presence_conditional_display(DebugProtect() && ChallengeJessie(), + "• Challenger Jessie is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", + rich_presence_lookup("MapID", MapID, RPMapID), + rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(DebugProtect() && ChallengeBrock(), - "• Challenger Brock is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! •", + "• Challenger Brock is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(DebugProtect() && ChallengeMisty(), - "• Challenger Misty is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! •", + "• Challenger Misty is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(DebugProtect() && ChallengeSurge(), - "• Challenger Surge is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! •", + "• Challenger Surge is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(DebugProtect() && ChallengeErika(), - "• Challenger Erika is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! •", + "• Challenger Erika is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(DebugProtect() && ChallengeKoga(), - "• Challenger Koga is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! •", + "• Challenger Koga is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(DebugProtect() && ChallengeSabrina(), - "• Challenger Sabrina is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! •", + "• Challenger Sabrina is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(DebugProtect() && ChallengeBlaine(), - "• Challenger Blaine is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! •", + "• Challenger Blaine is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(DebugProtect() && ChallengeGiovanni(), - "• Challenger Giovanni is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! •", + "• Challenger Giovanni is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(DebugProtect() && ChallengeLorelei(), - "• Challenger Lorelei is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! •", + "• Challenger Lorelei is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(DebugProtect() && ChallengeBruno(), - "• Challenger Bruno is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! •", + "• Challenger Bruno is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(DebugProtect() && ChallengeAgatha(), - "• Challenger Agatha is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! •", + "• Challenger Agatha is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(DebugProtect() && ChallengeLance(), - "• Challenger Lance is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! •", + "• Challenger Lance is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(DebugProtect() && ChallengeVesly() && LunaticDifficulty == 1, - "• Almighty Challenger Vesly is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! • Lunatic •", + "• Almighty Challenger Vesly is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! • Lunatic •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(DebugProtect() && ChallengeVesly(), - "• Challenger Vesly is in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! •", + "• Challenger Vesly is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) rich_presence_conditional_display(DebugProtect() && ChallengeLittleCup(), - "• Little Cup Challenge in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! •", + "• Little Cup Challenge in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", + rich_presence_lookup("MapID", MapID, RPMapID), + rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), + rich_presence_value("Seed", RNGSeed) +) + +rich_presence_conditional_display(DebugProtect() && ChallengeVoid(), + "• Void Exp Challenge in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", + rich_presence_lookup("MapID", MapID, RPMapID), + rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), + rich_presence_value("Seed", RNGSeed) +) + +rich_presence_conditional_display(DebugProtect() && ChallengeChaos(), + "• Full Chaos Challenge in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) -rich_presence_conditional_display(DebugProtect() && ChallengeFullChaos(), - "• Full Chaos Challenge in {0} • Pokédex: {1}/151 • RNG Seed: {2} • !! SUBSET ACHIEVEMENTS ONLY !! •", +rich_presence_conditional_display(DebugProtect() && ChallengePlus(), + "• Lunatic Plus Challenge in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", rich_presence_lookup("MapID", MapID, RPMapID), rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), + rich_presence_value("Seed", RNGSeed) +) + +rich_presence_conditional_display(DebugProtect() && ChallengeNuzlocke(), + "• Nuzlocke Challenge in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", + rich_presence_lookup("MapID", MapID, RPMapID), + rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), + rich_presence_value("Seed", RNGSeed) +) + +rich_presence_conditional_display(DebugProtect() && ChallengeCheater(), + "• A cheater is in {0} • Pokédex: {1}/151 • Faints: {2} • RNG Seed: {3} • !! SUBSET ACHIEVEMENTS ONLY !! •", + rich_presence_lookup("MapID", MapID, RPMapID), + rich_presence_value("Dex", PokedexCount()), + rich_presence_value("Faints", FaintsCount()), rich_presence_value("Seed", RNGSeed) ) @@ -1019,4 +1127,4 @@ rich_presence_conditional_display((DebuggerFlag == 0 && MapID != 0) || CheatFlag rich_presence_display( "• It's not Pokemon but it's not quite Fire Emblem either • " -) \ No newline at end of file +) diff --git a/MSX/Aliens: Alien 2 RAScript MK1 b/MSX/Aliens- Alien 2 RAScript MK1 similarity index 100% rename from MSX/Aliens: Alien 2 RAScript MK1 rename to MSX/Aliens- Alien 2 RAScript MK1 diff --git a/Mega Drive/Lord Monarch: Tokoton Sentou Densetsu.rascript b/Mega Drive/Lord Monarch- Tokoton Sentou Densetsu.rascript similarity index 100% rename from Mega Drive/Lord Monarch: Tokoton Sentou Densetsu.rascript rename to Mega Drive/Lord Monarch- Tokoton Sentou Densetsu.rascript diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Angler Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Angler Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Angler Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Angler Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Arid Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Arid Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Arid Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Arid Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Blanket Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Blanket Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Blanket Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Blanket Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Blether Charm.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Blether Charm.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Blether Charm.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Blether Charm.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Boom Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Boom Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Boom Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Boom Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Brand Charm.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Brand Charm.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Brand Charm.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Brand Charm.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Breeze Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Breeze Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Breeze Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Breeze Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Banding Kill LV5.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Banding Kill LV5.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Banding Kill LV5.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Banding Kill LV5.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Desert Cerberus Kill LV21.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Desert Cerberus Kill LV21.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Desert Cerberus Kill LV21.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Desert Cerberus Kill LV21.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Final Boss Kill LV30.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Final Boss Kill LV30.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Final Boss Kill LV30.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Final Boss Kill LV30.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Hydros Statue Kill LV12.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Hydros Statue Kill LV12.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Hydros Statue Kill LV12.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Hydros Statue Kill LV12.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Kraken Kill LV16.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Kraken Kill LV16.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Kraken Kill LV16.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Kraken Kill LV16.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Manticore King Kill LV15.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Manticore King Kill LV15.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Manticore King Kill LV15.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Manticore King Kill LV15.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Navampa Kill LV18.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Navampa Kill LV18.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Navampa Kill LV18.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Navampa Kill LV18.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode OUT OF ORDER Sealer Ape Kill LV8.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode OUT OF ORDER Sealer Ape Kill LV8.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode OUT OF ORDER Sealer Ape Kill LV8.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode OUT OF ORDER Sealer Ape Kill LV8.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Saturos Kill LV10.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Saturos Kill LV10.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Saturos Kill LV10.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Saturos Kill LV10.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Toadonpa Kill LV19.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Toadonpa Kill LV19.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Toadonpa Kill LV19.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Toadonpa Kill LV19.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Tret Kill LV7.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Tret Kill LV7.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Brutal Mode Tret Kill LV7.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Brutal Mode Tret Kill LV7.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Cascade Charm.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Cascade Charm.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Cascade Charm.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Cascade Charm.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Chasm Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Chasm Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Chasm Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Chasm Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Credit Roll.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Credit Roll.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Credit Roll.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Credit Roll.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Curare Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Curare Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Curare Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Curare Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Dew (Grand Djinn).state b/Misc/Save States/Golden Sun- Dawn of Djinn/Dew (Grand Djinn).state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Dew (Grand Djinn).state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Dew (Grand Djinn).state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Draft Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Draft Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Draft Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Draft Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Fatigue Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Fatigue Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Fatigue Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Fatigue Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Filter Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Filter Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Filter Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Filter Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Flurry Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Flurry Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Flurry Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Flurry Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Foam Charm.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Foam Charm.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Foam Charm.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Foam Charm.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Garland Charm.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Garland Charm.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Garland Charm.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Garland Charm.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Get Rapid.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Get Rapid.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Get Rapid.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Get Rapid.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Geyser and Simoom Charm.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Geyser and Simoom Charm.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Geyser and Simoom Charm.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Geyser and Simoom Charm.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Glare Charm.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Glare Charm.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Glare Charm.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Glare Charm.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Glint Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Glint Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Glint Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Glint Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Golden Sun Dawn of Djinn Patched (U).gba.sram b/Misc/Save States/Golden Sun- Dawn of Djinn/Golden Sun Dawn of Djinn Patched (U).gba.sram similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Golden Sun Dawn of Djinn Patched (U).gba.sram rename to Misc/Save States/Golden Sun- Dawn of Djinn/Golden Sun Dawn of Djinn Patched (U).gba.sram diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Java Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Java Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Java Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Java Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Jolt Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Jolt Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Jolt Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Jolt Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Jupiter Mimic.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Jupiter Mimic.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Jupiter Mimic.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Jupiter Mimic.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Kite Charm.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Kite Charm.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Kite Charm.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Kite Charm.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Last Pick for Boat Drift.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Last Pick for Boat Drift.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Last Pick for Boat Drift.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Last Pick for Boat Drift.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Lord of Djinn.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Lord of Djinn.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Lord of Djinn.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Lord of Djinn.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Lucky Boot secret item.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Lucky Boot secret item.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Lucky Boot secret item.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Lucky Boot secret item.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Magnet Charm.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Magnet Charm.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Magnet Charm.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Magnet Charm.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Mars Mimic.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Mars Mimic.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Mars Mimic.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Mars Mimic.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Mercury Mimic.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Mercury Mimic.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Mercury Mimic.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Mercury Mimic.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Mica Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Mica Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Mica Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Mica Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Mineral Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Mineral Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Mineral Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Mineral Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Mirage - Mars Grand Djinn.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Mirage - Mars Grand Djinn.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Mirage - Mars Grand Djinn.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Mirage - Mars Grand Djinn.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Onward to new adventures.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Onward to new adventures.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Onward to new adventures.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Onward to new adventures.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Putrid (Grand Djinn) Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Putrid (Grand Djinn) Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Putrid (Grand Djinn) Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Putrid (Grand Djinn) Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Putrid Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Putrid Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Putrid Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Putrid Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Sauna Charm.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Sauna Charm.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Sauna Charm.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Sauna Charm.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Seep Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Seep Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Seep Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Seep Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Shiver Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Shiver Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Shiver Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Shiver Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Smith Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Smith Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Smith Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Smith Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Swill Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Swill Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Swill Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Swill Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Venus Mimic.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Venus Mimic.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Venus Mimic.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Venus Mimic.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Vine Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Vine Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Vine Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Vine Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/Wade Get.state b/Misc/Save States/Golden Sun- Dawn of Djinn/Wade Get.state similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/Wade Get.state rename to Misc/Save States/Golden Sun- Dawn of Djinn/Wade Get.state diff --git a/Misc/Save States/Golden Sun: Dawn of Djinn/placeholder b/Misc/Save States/Golden Sun- Dawn of Djinn/placeholder similarity index 100% rename from Misc/Save States/Golden Sun: Dawn of Djinn/placeholder rename to Misc/Save States/Golden Sun- Dawn of Djinn/placeholder diff --git a/Nintendo DSi/Mr. Driller: Drill till you Drop.rascript b/Nintendo DSi/Mr. Driller- Drill till you Drop.rascript similarity index 100% rename from Nintendo DSi/Mr. Driller: Drill till you Drop.rascript rename to Nintendo DSi/Mr. Driller- Drill till you Drop.rascript diff --git a/PS2/Prince of Persia: The Sands of Time/28128-PoPSandsofTime-SubsetBonus.7z b/PS2/Prince of Persia- The Sands of Time/28128-PoPSandsofTime-SubsetBonus.7z similarity index 100% rename from PS2/Prince of Persia: The Sands of Time/28128-PoPSandsofTime-SubsetBonus.7z rename to PS2/Prince of Persia- The Sands of Time/28128-PoPSandsofTime-SubsetBonus.7z diff --git a/PS2/Prince of Persia: The Sands of Time/PoP 92 Unlocked.rar b/PS2/Prince of Persia- The Sands of Time/PoP 92 Unlocked.rar similarity index 100% rename from PS2/Prince of Persia: The Sands of Time/PoP 92 Unlocked.rar rename to PS2/Prince of Persia- The Sands of Time/PoP 92 Unlocked.rar diff --git a/PS2/Prince of Persia: The Sands of Time/Prince of Persia The Sands of Time V1.rascript b/PS2/Prince of Persia- The Sands of Time/Prince of Persia The Sands of Time V1.rascript similarity index 100% rename from PS2/Prince of Persia: The Sands of Time/Prince of Persia The Sands of Time V1.rascript rename to PS2/Prince of Persia- The Sands of Time/Prince of Persia The Sands of Time V1.rascript diff --git a/Vectrex/Star Trek: The Motion Picture.rascript b/Vectrex/Star Trek- The Motion Picture.rascript similarity index 100% rename from Vectrex/Star Trek: The Motion Picture.rascript rename to Vectrex/Star Trek- The Motion Picture.rascript