Adjustments to change age cheat and time travel enhancement (#4512)

This commit is contained in:
Garrett Cox
2024-11-06 20:38:57 -06:00
committed by GitHub
parent a919b6a5a0
commit d07cbe8395
7 changed files with 46 additions and 66 deletions

View File

@@ -1607,10 +1607,8 @@ void Inventory_SwapAgeEquipment(void) {
s16 i;
u16 shieldEquipValue;
// Mod Enhancments can utilise the rando flow path
if (IS_RANDO || CVarGetInteger(CVAR_GENERAL("SwitchAge"), 0) || CVarGetInteger(CVAR_GENERAL("SwitchTimeline"), 0)) {
if (IS_RANDO) {
Rando_Inventory_SwapAgeEquipment();
CVarSetInteger(CVAR_GENERAL("SwitchTimeline"), 0);
return;
}

View File

@@ -10811,7 +10811,7 @@ void Player_Init(Actor* thisx, PlayState* play2) {
if (respawnFlag == -3) {
thisx->params = gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams;
} else {
if ((respawnFlag == 1) || (respawnFlag == -1)) {
if (GameInteractor_Should(VB_INFLICT_VOID_DAMAGE, (respawnFlag == 1) || (respawnFlag == -1), respawnFlag)) {
this->unk_A86 = -2;
}