Pokemon RB: apworld fixes (#2042)

worlds/pokemon_rb/__init__.py

@@ -7,8 +7,8 @@ from typing import TextIO
 
 from BaseClasses import Item, MultiWorld, Tutorial, ItemClassification, LocationProgressType
 from Fill import fill_restrictive, FillError, sweep_from_pool
-from ..AutoWorld import World, WebWorld
+from worlds.AutoWorld import World, WebWorld
-from ..generic.Rules import add_item_rule
+from worlds.generic.Rules import add_item_rule
 from .items import item_table, item_groups
 from .locations import location_data, PokemonRBLocation
 from .regions import create_regions

worlds/pokemon_rb/rom.py

@@ -2,7 +2,7 @@ import os
 import hashlib
 import Utils
 import bsdiff4
-from copy import deepcopy
+import pkgutil
 from worlds.Files import APDeltaPatch
 from .text import encode_text
 from .items import item_table
@@ -12,7 +12,6 @@ from .rom_addresses import rom_addresses
 from .regions import PokemonRBWarp, map_ids
 from . import poke_data
 
-
 def write_quizzes(self, data, random):
 
     def get_quiz(q, a):
@@ -198,8 +197,8 @@ def generate_output(self, output_directory: str):
     game_version = self.multiworld.game_version[self.player].current_key
     data = bytes(get_base_rom_bytes(game_version))
 
-    with open(os.path.join(os.path.dirname(__file__), f'basepatch_{game_version}.bsdiff4'), 'rb') as stream:
+    base_patch = pkgutil.get_data(__name__, f'basepatch_{game_version}.bsdiff4')
-        base_patch = bytes(stream.read())
+
     data = bytearray(bsdiff4.patch(data, base_patch))
 
     basemd5 = hashlib.md5()

worlds/pokemon_rb/rules.py

@@ -1,4 +1,4 @@
-from ..generic.Rules import add_item_rule, add_rule, location_item_name
+from worlds.generic.Rules import add_item_rule, add_rule, location_item_name
 from .items import item_groups
 from . import logic