From 4fa8c432666039ec7cd82e88ba2fd29a62bacbd9 Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Sun, 19 Jan 2025 23:06:09 -0500
Subject: [PATCH] FFMQ: Fix collect_item (#4433)

* Fix FFMQ collect_item
---
 worlds/ffmq/__init__.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/worlds/ffmq/__init__.py b/worlds/ffmq/__init__.py
index 3c584872..58dc4bf1 100644
--- a/worlds/ffmq/__init__.py
+++ b/worlds/ffmq/__init__.py
@@ -152,14 +152,23 @@ class FFMQWorld(World):
         return FFMQItem(name, self.player)
 
     def collect_item(self, state, item, remove=False):
+        if not item.advancement:
+            return None
         if "Progressive" in item.name:
             i = item.code - 256
+            if remove:
+                if state.has(self.item_id_to_name[i+1], self.player):
+                    if state.has(self.item_id_to_name[i+2], self.player):
+                        return self.item_id_to_name[i+2]
+                    return self.item_id_to_name[i+1]
+                return self.item_id_to_name[i]
+
             if state.has(self.item_id_to_name[i], self.player):
                 if state.has(self.item_id_to_name[i+1], self.player):
                     return self.item_id_to_name[i+2]
                 return self.item_id_to_name[i+1]
             return self.item_id_to_name[i]
-        return item.name if item.advancement else None
+        return item.name
 
     def modify_multidata(self, multidata):
         # wait for self.rom_name to be available.