Convert End of Cycle enhancements to ShipInit #945
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| #ifndef CYCLE_H | ||
| #define CYCLE_H | ||
|
|
||
| void RegisterKeepExpressMail(); | ||
|
|
||
| #endif // CYCLE_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,103 +1,120 @@ | ||
| #include <libultraship/libultraship.h> | ||
| #include "2s2h/GameInteractor/GameInteractor.h" | ||
| #include "2s2h/ShipInit.hpp" | ||
|
|
||
| extern "C" { | ||
| #include <variables.h> | ||
| #include <overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h> | ||
| } | ||
|
|
||
| #define CVAR_NAME_RUPEES "gEnhancements.Cycle.DoNotResetRupees" | ||
| #define CVAR_RUPEES CVarGetInteger(CVAR_NAME_RUPEES, 0) | ||
| #define CVAR_NAME_CONSUME "gEnhancements.Cycle.DoNotResetConsumables" | ||
| #define CVAR_CONSUME CVarGetInteger(CVAR_NAME_CONSUME, 0) | ||
| #define CVAR_NAME_BOTTLE "gEnhancements.Cycle.DoNotResetBottleContent" | ||
| #define CVAR_BOTTLE CVarGetInteger(CVAR_NAME_BOTTLE, 0) | ||
| #define CVAR_NAME_SWORD "gEnhancements.Cycle.DoNotResetRazorSword" | ||
| #define CVAR_SWORD CVarGetInteger(CVAR_NAME_SWORD, 0) | ||
| #define CVAR_NAME_TIME "gEnhancements.Cycle.DoNotResetTimeSpeed" | ||
| #define CVAR_TIME CVarGetInteger(CVAR_NAME_TIME, 0) | ||
|
|
||
| SaveInfo saveInfoCopy; | ||
| ShipSaveInfo shipSaveInfoCopy; | ||
| s32 timeSpeedOffsetCopy = 0; | ||
|
|
||
| void RegisterEndOfCycleSaveHooks() { | ||
| COND_HOOK(BeforeEndOfCycleSave, true, []() { | ||
| memcpy(&saveInfoCopy, &gSaveContext.save.saveInfo, sizeof(SaveInfo)); | ||
| memcpy(&shipSaveInfoCopy, &gSaveContext.save.shipSaveInfo, sizeof(ShipSaveInfo)); | ||
| timeSpeedOffsetCopy = gSaveContext.save.timeSpeedOffset; | ||
| }); | ||
|
|
||
| COND_HOOK(AfterEndOfCycleSave, CVAR_RUPEES, []() { | ||
| gSaveContext.save.saveInfo.playerData.rupees = saveInfoCopy.playerData.rupees; | ||
| CLEAR_EVENTINF(EVENTINF_THREEDAYRESET_LOST_RUPEES); | ||
| }); | ||
|
|
||
| COND_HOOK(AfterEndOfCycleSave, CVAR_CONSUME, []() { | ||
| if (INV_CONTENT(ITEM_BOMB) == ITEM_BOMB) { | ||
| INV_CONTENT(ITEM_BOMB) = saveInfoCopy.inventory.items[ITEM_BOMB]; | ||
| AMMO(ITEM_BOMB) = saveInfoCopy.inventory.ammo[ITEM_BOMB]; | ||
| } | ||
|
|
||
| if (INV_CONTENT(ITEM_DEKU_NUT) == ITEM_DEKU_NUT) { | ||
| INV_CONTENT(ITEM_DEKU_NUT) = saveInfoCopy.inventory.items[ITEM_DEKU_NUT]; | ||
| AMMO(ITEM_DEKU_NUT) = saveInfoCopy.inventory.ammo[ITEM_DEKU_NUT]; | ||
| } | ||
|
|
||
| if (INV_CONTENT(ITEM_DEKU_STICK) == ITEM_DEKU_STICK) { | ||
| INV_CONTENT(ITEM_DEKU_STICK) = saveInfoCopy.inventory.items[ITEM_DEKU_STICK]; | ||
| AMMO(ITEM_DEKU_STICK) = saveInfoCopy.inventory.ammo[ITEM_DEKU_STICK]; | ||
| } | ||
|
|
||
| if (INV_CONTENT(ITEM_BOW) == ITEM_BOW) { | ||
| INV_CONTENT(ITEM_BOW) = saveInfoCopy.inventory.items[ITEM_BOW]; | ||
| AMMO(ITEM_BOW) = saveInfoCopy.inventory.ammo[ITEM_BOW]; | ||
| } | ||
|
|
||
| for (int i = 0; i < ITEM_NUM_SLOTS; i++) { | ||
| if (gAmmoItems[i] != ITEM_NONE) { | ||
| if ((gSaveContext.save.saveInfo.inventory.items[i] != ITEM_NONE) && (i != SLOT_PICTOGRAPH_BOX)) { | ||
| gSaveContext.save.saveInfo.inventory.items[i] = saveInfoCopy.inventory.items[i]; | ||
| gSaveContext.save.saveInfo.inventory.ammo[i] = saveInfoCopy.inventory.ammo[i]; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| CLEAR_EVENTINF(EVENTINF_THREEDAYRESET_LOST_BOMB_AMMO); | ||
| CLEAR_EVENTINF(EVENTINF_THREEDAYRESET_LOST_NUT_AMMO); | ||
| CLEAR_EVENTINF(EVENTINF_THREEDAYRESET_LOST_STICK_AMMO); | ||
| CLEAR_EVENTINF(EVENTINF_THREEDAYRESET_LOST_ARROW_AMMO); | ||
| }); | ||
|
|
||
| COND_HOOK(AfterEndOfCycleSave, CVAR_BOTTLE, []() { | ||
| int stolenBottles = (((saveInfoCopy.stolenItems & 0xFF000000) >> 0x18) == ITEM_BOTTLE) + | ||
| (((saveInfoCopy.stolenItems & 0x00FF0000) >> 0x10) == ITEM_BOTTLE); | ||
|
|
||
| // Replace bottles back, accounting for any stolen bottles | ||
| for (int i = SLOT_BOTTLE_1; i <= SLOT_BOTTLE_6; i++) { | ||
| gSaveContext.save.saveInfo.inventory.items[i] = saveInfoCopy.inventory.items[i]; | ||
|
|
||
| if (stolenBottles > 0 && saveInfoCopy.inventory.items[i] == ITEM_NONE) { | ||
| stolenBottles--; | ||
| gSaveContext.save.saveInfo.inventory.items[i] = ITEM_BOTTLE; | ||
| } | ||
| } | ||
|
|
||
| // Set back button equips to the correct bottle type | ||
| for (int j = EQUIP_SLOT_C_LEFT; j <= EQUIP_SLOT_C_RIGHT; j++) { | ||
| if (GET_CUR_FORM_BTN_ITEM(j) == ITEM_BOTTLE) { | ||
| SET_CUR_FORM_BTN_ITEM(j, saveInfoCopy.equips.buttonItems[0][j]); | ||
| } | ||
| } | ||
| for (int j = EQUIP_SLOT_D_RIGHT; j <= EQUIP_SLOT_D_UP; j++) { | ||
| if (DPAD_GET_CUR_FORM_BTN_ITEM(j) == ITEM_BOTTLE) { | ||
| DPAD_SET_CUR_FORM_BTN_ITEM(j, shipSaveInfoCopy.dpadEquips.dpadItems[0][j]); | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| COND_HOOK(AfterEndOfCycleSave, CVAR_SWORD, []() { | ||
| u8 curSword = (saveInfoCopy.equips.equipment & gEquipMasks[EQUIP_TYPE_SWORD]) >> gEquipShifts[EQUIP_TYPE_SWORD]; | ||
|
|
||
| // Check for razor sword equipped, stolen, or turned into the smithy | ||
| if (curSword == EQUIP_VALUE_SWORD_RAZOR || | ||
| (curSword == EQUIP_VALUE_SWORD_NONE && | ||
| ((saveInfoCopy.permanentSceneFlags[SCENE_KAJIYA].unk_14 & 4) || | ||
| (((saveInfoCopy.stolenItems & 0xFF000000) >> 0x18) == ITEM_SWORD_RAZOR) || | ||
| (((saveInfoCopy.stolenItems & 0x00FF0000) >> 0x10) == ITEM_SWORD_RAZOR)))) { | ||
|
|
||
| SET_EQUIP_VALUE(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_RAZOR); | ||
| BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_B) = ITEM_SWORD_RAZOR; | ||
| } | ||
| }); | ||
|
|
||
| COND_HOOK(AfterEndOfCycleSave, CVAR_TIME, []() { gSaveContext.save.timeSpeedOffset = timeSpeedOffsetCopy; }); | ||
| } | ||
|
|
||
| static RegisterShipInitFunc initFunc(RegisterEndOfCycleSaveHooks, | ||
| { CVAR_NAME_RUPEES, CVAR_NAME_CONSUME, CVAR_NAME_BOTTLE, CVAR_NAME_SWORD, | ||
| CVAR_NAME_TIME }); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice touch to add these!