sera shop slingshot check

This commit is contained in:
gymnast86
2026-04-21 22:05:38 -07:00
parent e7e5363c0c
commit 148a3d23eb
2 changed files with 13 additions and 3 deletions
+11
View File
@@ -911,6 +911,7 @@ int dShopSystem_c::seq_start(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
switch (itemNo) {
case dItemNo_Randomizer_HALF_MILK_BOTTLE_e:
itemNo = randomizer_getItemAtLocation("Ordon Cat Rescue");
break;
}
}
#endif
@@ -1204,6 +1205,16 @@ int dShopSystem_c::seq_decide_yes(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
if (mFlow.getEventId(&itemNo) == 1) {
if (i_flow->doFlow(actor, NULL, 0)) {
if (mItemPartnerId == fpcM_ERROR_PROCESS_ID_e) {
#if TARGET_PC
// In rando, override the item if it's one of our unique shop checks
if (randomizer_IsActive()) {
switch (itemNo) {
case dItemNo_Randomizer_PACHINKO_e:
itemNo = randomizer_getItemAtLocation("Sera Shop Slingshot");
break;
}
}
#endif
mItemPartnerId =
fopAcM_createItemForPresentDemo(&current.pos, itemNo, 0, -1, -1, NULL, NULL);
}
@@ -45,9 +45,8 @@
- Overworld
- Shop
- Ordona Province
- ARC
Metadata:
- None
- Location Name Lookup
Metadata: Sera Shop Slingshot
- Name: Ordon Shield
Original Item: Ordon Shield