diff --git a/Makefile b/Makefile index 2be60e2b283..61f104640bf 100644 --- a/Makefile +++ b/Makefile @@ -180,7 +180,7 @@ $(DOL_SHIFT): $(ELF_SHIFT) | tools shift: dirs $(DOL_SHIFT) -shiftedrels: shift +shiftedrels: shift $(RELS) @echo generating shifted RELs from .plf @echo $(RELS) > build/plf_files $(PYTHON) $(MAKEREL) build --string-table $(BUILD_DIR)/frameworkF.str @build/plf_files $(ELF_SHIFT) diff --git a/tools/package_game_assets.py b/tools/package_game_assets.py index 9347e7476d9..677c5b89037 100644 --- a/tools/package_game_assets.py +++ b/tools/package_game_assets.py @@ -342,10 +342,7 @@ def main(gamePath, buildPath, copyCode, yaz0Encoding): if not (gamePath / "files").exists() or not (gamePath / "sys").exists(): print("ISO is not extracted; extracting...") - previousDir = os.getcwd() - os.chdir(str(gamePath.absolute())) - extract_game_assets.extract("../" + str(iso),yaz0Encoding) - os.chdir(previousDir) + extract_game_assets.extract(iso.absolute(),gamePath.absolute(),yaz0Encoding) print("Copying game files...") if os.path.exists(buildPath / "dolzel2") == False: