move wallet fill after Link's Pocket (#6846)

This commit is contained in:
A Green Spoon
2026-07-02 14:49:09 -04:00
committed by GitHub
parent 1580d7c3d1
commit 7effe28911
+6 -4
View File
@@ -28,6 +28,8 @@ void GiveLinkRupees(int numOfRupees) {
maxRupeeCount = 200;
} else if (CUR_UPG_VALUE(UPG_WALLET) == 2) {
maxRupeeCount = 500;
} else if (CUR_UPG_VALUE(UPG_WALLET) == 3) {
maxRupeeCount = 999;
}
int newRupeeCount = gSaveContext.rupees;
@@ -361,10 +363,6 @@ void SetStartingItems() {
break;
}
if (Randomizer_GetSettingValue(RSK_FULL_WALLETS)) {
GiveLinkRupees(9001);
}
if (Randomizer_GetSettingValue(RSK_SHUFFLE_MAPANDCOMPASS) == RO_DUNGEON_ITEM_LOC_STARTWITH) {
uint32_t mapBitMask = 1 << 1;
uint32_t compassBitMask = 1 << 2;
@@ -533,6 +531,10 @@ extern "C" void Randomizer_InitSaveFile() {
// Give Link's pocket item
GiveLinksPocketItem();
if (Randomizer_GetSettingValue(RSK_FULL_WALLETS)) {
GiveLinkRupees(9001);
}
// Remove One Time Scrubs with Scrubsanity off
if (Randomizer_GetSettingValue(RSK_SHUFFLE_SCRUBS) == RO_SCRUBS_OFF) {
Flags_SetItemGetInf(ITEMGETINF_DEKU_SCRUB_HEART_PIECE);