Tools: update packageISO and move yaz0 function to config

Author: jdflyer

Makefile

@@ -156,11 +156,7 @@ tools: dirs $(ELF2DOL) $(YAZ0)
 
 assets:
 	@mkdir -p game
-	$(PYTHON) tools/extract_game_assets.py $(IMAGENAME) game native asset_config.json
-
-assets-fast:
-	@mkdir -p game
-	$(PYTHON) tools/extract_game_assets.py $(IMAGENAME) game oead asset_config.json
+	$(PYTHON) tools/extract_game_assets.py $(IMAGENAME) game asset_config.json
 
 docs:
 	$(DOXYGEN) Doxyfile
@@ -193,40 +189,23 @@ shiftedrels: shift $(RELS)
 
 game: shiftedrels
 	@mkdir -p game
-	@$(PYTHON) tools/package_game_assets.py ./game $(BUILD_PATH) copyCode native asset_config.json
-
-game-fast: shiftedrels
-	@mkdir -p game
-	@$(PYTHON) tools/package_game_assets.py ./game $(BUILD_PATH) copyCode oead asset_config.json
+	@$(PYTHON) tools/package_game_assets.py ./game $(BUILD_PATH) copyCode asset_config.json
 
 game-nocompile:
 	@mkdir -p game
-	@$(PYTHON) tools/package_game_assets.py ./game $(BUILD_PATH) noCopyCode native asset_config.json
-
-game-nocompile-fast:
-	@mkdir -p game
-	@$(PYTHON) tools/package_game_assets.py ./game $(BUILD_PATH) noCopyCode oead asset_config.json
+	@$(PYTHON) tools/package_game_assets.py ./game $(BUILD_PATH) noCopyCode asset_config.json
 
 rungame-nocompile: game-nocompile
 	@echo If you are playing on a shifted game make sure Hyrule Field Speed hack is disabled in dolphin!
 	dolphin-emu $(BUILD_DIR)/game/sys/main.dol
 
-rungame-nocompile-fast: game-nocompile-fast
-	@echo If you are playing on a shifted game make sure Hyrule Field Speed hack is disabled in dolphin!
-	dolphin-emu $(BUILD_DIR)/game/sys/main.dol
-
-rungame-fast: game-fast
-	@echo If you are playing on a shifted game make sure Hyrule Field Speed hack is disabled in dolphin!
-	dolphin-emu $(BUILD_DIR)/game/sys/main.dol
-
 rungame: game
 	@echo If you are playing on a shifted game make sure Hyrule Field Speed hack is disabled in dolphin!
 	dolphin-emu $(BUILD_DIR)/game/sys/main.dol
 
 iso: game
 	@$(PYTHON) tools/packageISO.py $(BUILD_DIR)/game/ $(TARGET_ISO)
 
-
 $(BUILD_DIR)/%.o: %.c $(BUILD_DIR)/%.d
 	@mkdir -p $(@D)
 	@echo building... $<

tools/assets_config.py

@@ -4,6 +4,7 @@
 from os import path
 
 CONFIG_DESCRIPTIONS = {
+    "oead_yaz0": "Use oead (pip install oead) for asset (de)compression (faster)",
     "decompress_assets": "Decompress Yaz0 compressed assets (appends .c to the filename)",
     "extract_arc": "Extract archive (.arc) files",
     "convert_stages": "Convert Stage Files (.dzs and .dzr) to json",
@@ -13,6 +14,7 @@
 }
 
 CONFIG_DEFAULTS = {
+    "oead_yaz0": False,
     "decompress_assets": True,
     "extract_arc": True,
     "convert_stages": True,

tools/extract_game_assets.py

@@ -170,7 +170,7 @@ def writeFile(name, data):
         if ("exceptions" in extractDef and str(name) in extractDef["exceptions"]) or ("config_key" in extractDef and config[extractDef["config_key"]] == False):
             extractDef = None
 
-    if  config["decompress_assets"] == None:
+    if config["decompress_assets"] == False:
         extractDef = None # If assets aren't being decompressed, just write the raw file
 
     if extractDef == None:
@@ -245,16 +245,16 @@ def getDolInfo(disc):
 
     return dolOffset, dolSize
 
-def extract(isoPath: Path, gamePath: Path, yaz0Encoder: str, config_file: str):
-    if yaz0Encoder == "oead":
+def extract(isoPath: Path, gamePath: Path, config_file: str):
+    global config
+    config = assets_config.getConfig(config_file,update=True)
+    if config["oead_yaz0"]:
         try:
             from oead import yaz0
             global yaz0DecompressFunction
             yaz0DecompressFunction = yaz0.decompress
         except:
             print("Extract: oead isn't installed, falling back to native yaz0")
-    global config
-    config = assets_config.getConfig(config_file,update=True)
     isoPath = isoPath.absolute()
     cwd = os.getcwd()
     os.chdir(gamePath)
@@ -302,7 +302,7 @@ def extract(isoPath: Path, gamePath: Path, yaz0Encoder: str, config_file: str):
 
 
 def main():
-    extract(Path(sys.argv[1]), Path(sys.argv[2]), sys.argv[3], sys.argv[4])
+    extract(Path(sys.argv[1]), Path(sys.argv[2]), sys.argv[3])
 
 
 if __name__ == "__main__":