monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pokémon R/B: Fix broken options (#2162)

This commit is contained in:
Alchav 2023-09-10 17:38:56 -04:00 committed by GitHub
parent 5eef7a34d3
commit 0e21a3e121
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worlds/pokemon_rb/__init__.py
View File

@ -138,7 +138,7 @@ class PokemonRedBlueWorld(World):
if self.multiworld.key_items_only[self.player]: if self.multiworld.key_items_only[self.player]:
self.multiworld.trainersanity[self.player] = self.multiworld.trainersanity[self.player].from_text("off") self.multiworld.trainersanity[self.player] = self.multiworld.trainersanity[self.player].from_text("off")
self.multiworld.dexsanity[self.player] = self.multiworld.dexsanity[self.player].from_text("false") self.multiworld.dexsanity[self.player].value = 0
self.multiworld.randomize_hidden_items[self.player] = \ self.multiworld.randomize_hidden_items[self.player] = \
self.multiworld.randomize_hidden_items[self.player].from_text("off") self.multiworld.randomize_hidden_items[self.player].from_text("off")

2
worlds/pokemon_rb/logic.py
View File

@ -53,7 +53,7 @@ def has_key_items(state, count, player):
"Hideout Key", "Card Key 2F", "Card Key 3F", "Card Key 4F", "Card Key 5F", "Hideout Key", "Card Key 2F", "Card Key 3F", "Card Key 4F", "Card Key 5F",
"Card Key 6F", "Card Key 7F", "Card Key 8F", "Card Key 9F", "Card Key 10F", "Card Key 6F", "Card Key 7F", "Card Key 8F", "Card Key 9F", "Card Key 10F",
"Card Key 11F", "Exp. All", "Fire Stone", "Thunder Stone", "Water Stone", "Card Key 11F", "Exp. All", "Fire Stone", "Thunder Stone", "Water Stone",
"Leaf Stone"] if state.has(item, player)]) "Leaf Stone", "Moon Stone"] if state.has(item, player)])
+ min(state.count("Progressive Card Key", player), 10)) + min(state.count("Progressive Card Key", player), 10))
return key_items >= count return key_items >= count

25
worlds/pokemon_rb/rom.py
View File

@ -238,18 +238,19 @@ def generate_output(self, output_directory: str):
data[address] = 0 if "Elevator" in connected_map_name else warp_to_ids[i] data[address] = 0 if "Elevator" in connected_map_name else warp_to_ids[i]
data[address + 1] = map_ids[connected_map_name] data[address + 1] = map_ids[connected_map_name]
for i, gym_leader in enumerate(("Pewter Gym - Brock TM", "Cerulean Gym - Misty TM", if not self.multiworld.key_items_only[self.player]:
"Vermilion Gym - Lt. Surge TM", "Celadon Gym - Erika TM", for i, gym_leader in enumerate(("Pewter Gym - Brock TM", "Cerulean Gym - Misty TM",
"Fuchsia Gym - Koga TM", "Saffron Gym - Sabrina TM", "Vermilion Gym - Lt. Surge TM", "Celadon Gym - Erika TM",
"Cinnabar Gym - Blaine TM", "Viridian Gym - Giovanni TM")): "Fuchsia Gym - Koga TM", "Saffron Gym - Sabrina TM",
item_name = self.multiworld.get_location(gym_leader, self.player).item.name "Cinnabar Gym - Blaine TM", "Viridian Gym - Giovanni TM")):
if item_name.startswith("TM"): item_name = self.multiworld.get_location(gym_leader, self.player).item.name
try: if item_name.startswith("TM"):
tm = int(item_name[2:4]) try:
move = poke_data.moves[self.local_tms[tm - 1]]["id"] tm = int(item_name[2:4])
data[rom_addresses["Gym_Leader_Moves"] + (2 * i)] = move move = poke_data.moves[self.local_tms[tm - 1]]["id"]
except KeyError: data[rom_addresses["Gym_Leader_Moves"] + (2 * i)] = move
pass except KeyError:
pass
def set_trade_mon(address, loc): def set_trade_mon(address, loc):
mon = self.multiworld.get_location(loc, self.player).item.name mon = self.multiworld.get_location(loc, self.player).item.name