Fix free roam behavior with Romani reward (#1101)

1 files changed, 18 insertions, 0 deletions

diff --git a/mm/2s2h/Rando/ActorBehavior/EnInvadepoh.cpp b/mm/2s2h/Rando/ActorBehavior/EnInvadepoh.cpp
new file mode 100644
index 000000000..91b11b7ba
--- /dev/null
+++ b/mm/2s2h/Rando/ActorBehavior/EnInvadepoh.cpp
@@ -0,0 +1,18 @@
+#include "ActorBehavior.h"
+#include <libultraship/libultraship.h>
+
+void Rando::ActorBehavior::InitEnInvadepohBehavior() {
+    // This is the same block found for non-scripted actors in OfferGetItem.cpp, but without Player_TalkWithPlayer().
+    COND_VB_SHOULD(VB_GIVE_ITEM_FROM_OFFER, IS_RANDO, {
+        GetItemId* item = va_arg(args, GetItemId*);
+        Actor* actor = va_arg(args, Actor*);
+        if (actor->id == ACTOR_EN_INVADEPOH) { // Romani Ranch invasion actor
+            *should = false;
+            Player* player = GET_PLAYER(gPlayState);
+            actor->parent = &player->actor;
+            player->talkActor = actor;
+            player->talkActorDistance = actor->xzDistToPlayer;
+            player->exchangeItemAction = PLAYER_IA_MINUS1;
+        }
+    });
+}
\ No newline at end of file