summaryrefslogtreecommitdiff
path: root/mm/2s2h/Rando/ActorBehavior/EnGirlA.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'mm/2s2h/Rando/ActorBehavior/EnGirlA.cpp')
-rw-r--r--mm/2s2h/Rando/ActorBehavior/EnGirlA.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/2s2h/Rando/ActorBehavior/EnGirlA.cpp b/mm/2s2h/Rando/ActorBehavior/EnGirlA.cpp
index 9da237c37..51800b327 100644
--- a/mm/2s2h/Rando/ActorBehavior/EnGirlA.cpp
+++ b/mm/2s2h/Rando/ActorBehavior/EnGirlA.cpp
@@ -75,11 +75,14 @@ s32 EnGirlA_RandoCanBuyFunc(PlayState* play, EnGirlA* enGirlA) {
void EnGirlA_RandoBuyFunc(PlayState* play, EnGirlA* enGirlA) {
auto& randoSaveCheck = RANDO_SAVE_CHECKS[enGirlA->actor.world.rot.z];
- RandoItemId randoItemId = Rando::ConvertItem(randoSaveCheck.randoItemId, (RandoCheckId)enGirlA->actor.world.rot.z);
+ RandoCheckId randoCheckId = (RandoCheckId)enGirlA->actor.world.rot.z;
+ RandoItemId randoItemId = Rando::ConvertItem(randoSaveCheck.randoItemId, randoCheckId);
randoSaveCheck.obtained = randoSaveCheck.cycleObtained = true;
Rupees_ChangeBy(-play->msgCtx.unk1206C);
if (randoItemId == RI_TRAP) {
RollTrapType();
+ } else if (randoItemId == RI_JUNK) {
+ randoItemId = Rando::CurrentJunkItem(randoCheckId);
}
Rando::GiveItem(randoItemId);
}