diff options
| author | inspectredc <78732756+inspectredc@users.noreply.github.com> | 2023-04-21 02:53:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-20 21:53:56 -0400 |
| commit | c146ca4aa5b3715ad0bfc3e4d01d50fb0677e425 (patch) | |
| tree | 0a73d197d7311b208729c3b453b6082bee117191 /soh/src/code | |
| parent | 8f0f8c7644563a3e16b9ba79db6a69df82e0374c (diff) | |
Fix: SoT Time Travel B-Button Behaviour (#2720)
* time travel allows fishing rod + fixes vanilla ToT age change behaviour
* oops removed too much
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_parameter.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index e69fd0126..ff22c0e12 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -1417,7 +1417,7 @@ void Inventory_SwapAgeEquipment(void) { if (i != 0) { gSaveContext.childEquips.buttonItems[i] = gSaveContext.equips.buttonItems[i]; } else { - if (CVarGetInteger("gSwitchAge", 0) && + if ((CVarGetInteger("gSwitchAge", 0) || CVarGetInteger("gSwitchTimeline", 0)) && (gSaveContext.infTable[29] & 1)) { gSaveContext.childEquips.buttonItems[i] = ITEM_NONE; } else { @@ -1501,7 +1501,8 @@ void Inventory_SwapAgeEquipment(void) { gSaveContext.adultEquips.equipment = gSaveContext.equips.equipment; if (gSaveContext.childEquips.buttonItems[0] != ITEM_NONE || - CVarGetInteger("gSwitchAge", 0)) { + CVarGetInteger("gSwitchAge", 0) || + CVarGetInteger("gSwitchTimeline", 0)) { for (i = 0; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) { gSaveContext.equips.buttonItems[i] = gSaveContext.childEquips.buttonItems[i]; @@ -1542,7 +1543,7 @@ void Inventory_SwapAgeEquipment(void) { gSaveContext.equips.equipment = 0x1111; } - if (CVarGetInteger("gSwitchAge", 0) && + if ((CVarGetInteger("gSwitchAge", 0) || CVarGetInteger("gSwitchTimeline", 0)) && (gSaveContext.equips.buttonItems[0] == ITEM_NONE)) { gSaveContext.infTable[29] |= 1; if (gSaveContext.childEquips.equipment == 0) { @@ -1552,7 +1553,7 @@ void Inventory_SwapAgeEquipment(void) { } } } - + CVarSetInteger("gSwitchTimeline", 0); temp = gEquipMasks[EQUIP_SHIELD] & gSaveContext.equips.equipment; if (temp != 0) { temp >>= gEquipShifts[EQUIP_SHIELD]; |