Pokémon Red and Blue: Progressive Card Key and auto hint bug fixes (A…

…rchipelagoMW#2076)

* Fix Progressive Card Key bug

* Fix auto hint spam

PokemonClient.py

@@ -176,8 +176,10 @@ async def parse_locations(data: List, ctx: GBContext):
     elif (location_name_to_id["Fossil - Choice B"] in ctx.checked_locations and location_name_to_id["Fossil - Choice A"]
             not in ctx.checked_locations):
         hints.append("Fossil - Choice A")
-    hints = [location_name_to_id[loc] for loc in hints if loc not in ctx.auto_hints and location_name_to_id[loc] in
-             ctx.missing_locations and location_name_to_id[loc] not in ctx.locations_checked]
+    hints = [
+        location_name_to_id[loc] for loc in hints if location_name_to_id[loc] not in ctx.auto_hints and
+        location_name_to_id[loc] in ctx.missing_locations and location_name_to_id[loc] not in ctx.locations_checked
+    ]
     if hints:
         await ctx.send_msgs([{"cmd": "LocationScouts", "locations": hints, "create_as_hint": 2}])
     ctx.auto_hints.update(hints)

worlds/pokemon_rb/rom_addresses.py

@@ -3,8 +3,8 @@
     "Option_Pitch_Black_Rock_Tunnel": 0x758,
     "Option_Blind_Trainers": 0x30c3,
     "Option_Trainersanity1": 0x3153,
-    "Option_Split_Card_Key": 0x3e09,
-    "Option_Fix_Combat_Bugs": 0x3e0a,
+    "Option_Split_Card_Key": 0x3e0c,
+    "Option_Fix_Combat_Bugs": 0x3e0d,
     "Option_Lose_Money": 0x40d4,
     "Base_Stats_Mew": 0x4260,
     "Title_Mon_First": 0x4373,
@@ -1164,22 +1164,22 @@
     "Prize_Mon_E": 0x52944,
     "Prize_Mon_F": 0x52946,
     "Start_Inventory": 0x52a7b,
-    "Map_Fly_Location": 0x52c77,
-    "Reset_A": 0x52d27,
-    "Reset_B": 0x52d53,
-    "Reset_C": 0x52d7f,
-    "Reset_D": 0x52dab,
-    "Reset_E": 0x52dd7,
-    "Reset_F": 0x52e03,
-    "Reset_G": 0x52e2f,
-    "Reset_H": 0x52e5b,
-    "Reset_I": 0x52e87,
-    "Reset_J": 0x52eb3,
-    "Reset_K": 0x52edf,
-    "Reset_L": 0x52f0b,
-    "Reset_M": 0x52f37,
-    "Reset_N": 0x52f63,
-    "Reset_O": 0x52f8f,
+    "Map_Fly_Location": 0x52c6f,
+    "Reset_A": 0x52d1b,
+    "Reset_B": 0x52d47,
+    "Reset_C": 0x52d73,
+    "Reset_D": 0x52d9f,
+    "Reset_E": 0x52dcb,
+    "Reset_F": 0x52df7,
+    "Reset_G": 0x52e23,
+    "Reset_H": 0x52e4f,
+    "Reset_I": 0x52e7b,
+    "Reset_J": 0x52ea7,
+    "Reset_K": 0x52ed3,
+    "Reset_L": 0x52eff,
+    "Reset_M": 0x52f2b,
+    "Reset_N": 0x52f57,
+    "Reset_O": 0x52f83,
     "Warps_Route2": 0x54026,
     "Missable_Route_2_Item_1": 0x5404a,
     "Missable_Route_2_Item_2": 0x54051,