diff --git a/.gitattributes b/.gitattributes index 84df2b71cd..a962a94d51 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,4 +8,5 @@ goal_src/import/** linguist-generated *.gc linguist-language=lisp *.gd linguist-language=lisp *.gs linguist-language=Scheme +*.gp linguist-language=Scheme goal_src/engine/gfx/ocean/ocean-tables.gc linguist-vendored diff --git a/.vs/launch.vs.json b/.vs/launch.vs.json index 1f9e767917..7bb03e1e47 100644 --- a/.vs/launch.vs.json +++ b/.vs/launch.vs.json @@ -138,7 +138,7 @@ "project" : "CMakeLists.txt", "projectTarget" : "extractor.exe (bin\\extractor.exe)", "name" : "Run - Extractor - Extract", - "args" : [ "\"C:\\Game\\PS2SMB\\DVD\\SCPS_150.21.Jak & Daxter - TPL (NTSC-J).iso\""] + "args" : ["E:\\ISOs\\Jak\\Jak 1.iso"] } ] } diff --git a/.vscode/launch.json b/.vscode/launch.json index 3ac84f3749..5bfcae9f77 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,12 +5,12 @@ "version": "0.2.0", "configurations": [ { - "name": "Cleanup All Types", + "name": "Python", "type": "python", "request": "launch", - "program": "${workspaceFolder}/scripts/cleanup-all-types.py", + "program": "${workspaceFolder}/scripts/initial_gsrc_creation/replicate_folder_structure.py", "console": "integratedTerminal", - "cwd": "${workspaceFolder}" + "cwd": "${workspaceFolder}/scripts/initial_gsrc_creation" }, ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 4021876518..f8caef5630 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,4 @@ { "terminal.integrated.scrollback": 32000, + "python.formatting.provider": "black", } diff --git a/Taskfile.yml b/Taskfile.yml index 7ed41a9f12..c471e35246 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -4,6 +4,7 @@ includes: build: ./scripts/tasks/Taskfile_{{OS}}.yml tasks: + # TODO - make it easy to switch between games instead of having a bunch of "jak1/jak2" varients # GENERAL extract-jak1: desc: "Extracts Jak 1 - NTSC - Black Label assets" @@ -61,6 +62,9 @@ tasks: decomp: cmds: - '{{.DECOMP_BIN_RELEASE_DIR}}/decompiler "./decompiler/config/jak1_ntsc_black_label.jsonc" "./iso_data" "./decompiler_out"' + decomp-jak2: + cmds: + - '{{.DECOMP_BIN_RELEASE_DIR}}/decompiler "./decompiler/config/jak2_ntsc_v1.jsonc" "./iso_data" "./decompiler_out"' decomp-clean: cmds: - rm ./decompiler_out/**/*.asm diff --git a/decompiler/ObjectFile/ObjectFileDB_IR2.cpp b/decompiler/ObjectFile/ObjectFileDB_IR2.cpp index 6b72c9d00e..aa1ba0c558 100644 --- a/decompiler/ObjectFile/ObjectFileDB_IR2.cpp +++ b/decompiler/ObjectFile/ObjectFileDB_IR2.cpp @@ -89,6 +89,11 @@ void ObjectFileDB::analyze_functions_ir2( ir2_symbol_definition_map(data); + // TODO - insert the game_name into the import line automatically + // instead of `goal_src/jak1/import/something.gc` + // just `import/something.gc` + // + // Can be relative to the root of the source directory const auto& imports_it = config.import_deps_by_file.find(data.to_unique_name()); std::vector imports; if (imports_it != config.import_deps_by_file.end()) { diff --git a/decompiler/config/jak1_jp.jsonc b/decompiler/config/jak1_jp.jsonc index 9e7215eb8e..041426990c 100644 --- a/decompiler/config/jak1_jp.jsonc +++ b/decompiler/config/jak1_jp.jsonc @@ -88,7 +88,7 @@ // optional: a predetermined object file name map from a file. // this will make decompilation naming consistent even if you only run on some objects. - "obj_file_name_map_file": "goal_src/build/all_objs_jak1_jp.json", + "obj_file_name_map_file": "goal_src/jak1/build/all_objs_jak1_jp.json", //////////////////////////// // LEVEL EXTRACTION diff --git a/decompiler/config/jak1_ntsc_black_label.jsonc b/decompiler/config/jak1_ntsc_black_label.jsonc index df3b944222..93f2942f8b 100644 --- a/decompiler/config/jak1_ntsc_black_label.jsonc +++ b/decompiler/config/jak1_ntsc_black_label.jsonc @@ -88,7 +88,7 @@ // optional: a predetermined object file name map from a file. // this will make decompilation naming consistent even if you only run on some objects. - "obj_file_name_map_file": "goal_src/build/all_objs.json", + "obj_file_name_map_file": "goal_src/jak1/build/all_objs.json", //////////////////////////// // LEVEL EXTRACTION diff --git a/decompiler/config/jak1_ntsc_black_label/import_deps.jsonc b/decompiler/config/jak1_ntsc_black_label/import_deps.jsonc index fc6d78ae13..1a7b7a5156 100644 --- a/decompiler/config/jak1_ntsc_black_label/import_deps.jsonc +++ b/decompiler/config/jak1_ntsc_black_label/import_deps.jsonc @@ -1,470 +1,470 @@ { "jungle-obs": [ - "goal_src/import/maindoor-ag.gc", - "goal_src/import/junglecam-ag.gc", - "goal_src/import/precurbridge-ag.gc", - "goal_src/import/sidedoor-ag.gc", - "goal_src/import/towertop-ag.gc", - "goal_src/import/logtrap-ag.gc", - "goal_src/import/lurkerm-tall-sail-ag.gc", - "goal_src/import/medres-firecanyon-ag.gc", - "goal_src/import/lurkerm-piston-ag.gc", - "goal_src/import/accordian-ag.gc" + "goal_src/jak1/import/maindoor-ag.gc", + "goal_src/jak1/import/junglecam-ag.gc", + "goal_src/jak1/import/precurbridge-ag.gc", + "goal_src/jak1/import/sidedoor-ag.gc", + "goal_src/jak1/import/towertop-ag.gc", + "goal_src/jak1/import/logtrap-ag.gc", + "goal_src/jak1/import/lurkerm-tall-sail-ag.gc", + "goal_src/jak1/import/medres-firecanyon-ag.gc", + "goal_src/jak1/import/lurkerm-piston-ag.gc", + "goal_src/jak1/import/accordian-ag.gc" ], "assistant-village2": [ - "goal_src/import/jaws-ag.gc", - "goal_src/import/assistant-village2-ag.gc" + "goal_src/jak1/import/jaws-ag.gc", + "goal_src/jak1/import/assistant-village2-ag.gc" ], - "floating-launcher": ["goal_src/import/floating-launcher-ag.gc"], + "floating-launcher": ["goal_src/jak1/import/floating-launcher-ag.gc"], "jungle-mirrors": [ - "goal_src/import/periscope-ag.gc", - "goal_src/import/reflector-mirror-ag.gc" + "goal_src/jak1/import/periscope-ag.gc", + "goal_src/jak1/import/reflector-mirror-ag.gc" ], - "citb-drop-plat": ["goal_src/import/citb-drop-plat-ag.gc"], - "rolling-robber": ["goal_src/import/robber-ag.gc"], - "balloonlurker": ["goal_src/import/balloonlurker-ag.gc"], - "racer": ["goal_src/import/racer-ag.gc"], + "citb-drop-plat": ["goal_src/jak1/import/citb-drop-plat-ag.gc"], + "rolling-robber": ["goal_src/jak1/import/robber-ag.gc"], + "balloonlurker": ["goal_src/jak1/import/balloonlurker-ag.gc"], + "racer": ["goal_src/jak1/import/racer-ag.gc"], "mistycannon": [ - "goal_src/import/sack-ag.gc", - "goal_src/import/mistycannon-ag.gc" + "goal_src/jak1/import/sack-ag.gc", + "goal_src/jak1/import/mistycannon-ag.gc" ], "beach-obs": [ - "goal_src/import/ecoventrock-ag.gc", - "goal_src/import/beachcam-ag.gc", - "goal_src/import/windmill-one-ag.gc", - "goal_src/import/kickrock-ag.gc", - "goal_src/import/harvester-ag.gc", - "goal_src/import/flutflutegg-ag.gc", - "goal_src/import/grottopole-ag.gc", - "goal_src/import/flutflut-ag.gc", - "goal_src/import/bladeassm-ag.gc" + "goal_src/jak1/import/ecoventrock-ag.gc", + "goal_src/jak1/import/beachcam-ag.gc", + "goal_src/jak1/import/windmill-one-ag.gc", + "goal_src/jak1/import/kickrock-ag.gc", + "goal_src/jak1/import/harvester-ag.gc", + "goal_src/jak1/import/flutflutegg-ag.gc", + "goal_src/jak1/import/grottopole-ag.gc", + "goal_src/jak1/import/flutflut-ag.gc", + "goal_src/jak1/import/bladeassm-ag.gc" ], "snow-flutflut-obs": [ - "goal_src/import/snow-button-ag.gc", - "goal_src/import/flutflut-plat-med-ag.gc", - "goal_src/import/flutflut-plat-small-ag.gc", - "goal_src/import/flutflut-plat-large-ag.gc" + "goal_src/jak1/import/snow-button-ag.gc", + "goal_src/jak1/import/flutflut-plat-med-ag.gc", + "goal_src/jak1/import/flutflut-plat-small-ag.gc", + "goal_src/jak1/import/flutflut-plat-large-ag.gc" ], - "snow-ball": ["goal_src/import/snow-ball-ag.gc"], - "sun-iris-door": ["goal_src/import/sun-iris-door-ag.gc"], - "bouncer": ["goal_src/import/bounceytarp-ag.gc"], + "snow-ball": ["goal_src/jak1/import/snow-ball-ag.gc"], + "sun-iris-door": ["goal_src/jak1/import/sun-iris-door-ag.gc"], + "bouncer": ["goal_src/jak1/import/bounceytarp-ag.gc"], "swamp-blimp": [ - "goal_src/import/swamp-tetherrock-ag.gc", - "goal_src/import/swamp-rope-ag.gc", - "goal_src/import/swamp-tetherrock-explode-ag.gc", - "goal_src/import/precursor-arm-ag.gc", - "goal_src/import/swamp-blimp-ag.gc" + "goal_src/jak1/import/swamp-tetherrock-ag.gc", + "goal_src/jak1/import/swamp-rope-ag.gc", + "goal_src/jak1/import/swamp-tetherrock-explode-ag.gc", + "goal_src/jak1/import/precursor-arm-ag.gc", + "goal_src/jak1/import/swamp-blimp-ag.gc" ], "village-obs": [ - "goal_src/import/windmill-sail-ag.gc", - "goal_src/import/medres-beach3-ag.gc", - "goal_src/import/mayorgears-ag.gc", - "goal_src/import/medres-village11-ag.gc", - "goal_src/import/revcycleprop-ag.gc", - "goal_src/import/medres-jungle2-ag.gc", - "goal_src/import/revcycle-ag.gc", - "goal_src/import/medres-misty-ag.gc", - "goal_src/import/sagesail-ag.gc", - "goal_src/import/windspinner-ag.gc", - "goal_src/import/medres-jungle1-ag.gc", - "goal_src/import/medres-village12-ag.gc", - "goal_src/import/hutlamp-ag.gc", - "goal_src/import/medres-jungle-ag.gc", - "goal_src/import/medres-village13-ag.gc", - "goal_src/import/medres-beach2-ag.gc", - "goal_src/import/villa-starfish-ag.gc", - "goal_src/import/medres-training-ag.gc", - "goal_src/import/medres-beach-ag.gc", - "goal_src/import/reflector-middle-ag.gc", - "goal_src/import/medres-beach1-ag.gc" + "goal_src/jak1/import/windmill-sail-ag.gc", + "goal_src/jak1/import/medres-beach3-ag.gc", + "goal_src/jak1/import/mayorgears-ag.gc", + "goal_src/jak1/import/medres-village11-ag.gc", + "goal_src/jak1/import/revcycleprop-ag.gc", + "goal_src/jak1/import/medres-jungle2-ag.gc", + "goal_src/jak1/import/revcycle-ag.gc", + "goal_src/jak1/import/medres-misty-ag.gc", + "goal_src/jak1/import/sagesail-ag.gc", + "goal_src/jak1/import/windspinner-ag.gc", + "goal_src/jak1/import/medres-jungle1-ag.gc", + "goal_src/jak1/import/medres-village12-ag.gc", + "goal_src/jak1/import/hutlamp-ag.gc", + "goal_src/jak1/import/medres-jungle-ag.gc", + "goal_src/jak1/import/medres-village13-ag.gc", + "goal_src/jak1/import/medres-beach2-ag.gc", + "goal_src/jak1/import/villa-starfish-ag.gc", + "goal_src/jak1/import/medres-training-ag.gc", + "goal_src/jak1/import/medres-beach-ag.gc", + "goal_src/jak1/import/reflector-middle-ag.gc", + "goal_src/jak1/import/medres-beach1-ag.gc" ], - "swamp-bat": ["goal_src/import/swamp-bat-ag.gc"], - "crates": ["goal_src/import/crate-ag.gc"], - "lurkerpuppy": ["goal_src/import/lurkerpuppy-ag.gc"], - "light-eco": ["goal_src/import/light-eco-ag.gc"], - "voicebox": ["goal_src/import/speaker-ag.gc"], - "green-eco-lurker": ["goal_src/import/green-eco-lurker-ag.gc"], + "swamp-bat": ["goal_src/jak1/import/swamp-bat-ag.gc"], + "crates": ["goal_src/jak1/import/crate-ag.gc"], + "lurkerpuppy": ["goal_src/jak1/import/lurkerpuppy-ag.gc"], + "light-eco": ["goal_src/jak1/import/light-eco-ag.gc"], + "voicebox": ["goal_src/jak1/import/speaker-ag.gc"], + "green-eco-lurker": ["goal_src/jak1/import/green-eco-lurker-ag.gc"], "helix-water": [ - "goal_src/import/helix-slide-door-ag.gc", - "goal_src/import/helix-button-ag.gc" + "goal_src/jak1/import/helix-slide-door-ag.gc", + "goal_src/jak1/import/helix-button-ag.gc" ], "billy": [ - "goal_src/import/farthy-snack-ag.gc", - "goal_src/import/billy-ag.gc", - "goal_src/import/billy-sidekick-ag.gc" + "goal_src/jak1/import/farthy-snack-ag.gc", + "goal_src/jak1/import/billy-ag.gc", + "goal_src/jak1/import/billy-sidekick-ag.gc" ], - "snow-ram": ["goal_src/import/ram-ag.gc"], - "blocking-plane": ["goal_src/import/ef-plane-ag.gc"], - "target-util": ["goal_src/import/eichar-ag.gc"], - "beach-rocks": ["goal_src/import/lrocklrg-ag.gc"], + "snow-ram": ["goal_src/jak1/import/ram-ag.gc"], + "blocking-plane": ["goal_src/jak1/import/ef-plane-ag.gc"], + "target-util": ["goal_src/jak1/import/eichar-ag.gc"], + "beach-rocks": ["goal_src/jak1/import/lrocklrg-ag.gc"], "sunken-obs": [ - "goal_src/import/seaweed-ag.gc", - "goal_src/import/sunkencam-ag.gc", - "goal_src/import/side-to-side-plat-ag.gc" + "goal_src/jak1/import/seaweed-ag.gc", + "goal_src/jak1/import/sunkencam-ag.gc", + "goal_src/jak1/import/side-to-side-plat-ag.gc" ], "qbert-plat": [ - "goal_src/import/qbert-plat-ag.gc", - "goal_src/import/qbert-plat-on-ag.gc" + "goal_src/jak1/import/qbert-plat-ag.gc", + "goal_src/jak1/import/qbert-plat-on-ag.gc" ], "sun-exit-chamber": [ - "goal_src/import/exit-chamber-ag.gc", - "goal_src/import/blue-eco-charger-ag.gc", - "goal_src/import/blue-eco-charger-orb-ag.gc" + "goal_src/jak1/import/exit-chamber-ag.gc", + "goal_src/jak1/import/blue-eco-charger-ag.gc", + "goal_src/jak1/import/blue-eco-charger-orb-ag.gc" ], - "mother-spider": ["goal_src/import/mother-spider-ag.gc"], - "darkvine": ["goal_src/import/darkvine-ag.gc"], - "sidekick": ["goal_src/import/sidekick-ag.gc"], - "kermit": ["goal_src/import/kermit-ag.gc"], + "mother-spider": ["goal_src/jak1/import/mother-spider-ag.gc"], + "darkvine": ["goal_src/jak1/import/darkvine-ag.gc"], + "sidekick": ["goal_src/jak1/import/sidekick-ag.gc"], + "kermit": ["goal_src/jak1/import/kermit-ag.gc"], "firecanyon-obs": [ - "goal_src/import/crate-darkeco-cluster-ag.gc", - "goal_src/import/spike-ag.gc" + "goal_src/jak1/import/crate-darkeco-cluster-ag.gc", + "goal_src/jak1/import/spike-ag.gc" ], "orbit-plat": [ - "goal_src/import/orbit-plat-ag.gc", - "goal_src/import/orbit-plat-bottom-ag.gc" + "goal_src/jak1/import/orbit-plat-ag.gc", + "goal_src/jak1/import/orbit-plat-bottom-ag.gc" ], "fishermans-boat": [ - "goal_src/import/evilbro-ag.gc", - "goal_src/import/fishermans-boat-ag.gc", - "goal_src/import/evilsis-ag.gc" + "goal_src/jak1/import/evilbro-ag.gc", + "goal_src/jak1/import/fishermans-boat-ag.gc", + "goal_src/jak1/import/evilsis-ag.gc" ], - "driller-lurker": ["goal_src/import/driller-lurker-ag.gc"], + "driller-lurker": ["goal_src/jak1/import/driller-lurker-ag.gc"], "sidekick-human": [ - "goal_src/import/darkecocan-ag.gc", - "goal_src/import/sidekick-human-ag.gc", - "goal_src/import/evilbro-ag.gc", - "goal_src/import/evilsis-ag.gc" + "goal_src/jak1/import/darkecocan-ag.gc", + "goal_src/jak1/import/sidekick-human-ag.gc", + "goal_src/jak1/import/evilbro-ag.gc", + "goal_src/jak1/import/evilsis-ag.gc" ], "misty-conveyor": [ - "goal_src/import/keg-conveyor-ag.gc", - "goal_src/import/keg-conveyor-paddle-ag.gc", - "goal_src/import/keg-ag.gc" + "goal_src/jak1/import/keg-conveyor-ag.gc", + "goal_src/jak1/import/keg-conveyor-paddle-ag.gc", + "goal_src/jak1/import/keg-ag.gc" ], - "snow-ram-boss": ["goal_src/import/ram-boss-ag.gc"], - "junglefish": ["goal_src/import/junglefish-ag.gc"], + "snow-ram-boss": ["goal_src/jak1/import/ram-boss-ag.gc"], + "junglefish": ["goal_src/jak1/import/junglefish-ag.gc"], "swamp-obs": [ - "goal_src/import/swamp-rock-ag.gc", - "goal_src/import/swamp-spike-ag.gc", - "goal_src/import/swampcam-ag.gc", - "goal_src/import/tar-plat-ag.gc", - "goal_src/import/balance-plat-ag.gc" + "goal_src/jak1/import/swamp-rock-ag.gc", + "goal_src/jak1/import/swamp-spike-ag.gc", + "goal_src/jak1/import/swampcam-ag.gc", + "goal_src/jak1/import/tar-plat-ag.gc", + "goal_src/jak1/import/balance-plat-ag.gc" ], - "snow-bumper": ["goal_src/import/snow-bumper-ag.gc"], - "darkcave-obs": ["goal_src/import/cavecrystal-ag.gc"], - "junglesnake": ["goal_src/import/junglesnake-ag.gc"], - "evilbro": ["goal_src/import/evilbro-ag.gc", "goal_src/import/evilsis-ag.gc"], - "bully": ["goal_src/import/bully-ag.gc"], - "square-platform": ["goal_src/import/square-platform-ag.gc"], - "dark-crystal": ["goal_src/import/dark-crystal-ag.gc"], + "snow-bumper": ["goal_src/jak1/import/snow-bumper-ag.gc"], + "darkcave-obs": ["goal_src/jak1/import/cavecrystal-ag.gc"], + "junglesnake": ["goal_src/jak1/import/junglesnake-ag.gc"], + "evilbro": ["goal_src/jak1/import/evilbro-ag.gc", "goal_src/jak1/import/evilsis-ag.gc"], + "bully": ["goal_src/jak1/import/bully-ag.gc"], + "square-platform": ["goal_src/jak1/import/square-platform-ag.gc"], + "dark-crystal": ["goal_src/jak1/import/dark-crystal-ag.gc"], "sage-village3": [ - "goal_src/import/evilsis-village3-ag.gc", - "goal_src/import/sage-village3-ag.gc", - "goal_src/import/evilbro-village3-ag.gc" + "goal_src/jak1/import/evilsis-village3-ag.gc", + "goal_src/jak1/import/sage-village3-ag.gc", + "goal_src/jak1/import/evilbro-village3-ag.gc" ], - "yakow": ["goal_src/import/village1cam-ag.gc", "goal_src/import/yakow-ag.gc"], - "plat-button": ["goal_src/import/plat-button-ag.gc"], - "hud-classes": ["goal_src/import/fuelcell-naked-ag.gc"], + "yakow": ["goal_src/jak1/import/village1cam-ag.gc", "goal_src/jak1/import/yakow-ag.gc"], + "plat-button": ["goal_src/jak1/import/plat-button-ag.gc"], + "hud-classes": ["goal_src/jak1/import/fuelcell-naked-ag.gc"], "misty-obs": [ - "goal_src/import/breakaway-right-ag.gc", - "goal_src/import/boatpaddle-ag.gc", - "goal_src/import/breakaway-mid-ag.gc", - "goal_src/import/mis-bone-platform-ag.gc", - "goal_src/import/breakaway-left-ag.gc", - "goal_src/import/windturbine-ag.gc", - "goal_src/import/mistycam-ag.gc", - "goal_src/import/mis-bone-bridge-ag.gc" + "goal_src/jak1/import/breakaway-right-ag.gc", + "goal_src/jak1/import/boatpaddle-ag.gc", + "goal_src/jak1/import/breakaway-mid-ag.gc", + "goal_src/jak1/import/mis-bone-platform-ag.gc", + "goal_src/jak1/import/breakaway-left-ag.gc", + "goal_src/jak1/import/windturbine-ag.gc", + "goal_src/jak1/import/mistycam-ag.gc", + "goal_src/jak1/import/mis-bone-bridge-ag.gc" ], "rolling-obs": [ - "goal_src/import/rollingcam-ag.gc", - "goal_src/import/pusher-ag.gc", - "goal_src/import/happy-plant-ag.gc", - "goal_src/import/dark-plant-ag.gc", - "goal_src/import/rolling-start-ag.gc" + "goal_src/jak1/import/rollingcam-ag.gc", + "goal_src/jak1/import/pusher-ag.gc", + "goal_src/jak1/import/happy-plant-ag.gc", + "goal_src/jak1/import/dark-plant-ag.gc", + "goal_src/jak1/import/rolling-start-ag.gc" ], - "aphid": ["goal_src/import/aphid-lurker-ag.gc"], - "plat-eco": ["goal_src/import/plat-eco-ag.gc"], - "assistant": ["goal_src/import/assistant-ag.gc"], - "flutflut-bluehut": ["goal_src/import/flutflut-bluehut-ag.gc"], - "explorer": ["goal_src/import/explorer-ag.gc"], - "rolling-lightning-mole": ["goal_src/import/lightning-mole-ag.gc"], + "aphid": ["goal_src/jak1/import/aphid-lurker-ag.gc"], + "plat-eco": ["goal_src/jak1/import/plat-eco-ag.gc"], + "assistant": ["goal_src/jak1/import/assistant-ag.gc"], + "flutflut-bluehut": ["goal_src/jak1/import/flutflut-bluehut-ag.gc"], + "explorer": ["goal_src/jak1/import/explorer-ag.gc"], + "rolling-lightning-mole": ["goal_src/jak1/import/lightning-mole-ag.gc"], "plat": [ - "goal_src/import/plat-sunken-ag.gc", - "goal_src/import/plat-ag.gc", - "goal_src/import/plat-jungleb-ag.gc" + "goal_src/jak1/import/plat-sunken-ag.gc", + "goal_src/jak1/import/plat-ag.gc", + "goal_src/jak1/import/plat-jungleb-ag.gc" ], - "flutflut": ["goal_src/import/flut-saddle-ag.gc"], + "flutflut": ["goal_src/jak1/import/flut-saddle-ag.gc"], "training-obs": [ - "goal_src/import/scarecrow-b-ag.gc", - "goal_src/import/pontoonfive-ag.gc", - "goal_src/import/trainingcam-ag.gc", - "goal_src/import/scarecrow-a-ag.gc", - "goal_src/import/jng-iris-door-ag.gc" + "goal_src/jak1/import/scarecrow-b-ag.gc", + "goal_src/jak1/import/pontoonfive-ag.gc", + "goal_src/jak1/import/trainingcam-ag.gc", + "goal_src/jak1/import/scarecrow-a-ag.gc", + "goal_src/jak1/import/jng-iris-door-ag.gc" ], "snow-obs": [ - "goal_src/import/snowcam-ag.gc", - "goal_src/import/snow-fort-gate-ag.gc", - "goal_src/import/snow-eggtop-ag.gc", - "goal_src/import/snow-spatula-ag.gc", - "goal_src/import/snow-switch-ag.gc", - "goal_src/import/snow-gears-ag.gc", - "goal_src/import/snowpusher-ag.gc", - "goal_src/import/snow-log-ag.gc" + "goal_src/jak1/import/snowcam-ag.gc", + "goal_src/jak1/import/snow-fort-gate-ag.gc", + "goal_src/jak1/import/snow-eggtop-ag.gc", + "goal_src/jak1/import/snow-spatula-ag.gc", + "goal_src/jak1/import/snow-switch-ag.gc", + "goal_src/jak1/import/snow-gears-ag.gc", + "goal_src/jak1/import/snowpusher-ag.gc", + "goal_src/jak1/import/snow-log-ag.gc" ], "citadel-obs": [ - "goal_src/import/citb-generator-ag.gc", - "goal_src/import/citb-launcher-ag.gc", - "goal_src/import/citb-button-ag.gc", - "goal_src/import/citadelcam-ag.gc", - "goal_src/import/citb-hose-ag.gc", - "goal_src/import/citb-robotboss-ag.gc", - "goal_src/import/citb-coil-ag.gc", - "goal_src/import/citb-arm-shoulder-ag.gc", - "goal_src/import/citb-iris-door-ag.gc", - "goal_src/import/citb-disc-ag.gc", - "goal_src/import/citb-arm-ag.gc" + "goal_src/jak1/import/citb-generator-ag.gc", + "goal_src/jak1/import/citb-launcher-ag.gc", + "goal_src/jak1/import/citb-button-ag.gc", + "goal_src/jak1/import/citadelcam-ag.gc", + "goal_src/jak1/import/citb-hose-ag.gc", + "goal_src/jak1/import/citb-robotboss-ag.gc", + "goal_src/jak1/import/citb-coil-ag.gc", + "goal_src/jak1/import/citb-arm-shoulder-ag.gc", + "goal_src/jak1/import/citb-iris-door-ag.gc", + "goal_src/jak1/import/citb-disc-ag.gc", + "goal_src/jak1/import/citb-arm-ag.gc" ], "citadel-sages": [ - "goal_src/import/green-sagecage-ag.gc", - "goal_src/import/yellowsage-ag.gc", - "goal_src/import/redsage-ag.gc", - "goal_src/import/evilbro-citadel-ag.gc", - "goal_src/import/evilsis-citadel-ag.gc", - "goal_src/import/citb-sagecage-ag.gc", - "goal_src/import/bluesage-ag.gc" + "goal_src/jak1/import/green-sagecage-ag.gc", + "goal_src/jak1/import/yellowsage-ag.gc", + "goal_src/jak1/import/redsage-ag.gc", + "goal_src/jak1/import/evilbro-citadel-ag.gc", + "goal_src/jak1/import/evilsis-citadel-ag.gc", + "goal_src/jak1/import/citb-sagecage-ag.gc", + "goal_src/jak1/import/bluesage-ag.gc" ], - "lurkercrab": ["goal_src/import/lurkercrab-ag.gc"], - "muse": ["goal_src/import/muse-ag.gc"], - "puffer": ["goal_src/import/puffer-ag.gc"], + "lurkercrab": ["goal_src/jak1/import/lurkercrab-ag.gc"], + "muse": ["goal_src/jak1/import/muse-ag.gc"], + "puffer": ["goal_src/jak1/import/puffer-ag.gc"], "robotboss-misc": [ - "goal_src/import/silodoor-ag.gc", - "goal_src/import/ecoclaw-ag.gc", - "goal_src/import/finalbosscam-ag.gc" + "goal_src/jak1/import/silodoor-ag.gc", + "goal_src/jak1/import/ecoclaw-ag.gc", + "goal_src/jak1/import/finalbosscam-ag.gc" ], "sage-finalboss": [ - "goal_src/import/plat-eco-finalboss-ag.gc", - "goal_src/import/green-sagecage-ag.gc", - "goal_src/import/jak-white-ag.gc", - "goal_src/import/robotboss-cinematic-ag.gc" + "goal_src/jak1/import/plat-eco-finalboss-ag.gc", + "goal_src/jak1/import/green-sagecage-ag.gc", + "goal_src/jak1/import/jak-white-ag.gc", + "goal_src/jak1/import/robotboss-cinematic-ag.gc" ], - "target-racer-h": ["goal_src/import/balloon-ag.gc"], - "gambler": ["goal_src/import/gambler-ag.gc"], + "target-racer-h": ["goal_src/jak1/import/balloon-ag.gc"], + "gambler": ["goal_src/jak1/import/gambler-ag.gc"], "lavatube-obs": [ - "goal_src/import/lavafallsewerb-ag.gc", - "goal_src/import/lavashortcut-ag.gc", - "goal_src/import/lavabase-ag.gc", - "goal_src/import/lavafallsewera-ag.gc", - "goal_src/import/chainmine-ag.gc", - "goal_src/import/lavafall-ag.gc", - "goal_src/import/lavaballoon-ag.gc", - "goal_src/import/darkecobarrel-ag.gc", - "goal_src/import/lavayellowtarp-ag.gc" + "goal_src/jak1/import/lavafallsewerb-ag.gc", + "goal_src/jak1/import/lavashortcut-ag.gc", + "goal_src/jak1/import/lavabase-ag.gc", + "goal_src/jak1/import/lavafallsewera-ag.gc", + "goal_src/jak1/import/chainmine-ag.gc", + "goal_src/jak1/import/lavafall-ag.gc", + "goal_src/jak1/import/lavaballoon-ag.gc", + "goal_src/jak1/import/darkecobarrel-ag.gc", + "goal_src/jak1/import/lavayellowtarp-ag.gc" ], - "assistant-firecanyon": ["goal_src/import/assistant-firecanyon-ag.gc"], - "sharkey": ["goal_src/import/sharkey-ag.gc"], - "bonelurker": ["goal_src/import/bonelurker-ag.gc"], - "pelican": ["goal_src/import/pelican-ag.gc"], - "warrior": ["goal_src/import/warrior-ag.gc"], + "assistant-firecanyon": ["goal_src/jak1/import/assistant-firecanyon-ag.gc"], + "sharkey": ["goal_src/jak1/import/sharkey-ag.gc"], + "bonelurker": ["goal_src/jak1/import/bonelurker-ag.gc"], + "pelican": ["goal_src/jak1/import/pelican-ag.gc"], + "warrior": ["goal_src/jak1/import/warrior-ag.gc"], "maincave-obs": [ - "goal_src/import/caveelevator-ag.gc", - "goal_src/import/cavespatulatwo-ag.gc", - "goal_src/import/cavetrapdoor-ag.gc", - "goal_src/import/maincavecam-ag.gc", - "goal_src/import/cavecrusher-ag.gc", - "goal_src/import/cavespatula-darkcave-ag.gc" + "goal_src/jak1/import/caveelevator-ag.gc", + "goal_src/jak1/import/cavespatulatwo-ag.gc", + "goal_src/jak1/import/cavetrapdoor-ag.gc", + "goal_src/jak1/import/maincavecam-ag.gc", + "goal_src/jak1/import/cavecrusher-ag.gc", + "goal_src/jak1/import/cavespatula-darkcave-ag.gc" ], "fisher": [ - "goal_src/import/fish-net-ag.gc", - "goal_src/import/fisher-ag.gc", - "goal_src/import/catch-fisha-ag.gc", - "goal_src/import/catch-fishb-ag.gc", - "goal_src/import/catch-fishc-ag.gc" + "goal_src/jak1/import/fish-net-ag.gc", + "goal_src/jak1/import/fisher-ag.gc", + "goal_src/jak1/import/catch-fisha-ag.gc", + "goal_src/jak1/import/catch-fishb-ag.gc", + "goal_src/jak1/import/catch-fishc-ag.gc" ], "villagep-obs": [ - "goal_src/import/warp-gate-switch-ag.gc", - "goal_src/import/village-cam-ag.gc" + "goal_src/jak1/import/warp-gate-switch-ag.gc", + "goal_src/jak1/import/village-cam-ag.gc" ], - "citb-bunny": ["goal_src/import/citb-bunny-ag.gc"], + "citb-bunny": ["goal_src/jak1/import/citb-bunny-ag.gc"], "flying-lurker": [ - "goal_src/import/ogrecam-ag.gc", - "goal_src/import/plunger-lurker-ag.gc", - "goal_src/import/flying-lurker-ag.gc" + "goal_src/jak1/import/ogrecam-ag.gc", + "goal_src/jak1/import/plunger-lurker-ag.gc", + "goal_src/jak1/import/flying-lurker-ag.gc" ], - "shover": ["goal_src/import/shover-ag.gc"], + "shover": ["goal_src/jak1/import/shover-ag.gc"], "ice-cube": [ - "goal_src/import/ice-cube-ag.gc", - "goal_src/import/ice-cube-break-ag.gc" + "goal_src/jak1/import/ice-cube-ag.gc", + "goal_src/jak1/import/ice-cube-break-ag.gc" ], - "baby-spider": ["goal_src/import/baby-spider-ag.gc"], - "minecart": ["goal_src/import/minecartsteel-ag.gc"], - "bird-lady": ["goal_src/import/bird-lady-ag.gc"], - "spider-egg": ["goal_src/import/spider-egg-ag.gc"], - "wall-plat": ["goal_src/import/wall-plat-ag.gc"], - "oracle": ["goal_src/import/oracle-ag.gc"], - "basebutton": ["goal_src/import/generic-button-ag.gc"], + "baby-spider": ["goal_src/jak1/import/baby-spider-ag.gc"], + "minecart": ["goal_src/jak1/import/minecartsteel-ag.gc"], + "bird-lady": ["goal_src/jak1/import/bird-lady-ag.gc"], + "spider-egg": ["goal_src/jak1/import/spider-egg-ag.gc"], + "wall-plat": ["goal_src/jak1/import/wall-plat-ag.gc"], + "oracle": ["goal_src/jak1/import/oracle-ag.gc"], + "basebutton": ["goal_src/jak1/import/generic-button-ag.gc"], "miners": [ - "goal_src/import/minershort-ag.gc", - "goal_src/import/cavegem-ag.gc", - "goal_src/import/minertall-ag.gc" + "goal_src/jak1/import/minershort-ag.gc", + "goal_src/jak1/import/cavegem-ag.gc", + "goal_src/jak1/import/minertall-ag.gc" ], - "farmer": ["goal_src/import/farmer-ag.gc"], - "rolling-race-ring": ["goal_src/import/race-ring-ag.gc"], - "quicksandlurker": ["goal_src/import/quicksandlurker-ag.gc"], + "farmer": ["goal_src/jak1/import/farmer-ag.gc"], + "rolling-race-ring": ["goal_src/jak1/import/race-ring-ag.gc"], + "quicksandlurker": ["goal_src/jak1/import/quicksandlurker-ag.gc"], "misty-warehouse": [ - "goal_src/import/silostep-ag.gc", - "goal_src/import/rounddoor-ag.gc" + "goal_src/jak1/import/silostep-ag.gc", + "goal_src/jak1/import/rounddoor-ag.gc" ], - "yeti": ["goal_src/import/yeti-ag.gc"], - "hopper": ["goal_src/import/hopper-ag.gc"], - "target-death": ["goal_src/import/deathcam-ag.gc"], - "spiderwebs": ["goal_src/import/spiderwebs-ag.gc"], - "misty-teetertotter": ["goal_src/import/teetertotter-ag.gc"], + "yeti": ["goal_src/jak1/import/yeti-ag.gc"], + "hopper": ["goal_src/jak1/import/hopper-ag.gc"], + "target-death": ["goal_src/jak1/import/deathcam-ag.gc"], + "spiderwebs": ["goal_src/jak1/import/spiderwebs-ag.gc"], + "misty-teetertotter": ["goal_src/jak1/import/teetertotter-ag.gc"], "village2-obs": [ - "goal_src/import/pontoonfive-ag.gc", - "goal_src/import/allpontoons-ag.gc", - "goal_src/import/medres-village2-ag.gc", - "goal_src/import/exit-chamber-dummy-ag.gc", - "goal_src/import/village2cam-ag.gc", - "goal_src/import/fireboulder-ag.gc", - "goal_src/import/ogreboss-village2-ag.gc", - "goal_src/import/ceilingflag-ag.gc", - "goal_src/import/medres-rolling1-ag.gc", - "goal_src/import/medres-rolling-ag.gc", - "goal_src/import/pontoonten-ag.gc" + "goal_src/jak1/import/pontoonfive-ag.gc", + "goal_src/jak1/import/allpontoons-ag.gc", + "goal_src/jak1/import/medres-village2-ag.gc", + "goal_src/jak1/import/exit-chamber-dummy-ag.gc", + "goal_src/jak1/import/village2cam-ag.gc", + "goal_src/jak1/import/fireboulder-ag.gc", + "goal_src/jak1/import/ogreboss-village2-ag.gc", + "goal_src/jak1/import/ceilingflag-ag.gc", + "goal_src/jak1/import/medres-rolling1-ag.gc", + "goal_src/jak1/import/medres-rolling-ag.gc", + "goal_src/jak1/import/pontoonten-ag.gc" ], - "plant-boss": ["goal_src/import/plant-boss-ag.gc"], - "snow-bunny": ["goal_src/import/snow-bunny-ag.gc"], - "sunken-elevator": ["goal_src/import/sunken-elevator-ag.gc"], - "sage": ["goal_src/import/sage-ag.gc"], - "robotboss-h": ["goal_src/import/robotboss-ag.gc"], - "geologist": ["goal_src/import/geologist-ag.gc"], + "plant-boss": ["goal_src/jak1/import/plant-boss-ag.gc"], + "snow-bunny": ["goal_src/jak1/import/snow-bunny-ag.gc"], + "sunken-elevator": ["goal_src/jak1/import/sunken-elevator-ag.gc"], + "sage": ["goal_src/jak1/import/sage-ag.gc"], + "robotboss-h": ["goal_src/jak1/import/robotboss-ag.gc"], + "geologist": ["goal_src/jak1/import/geologist-ag.gc"], "village3-obs": [ - "goal_src/import/medres-ogre-ag.gc", - "goal_src/import/medres-finalboss-ag.gc", - "goal_src/import/pistons-ag.gc", - "goal_src/import/gondola-ag.gc", - "goal_src/import/medres-ogre2-ag.gc", - "goal_src/import/medres-ogre3-ag.gc", - "goal_src/import/gondolacables-ag.gc" + "goal_src/jak1/import/medres-ogre-ag.gc", + "goal_src/jak1/import/medres-finalboss-ag.gc", + "goal_src/jak1/import/pistons-ag.gc", + "goal_src/jak1/import/gondola-ag.gc", + "goal_src/jak1/import/medres-ogre2-ag.gc", + "goal_src/jak1/import/medres-ogre3-ag.gc", + "goal_src/jak1/import/gondolacables-ag.gc" ], "double-lurker": [ - "goal_src/import/double-lurker-ag.gc", - "goal_src/import/double-lurker-top-ag.gc" + "goal_src/jak1/import/double-lurker-ag.gc", + "goal_src/jak1/import/double-lurker-top-ag.gc" ], - "ogreboss": ["goal_src/import/ogreboss-ag.gc"], - "swamp-rat": ["goal_src/import/swamp-rat-ag.gc"], + "ogreboss": ["goal_src/jak1/import/ogreboss-ag.gc"], + "swamp-rat": ["goal_src/jak1/import/swamp-rat-ag.gc"], "sculptor": [ - "goal_src/import/sculptor-muse-ag.gc", - "goal_src/import/sculptor-ag.gc" + "goal_src/jak1/import/sculptor-muse-ag.gc", + "goal_src/jak1/import/sculptor-ag.gc" ], - "seagull": ["goal_src/import/seagull-ag.gc"], - "mayor": ["goal_src/import/mayor-ag.gc"], + "seagull": ["goal_src/jak1/import/seagull-ag.gc"], + "mayor": ["goal_src/jak1/import/mayor-ag.gc"], "final-door": [ - "goal_src/import/power-left-ag.gc", - "goal_src/import/power-right-ag.gc", - "goal_src/import/powercellalt-ag.gc" + "goal_src/jak1/import/power-left-ag.gc", + "goal_src/jak1/import/power-right-ag.gc", + "goal_src/jak1/import/powercellalt-ag.gc" ], - "assistant-lavatube": ["goal_src/import/assistant-lavatube-start-ag.gc"], + "assistant-lavatube": ["goal_src/jak1/import/assistant-lavatube-start-ag.gc"], "launcherdoor": [ - "goal_src/import/launcherdoor-maincave-ag.gc", - "goal_src/import/launcherdoor-ag.gc" + "goal_src/jak1/import/launcherdoor-maincave-ag.gc", + "goal_src/jak1/import/launcherdoor-ag.gc" ], "title-obs": [ - "goal_src/import/logo-cam-ag.gc", - "goal_src/import/logo-black-ag.gc", - "goal_src/import/logo-ag.gc", - "goal_src/import/logo-volumes-ag.gc", - "goal_src/import/ndi-cam-ag.gc", - "goal_src/import/ndi-ag.gc", - "goal_src/import/ndi-volumes-ag.gc" + "goal_src/jak1/import/logo-cam-ag.gc", + "goal_src/jak1/import/logo-black-ag.gc", + "goal_src/jak1/import/logo-ag.gc", + "goal_src/jak1/import/logo-volumes-ag.gc", + "goal_src/jak1/import/ndi-cam-ag.gc", + "goal_src/jak1/import/ndi-ag.gc", + "goal_src/jak1/import/ndi-volumes-ag.gc" ], - "whirlpool": ["goal_src/import/whirlpool-ag.gc"], - "lurkerworm": ["goal_src/import/lurkerworm-ag.gc"], + "whirlpool": ["goal_src/jak1/import/whirlpool-ag.gc"], + "lurkerworm": ["goal_src/jak1/import/lurkerworm-ag.gc"], "collectables": [ - "goal_src/import/buzzer-ag.gc", - "goal_src/import/ecovalve-ag.gc", - "goal_src/import/money-ag.gc", - "goal_src/import/fuel-cell-ag.gc" + "goal_src/jak1/import/buzzer-ag.gc", + "goal_src/jak1/import/ecovalve-ag.gc", + "goal_src/jak1/import/money-ag.gc", + "goal_src/jak1/import/fuel-cell-ag.gc" ], "water-anim": [ - "goal_src/import/water-anim-maincave-ag.gc", - "goal_src/import/water-anim-village3-ag.gc", - "goal_src/import/water-anim-finalboss-ag.gc", - "goal_src/import/water-anim-maincave-water-ag.gc", - "goal_src/import/water-anim-sunken-ag.gc", - "goal_src/import/water-anim-lavatube-ag.gc", - "goal_src/import/water-anim-robocave-ag.gc", - "goal_src/import/water-anim-jungle-ag.gc", - "goal_src/import/water-anim-ogre-ag.gc", - "goal_src/import/water-anim-training-ag.gc", - "goal_src/import/water-anim-darkcave-ag.gc", - "goal_src/import/water-anim-village1-ag.gc", - "goal_src/import/water-anim-rolling-ag.gc", - "goal_src/import/water-anim-misty-ag.gc", - "goal_src/import/water-anim-sunken-dark-eco-ag.gc", - "goal_src/import/water-anim-village2-ag.gc" + "goal_src/jak1/import/water-anim-maincave-ag.gc", + "goal_src/jak1/import/water-anim-village3-ag.gc", + "goal_src/jak1/import/water-anim-finalboss-ag.gc", + "goal_src/jak1/import/water-anim-maincave-water-ag.gc", + "goal_src/jak1/import/water-anim-sunken-ag.gc", + "goal_src/jak1/import/water-anim-lavatube-ag.gc", + "goal_src/jak1/import/water-anim-robocave-ag.gc", + "goal_src/jak1/import/water-anim-jungle-ag.gc", + "goal_src/jak1/import/water-anim-ogre-ag.gc", + "goal_src/jak1/import/water-anim-training-ag.gc", + "goal_src/jak1/import/water-anim-darkcave-ag.gc", + "goal_src/jak1/import/water-anim-village1-ag.gc", + "goal_src/jak1/import/water-anim-rolling-ag.gc", + "goal_src/jak1/import/water-anim-misty-ag.gc", + "goal_src/jak1/import/water-anim-sunken-dark-eco-ag.gc", + "goal_src/jak1/import/water-anim-village2-ag.gc" ], "ropebridge": [ - "goal_src/import/vil3-bridge-36-ag.gc", - "goal_src/import/ropebridge-36-ag.gc", - "goal_src/import/ropebridge-32-ag.gc", - "goal_src/import/ropebridge-52-ag.gc", - "goal_src/import/snow-bridge-36-ag.gc", - "goal_src/import/ropebridge-70-ag.gc" + "goal_src/jak1/import/vil3-bridge-36-ag.gc", + "goal_src/jak1/import/ropebridge-36-ag.gc", + "goal_src/jak1/import/ropebridge-32-ag.gc", + "goal_src/jak1/import/ropebridge-52-ag.gc", + "goal_src/jak1/import/snow-bridge-36-ag.gc", + "goal_src/jak1/import/ropebridge-70-ag.gc" ], "robotboss": [ - "goal_src/import/robotboss-redeco-ag.gc", - "goal_src/import/robotboss-blueeco-ag.gc", - "goal_src/import/robotboss-yelloweco-ag.gc" + "goal_src/jak1/import/robotboss-redeco-ag.gc", + "goal_src/jak1/import/robotboss-blueeco-ag.gc", + "goal_src/jak1/import/robotboss-yelloweco-ag.gc" ], - "steam-cap": ["goal_src/import/steam-cap-ag.gc"], + "steam-cap": ["goal_src/jak1/import/steam-cap-ag.gc"], "ogre-obs": [ - "goal_src/import/ogre-step-ag.gc", - "goal_src/import/tntbarrel-ag.gc", - "goal_src/import/ogre-bridge-ag.gc", - "goal_src/import/shortcut-boulder-ag.gc", - "goal_src/import/medres-snow-ag.gc", - "goal_src/import/ogre-bridgeend-ag.gc", - "goal_src/import/ogre-isle-ag.gc" + "goal_src/jak1/import/ogre-step-ag.gc", + "goal_src/jak1/import/tntbarrel-ag.gc", + "goal_src/jak1/import/ogre-bridge-ag.gc", + "goal_src/jak1/import/shortcut-boulder-ag.gc", + "goal_src/jak1/import/medres-snow-ag.gc", + "goal_src/jak1/import/ogre-bridgeend-ag.gc", + "goal_src/jak1/import/ogre-isle-ag.gc" ], - "assistant-village3": ["goal_src/import/assistant-village3-ag.gc"], - "babak": ["goal_src/import/babak-ag.gc"], + "assistant-village3": ["goal_src/jak1/import/assistant-village3-ag.gc"], + "babak": ["goal_src/jak1/import/babak-ag.gc"], "lavatube-energy": [ - "goal_src/import/energyball-ag.gc", - "goal_src/import/energybase-ag.gc", - "goal_src/import/energyhub-ag.gc", - "goal_src/import/energyarm-ag.gc", - "goal_src/import/energydoor-ag.gc" + "goal_src/jak1/import/energyball-ag.gc", + "goal_src/jak1/import/energybase-ag.gc", + "goal_src/jak1/import/energyhub-ag.gc", + "goal_src/jak1/import/energyarm-ag.gc", + "goal_src/jak1/import/energydoor-ag.gc" ], - "mother-spider-egg": ["goal_src/import/spider-egg-ag.gc"], - "plat-flip": ["goal_src/import/plat-flip-ag.gc"], - "assistant-citadel": ["goal_src/import/assistant-lavatube-end-ag.gc"], - "bird-lady-beach": ["goal_src/import/bird-lady-beach-ag.gc"], - "orb-cache": ["goal_src/import/orb-cache-top-ag.gc"], + "mother-spider-egg": ["goal_src/jak1/import/spider-egg-ag.gc"], + "plat-flip": ["goal_src/jak1/import/plat-flip-ag.gc"], + "assistant-citadel": ["goal_src/jak1/import/assistant-lavatube-end-ag.gc"], + "bird-lady-beach": ["goal_src/jak1/import/bird-lady-beach-ag.gc"], + "orb-cache": ["goal_src/jak1/import/orb-cache-top-ag.gc"], "robotboss-weapon": [ - "goal_src/import/darkecobomb-ag.gc", - "goal_src/import/greenshot-ag.gc", - "goal_src/import/redring-ag.gc" + "goal_src/jak1/import/darkecobomb-ag.gc", + "goal_src/jak1/import/greenshot-ag.gc", + "goal_src/jak1/import/redring-ag.gc" ], "citb-plat": [ - "goal_src/import/citb-exit-plat-ag.gc", - "goal_src/import/plat-eco-citb-ag.gc", - "goal_src/import/plat-citb-ag.gc", - "goal_src/import/citb-stopbox-ag.gc", - "goal_src/import/citb-firehose-ag.gc", - "goal_src/import/citb-rotatebox-ag.gc", - "goal_src/import/citb-chain-plat-ag.gc", - "goal_src/import/citb-donut-ag.gc" + "goal_src/jak1/import/citb-exit-plat-ag.gc", + "goal_src/jak1/import/plat-eco-citb-ag.gc", + "goal_src/jak1/import/plat-citb-ag.gc", + "goal_src/jak1/import/citb-stopbox-ag.gc", + "goal_src/jak1/import/citb-firehose-ag.gc", + "goal_src/jak1/import/citb-rotatebox-ag.gc", + "goal_src/jak1/import/citb-chain-plat-ag.gc", + "goal_src/jak1/import/citb-donut-ag.gc" ], - "gnawer": ["goal_src/import/gnawer-ag.gc"], + "gnawer": ["goal_src/jak1/import/gnawer-ag.gc"], "jungleb-obs": [ - "goal_src/import/eggtop-ag.gc", - "goal_src/import/jng-iris-door-ag.gc" + "goal_src/jak1/import/eggtop-ag.gc", + "goal_src/jak1/import/jng-iris-door-ag.gc" ], - "swamp-rat-nest": ["goal_src/import/swamp-rat-nest-ag.gc"], + "swamp-rat-nest": ["goal_src/jak1/import/swamp-rat-nest-ag.gc"], "wedge-plats": [ - "goal_src/import/wedge-plat-outer-ag.gc", - "goal_src/import/wedge-plat-ag.gc" + "goal_src/jak1/import/wedge-plat-outer-ag.gc", + "goal_src/jak1/import/wedge-plat-ag.gc" ], - "sunken-fish": ["goal_src/import/sunkenfisha-ag.gc"], - "sage-bluehut": ["goal_src/import/sage-bluehut-ag.gc"] + "sunken-fish": ["goal_src/jak1/import/sunkenfisha-ag.gc"], + "sage-bluehut": ["goal_src/jak1/import/sage-bluehut-ag.gc"] } diff --git a/decompiler/config/jak1_pal.jsonc b/decompiler/config/jak1_pal.jsonc index efb450929c..685b8e8e9d 100644 --- a/decompiler/config/jak1_pal.jsonc +++ b/decompiler/config/jak1_pal.jsonc @@ -88,7 +88,7 @@ // optional: a predetermined object file name map from a file. // this will make decompilation naming consistent even if you only run on some objects. - "obj_file_name_map_file": "goal_src/build/all_objs_jak1_pal.json", + "obj_file_name_map_file": "goal_src/jak1/build/all_objs_jak1_pal.json", //////////////////////////// // LEVEL EXTRACTION diff --git a/decompiler/config/jak1_us2.jsonc b/decompiler/config/jak1_us2.jsonc index a3570b22ce..9b3d2d6094 100644 --- a/decompiler/config/jak1_us2.jsonc +++ b/decompiler/config/jak1_us2.jsonc @@ -88,7 +88,7 @@ // optional: a predetermined object file name map from a file. // this will make decompilation naming consistent even if you only run on some objects. - "obj_file_name_map_file": "goal_src/build/all_objs_jak1_jp.json", + "obj_file_name_map_file": "goal_src/jak1/build/all_objs_jak1_jp.json", //////////////////////////// // LEVEL EXTRACTION diff --git a/decompiler/config/jak2_ntsc_v1.jsonc b/decompiler/config/jak2_ntsc_v1.jsonc index a1d2f121bc..377f090818 100644 --- a/decompiler/config/jak2_ntsc_v1.jsonc +++ b/decompiler/config/jak2_ntsc_v1.jsonc @@ -39,7 +39,7 @@ // unpack game count to assets folder "process_game_count": true, // write goal imports for art groups - "process_art_groups": true, + "process_art_groups": false, /////////////////////////// // WEIRD OPTIONS @@ -93,7 +93,7 @@ // optional: a predetermined object file name map from a file. // this will make decompilation naming consistent even if you only run on some objects. - // "obj_file_name_map_file": "goal_src2/build/all_objs.json", + // "obj_file_name_map_file": "goal_src/jak2/build/all_objs.json", //////////////////////////// // LEVEL EXTRACTION diff --git a/decompiler/extractor/main.cpp b/decompiler/extractor/main.cpp index 94680ab19d..9e9d6b8a9b 100644 --- a/decompiler/extractor/main.cpp +++ b/decompiler/extractor/main.cpp @@ -455,8 +455,10 @@ void compile(std::filesystem::path extracted_iso_path) { } compiler.make_system().set_constant("*jak1-full-game*", !(flags & FLAG_JAK1_BLACK_LABEL)); + // TODO - jak2 - BAD! + // TODO - if this directory is failing, very bad (non-existant) error message compiler.make_system().load_project_file( - (file_util::get_jak_project_dir() / "goal_src" / "game.gp").string()); + (file_util::get_jak_project_dir() / "goal_src" / "jak1" / "game.gp").string()); compiler.run_front_end_on_string("(mi)"); } diff --git a/goal_src/goal-lib.gc b/goal_src/goal-lib.gc index 0ec598c8e1..c9cde4a2a2 100644 --- a/goal_src/goal-lib.gc +++ b/goal_src/goal-lib.gc @@ -6,7 +6,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; tell compiler about stuff defined/implemented in the runtime. -(asm-file "goal_src/kernel-defs.gc") +(asm-file "goal_src/jak1/kernel-defs.gc") ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; BUILD SYSTEM @@ -40,7 +40,7 @@ (defmacro load-art-import (name) - `(asm-file ,(string-append "goal_src/import/" (symbol->string name) "-ag.gc") :no-code :no-throw)) + `(asm-file ,(string-append "goal_src/jak1/import/" (symbol->string name) "-ag.gc") :no-code :no-throw)) (defmacro load-imports () `(begin @@ -1054,4 +1054,4 @@ (defconstant *jak1-full-game* (__get_jak1_full_game)) ;; load the default project -(load-project "goal_src/game.gp") +(load-project "goal_src/jak1/game.gp") diff --git a/goal_src/build/all_objs.json b/goal_src/jak1/build/all_objs.json similarity index 100% rename from goal_src/build/all_objs.json rename to goal_src/jak1/build/all_objs.json diff --git a/goal_src/build/all_objs_jak1_jp.json b/goal_src/jak1/build/all_objs_jak1_jp.json similarity index 100% rename from goal_src/build/all_objs_jak1_jp.json rename to goal_src/jak1/build/all_objs_jak1_jp.json diff --git a/goal_src/build/all_objs_jak1_pal.json b/goal_src/jak1/build/all_objs_jak1_pal.json similarity index 100% rename from goal_src/build/all_objs_jak1_pal.json rename to goal_src/jak1/build/all_objs_jak1_pal.json diff --git a/goal_src/dgos/bea.gd b/goal_src/jak1/dgos/bea.gd similarity index 100% rename from goal_src/dgos/bea.gd rename to goal_src/jak1/dgos/bea.gd diff --git a/goal_src/dgos/cit.gd b/goal_src/jak1/dgos/cit.gd similarity index 100% rename from goal_src/dgos/cit.gd rename to goal_src/jak1/dgos/cit.gd diff --git a/goal_src/dgos/dar.gd b/goal_src/jak1/dgos/dar.gd similarity index 100% rename from goal_src/dgos/dar.gd rename to goal_src/jak1/dgos/dar.gd diff --git a/goal_src/dgos/dem.gd b/goal_src/jak1/dgos/dem.gd similarity index 100% rename from goal_src/dgos/dem.gd rename to goal_src/jak1/dgos/dem.gd diff --git a/goal_src/dgos/engine.gd b/goal_src/jak1/dgos/engine.gd similarity index 100% rename from goal_src/dgos/engine.gd rename to goal_src/jak1/dgos/engine.gd diff --git a/goal_src/dgos/fic.gd b/goal_src/jak1/dgos/fic.gd similarity index 100% rename from goal_src/dgos/fic.gd rename to goal_src/jak1/dgos/fic.gd diff --git a/goal_src/dgos/fin.gd b/goal_src/jak1/dgos/fin.gd similarity index 100% rename from goal_src/dgos/fin.gd rename to goal_src/jak1/dgos/fin.gd diff --git a/goal_src/dgos/game.gd b/goal_src/jak1/dgos/game.gd similarity index 100% rename from goal_src/dgos/game.gd rename to goal_src/jak1/dgos/game.gd diff --git a/goal_src/dgos/int.gd b/goal_src/jak1/dgos/int.gd similarity index 100% rename from goal_src/dgos/int.gd rename to goal_src/jak1/dgos/int.gd diff --git a/goal_src/dgos/jub.gd b/goal_src/jak1/dgos/jub.gd similarity index 100% rename from goal_src/dgos/jub.gd rename to goal_src/jak1/dgos/jub.gd diff --git a/goal_src/dgos/jun.gd b/goal_src/jak1/dgos/jun.gd similarity index 100% rename from goal_src/dgos/jun.gd rename to goal_src/jak1/dgos/jun.gd diff --git a/goal_src/dgos/kernel.gd b/goal_src/jak1/dgos/kernel.gd similarity index 100% rename from goal_src/dgos/kernel.gd rename to goal_src/jak1/dgos/kernel.gd diff --git a/goal_src/dgos/lav.gd b/goal_src/jak1/dgos/lav.gd similarity index 100% rename from goal_src/dgos/lav.gd rename to goal_src/jak1/dgos/lav.gd diff --git a/goal_src/dgos/mai.gd b/goal_src/jak1/dgos/mai.gd similarity index 100% rename from goal_src/dgos/mai.gd rename to goal_src/jak1/dgos/mai.gd diff --git a/goal_src/dgos/mis.gd b/goal_src/jak1/dgos/mis.gd similarity index 100% rename from goal_src/dgos/mis.gd rename to goal_src/jak1/dgos/mis.gd diff --git a/goal_src/dgos/ogr.gd b/goal_src/jak1/dgos/ogr.gd similarity index 100% rename from goal_src/dgos/ogr.gd rename to goal_src/jak1/dgos/ogr.gd diff --git a/goal_src/dgos/rob.gd b/goal_src/jak1/dgos/rob.gd similarity index 100% rename from goal_src/dgos/rob.gd rename to goal_src/jak1/dgos/rob.gd diff --git a/goal_src/dgos/rol.gd b/goal_src/jak1/dgos/rol.gd similarity index 100% rename from goal_src/dgos/rol.gd rename to goal_src/jak1/dgos/rol.gd diff --git a/goal_src/dgos/sno.gd b/goal_src/jak1/dgos/sno.gd similarity index 100% rename from goal_src/dgos/sno.gd rename to goal_src/jak1/dgos/sno.gd diff --git a/goal_src/dgos/sub.gd b/goal_src/jak1/dgos/sub.gd similarity index 100% rename from goal_src/dgos/sub.gd rename to goal_src/jak1/dgos/sub.gd diff --git a/goal_src/dgos/sun.gd b/goal_src/jak1/dgos/sun.gd similarity index 100% rename from goal_src/dgos/sun.gd rename to goal_src/jak1/dgos/sun.gd diff --git a/goal_src/dgos/swa.gd b/goal_src/jak1/dgos/swa.gd similarity index 100% rename from goal_src/dgos/swa.gd rename to goal_src/jak1/dgos/swa.gd diff --git a/goal_src/dgos/tit.gd b/goal_src/jak1/dgos/tit.gd similarity index 100% rename from goal_src/dgos/tit.gd rename to goal_src/jak1/dgos/tit.gd diff --git a/goal_src/dgos/tra.gd b/goal_src/jak1/dgos/tra.gd similarity index 100% rename from goal_src/dgos/tra.gd rename to goal_src/jak1/dgos/tra.gd diff --git a/goal_src/dgos/vi1.gd b/goal_src/jak1/dgos/vi1.gd similarity index 100% rename from goal_src/dgos/vi1.gd rename to goal_src/jak1/dgos/vi1.gd diff --git a/goal_src/dgos/vi2.gd b/goal_src/jak1/dgos/vi2.gd similarity index 100% rename from goal_src/dgos/vi2.gd rename to goal_src/jak1/dgos/vi2.gd diff --git a/goal_src/dgos/vi3.gd b/goal_src/jak1/dgos/vi3.gd similarity index 100% rename from goal_src/dgos/vi3.gd rename to goal_src/jak1/dgos/vi3.gd diff --git a/goal_src/engine/ambient/ambient.gc b/goal_src/jak1/engine/ambient/ambient.gc similarity index 100% rename from goal_src/engine/ambient/ambient.gc rename to goal_src/jak1/engine/ambient/ambient.gc diff --git a/goal_src/engine/ambient/mood-tables.gc b/goal_src/jak1/engine/ambient/mood-tables.gc similarity index 100% rename from goal_src/engine/ambient/mood-tables.gc rename to goal_src/jak1/engine/ambient/mood-tables.gc diff --git a/goal_src/engine/ambient/mood.gc b/goal_src/jak1/engine/ambient/mood.gc similarity index 100% rename from goal_src/engine/ambient/mood.gc rename to goal_src/jak1/engine/ambient/mood.gc diff --git a/goal_src/engine/ambient/weather-part.gc b/goal_src/jak1/engine/ambient/weather-part.gc similarity index 100% rename from goal_src/engine/ambient/weather-part.gc rename to goal_src/jak1/engine/ambient/weather-part.gc diff --git a/goal_src/engine/anim/aligner-h.gc b/goal_src/jak1/engine/anim/aligner-h.gc similarity index 100% rename from goal_src/engine/anim/aligner-h.gc rename to goal_src/jak1/engine/anim/aligner-h.gc diff --git a/goal_src/engine/anim/aligner.gc b/goal_src/jak1/engine/anim/aligner.gc similarity index 100% rename from goal_src/engine/anim/aligner.gc rename to goal_src/jak1/engine/anim/aligner.gc diff --git a/goal_src/engine/anim/bones-h.gc b/goal_src/jak1/engine/anim/bones-h.gc similarity index 100% rename from goal_src/engine/anim/bones-h.gc rename to goal_src/jak1/engine/anim/bones-h.gc diff --git a/goal_src/engine/anim/bones.gc b/goal_src/jak1/engine/anim/bones.gc similarity index 100% rename from goal_src/engine/anim/bones.gc rename to goal_src/jak1/engine/anim/bones.gc diff --git a/goal_src/engine/anim/joint-h.gc b/goal_src/jak1/engine/anim/joint-h.gc similarity index 100% rename from goal_src/engine/anim/joint-h.gc rename to goal_src/jak1/engine/anim/joint-h.gc diff --git a/goal_src/engine/anim/joint.gc b/goal_src/jak1/engine/anim/joint.gc similarity index 100% rename from goal_src/engine/anim/joint.gc rename to goal_src/jak1/engine/anim/joint.gc diff --git a/goal_src/engine/anim/mspace-h.gc b/goal_src/jak1/engine/anim/mspace-h.gc similarity index 100% rename from goal_src/engine/anim/mspace-h.gc rename to goal_src/jak1/engine/anim/mspace-h.gc diff --git a/goal_src/engine/camera/cam-combiner.gc b/goal_src/jak1/engine/camera/cam-combiner.gc similarity index 100% rename from goal_src/engine/camera/cam-combiner.gc rename to goal_src/jak1/engine/camera/cam-combiner.gc diff --git a/goal_src/engine/camera/cam-debug-h.gc b/goal_src/jak1/engine/camera/cam-debug-h.gc similarity index 100% rename from goal_src/engine/camera/cam-debug-h.gc rename to goal_src/jak1/engine/camera/cam-debug-h.gc diff --git a/goal_src/engine/camera/cam-debug.gc b/goal_src/jak1/engine/camera/cam-debug.gc similarity index 100% rename from goal_src/engine/camera/cam-debug.gc rename to goal_src/jak1/engine/camera/cam-debug.gc diff --git a/goal_src/engine/camera/cam-interface-h.gc b/goal_src/jak1/engine/camera/cam-interface-h.gc similarity index 100% rename from goal_src/engine/camera/cam-interface-h.gc rename to goal_src/jak1/engine/camera/cam-interface-h.gc diff --git a/goal_src/engine/camera/cam-interface.gc b/goal_src/jak1/engine/camera/cam-interface.gc similarity index 100% rename from goal_src/engine/camera/cam-interface.gc rename to goal_src/jak1/engine/camera/cam-interface.gc diff --git a/goal_src/engine/camera/cam-layout.gc b/goal_src/jak1/engine/camera/cam-layout.gc similarity index 100% rename from goal_src/engine/camera/cam-layout.gc rename to goal_src/jak1/engine/camera/cam-layout.gc diff --git a/goal_src/engine/camera/cam-master.gc b/goal_src/jak1/engine/camera/cam-master.gc similarity index 100% rename from goal_src/engine/camera/cam-master.gc rename to goal_src/jak1/engine/camera/cam-master.gc diff --git a/goal_src/engine/camera/cam-start.gc b/goal_src/jak1/engine/camera/cam-start.gc similarity index 100% rename from goal_src/engine/camera/cam-start.gc rename to goal_src/jak1/engine/camera/cam-start.gc diff --git a/goal_src/engine/camera/cam-states-dbg.gc b/goal_src/jak1/engine/camera/cam-states-dbg.gc similarity index 100% rename from goal_src/engine/camera/cam-states-dbg.gc rename to goal_src/jak1/engine/camera/cam-states-dbg.gc diff --git a/goal_src/engine/camera/cam-states.gc b/goal_src/jak1/engine/camera/cam-states.gc similarity index 100% rename from goal_src/engine/camera/cam-states.gc rename to goal_src/jak1/engine/camera/cam-states.gc diff --git a/goal_src/engine/camera/cam-update-h.gc b/goal_src/jak1/engine/camera/cam-update-h.gc similarity index 100% rename from goal_src/engine/camera/cam-update-h.gc rename to goal_src/jak1/engine/camera/cam-update-h.gc diff --git a/goal_src/engine/camera/cam-update.gc b/goal_src/jak1/engine/camera/cam-update.gc similarity index 100% rename from goal_src/engine/camera/cam-update.gc rename to goal_src/jak1/engine/camera/cam-update.gc diff --git a/goal_src/engine/camera/camera-h.gc b/goal_src/jak1/engine/camera/camera-h.gc similarity index 100% rename from goal_src/engine/camera/camera-h.gc rename to goal_src/jak1/engine/camera/camera-h.gc diff --git a/goal_src/engine/camera/camera.gc b/goal_src/jak1/engine/camera/camera.gc similarity index 100% rename from goal_src/engine/camera/camera.gc rename to goal_src/jak1/engine/camera/camera.gc diff --git a/goal_src/engine/camera/math-camera-h.gc b/goal_src/jak1/engine/camera/math-camera-h.gc similarity index 100% rename from goal_src/engine/camera/math-camera-h.gc rename to goal_src/jak1/engine/camera/math-camera-h.gc diff --git a/goal_src/engine/camera/math-camera.gc b/goal_src/jak1/engine/camera/math-camera.gc similarity index 100% rename from goal_src/engine/camera/math-camera.gc rename to goal_src/jak1/engine/camera/math-camera.gc diff --git a/goal_src/engine/camera/pov-camera-h.gc b/goal_src/jak1/engine/camera/pov-camera-h.gc similarity index 100% rename from goal_src/engine/camera/pov-camera-h.gc rename to goal_src/jak1/engine/camera/pov-camera-h.gc diff --git a/goal_src/engine/camera/pov-camera.gc b/goal_src/jak1/engine/camera/pov-camera.gc similarity index 100% rename from goal_src/engine/camera/pov-camera.gc rename to goal_src/jak1/engine/camera/pov-camera.gc diff --git a/goal_src/engine/collide/collide-cache-h.gc b/goal_src/jak1/engine/collide/collide-cache-h.gc similarity index 100% rename from goal_src/engine/collide/collide-cache-h.gc rename to goal_src/jak1/engine/collide/collide-cache-h.gc diff --git a/goal_src/engine/collide/collide-cache.gc b/goal_src/jak1/engine/collide/collide-cache.gc similarity index 100% rename from goal_src/engine/collide/collide-cache.gc rename to goal_src/jak1/engine/collide/collide-cache.gc diff --git a/goal_src/engine/collide/collide-edge-grab-h.gc b/goal_src/jak1/engine/collide/collide-edge-grab-h.gc similarity index 100% rename from goal_src/engine/collide/collide-edge-grab-h.gc rename to goal_src/jak1/engine/collide/collide-edge-grab-h.gc diff --git a/goal_src/engine/collide/collide-edge-grab.gc b/goal_src/jak1/engine/collide/collide-edge-grab.gc similarity index 100% rename from goal_src/engine/collide/collide-edge-grab.gc rename to goal_src/jak1/engine/collide/collide-edge-grab.gc diff --git a/goal_src/engine/collide/collide-frag-h.gc b/goal_src/jak1/engine/collide/collide-frag-h.gc similarity index 100% rename from goal_src/engine/collide/collide-frag-h.gc rename to goal_src/jak1/engine/collide/collide-frag-h.gc diff --git a/goal_src/engine/collide/collide-frag.gc b/goal_src/jak1/engine/collide/collide-frag.gc similarity index 100% rename from goal_src/engine/collide/collide-frag.gc rename to goal_src/jak1/engine/collide/collide-frag.gc diff --git a/goal_src/engine/collide/collide-func-h.gc b/goal_src/jak1/engine/collide/collide-func-h.gc similarity index 100% rename from goal_src/engine/collide/collide-func-h.gc rename to goal_src/jak1/engine/collide/collide-func-h.gc diff --git a/goal_src/engine/collide/collide-func.gc b/goal_src/jak1/engine/collide/collide-func.gc similarity index 100% rename from goal_src/engine/collide/collide-func.gc rename to goal_src/jak1/engine/collide/collide-func.gc diff --git a/goal_src/engine/collide/collide-h.gc b/goal_src/jak1/engine/collide/collide-h.gc similarity index 100% rename from goal_src/engine/collide/collide-h.gc rename to goal_src/jak1/engine/collide/collide-h.gc diff --git a/goal_src/engine/collide/collide-mesh-h.gc b/goal_src/jak1/engine/collide/collide-mesh-h.gc similarity index 100% rename from goal_src/engine/collide/collide-mesh-h.gc rename to goal_src/jak1/engine/collide/collide-mesh-h.gc diff --git a/goal_src/engine/collide/collide-mesh.gc b/goal_src/jak1/engine/collide/collide-mesh.gc similarity index 100% rename from goal_src/engine/collide/collide-mesh.gc rename to goal_src/jak1/engine/collide/collide-mesh.gc diff --git a/goal_src/engine/collide/collide-planes.gc b/goal_src/jak1/engine/collide/collide-planes.gc similarity index 100% rename from goal_src/engine/collide/collide-planes.gc rename to goal_src/jak1/engine/collide/collide-planes.gc diff --git a/goal_src/engine/collide/collide-probe.gc b/goal_src/jak1/engine/collide/collide-probe.gc similarity index 100% rename from goal_src/engine/collide/collide-probe.gc rename to goal_src/jak1/engine/collide/collide-probe.gc diff --git a/goal_src/engine/collide/collide-reaction-target.gc b/goal_src/jak1/engine/collide/collide-reaction-target.gc similarity index 100% rename from goal_src/engine/collide/collide-reaction-target.gc rename to goal_src/jak1/engine/collide/collide-reaction-target.gc diff --git a/goal_src/engine/collide/collide-shape-h.gc b/goal_src/jak1/engine/collide/collide-shape-h.gc similarity index 100% rename from goal_src/engine/collide/collide-shape-h.gc rename to goal_src/jak1/engine/collide/collide-shape-h.gc diff --git a/goal_src/engine/collide/collide-shape-rider.gc b/goal_src/jak1/engine/collide/collide-shape-rider.gc similarity index 100% rename from goal_src/engine/collide/collide-shape-rider.gc rename to goal_src/jak1/engine/collide/collide-shape-rider.gc diff --git a/goal_src/engine/collide/collide-shape.gc b/goal_src/jak1/engine/collide/collide-shape.gc similarity index 100% rename from goal_src/engine/collide/collide-shape.gc rename to goal_src/jak1/engine/collide/collide-shape.gc diff --git a/goal_src/engine/collide/collide-target-h.gc b/goal_src/jak1/engine/collide/collide-target-h.gc similarity index 100% rename from goal_src/engine/collide/collide-target-h.gc rename to goal_src/jak1/engine/collide/collide-target-h.gc diff --git a/goal_src/engine/collide/collide-touch-h.gc b/goal_src/jak1/engine/collide/collide-touch-h.gc similarity index 100% rename from goal_src/engine/collide/collide-touch-h.gc rename to goal_src/jak1/engine/collide/collide-touch-h.gc diff --git a/goal_src/engine/collide/collide-touch.gc b/goal_src/jak1/engine/collide/collide-touch.gc similarity index 100% rename from goal_src/engine/collide/collide-touch.gc rename to goal_src/jak1/engine/collide/collide-touch.gc diff --git a/goal_src/engine/collide/collide.gc b/goal_src/jak1/engine/collide/collide.gc similarity index 100% rename from goal_src/engine/collide/collide.gc rename to goal_src/jak1/engine/collide/collide.gc diff --git a/goal_src/engine/collide/main-collide.gc b/goal_src/jak1/engine/collide/main-collide.gc similarity index 100% rename from goal_src/engine/collide/main-collide.gc rename to goal_src/jak1/engine/collide/main-collide.gc diff --git a/goal_src/engine/data/art-h.gc b/goal_src/jak1/engine/data/art-h.gc similarity index 100% rename from goal_src/engine/data/art-h.gc rename to goal_src/jak1/engine/data/art-h.gc diff --git a/goal_src/engine/data/res-h.gc b/goal_src/jak1/engine/data/res-h.gc similarity index 100% rename from goal_src/engine/data/res-h.gc rename to goal_src/jak1/engine/data/res-h.gc diff --git a/goal_src/engine/data/res.gc b/goal_src/jak1/engine/data/res.gc similarity index 100% rename from goal_src/engine/data/res.gc rename to goal_src/jak1/engine/data/res.gc diff --git a/goal_src/engine/debug/anim-tester.gc b/goal_src/jak1/engine/debug/anim-tester.gc similarity index 100% rename from goal_src/engine/debug/anim-tester.gc rename to goal_src/jak1/engine/debug/anim-tester.gc diff --git a/goal_src/engine/debug/assert-h.gc b/goal_src/jak1/engine/debug/assert-h.gc similarity index 100% rename from goal_src/engine/debug/assert-h.gc rename to goal_src/jak1/engine/debug/assert-h.gc diff --git a/goal_src/engine/debug/assert.gc b/goal_src/jak1/engine/debug/assert.gc similarity index 100% rename from goal_src/engine/debug/assert.gc rename to goal_src/jak1/engine/debug/assert.gc diff --git a/goal_src/engine/debug/debug-h.gc b/goal_src/jak1/engine/debug/debug-h.gc similarity index 100% rename from goal_src/engine/debug/debug-h.gc rename to goal_src/jak1/engine/debug/debug-h.gc diff --git a/goal_src/engine/debug/debug-sphere.gc b/goal_src/jak1/engine/debug/debug-sphere.gc similarity index 100% rename from goal_src/engine/debug/debug-sphere.gc rename to goal_src/jak1/engine/debug/debug-sphere.gc diff --git a/goal_src/engine/debug/debug.gc b/goal_src/jak1/engine/debug/debug.gc similarity index 100% rename from goal_src/engine/debug/debug.gc rename to goal_src/jak1/engine/debug/debug.gc diff --git a/goal_src/engine/debug/default-menu.gc b/goal_src/jak1/engine/debug/default-menu.gc similarity index 100% rename from goal_src/engine/debug/default-menu.gc rename to goal_src/jak1/engine/debug/default-menu.gc diff --git a/goal_src/engine/debug/memory-usage-h.gc b/goal_src/jak1/engine/debug/memory-usage-h.gc similarity index 100% rename from goal_src/engine/debug/memory-usage-h.gc rename to goal_src/jak1/engine/debug/memory-usage-h.gc diff --git a/goal_src/engine/debug/memory-usage.gc b/goal_src/jak1/engine/debug/memory-usage.gc similarity index 100% rename from goal_src/engine/debug/memory-usage.gc rename to goal_src/jak1/engine/debug/memory-usage.gc diff --git a/goal_src/engine/debug/menu.gc b/goal_src/jak1/engine/debug/menu.gc similarity index 100% rename from goal_src/engine/debug/menu.gc rename to goal_src/jak1/engine/debug/menu.gc diff --git a/goal_src/engine/debug/part-tester.gc b/goal_src/jak1/engine/debug/part-tester.gc similarity index 100% rename from goal_src/engine/debug/part-tester.gc rename to goal_src/jak1/engine/debug/part-tester.gc diff --git a/goal_src/engine/debug/stats-h.gc b/goal_src/jak1/engine/debug/stats-h.gc similarity index 100% rename from goal_src/engine/debug/stats-h.gc rename to goal_src/jak1/engine/debug/stats-h.gc diff --git a/goal_src/engine/debug/viewer.gc b/goal_src/jak1/engine/debug/viewer.gc similarity index 100% rename from goal_src/engine/debug/viewer.gc rename to goal_src/jak1/engine/debug/viewer.gc diff --git a/goal_src/engine/dma/dma-bucket.gc b/goal_src/jak1/engine/dma/dma-bucket.gc similarity index 100% rename from goal_src/engine/dma/dma-bucket.gc rename to goal_src/jak1/engine/dma/dma-bucket.gc diff --git a/goal_src/engine/dma/dma-buffer.gc b/goal_src/jak1/engine/dma/dma-buffer.gc similarity index 100% rename from goal_src/engine/dma/dma-buffer.gc rename to goal_src/jak1/engine/dma/dma-buffer.gc diff --git a/goal_src/engine/dma/dma-disasm.gc b/goal_src/jak1/engine/dma/dma-disasm.gc similarity index 100% rename from goal_src/engine/dma/dma-disasm.gc rename to goal_src/jak1/engine/dma/dma-disasm.gc diff --git a/goal_src/engine/dma/dma-h.gc b/goal_src/jak1/engine/dma/dma-h.gc similarity index 100% rename from goal_src/engine/dma/dma-h.gc rename to goal_src/jak1/engine/dma/dma-h.gc diff --git a/goal_src/engine/dma/dma.gc b/goal_src/jak1/engine/dma/dma.gc similarity index 100% rename from goal_src/engine/dma/dma.gc rename to goal_src/jak1/engine/dma/dma.gc diff --git a/goal_src/engine/draw/draw-node-h.gc b/goal_src/jak1/engine/draw/draw-node-h.gc similarity index 100% rename from goal_src/engine/draw/draw-node-h.gc rename to goal_src/jak1/engine/draw/draw-node-h.gc diff --git a/goal_src/engine/draw/draw-node.gc b/goal_src/jak1/engine/draw/draw-node.gc similarity index 100% rename from goal_src/engine/draw/draw-node.gc rename to goal_src/jak1/engine/draw/draw-node.gc diff --git a/goal_src/engine/draw/drawable-actor-h.gc b/goal_src/jak1/engine/draw/drawable-actor-h.gc similarity index 100% rename from goal_src/engine/draw/drawable-actor-h.gc rename to goal_src/jak1/engine/draw/drawable-actor-h.gc diff --git a/goal_src/engine/draw/drawable-ambient-h.gc b/goal_src/jak1/engine/draw/drawable-ambient-h.gc similarity index 100% rename from goal_src/engine/draw/drawable-ambient-h.gc rename to goal_src/jak1/engine/draw/drawable-ambient-h.gc diff --git a/goal_src/engine/draw/drawable-group-h.gc b/goal_src/jak1/engine/draw/drawable-group-h.gc similarity index 100% rename from goal_src/engine/draw/drawable-group-h.gc rename to goal_src/jak1/engine/draw/drawable-group-h.gc diff --git a/goal_src/engine/draw/drawable-group.gc b/goal_src/jak1/engine/draw/drawable-group.gc similarity index 100% rename from goal_src/engine/draw/drawable-group.gc rename to goal_src/jak1/engine/draw/drawable-group.gc diff --git a/goal_src/engine/draw/drawable-h.gc b/goal_src/jak1/engine/draw/drawable-h.gc similarity index 100% rename from goal_src/engine/draw/drawable-h.gc rename to goal_src/jak1/engine/draw/drawable-h.gc diff --git a/goal_src/engine/draw/drawable-inline-array-h.gc b/goal_src/jak1/engine/draw/drawable-inline-array-h.gc similarity index 100% rename from goal_src/engine/draw/drawable-inline-array-h.gc rename to goal_src/jak1/engine/draw/drawable-inline-array-h.gc diff --git a/goal_src/engine/draw/drawable-inline-array.gc b/goal_src/jak1/engine/draw/drawable-inline-array.gc similarity index 100% rename from goal_src/engine/draw/drawable-inline-array.gc rename to goal_src/jak1/engine/draw/drawable-inline-array.gc diff --git a/goal_src/engine/draw/drawable-tree-h.gc b/goal_src/jak1/engine/draw/drawable-tree-h.gc similarity index 100% rename from goal_src/engine/draw/drawable-tree-h.gc rename to goal_src/jak1/engine/draw/drawable-tree-h.gc diff --git a/goal_src/engine/draw/drawable-tree.gc b/goal_src/jak1/engine/draw/drawable-tree.gc similarity index 100% rename from goal_src/engine/draw/drawable-tree.gc rename to goal_src/jak1/engine/draw/drawable-tree.gc diff --git a/goal_src/engine/draw/drawable.gc b/goal_src/jak1/engine/draw/drawable.gc similarity index 100% rename from goal_src/engine/draw/drawable.gc rename to goal_src/jak1/engine/draw/drawable.gc diff --git a/goal_src/engine/draw/process-drawable-h.gc b/goal_src/jak1/engine/draw/process-drawable-h.gc similarity index 100% rename from goal_src/engine/draw/process-drawable-h.gc rename to goal_src/jak1/engine/draw/process-drawable-h.gc diff --git a/goal_src/engine/draw/process-drawable.gc b/goal_src/jak1/engine/draw/process-drawable.gc similarity index 100% rename from goal_src/engine/draw/process-drawable.gc rename to goal_src/jak1/engine/draw/process-drawable.gc diff --git a/goal_src/engine/engine/connect.gc b/goal_src/jak1/engine/engine/connect.gc similarity index 100% rename from goal_src/engine/engine/connect.gc rename to goal_src/jak1/engine/engine/connect.gc diff --git a/goal_src/engine/engine/engines.gc b/goal_src/jak1/engine/engine/engines.gc similarity index 100% rename from goal_src/engine/engine/engines.gc rename to goal_src/jak1/engine/engine/engines.gc diff --git a/goal_src/engine/entity/actor-link-h.gc b/goal_src/jak1/engine/entity/actor-link-h.gc similarity index 100% rename from goal_src/engine/entity/actor-link-h.gc rename to goal_src/jak1/engine/entity/actor-link-h.gc diff --git a/goal_src/engine/entity/entity-h.gc b/goal_src/jak1/engine/entity/entity-h.gc similarity index 100% rename from goal_src/engine/entity/entity-h.gc rename to goal_src/jak1/engine/entity/entity-h.gc diff --git a/goal_src/engine/entity/entity-table.gc b/goal_src/jak1/engine/entity/entity-table.gc similarity index 100% rename from goal_src/engine/entity/entity-table.gc rename to goal_src/jak1/engine/entity/entity-table.gc diff --git a/goal_src/engine/entity/entity.gc b/goal_src/jak1/engine/entity/entity.gc similarity index 100% rename from goal_src/engine/entity/entity.gc rename to goal_src/jak1/engine/entity/entity.gc diff --git a/goal_src/engine/entity/relocate.gc b/goal_src/jak1/engine/entity/relocate.gc similarity index 100% rename from goal_src/engine/entity/relocate.gc rename to goal_src/jak1/engine/entity/relocate.gc diff --git a/goal_src/engine/game/collectables-part.gc b/goal_src/jak1/engine/game/collectables-part.gc similarity index 100% rename from goal_src/engine/game/collectables-part.gc rename to goal_src/jak1/engine/game/collectables-part.gc diff --git a/goal_src/engine/game/collectables.gc b/goal_src/jak1/engine/game/collectables.gc similarity index 99% rename from goal_src/engine/game/collectables.gc rename to goal_src/jak1/engine/game/collectables.gc index 84baaf4b26..80bf08394b 100644 --- a/goal_src/engine/game/collectables.gc +++ b/goal_src/jak1/engine/game/collectables.gc @@ -22,10 +22,10 @@ ;; DECOMP BEGINS -(import "goal_src/import/buzzer-ag.gc") -(import "goal_src/import/ecovalve-ag.gc") -(import "goal_src/import/money-ag.gc") -(import "goal_src/import/fuel-cell-ag.gc") +(import "goal_src/jak1/import/buzzer-ag.gc") +(import "goal_src/jak1/import/ecovalve-ag.gc") +(import "goal_src/jak1/import/money-ag.gc") +(import "goal_src/jak1/import/fuel-cell-ag.gc") (define *eco-pill-count* 0) diff --git a/goal_src/engine/game/crates.gc b/goal_src/jak1/engine/game/crates.gc similarity index 99% rename from goal_src/engine/game/crates.gc rename to goal_src/jak1/engine/game/crates.gc index 7401a6f019..ad7b540fc1 100644 --- a/goal_src/engine/game/crates.gc +++ b/goal_src/jak1/engine/game/crates.gc @@ -10,7 +10,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/crate-ag.gc") +(import "goal_src/jak1/import/crate-ag.gc") (defskelgroup *crate-barrel-sg* crate crate-barrel-lod0-jg crate-barrel-idle-ja ((crate-barrel-lod0-mg (meters 20)) (crate-barrel-lod1-mg (meters 40)) (crate-barrel-lod2-mg (meters 999999))) diff --git a/goal_src/engine/game/effect-control-h.gc b/goal_src/jak1/engine/game/effect-control-h.gc similarity index 100% rename from goal_src/engine/game/effect-control-h.gc rename to goal_src/jak1/engine/game/effect-control-h.gc diff --git a/goal_src/engine/game/effect-control.gc b/goal_src/jak1/engine/game/effect-control.gc similarity index 100% rename from goal_src/engine/game/effect-control.gc rename to goal_src/jak1/engine/game/effect-control.gc diff --git a/goal_src/engine/game/fact-h.gc b/goal_src/jak1/engine/game/fact-h.gc similarity index 100% rename from goal_src/engine/game/fact-h.gc rename to goal_src/jak1/engine/game/fact-h.gc diff --git a/goal_src/engine/game/game-h.gc b/goal_src/jak1/engine/game/game-h.gc similarity index 100% rename from goal_src/engine/game/game-h.gc rename to goal_src/jak1/engine/game/game-h.gc diff --git a/goal_src/engine/game/game-info-h.gc b/goal_src/jak1/engine/game/game-info-h.gc similarity index 100% rename from goal_src/engine/game/game-info-h.gc rename to goal_src/jak1/engine/game/game-info-h.gc diff --git a/goal_src/engine/game/game-info.gc b/goal_src/jak1/engine/game/game-info.gc similarity index 100% rename from goal_src/engine/game/game-info.gc rename to goal_src/jak1/engine/game/game-info.gc diff --git a/goal_src/engine/game/game-save.gc b/goal_src/jak1/engine/game/game-save.gc similarity index 100% rename from goal_src/engine/game/game-save.gc rename to goal_src/jak1/engine/game/game-save.gc diff --git a/goal_src/engine/game/generic-obs-h.gc b/goal_src/jak1/engine/game/generic-obs-h.gc similarity index 100% rename from goal_src/engine/game/generic-obs-h.gc rename to goal_src/jak1/engine/game/generic-obs-h.gc diff --git a/goal_src/engine/game/generic-obs.gc b/goal_src/jak1/engine/game/generic-obs.gc similarity index 100% rename from goal_src/engine/game/generic-obs.gc rename to goal_src/jak1/engine/game/generic-obs.gc diff --git a/goal_src/engine/game/main-h.gc b/goal_src/jak1/engine/game/main-h.gc similarity index 100% rename from goal_src/engine/game/main-h.gc rename to goal_src/jak1/engine/game/main-h.gc diff --git a/goal_src/engine/game/main.gc b/goal_src/jak1/engine/game/main.gc similarity index 100% rename from goal_src/engine/game/main.gc rename to goal_src/jak1/engine/game/main.gc diff --git a/goal_src/engine/game/powerups.gc b/goal_src/jak1/engine/game/powerups.gc similarity index 100% rename from goal_src/engine/game/powerups.gc rename to goal_src/jak1/engine/game/powerups.gc diff --git a/goal_src/engine/game/projectiles-h.gc b/goal_src/jak1/engine/game/projectiles-h.gc similarity index 100% rename from goal_src/engine/game/projectiles-h.gc rename to goal_src/jak1/engine/game/projectiles-h.gc diff --git a/goal_src/engine/game/projectiles.gc b/goal_src/jak1/engine/game/projectiles.gc similarity index 100% rename from goal_src/engine/game/projectiles.gc rename to goal_src/jak1/engine/game/projectiles.gc diff --git a/goal_src/engine/game/settings-h.gc b/goal_src/jak1/engine/game/settings-h.gc similarity index 100% rename from goal_src/engine/game/settings-h.gc rename to goal_src/jak1/engine/game/settings-h.gc diff --git a/goal_src/engine/game/settings.gc b/goal_src/jak1/engine/game/settings.gc similarity index 100% rename from goal_src/engine/game/settings.gc rename to goal_src/jak1/engine/game/settings.gc diff --git a/goal_src/engine/game/task/game-task-h.gc b/goal_src/jak1/engine/game/task/game-task-h.gc similarity index 100% rename from goal_src/engine/game/task/game-task-h.gc rename to goal_src/jak1/engine/game/task/game-task-h.gc diff --git a/goal_src/engine/game/task/hint-control-h.gc b/goal_src/jak1/engine/game/task/hint-control-h.gc similarity index 100% rename from goal_src/engine/game/task/hint-control-h.gc rename to goal_src/jak1/engine/game/task/hint-control-h.gc diff --git a/goal_src/engine/game/task/hint-control.gc b/goal_src/jak1/engine/game/task/hint-control.gc similarity index 100% rename from goal_src/engine/game/task/hint-control.gc rename to goal_src/jak1/engine/game/task/hint-control.gc diff --git a/goal_src/engine/game/task/process-taskable.gc b/goal_src/jak1/engine/game/task/process-taskable.gc similarity index 100% rename from goal_src/engine/game/task/process-taskable.gc rename to goal_src/jak1/engine/game/task/process-taskable.gc diff --git a/goal_src/engine/game/task/task-control-h.gc b/goal_src/jak1/engine/game/task/task-control-h.gc similarity index 100% rename from goal_src/engine/game/task/task-control-h.gc rename to goal_src/jak1/engine/game/task/task-control-h.gc diff --git a/goal_src/engine/game/task/task-control.gc b/goal_src/jak1/engine/game/task/task-control.gc similarity index 100% rename from goal_src/engine/game/task/task-control.gc rename to goal_src/jak1/engine/game/task/task-control.gc diff --git a/goal_src/engine/game/video.gc b/goal_src/jak1/engine/game/video.gc similarity index 100% rename from goal_src/engine/game/video.gc rename to goal_src/jak1/engine/game/video.gc diff --git a/goal_src/engine/game/voicebox.gc b/goal_src/jak1/engine/game/voicebox.gc similarity index 99% rename from goal_src/engine/game/voicebox.gc rename to goal_src/jak1/engine/game/voicebox.gc index 4d700bed41..7d63e1ad7a 100644 --- a/goal_src/engine/game/voicebox.gc +++ b/goal_src/jak1/engine/game/voicebox.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/speaker-ag.gc") +(import "goal_src/jak1/import/speaker-ag.gc") (deftype camera-voicebox (camera-slave) () diff --git a/goal_src/engine/geometry/bounding-box-h.gc b/goal_src/jak1/engine/geometry/bounding-box-h.gc similarity index 100% rename from goal_src/engine/geometry/bounding-box-h.gc rename to goal_src/jak1/engine/geometry/bounding-box-h.gc diff --git a/goal_src/engine/geometry/bounding-box.gc b/goal_src/jak1/engine/geometry/bounding-box.gc similarity index 100% rename from goal_src/engine/geometry/bounding-box.gc rename to goal_src/jak1/engine/geometry/bounding-box.gc diff --git a/goal_src/engine/geometry/cylinder.gc b/goal_src/jak1/engine/geometry/cylinder.gc similarity index 100% rename from goal_src/engine/geometry/cylinder.gc rename to goal_src/jak1/engine/geometry/cylinder.gc diff --git a/goal_src/engine/geometry/geometry-h.gc b/goal_src/jak1/engine/geometry/geometry-h.gc similarity index 100% rename from goal_src/engine/geometry/geometry-h.gc rename to goal_src/jak1/engine/geometry/geometry-h.gc diff --git a/goal_src/engine/geometry/geometry.gc b/goal_src/jak1/engine/geometry/geometry.gc similarity index 100% rename from goal_src/engine/geometry/geometry.gc rename to goal_src/jak1/engine/geometry/geometry.gc diff --git a/goal_src/engine/geometry/vol-h.gc b/goal_src/jak1/engine/geometry/vol-h.gc similarity index 100% rename from goal_src/engine/geometry/vol-h.gc rename to goal_src/jak1/engine/geometry/vol-h.gc diff --git a/goal_src/engine/geometry/vol.gc b/goal_src/jak1/engine/geometry/vol.gc similarity index 100% rename from goal_src/engine/geometry/vol.gc rename to goal_src/jak1/engine/geometry/vol.gc diff --git a/goal_src/engine/gfx/background-h.gc b/goal_src/jak1/engine/gfx/background-h.gc similarity index 100% rename from goal_src/engine/gfx/background-h.gc rename to goal_src/jak1/engine/gfx/background-h.gc diff --git a/goal_src/engine/gfx/background.gc b/goal_src/jak1/engine/gfx/background.gc similarity index 100% rename from goal_src/engine/gfx/background.gc rename to goal_src/jak1/engine/gfx/background.gc diff --git a/goal_src/engine/gfx/capture.gc b/goal_src/jak1/engine/gfx/capture.gc similarity index 100% rename from goal_src/engine/gfx/capture.gc rename to goal_src/jak1/engine/gfx/capture.gc diff --git a/goal_src/engine/gfx/decomp-h.gc b/goal_src/jak1/engine/gfx/decomp-h.gc similarity index 100% rename from goal_src/engine/gfx/decomp-h.gc rename to goal_src/jak1/engine/gfx/decomp-h.gc diff --git a/goal_src/engine/gfx/depth-cue-h.gc b/goal_src/jak1/engine/gfx/depth-cue-h.gc similarity index 100% rename from goal_src/engine/gfx/depth-cue-h.gc rename to goal_src/jak1/engine/gfx/depth-cue-h.gc diff --git a/goal_src/engine/gfx/depth-cue.gc b/goal_src/jak1/engine/gfx/depth-cue.gc similarity index 100% rename from goal_src/engine/gfx/depth-cue.gc rename to goal_src/jak1/engine/gfx/depth-cue.gc diff --git a/goal_src/engine/gfx/eye-h.gc b/goal_src/jak1/engine/gfx/eye-h.gc similarity index 100% rename from goal_src/engine/gfx/eye-h.gc rename to goal_src/jak1/engine/gfx/eye-h.gc diff --git a/goal_src/engine/gfx/eye.gc b/goal_src/jak1/engine/gfx/eye.gc similarity index 100% rename from goal_src/engine/gfx/eye.gc rename to goal_src/jak1/engine/gfx/eye.gc diff --git a/goal_src/engine/gfx/font-h.gc b/goal_src/jak1/engine/gfx/font-h.gc similarity index 100% rename from goal_src/engine/gfx/font-h.gc rename to goal_src/jak1/engine/gfx/font-h.gc diff --git a/goal_src/engine/gfx/font.gc b/goal_src/jak1/engine/gfx/font.gc similarity index 100% rename from goal_src/engine/gfx/font.gc rename to goal_src/jak1/engine/gfx/font.gc diff --git a/goal_src/engine/gfx/generic/generic-effect.gc b/goal_src/jak1/engine/gfx/generic/generic-effect.gc similarity index 100% rename from goal_src/engine/gfx/generic/generic-effect.gc rename to goal_src/jak1/engine/gfx/generic/generic-effect.gc diff --git a/goal_src/engine/gfx/generic/generic-h.gc b/goal_src/jak1/engine/gfx/generic/generic-h.gc similarity index 100% rename from goal_src/engine/gfx/generic/generic-h.gc rename to goal_src/jak1/engine/gfx/generic/generic-h.gc diff --git a/goal_src/engine/gfx/generic/generic-merc.gc b/goal_src/jak1/engine/gfx/generic/generic-merc.gc similarity index 100% rename from goal_src/engine/gfx/generic/generic-merc.gc rename to goal_src/jak1/engine/gfx/generic/generic-merc.gc diff --git a/goal_src/engine/gfx/generic/generic-tie.gc b/goal_src/jak1/engine/gfx/generic/generic-tie.gc similarity index 100% rename from goal_src/engine/gfx/generic/generic-tie.gc rename to goal_src/jak1/engine/gfx/generic/generic-tie.gc diff --git a/goal_src/engine/gfx/generic/generic-vu0.gc b/goal_src/jak1/engine/gfx/generic/generic-vu0.gc similarity index 100% rename from goal_src/engine/gfx/generic/generic-vu0.gc rename to goal_src/jak1/engine/gfx/generic/generic-vu0.gc diff --git a/goal_src/engine/gfx/generic/generic-vu1-h.gc b/goal_src/jak1/engine/gfx/generic/generic-vu1-h.gc similarity index 100% rename from goal_src/engine/gfx/generic/generic-vu1-h.gc rename to goal_src/jak1/engine/gfx/generic/generic-vu1-h.gc diff --git a/goal_src/engine/gfx/generic/generic-vu1.gc b/goal_src/jak1/engine/gfx/generic/generic-vu1.gc similarity index 100% rename from goal_src/engine/gfx/generic/generic-vu1.gc rename to goal_src/jak1/engine/gfx/generic/generic-vu1.gc diff --git a/goal_src/engine/gfx/generic/generic-work-h.gc b/goal_src/jak1/engine/gfx/generic/generic-work-h.gc similarity index 100% rename from goal_src/engine/gfx/generic/generic-work-h.gc rename to goal_src/jak1/engine/gfx/generic/generic-work-h.gc diff --git a/goal_src/engine/gfx/generic/generic.gc b/goal_src/jak1/engine/gfx/generic/generic.gc similarity index 100% rename from goal_src/engine/gfx/generic/generic.gc rename to goal_src/jak1/engine/gfx/generic/generic.gc diff --git a/goal_src/engine/gfx/hw/display-h.gc b/goal_src/jak1/engine/gfx/hw/display-h.gc similarity index 100% rename from goal_src/engine/gfx/hw/display-h.gc rename to goal_src/jak1/engine/gfx/hw/display-h.gc diff --git a/goal_src/engine/gfx/hw/display.gc b/goal_src/jak1/engine/gfx/hw/display.gc similarity index 100% rename from goal_src/engine/gfx/hw/display.gc rename to goal_src/jak1/engine/gfx/hw/display.gc diff --git a/goal_src/engine/gfx/hw/gs.gc b/goal_src/jak1/engine/gfx/hw/gs.gc similarity index 100% rename from goal_src/engine/gfx/hw/gs.gc rename to goal_src/jak1/engine/gfx/hw/gs.gc diff --git a/goal_src/engine/gfx/hw/video-h.gc b/goal_src/jak1/engine/gfx/hw/video-h.gc similarity index 100% rename from goal_src/engine/gfx/hw/video-h.gc rename to goal_src/jak1/engine/gfx/hw/video-h.gc diff --git a/goal_src/engine/gfx/hw/vu1-user-h.gc b/goal_src/jak1/engine/gfx/hw/vu1-user-h.gc similarity index 100% rename from goal_src/engine/gfx/hw/vu1-user-h.gc rename to goal_src/jak1/engine/gfx/hw/vu1-user-h.gc diff --git a/goal_src/engine/gfx/lights-h.gc b/goal_src/jak1/engine/gfx/lights-h.gc similarity index 100% rename from goal_src/engine/gfx/lights-h.gc rename to goal_src/jak1/engine/gfx/lights-h.gc diff --git a/goal_src/engine/gfx/lights.gc b/goal_src/jak1/engine/gfx/lights.gc similarity index 100% rename from goal_src/engine/gfx/lights.gc rename to goal_src/jak1/engine/gfx/lights.gc diff --git a/goal_src/engine/gfx/merc/generic-merc-h.gc b/goal_src/jak1/engine/gfx/merc/generic-merc-h.gc similarity index 100% rename from goal_src/engine/gfx/merc/generic-merc-h.gc rename to goal_src/jak1/engine/gfx/merc/generic-merc-h.gc diff --git a/goal_src/engine/gfx/merc/merc-blend-shape.gc b/goal_src/jak1/engine/gfx/merc/merc-blend-shape.gc similarity index 100% rename from goal_src/engine/gfx/merc/merc-blend-shape.gc rename to goal_src/jak1/engine/gfx/merc/merc-blend-shape.gc diff --git a/goal_src/engine/gfx/merc/merc-death.gc b/goal_src/jak1/engine/gfx/merc/merc-death.gc similarity index 100% rename from goal_src/engine/gfx/merc/merc-death.gc rename to goal_src/jak1/engine/gfx/merc/merc-death.gc diff --git a/goal_src/engine/gfx/merc/merc-h.gc b/goal_src/jak1/engine/gfx/merc/merc-h.gc similarity index 100% rename from goal_src/engine/gfx/merc/merc-h.gc rename to goal_src/jak1/engine/gfx/merc/merc-h.gc diff --git a/goal_src/engine/gfx/merc/merc-vu1.gc b/goal_src/jak1/engine/gfx/merc/merc-vu1.gc similarity index 100% rename from goal_src/engine/gfx/merc/merc-vu1.gc rename to goal_src/jak1/engine/gfx/merc/merc-vu1.gc diff --git a/goal_src/engine/gfx/merc/merc.gc b/goal_src/jak1/engine/gfx/merc/merc.gc similarity index 100% rename from goal_src/engine/gfx/merc/merc.gc rename to goal_src/jak1/engine/gfx/merc/merc.gc diff --git a/goal_src/engine/gfx/mood-h.gc b/goal_src/jak1/engine/gfx/mood-h.gc similarity index 100% rename from goal_src/engine/gfx/mood-h.gc rename to goal_src/jak1/engine/gfx/mood-h.gc diff --git a/goal_src/engine/gfx/ocean/ocean-frames.gc b/goal_src/jak1/engine/gfx/ocean/ocean-frames.gc similarity index 100% rename from goal_src/engine/gfx/ocean/ocean-frames.gc rename to goal_src/jak1/engine/gfx/ocean/ocean-frames.gc diff --git a/goal_src/engine/gfx/ocean/ocean-h.gc b/goal_src/jak1/engine/gfx/ocean/ocean-h.gc similarity index 100% rename from goal_src/engine/gfx/ocean/ocean-h.gc rename to goal_src/jak1/engine/gfx/ocean/ocean-h.gc diff --git a/goal_src/engine/gfx/ocean/ocean-mid.gc b/goal_src/jak1/engine/gfx/ocean/ocean-mid.gc similarity index 100% rename from goal_src/engine/gfx/ocean/ocean-mid.gc rename to goal_src/jak1/engine/gfx/ocean/ocean-mid.gc diff --git a/goal_src/engine/gfx/ocean/ocean-near.gc b/goal_src/jak1/engine/gfx/ocean/ocean-near.gc similarity index 100% rename from goal_src/engine/gfx/ocean/ocean-near.gc rename to goal_src/jak1/engine/gfx/ocean/ocean-near.gc diff --git a/goal_src/engine/gfx/ocean/ocean-tables.gc b/goal_src/jak1/engine/gfx/ocean/ocean-tables.gc similarity index 100% rename from goal_src/engine/gfx/ocean/ocean-tables.gc rename to goal_src/jak1/engine/gfx/ocean/ocean-tables.gc diff --git a/goal_src/engine/gfx/ocean/ocean-texture.gc b/goal_src/jak1/engine/gfx/ocean/ocean-texture.gc similarity index 100% rename from goal_src/engine/gfx/ocean/ocean-texture.gc rename to goal_src/jak1/engine/gfx/ocean/ocean-texture.gc diff --git a/goal_src/engine/gfx/ocean/ocean-trans-tables.gc b/goal_src/jak1/engine/gfx/ocean/ocean-trans-tables.gc similarity index 100% rename from goal_src/engine/gfx/ocean/ocean-trans-tables.gc rename to goal_src/jak1/engine/gfx/ocean/ocean-trans-tables.gc diff --git a/goal_src/engine/gfx/ocean/ocean-transition.gc b/goal_src/jak1/engine/gfx/ocean/ocean-transition.gc similarity index 100% rename from goal_src/engine/gfx/ocean/ocean-transition.gc rename to goal_src/jak1/engine/gfx/ocean/ocean-transition.gc diff --git a/goal_src/engine/gfx/ocean/ocean-vu0.gc b/goal_src/jak1/engine/gfx/ocean/ocean-vu0.gc similarity index 100% rename from goal_src/engine/gfx/ocean/ocean-vu0.gc rename to goal_src/jak1/engine/gfx/ocean/ocean-vu0.gc diff --git a/goal_src/engine/gfx/ocean/ocean.gc b/goal_src/jak1/engine/gfx/ocean/ocean.gc similarity index 100% rename from goal_src/engine/gfx/ocean/ocean.gc rename to goal_src/jak1/engine/gfx/ocean/ocean.gc diff --git a/goal_src/engine/gfx/ripple.gc b/goal_src/jak1/engine/gfx/ripple.gc similarity index 100% rename from goal_src/engine/gfx/ripple.gc rename to goal_src/jak1/engine/gfx/ripple.gc diff --git a/goal_src/engine/gfx/shadow/shadow-cpu-h.gc b/goal_src/jak1/engine/gfx/shadow/shadow-cpu-h.gc similarity index 100% rename from goal_src/engine/gfx/shadow/shadow-cpu-h.gc rename to goal_src/jak1/engine/gfx/shadow/shadow-cpu-h.gc diff --git a/goal_src/engine/gfx/shadow/shadow-cpu.gc b/goal_src/jak1/engine/gfx/shadow/shadow-cpu.gc similarity index 100% rename from goal_src/engine/gfx/shadow/shadow-cpu.gc rename to goal_src/jak1/engine/gfx/shadow/shadow-cpu.gc diff --git a/goal_src/engine/gfx/shadow/shadow-h.gc b/goal_src/jak1/engine/gfx/shadow/shadow-h.gc similarity index 100% rename from goal_src/engine/gfx/shadow/shadow-h.gc rename to goal_src/jak1/engine/gfx/shadow/shadow-h.gc diff --git a/goal_src/engine/gfx/shadow/shadow-vu1-h.gc b/goal_src/jak1/engine/gfx/shadow/shadow-vu1-h.gc similarity index 100% rename from goal_src/engine/gfx/shadow/shadow-vu1-h.gc rename to goal_src/jak1/engine/gfx/shadow/shadow-vu1-h.gc diff --git a/goal_src/engine/gfx/shadow/shadow-vu1.gc b/goal_src/jak1/engine/gfx/shadow/shadow-vu1.gc similarity index 100% rename from goal_src/engine/gfx/shadow/shadow-vu1.gc rename to goal_src/jak1/engine/gfx/shadow/shadow-vu1.gc diff --git a/goal_src/engine/gfx/shadow/shadow.gc b/goal_src/jak1/engine/gfx/shadow/shadow.gc similarity index 100% rename from goal_src/engine/gfx/shadow/shadow.gc rename to goal_src/jak1/engine/gfx/shadow/shadow.gc diff --git a/goal_src/engine/gfx/shrub/shrub-work.gc b/goal_src/jak1/engine/gfx/shrub/shrub-work.gc similarity index 100% rename from goal_src/engine/gfx/shrub/shrub-work.gc rename to goal_src/jak1/engine/gfx/shrub/shrub-work.gc diff --git a/goal_src/engine/gfx/shrub/shrubbery-h.gc b/goal_src/jak1/engine/gfx/shrub/shrubbery-h.gc similarity index 100% rename from goal_src/engine/gfx/shrub/shrubbery-h.gc rename to goal_src/jak1/engine/gfx/shrub/shrubbery-h.gc diff --git a/goal_src/engine/gfx/shrub/shrubbery.gc b/goal_src/jak1/engine/gfx/shrub/shrubbery.gc similarity index 100% rename from goal_src/engine/gfx/shrub/shrubbery.gc rename to goal_src/jak1/engine/gfx/shrub/shrubbery.gc diff --git a/goal_src/engine/gfx/sky/sky-h.gc b/goal_src/jak1/engine/gfx/sky/sky-h.gc similarity index 100% rename from goal_src/engine/gfx/sky/sky-h.gc rename to goal_src/jak1/engine/gfx/sky/sky-h.gc diff --git a/goal_src/engine/gfx/sky/sky-tng.gc b/goal_src/jak1/engine/gfx/sky/sky-tng.gc similarity index 100% rename from goal_src/engine/gfx/sky/sky-tng.gc rename to goal_src/jak1/engine/gfx/sky/sky-tng.gc diff --git a/goal_src/engine/gfx/sky/sky-utils.gc b/goal_src/jak1/engine/gfx/sky/sky-utils.gc similarity index 100% rename from goal_src/engine/gfx/sky/sky-utils.gc rename to goal_src/jak1/engine/gfx/sky/sky-utils.gc diff --git a/goal_src/engine/gfx/sky/sky.gc b/goal_src/jak1/engine/gfx/sky/sky.gc similarity index 100% rename from goal_src/engine/gfx/sky/sky.gc rename to goal_src/jak1/engine/gfx/sky/sky.gc diff --git a/goal_src/engine/gfx/sprite/sprite-distort.gc b/goal_src/jak1/engine/gfx/sprite/sprite-distort.gc similarity index 100% rename from goal_src/engine/gfx/sprite/sprite-distort.gc rename to goal_src/jak1/engine/gfx/sprite/sprite-distort.gc diff --git a/goal_src/engine/gfx/sprite/sprite-h.gc b/goal_src/jak1/engine/gfx/sprite/sprite-h.gc similarity index 100% rename from goal_src/engine/gfx/sprite/sprite-h.gc rename to goal_src/jak1/engine/gfx/sprite/sprite-h.gc diff --git a/goal_src/engine/gfx/sprite/sprite.gc b/goal_src/jak1/engine/gfx/sprite/sprite.gc similarity index 100% rename from goal_src/engine/gfx/sprite/sprite.gc rename to goal_src/jak1/engine/gfx/sprite/sprite.gc diff --git a/goal_src/engine/gfx/texture-h.gc b/goal_src/jak1/engine/gfx/texture-h.gc similarity index 100% rename from goal_src/engine/gfx/texture-h.gc rename to goal_src/jak1/engine/gfx/texture-h.gc diff --git a/goal_src/engine/gfx/texture.gc b/goal_src/jak1/engine/gfx/texture.gc similarity index 100% rename from goal_src/engine/gfx/texture.gc rename to goal_src/jak1/engine/gfx/texture.gc diff --git a/goal_src/engine/gfx/tfrag/subdivide-h.gc b/goal_src/jak1/engine/gfx/tfrag/subdivide-h.gc similarity index 100% rename from goal_src/engine/gfx/tfrag/subdivide-h.gc rename to goal_src/jak1/engine/gfx/tfrag/subdivide-h.gc diff --git a/goal_src/engine/gfx/tfrag/subdivide.gc b/goal_src/jak1/engine/gfx/tfrag/subdivide.gc similarity index 100% rename from goal_src/engine/gfx/tfrag/subdivide.gc rename to goal_src/jak1/engine/gfx/tfrag/subdivide.gc diff --git a/goal_src/engine/gfx/tfrag/tfrag-h.gc b/goal_src/jak1/engine/gfx/tfrag/tfrag-h.gc similarity index 100% rename from goal_src/engine/gfx/tfrag/tfrag-h.gc rename to goal_src/jak1/engine/gfx/tfrag/tfrag-h.gc diff --git a/goal_src/engine/gfx/tfrag/tfrag-methods.gc b/goal_src/jak1/engine/gfx/tfrag/tfrag-methods.gc similarity index 100% rename from goal_src/engine/gfx/tfrag/tfrag-methods.gc rename to goal_src/jak1/engine/gfx/tfrag/tfrag-methods.gc diff --git a/goal_src/engine/gfx/tfrag/tfrag-near.gc b/goal_src/jak1/engine/gfx/tfrag/tfrag-near.gc similarity index 100% rename from goal_src/engine/gfx/tfrag/tfrag-near.gc rename to goal_src/jak1/engine/gfx/tfrag/tfrag-near.gc diff --git a/goal_src/engine/gfx/tfrag/tfrag-work.gc b/goal_src/jak1/engine/gfx/tfrag/tfrag-work.gc similarity index 100% rename from goal_src/engine/gfx/tfrag/tfrag-work.gc rename to goal_src/jak1/engine/gfx/tfrag/tfrag-work.gc diff --git a/goal_src/engine/gfx/tfrag/tfrag.gc b/goal_src/jak1/engine/gfx/tfrag/tfrag.gc similarity index 100% rename from goal_src/engine/gfx/tfrag/tfrag.gc rename to goal_src/jak1/engine/gfx/tfrag/tfrag.gc diff --git a/goal_src/engine/gfx/tie/generic-tie-h.gc b/goal_src/jak1/engine/gfx/tie/generic-tie-h.gc similarity index 100% rename from goal_src/engine/gfx/tie/generic-tie-h.gc rename to goal_src/jak1/engine/gfx/tie/generic-tie-h.gc diff --git a/goal_src/engine/gfx/tie/prototype-h.gc b/goal_src/jak1/engine/gfx/tie/prototype-h.gc similarity index 100% rename from goal_src/engine/gfx/tie/prototype-h.gc rename to goal_src/jak1/engine/gfx/tie/prototype-h.gc diff --git a/goal_src/engine/gfx/tie/prototype.gc b/goal_src/jak1/engine/gfx/tie/prototype.gc similarity index 100% rename from goal_src/engine/gfx/tie/prototype.gc rename to goal_src/jak1/engine/gfx/tie/prototype.gc diff --git a/goal_src/engine/gfx/tie/tie-h.gc b/goal_src/jak1/engine/gfx/tie/tie-h.gc similarity index 100% rename from goal_src/engine/gfx/tie/tie-h.gc rename to goal_src/jak1/engine/gfx/tie/tie-h.gc diff --git a/goal_src/engine/gfx/tie/tie-methods.gc b/goal_src/jak1/engine/gfx/tie/tie-methods.gc similarity index 100% rename from goal_src/engine/gfx/tie/tie-methods.gc rename to goal_src/jak1/engine/gfx/tie/tie-methods.gc diff --git a/goal_src/engine/gfx/tie/tie-near.gc b/goal_src/jak1/engine/gfx/tie/tie-near.gc similarity index 100% rename from goal_src/engine/gfx/tie/tie-near.gc rename to goal_src/jak1/engine/gfx/tie/tie-near.gc diff --git a/goal_src/engine/gfx/tie/tie-work.gc b/goal_src/jak1/engine/gfx/tie/tie-work.gc similarity index 100% rename from goal_src/engine/gfx/tie/tie-work.gc rename to goal_src/jak1/engine/gfx/tie/tie-work.gc diff --git a/goal_src/engine/gfx/tie/tie.gc b/goal_src/jak1/engine/gfx/tie/tie.gc similarity index 100% rename from goal_src/engine/gfx/tie/tie.gc rename to goal_src/jak1/engine/gfx/tie/tie.gc diff --git a/goal_src/engine/gfx/time-of-day-h.gc b/goal_src/jak1/engine/gfx/time-of-day-h.gc similarity index 100% rename from goal_src/engine/gfx/time-of-day-h.gc rename to goal_src/jak1/engine/gfx/time-of-day-h.gc diff --git a/goal_src/engine/gfx/time-of-day.gc b/goal_src/jak1/engine/gfx/time-of-day.gc similarity index 100% rename from goal_src/engine/gfx/time-of-day.gc rename to goal_src/jak1/engine/gfx/time-of-day.gc diff --git a/goal_src/engine/gfx/vis/bsp-h.gc b/goal_src/jak1/engine/gfx/vis/bsp-h.gc similarity index 100% rename from goal_src/engine/gfx/vis/bsp-h.gc rename to goal_src/jak1/engine/gfx/vis/bsp-h.gc diff --git a/goal_src/engine/gfx/vis/bsp.gc b/goal_src/jak1/engine/gfx/vis/bsp.gc similarity index 100% rename from goal_src/engine/gfx/vis/bsp.gc rename to goal_src/jak1/engine/gfx/vis/bsp.gc diff --git a/goal_src/engine/gfx/water/water-h.gc b/goal_src/jak1/engine/gfx/water/water-h.gc similarity index 100% rename from goal_src/engine/gfx/water/water-h.gc rename to goal_src/jak1/engine/gfx/water/water-h.gc diff --git a/goal_src/engine/gfx/water/water.gc b/goal_src/jak1/engine/gfx/water/water.gc similarity index 100% rename from goal_src/engine/gfx/water/water.gc rename to goal_src/jak1/engine/gfx/water/water.gc diff --git a/goal_src/engine/gfx/wind-h.gc b/goal_src/jak1/engine/gfx/wind-h.gc similarity index 100% rename from goal_src/engine/gfx/wind-h.gc rename to goal_src/jak1/engine/gfx/wind-h.gc diff --git a/goal_src/engine/gfx/wind.gc b/goal_src/jak1/engine/gfx/wind.gc similarity index 100% rename from goal_src/engine/gfx/wind.gc rename to goal_src/jak1/engine/gfx/wind.gc diff --git a/goal_src/engine/level/level-h.gc b/goal_src/jak1/engine/level/level-h.gc similarity index 100% rename from goal_src/engine/level/level-h.gc rename to goal_src/jak1/engine/level/level-h.gc diff --git a/goal_src/engine/level/level-info.gc b/goal_src/jak1/engine/level/level-info.gc similarity index 100% rename from goal_src/engine/level/level-info.gc rename to goal_src/jak1/engine/level/level-info.gc diff --git a/goal_src/engine/level/level.gc b/goal_src/jak1/engine/level/level.gc similarity index 100% rename from goal_src/engine/level/level.gc rename to goal_src/jak1/engine/level/level.gc diff --git a/goal_src/engine/level/load-boundary-data.gc b/goal_src/jak1/engine/level/load-boundary-data.gc similarity index 100% rename from goal_src/engine/level/load-boundary-data.gc rename to goal_src/jak1/engine/level/load-boundary-data.gc diff --git a/goal_src/engine/level/load-boundary-h.gc b/goal_src/jak1/engine/level/load-boundary-h.gc similarity index 100% rename from goal_src/engine/level/load-boundary-h.gc rename to goal_src/jak1/engine/level/load-boundary-h.gc diff --git a/goal_src/engine/level/load-boundary.gc b/goal_src/jak1/engine/level/load-boundary.gc similarity index 100% rename from goal_src/engine/level/load-boundary.gc rename to goal_src/jak1/engine/level/load-boundary.gc diff --git a/goal_src/engine/load/decomp.gc b/goal_src/jak1/engine/load/decomp.gc similarity index 100% rename from goal_src/engine/load/decomp.gc rename to goal_src/jak1/engine/load/decomp.gc diff --git a/goal_src/engine/load/file-io.gc b/goal_src/jak1/engine/load/file-io.gc similarity index 100% rename from goal_src/engine/load/file-io.gc rename to goal_src/jak1/engine/load/file-io.gc diff --git a/goal_src/engine/load/load-dgo.gc b/goal_src/jak1/engine/load/load-dgo.gc similarity index 100% rename from goal_src/engine/load/load-dgo.gc rename to goal_src/jak1/engine/load/load-dgo.gc diff --git a/goal_src/engine/load/loader-h.gc b/goal_src/jak1/engine/load/loader-h.gc similarity index 100% rename from goal_src/engine/load/loader-h.gc rename to goal_src/jak1/engine/load/loader-h.gc diff --git a/goal_src/engine/load/loader.gc b/goal_src/jak1/engine/load/loader.gc similarity index 100% rename from goal_src/engine/load/loader.gc rename to goal_src/jak1/engine/load/loader.gc diff --git a/goal_src/engine/load/ramdisk.gc b/goal_src/jak1/engine/load/ramdisk.gc similarity index 100% rename from goal_src/engine/load/ramdisk.gc rename to goal_src/jak1/engine/load/ramdisk.gc diff --git a/goal_src/engine/math/euler-h.gc b/goal_src/jak1/engine/math/euler-h.gc similarity index 100% rename from goal_src/engine/math/euler-h.gc rename to goal_src/jak1/engine/math/euler-h.gc diff --git a/goal_src/engine/math/euler.gc b/goal_src/jak1/engine/math/euler.gc similarity index 100% rename from goal_src/engine/math/euler.gc rename to goal_src/jak1/engine/math/euler.gc diff --git a/goal_src/engine/math/math.gc b/goal_src/jak1/engine/math/math.gc similarity index 100% rename from goal_src/engine/math/math.gc rename to goal_src/jak1/engine/math/math.gc diff --git a/goal_src/engine/math/matrix-h.gc b/goal_src/jak1/engine/math/matrix-h.gc similarity index 100% rename from goal_src/engine/math/matrix-h.gc rename to goal_src/jak1/engine/math/matrix-h.gc diff --git a/goal_src/engine/math/matrix.gc b/goal_src/jak1/engine/math/matrix.gc similarity index 100% rename from goal_src/engine/math/matrix.gc rename to goal_src/jak1/engine/math/matrix.gc diff --git a/goal_src/engine/math/quaternion-h.gc b/goal_src/jak1/engine/math/quaternion-h.gc similarity index 100% rename from goal_src/engine/math/quaternion-h.gc rename to goal_src/jak1/engine/math/quaternion-h.gc diff --git a/goal_src/engine/math/quaternion.gc b/goal_src/jak1/engine/math/quaternion.gc similarity index 100% rename from goal_src/engine/math/quaternion.gc rename to goal_src/jak1/engine/math/quaternion.gc diff --git a/goal_src/engine/math/transform-h.gc b/goal_src/jak1/engine/math/transform-h.gc similarity index 100% rename from goal_src/engine/math/transform-h.gc rename to goal_src/jak1/engine/math/transform-h.gc diff --git a/goal_src/engine/math/transform.gc b/goal_src/jak1/engine/math/transform.gc similarity index 100% rename from goal_src/engine/math/transform.gc rename to goal_src/jak1/engine/math/transform.gc diff --git a/goal_src/engine/math/transformq-h.gc b/goal_src/jak1/engine/math/transformq-h.gc similarity index 100% rename from goal_src/engine/math/transformq-h.gc rename to goal_src/jak1/engine/math/transformq-h.gc diff --git a/goal_src/engine/math/transformq.gc b/goal_src/jak1/engine/math/transformq.gc similarity index 100% rename from goal_src/engine/math/transformq.gc rename to goal_src/jak1/engine/math/transformq.gc diff --git a/goal_src/engine/math/trigonometry-h.gc b/goal_src/jak1/engine/math/trigonometry-h.gc similarity index 100% rename from goal_src/engine/math/trigonometry-h.gc rename to goal_src/jak1/engine/math/trigonometry-h.gc diff --git a/goal_src/engine/math/trigonometry.gc b/goal_src/jak1/engine/math/trigonometry.gc similarity index 100% rename from goal_src/engine/math/trigonometry.gc rename to goal_src/jak1/engine/math/trigonometry.gc diff --git a/goal_src/engine/math/vector-h.gc b/goal_src/jak1/engine/math/vector-h.gc similarity index 100% rename from goal_src/engine/math/vector-h.gc rename to goal_src/jak1/engine/math/vector-h.gc diff --git a/goal_src/engine/math/vector.gc b/goal_src/jak1/engine/math/vector.gc similarity index 100% rename from goal_src/engine/math/vector.gc rename to goal_src/jak1/engine/math/vector.gc diff --git a/goal_src/engine/nav/navigate-h.gc b/goal_src/jak1/engine/nav/navigate-h.gc similarity index 100% rename from goal_src/engine/nav/navigate-h.gc rename to goal_src/jak1/engine/nav/navigate-h.gc diff --git a/goal_src/engine/nav/navigate.gc b/goal_src/jak1/engine/nav/navigate.gc similarity index 100% rename from goal_src/engine/nav/navigate.gc rename to goal_src/jak1/engine/nav/navigate.gc diff --git a/goal_src/engine/nav/path-h.gc b/goal_src/jak1/engine/nav/path-h.gc similarity index 100% rename from goal_src/engine/nav/path-h.gc rename to goal_src/jak1/engine/nav/path-h.gc diff --git a/goal_src/engine/nav/path.gc b/goal_src/jak1/engine/nav/path.gc similarity index 100% rename from goal_src/engine/nav/path.gc rename to goal_src/jak1/engine/nav/path.gc diff --git a/goal_src/engine/physics/dynamics-h.gc b/goal_src/jak1/engine/physics/dynamics-h.gc similarity index 100% rename from goal_src/engine/physics/dynamics-h.gc rename to goal_src/jak1/engine/physics/dynamics-h.gc diff --git a/goal_src/engine/physics/gravity-h.gc b/goal_src/jak1/engine/physics/gravity-h.gc similarity index 100% rename from goal_src/engine/physics/gravity-h.gc rename to goal_src/jak1/engine/physics/gravity-h.gc diff --git a/goal_src/engine/physics/trajectory-h.gc b/goal_src/jak1/engine/physics/trajectory-h.gc similarity index 100% rename from goal_src/engine/physics/trajectory-h.gc rename to goal_src/jak1/engine/physics/trajectory-h.gc diff --git a/goal_src/engine/physics/trajectory.gc b/goal_src/jak1/engine/physics/trajectory.gc similarity index 100% rename from goal_src/engine/physics/trajectory.gc rename to goal_src/jak1/engine/physics/trajectory.gc diff --git a/goal_src/engine/ps2/memcard-h.gc b/goal_src/jak1/engine/ps2/memcard-h.gc similarity index 100% rename from goal_src/engine/ps2/memcard-h.gc rename to goal_src/jak1/engine/ps2/memcard-h.gc diff --git a/goal_src/engine/ps2/pad.gc b/goal_src/jak1/engine/ps2/pad.gc similarity index 100% rename from goal_src/engine/ps2/pad.gc rename to goal_src/jak1/engine/ps2/pad.gc diff --git a/goal_src/engine/ps2/rpc-h.gc b/goal_src/jak1/engine/ps2/rpc-h.gc similarity index 100% rename from goal_src/engine/ps2/rpc-h.gc rename to goal_src/jak1/engine/ps2/rpc-h.gc diff --git a/goal_src/engine/ps2/timer-h.gc b/goal_src/jak1/engine/ps2/timer-h.gc similarity index 100% rename from goal_src/engine/ps2/timer-h.gc rename to goal_src/jak1/engine/ps2/timer-h.gc diff --git a/goal_src/engine/ps2/timer.gc b/goal_src/jak1/engine/ps2/timer.gc similarity index 100% rename from goal_src/engine/ps2/timer.gc rename to goal_src/jak1/engine/ps2/timer.gc diff --git a/goal_src/engine/ps2/vif-h.gc b/goal_src/jak1/engine/ps2/vif-h.gc similarity index 100% rename from goal_src/engine/ps2/vif-h.gc rename to goal_src/jak1/engine/ps2/vif-h.gc diff --git a/goal_src/engine/ps2/vu1-macros.gc b/goal_src/jak1/engine/ps2/vu1-macros.gc similarity index 100% rename from goal_src/engine/ps2/vu1-macros.gc rename to goal_src/jak1/engine/ps2/vu1-macros.gc diff --git a/goal_src/engine/sound/gsound-h.gc b/goal_src/jak1/engine/sound/gsound-h.gc similarity index 100% rename from goal_src/engine/sound/gsound-h.gc rename to goal_src/jak1/engine/sound/gsound-h.gc diff --git a/goal_src/engine/sound/gsound.gc b/goal_src/jak1/engine/sound/gsound.gc similarity index 100% rename from goal_src/engine/sound/gsound.gc rename to goal_src/jak1/engine/sound/gsound.gc diff --git a/goal_src/engine/sparticle/sparticle-h.gc b/goal_src/jak1/engine/sparticle/sparticle-h.gc similarity index 100% rename from goal_src/engine/sparticle/sparticle-h.gc rename to goal_src/jak1/engine/sparticle/sparticle-h.gc diff --git a/goal_src/engine/sparticle/sparticle-launcher-h.gc b/goal_src/jak1/engine/sparticle/sparticle-launcher-h.gc similarity index 100% rename from goal_src/engine/sparticle/sparticle-launcher-h.gc rename to goal_src/jak1/engine/sparticle/sparticle-launcher-h.gc diff --git a/goal_src/engine/sparticle/sparticle-launcher.gc b/goal_src/jak1/engine/sparticle/sparticle-launcher.gc similarity index 100% rename from goal_src/engine/sparticle/sparticle-launcher.gc rename to goal_src/jak1/engine/sparticle/sparticle-launcher.gc diff --git a/goal_src/engine/sparticle/sparticle.gc b/goal_src/jak1/engine/sparticle/sparticle.gc similarity index 100% rename from goal_src/engine/sparticle/sparticle.gc rename to goal_src/jak1/engine/sparticle/sparticle.gc diff --git a/goal_src/engine/target/joint-mod-h.gc b/goal_src/jak1/engine/target/joint-mod-h.gc similarity index 100% rename from goal_src/engine/target/joint-mod-h.gc rename to goal_src/jak1/engine/target/joint-mod-h.gc diff --git a/goal_src/engine/target/logic-target.gc b/goal_src/jak1/engine/target/logic-target.gc similarity index 100% rename from goal_src/engine/target/logic-target.gc rename to goal_src/jak1/engine/target/logic-target.gc diff --git a/goal_src/engine/target/pat-h.gc b/goal_src/jak1/engine/target/pat-h.gc similarity index 100% rename from goal_src/engine/target/pat-h.gc rename to goal_src/jak1/engine/target/pat-h.gc diff --git a/goal_src/engine/target/sidekick.gc b/goal_src/jak1/engine/target/sidekick.gc similarity index 99% rename from goal_src/engine/target/sidekick.gc rename to goal_src/jak1/engine/target/sidekick.gc index 5d1344be3b..8eec9b5b38 100644 --- a/goal_src/engine/target/sidekick.gc +++ b/goal_src/jak1/engine/target/sidekick.gc @@ -9,7 +9,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/sidekick-ag.gc") +(import "goal_src/jak1/import/sidekick-ag.gc") (define *sidekick-remap* '(("run-to-stance-left" "run-to-stance") ("run-to-stance-loop-left" "run-to-stance-loop") diff --git a/goal_src/engine/target/surface-h.gc b/goal_src/jak1/engine/target/surface-h.gc similarity index 100% rename from goal_src/engine/target/surface-h.gc rename to goal_src/jak1/engine/target/surface-h.gc diff --git a/goal_src/engine/target/target-death.gc b/goal_src/jak1/engine/target/target-death.gc similarity index 99% rename from goal_src/engine/target/target-death.gc rename to goal_src/jak1/engine/target/target-death.gc index 837d1cb9a2..34038d1514 100644 --- a/goal_src/engine/target/target-death.gc +++ b/goal_src/jak1/engine/target/target-death.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/deathcam-ag.gc") +(import "goal_src/jak1/import/deathcam-ag.gc") (defskelgroup *deathcam-sg* deathcam deathcam-lod0-jg deathcam-idle-ja ((deathcam-lod0-mg (meters 999999))) diff --git a/goal_src/engine/target/target-h.gc b/goal_src/jak1/engine/target/target-h.gc similarity index 100% rename from goal_src/engine/target/target-h.gc rename to goal_src/jak1/engine/target/target-h.gc diff --git a/goal_src/engine/target/target-handler.gc b/goal_src/jak1/engine/target/target-handler.gc similarity index 100% rename from goal_src/engine/target/target-handler.gc rename to goal_src/jak1/engine/target/target-handler.gc diff --git a/goal_src/engine/target/target-part.gc b/goal_src/jak1/engine/target/target-part.gc similarity index 100% rename from goal_src/engine/target/target-part.gc rename to goal_src/jak1/engine/target/target-part.gc diff --git a/goal_src/engine/target/target-util.gc b/goal_src/jak1/engine/target/target-util.gc similarity index 99% rename from goal_src/engine/target/target-util.gc rename to goal_src/jak1/engine/target/target-util.gc index 9ce84022e8..fe58f3cbef 100644 --- a/goal_src/engine/target/target-util.gc +++ b/goal_src/jak1/engine/target/target-util.gc @@ -9,7 +9,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/eichar-ag.gc") +(import "goal_src/jak1/import/eichar-ag.gc") (defskelgroup *jchar-sg* eichar eichar-lod0-jg -1 ((eichar-lod0-mg (meters 999999))) diff --git a/goal_src/engine/target/target.gc b/goal_src/jak1/engine/target/target.gc similarity index 100% rename from goal_src/engine/target/target.gc rename to goal_src/jak1/engine/target/target.gc diff --git a/goal_src/engine/target/target2.gc b/goal_src/jak1/engine/target/target2.gc similarity index 100% rename from goal_src/engine/target/target2.gc rename to goal_src/jak1/engine/target/target2.gc diff --git a/goal_src/engine/ui/credits.gc b/goal_src/jak1/engine/ui/credits.gc similarity index 100% rename from goal_src/engine/ui/credits.gc rename to goal_src/jak1/engine/ui/credits.gc diff --git a/goal_src/engine/ui/hud-classes.gc b/goal_src/jak1/engine/ui/hud-classes.gc similarity index 99% rename from goal_src/engine/ui/hud-classes.gc rename to goal_src/jak1/engine/ui/hud-classes.gc index 5cde804efa..a81df8b930 100644 --- a/goal_src/engine/ui/hud-classes.gc +++ b/goal_src/jak1/engine/ui/hud-classes.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/fuelcell-naked-ag.gc") +(import "goal_src/jak1/import/fuelcell-naked-ag.gc") (defpartgroup group-part-hud-pickup :id 75 diff --git a/goal_src/engine/ui/hud-h.gc b/goal_src/jak1/engine/ui/hud-h.gc similarity index 100% rename from goal_src/engine/ui/hud-h.gc rename to goal_src/jak1/engine/ui/hud-h.gc diff --git a/goal_src/engine/ui/hud.gc b/goal_src/jak1/engine/ui/hud.gc similarity index 100% rename from goal_src/engine/ui/hud.gc rename to goal_src/jak1/engine/ui/hud.gc diff --git a/goal_src/engine/ui/progress-h.gc b/goal_src/jak1/engine/ui/progress-h.gc similarity index 100% rename from goal_src/engine/ui/progress-h.gc rename to goal_src/jak1/engine/ui/progress-h.gc diff --git a/goal_src/engine/ui/progress/progress-draw.gc b/goal_src/jak1/engine/ui/progress/progress-draw.gc similarity index 100% rename from goal_src/engine/ui/progress/progress-draw.gc rename to goal_src/jak1/engine/ui/progress/progress-draw.gc diff --git a/goal_src/engine/ui/progress/progress-part.gc b/goal_src/jak1/engine/ui/progress/progress-part.gc similarity index 100% rename from goal_src/engine/ui/progress/progress-part.gc rename to goal_src/jak1/engine/ui/progress/progress-part.gc diff --git a/goal_src/engine/ui/progress/progress-static.gc b/goal_src/jak1/engine/ui/progress/progress-static.gc similarity index 100% rename from goal_src/engine/ui/progress/progress-static.gc rename to goal_src/jak1/engine/ui/progress/progress-static.gc diff --git a/goal_src/engine/ui/progress/progress.gc b/goal_src/jak1/engine/ui/progress/progress.gc similarity index 100% rename from goal_src/engine/ui/progress/progress.gc rename to goal_src/jak1/engine/ui/progress/progress.gc diff --git a/goal_src/engine/ui/text-h.gc b/goal_src/jak1/engine/ui/text-h.gc similarity index 100% rename from goal_src/engine/ui/text-h.gc rename to goal_src/jak1/engine/ui/text-h.gc diff --git a/goal_src/engine/ui/text.gc b/goal_src/jak1/engine/ui/text.gc similarity index 100% rename from goal_src/engine/ui/text.gc rename to goal_src/jak1/engine/ui/text.gc diff --git a/goal_src/engine/util/glist-h.gc b/goal_src/jak1/engine/util/glist-h.gc similarity index 100% rename from goal_src/engine/util/glist-h.gc rename to goal_src/jak1/engine/util/glist-h.gc diff --git a/goal_src/engine/util/glist.gc b/goal_src/jak1/engine/util/glist.gc similarity index 100% rename from goal_src/engine/util/glist.gc rename to goal_src/jak1/engine/util/glist.gc diff --git a/goal_src/engine/util/smush-control-h.gc b/goal_src/jak1/engine/util/smush-control-h.gc similarity index 100% rename from goal_src/engine/util/smush-control-h.gc rename to goal_src/jak1/engine/util/smush-control-h.gc diff --git a/goal_src/engine/util/sync-info-h.gc b/goal_src/jak1/engine/util/sync-info-h.gc similarity index 100% rename from goal_src/engine/util/sync-info-h.gc rename to goal_src/jak1/engine/util/sync-info-h.gc diff --git a/goal_src/engine/util/sync-info.gc b/goal_src/jak1/engine/util/sync-info.gc similarity index 100% rename from goal_src/engine/util/sync-info.gc rename to goal_src/jak1/engine/util/sync-info.gc diff --git a/goal_src/engine/util/types-h.gc b/goal_src/jak1/engine/util/types-h.gc similarity index 100% rename from goal_src/engine/util/types-h.gc rename to goal_src/jak1/engine/util/types-h.gc diff --git a/goal_src/examples/debug-collide.gc b/goal_src/jak1/examples/debug-collide.gc similarity index 100% rename from goal_src/examples/debug-collide.gc rename to goal_src/jak1/examples/debug-collide.gc diff --git a/goal_src/examples/debug-draw-example.gc b/goal_src/jak1/examples/debug-draw-example.gc similarity index 100% rename from goal_src/examples/debug-draw-example.gc rename to goal_src/jak1/examples/debug-draw-example.gc diff --git a/goal_src/examples/debug-sprite.gc b/goal_src/jak1/examples/debug-sprite.gc similarity index 100% rename from goal_src/examples/debug-sprite.gc rename to goal_src/jak1/examples/debug-sprite.gc diff --git a/goal_src/examples/display-all-colors.gc b/goal_src/jak1/examples/display-all-colors.gc similarity index 100% rename from goal_src/examples/display-all-colors.gc rename to goal_src/jak1/examples/display-all-colors.gc diff --git a/goal_src/game.gp b/goal_src/jak1/game.gp similarity index 99% rename from goal_src/game.gp rename to goal_src/jak1/game.gp index 434554a9a3..ff1e6067b7 100644 --- a/goal_src/game.gp +++ b/goal_src/jak1/game.gp @@ -54,7 +54,7 @@ "Add a GOAL source file with the given dependencies" `(let ((output-file ,(gc-file->o-file src-file))) (set! *all-gc* (cons output-file *all-gc*)) - (defstep :in ,(string-append "goal_src/" src-file) + (defstep :in ,(string-append "goal_src/jak1/" src-file) ;; use goal compiler :tool 'goalc ;; will output the obj file @@ -69,7 +69,7 @@ "Helper for goal-src-sequence" `(let ((output-file ,(gc-file->o-file current))) (set! *all-gc* (cons output-file *all-gc*)) - (defstep :in ,(string-append "goal_src/" prefix current) + (defstep :in ,(string-append "goal_src/jak1/" prefix current) :tool 'goalc :out (list output-file) :dep '(,(gc-file->o-file previous)) @@ -115,9 +115,9 @@ ) (defun cgo (output-name desc-file-name) - "Add a CGO with the given output name (in out/iso) and input name (in goal_src/dgos)" + "Add a CGO with the given output name (in out/iso) and input name (in goal_src/jak1/dgos)" (let ((out-name (string-append "out/iso/" output-name))) - (defstep :in (string-append "goal_src/dgos/" desc-file-name) + (defstep :in (string-append "goal_src/jak1/dgos/" desc-file-name) :tool 'dgo :out `(,out-name) ) diff --git a/goal_src/import/accordian-ag.gc b/goal_src/jak1/import/accordian-ag.gc similarity index 100% rename from goal_src/import/accordian-ag.gc rename to goal_src/jak1/import/accordian-ag.gc diff --git a/goal_src/import/allpontoons-ag.gc b/goal_src/jak1/import/allpontoons-ag.gc similarity index 100% rename from goal_src/import/allpontoons-ag.gc rename to goal_src/jak1/import/allpontoons-ag.gc diff --git a/goal_src/import/aphid-lurker-ag.gc b/goal_src/jak1/import/aphid-lurker-ag.gc similarity index 100% rename from goal_src/import/aphid-lurker-ag.gc rename to goal_src/jak1/import/aphid-lurker-ag.gc diff --git a/goal_src/import/assistant-ag.gc b/goal_src/jak1/import/assistant-ag.gc similarity index 100% rename from goal_src/import/assistant-ag.gc rename to goal_src/jak1/import/assistant-ag.gc diff --git a/goal_src/import/assistant-firecanyon-ag.gc b/goal_src/jak1/import/assistant-firecanyon-ag.gc similarity index 100% rename from goal_src/import/assistant-firecanyon-ag.gc rename to goal_src/jak1/import/assistant-firecanyon-ag.gc diff --git a/goal_src/import/assistant-lavatube-end-ag.gc b/goal_src/jak1/import/assistant-lavatube-end-ag.gc similarity index 100% rename from goal_src/import/assistant-lavatube-end-ag.gc rename to goal_src/jak1/import/assistant-lavatube-end-ag.gc diff --git a/goal_src/import/assistant-lavatube-start-ag.gc b/goal_src/jak1/import/assistant-lavatube-start-ag.gc similarity index 100% rename from goal_src/import/assistant-lavatube-start-ag.gc rename to goal_src/jak1/import/assistant-lavatube-start-ag.gc diff --git a/goal_src/import/assistant-village2-ag.gc b/goal_src/jak1/import/assistant-village2-ag.gc similarity index 100% rename from goal_src/import/assistant-village2-ag.gc rename to goal_src/jak1/import/assistant-village2-ag.gc diff --git a/goal_src/import/assistant-village3-ag.gc b/goal_src/jak1/import/assistant-village3-ag.gc similarity index 100% rename from goal_src/import/assistant-village3-ag.gc rename to goal_src/jak1/import/assistant-village3-ag.gc diff --git a/goal_src/import/babak-ag.gc b/goal_src/jak1/import/babak-ag.gc similarity index 100% rename from goal_src/import/babak-ag.gc rename to goal_src/jak1/import/babak-ag.gc diff --git a/goal_src/import/baby-spider-ag.gc b/goal_src/jak1/import/baby-spider-ag.gc similarity index 100% rename from goal_src/import/baby-spider-ag.gc rename to goal_src/jak1/import/baby-spider-ag.gc diff --git a/goal_src/import/balance-plat-ag.gc b/goal_src/jak1/import/balance-plat-ag.gc similarity index 100% rename from goal_src/import/balance-plat-ag.gc rename to goal_src/jak1/import/balance-plat-ag.gc diff --git a/goal_src/import/balloon-ag.gc b/goal_src/jak1/import/balloon-ag.gc similarity index 100% rename from goal_src/import/balloon-ag.gc rename to goal_src/jak1/import/balloon-ag.gc diff --git a/goal_src/import/balloonlurker-ag.gc b/goal_src/jak1/import/balloonlurker-ag.gc similarity index 100% rename from goal_src/import/balloonlurker-ag.gc rename to goal_src/jak1/import/balloonlurker-ag.gc diff --git a/goal_src/import/barrel-ag.gc b/goal_src/jak1/import/barrel-ag.gc similarity index 100% rename from goal_src/import/barrel-ag.gc rename to goal_src/jak1/import/barrel-ag.gc diff --git a/goal_src/import/beachcam-ag.gc b/goal_src/jak1/import/beachcam-ag.gc similarity index 100% rename from goal_src/import/beachcam-ag.gc rename to goal_src/jak1/import/beachcam-ag.gc diff --git a/goal_src/import/billy-ag.gc b/goal_src/jak1/import/billy-ag.gc similarity index 100% rename from goal_src/import/billy-ag.gc rename to goal_src/jak1/import/billy-ag.gc diff --git a/goal_src/import/billy-sidekick-ag.gc b/goal_src/jak1/import/billy-sidekick-ag.gc similarity index 100% rename from goal_src/import/billy-sidekick-ag.gc rename to goal_src/jak1/import/billy-sidekick-ag.gc diff --git a/goal_src/import/bird-lady-ag.gc b/goal_src/jak1/import/bird-lady-ag.gc similarity index 100% rename from goal_src/import/bird-lady-ag.gc rename to goal_src/jak1/import/bird-lady-ag.gc diff --git a/goal_src/import/bird-lady-beach-ag.gc b/goal_src/jak1/import/bird-lady-beach-ag.gc similarity index 100% rename from goal_src/import/bird-lady-beach-ag.gc rename to goal_src/jak1/import/bird-lady-beach-ag.gc diff --git a/goal_src/import/bladeassm-ag.gc b/goal_src/jak1/import/bladeassm-ag.gc similarity index 100% rename from goal_src/import/bladeassm-ag.gc rename to goal_src/jak1/import/bladeassm-ag.gc diff --git a/goal_src/import/blue-eco-charger-ag.gc b/goal_src/jak1/import/blue-eco-charger-ag.gc similarity index 100% rename from goal_src/import/blue-eco-charger-ag.gc rename to goal_src/jak1/import/blue-eco-charger-ag.gc diff --git a/goal_src/import/blue-eco-charger-orb-ag.gc b/goal_src/jak1/import/blue-eco-charger-orb-ag.gc similarity index 100% rename from goal_src/import/blue-eco-charger-orb-ag.gc rename to goal_src/jak1/import/blue-eco-charger-orb-ag.gc diff --git a/goal_src/import/bluesage-ag.gc b/goal_src/jak1/import/bluesage-ag.gc similarity index 100% rename from goal_src/import/bluesage-ag.gc rename to goal_src/jak1/import/bluesage-ag.gc diff --git a/goal_src/import/boatpaddle-ag.gc b/goal_src/jak1/import/boatpaddle-ag.gc similarity index 100% rename from goal_src/import/boatpaddle-ag.gc rename to goal_src/jak1/import/boatpaddle-ag.gc diff --git a/goal_src/import/bonelurker-ag.gc b/goal_src/jak1/import/bonelurker-ag.gc similarity index 100% rename from goal_src/import/bonelurker-ag.gc rename to goal_src/jak1/import/bonelurker-ag.gc diff --git a/goal_src/import/bounceytarp-ag.gc b/goal_src/jak1/import/bounceytarp-ag.gc similarity index 100% rename from goal_src/import/bounceytarp-ag.gc rename to goal_src/jak1/import/bounceytarp-ag.gc diff --git a/goal_src/import/breakaway-left-ag.gc b/goal_src/jak1/import/breakaway-left-ag.gc similarity index 100% rename from goal_src/import/breakaway-left-ag.gc rename to goal_src/jak1/import/breakaway-left-ag.gc diff --git a/goal_src/import/breakaway-mid-ag.gc b/goal_src/jak1/import/breakaway-mid-ag.gc similarity index 100% rename from goal_src/import/breakaway-mid-ag.gc rename to goal_src/jak1/import/breakaway-mid-ag.gc diff --git a/goal_src/import/breakaway-right-ag.gc b/goal_src/jak1/import/breakaway-right-ag.gc similarity index 100% rename from goal_src/import/breakaway-right-ag.gc rename to goal_src/jak1/import/breakaway-right-ag.gc diff --git a/goal_src/import/bully-ag.gc b/goal_src/jak1/import/bully-ag.gc similarity index 100% rename from goal_src/import/bully-ag.gc rename to goal_src/jak1/import/bully-ag.gc diff --git a/goal_src/import/buzzer-ag.gc b/goal_src/jak1/import/buzzer-ag.gc similarity index 100% rename from goal_src/import/buzzer-ag.gc rename to goal_src/jak1/import/buzzer-ag.gc diff --git a/goal_src/import/catch-fisha-ag.gc b/goal_src/jak1/import/catch-fisha-ag.gc similarity index 100% rename from goal_src/import/catch-fisha-ag.gc rename to goal_src/jak1/import/catch-fisha-ag.gc diff --git a/goal_src/import/catch-fishb-ag.gc b/goal_src/jak1/import/catch-fishb-ag.gc similarity index 100% rename from goal_src/import/catch-fishb-ag.gc rename to goal_src/jak1/import/catch-fishb-ag.gc diff --git a/goal_src/import/catch-fishc-ag.gc b/goal_src/jak1/import/catch-fishc-ag.gc similarity index 100% rename from goal_src/import/catch-fishc-ag.gc rename to goal_src/jak1/import/catch-fishc-ag.gc diff --git a/goal_src/import/cavecrusher-ag.gc b/goal_src/jak1/import/cavecrusher-ag.gc similarity index 100% rename from goal_src/import/cavecrusher-ag.gc rename to goal_src/jak1/import/cavecrusher-ag.gc diff --git a/goal_src/import/cavecrystal-ag.gc b/goal_src/jak1/import/cavecrystal-ag.gc similarity index 100% rename from goal_src/import/cavecrystal-ag.gc rename to goal_src/jak1/import/cavecrystal-ag.gc diff --git a/goal_src/import/caveelevator-ag.gc b/goal_src/jak1/import/caveelevator-ag.gc similarity index 100% rename from goal_src/import/caveelevator-ag.gc rename to goal_src/jak1/import/caveelevator-ag.gc diff --git a/goal_src/import/cavegem-ag.gc b/goal_src/jak1/import/cavegem-ag.gc similarity index 100% rename from goal_src/import/cavegem-ag.gc rename to goal_src/jak1/import/cavegem-ag.gc diff --git a/goal_src/import/cavespatula-darkcave-ag.gc b/goal_src/jak1/import/cavespatula-darkcave-ag.gc similarity index 100% rename from goal_src/import/cavespatula-darkcave-ag.gc rename to goal_src/jak1/import/cavespatula-darkcave-ag.gc diff --git a/goal_src/import/cavespatulatwo-ag.gc b/goal_src/jak1/import/cavespatulatwo-ag.gc similarity index 100% rename from goal_src/import/cavespatulatwo-ag.gc rename to goal_src/jak1/import/cavespatulatwo-ag.gc diff --git a/goal_src/import/cavetrapdoor-ag.gc b/goal_src/jak1/import/cavetrapdoor-ag.gc similarity index 100% rename from goal_src/import/cavetrapdoor-ag.gc rename to goal_src/jak1/import/cavetrapdoor-ag.gc diff --git a/goal_src/import/ceilingflag-ag.gc b/goal_src/jak1/import/ceilingflag-ag.gc similarity index 100% rename from goal_src/import/ceilingflag-ag.gc rename to goal_src/jak1/import/ceilingflag-ag.gc diff --git a/goal_src/import/chainmine-ag.gc b/goal_src/jak1/import/chainmine-ag.gc similarity index 100% rename from goal_src/import/chainmine-ag.gc rename to goal_src/jak1/import/chainmine-ag.gc diff --git a/goal_src/import/citadelcam-ag.gc b/goal_src/jak1/import/citadelcam-ag.gc similarity index 100% rename from goal_src/import/citadelcam-ag.gc rename to goal_src/jak1/import/citadelcam-ag.gc diff --git a/goal_src/import/citb-arm-ag.gc b/goal_src/jak1/import/citb-arm-ag.gc similarity index 100% rename from goal_src/import/citb-arm-ag.gc rename to goal_src/jak1/import/citb-arm-ag.gc diff --git a/goal_src/import/citb-arm-shoulder-ag.gc b/goal_src/jak1/import/citb-arm-shoulder-ag.gc similarity index 100% rename from goal_src/import/citb-arm-shoulder-ag.gc rename to goal_src/jak1/import/citb-arm-shoulder-ag.gc diff --git a/goal_src/import/citb-bunny-ag.gc b/goal_src/jak1/import/citb-bunny-ag.gc similarity index 100% rename from goal_src/import/citb-bunny-ag.gc rename to goal_src/jak1/import/citb-bunny-ag.gc diff --git a/goal_src/import/citb-button-ag.gc b/goal_src/jak1/import/citb-button-ag.gc similarity index 100% rename from goal_src/import/citb-button-ag.gc rename to goal_src/jak1/import/citb-button-ag.gc diff --git a/goal_src/import/citb-chain-plat-ag.gc b/goal_src/jak1/import/citb-chain-plat-ag.gc similarity index 100% rename from goal_src/import/citb-chain-plat-ag.gc rename to goal_src/jak1/import/citb-chain-plat-ag.gc diff --git a/goal_src/import/citb-chains-ag.gc b/goal_src/jak1/import/citb-chains-ag.gc similarity index 100% rename from goal_src/import/citb-chains-ag.gc rename to goal_src/jak1/import/citb-chains-ag.gc diff --git a/goal_src/import/citb-coil-ag.gc b/goal_src/jak1/import/citb-coil-ag.gc similarity index 100% rename from goal_src/import/citb-coil-ag.gc rename to goal_src/jak1/import/citb-coil-ag.gc diff --git a/goal_src/import/citb-disc-ag.gc b/goal_src/jak1/import/citb-disc-ag.gc similarity index 100% rename from goal_src/import/citb-disc-ag.gc rename to goal_src/jak1/import/citb-disc-ag.gc diff --git a/goal_src/import/citb-donut-ag.gc b/goal_src/jak1/import/citb-donut-ag.gc similarity index 100% rename from goal_src/import/citb-donut-ag.gc rename to goal_src/jak1/import/citb-donut-ag.gc diff --git a/goal_src/import/citb-drop-plat-ag.gc b/goal_src/jak1/import/citb-drop-plat-ag.gc similarity index 100% rename from goal_src/import/citb-drop-plat-ag.gc rename to goal_src/jak1/import/citb-drop-plat-ag.gc diff --git a/goal_src/import/citb-exit-plat-ag.gc b/goal_src/jak1/import/citb-exit-plat-ag.gc similarity index 100% rename from goal_src/import/citb-exit-plat-ag.gc rename to goal_src/jak1/import/citb-exit-plat-ag.gc diff --git a/goal_src/import/citb-firehose-ag.gc b/goal_src/jak1/import/citb-firehose-ag.gc similarity index 100% rename from goal_src/import/citb-firehose-ag.gc rename to goal_src/jak1/import/citb-firehose-ag.gc diff --git a/goal_src/import/citb-generator-ag.gc b/goal_src/jak1/import/citb-generator-ag.gc similarity index 100% rename from goal_src/import/citb-generator-ag.gc rename to goal_src/jak1/import/citb-generator-ag.gc diff --git a/goal_src/import/citb-hose-ag.gc b/goal_src/jak1/import/citb-hose-ag.gc similarity index 100% rename from goal_src/import/citb-hose-ag.gc rename to goal_src/jak1/import/citb-hose-ag.gc diff --git a/goal_src/import/citb-iris-door-ag.gc b/goal_src/jak1/import/citb-iris-door-ag.gc similarity index 100% rename from goal_src/import/citb-iris-door-ag.gc rename to goal_src/jak1/import/citb-iris-door-ag.gc diff --git a/goal_src/import/citb-launcher-ag.gc b/goal_src/jak1/import/citb-launcher-ag.gc similarity index 100% rename from goal_src/import/citb-launcher-ag.gc rename to goal_src/jak1/import/citb-launcher-ag.gc diff --git a/goal_src/import/citb-robotboss-ag.gc b/goal_src/jak1/import/citb-robotboss-ag.gc similarity index 100% rename from goal_src/import/citb-robotboss-ag.gc rename to goal_src/jak1/import/citb-robotboss-ag.gc diff --git a/goal_src/import/citb-rotatebox-ag.gc b/goal_src/jak1/import/citb-rotatebox-ag.gc similarity index 100% rename from goal_src/import/citb-rotatebox-ag.gc rename to goal_src/jak1/import/citb-rotatebox-ag.gc diff --git a/goal_src/import/citb-sagecage-ag.gc b/goal_src/jak1/import/citb-sagecage-ag.gc similarity index 100% rename from goal_src/import/citb-sagecage-ag.gc rename to goal_src/jak1/import/citb-sagecage-ag.gc diff --git a/goal_src/import/citb-stopbox-ag.gc b/goal_src/jak1/import/citb-stopbox-ag.gc similarity index 100% rename from goal_src/import/citb-stopbox-ag.gc rename to goal_src/jak1/import/citb-stopbox-ag.gc diff --git a/goal_src/import/crate-ag.gc b/goal_src/jak1/import/crate-ag.gc similarity index 100% rename from goal_src/import/crate-ag.gc rename to goal_src/jak1/import/crate-ag.gc diff --git a/goal_src/import/crate-darkeco-cluster-ag.gc b/goal_src/jak1/import/crate-darkeco-cluster-ag.gc similarity index 100% rename from goal_src/import/crate-darkeco-cluster-ag.gc rename to goal_src/jak1/import/crate-darkeco-cluster-ag.gc diff --git a/goal_src/import/dark-crystal-ag.gc b/goal_src/jak1/import/dark-crystal-ag.gc similarity index 100% rename from goal_src/import/dark-crystal-ag.gc rename to goal_src/jak1/import/dark-crystal-ag.gc diff --git a/goal_src/import/dark-plant-ag.gc b/goal_src/jak1/import/dark-plant-ag.gc similarity index 100% rename from goal_src/import/dark-plant-ag.gc rename to goal_src/jak1/import/dark-plant-ag.gc diff --git a/goal_src/import/darkecobarrel-ag.gc b/goal_src/jak1/import/darkecobarrel-ag.gc similarity index 100% rename from goal_src/import/darkecobarrel-ag.gc rename to goal_src/jak1/import/darkecobarrel-ag.gc diff --git a/goal_src/import/darkecobomb-ag.gc b/goal_src/jak1/import/darkecobomb-ag.gc similarity index 100% rename from goal_src/import/darkecobomb-ag.gc rename to goal_src/jak1/import/darkecobomb-ag.gc diff --git a/goal_src/import/darkecocan-ag.gc b/goal_src/jak1/import/darkecocan-ag.gc similarity index 100% rename from goal_src/import/darkecocan-ag.gc rename to goal_src/jak1/import/darkecocan-ag.gc diff --git a/goal_src/import/darkvine-ag.gc b/goal_src/jak1/import/darkvine-ag.gc similarity index 100% rename from goal_src/import/darkvine-ag.gc rename to goal_src/jak1/import/darkvine-ag.gc diff --git a/goal_src/import/deathcam-ag.gc b/goal_src/jak1/import/deathcam-ag.gc similarity index 100% rename from goal_src/import/deathcam-ag.gc rename to goal_src/jak1/import/deathcam-ag.gc diff --git a/goal_src/import/double-lurker-ag.gc b/goal_src/jak1/import/double-lurker-ag.gc similarity index 100% rename from goal_src/import/double-lurker-ag.gc rename to goal_src/jak1/import/double-lurker-ag.gc diff --git a/goal_src/import/double-lurker-top-ag.gc b/goal_src/jak1/import/double-lurker-top-ag.gc similarity index 100% rename from goal_src/import/double-lurker-top-ag.gc rename to goal_src/jak1/import/double-lurker-top-ag.gc diff --git a/goal_src/import/driller-lurker-ag.gc b/goal_src/jak1/import/driller-lurker-ag.gc similarity index 100% rename from goal_src/import/driller-lurker-ag.gc rename to goal_src/jak1/import/driller-lurker-ag.gc diff --git a/goal_src/import/ecoclaw-ag.gc b/goal_src/jak1/import/ecoclaw-ag.gc similarity index 100% rename from goal_src/import/ecoclaw-ag.gc rename to goal_src/jak1/import/ecoclaw-ag.gc diff --git a/goal_src/import/ecovalve-ag.gc b/goal_src/jak1/import/ecovalve-ag.gc similarity index 100% rename from goal_src/import/ecovalve-ag.gc rename to goal_src/jak1/import/ecovalve-ag.gc diff --git a/goal_src/import/ecoventrock-ag.gc b/goal_src/jak1/import/ecoventrock-ag.gc similarity index 100% rename from goal_src/import/ecoventrock-ag.gc rename to goal_src/jak1/import/ecoventrock-ag.gc diff --git a/goal_src/import/ef-plane-ag.gc b/goal_src/jak1/import/ef-plane-ag.gc similarity index 100% rename from goal_src/import/ef-plane-ag.gc rename to goal_src/jak1/import/ef-plane-ag.gc diff --git a/goal_src/import/eggtop-ag.gc b/goal_src/jak1/import/eggtop-ag.gc similarity index 100% rename from goal_src/import/eggtop-ag.gc rename to goal_src/jak1/import/eggtop-ag.gc diff --git a/goal_src/import/eichar-ag.gc b/goal_src/jak1/import/eichar-ag.gc similarity index 100% rename from goal_src/import/eichar-ag.gc rename to goal_src/jak1/import/eichar-ag.gc diff --git a/goal_src/import/eichar-fish+0-ag.gc b/goal_src/jak1/import/eichar-fish+0-ag.gc similarity index 100% rename from goal_src/import/eichar-fish+0-ag.gc rename to goal_src/jak1/import/eichar-fish+0-ag.gc diff --git a/goal_src/import/eichar-flut+0-ag.gc b/goal_src/jak1/import/eichar-flut+0-ag.gc similarity index 100% rename from goal_src/import/eichar-flut+0-ag.gc rename to goal_src/jak1/import/eichar-flut+0-ag.gc diff --git a/goal_src/import/eichar-ice+0-ag.gc b/goal_src/jak1/import/eichar-ice+0-ag.gc similarity index 100% rename from goal_src/import/eichar-ice+0-ag.gc rename to goal_src/jak1/import/eichar-ice+0-ag.gc diff --git a/goal_src/import/eichar-pole+0-ag.gc b/goal_src/jak1/import/eichar-pole+0-ag.gc similarity index 100% rename from goal_src/import/eichar-pole+0-ag.gc rename to goal_src/jak1/import/eichar-pole+0-ag.gc diff --git a/goal_src/import/eichar-racer+0-ag.gc b/goal_src/jak1/import/eichar-racer+0-ag.gc similarity index 100% rename from goal_src/import/eichar-racer+0-ag.gc rename to goal_src/jak1/import/eichar-racer+0-ag.gc diff --git a/goal_src/import/eichar-tube+0-ag.gc b/goal_src/jak1/import/eichar-tube+0-ag.gc similarity index 100% rename from goal_src/import/eichar-tube+0-ag.gc rename to goal_src/jak1/import/eichar-tube+0-ag.gc diff --git a/goal_src/import/energyarm-ag.gc b/goal_src/jak1/import/energyarm-ag.gc similarity index 100% rename from goal_src/import/energyarm-ag.gc rename to goal_src/jak1/import/energyarm-ag.gc diff --git a/goal_src/import/energyball-ag.gc b/goal_src/jak1/import/energyball-ag.gc similarity index 100% rename from goal_src/import/energyball-ag.gc rename to goal_src/jak1/import/energyball-ag.gc diff --git a/goal_src/import/energybase-ag.gc b/goal_src/jak1/import/energybase-ag.gc similarity index 100% rename from goal_src/import/energybase-ag.gc rename to goal_src/jak1/import/energybase-ag.gc diff --git a/goal_src/import/energydoor-ag.gc b/goal_src/jak1/import/energydoor-ag.gc similarity index 100% rename from goal_src/import/energydoor-ag.gc rename to goal_src/jak1/import/energydoor-ag.gc diff --git a/goal_src/import/energyhub-ag.gc b/goal_src/jak1/import/energyhub-ag.gc similarity index 100% rename from goal_src/import/energyhub-ag.gc rename to goal_src/jak1/import/energyhub-ag.gc diff --git a/goal_src/import/evilbro-ag.gc b/goal_src/jak1/import/evilbro-ag.gc similarity index 100% rename from goal_src/import/evilbro-ag.gc rename to goal_src/jak1/import/evilbro-ag.gc diff --git a/goal_src/import/evilbro-citadel-ag.gc b/goal_src/jak1/import/evilbro-citadel-ag.gc similarity index 100% rename from goal_src/import/evilbro-citadel-ag.gc rename to goal_src/jak1/import/evilbro-citadel-ag.gc diff --git a/goal_src/import/evilbro-village3-ag.gc b/goal_src/jak1/import/evilbro-village3-ag.gc similarity index 100% rename from goal_src/import/evilbro-village3-ag.gc rename to goal_src/jak1/import/evilbro-village3-ag.gc diff --git a/goal_src/import/evilplant-ag.gc b/goal_src/jak1/import/evilplant-ag.gc similarity index 100% rename from goal_src/import/evilplant-ag.gc rename to goal_src/jak1/import/evilplant-ag.gc diff --git a/goal_src/import/evilsis-ag.gc b/goal_src/jak1/import/evilsis-ag.gc similarity index 100% rename from goal_src/import/evilsis-ag.gc rename to goal_src/jak1/import/evilsis-ag.gc diff --git a/goal_src/import/evilsis-citadel-ag.gc b/goal_src/jak1/import/evilsis-citadel-ag.gc similarity index 100% rename from goal_src/import/evilsis-citadel-ag.gc rename to goal_src/jak1/import/evilsis-citadel-ag.gc diff --git a/goal_src/import/evilsis-village3-ag.gc b/goal_src/jak1/import/evilsis-village3-ag.gc similarity index 100% rename from goal_src/import/evilsis-village3-ag.gc rename to goal_src/jak1/import/evilsis-village3-ag.gc diff --git a/goal_src/import/exit-chamber-ag.gc b/goal_src/jak1/import/exit-chamber-ag.gc similarity index 100% rename from goal_src/import/exit-chamber-ag.gc rename to goal_src/jak1/import/exit-chamber-ag.gc diff --git a/goal_src/import/exit-chamber-dummy-ag.gc b/goal_src/jak1/import/exit-chamber-dummy-ag.gc similarity index 100% rename from goal_src/import/exit-chamber-dummy-ag.gc rename to goal_src/jak1/import/exit-chamber-dummy-ag.gc diff --git a/goal_src/import/explorer-ag.gc b/goal_src/jak1/import/explorer-ag.gc similarity index 100% rename from goal_src/import/explorer-ag.gc rename to goal_src/jak1/import/explorer-ag.gc diff --git a/goal_src/import/farmer-ag.gc b/goal_src/jak1/import/farmer-ag.gc similarity index 100% rename from goal_src/import/farmer-ag.gc rename to goal_src/jak1/import/farmer-ag.gc diff --git a/goal_src/import/farthy-snack-ag.gc b/goal_src/jak1/import/farthy-snack-ag.gc similarity index 100% rename from goal_src/import/farthy-snack-ag.gc rename to goal_src/jak1/import/farthy-snack-ag.gc diff --git a/goal_src/import/finalbosscam-ag.gc b/goal_src/jak1/import/finalbosscam-ag.gc similarity index 100% rename from goal_src/import/finalbosscam-ag.gc rename to goal_src/jak1/import/finalbosscam-ag.gc diff --git a/goal_src/import/fireboulder-ag.gc b/goal_src/jak1/import/fireboulder-ag.gc similarity index 100% rename from goal_src/import/fireboulder-ag.gc rename to goal_src/jak1/import/fireboulder-ag.gc diff --git a/goal_src/import/fish-net-ag.gc b/goal_src/jak1/import/fish-net-ag.gc similarity index 100% rename from goal_src/import/fish-net-ag.gc rename to goal_src/jak1/import/fish-net-ag.gc diff --git a/goal_src/import/fisher-ag.gc b/goal_src/jak1/import/fisher-ag.gc similarity index 100% rename from goal_src/import/fisher-ag.gc rename to goal_src/jak1/import/fisher-ag.gc diff --git a/goal_src/import/fishermans-boat-ag.gc b/goal_src/jak1/import/fishermans-boat-ag.gc similarity index 100% rename from goal_src/import/fishermans-boat-ag.gc rename to goal_src/jak1/import/fishermans-boat-ag.gc diff --git a/goal_src/import/floating-launcher-ag.gc b/goal_src/jak1/import/floating-launcher-ag.gc similarity index 100% rename from goal_src/import/floating-launcher-ag.gc rename to goal_src/jak1/import/floating-launcher-ag.gc diff --git a/goal_src/import/flut-saddle-ag.gc b/goal_src/jak1/import/flut-saddle-ag.gc similarity index 100% rename from goal_src/import/flut-saddle-ag.gc rename to goal_src/jak1/import/flut-saddle-ag.gc diff --git a/goal_src/import/flutflut-ag.gc b/goal_src/jak1/import/flutflut-ag.gc similarity index 100% rename from goal_src/import/flutflut-ag.gc rename to goal_src/jak1/import/flutflut-ag.gc diff --git a/goal_src/import/flutflut-bluehut-ag.gc b/goal_src/jak1/import/flutflut-bluehut-ag.gc similarity index 100% rename from goal_src/import/flutflut-bluehut-ag.gc rename to goal_src/jak1/import/flutflut-bluehut-ag.gc diff --git a/goal_src/import/flutflut-plat-large-ag.gc b/goal_src/jak1/import/flutflut-plat-large-ag.gc similarity index 100% rename from goal_src/import/flutflut-plat-large-ag.gc rename to goal_src/jak1/import/flutflut-plat-large-ag.gc diff --git a/goal_src/import/flutflut-plat-med-ag.gc b/goal_src/jak1/import/flutflut-plat-med-ag.gc similarity index 100% rename from goal_src/import/flutflut-plat-med-ag.gc rename to goal_src/jak1/import/flutflut-plat-med-ag.gc diff --git a/goal_src/import/flutflut-plat-small-ag.gc b/goal_src/jak1/import/flutflut-plat-small-ag.gc similarity index 100% rename from goal_src/import/flutflut-plat-small-ag.gc rename to goal_src/jak1/import/flutflut-plat-small-ag.gc diff --git a/goal_src/import/flutflutegg-ag.gc b/goal_src/jak1/import/flutflutegg-ag.gc similarity index 100% rename from goal_src/import/flutflutegg-ag.gc rename to goal_src/jak1/import/flutflutegg-ag.gc diff --git a/goal_src/import/flying-lurker-ag.gc b/goal_src/jak1/import/flying-lurker-ag.gc similarity index 100% rename from goal_src/import/flying-lurker-ag.gc rename to goal_src/jak1/import/flying-lurker-ag.gc diff --git a/goal_src/import/fuel-cell-ag.gc b/goal_src/jak1/import/fuel-cell-ag.gc similarity index 100% rename from goal_src/import/fuel-cell-ag.gc rename to goal_src/jak1/import/fuel-cell-ag.gc diff --git a/goal_src/import/fuelcell-naked-ag.gc b/goal_src/jak1/import/fuelcell-naked-ag.gc similarity index 100% rename from goal_src/import/fuelcell-naked-ag.gc rename to goal_src/jak1/import/fuelcell-naked-ag.gc diff --git a/goal_src/import/gambler-ag.gc b/goal_src/jak1/import/gambler-ag.gc similarity index 100% rename from goal_src/import/gambler-ag.gc rename to goal_src/jak1/import/gambler-ag.gc diff --git a/goal_src/import/generic-button-ag.gc b/goal_src/jak1/import/generic-button-ag.gc similarity index 100% rename from goal_src/import/generic-button-ag.gc rename to goal_src/jak1/import/generic-button-ag.gc diff --git a/goal_src/import/geologist-ag.gc b/goal_src/jak1/import/geologist-ag.gc similarity index 100% rename from goal_src/import/geologist-ag.gc rename to goal_src/jak1/import/geologist-ag.gc diff --git a/goal_src/import/gnawer-ag.gc b/goal_src/jak1/import/gnawer-ag.gc similarity index 100% rename from goal_src/import/gnawer-ag.gc rename to goal_src/jak1/import/gnawer-ag.gc diff --git a/goal_src/import/gondola-ag.gc b/goal_src/jak1/import/gondola-ag.gc similarity index 100% rename from goal_src/import/gondola-ag.gc rename to goal_src/jak1/import/gondola-ag.gc diff --git a/goal_src/import/gondolacables-ag.gc b/goal_src/jak1/import/gondolacables-ag.gc similarity index 100% rename from goal_src/import/gondolacables-ag.gc rename to goal_src/jak1/import/gondolacables-ag.gc diff --git a/goal_src/import/green-eco-lurker-ag.gc b/goal_src/jak1/import/green-eco-lurker-ag.gc similarity index 100% rename from goal_src/import/green-eco-lurker-ag.gc rename to goal_src/jak1/import/green-eco-lurker-ag.gc diff --git a/goal_src/import/green-sagecage-ag.gc b/goal_src/jak1/import/green-sagecage-ag.gc similarity index 100% rename from goal_src/import/green-sagecage-ag.gc rename to goal_src/jak1/import/green-sagecage-ag.gc diff --git a/goal_src/import/greenshot-ag.gc b/goal_src/jak1/import/greenshot-ag.gc similarity index 100% rename from goal_src/import/greenshot-ag.gc rename to goal_src/jak1/import/greenshot-ag.gc diff --git a/goal_src/import/grottopole-ag.gc b/goal_src/jak1/import/grottopole-ag.gc similarity index 100% rename from goal_src/import/grottopole-ag.gc rename to goal_src/jak1/import/grottopole-ag.gc diff --git a/goal_src/import/happy-plant-ag.gc b/goal_src/jak1/import/happy-plant-ag.gc similarity index 100% rename from goal_src/import/happy-plant-ag.gc rename to goal_src/jak1/import/happy-plant-ag.gc diff --git a/goal_src/import/harvester-ag.gc b/goal_src/jak1/import/harvester-ag.gc similarity index 100% rename from goal_src/import/harvester-ag.gc rename to goal_src/jak1/import/harvester-ag.gc diff --git a/goal_src/import/helix-button-ag.gc b/goal_src/jak1/import/helix-button-ag.gc similarity index 100% rename from goal_src/import/helix-button-ag.gc rename to goal_src/jak1/import/helix-button-ag.gc diff --git a/goal_src/import/helix-slide-door-ag.gc b/goal_src/jak1/import/helix-slide-door-ag.gc similarity index 100% rename from goal_src/import/helix-slide-door-ag.gc rename to goal_src/jak1/import/helix-slide-door-ag.gc diff --git a/goal_src/import/hopper-ag.gc b/goal_src/jak1/import/hopper-ag.gc similarity index 100% rename from goal_src/import/hopper-ag.gc rename to goal_src/jak1/import/hopper-ag.gc diff --git a/goal_src/import/hutlamp-ag.gc b/goal_src/jak1/import/hutlamp-ag.gc similarity index 100% rename from goal_src/import/hutlamp-ag.gc rename to goal_src/jak1/import/hutlamp-ag.gc diff --git a/goal_src/import/ice-cube-ag.gc b/goal_src/jak1/import/ice-cube-ag.gc similarity index 100% rename from goal_src/import/ice-cube-ag.gc rename to goal_src/jak1/import/ice-cube-ag.gc diff --git a/goal_src/import/ice-cube-break-ag.gc b/goal_src/jak1/import/ice-cube-break-ag.gc similarity index 100% rename from goal_src/import/ice-cube-break-ag.gc rename to goal_src/jak1/import/ice-cube-break-ag.gc diff --git a/goal_src/import/jak-white-ag.gc b/goal_src/jak1/import/jak-white-ag.gc similarity index 100% rename from goal_src/import/jak-white-ag.gc rename to goal_src/jak1/import/jak-white-ag.gc diff --git a/goal_src/import/jaws-ag.gc b/goal_src/jak1/import/jaws-ag.gc similarity index 100% rename from goal_src/import/jaws-ag.gc rename to goal_src/jak1/import/jaws-ag.gc diff --git a/goal_src/import/jng-iris-door-ag.gc b/goal_src/jak1/import/jng-iris-door-ag.gc similarity index 100% rename from goal_src/import/jng-iris-door-ag.gc rename to goal_src/jak1/import/jng-iris-door-ag.gc diff --git a/goal_src/import/junglecam-ag.gc b/goal_src/jak1/import/junglecam-ag.gc similarity index 100% rename from goal_src/import/junglecam-ag.gc rename to goal_src/jak1/import/junglecam-ag.gc diff --git a/goal_src/import/junglefish-ag.gc b/goal_src/jak1/import/junglefish-ag.gc similarity index 100% rename from goal_src/import/junglefish-ag.gc rename to goal_src/jak1/import/junglefish-ag.gc diff --git a/goal_src/import/junglesnake-ag.gc b/goal_src/jak1/import/junglesnake-ag.gc similarity index 100% rename from goal_src/import/junglesnake-ag.gc rename to goal_src/jak1/import/junglesnake-ag.gc diff --git a/goal_src/import/keg-ag.gc b/goal_src/jak1/import/keg-ag.gc similarity index 100% rename from goal_src/import/keg-ag.gc rename to goal_src/jak1/import/keg-ag.gc diff --git a/goal_src/import/keg-conveyor-ag.gc b/goal_src/jak1/import/keg-conveyor-ag.gc similarity index 100% rename from goal_src/import/keg-conveyor-ag.gc rename to goal_src/jak1/import/keg-conveyor-ag.gc diff --git a/goal_src/import/keg-conveyor-paddle-ag.gc b/goal_src/jak1/import/keg-conveyor-paddle-ag.gc similarity index 100% rename from goal_src/import/keg-conveyor-paddle-ag.gc rename to goal_src/jak1/import/keg-conveyor-paddle-ag.gc diff --git a/goal_src/import/kermit-ag.gc b/goal_src/jak1/import/kermit-ag.gc similarity index 100% rename from goal_src/import/kermit-ag.gc rename to goal_src/jak1/import/kermit-ag.gc diff --git a/goal_src/import/kickrock-ag.gc b/goal_src/jak1/import/kickrock-ag.gc similarity index 100% rename from goal_src/import/kickrock-ag.gc rename to goal_src/jak1/import/kickrock-ag.gc diff --git a/goal_src/import/launcherdoor-ag.gc b/goal_src/jak1/import/launcherdoor-ag.gc similarity index 100% rename from goal_src/import/launcherdoor-ag.gc rename to goal_src/jak1/import/launcherdoor-ag.gc diff --git a/goal_src/import/launcherdoor-maincave-ag.gc b/goal_src/jak1/import/launcherdoor-maincave-ag.gc similarity index 100% rename from goal_src/import/launcherdoor-maincave-ag.gc rename to goal_src/jak1/import/launcherdoor-maincave-ag.gc diff --git a/goal_src/import/lavaballoon-ag.gc b/goal_src/jak1/import/lavaballoon-ag.gc similarity index 100% rename from goal_src/import/lavaballoon-ag.gc rename to goal_src/jak1/import/lavaballoon-ag.gc diff --git a/goal_src/import/lavabase-ag.gc b/goal_src/jak1/import/lavabase-ag.gc similarity index 100% rename from goal_src/import/lavabase-ag.gc rename to goal_src/jak1/import/lavabase-ag.gc diff --git a/goal_src/import/lavafall-ag.gc b/goal_src/jak1/import/lavafall-ag.gc similarity index 100% rename from goal_src/import/lavafall-ag.gc rename to goal_src/jak1/import/lavafall-ag.gc diff --git a/goal_src/import/lavafallsewera-ag.gc b/goal_src/jak1/import/lavafallsewera-ag.gc similarity index 100% rename from goal_src/import/lavafallsewera-ag.gc rename to goal_src/jak1/import/lavafallsewera-ag.gc diff --git a/goal_src/import/lavafallsewerb-ag.gc b/goal_src/jak1/import/lavafallsewerb-ag.gc similarity index 100% rename from goal_src/import/lavafallsewerb-ag.gc rename to goal_src/jak1/import/lavafallsewerb-ag.gc diff --git a/goal_src/import/lavashortcut-ag.gc b/goal_src/jak1/import/lavashortcut-ag.gc similarity index 100% rename from goal_src/import/lavashortcut-ag.gc rename to goal_src/jak1/import/lavashortcut-ag.gc diff --git a/goal_src/import/lavaspoutdrip-ag.gc b/goal_src/jak1/import/lavaspoutdrip-ag.gc similarity index 100% rename from goal_src/import/lavaspoutdrip-ag.gc rename to goal_src/jak1/import/lavaspoutdrip-ag.gc diff --git a/goal_src/import/lavayellowtarp-ag.gc b/goal_src/jak1/import/lavayellowtarp-ag.gc similarity index 100% rename from goal_src/import/lavayellowtarp-ag.gc rename to goal_src/jak1/import/lavayellowtarp-ag.gc diff --git a/goal_src/import/light-eco-ag.gc b/goal_src/jak1/import/light-eco-ag.gc similarity index 100% rename from goal_src/import/light-eco-ag.gc rename to goal_src/jak1/import/light-eco-ag.gc diff --git a/goal_src/import/lightning-mole-ag.gc b/goal_src/jak1/import/lightning-mole-ag.gc similarity index 100% rename from goal_src/import/lightning-mole-ag.gc rename to goal_src/jak1/import/lightning-mole-ag.gc diff --git a/goal_src/import/logo-ag.gc b/goal_src/jak1/import/logo-ag.gc similarity index 100% rename from goal_src/import/logo-ag.gc rename to goal_src/jak1/import/logo-ag.gc diff --git a/goal_src/import/logo-black-ag.gc b/goal_src/jak1/import/logo-black-ag.gc similarity index 100% rename from goal_src/import/logo-black-ag.gc rename to goal_src/jak1/import/logo-black-ag.gc diff --git a/goal_src/import/logo-cam-ag.gc b/goal_src/jak1/import/logo-cam-ag.gc similarity index 100% rename from goal_src/import/logo-cam-ag.gc rename to goal_src/jak1/import/logo-cam-ag.gc diff --git a/goal_src/import/logo-volumes-ag.gc b/goal_src/jak1/import/logo-volumes-ag.gc similarity index 100% rename from goal_src/import/logo-volumes-ag.gc rename to goal_src/jak1/import/logo-volumes-ag.gc diff --git a/goal_src/import/logtrap-ag.gc b/goal_src/jak1/import/logtrap-ag.gc similarity index 100% rename from goal_src/import/logtrap-ag.gc rename to goal_src/jak1/import/logtrap-ag.gc diff --git a/goal_src/import/lrocklrg-ag.gc b/goal_src/jak1/import/lrocklrg-ag.gc similarity index 100% rename from goal_src/import/lrocklrg-ag.gc rename to goal_src/jak1/import/lrocklrg-ag.gc diff --git a/goal_src/import/lurkercrab-ag.gc b/goal_src/jak1/import/lurkercrab-ag.gc similarity index 100% rename from goal_src/import/lurkercrab-ag.gc rename to goal_src/jak1/import/lurkercrab-ag.gc diff --git a/goal_src/import/lurkerm-piston-ag.gc b/goal_src/jak1/import/lurkerm-piston-ag.gc similarity index 100% rename from goal_src/import/lurkerm-piston-ag.gc rename to goal_src/jak1/import/lurkerm-piston-ag.gc diff --git a/goal_src/import/lurkerm-tall-sail-ag.gc b/goal_src/jak1/import/lurkerm-tall-sail-ag.gc similarity index 100% rename from goal_src/import/lurkerm-tall-sail-ag.gc rename to goal_src/jak1/import/lurkerm-tall-sail-ag.gc diff --git a/goal_src/import/lurkerpuppy-ag.gc b/goal_src/jak1/import/lurkerpuppy-ag.gc similarity index 100% rename from goal_src/import/lurkerpuppy-ag.gc rename to goal_src/jak1/import/lurkerpuppy-ag.gc diff --git a/goal_src/import/lurkerworm-ag.gc b/goal_src/jak1/import/lurkerworm-ag.gc similarity index 100% rename from goal_src/import/lurkerworm-ag.gc rename to goal_src/jak1/import/lurkerworm-ag.gc diff --git a/goal_src/import/maincavecam-ag.gc b/goal_src/jak1/import/maincavecam-ag.gc similarity index 100% rename from goal_src/import/maincavecam-ag.gc rename to goal_src/jak1/import/maincavecam-ag.gc diff --git a/goal_src/import/maindoor-ag.gc b/goal_src/jak1/import/maindoor-ag.gc similarity index 100% rename from goal_src/import/maindoor-ag.gc rename to goal_src/jak1/import/maindoor-ag.gc diff --git a/goal_src/import/mayor-ag.gc b/goal_src/jak1/import/mayor-ag.gc similarity index 100% rename from goal_src/import/mayor-ag.gc rename to goal_src/jak1/import/mayor-ag.gc diff --git a/goal_src/import/mayorgears-ag.gc b/goal_src/jak1/import/mayorgears-ag.gc similarity index 100% rename from goal_src/import/mayorgears-ag.gc rename to goal_src/jak1/import/mayorgears-ag.gc diff --git a/goal_src/import/medres-beach-ag.gc b/goal_src/jak1/import/medres-beach-ag.gc similarity index 100% rename from goal_src/import/medres-beach-ag.gc rename to goal_src/jak1/import/medres-beach-ag.gc diff --git a/goal_src/import/medres-beach1-ag.gc b/goal_src/jak1/import/medres-beach1-ag.gc similarity index 100% rename from goal_src/import/medres-beach1-ag.gc rename to goal_src/jak1/import/medres-beach1-ag.gc diff --git a/goal_src/import/medres-beach2-ag.gc b/goal_src/jak1/import/medres-beach2-ag.gc similarity index 100% rename from goal_src/import/medres-beach2-ag.gc rename to goal_src/jak1/import/medres-beach2-ag.gc diff --git a/goal_src/import/medres-beach3-ag.gc b/goal_src/jak1/import/medres-beach3-ag.gc similarity index 100% rename from goal_src/import/medres-beach3-ag.gc rename to goal_src/jak1/import/medres-beach3-ag.gc diff --git a/goal_src/import/medres-finalboss-ag.gc b/goal_src/jak1/import/medres-finalboss-ag.gc similarity index 100% rename from goal_src/import/medres-finalboss-ag.gc rename to goal_src/jak1/import/medres-finalboss-ag.gc diff --git a/goal_src/import/medres-firecanyon-ag.gc b/goal_src/jak1/import/medres-firecanyon-ag.gc similarity index 100% rename from goal_src/import/medres-firecanyon-ag.gc rename to goal_src/jak1/import/medres-firecanyon-ag.gc diff --git a/goal_src/import/medres-jungle-ag.gc b/goal_src/jak1/import/medres-jungle-ag.gc similarity index 100% rename from goal_src/import/medres-jungle-ag.gc rename to goal_src/jak1/import/medres-jungle-ag.gc diff --git a/goal_src/import/medres-jungle1-ag.gc b/goal_src/jak1/import/medres-jungle1-ag.gc similarity index 100% rename from goal_src/import/medres-jungle1-ag.gc rename to goal_src/jak1/import/medres-jungle1-ag.gc diff --git a/goal_src/import/medres-jungle2-ag.gc b/goal_src/jak1/import/medres-jungle2-ag.gc similarity index 100% rename from goal_src/import/medres-jungle2-ag.gc rename to goal_src/jak1/import/medres-jungle2-ag.gc diff --git a/goal_src/import/medres-misty-ag.gc b/goal_src/jak1/import/medres-misty-ag.gc similarity index 100% rename from goal_src/import/medres-misty-ag.gc rename to goal_src/jak1/import/medres-misty-ag.gc diff --git a/goal_src/import/medres-ogre-ag.gc b/goal_src/jak1/import/medres-ogre-ag.gc similarity index 100% rename from goal_src/import/medres-ogre-ag.gc rename to goal_src/jak1/import/medres-ogre-ag.gc diff --git a/goal_src/import/medres-ogre2-ag.gc b/goal_src/jak1/import/medres-ogre2-ag.gc similarity index 100% rename from goal_src/import/medres-ogre2-ag.gc rename to goal_src/jak1/import/medres-ogre2-ag.gc diff --git a/goal_src/import/medres-ogre3-ag.gc b/goal_src/jak1/import/medres-ogre3-ag.gc similarity index 100% rename from goal_src/import/medres-ogre3-ag.gc rename to goal_src/jak1/import/medres-ogre3-ag.gc diff --git a/goal_src/import/medres-rolling-ag.gc b/goal_src/jak1/import/medres-rolling-ag.gc similarity index 100% rename from goal_src/import/medres-rolling-ag.gc rename to goal_src/jak1/import/medres-rolling-ag.gc diff --git a/goal_src/import/medres-rolling1-ag.gc b/goal_src/jak1/import/medres-rolling1-ag.gc similarity index 100% rename from goal_src/import/medres-rolling1-ag.gc rename to goal_src/jak1/import/medres-rolling1-ag.gc diff --git a/goal_src/import/medres-snow-ag.gc b/goal_src/jak1/import/medres-snow-ag.gc similarity index 100% rename from goal_src/import/medres-snow-ag.gc rename to goal_src/jak1/import/medres-snow-ag.gc diff --git a/goal_src/import/medres-training-ag.gc b/goal_src/jak1/import/medres-training-ag.gc similarity index 100% rename from goal_src/import/medres-training-ag.gc rename to goal_src/jak1/import/medres-training-ag.gc diff --git a/goal_src/import/medres-village11-ag.gc b/goal_src/jak1/import/medres-village11-ag.gc similarity index 100% rename from goal_src/import/medres-village11-ag.gc rename to goal_src/jak1/import/medres-village11-ag.gc diff --git a/goal_src/import/medres-village12-ag.gc b/goal_src/jak1/import/medres-village12-ag.gc similarity index 100% rename from goal_src/import/medres-village12-ag.gc rename to goal_src/jak1/import/medres-village12-ag.gc diff --git a/goal_src/import/medres-village13-ag.gc b/goal_src/jak1/import/medres-village13-ag.gc similarity index 100% rename from goal_src/import/medres-village13-ag.gc rename to goal_src/jak1/import/medres-village13-ag.gc diff --git a/goal_src/import/medres-village2-ag.gc b/goal_src/jak1/import/medres-village2-ag.gc similarity index 100% rename from goal_src/import/medres-village2-ag.gc rename to goal_src/jak1/import/medres-village2-ag.gc diff --git a/goal_src/import/minecartsteel-ag.gc b/goal_src/jak1/import/minecartsteel-ag.gc similarity index 100% rename from goal_src/import/minecartsteel-ag.gc rename to goal_src/jak1/import/minecartsteel-ag.gc diff --git a/goal_src/import/minershort-ag.gc b/goal_src/jak1/import/minershort-ag.gc similarity index 100% rename from goal_src/import/minershort-ag.gc rename to goal_src/jak1/import/minershort-ag.gc diff --git a/goal_src/import/minertall-ag.gc b/goal_src/jak1/import/minertall-ag.gc similarity index 100% rename from goal_src/import/minertall-ag.gc rename to goal_src/jak1/import/minertall-ag.gc diff --git a/goal_src/import/mis-bone-bridge-ag.gc b/goal_src/jak1/import/mis-bone-bridge-ag.gc similarity index 100% rename from goal_src/import/mis-bone-bridge-ag.gc rename to goal_src/jak1/import/mis-bone-bridge-ag.gc diff --git a/goal_src/import/mis-bone-platform-ag.gc b/goal_src/jak1/import/mis-bone-platform-ag.gc similarity index 100% rename from goal_src/import/mis-bone-platform-ag.gc rename to goal_src/jak1/import/mis-bone-platform-ag.gc diff --git a/goal_src/import/mistycam-ag.gc b/goal_src/jak1/import/mistycam-ag.gc similarity index 100% rename from goal_src/import/mistycam-ag.gc rename to goal_src/jak1/import/mistycam-ag.gc diff --git a/goal_src/import/mistycannon-ag.gc b/goal_src/jak1/import/mistycannon-ag.gc similarity index 100% rename from goal_src/import/mistycannon-ag.gc rename to goal_src/jak1/import/mistycannon-ag.gc diff --git a/goal_src/import/money-ag.gc b/goal_src/jak1/import/money-ag.gc similarity index 100% rename from goal_src/import/money-ag.gc rename to goal_src/jak1/import/money-ag.gc diff --git a/goal_src/import/mother-spider-ag.gc b/goal_src/jak1/import/mother-spider-ag.gc similarity index 100% rename from goal_src/import/mother-spider-ag.gc rename to goal_src/jak1/import/mother-spider-ag.gc diff --git a/goal_src/import/muse-ag.gc b/goal_src/jak1/import/muse-ag.gc similarity index 100% rename from goal_src/import/muse-ag.gc rename to goal_src/jak1/import/muse-ag.gc diff --git a/goal_src/import/ndi-ag.gc b/goal_src/jak1/import/ndi-ag.gc similarity index 100% rename from goal_src/import/ndi-ag.gc rename to goal_src/jak1/import/ndi-ag.gc diff --git a/goal_src/import/ndi-cam-ag.gc b/goal_src/jak1/import/ndi-cam-ag.gc similarity index 100% rename from goal_src/import/ndi-cam-ag.gc rename to goal_src/jak1/import/ndi-cam-ag.gc diff --git a/goal_src/import/ndi-volumes-ag.gc b/goal_src/jak1/import/ndi-volumes-ag.gc similarity index 100% rename from goal_src/import/ndi-volumes-ag.gc rename to goal_src/jak1/import/ndi-volumes-ag.gc diff --git a/goal_src/import/ogre-bridge-ag.gc b/goal_src/jak1/import/ogre-bridge-ag.gc similarity index 100% rename from goal_src/import/ogre-bridge-ag.gc rename to goal_src/jak1/import/ogre-bridge-ag.gc diff --git a/goal_src/import/ogre-bridgeend-ag.gc b/goal_src/jak1/import/ogre-bridgeend-ag.gc similarity index 100% rename from goal_src/import/ogre-bridgeend-ag.gc rename to goal_src/jak1/import/ogre-bridgeend-ag.gc diff --git a/goal_src/import/ogre-isle-ag.gc b/goal_src/jak1/import/ogre-isle-ag.gc similarity index 100% rename from goal_src/import/ogre-isle-ag.gc rename to goal_src/jak1/import/ogre-isle-ag.gc diff --git a/goal_src/import/ogre-step-ag.gc b/goal_src/jak1/import/ogre-step-ag.gc similarity index 100% rename from goal_src/import/ogre-step-ag.gc rename to goal_src/jak1/import/ogre-step-ag.gc diff --git a/goal_src/import/ogreboss-ag.gc b/goal_src/jak1/import/ogreboss-ag.gc similarity index 100% rename from goal_src/import/ogreboss-ag.gc rename to goal_src/jak1/import/ogreboss-ag.gc diff --git a/goal_src/import/ogreboss-village2-ag.gc b/goal_src/jak1/import/ogreboss-village2-ag.gc similarity index 100% rename from goal_src/import/ogreboss-village2-ag.gc rename to goal_src/jak1/import/ogreboss-village2-ag.gc diff --git a/goal_src/import/ogrecam-ag.gc b/goal_src/jak1/import/ogrecam-ag.gc similarity index 100% rename from goal_src/import/ogrecam-ag.gc rename to goal_src/jak1/import/ogrecam-ag.gc diff --git a/goal_src/import/oracle-ag.gc b/goal_src/jak1/import/oracle-ag.gc similarity index 100% rename from goal_src/import/oracle-ag.gc rename to goal_src/jak1/import/oracle-ag.gc diff --git a/goal_src/import/orb-cache-top-ag.gc b/goal_src/jak1/import/orb-cache-top-ag.gc similarity index 100% rename from goal_src/import/orb-cache-top-ag.gc rename to goal_src/jak1/import/orb-cache-top-ag.gc diff --git a/goal_src/import/orbit-plat-ag.gc b/goal_src/jak1/import/orbit-plat-ag.gc similarity index 100% rename from goal_src/import/orbit-plat-ag.gc rename to goal_src/jak1/import/orbit-plat-ag.gc diff --git a/goal_src/import/orbit-plat-bottom-ag.gc b/goal_src/jak1/import/orbit-plat-bottom-ag.gc similarity index 100% rename from goal_src/import/orbit-plat-bottom-ag.gc rename to goal_src/jak1/import/orbit-plat-bottom-ag.gc diff --git a/goal_src/import/pelican-ag.gc b/goal_src/jak1/import/pelican-ag.gc similarity index 100% rename from goal_src/import/pelican-ag.gc rename to goal_src/jak1/import/pelican-ag.gc diff --git a/goal_src/import/periscope-ag.gc b/goal_src/jak1/import/periscope-ag.gc similarity index 100% rename from goal_src/import/periscope-ag.gc rename to goal_src/jak1/import/periscope-ag.gc diff --git a/goal_src/import/pistons-ag.gc b/goal_src/jak1/import/pistons-ag.gc similarity index 100% rename from goal_src/import/pistons-ag.gc rename to goal_src/jak1/import/pistons-ag.gc diff --git a/goal_src/import/plant-boss-ag.gc b/goal_src/jak1/import/plant-boss-ag.gc similarity index 100% rename from goal_src/import/plant-boss-ag.gc rename to goal_src/jak1/import/plant-boss-ag.gc diff --git a/goal_src/import/plant-boss-main+0-ag.gc b/goal_src/jak1/import/plant-boss-main+0-ag.gc similarity index 100% rename from goal_src/import/plant-boss-main+0-ag.gc rename to goal_src/jak1/import/plant-boss-main+0-ag.gc diff --git a/goal_src/import/plat-ag.gc b/goal_src/jak1/import/plat-ag.gc similarity index 100% rename from goal_src/import/plat-ag.gc rename to goal_src/jak1/import/plat-ag.gc diff --git a/goal_src/import/plat-button-ag.gc b/goal_src/jak1/import/plat-button-ag.gc similarity index 100% rename from goal_src/import/plat-button-ag.gc rename to goal_src/jak1/import/plat-button-ag.gc diff --git a/goal_src/import/plat-citb-ag.gc b/goal_src/jak1/import/plat-citb-ag.gc similarity index 100% rename from goal_src/import/plat-citb-ag.gc rename to goal_src/jak1/import/plat-citb-ag.gc diff --git a/goal_src/import/plat-eco-ag.gc b/goal_src/jak1/import/plat-eco-ag.gc similarity index 100% rename from goal_src/import/plat-eco-ag.gc rename to goal_src/jak1/import/plat-eco-ag.gc diff --git a/goal_src/import/plat-eco-citb-ag.gc b/goal_src/jak1/import/plat-eco-citb-ag.gc similarity index 100% rename from goal_src/import/plat-eco-citb-ag.gc rename to goal_src/jak1/import/plat-eco-citb-ag.gc diff --git a/goal_src/import/plat-eco-finalboss-ag.gc b/goal_src/jak1/import/plat-eco-finalboss-ag.gc similarity index 100% rename from goal_src/import/plat-eco-finalboss-ag.gc rename to goal_src/jak1/import/plat-eco-finalboss-ag.gc diff --git a/goal_src/import/plat-flip-ag.gc b/goal_src/jak1/import/plat-flip-ag.gc similarity index 100% rename from goal_src/import/plat-flip-ag.gc rename to goal_src/jak1/import/plat-flip-ag.gc diff --git a/goal_src/import/plat-jungleb-ag.gc b/goal_src/jak1/import/plat-jungleb-ag.gc similarity index 100% rename from goal_src/import/plat-jungleb-ag.gc rename to goal_src/jak1/import/plat-jungleb-ag.gc diff --git a/goal_src/import/plat-sunken-ag.gc b/goal_src/jak1/import/plat-sunken-ag.gc similarity index 100% rename from goal_src/import/plat-sunken-ag.gc rename to goal_src/jak1/import/plat-sunken-ag.gc diff --git a/goal_src/import/plunger-lurker-ag.gc b/goal_src/jak1/import/plunger-lurker-ag.gc similarity index 100% rename from goal_src/import/plunger-lurker-ag.gc rename to goal_src/jak1/import/plunger-lurker-ag.gc diff --git a/goal_src/import/pontoonfive-ag.gc b/goal_src/jak1/import/pontoonfive-ag.gc similarity index 100% rename from goal_src/import/pontoonfive-ag.gc rename to goal_src/jak1/import/pontoonfive-ag.gc diff --git a/goal_src/import/pontoonten-ag.gc b/goal_src/jak1/import/pontoonten-ag.gc similarity index 100% rename from goal_src/import/pontoonten-ag.gc rename to goal_src/jak1/import/pontoonten-ag.gc diff --git a/goal_src/import/power-left-ag.gc b/goal_src/jak1/import/power-left-ag.gc similarity index 100% rename from goal_src/import/power-left-ag.gc rename to goal_src/jak1/import/power-left-ag.gc diff --git a/goal_src/import/power-right-ag.gc b/goal_src/jak1/import/power-right-ag.gc similarity index 100% rename from goal_src/import/power-right-ag.gc rename to goal_src/jak1/import/power-right-ag.gc diff --git a/goal_src/import/powercellalt-ag.gc b/goal_src/jak1/import/powercellalt-ag.gc similarity index 100% rename from goal_src/import/powercellalt-ag.gc rename to goal_src/jak1/import/powercellalt-ag.gc diff --git a/goal_src/import/precurbridge-ag.gc b/goal_src/jak1/import/precurbridge-ag.gc similarity index 100% rename from goal_src/import/precurbridge-ag.gc rename to goal_src/jak1/import/precurbridge-ag.gc diff --git a/goal_src/import/precursor-arm-ag.gc b/goal_src/jak1/import/precursor-arm-ag.gc similarity index 100% rename from goal_src/import/precursor-arm-ag.gc rename to goal_src/jak1/import/precursor-arm-ag.gc diff --git a/goal_src/import/puffer-ag.gc b/goal_src/jak1/import/puffer-ag.gc similarity index 100% rename from goal_src/import/puffer-ag.gc rename to goal_src/jak1/import/puffer-ag.gc diff --git a/goal_src/import/pusher-ag.gc b/goal_src/jak1/import/pusher-ag.gc similarity index 100% rename from goal_src/import/pusher-ag.gc rename to goal_src/jak1/import/pusher-ag.gc diff --git a/goal_src/import/qbert-plat-ag.gc b/goal_src/jak1/import/qbert-plat-ag.gc similarity index 100% rename from goal_src/import/qbert-plat-ag.gc rename to goal_src/jak1/import/qbert-plat-ag.gc diff --git a/goal_src/import/qbert-plat-on-ag.gc b/goal_src/jak1/import/qbert-plat-on-ag.gc similarity index 100% rename from goal_src/import/qbert-plat-on-ag.gc rename to goal_src/jak1/import/qbert-plat-on-ag.gc diff --git a/goal_src/import/quicksandlurker-ag.gc b/goal_src/jak1/import/quicksandlurker-ag.gc similarity index 100% rename from goal_src/import/quicksandlurker-ag.gc rename to goal_src/jak1/import/quicksandlurker-ag.gc diff --git a/goal_src/import/race-ring-ag.gc b/goal_src/jak1/import/race-ring-ag.gc similarity index 100% rename from goal_src/import/race-ring-ag.gc rename to goal_src/jak1/import/race-ring-ag.gc diff --git a/goal_src/import/racer-ag.gc b/goal_src/jak1/import/racer-ag.gc similarity index 100% rename from goal_src/import/racer-ag.gc rename to goal_src/jak1/import/racer-ag.gc diff --git a/goal_src/import/ram-ag.gc b/goal_src/jak1/import/ram-ag.gc similarity index 100% rename from goal_src/import/ram-ag.gc rename to goal_src/jak1/import/ram-ag.gc diff --git a/goal_src/import/ram-boss-ag.gc b/goal_src/jak1/import/ram-boss-ag.gc similarity index 100% rename from goal_src/import/ram-boss-ag.gc rename to goal_src/jak1/import/ram-boss-ag.gc diff --git a/goal_src/import/redring-ag.gc b/goal_src/jak1/import/redring-ag.gc similarity index 100% rename from goal_src/import/redring-ag.gc rename to goal_src/jak1/import/redring-ag.gc diff --git a/goal_src/import/redsage-ag.gc b/goal_src/jak1/import/redsage-ag.gc similarity index 100% rename from goal_src/import/redsage-ag.gc rename to goal_src/jak1/import/redsage-ag.gc diff --git a/goal_src/import/reflector-middle-ag.gc b/goal_src/jak1/import/reflector-middle-ag.gc similarity index 100% rename from goal_src/import/reflector-middle-ag.gc rename to goal_src/jak1/import/reflector-middle-ag.gc diff --git a/goal_src/import/reflector-mirror-ag.gc b/goal_src/jak1/import/reflector-mirror-ag.gc similarity index 100% rename from goal_src/import/reflector-mirror-ag.gc rename to goal_src/jak1/import/reflector-mirror-ag.gc diff --git a/goal_src/import/revcycle-ag.gc b/goal_src/jak1/import/revcycle-ag.gc similarity index 100% rename from goal_src/import/revcycle-ag.gc rename to goal_src/jak1/import/revcycle-ag.gc diff --git a/goal_src/import/revcycleprop-ag.gc b/goal_src/jak1/import/revcycleprop-ag.gc similarity index 100% rename from goal_src/import/revcycleprop-ag.gc rename to goal_src/jak1/import/revcycleprop-ag.gc diff --git a/goal_src/import/robber-ag.gc b/goal_src/jak1/import/robber-ag.gc similarity index 100% rename from goal_src/import/robber-ag.gc rename to goal_src/jak1/import/robber-ag.gc diff --git a/goal_src/import/robotboss-ag.gc b/goal_src/jak1/import/robotboss-ag.gc similarity index 100% rename from goal_src/import/robotboss-ag.gc rename to goal_src/jak1/import/robotboss-ag.gc diff --git a/goal_src/import/robotboss-blueeco-ag.gc b/goal_src/jak1/import/robotboss-blueeco-ag.gc similarity index 100% rename from goal_src/import/robotboss-blueeco-ag.gc rename to goal_src/jak1/import/robotboss-blueeco-ag.gc diff --git a/goal_src/import/robotboss-cinematic-ag.gc b/goal_src/jak1/import/robotboss-cinematic-ag.gc similarity index 100% rename from goal_src/import/robotboss-cinematic-ag.gc rename to goal_src/jak1/import/robotboss-cinematic-ag.gc diff --git a/goal_src/import/robotboss-redeco-ag.gc b/goal_src/jak1/import/robotboss-redeco-ag.gc similarity index 100% rename from goal_src/import/robotboss-redeco-ag.gc rename to goal_src/jak1/import/robotboss-redeco-ag.gc diff --git a/goal_src/import/robotboss-yelloweco-ag.gc b/goal_src/jak1/import/robotboss-yelloweco-ag.gc similarity index 100% rename from goal_src/import/robotboss-yelloweco-ag.gc rename to goal_src/jak1/import/robotboss-yelloweco-ag.gc diff --git a/goal_src/import/rolling-start-ag.gc b/goal_src/jak1/import/rolling-start-ag.gc similarity index 100% rename from goal_src/import/rolling-start-ag.gc rename to goal_src/jak1/import/rolling-start-ag.gc diff --git a/goal_src/import/rollingcam-ag.gc b/goal_src/jak1/import/rollingcam-ag.gc similarity index 100% rename from goal_src/import/rollingcam-ag.gc rename to goal_src/jak1/import/rollingcam-ag.gc diff --git a/goal_src/import/ropebridge-32-ag.gc b/goal_src/jak1/import/ropebridge-32-ag.gc similarity index 100% rename from goal_src/import/ropebridge-32-ag.gc rename to goal_src/jak1/import/ropebridge-32-ag.gc diff --git a/goal_src/import/ropebridge-36-ag.gc b/goal_src/jak1/import/ropebridge-36-ag.gc similarity index 100% rename from goal_src/import/ropebridge-36-ag.gc rename to goal_src/jak1/import/ropebridge-36-ag.gc diff --git a/goal_src/import/ropebridge-52-ag.gc b/goal_src/jak1/import/ropebridge-52-ag.gc similarity index 100% rename from goal_src/import/ropebridge-52-ag.gc rename to goal_src/jak1/import/ropebridge-52-ag.gc diff --git a/goal_src/import/ropebridge-70-ag.gc b/goal_src/jak1/import/ropebridge-70-ag.gc similarity index 100% rename from goal_src/import/ropebridge-70-ag.gc rename to goal_src/jak1/import/ropebridge-70-ag.gc diff --git a/goal_src/import/rounddoor-ag.gc b/goal_src/jak1/import/rounddoor-ag.gc similarity index 100% rename from goal_src/import/rounddoor-ag.gc rename to goal_src/jak1/import/rounddoor-ag.gc diff --git a/goal_src/import/sack-ag.gc b/goal_src/jak1/import/sack-ag.gc similarity index 100% rename from goal_src/import/sack-ag.gc rename to goal_src/jak1/import/sack-ag.gc diff --git a/goal_src/import/sage-ag.gc b/goal_src/jak1/import/sage-ag.gc similarity index 100% rename from goal_src/import/sage-ag.gc rename to goal_src/jak1/import/sage-ag.gc diff --git a/goal_src/import/sage-bluehut-ag.gc b/goal_src/jak1/import/sage-bluehut-ag.gc similarity index 100% rename from goal_src/import/sage-bluehut-ag.gc rename to goal_src/jak1/import/sage-bluehut-ag.gc diff --git a/goal_src/import/sage-village3-ag.gc b/goal_src/jak1/import/sage-village3-ag.gc similarity index 100% rename from goal_src/import/sage-village3-ag.gc rename to goal_src/jak1/import/sage-village3-ag.gc diff --git a/goal_src/import/sagesail-ag.gc b/goal_src/jak1/import/sagesail-ag.gc similarity index 100% rename from goal_src/import/sagesail-ag.gc rename to goal_src/jak1/import/sagesail-ag.gc diff --git a/goal_src/import/scarecrow-a-ag.gc b/goal_src/jak1/import/scarecrow-a-ag.gc similarity index 100% rename from goal_src/import/scarecrow-a-ag.gc rename to goal_src/jak1/import/scarecrow-a-ag.gc diff --git a/goal_src/import/scarecrow-b-ag.gc b/goal_src/jak1/import/scarecrow-b-ag.gc similarity index 100% rename from goal_src/import/scarecrow-b-ag.gc rename to goal_src/jak1/import/scarecrow-b-ag.gc diff --git a/goal_src/import/sculptor-ag.gc b/goal_src/jak1/import/sculptor-ag.gc similarity index 100% rename from goal_src/import/sculptor-ag.gc rename to goal_src/jak1/import/sculptor-ag.gc diff --git a/goal_src/import/sculptor-muse-ag.gc b/goal_src/jak1/import/sculptor-muse-ag.gc similarity index 100% rename from goal_src/import/sculptor-muse-ag.gc rename to goal_src/jak1/import/sculptor-muse-ag.gc diff --git a/goal_src/import/seagull-ag.gc b/goal_src/jak1/import/seagull-ag.gc similarity index 100% rename from goal_src/import/seagull-ag.gc rename to goal_src/jak1/import/seagull-ag.gc diff --git a/goal_src/import/seaweed-ag.gc b/goal_src/jak1/import/seaweed-ag.gc similarity index 100% rename from goal_src/import/seaweed-ag.gc rename to goal_src/jak1/import/seaweed-ag.gc diff --git a/goal_src/import/sharkey-ag.gc b/goal_src/jak1/import/sharkey-ag.gc similarity index 100% rename from goal_src/import/sharkey-ag.gc rename to goal_src/jak1/import/sharkey-ag.gc diff --git a/goal_src/import/shortcut-boulder-ag.gc b/goal_src/jak1/import/shortcut-boulder-ag.gc similarity index 100% rename from goal_src/import/shortcut-boulder-ag.gc rename to goal_src/jak1/import/shortcut-boulder-ag.gc diff --git a/goal_src/import/shover-ag.gc b/goal_src/jak1/import/shover-ag.gc similarity index 100% rename from goal_src/import/shover-ag.gc rename to goal_src/jak1/import/shover-ag.gc diff --git a/goal_src/import/side-to-side-plat-ag.gc b/goal_src/jak1/import/side-to-side-plat-ag.gc similarity index 100% rename from goal_src/import/side-to-side-plat-ag.gc rename to goal_src/jak1/import/side-to-side-plat-ag.gc diff --git a/goal_src/import/sidedoor-ag.gc b/goal_src/jak1/import/sidedoor-ag.gc similarity index 100% rename from goal_src/import/sidedoor-ag.gc rename to goal_src/jak1/import/sidedoor-ag.gc diff --git a/goal_src/import/sidekick-ag.gc b/goal_src/jak1/import/sidekick-ag.gc similarity index 100% rename from goal_src/import/sidekick-ag.gc rename to goal_src/jak1/import/sidekick-ag.gc diff --git a/goal_src/import/sidekick-human-ag.gc b/goal_src/jak1/import/sidekick-human-ag.gc similarity index 100% rename from goal_src/import/sidekick-human-ag.gc rename to goal_src/jak1/import/sidekick-human-ag.gc diff --git a/goal_src/import/silodoor-ag.gc b/goal_src/jak1/import/silodoor-ag.gc similarity index 100% rename from goal_src/import/silodoor-ag.gc rename to goal_src/jak1/import/silodoor-ag.gc diff --git a/goal_src/import/silostep-ag.gc b/goal_src/jak1/import/silostep-ag.gc similarity index 100% rename from goal_src/import/silostep-ag.gc rename to goal_src/jak1/import/silostep-ag.gc diff --git a/goal_src/import/snow-ball-ag.gc b/goal_src/jak1/import/snow-ball-ag.gc similarity index 100% rename from goal_src/import/snow-ball-ag.gc rename to goal_src/jak1/import/snow-ball-ag.gc diff --git a/goal_src/import/snow-bridge-36-ag.gc b/goal_src/jak1/import/snow-bridge-36-ag.gc similarity index 100% rename from goal_src/import/snow-bridge-36-ag.gc rename to goal_src/jak1/import/snow-bridge-36-ag.gc diff --git a/goal_src/import/snow-bumper-ag.gc b/goal_src/jak1/import/snow-bumper-ag.gc similarity index 100% rename from goal_src/import/snow-bumper-ag.gc rename to goal_src/jak1/import/snow-bumper-ag.gc diff --git a/goal_src/import/snow-bunny-ag.gc b/goal_src/jak1/import/snow-bunny-ag.gc similarity index 100% rename from goal_src/import/snow-bunny-ag.gc rename to goal_src/jak1/import/snow-bunny-ag.gc diff --git a/goal_src/import/snow-button-ag.gc b/goal_src/jak1/import/snow-button-ag.gc similarity index 100% rename from goal_src/import/snow-button-ag.gc rename to goal_src/jak1/import/snow-button-ag.gc diff --git a/goal_src/import/snow-eggtop-ag.gc b/goal_src/jak1/import/snow-eggtop-ag.gc similarity index 100% rename from goal_src/import/snow-eggtop-ag.gc rename to goal_src/jak1/import/snow-eggtop-ag.gc diff --git a/goal_src/import/snow-fort-gate-ag.gc b/goal_src/jak1/import/snow-fort-gate-ag.gc similarity index 100% rename from goal_src/import/snow-fort-gate-ag.gc rename to goal_src/jak1/import/snow-fort-gate-ag.gc diff --git a/goal_src/import/snow-gears-ag.gc b/goal_src/jak1/import/snow-gears-ag.gc similarity index 100% rename from goal_src/import/snow-gears-ag.gc rename to goal_src/jak1/import/snow-gears-ag.gc diff --git a/goal_src/import/snow-log-ag.gc b/goal_src/jak1/import/snow-log-ag.gc similarity index 100% rename from goal_src/import/snow-log-ag.gc rename to goal_src/jak1/import/snow-log-ag.gc diff --git a/goal_src/import/snow-spatula-ag.gc b/goal_src/jak1/import/snow-spatula-ag.gc similarity index 100% rename from goal_src/import/snow-spatula-ag.gc rename to goal_src/jak1/import/snow-spatula-ag.gc diff --git a/goal_src/import/snow-switch-ag.gc b/goal_src/jak1/import/snow-switch-ag.gc similarity index 100% rename from goal_src/import/snow-switch-ag.gc rename to goal_src/jak1/import/snow-switch-ag.gc diff --git a/goal_src/import/snowcam-ag.gc b/goal_src/jak1/import/snowcam-ag.gc similarity index 100% rename from goal_src/import/snowcam-ag.gc rename to goal_src/jak1/import/snowcam-ag.gc diff --git a/goal_src/import/snowpusher-ag.gc b/goal_src/jak1/import/snowpusher-ag.gc similarity index 100% rename from goal_src/import/snowpusher-ag.gc rename to goal_src/jak1/import/snowpusher-ag.gc diff --git a/goal_src/import/speaker-ag.gc b/goal_src/jak1/import/speaker-ag.gc similarity index 100% rename from goal_src/import/speaker-ag.gc rename to goal_src/jak1/import/speaker-ag.gc diff --git a/goal_src/import/spider-egg-ag.gc b/goal_src/jak1/import/spider-egg-ag.gc similarity index 100% rename from goal_src/import/spider-egg-ag.gc rename to goal_src/jak1/import/spider-egg-ag.gc diff --git a/goal_src/import/spiderwebs-ag.gc b/goal_src/jak1/import/spiderwebs-ag.gc similarity index 100% rename from goal_src/import/spiderwebs-ag.gc rename to goal_src/jak1/import/spiderwebs-ag.gc diff --git a/goal_src/import/spike-ag.gc b/goal_src/jak1/import/spike-ag.gc similarity index 100% rename from goal_src/import/spike-ag.gc rename to goal_src/jak1/import/spike-ag.gc diff --git a/goal_src/import/square-platform-ag.gc b/goal_src/jak1/import/square-platform-ag.gc similarity index 100% rename from goal_src/import/square-platform-ag.gc rename to goal_src/jak1/import/square-platform-ag.gc diff --git a/goal_src/import/steam-cap-ag.gc b/goal_src/jak1/import/steam-cap-ag.gc similarity index 100% rename from goal_src/import/steam-cap-ag.gc rename to goal_src/jak1/import/steam-cap-ag.gc diff --git a/goal_src/import/sun-iris-door-ag.gc b/goal_src/jak1/import/sun-iris-door-ag.gc similarity index 100% rename from goal_src/import/sun-iris-door-ag.gc rename to goal_src/jak1/import/sun-iris-door-ag.gc diff --git a/goal_src/import/sunken-elevator-ag.gc b/goal_src/jak1/import/sunken-elevator-ag.gc similarity index 100% rename from goal_src/import/sunken-elevator-ag.gc rename to goal_src/jak1/import/sunken-elevator-ag.gc diff --git a/goal_src/import/sunkencam-ag.gc b/goal_src/jak1/import/sunkencam-ag.gc similarity index 100% rename from goal_src/import/sunkencam-ag.gc rename to goal_src/jak1/import/sunkencam-ag.gc diff --git a/goal_src/import/sunkenfisha-ag.gc b/goal_src/jak1/import/sunkenfisha-ag.gc similarity index 100% rename from goal_src/import/sunkenfisha-ag.gc rename to goal_src/jak1/import/sunkenfisha-ag.gc diff --git a/goal_src/import/swamp-bat-ag.gc b/goal_src/jak1/import/swamp-bat-ag.gc similarity index 100% rename from goal_src/import/swamp-bat-ag.gc rename to goal_src/jak1/import/swamp-bat-ag.gc diff --git a/goal_src/import/swamp-blimp-ag.gc b/goal_src/jak1/import/swamp-blimp-ag.gc similarity index 100% rename from goal_src/import/swamp-blimp-ag.gc rename to goal_src/jak1/import/swamp-blimp-ag.gc diff --git a/goal_src/import/swamp-rat-ag.gc b/goal_src/jak1/import/swamp-rat-ag.gc similarity index 100% rename from goal_src/import/swamp-rat-ag.gc rename to goal_src/jak1/import/swamp-rat-ag.gc diff --git a/goal_src/import/swamp-rat-nest-ag.gc b/goal_src/jak1/import/swamp-rat-nest-ag.gc similarity index 100% rename from goal_src/import/swamp-rat-nest-ag.gc rename to goal_src/jak1/import/swamp-rat-nest-ag.gc diff --git a/goal_src/import/swamp-rock-ag.gc b/goal_src/jak1/import/swamp-rock-ag.gc similarity index 100% rename from goal_src/import/swamp-rock-ag.gc rename to goal_src/jak1/import/swamp-rock-ag.gc diff --git a/goal_src/import/swamp-rope-ag.gc b/goal_src/jak1/import/swamp-rope-ag.gc similarity index 100% rename from goal_src/import/swamp-rope-ag.gc rename to goal_src/jak1/import/swamp-rope-ag.gc diff --git a/goal_src/import/swamp-spike-ag.gc b/goal_src/jak1/import/swamp-spike-ag.gc similarity index 100% rename from goal_src/import/swamp-spike-ag.gc rename to goal_src/jak1/import/swamp-spike-ag.gc diff --git a/goal_src/import/swamp-tetherrock-ag.gc b/goal_src/jak1/import/swamp-tetherrock-ag.gc similarity index 100% rename from goal_src/import/swamp-tetherrock-ag.gc rename to goal_src/jak1/import/swamp-tetherrock-ag.gc diff --git a/goal_src/import/swamp-tetherrock-explode-ag.gc b/goal_src/jak1/import/swamp-tetherrock-explode-ag.gc similarity index 100% rename from goal_src/import/swamp-tetherrock-explode-ag.gc rename to goal_src/jak1/import/swamp-tetherrock-explode-ag.gc diff --git a/goal_src/import/swampcam-ag.gc b/goal_src/jak1/import/swampcam-ag.gc similarity index 100% rename from goal_src/import/swampcam-ag.gc rename to goal_src/jak1/import/swampcam-ag.gc diff --git a/goal_src/import/tar-plat-ag.gc b/goal_src/jak1/import/tar-plat-ag.gc similarity index 100% rename from goal_src/import/tar-plat-ag.gc rename to goal_src/jak1/import/tar-plat-ag.gc diff --git a/goal_src/import/teetertotter-ag.gc b/goal_src/jak1/import/teetertotter-ag.gc similarity index 100% rename from goal_src/import/teetertotter-ag.gc rename to goal_src/jak1/import/teetertotter-ag.gc diff --git a/goal_src/import/tntbarrel-ag.gc b/goal_src/jak1/import/tntbarrel-ag.gc similarity index 100% rename from goal_src/import/tntbarrel-ag.gc rename to goal_src/jak1/import/tntbarrel-ag.gc diff --git a/goal_src/import/towertop-ag.gc b/goal_src/jak1/import/towertop-ag.gc similarity index 100% rename from goal_src/import/towertop-ag.gc rename to goal_src/jak1/import/towertop-ag.gc diff --git a/goal_src/import/trainingcam-ag.gc b/goal_src/jak1/import/trainingcam-ag.gc similarity index 100% rename from goal_src/import/trainingcam-ag.gc rename to goal_src/jak1/import/trainingcam-ag.gc diff --git a/goal_src/import/vil3-bridge-36-ag.gc b/goal_src/jak1/import/vil3-bridge-36-ag.gc similarity index 100% rename from goal_src/import/vil3-bridge-36-ag.gc rename to goal_src/jak1/import/vil3-bridge-36-ag.gc diff --git a/goal_src/import/villa-starfish-ag.gc b/goal_src/jak1/import/villa-starfish-ag.gc similarity index 100% rename from goal_src/import/villa-starfish-ag.gc rename to goal_src/jak1/import/villa-starfish-ag.gc diff --git a/goal_src/import/village-cam-ag.gc b/goal_src/jak1/import/village-cam-ag.gc similarity index 100% rename from goal_src/import/village-cam-ag.gc rename to goal_src/jak1/import/village-cam-ag.gc diff --git a/goal_src/import/village1cam-ag.gc b/goal_src/jak1/import/village1cam-ag.gc similarity index 100% rename from goal_src/import/village1cam-ag.gc rename to goal_src/jak1/import/village1cam-ag.gc diff --git a/goal_src/import/village2cam-ag.gc b/goal_src/jak1/import/village2cam-ag.gc similarity index 100% rename from goal_src/import/village2cam-ag.gc rename to goal_src/jak1/import/village2cam-ag.gc diff --git a/goal_src/import/wall-plat-ag.gc b/goal_src/jak1/import/wall-plat-ag.gc similarity index 100% rename from goal_src/import/wall-plat-ag.gc rename to goal_src/jak1/import/wall-plat-ag.gc diff --git a/goal_src/import/warp-gate-switch-ag.gc b/goal_src/jak1/import/warp-gate-switch-ag.gc similarity index 100% rename from goal_src/import/warp-gate-switch-ag.gc rename to goal_src/jak1/import/warp-gate-switch-ag.gc diff --git a/goal_src/import/warpgate-ag.gc b/goal_src/jak1/import/warpgate-ag.gc similarity index 100% rename from goal_src/import/warpgate-ag.gc rename to goal_src/jak1/import/warpgate-ag.gc diff --git a/goal_src/import/warrior-ag.gc b/goal_src/jak1/import/warrior-ag.gc similarity index 100% rename from goal_src/import/warrior-ag.gc rename to goal_src/jak1/import/warrior-ag.gc diff --git a/goal_src/import/water-anim-darkcave-ag.gc b/goal_src/jak1/import/water-anim-darkcave-ag.gc similarity index 100% rename from goal_src/import/water-anim-darkcave-ag.gc rename to goal_src/jak1/import/water-anim-darkcave-ag.gc diff --git a/goal_src/import/water-anim-finalboss-ag.gc b/goal_src/jak1/import/water-anim-finalboss-ag.gc similarity index 100% rename from goal_src/import/water-anim-finalboss-ag.gc rename to goal_src/jak1/import/water-anim-finalboss-ag.gc diff --git a/goal_src/import/water-anim-jungle-ag.gc b/goal_src/jak1/import/water-anim-jungle-ag.gc similarity index 100% rename from goal_src/import/water-anim-jungle-ag.gc rename to goal_src/jak1/import/water-anim-jungle-ag.gc diff --git a/goal_src/import/water-anim-lavatube-ag.gc b/goal_src/jak1/import/water-anim-lavatube-ag.gc similarity index 100% rename from goal_src/import/water-anim-lavatube-ag.gc rename to goal_src/jak1/import/water-anim-lavatube-ag.gc diff --git a/goal_src/import/water-anim-maincave-ag.gc b/goal_src/jak1/import/water-anim-maincave-ag.gc similarity index 100% rename from goal_src/import/water-anim-maincave-ag.gc rename to goal_src/jak1/import/water-anim-maincave-ag.gc diff --git a/goal_src/import/water-anim-maincave-water-ag.gc b/goal_src/jak1/import/water-anim-maincave-water-ag.gc similarity index 100% rename from goal_src/import/water-anim-maincave-water-ag.gc rename to goal_src/jak1/import/water-anim-maincave-water-ag.gc diff --git a/goal_src/import/water-anim-misty-ag.gc b/goal_src/jak1/import/water-anim-misty-ag.gc similarity index 100% rename from goal_src/import/water-anim-misty-ag.gc rename to goal_src/jak1/import/water-anim-misty-ag.gc diff --git a/goal_src/import/water-anim-ogre-ag.gc b/goal_src/jak1/import/water-anim-ogre-ag.gc similarity index 100% rename from goal_src/import/water-anim-ogre-ag.gc rename to goal_src/jak1/import/water-anim-ogre-ag.gc diff --git a/goal_src/import/water-anim-robocave-ag.gc b/goal_src/jak1/import/water-anim-robocave-ag.gc similarity index 100% rename from goal_src/import/water-anim-robocave-ag.gc rename to goal_src/jak1/import/water-anim-robocave-ag.gc diff --git a/goal_src/import/water-anim-rolling-ag.gc b/goal_src/jak1/import/water-anim-rolling-ag.gc similarity index 100% rename from goal_src/import/water-anim-rolling-ag.gc rename to goal_src/jak1/import/water-anim-rolling-ag.gc diff --git a/goal_src/import/water-anim-sunken-ag.gc b/goal_src/jak1/import/water-anim-sunken-ag.gc similarity index 100% rename from goal_src/import/water-anim-sunken-ag.gc rename to goal_src/jak1/import/water-anim-sunken-ag.gc diff --git a/goal_src/import/water-anim-sunken-dark-eco-ag.gc b/goal_src/jak1/import/water-anim-sunken-dark-eco-ag.gc similarity index 100% rename from goal_src/import/water-anim-sunken-dark-eco-ag.gc rename to goal_src/jak1/import/water-anim-sunken-dark-eco-ag.gc diff --git a/goal_src/import/water-anim-training-ag.gc b/goal_src/jak1/import/water-anim-training-ag.gc similarity index 100% rename from goal_src/import/water-anim-training-ag.gc rename to goal_src/jak1/import/water-anim-training-ag.gc diff --git a/goal_src/import/water-anim-village1-ag.gc b/goal_src/jak1/import/water-anim-village1-ag.gc similarity index 100% rename from goal_src/import/water-anim-village1-ag.gc rename to goal_src/jak1/import/water-anim-village1-ag.gc diff --git a/goal_src/import/water-anim-village2-ag.gc b/goal_src/jak1/import/water-anim-village2-ag.gc similarity index 100% rename from goal_src/import/water-anim-village2-ag.gc rename to goal_src/jak1/import/water-anim-village2-ag.gc diff --git a/goal_src/import/water-anim-village3-ag.gc b/goal_src/jak1/import/water-anim-village3-ag.gc similarity index 100% rename from goal_src/import/water-anim-village3-ag.gc rename to goal_src/jak1/import/water-anim-village3-ag.gc diff --git a/goal_src/import/wedge-plat-ag.gc b/goal_src/jak1/import/wedge-plat-ag.gc similarity index 100% rename from goal_src/import/wedge-plat-ag.gc rename to goal_src/jak1/import/wedge-plat-ag.gc diff --git a/goal_src/import/wedge-plat-outer-ag.gc b/goal_src/jak1/import/wedge-plat-outer-ag.gc similarity index 100% rename from goal_src/import/wedge-plat-outer-ag.gc rename to goal_src/jak1/import/wedge-plat-outer-ag.gc diff --git a/goal_src/import/wheel-ag.gc b/goal_src/jak1/import/wheel-ag.gc similarity index 100% rename from goal_src/import/wheel-ag.gc rename to goal_src/jak1/import/wheel-ag.gc diff --git a/goal_src/import/whirlpool-ag.gc b/goal_src/jak1/import/whirlpool-ag.gc similarity index 100% rename from goal_src/import/whirlpool-ag.gc rename to goal_src/jak1/import/whirlpool-ag.gc diff --git a/goal_src/import/windmill-one-ag.gc b/goal_src/jak1/import/windmill-one-ag.gc similarity index 100% rename from goal_src/import/windmill-one-ag.gc rename to goal_src/jak1/import/windmill-one-ag.gc diff --git a/goal_src/import/windmill-sail-ag.gc b/goal_src/jak1/import/windmill-sail-ag.gc similarity index 100% rename from goal_src/import/windmill-sail-ag.gc rename to goal_src/jak1/import/windmill-sail-ag.gc diff --git a/goal_src/import/windspinner-ag.gc b/goal_src/jak1/import/windspinner-ag.gc similarity index 100% rename from goal_src/import/windspinner-ag.gc rename to goal_src/jak1/import/windspinner-ag.gc diff --git a/goal_src/import/windturbine-ag.gc b/goal_src/jak1/import/windturbine-ag.gc similarity index 100% rename from goal_src/import/windturbine-ag.gc rename to goal_src/jak1/import/windturbine-ag.gc diff --git a/goal_src/import/yakow-ag.gc b/goal_src/jak1/import/yakow-ag.gc similarity index 100% rename from goal_src/import/yakow-ag.gc rename to goal_src/jak1/import/yakow-ag.gc diff --git a/goal_src/import/yellowsage-ag.gc b/goal_src/jak1/import/yellowsage-ag.gc similarity index 100% rename from goal_src/import/yellowsage-ag.gc rename to goal_src/jak1/import/yellowsage-ag.gc diff --git a/goal_src/import/yeti-ag.gc b/goal_src/jak1/import/yeti-ag.gc similarity index 100% rename from goal_src/import/yeti-ag.gc rename to goal_src/jak1/import/yeti-ag.gc diff --git a/goal_src/kernel-defs.gc b/goal_src/jak1/kernel-defs.gc similarity index 100% rename from goal_src/kernel-defs.gc rename to goal_src/jak1/kernel-defs.gc diff --git a/goal_src/kernel/dgo-h.gc b/goal_src/jak1/kernel/dgo-h.gc similarity index 100% rename from goal_src/kernel/dgo-h.gc rename to goal_src/jak1/kernel/dgo-h.gc diff --git a/goal_src/kernel/gcommon.gc b/goal_src/jak1/kernel/gcommon.gc similarity index 100% rename from goal_src/kernel/gcommon.gc rename to goal_src/jak1/kernel/gcommon.gc diff --git a/goal_src/kernel/gkernel-h.gc b/goal_src/jak1/kernel/gkernel-h.gc similarity index 100% rename from goal_src/kernel/gkernel-h.gc rename to goal_src/jak1/kernel/gkernel-h.gc diff --git a/goal_src/kernel/gkernel.gc b/goal_src/jak1/kernel/gkernel.gc similarity index 100% rename from goal_src/kernel/gkernel.gc rename to goal_src/jak1/kernel/gkernel.gc diff --git a/goal_src/kernel/gstate.gc b/goal_src/jak1/kernel/gstate.gc similarity index 100% rename from goal_src/kernel/gstate.gc rename to goal_src/jak1/kernel/gstate.gc diff --git a/goal_src/kernel/gstring-h.gc b/goal_src/jak1/kernel/gstring-h.gc similarity index 100% rename from goal_src/kernel/gstring-h.gc rename to goal_src/jak1/kernel/gstring-h.gc diff --git a/goal_src/kernel/gstring.gc b/goal_src/jak1/kernel/gstring.gc similarity index 100% rename from goal_src/kernel/gstring.gc rename to goal_src/jak1/kernel/gstring.gc diff --git a/goal_src/kernel/pskernel.gc b/goal_src/jak1/kernel/pskernel.gc similarity index 100% rename from goal_src/kernel/pskernel.gc rename to goal_src/jak1/kernel/pskernel.gc diff --git a/goal_src/levels/beach/air-h.gc b/goal_src/jak1/levels/beach/air-h.gc similarity index 100% rename from goal_src/levels/beach/air-h.gc rename to goal_src/jak1/levels/beach/air-h.gc diff --git a/goal_src/levels/beach/air.gc b/goal_src/jak1/levels/beach/air.gc similarity index 100% rename from goal_src/levels/beach/air.gc rename to goal_src/jak1/levels/beach/air.gc diff --git a/goal_src/levels/beach/beach-obs.gc b/goal_src/jak1/levels/beach/beach-obs.gc similarity index 99% rename from goal_src/levels/beach/beach-obs.gc rename to goal_src/jak1/levels/beach/beach-obs.gc index a322d1fc6f..5075eb8b5c 100644 --- a/goal_src/levels/beach/beach-obs.gc +++ b/goal_src/jak1/levels/beach/beach-obs.gc @@ -9,15 +9,15 @@ ;; DECOMP BEGINS -(import "goal_src/import/ecoventrock-ag.gc") -(import "goal_src/import/beachcam-ag.gc") -(import "goal_src/import/windmill-one-ag.gc") -(import "goal_src/import/kickrock-ag.gc") -(import "goal_src/import/harvester-ag.gc") -(import "goal_src/import/flutflutegg-ag.gc") -(import "goal_src/import/grottopole-ag.gc") -(import "goal_src/import/flutflut-ag.gc") -(import "goal_src/import/bladeassm-ag.gc") +(import "goal_src/jak1/import/ecoventrock-ag.gc") +(import "goal_src/jak1/import/beachcam-ag.gc") +(import "goal_src/jak1/import/windmill-one-ag.gc") +(import "goal_src/jak1/import/kickrock-ag.gc") +(import "goal_src/jak1/import/harvester-ag.gc") +(import "goal_src/jak1/import/flutflutegg-ag.gc") +(import "goal_src/jak1/import/grottopole-ag.gc") +(import "goal_src/jak1/import/flutflut-ag.gc") +(import "goal_src/jak1/import/bladeassm-ag.gc") (defskelgroup *beachcam-sg* beachcam beachcam-lod0-jg beachcam-anim-ja ((beachcam-lod0-mg (meters 999999))) diff --git a/goal_src/levels/beach/beach-part.gc b/goal_src/jak1/levels/beach/beach-part.gc similarity index 100% rename from goal_src/levels/beach/beach-part.gc rename to goal_src/jak1/levels/beach/beach-part.gc diff --git a/goal_src/levels/beach/beach-rocks.gc b/goal_src/jak1/levels/beach/beach-rocks.gc similarity index 99% rename from goal_src/levels/beach/beach-rocks.gc rename to goal_src/jak1/levels/beach/beach-rocks.gc index 6f2ab0b7d1..30fb1a3df1 100644 --- a/goal_src/levels/beach/beach-rocks.gc +++ b/goal_src/jak1/levels/beach/beach-rocks.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/lrocklrg-ag.gc") +(import "goal_src/jak1/import/lrocklrg-ag.gc") (defskelgroup *lrocklrg-sg* lrocklrg lrocklrg-lod0-jg lrocklrg-idle-ja ((lrocklrg-lod0-mg (meters 999999))) diff --git a/goal_src/levels/beach/bird-lady-beach.gc b/goal_src/jak1/levels/beach/bird-lady-beach.gc similarity index 98% rename from goal_src/levels/beach/bird-lady-beach.gc rename to goal_src/jak1/levels/beach/bird-lady-beach.gc index e0f388b267..41273331d8 100644 --- a/goal_src/levels/beach/bird-lady-beach.gc +++ b/goal_src/jak1/levels/beach/bird-lady-beach.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/bird-lady-beach-ag.gc") +(import "goal_src/jak1/import/bird-lady-beach-ag.gc") (deftype bird-lady-beach (process-taskable) ((flutflut handle :offset-assert 384) diff --git a/goal_src/levels/beach/bird-lady.gc b/goal_src/jak1/levels/beach/bird-lady.gc similarity index 99% rename from goal_src/levels/beach/bird-lady.gc rename to goal_src/jak1/levels/beach/bird-lady.gc index 0435e3c041..c6c1d1cea2 100644 --- a/goal_src/levels/beach/bird-lady.gc +++ b/goal_src/jak1/levels/beach/bird-lady.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/bird-lady-ag.gc") +(import "goal_src/jak1/import/bird-lady-ag.gc") (deftype bird-lady (process-taskable) () diff --git a/goal_src/levels/beach/lurkercrab.gc b/goal_src/jak1/levels/beach/lurkercrab.gc similarity index 99% rename from goal_src/levels/beach/lurkercrab.gc rename to goal_src/jak1/levels/beach/lurkercrab.gc index 53eb409c0d..950589af11 100644 --- a/goal_src/levels/beach/lurkercrab.gc +++ b/goal_src/jak1/levels/beach/lurkercrab.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/lurkercrab-ag.gc") +(import "goal_src/jak1/import/lurkercrab-ag.gc") (defpartgroup group-lurkercrab-slide :id 159 diff --git a/goal_src/levels/beach/lurkerpuppy.gc b/goal_src/jak1/levels/beach/lurkerpuppy.gc similarity index 99% rename from goal_src/levels/beach/lurkerpuppy.gc rename to goal_src/jak1/levels/beach/lurkerpuppy.gc index 7b8460c1c1..7056712508 100644 --- a/goal_src/levels/beach/lurkerpuppy.gc +++ b/goal_src/jak1/levels/beach/lurkerpuppy.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/lurkerpuppy-ag.gc") +(import "goal_src/jak1/import/lurkerpuppy-ag.gc") (deftype lurkerpuppy (nav-enemy) () diff --git a/goal_src/levels/beach/lurkerworm.gc b/goal_src/jak1/levels/beach/lurkerworm.gc similarity index 99% rename from goal_src/levels/beach/lurkerworm.gc rename to goal_src/jak1/levels/beach/lurkerworm.gc index b7d16a2ff9..8c65a75e11 100644 --- a/goal_src/levels/beach/lurkerworm.gc +++ b/goal_src/jak1/levels/beach/lurkerworm.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/lurkerworm-ag.gc") +(import "goal_src/jak1/import/lurkerworm-ag.gc") (deftype lurkerworm (process-drawable) ((root-override collide-shape-moving :offset 112) diff --git a/goal_src/levels/beach/mayor.gc b/goal_src/jak1/levels/beach/mayor.gc similarity index 99% rename from goal_src/levels/beach/mayor.gc rename to goal_src/jak1/levels/beach/mayor.gc index 84c109de5a..ce05519dbb 100644 --- a/goal_src/levels/beach/mayor.gc +++ b/goal_src/jak1/levels/beach/mayor.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/mayor-ag.gc") +(import "goal_src/jak1/import/mayor-ag.gc") (deftype mayor (process-taskable) () diff --git a/goal_src/levels/beach/pelican.gc b/goal_src/jak1/levels/beach/pelican.gc similarity index 99% rename from goal_src/levels/beach/pelican.gc rename to goal_src/jak1/levels/beach/pelican.gc index 702fea9c01..71bcd2f0f0 100644 --- a/goal_src/levels/beach/pelican.gc +++ b/goal_src/jak1/levels/beach/pelican.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/pelican-ag.gc") +(import "goal_src/jak1/import/pelican-ag.gc") (deftype pelican-bank (basic) ((circle-speed meters :offset-assert 4) diff --git a/goal_src/levels/beach/sculptor.gc b/goal_src/jak1/levels/beach/sculptor.gc similarity index 99% rename from goal_src/levels/beach/sculptor.gc rename to goal_src/jak1/levels/beach/sculptor.gc index 3195db4c61..b60eae0caf 100644 --- a/goal_src/levels/beach/sculptor.gc +++ b/goal_src/jak1/levels/beach/sculptor.gc @@ -8,8 +8,8 @@ ;; DECOMP BEGINS -(import "goal_src/import/sculptor-muse-ag.gc") -(import "goal_src/import/sculptor-ag.gc") +(import "goal_src/jak1/import/sculptor-muse-ag.gc") +(import "goal_src/jak1/import/sculptor-ag.gc") (deftype sculptor (process-taskable) ((muse handle :offset-assert 384) diff --git a/goal_src/levels/beach/seagull.gc b/goal_src/jak1/levels/beach/seagull.gc similarity index 99% rename from goal_src/levels/beach/seagull.gc rename to goal_src/jak1/levels/beach/seagull.gc index 0ed5cb74a4..065e3a45bc 100644 --- a/goal_src/levels/beach/seagull.gc +++ b/goal_src/jak1/levels/beach/seagull.gc @@ -10,7 +10,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/seagull-ag.gc") +(import "goal_src/jak1/import/seagull-ag.gc") (defpartgroup group-seagull-takeoff :id 160 diff --git a/goal_src/levels/beach/twister.gc b/goal_src/jak1/levels/beach/twister.gc similarity index 100% rename from goal_src/levels/beach/twister.gc rename to goal_src/jak1/levels/beach/twister.gc diff --git a/goal_src/levels/beach/wobbler.gc b/goal_src/jak1/levels/beach/wobbler.gc similarity index 100% rename from goal_src/levels/beach/wobbler.gc rename to goal_src/jak1/levels/beach/wobbler.gc diff --git a/goal_src/levels/citadel/assistant-citadel.gc b/goal_src/jak1/levels/citadel/assistant-citadel.gc similarity index 98% rename from goal_src/levels/citadel/assistant-citadel.gc rename to goal_src/jak1/levels/citadel/assistant-citadel.gc index 70613240a6..7902f1c0f9 100644 --- a/goal_src/levels/citadel/assistant-citadel.gc +++ b/goal_src/jak1/levels/citadel/assistant-citadel.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/assistant-lavatube-end-ag.gc") +(import "goal_src/jak1/import/assistant-lavatube-end-ag.gc") (deftype assistant-lavatube-end (process-taskable) () diff --git a/goal_src/levels/citadel/citadel-obs.gc b/goal_src/jak1/levels/citadel/citadel-obs.gc similarity index 98% rename from goal_src/levels/citadel/citadel-obs.gc rename to goal_src/jak1/levels/citadel/citadel-obs.gc index d1c6ffd9b2..0524fb8001 100644 --- a/goal_src/levels/citadel/citadel-obs.gc +++ b/goal_src/jak1/levels/citadel/citadel-obs.gc @@ -7,17 +7,17 @@ ;; DECOMP BEGINS -(import "goal_src/import/citb-generator-ag.gc") -(import "goal_src/import/citb-launcher-ag.gc") -(import "goal_src/import/citb-button-ag.gc") -(import "goal_src/import/citadelcam-ag.gc") -(import "goal_src/import/citb-hose-ag.gc") -(import "goal_src/import/citb-robotboss-ag.gc") -(import "goal_src/import/citb-coil-ag.gc") -(import "goal_src/import/citb-arm-shoulder-ag.gc") -(import "goal_src/import/citb-iris-door-ag.gc") -(import "goal_src/import/citb-disc-ag.gc") -(import "goal_src/import/citb-arm-ag.gc") +(import "goal_src/jak1/import/citb-generator-ag.gc") +(import "goal_src/jak1/import/citb-launcher-ag.gc") +(import "goal_src/jak1/import/citb-button-ag.gc") +(import "goal_src/jak1/import/citadelcam-ag.gc") +(import "goal_src/jak1/import/citb-hose-ag.gc") +(import "goal_src/jak1/import/citb-robotboss-ag.gc") +(import "goal_src/jak1/import/citb-coil-ag.gc") +(import "goal_src/jak1/import/citb-arm-shoulder-ag.gc") +(import "goal_src/jak1/import/citb-iris-door-ag.gc") +(import "goal_src/jak1/import/citb-disc-ag.gc") +(import "goal_src/jak1/import/citb-arm-ag.gc") (deftype citb-arm-section (process-drawable) ((sync sync-info :inline :offset-assert 176) diff --git a/goal_src/levels/citadel/citadel-part.gc b/goal_src/jak1/levels/citadel/citadel-part.gc similarity index 100% rename from goal_src/levels/citadel/citadel-part.gc rename to goal_src/jak1/levels/citadel/citadel-part.gc diff --git a/goal_src/levels/citadel/citadel-sages.gc b/goal_src/jak1/levels/citadel/citadel-sages.gc similarity index 99% rename from goal_src/levels/citadel/citadel-sages.gc rename to goal_src/jak1/levels/citadel/citadel-sages.gc index e8e9215a92..baf146e07b 100644 --- a/goal_src/levels/citadel/citadel-sages.gc +++ b/goal_src/jak1/levels/citadel/citadel-sages.gc @@ -12,13 +12,13 @@ ;; DECOMP BEGINS -(import "goal_src/import/green-sagecage-ag.gc") -(import "goal_src/import/yellowsage-ag.gc") -(import "goal_src/import/redsage-ag.gc") -(import "goal_src/import/evilbro-citadel-ag.gc") -(import "goal_src/import/evilsis-citadel-ag.gc") -(import "goal_src/import/citb-sagecage-ag.gc") -(import "goal_src/import/bluesage-ag.gc") +(import "goal_src/jak1/import/green-sagecage-ag.gc") +(import "goal_src/jak1/import/yellowsage-ag.gc") +(import "goal_src/jak1/import/redsage-ag.gc") +(import "goal_src/jak1/import/evilbro-citadel-ag.gc") +(import "goal_src/jak1/import/evilsis-citadel-ag.gc") +(import "goal_src/jak1/import/citb-sagecage-ag.gc") +(import "goal_src/jak1/import/bluesage-ag.gc") (defskelgroup *citb-sagecage-sg* citb-sagecage citb-sagecage-lod0-jg citb-sagecage-redsage-idle-ja ((citb-sagecage-lod0-mg (meters 20)) (citb-sagecage-lod1-mg (meters 999999))) diff --git a/goal_src/levels/citadel/citb-bunny.gc b/goal_src/jak1/levels/citadel/citb-bunny.gc similarity index 99% rename from goal_src/levels/citadel/citb-bunny.gc rename to goal_src/jak1/levels/citadel/citb-bunny.gc index fc9cde5c53..83cc44ae2e 100644 --- a/goal_src/levels/citadel/citb-bunny.gc +++ b/goal_src/jak1/levels/citadel/citb-bunny.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/citb-bunny-ag.gc") +(import "goal_src/jak1/import/citb-bunny-ag.gc") (deftype citb-bunny (snow-bunny) () diff --git a/goal_src/levels/citadel/citb-drop-plat.gc b/goal_src/jak1/levels/citadel/citb-drop-plat.gc similarity index 99% rename from goal_src/levels/citadel/citb-drop-plat.gc rename to goal_src/jak1/levels/citadel/citb-drop-plat.gc index c731734620..38a293dc80 100644 --- a/goal_src/levels/citadel/citb-drop-plat.gc +++ b/goal_src/jak1/levels/citadel/citb-drop-plat.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/citb-drop-plat-ag.gc") +(import "goal_src/jak1/import/citb-drop-plat-ag.gc") (defskelgroup *citb-drop-plat-sg* citb-drop-plat citb-drop-plat-lod0-jg citb-drop-plat-idle-ja ((citb-drop-plat-lod0-mg (meters 20)) (citb-drop-plat-lod1-mg (meters 999999))) diff --git a/goal_src/levels/citadel/citb-plat.gc b/goal_src/jak1/levels/citadel/citb-plat.gc similarity index 99% rename from goal_src/levels/citadel/citb-plat.gc rename to goal_src/jak1/levels/citadel/citb-plat.gc index 840e4a9cd1..35b11de21d 100644 --- a/goal_src/levels/citadel/citb-plat.gc +++ b/goal_src/jak1/levels/citadel/citb-plat.gc @@ -7,14 +7,14 @@ ;; DECOMP BEGINS -(import "goal_src/import/citb-exit-plat-ag.gc") -(import "goal_src/import/plat-eco-citb-ag.gc") -(import "goal_src/import/plat-citb-ag.gc") -(import "goal_src/import/citb-stopbox-ag.gc") -(import "goal_src/import/citb-firehose-ag.gc") -(import "goal_src/import/citb-rotatebox-ag.gc") -(import "goal_src/import/citb-chain-plat-ag.gc") -(import "goal_src/import/citb-donut-ag.gc") +(import "goal_src/jak1/import/citb-exit-plat-ag.gc") +(import "goal_src/jak1/import/plat-eco-citb-ag.gc") +(import "goal_src/jak1/import/plat-citb-ag.gc") +(import "goal_src/jak1/import/citb-stopbox-ag.gc") +(import "goal_src/jak1/import/citb-firehose-ag.gc") +(import "goal_src/jak1/import/citb-rotatebox-ag.gc") +(import "goal_src/jak1/import/citb-chain-plat-ag.gc") +(import "goal_src/jak1/import/citb-donut-ag.gc") (defskelgroup *plat-citb-sg* plat-citb plat-citb-lod0-jg plat-citb-idle-ja ((plat-citb-lod0-mg (meters 20)) (plat-citb-lod1-mg (meters 999999))) diff --git a/goal_src/levels/common/babak.gc b/goal_src/jak1/levels/common/babak.gc similarity index 99% rename from goal_src/levels/common/babak.gc rename to goal_src/jak1/levels/common/babak.gc index f44b2d06e7..e4421e2dc0 100644 --- a/goal_src/levels/common/babak.gc +++ b/goal_src/jak1/levels/common/babak.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/babak-ag.gc") +(import "goal_src/jak1/import/babak-ag.gc") (deftype babak (nav-enemy) () diff --git a/goal_src/levels/common/basebutton.gc b/goal_src/jak1/levels/common/basebutton.gc similarity index 99% rename from goal_src/levels/common/basebutton.gc rename to goal_src/jak1/levels/common/basebutton.gc index 1be11bb3b4..8b4f46c5cc 100644 --- a/goal_src/levels/common/basebutton.gc +++ b/goal_src/jak1/levels/common/basebutton.gc @@ -8,7 +8,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/generic-button-ag.gc") +(import "goal_src/jak1/import/generic-button-ag.gc") (deftype basebutton (process-drawable) ((root-override collide-shape-moving :offset 112) diff --git a/goal_src/levels/common/baseplat.gc b/goal_src/jak1/levels/common/baseplat.gc similarity index 100% rename from goal_src/levels/common/baseplat.gc rename to goal_src/jak1/levels/common/baseplat.gc diff --git a/goal_src/levels/common/battlecontroller.gc b/goal_src/jak1/levels/common/battlecontroller.gc similarity index 100% rename from goal_src/levels/common/battlecontroller.gc rename to goal_src/jak1/levels/common/battlecontroller.gc diff --git a/goal_src/levels/common/blocking-plane.gc b/goal_src/jak1/levels/common/blocking-plane.gc similarity index 98% rename from goal_src/levels/common/blocking-plane.gc rename to goal_src/jak1/levels/common/blocking-plane.gc index 6bcda23265..257d6d3935 100644 --- a/goal_src/levels/common/blocking-plane.gc +++ b/goal_src/jak1/levels/common/blocking-plane.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/ef-plane-ag.gc") +(import "goal_src/jak1/import/ef-plane-ag.gc") (deftype blocking-plane (process-drawable) () diff --git a/goal_src/levels/common/dark-eco-pool.gc b/goal_src/jak1/levels/common/dark-eco-pool.gc similarity index 100% rename from goal_src/levels/common/dark-eco-pool.gc rename to goal_src/jak1/levels/common/dark-eco-pool.gc diff --git a/goal_src/levels/common/joint-exploder.gc b/goal_src/jak1/levels/common/joint-exploder.gc similarity index 100% rename from goal_src/levels/common/joint-exploder.gc rename to goal_src/jak1/levels/common/joint-exploder.gc diff --git a/goal_src/levels/common/launcherdoor.gc b/goal_src/jak1/levels/common/launcherdoor.gc similarity index 98% rename from goal_src/levels/common/launcherdoor.gc rename to goal_src/jak1/levels/common/launcherdoor.gc index 61b55a52ad..97282e6672 100644 --- a/goal_src/levels/common/launcherdoor.gc +++ b/goal_src/jak1/levels/common/launcherdoor.gc @@ -8,8 +8,8 @@ ;; DECOMP BEGINS -(import "goal_src/import/launcherdoor-maincave-ag.gc") -(import "goal_src/import/launcherdoor-ag.gc") +(import "goal_src/jak1/import/launcherdoor-maincave-ag.gc") +(import "goal_src/jak1/import/launcherdoor-ag.gc") (deftype launcherdoor (process-drawable) ((root-override collide-shape :offset 112) diff --git a/goal_src/levels/common/nav-enemy-h.gc b/goal_src/jak1/levels/common/nav-enemy-h.gc similarity index 100% rename from goal_src/levels/common/nav-enemy-h.gc rename to goal_src/jak1/levels/common/nav-enemy-h.gc diff --git a/goal_src/levels/common/nav-enemy.gc b/goal_src/jak1/levels/common/nav-enemy.gc similarity index 100% rename from goal_src/levels/common/nav-enemy.gc rename to goal_src/jak1/levels/common/nav-enemy.gc diff --git a/goal_src/levels/common/orb-cache.gc b/goal_src/jak1/levels/common/orb-cache.gc similarity index 99% rename from goal_src/levels/common/orb-cache.gc rename to goal_src/jak1/levels/common/orb-cache.gc index 3e4f734d55..2bfaed35d3 100644 --- a/goal_src/levels/common/orb-cache.gc +++ b/goal_src/jak1/levels/common/orb-cache.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/orb-cache-top-ag.gc") +(import "goal_src/jak1/import/orb-cache-top-ag.gc") (deftype orb-cache-top (baseplat) ((active-distance float :offset-assert 228) diff --git a/goal_src/levels/common/plat-button.gc b/goal_src/jak1/levels/common/plat-button.gc similarity index 99% rename from goal_src/levels/common/plat-button.gc rename to goal_src/jak1/levels/common/plat-button.gc index 181875850a..85eb4ac02b 100644 --- a/goal_src/levels/common/plat-button.gc +++ b/goal_src/jak1/levels/common/plat-button.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/plat-button-ag.gc") +(import "goal_src/jak1/import/plat-button-ag.gc") (deftype plat-button (process-drawable) ((root-override collide-shape-moving :offset 112) diff --git a/goal_src/levels/common/plat-eco.gc b/goal_src/jak1/levels/common/plat-eco.gc similarity index 99% rename from goal_src/levels/common/plat-eco.gc rename to goal_src/jak1/levels/common/plat-eco.gc index 83304de0ef..e608535afc 100644 --- a/goal_src/levels/common/plat-eco.gc +++ b/goal_src/jak1/levels/common/plat-eco.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/plat-eco-ag.gc") +(import "goal_src/jak1/import/plat-eco-ag.gc") (deftype plat-eco (plat) ((notice-dist float :offset-assert 264) diff --git a/goal_src/levels/common/plat.gc b/goal_src/jak1/levels/common/plat.gc similarity index 98% rename from goal_src/levels/common/plat.gc rename to goal_src/jak1/levels/common/plat.gc index 0ee4403c3b..bf42bff941 100644 --- a/goal_src/levels/common/plat.gc +++ b/goal_src/jak1/levels/common/plat.gc @@ -7,9 +7,9 @@ ;; DECOMP BEGINS -(import "goal_src/import/plat-sunken-ag.gc") -(import "goal_src/import/plat-ag.gc") -(import "goal_src/import/plat-jungleb-ag.gc") +(import "goal_src/jak1/import/plat-sunken-ag.gc") +(import "goal_src/jak1/import/plat-ag.gc") +(import "goal_src/jak1/import/plat-jungleb-ag.gc") (defpartgroup group-standard-plat :id 107 diff --git a/goal_src/levels/common/rigid-body-h.gc b/goal_src/jak1/levels/common/rigid-body-h.gc similarity index 100% rename from goal_src/levels/common/rigid-body-h.gc rename to goal_src/jak1/levels/common/rigid-body-h.gc diff --git a/goal_src/levels/common/rigid-body.gc b/goal_src/jak1/levels/common/rigid-body.gc similarity index 100% rename from goal_src/levels/common/rigid-body.gc rename to goal_src/jak1/levels/common/rigid-body.gc diff --git a/goal_src/levels/common/ropebridge.gc b/goal_src/jak1/levels/common/ropebridge.gc similarity index 99% rename from goal_src/levels/common/ropebridge.gc rename to goal_src/jak1/levels/common/ropebridge.gc index 12857d9f12..077d0f08d2 100644 --- a/goal_src/levels/common/ropebridge.gc +++ b/goal_src/jak1/levels/common/ropebridge.gc @@ -7,12 +7,12 @@ ;; DECOMP BEGINS -(import "goal_src/import/vil3-bridge-36-ag.gc") -(import "goal_src/import/ropebridge-36-ag.gc") -(import "goal_src/import/ropebridge-32-ag.gc") -(import "goal_src/import/ropebridge-52-ag.gc") -(import "goal_src/import/snow-bridge-36-ag.gc") -(import "goal_src/import/ropebridge-70-ag.gc") +(import "goal_src/jak1/import/vil3-bridge-36-ag.gc") +(import "goal_src/jak1/import/ropebridge-36-ag.gc") +(import "goal_src/jak1/import/ropebridge-32-ag.gc") +(import "goal_src/jak1/import/ropebridge-52-ag.gc") +(import "goal_src/jak1/import/snow-bridge-36-ag.gc") +(import "goal_src/jak1/import/ropebridge-70-ag.gc") (deftype ropebridge-tuning (structure) ((num-springs int32 :offset-assert 0) diff --git a/goal_src/levels/common/sharkey.gc b/goal_src/jak1/levels/common/sharkey.gc similarity index 99% rename from goal_src/levels/common/sharkey.gc rename to goal_src/jak1/levels/common/sharkey.gc index 7f779eb122..4836c39286 100644 --- a/goal_src/levels/common/sharkey.gc +++ b/goal_src/jak1/levels/common/sharkey.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/sharkey-ag.gc") +(import "goal_src/jak1/import/sharkey-ag.gc") (defpartgroup group-sharkey-splash :id 106 diff --git a/goal_src/levels/common/texture-upload.gc b/goal_src/jak1/levels/common/texture-upload.gc similarity index 100% rename from goal_src/levels/common/texture-upload.gc rename to goal_src/jak1/levels/common/texture-upload.gc diff --git a/goal_src/levels/common/ticky.gc b/goal_src/jak1/levels/common/ticky.gc similarity index 100% rename from goal_src/levels/common/ticky.gc rename to goal_src/jak1/levels/common/ticky.gc diff --git a/goal_src/levels/common/tippy.gc b/goal_src/jak1/levels/common/tippy.gc similarity index 100% rename from goal_src/levels/common/tippy.gc rename to goal_src/jak1/levels/common/tippy.gc diff --git a/goal_src/levels/common/water-anim.gc b/goal_src/jak1/levels/common/water-anim.gc similarity index 96% rename from goal_src/levels/common/water-anim.gc rename to goal_src/jak1/levels/common/water-anim.gc index 1082bd9943..7caf76b0d7 100644 --- a/goal_src/levels/common/water-anim.gc +++ b/goal_src/jak1/levels/common/water-anim.gc @@ -7,22 +7,22 @@ ;; DECOMP BEGINS -(import "goal_src/import/water-anim-maincave-ag.gc") -(import "goal_src/import/water-anim-village3-ag.gc") -(import "goal_src/import/water-anim-finalboss-ag.gc") -(import "goal_src/import/water-anim-maincave-water-ag.gc") -(import "goal_src/import/water-anim-sunken-ag.gc") -(import "goal_src/import/water-anim-lavatube-ag.gc") -(import "goal_src/import/water-anim-robocave-ag.gc") -(import "goal_src/import/water-anim-jungle-ag.gc") -(import "goal_src/import/water-anim-ogre-ag.gc") -(import "goal_src/import/water-anim-training-ag.gc") -(import "goal_src/import/water-anim-darkcave-ag.gc") -(import "goal_src/import/water-anim-village1-ag.gc") -(import "goal_src/import/water-anim-rolling-ag.gc") -(import "goal_src/import/water-anim-misty-ag.gc") -(import "goal_src/import/water-anim-sunken-dark-eco-ag.gc") -(import "goal_src/import/water-anim-village2-ag.gc") +(import "goal_src/jak1/import/water-anim-maincave-ag.gc") +(import "goal_src/jak1/import/water-anim-village3-ag.gc") +(import "goal_src/jak1/import/water-anim-finalboss-ag.gc") +(import "goal_src/jak1/import/water-anim-maincave-water-ag.gc") +(import "goal_src/jak1/import/water-anim-sunken-ag.gc") +(import "goal_src/jak1/import/water-anim-lavatube-ag.gc") +(import "goal_src/jak1/import/water-anim-robocave-ag.gc") +(import "goal_src/jak1/import/water-anim-jungle-ag.gc") +(import "goal_src/jak1/import/water-anim-ogre-ag.gc") +(import "goal_src/jak1/import/water-anim-training-ag.gc") +(import "goal_src/jak1/import/water-anim-darkcave-ag.gc") +(import "goal_src/jak1/import/water-anim-village1-ag.gc") +(import "goal_src/jak1/import/water-anim-rolling-ag.gc") +(import "goal_src/jak1/import/water-anim-misty-ag.gc") +(import "goal_src/jak1/import/water-anim-sunken-dark-eco-ag.gc") +(import "goal_src/jak1/import/water-anim-village2-ag.gc") (deftype water-anim (water-vol) ((ppointer-water-anim (pointer water-anim) :offset 24) diff --git a/goal_src/levels/darkcave/darkcave-obs.gc b/goal_src/jak1/levels/darkcave/darkcave-obs.gc similarity index 99% rename from goal_src/levels/darkcave/darkcave-obs.gc rename to goal_src/jak1/levels/darkcave/darkcave-obs.gc index c91cc200cf..3a173e8430 100644 --- a/goal_src/levels/darkcave/darkcave-obs.gc +++ b/goal_src/jak1/levels/darkcave/darkcave-obs.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/cavecrystal-ag.gc") +(import "goal_src/jak1/import/cavecrystal-ag.gc") (deftype cavecrystal (process-drawable) ((root-override collide-shape :offset 112) diff --git a/goal_src/levels/demo/demo-obs.gc b/goal_src/jak1/levels/demo/demo-obs.gc similarity index 100% rename from goal_src/levels/demo/demo-obs.gc rename to goal_src/jak1/levels/demo/demo-obs.gc diff --git a/goal_src/levels/demo/static-screen.gc b/goal_src/jak1/levels/demo/static-screen.gc similarity index 100% rename from goal_src/levels/demo/static-screen.gc rename to goal_src/jak1/levels/demo/static-screen.gc diff --git a/goal_src/levels/finalboss/final-door.gc b/goal_src/jak1/levels/finalboss/final-door.gc similarity index 98% rename from goal_src/levels/finalboss/final-door.gc rename to goal_src/jak1/levels/finalboss/final-door.gc index 571fd91d7b..e3dff75879 100644 --- a/goal_src/levels/finalboss/final-door.gc +++ b/goal_src/jak1/levels/finalboss/final-door.gc @@ -9,9 +9,9 @@ ;; DECOMP BEGINS -(import "goal_src/import/power-left-ag.gc") -(import "goal_src/import/power-right-ag.gc") -(import "goal_src/import/powercellalt-ag.gc") +(import "goal_src/jak1/import/power-left-ag.gc") +(import "goal_src/jak1/import/power-right-ag.gc") +(import "goal_src/jak1/import/powercellalt-ag.gc") (deftype fin-door (process-hidden) () diff --git a/goal_src/levels/finalboss/green-eco-lurker.gc b/goal_src/jak1/levels/finalboss/green-eco-lurker.gc similarity index 99% rename from goal_src/levels/finalboss/green-eco-lurker.gc rename to goal_src/jak1/levels/finalboss/green-eco-lurker.gc index c244180bc8..6dd30b705f 100644 --- a/goal_src/levels/finalboss/green-eco-lurker.gc +++ b/goal_src/jak1/levels/finalboss/green-eco-lurker.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/green-eco-lurker-ag.gc") +(import "goal_src/jak1/import/green-eco-lurker-ag.gc") (deftype green-eco-lurker (nav-enemy) ((played-sound? symbol :offset-assert 400) diff --git a/goal_src/levels/finalboss/light-eco.gc b/goal_src/jak1/levels/finalboss/light-eco.gc similarity index 99% rename from goal_src/levels/finalboss/light-eco.gc rename to goal_src/jak1/levels/finalboss/light-eco.gc index 2786515d1c..d24790318b 100644 --- a/goal_src/levels/finalboss/light-eco.gc +++ b/goal_src/jak1/levels/finalboss/light-eco.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/light-eco-ag.gc") +(import "goal_src/jak1/import/light-eco-ag.gc") (deftype light-eco-child (process-drawable) ((root-override collide-shape :offset 112) diff --git a/goal_src/levels/finalboss/robotboss-h.gc b/goal_src/jak1/levels/finalboss/robotboss-h.gc similarity index 99% rename from goal_src/levels/finalboss/robotboss-h.gc rename to goal_src/jak1/levels/finalboss/robotboss-h.gc index 2aceed64a9..197a7abafd 100644 --- a/goal_src/levels/finalboss/robotboss-h.gc +++ b/goal_src/jak1/levels/finalboss/robotboss-h.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/robotboss-ag.gc") +(import "goal_src/jak1/import/robotboss-ag.gc") (deftype robotboss-dda (structure) ((blue-bomb-time float :offset-assert 0) diff --git a/goal_src/levels/finalboss/robotboss-misc.gc b/goal_src/jak1/levels/finalboss/robotboss-misc.gc similarity index 99% rename from goal_src/levels/finalboss/robotboss-misc.gc rename to goal_src/jak1/levels/finalboss/robotboss-misc.gc index 5c248d3f48..fa3de6067a 100644 --- a/goal_src/levels/finalboss/robotboss-misc.gc +++ b/goal_src/jak1/levels/finalboss/robotboss-misc.gc @@ -11,9 +11,9 @@ ;; DECOMP BEGINS -(import "goal_src/import/silodoor-ag.gc") -(import "goal_src/import/ecoclaw-ag.gc") -(import "goal_src/import/finalbosscam-ag.gc") +(import "goal_src/jak1/import/silodoor-ag.gc") +(import "goal_src/jak1/import/ecoclaw-ag.gc") +(import "goal_src/jak1/import/finalbosscam-ag.gc") (defskelgroup *med-res-snow1-sg* medres-snowback 0 2 ((1 (meters 999999))) diff --git a/goal_src/levels/finalboss/robotboss-part.gc b/goal_src/jak1/levels/finalboss/robotboss-part.gc similarity index 100% rename from goal_src/levels/finalboss/robotboss-part.gc rename to goal_src/jak1/levels/finalboss/robotboss-part.gc diff --git a/goal_src/levels/finalboss/robotboss-weapon.gc b/goal_src/jak1/levels/finalboss/robotboss-weapon.gc similarity index 99% rename from goal_src/levels/finalboss/robotboss-weapon.gc rename to goal_src/jak1/levels/finalboss/robotboss-weapon.gc index 302f44df2c..a725834006 100644 --- a/goal_src/levels/finalboss/robotboss-weapon.gc +++ b/goal_src/jak1/levels/finalboss/robotboss-weapon.gc @@ -7,9 +7,9 @@ ;; DECOMP BEGINS -(import "goal_src/import/darkecobomb-ag.gc") -(import "goal_src/import/greenshot-ag.gc") -(import "goal_src/import/redring-ag.gc") +(import "goal_src/jak1/import/darkecobomb-ag.gc") +(import "goal_src/jak1/import/greenshot-ag.gc") +(import "goal_src/jak1/import/redring-ag.gc") (deftype torus (structure) ((origin vector :inline :offset-assert 0) diff --git a/goal_src/levels/finalboss/robotboss.gc b/goal_src/jak1/levels/finalboss/robotboss.gc similarity index 99% rename from goal_src/levels/finalboss/robotboss.gc rename to goal_src/jak1/levels/finalboss/robotboss.gc index 24f30fa182..5be604ab7c 100644 --- a/goal_src/levels/finalboss/robotboss.gc +++ b/goal_src/jak1/levels/finalboss/robotboss.gc @@ -7,9 +7,9 @@ ;; DECOMP BEGINS -(import "goal_src/import/robotboss-redeco-ag.gc") -(import "goal_src/import/robotboss-blueeco-ag.gc") -(import "goal_src/import/robotboss-yelloweco-ag.gc") +(import "goal_src/jak1/import/robotboss-redeco-ag.gc") +(import "goal_src/jak1/import/robotboss-blueeco-ag.gc") +(import "goal_src/jak1/import/robotboss-yelloweco-ag.gc") (defmethod ease-loc-t robotboss ((obj robotboss)) (parameter-ease-sin-clamp (-> obj loc-t)) diff --git a/goal_src/levels/finalboss/sage-finalboss-part.gc b/goal_src/jak1/levels/finalboss/sage-finalboss-part.gc similarity index 100% rename from goal_src/levels/finalboss/sage-finalboss-part.gc rename to goal_src/jak1/levels/finalboss/sage-finalboss-part.gc diff --git a/goal_src/levels/finalboss/sage-finalboss.gc b/goal_src/jak1/levels/finalboss/sage-finalboss.gc similarity index 99% rename from goal_src/levels/finalboss/sage-finalboss.gc rename to goal_src/jak1/levels/finalboss/sage-finalboss.gc index 126723dffe..65b6aefae2 100644 --- a/goal_src/levels/finalboss/sage-finalboss.gc +++ b/goal_src/jak1/levels/finalboss/sage-finalboss.gc @@ -6,10 +6,10 @@ ;; dgos: FIN ;; DECOMP BEGINS -(import "goal_src/import/plat-eco-finalboss-ag.gc") -(import "goal_src/import/green-sagecage-ag.gc") -(import "goal_src/import/jak-white-ag.gc") -(import "goal_src/import/robotboss-cinematic-ag.gc") +(import "goal_src/jak1/import/plat-eco-finalboss-ag.gc") +(import "goal_src/jak1/import/green-sagecage-ag.gc") +(import "goal_src/jak1/import/jak-white-ag.gc") +(import "goal_src/jak1/import/robotboss-cinematic-ag.gc") (defskelgroup *robotboss-cinematic-sg* robotboss-cinematic robotboss-cinematic-lod0-jg robotboss-cinematic-idle-ja ((robotboss-cinematic-lod0-mg (meters 999999))) diff --git a/goal_src/levels/firecanyon/assistant-firecanyon.gc b/goal_src/jak1/levels/firecanyon/assistant-firecanyon.gc similarity index 99% rename from goal_src/levels/firecanyon/assistant-firecanyon.gc rename to goal_src/jak1/levels/firecanyon/assistant-firecanyon.gc index 81dd8e9eeb..a0abf32eac 100644 --- a/goal_src/levels/firecanyon/assistant-firecanyon.gc +++ b/goal_src/jak1/levels/firecanyon/assistant-firecanyon.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/assistant-firecanyon-ag.gc") +(import "goal_src/jak1/import/assistant-firecanyon-ag.gc") (deftype assistant-firecanyon (process-taskable) () diff --git a/goal_src/levels/firecanyon/firecanyon-obs.gc b/goal_src/jak1/levels/firecanyon/firecanyon-obs.gc similarity index 99% rename from goal_src/levels/firecanyon/firecanyon-obs.gc rename to goal_src/jak1/levels/firecanyon/firecanyon-obs.gc index c17469ddad..74e561992e 100644 --- a/goal_src/levels/firecanyon/firecanyon-obs.gc +++ b/goal_src/jak1/levels/firecanyon/firecanyon-obs.gc @@ -8,8 +8,8 @@ ;; DECOMP BEGINS -(import "goal_src/import/crate-darkeco-cluster-ag.gc") -(import "goal_src/import/spike-ag.gc") +(import "goal_src/jak1/import/crate-darkeco-cluster-ag.gc") +(import "goal_src/jak1/import/spike-ag.gc") (deftype balloon (process-drawable) ((root-override collide-shape :offset 112) diff --git a/goal_src/levels/firecanyon/firecanyon-part.gc b/goal_src/jak1/levels/firecanyon/firecanyon-part.gc similarity index 100% rename from goal_src/levels/firecanyon/firecanyon-part.gc rename to goal_src/jak1/levels/firecanyon/firecanyon-part.gc diff --git a/goal_src/levels/flut_common/flut-part.gc b/goal_src/jak1/levels/flut_common/flut-part.gc similarity index 100% rename from goal_src/levels/flut_common/flut-part.gc rename to goal_src/jak1/levels/flut_common/flut-part.gc diff --git a/goal_src/levels/flut_common/flutflut.gc b/goal_src/jak1/levels/flut_common/flutflut.gc similarity index 99% rename from goal_src/levels/flut_common/flutflut.gc rename to goal_src/jak1/levels/flut_common/flutflut.gc index e36b0d8c45..df63687846 100644 --- a/goal_src/levels/flut_common/flutflut.gc +++ b/goal_src/jak1/levels/flut_common/flutflut.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/flut-saddle-ag.gc") +(import "goal_src/jak1/import/flut-saddle-ag.gc") (if (not (nmember "flutp" *kernel-packages*)) (set! *kernel-packages* (cons "flutp" *kernel-packages*)) diff --git a/goal_src/levels/flut_common/target-flut.gc b/goal_src/jak1/levels/flut_common/target-flut.gc similarity index 100% rename from goal_src/levels/flut_common/target-flut.gc rename to goal_src/jak1/levels/flut_common/target-flut.gc diff --git a/goal_src/levels/intro/evilbro.gc b/goal_src/jak1/levels/intro/evilbro.gc similarity index 97% rename from goal_src/levels/intro/evilbro.gc rename to goal_src/jak1/levels/intro/evilbro.gc index 038f0bd5bf..bf6f90f33c 100644 --- a/goal_src/levels/intro/evilbro.gc +++ b/goal_src/jak1/levels/intro/evilbro.gc @@ -7,8 +7,8 @@ ;; DECOMP BEGINS -(import "goal_src/import/evilbro-ag.gc") -(import "goal_src/import/evilsis-ag.gc") +(import "goal_src/jak1/import/evilbro-ag.gc") +(import "goal_src/jak1/import/evilsis-ag.gc") (deftype evilbro (process-taskable) ((evilsis entity-actor :offset-assert 380) diff --git a/goal_src/levels/jungle/bouncer.gc b/goal_src/jak1/levels/jungle/bouncer.gc similarity index 98% rename from goal_src/levels/jungle/bouncer.gc rename to goal_src/jak1/levels/jungle/bouncer.gc index bd7fd3f481..07c0d1edcf 100644 --- a/goal_src/levels/jungle/bouncer.gc +++ b/goal_src/jak1/levels/jungle/bouncer.gc @@ -9,7 +9,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/bounceytarp-ag.gc") +(import "goal_src/jak1/import/bounceytarp-ag.gc") (deftype springbox (process-drawable) ((spring-height meters :offset-assert 176) diff --git a/goal_src/levels/jungle/darkvine.gc b/goal_src/jak1/levels/jungle/darkvine.gc similarity index 99% rename from goal_src/levels/jungle/darkvine.gc rename to goal_src/jak1/levels/jungle/darkvine.gc index c00e933300..7df81ca90e 100644 --- a/goal_src/levels/jungle/darkvine.gc +++ b/goal_src/jak1/levels/jungle/darkvine.gc @@ -12,7 +12,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/darkvine-ag.gc") +(import "goal_src/jak1/import/darkvine-ag.gc") (deftype darkvine (process-drawable) ((root-override collide-shape :offset 112) diff --git a/goal_src/levels/jungle/fisher.gc b/goal_src/jak1/levels/jungle/fisher.gc similarity index 99% rename from goal_src/levels/jungle/fisher.gc rename to goal_src/jak1/levels/jungle/fisher.gc index f68997ad64..c9e625998d 100644 --- a/goal_src/levels/jungle/fisher.gc +++ b/goal_src/jak1/levels/jungle/fisher.gc @@ -9,11 +9,11 @@ ;; DECOMP BEGINS -(import "goal_src/import/fish-net-ag.gc") -(import "goal_src/import/fisher-ag.gc") -(import "goal_src/import/catch-fisha-ag.gc") -(import "goal_src/import/catch-fishb-ag.gc") -(import "goal_src/import/catch-fishc-ag.gc") +(import "goal_src/jak1/import/fish-net-ag.gc") +(import "goal_src/jak1/import/fisher-ag.gc") +(import "goal_src/jak1/import/catch-fisha-ag.gc") +(import "goal_src/jak1/import/catch-fishb-ag.gc") +(import "goal_src/jak1/import/catch-fishc-ag.gc") (deftype fisher-bank (basic) ((width meters :offset-assert 4) diff --git a/goal_src/levels/jungle/hopper.gc b/goal_src/jak1/levels/jungle/hopper.gc similarity index 99% rename from goal_src/levels/jungle/hopper.gc rename to goal_src/jak1/levels/jungle/hopper.gc index 56b0edb224..28d9b34b75 100644 --- a/goal_src/levels/jungle/hopper.gc +++ b/goal_src/jak1/levels/jungle/hopper.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/hopper-ag.gc") +(import "goal_src/jak1/import/hopper-ag.gc") (deftype hopper (nav-enemy) ((jump-length float :offset-assert 400) diff --git a/goal_src/levels/jungle/jungle-elevator.gc b/goal_src/jak1/levels/jungle/jungle-elevator.gc similarity index 100% rename from goal_src/levels/jungle/jungle-elevator.gc rename to goal_src/jak1/levels/jungle/jungle-elevator.gc diff --git a/goal_src/levels/jungle/jungle-mirrors.gc b/goal_src/jak1/levels/jungle/jungle-mirrors.gc similarity index 99% rename from goal_src/levels/jungle/jungle-mirrors.gc rename to goal_src/jak1/levels/jungle/jungle-mirrors.gc index 714d768efd..f4f01caa78 100644 --- a/goal_src/levels/jungle/jungle-mirrors.gc +++ b/goal_src/jak1/levels/jungle/jungle-mirrors.gc @@ -11,8 +11,8 @@ ;; DECOMP BEGINS -(import "goal_src/import/periscope-ag.gc") -(import "goal_src/import/reflector-mirror-ag.gc") +(import "goal_src/jak1/import/periscope-ag.gc") +(import "goal_src/jak1/import/reflector-mirror-ag.gc") (defpartgroup group-jungle-binoculars :id 176 diff --git a/goal_src/levels/jungle/jungle-obs.gc b/goal_src/jak1/levels/jungle/jungle-obs.gc similarity index 98% rename from goal_src/levels/jungle/jungle-obs.gc rename to goal_src/jak1/levels/jungle/jungle-obs.gc index e84d2d17f9..7d161403d0 100644 --- a/goal_src/levels/jungle/jungle-obs.gc +++ b/goal_src/jak1/levels/jungle/jungle-obs.gc @@ -7,16 +7,16 @@ ;; DECOMP BEGINS -(import "goal_src/import/maindoor-ag.gc") -(import "goal_src/import/junglecam-ag.gc") -(import "goal_src/import/precurbridge-ag.gc") -(import "goal_src/import/sidedoor-ag.gc") -(import "goal_src/import/towertop-ag.gc") -(import "goal_src/import/logtrap-ag.gc") -(import "goal_src/import/lurkerm-tall-sail-ag.gc") -(import "goal_src/import/medres-firecanyon-ag.gc") -(import "goal_src/import/lurkerm-piston-ag.gc") -(import "goal_src/import/accordian-ag.gc") +(import "goal_src/jak1/import/maindoor-ag.gc") +(import "goal_src/jak1/import/junglecam-ag.gc") +(import "goal_src/jak1/import/precurbridge-ag.gc") +(import "goal_src/jak1/import/sidedoor-ag.gc") +(import "goal_src/jak1/import/towertop-ag.gc") +(import "goal_src/jak1/import/logtrap-ag.gc") +(import "goal_src/jak1/import/lurkerm-tall-sail-ag.gc") +(import "goal_src/jak1/import/medres-firecanyon-ag.gc") +(import "goal_src/jak1/import/lurkerm-piston-ag.gc") +(import "goal_src/jak1/import/accordian-ag.gc") (defskelgroup *med-res-firecanyon-sg* medres-firecanyon medres-firecanyon-lod0-jg medres-firecanyon-idle-ja ((medres-firecanyon-lod0-mg (meters 999999))) diff --git a/goal_src/levels/jungle/jungle-part.gc b/goal_src/jak1/levels/jungle/jungle-part.gc similarity index 100% rename from goal_src/levels/jungle/jungle-part.gc rename to goal_src/jak1/levels/jungle/jungle-part.gc diff --git a/goal_src/levels/jungle/junglefish.gc b/goal_src/jak1/levels/jungle/junglefish.gc similarity index 99% rename from goal_src/levels/jungle/junglefish.gc rename to goal_src/jak1/levels/jungle/junglefish.gc index 729364d336..87ab0ce8ee 100644 --- a/goal_src/levels/jungle/junglefish.gc +++ b/goal_src/jak1/levels/jungle/junglefish.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/junglefish-ag.gc") +(import "goal_src/jak1/import/junglefish-ag.gc") (deftype junglefish (nav-enemy) () diff --git a/goal_src/levels/jungle/junglesnake.gc b/goal_src/jak1/levels/jungle/junglesnake.gc similarity index 99% rename from goal_src/levels/jungle/junglesnake.gc rename to goal_src/jak1/levels/jungle/junglesnake.gc index c370b143bd..69c6d15345 100644 --- a/goal_src/levels/jungle/junglesnake.gc +++ b/goal_src/jak1/levels/jungle/junglesnake.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/junglesnake-ag.gc") +(import "goal_src/jak1/import/junglesnake-ag.gc") (defskelgroup *junglesnake-sg* junglesnake junglesnake-lod0-jg junglesnake-idle-ja ((junglesnake-lod0-mg (meters 999999))) diff --git a/goal_src/levels/jungleb/aphid.gc b/goal_src/jak1/levels/jungleb/aphid.gc similarity index 99% rename from goal_src/levels/jungleb/aphid.gc rename to goal_src/jak1/levels/jungleb/aphid.gc index d4e1743684..5730999def 100644 --- a/goal_src/levels/jungleb/aphid.gc +++ b/goal_src/jak1/levels/jungleb/aphid.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/aphid-lurker-ag.gc") +(import "goal_src/jak1/import/aphid-lurker-ag.gc") (deftype aphid (nav-enemy) ((try int32 :offset-assert 400) diff --git a/goal_src/levels/jungleb/jungleb-obs.gc b/goal_src/jak1/levels/jungleb/jungleb-obs.gc similarity index 99% rename from goal_src/levels/jungleb/jungleb-obs.gc rename to goal_src/jak1/levels/jungleb/jungleb-obs.gc index 8c0b6aef1c..b5eb004981 100644 --- a/goal_src/levels/jungleb/jungleb-obs.gc +++ b/goal_src/jak1/levels/jungleb/jungleb-obs.gc @@ -8,8 +8,8 @@ ;; DECOMP BEGINS -(import "goal_src/import/eggtop-ag.gc") -(import "goal_src/import/jng-iris-door-ag.gc") +(import "goal_src/jak1/import/eggtop-ag.gc") +(import "goal_src/jak1/import/jng-iris-door-ag.gc") (deftype eggtop (process-drawable) ((root-override collide-shape-moving :offset 112) diff --git a/goal_src/levels/jungleb/plant-boss.gc b/goal_src/jak1/levels/jungleb/plant-boss.gc similarity index 99% rename from goal_src/levels/jungleb/plant-boss.gc rename to goal_src/jak1/levels/jungleb/plant-boss.gc index 7727e9b13c..3108cba7e3 100644 --- a/goal_src/levels/jungleb/plant-boss.gc +++ b/goal_src/jak1/levels/jungleb/plant-boss.gc @@ -9,7 +9,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/plant-boss-ag.gc") +(import "goal_src/jak1/import/plant-boss-ag.gc") (deftype plant-boss (process-drawable) ((root-override collide-shape :offset 112) diff --git a/goal_src/levels/jungleb/plat-flip.gc b/goal_src/jak1/levels/jungleb/plat-flip.gc similarity index 99% rename from goal_src/levels/jungleb/plat-flip.gc rename to goal_src/jak1/levels/jungleb/plat-flip.gc index 30339dd17f..e7db686207 100644 --- a/goal_src/levels/jungleb/plat-flip.gc +++ b/goal_src/jak1/levels/jungleb/plat-flip.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/plat-flip-ag.gc") +(import "goal_src/jak1/import/plat-flip-ag.gc") (deftype plat-flip (process-drawable) ((root-override collide-shape-moving :offset 112) diff --git a/goal_src/levels/lavatube/assistant-lavatube.gc b/goal_src/jak1/levels/lavatube/assistant-lavatube.gc similarity index 98% rename from goal_src/levels/lavatube/assistant-lavatube.gc rename to goal_src/jak1/levels/lavatube/assistant-lavatube.gc index dcbbcd4819..5b716efed8 100644 --- a/goal_src/levels/lavatube/assistant-lavatube.gc +++ b/goal_src/jak1/levels/lavatube/assistant-lavatube.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/assistant-lavatube-start-ag.gc") +(import "goal_src/jak1/import/assistant-lavatube-start-ag.gc") (deftype assistant-lavatube-start (process-taskable) () diff --git a/goal_src/levels/lavatube/lavatube-energy.gc b/goal_src/jak1/levels/lavatube/lavatube-energy.gc similarity index 99% rename from goal_src/levels/lavatube/lavatube-energy.gc rename to goal_src/jak1/levels/lavatube/lavatube-energy.gc index e33154d55c..4a40aecee3 100644 --- a/goal_src/levels/lavatube/lavatube-energy.gc +++ b/goal_src/jak1/levels/lavatube/lavatube-energy.gc @@ -7,11 +7,11 @@ ;; DECOMP BEGINS -(import "goal_src/import/energyball-ag.gc") -(import "goal_src/import/energybase-ag.gc") -(import "goal_src/import/energyhub-ag.gc") -(import "goal_src/import/energyarm-ag.gc") -(import "goal_src/import/energydoor-ag.gc") +(import "goal_src/jak1/import/energyball-ag.gc") +(import "goal_src/jak1/import/energybase-ag.gc") +(import "goal_src/jak1/import/energyhub-ag.gc") +(import "goal_src/jak1/import/energyarm-ag.gc") +(import "goal_src/jak1/import/energydoor-ag.gc") (defpartgroup group-energyarm :id 544 diff --git a/goal_src/levels/lavatube/lavatube-obs.gc b/goal_src/jak1/levels/lavatube/lavatube-obs.gc similarity index 99% rename from goal_src/levels/lavatube/lavatube-obs.gc rename to goal_src/jak1/levels/lavatube/lavatube-obs.gc index bf0292b7f5..a4544cedf7 100644 --- a/goal_src/levels/lavatube/lavatube-obs.gc +++ b/goal_src/jak1/levels/lavatube/lavatube-obs.gc @@ -7,15 +7,15 @@ ;; DECOMP BEGINS -(import "goal_src/import/lavafallsewerb-ag.gc") -(import "goal_src/import/lavashortcut-ag.gc") -(import "goal_src/import/lavabase-ag.gc") -(import "goal_src/import/lavafallsewera-ag.gc") -(import "goal_src/import/chainmine-ag.gc") -(import "goal_src/import/lavafall-ag.gc") -(import "goal_src/import/lavaballoon-ag.gc") -(import "goal_src/import/darkecobarrel-ag.gc") -(import "goal_src/import/lavayellowtarp-ag.gc") +(import "goal_src/jak1/import/lavafallsewerb-ag.gc") +(import "goal_src/jak1/import/lavashortcut-ag.gc") +(import "goal_src/jak1/import/lavabase-ag.gc") +(import "goal_src/jak1/import/lavafallsewera-ag.gc") +(import "goal_src/jak1/import/chainmine-ag.gc") +(import "goal_src/jak1/import/lavafall-ag.gc") +(import "goal_src/jak1/import/lavaballoon-ag.gc") +(import "goal_src/jak1/import/darkecobarrel-ag.gc") +(import "goal_src/jak1/import/lavayellowtarp-ag.gc") (deftype lavabase (process-drawable) () diff --git a/goal_src/levels/lavatube/lavatube-part.gc b/goal_src/jak1/levels/lavatube/lavatube-part.gc similarity index 100% rename from goal_src/levels/lavatube/lavatube-part.gc rename to goal_src/jak1/levels/lavatube/lavatube-part.gc diff --git a/goal_src/levels/maincave/baby-spider.gc b/goal_src/jak1/levels/maincave/baby-spider.gc similarity index 99% rename from goal_src/levels/maincave/baby-spider.gc rename to goal_src/jak1/levels/maincave/baby-spider.gc index fc2f12fe7f..086af0ccd4 100644 --- a/goal_src/levels/maincave/baby-spider.gc +++ b/goal_src/jak1/levels/maincave/baby-spider.gc @@ -9,7 +9,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/baby-spider-ag.gc") +(import "goal_src/jak1/import/baby-spider-ag.gc") (deftype baby-spider-spawn-params (structure) ((hatched? symbol :offset-assert 0) diff --git a/goal_src/levels/maincave/cavecrystal-light.gc b/goal_src/jak1/levels/maincave/cavecrystal-light.gc similarity index 100% rename from goal_src/levels/maincave/cavecrystal-light.gc rename to goal_src/jak1/levels/maincave/cavecrystal-light.gc diff --git a/goal_src/levels/maincave/dark-crystal.gc b/goal_src/jak1/levels/maincave/dark-crystal.gc similarity index 99% rename from goal_src/levels/maincave/dark-crystal.gc rename to goal_src/jak1/levels/maincave/dark-crystal.gc index 1e67b4f2eb..e3a3d97f8c 100644 --- a/goal_src/levels/maincave/dark-crystal.gc +++ b/goal_src/jak1/levels/maincave/dark-crystal.gc @@ -8,7 +8,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/dark-crystal-ag.gc") +(import "goal_src/jak1/import/dark-crystal-ag.gc") (deftype dark-crystal (process-drawable) ((root-override collide-shape :offset 112) diff --git a/goal_src/levels/maincave/driller-lurker.gc b/goal_src/jak1/levels/maincave/driller-lurker.gc similarity index 99% rename from goal_src/levels/maincave/driller-lurker.gc rename to goal_src/jak1/levels/maincave/driller-lurker.gc index 3f8a875b0d..ad8e98425b 100644 --- a/goal_src/levels/maincave/driller-lurker.gc +++ b/goal_src/jak1/levels/maincave/driller-lurker.gc @@ -8,7 +8,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/driller-lurker-ag.gc") +(import "goal_src/jak1/import/driller-lurker-ag.gc") (deftype driller-lurker (process-drawable) ((root-overeride collide-shape-moving :offset 112) diff --git a/goal_src/levels/maincave/gnawer.gc b/goal_src/jak1/levels/maincave/gnawer.gc similarity index 99% rename from goal_src/levels/maincave/gnawer.gc rename to goal_src/jak1/levels/maincave/gnawer.gc index ccc5078c5c..879ea79521 100644 --- a/goal_src/levels/maincave/gnawer.gc +++ b/goal_src/jak1/levels/maincave/gnawer.gc @@ -12,7 +12,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/gnawer-ag.gc") +(import "goal_src/jak1/import/gnawer-ag.gc") (deftype gnawer-falling-segment (process-drawable) ((transv vector :inline :offset-assert 176) diff --git a/goal_src/levels/maincave/maincave-obs.gc b/goal_src/jak1/levels/maincave/maincave-obs.gc similarity index 99% rename from goal_src/levels/maincave/maincave-obs.gc rename to goal_src/jak1/levels/maincave/maincave-obs.gc index 9a96531ac2..370ec70188 100644 --- a/goal_src/levels/maincave/maincave-obs.gc +++ b/goal_src/jak1/levels/maincave/maincave-obs.gc @@ -7,12 +7,12 @@ ;; DECOMP BEGINS -(import "goal_src/import/caveelevator-ag.gc") -(import "goal_src/import/cavespatulatwo-ag.gc") -(import "goal_src/import/cavetrapdoor-ag.gc") -(import "goal_src/import/maincavecam-ag.gc") -(import "goal_src/import/cavecrusher-ag.gc") -(import "goal_src/import/cavespatula-darkcave-ag.gc") +(import "goal_src/jak1/import/caveelevator-ag.gc") +(import "goal_src/jak1/import/cavespatulatwo-ag.gc") +(import "goal_src/jak1/import/cavetrapdoor-ag.gc") +(import "goal_src/jak1/import/maincavecam-ag.gc") +(import "goal_src/jak1/import/cavecrusher-ag.gc") +(import "goal_src/jak1/import/cavespatula-darkcave-ag.gc") (deftype maincavecam (pov-camera) ((seq uint64 :offset-assert 224) diff --git a/goal_src/levels/maincave/maincave-part.gc b/goal_src/jak1/levels/maincave/maincave-part.gc similarity index 100% rename from goal_src/levels/maincave/maincave-part.gc rename to goal_src/jak1/levels/maincave/maincave-part.gc diff --git a/goal_src/levels/maincave/mother-spider-egg.gc b/goal_src/jak1/levels/maincave/mother-spider-egg.gc similarity index 99% rename from goal_src/levels/maincave/mother-spider-egg.gc rename to goal_src/jak1/levels/maincave/mother-spider-egg.gc index 62b3425cb9..1e8969c901 100644 --- a/goal_src/levels/maincave/mother-spider-egg.gc +++ b/goal_src/jak1/levels/maincave/mother-spider-egg.gc @@ -8,7 +8,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/spider-egg-ag.gc") +(import "goal_src/jak1/import/spider-egg-ag.gc") (deftype mother-spider-egg (process-drawable) ((parent-override (pointer mother-spider) :offset 12) diff --git a/goal_src/levels/maincave/mother-spider-h.gc b/goal_src/jak1/levels/maincave/mother-spider-h.gc similarity index 100% rename from goal_src/levels/maincave/mother-spider-h.gc rename to goal_src/jak1/levels/maincave/mother-spider-h.gc diff --git a/goal_src/levels/maincave/mother-spider-proj.gc b/goal_src/jak1/levels/maincave/mother-spider-proj.gc similarity index 100% rename from goal_src/levels/maincave/mother-spider-proj.gc rename to goal_src/jak1/levels/maincave/mother-spider-proj.gc diff --git a/goal_src/levels/maincave/mother-spider.gc b/goal_src/jak1/levels/maincave/mother-spider.gc similarity index 99% rename from goal_src/levels/maincave/mother-spider.gc rename to goal_src/jak1/levels/maincave/mother-spider.gc index e765dc6aa8..8a9e7731e4 100644 --- a/goal_src/levels/maincave/mother-spider.gc +++ b/goal_src/jak1/levels/maincave/mother-spider.gc @@ -10,7 +10,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/mother-spider-ag.gc") +(import "goal_src/jak1/import/mother-spider-ag.gc") (defskelgroup *mother-spider-sg* mother-spider mother-spider-lod0-jg -1 ((mother-spider-lod0-mg (meters 20)) diff --git a/goal_src/levels/maincave/spiderwebs.gc b/goal_src/jak1/levels/maincave/spiderwebs.gc similarity index 99% rename from goal_src/levels/maincave/spiderwebs.gc rename to goal_src/jak1/levels/maincave/spiderwebs.gc index 322c9bcd13..32e5121704 100644 --- a/goal_src/levels/maincave/spiderwebs.gc +++ b/goal_src/jak1/levels/maincave/spiderwebs.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/spiderwebs-ag.gc") +(import "goal_src/jak1/import/spiderwebs-ag.gc") (define *spider-jump-mods* (new 'static 'surface :name 'jump diff --git a/goal_src/levels/misty/babak-with-cannon.gc b/goal_src/jak1/levels/misty/babak-with-cannon.gc similarity index 100% rename from goal_src/levels/misty/babak-with-cannon.gc rename to goal_src/jak1/levels/misty/babak-with-cannon.gc diff --git a/goal_src/levels/misty/balloonlurker.gc b/goal_src/jak1/levels/misty/balloonlurker.gc similarity index 99% rename from goal_src/levels/misty/balloonlurker.gc rename to goal_src/jak1/levels/misty/balloonlurker.gc index 8306726fb3..7da2541011 100644 --- a/goal_src/levels/misty/balloonlurker.gc +++ b/goal_src/jak1/levels/misty/balloonlurker.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/balloonlurker-ag.gc") +(import "goal_src/jak1/import/balloonlurker-ag.gc") (defpartgroup group-balloonlurker-pilot-death :id 203 diff --git a/goal_src/levels/misty/bonelurker.gc b/goal_src/jak1/levels/misty/bonelurker.gc similarity index 99% rename from goal_src/levels/misty/bonelurker.gc rename to goal_src/jak1/levels/misty/bonelurker.gc index f2fd938364..1af1ec2891 100644 --- a/goal_src/levels/misty/bonelurker.gc +++ b/goal_src/jak1/levels/misty/bonelurker.gc @@ -9,7 +9,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/bonelurker-ag.gc") +(import "goal_src/jak1/import/bonelurker-ag.gc") (deftype bonelurker (nav-enemy) ((bump-player-time time-frame :offset-assert 400) diff --git a/goal_src/levels/misty/misty-conveyor.gc b/goal_src/jak1/levels/misty/misty-conveyor.gc similarity index 99% rename from goal_src/levels/misty/misty-conveyor.gc rename to goal_src/jak1/levels/misty/misty-conveyor.gc index 677f269b2e..157ae09f3e 100644 --- a/goal_src/levels/misty/misty-conveyor.gc +++ b/goal_src/jak1/levels/misty/misty-conveyor.gc @@ -12,9 +12,9 @@ ;; DECOMP BEGINS -(import "goal_src/import/keg-conveyor-ag.gc") -(import "goal_src/import/keg-conveyor-paddle-ag.gc") -(import "goal_src/import/keg-ag.gc") +(import "goal_src/jak1/import/keg-conveyor-ag.gc") +(import "goal_src/jak1/import/keg-conveyor-paddle-ag.gc") +(import "goal_src/jak1/import/keg-ag.gc") (defpartgroup group-keg-bounce :id 197 diff --git a/goal_src/levels/misty/misty-obs.gc b/goal_src/jak1/levels/misty/misty-obs.gc similarity index 99% rename from goal_src/levels/misty/misty-obs.gc rename to goal_src/jak1/levels/misty/misty-obs.gc index 2657d82112..a48f8f25dd 100644 --- a/goal_src/levels/misty/misty-obs.gc +++ b/goal_src/jak1/levels/misty/misty-obs.gc @@ -7,14 +7,14 @@ ;; DECOMP BEGINS -(import "goal_src/import/breakaway-right-ag.gc") -(import "goal_src/import/boatpaddle-ag.gc") -(import "goal_src/import/breakaway-mid-ag.gc") -(import "goal_src/import/mis-bone-platform-ag.gc") -(import "goal_src/import/breakaway-left-ag.gc") -(import "goal_src/import/windturbine-ag.gc") -(import "goal_src/import/mistycam-ag.gc") -(import "goal_src/import/mis-bone-bridge-ag.gc") +(import "goal_src/jak1/import/breakaway-right-ag.gc") +(import "goal_src/jak1/import/boatpaddle-ag.gc") +(import "goal_src/jak1/import/breakaway-mid-ag.gc") +(import "goal_src/jak1/import/mis-bone-platform-ag.gc") +(import "goal_src/jak1/import/breakaway-left-ag.gc") +(import "goal_src/jak1/import/windturbine-ag.gc") +(import "goal_src/jak1/import/mistycam-ag.gc") +(import "goal_src/jak1/import/mis-bone-bridge-ag.gc") (defpartgroup group-windturbine-particles :id 191 diff --git a/goal_src/levels/misty/misty-part.gc b/goal_src/jak1/levels/misty/misty-part.gc similarity index 100% rename from goal_src/levels/misty/misty-part.gc rename to goal_src/jak1/levels/misty/misty-part.gc diff --git a/goal_src/levels/misty/misty-teetertotter.gc b/goal_src/jak1/levels/misty/misty-teetertotter.gc similarity index 99% rename from goal_src/levels/misty/misty-teetertotter.gc rename to goal_src/jak1/levels/misty/misty-teetertotter.gc index d91781cc24..8b5f6536f6 100644 --- a/goal_src/levels/misty/misty-teetertotter.gc +++ b/goal_src/jak1/levels/misty/misty-teetertotter.gc @@ -9,7 +9,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/teetertotter-ag.gc") +(import "goal_src/jak1/import/teetertotter-ag.gc") (deftype teetertotter (process-drawable) ((launched-player basic :offset-assert 176) diff --git a/goal_src/levels/misty/misty-warehouse.gc b/goal_src/jak1/levels/misty/misty-warehouse.gc similarity index 98% rename from goal_src/levels/misty/misty-warehouse.gc rename to goal_src/jak1/levels/misty/misty-warehouse.gc index 55f0608b01..4881b12c62 100644 --- a/goal_src/levels/misty/misty-warehouse.gc +++ b/goal_src/jak1/levels/misty/misty-warehouse.gc @@ -9,8 +9,8 @@ ;; DECOMP BEGINS -(import "goal_src/import/silostep-ag.gc") -(import "goal_src/import/rounddoor-ag.gc") +(import "goal_src/jak1/import/silostep-ag.gc") +(import "goal_src/jak1/import/rounddoor-ag.gc") (deftype silostep (process-drawable) ((anim-limit float :offset-assert 176) diff --git a/goal_src/levels/misty/mistycannon.gc b/goal_src/jak1/levels/misty/mistycannon.gc similarity index 99% rename from goal_src/levels/misty/mistycannon.gc rename to goal_src/jak1/levels/misty/mistycannon.gc index 1152fb3821..96bb166953 100644 --- a/goal_src/levels/misty/mistycannon.gc +++ b/goal_src/jak1/levels/misty/mistycannon.gc @@ -7,8 +7,8 @@ ;; DECOMP BEGINS -(import "goal_src/import/sack-ag.gc") -(import "goal_src/import/mistycannon-ag.gc") +(import "goal_src/jak1/import/sack-ag.gc") +(import "goal_src/jak1/import/mistycannon-ag.gc") (deftype angle-tracker (structure) ((value float :offset-assert 0) diff --git a/goal_src/levels/misty/mud.gc b/goal_src/jak1/levels/misty/mud.gc similarity index 100% rename from goal_src/levels/misty/mud.gc rename to goal_src/jak1/levels/misty/mud.gc diff --git a/goal_src/levels/misty/muse.gc b/goal_src/jak1/levels/misty/muse.gc similarity index 99% rename from goal_src/levels/misty/muse.gc rename to goal_src/jak1/levels/misty/muse.gc index be7ddcf094..54d3d0bab1 100644 --- a/goal_src/levels/misty/muse.gc +++ b/goal_src/jak1/levels/misty/muse.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/muse-ag.gc") +(import "goal_src/jak1/import/muse-ag.gc") (deftype muse (nav-enemy) ((root-override collide-shape-moving :offset 112) diff --git a/goal_src/levels/misty/quicksandlurker.gc b/goal_src/jak1/levels/misty/quicksandlurker.gc similarity index 99% rename from goal_src/levels/misty/quicksandlurker.gc rename to goal_src/jak1/levels/misty/quicksandlurker.gc index 5a31d6be16..81c4cb58a9 100644 --- a/goal_src/levels/misty/quicksandlurker.gc +++ b/goal_src/jak1/levels/misty/quicksandlurker.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/quicksandlurker-ag.gc") +(import "goal_src/jak1/import/quicksandlurker-ag.gc") (defpartgroup group-quicksandlurker-missile :id 198 diff --git a/goal_src/levels/misty/sidekick-human.gc b/goal_src/jak1/levels/misty/sidekick-human.gc similarity index 99% rename from goal_src/levels/misty/sidekick-human.gc rename to goal_src/jak1/levels/misty/sidekick-human.gc index 15ee3a5f7e..3c27187cd5 100644 --- a/goal_src/levels/misty/sidekick-human.gc +++ b/goal_src/jak1/levels/misty/sidekick-human.gc @@ -7,10 +7,10 @@ ;; DECOMP BEGINS -(import "goal_src/import/darkecocan-ag.gc") -(import "goal_src/import/sidekick-human-ag.gc") -(import "goal_src/import/evilbro-ag.gc") -(import "goal_src/import/evilsis-ag.gc") +(import "goal_src/jak1/import/darkecocan-ag.gc") +(import "goal_src/jak1/import/sidekick-human-ag.gc") +(import "goal_src/jak1/import/evilbro-ag.gc") +(import "goal_src/jak1/import/evilsis-ag.gc") (deftype sequenceA (process-hidden) () diff --git a/goal_src/levels/ogre/flying-lurker.gc b/goal_src/jak1/levels/ogre/flying-lurker.gc similarity index 99% rename from goal_src/levels/ogre/flying-lurker.gc rename to goal_src/jak1/levels/ogre/flying-lurker.gc index 574371e7d8..dc8a06938c 100644 --- a/goal_src/levels/ogre/flying-lurker.gc +++ b/goal_src/jak1/levels/ogre/flying-lurker.gc @@ -7,9 +7,9 @@ ;; DECOMP BEGINS -(import "goal_src/import/ogrecam-ag.gc") -(import "goal_src/import/plunger-lurker-ag.gc") -(import "goal_src/import/flying-lurker-ag.gc") +(import "goal_src/jak1/import/ogrecam-ag.gc") +(import "goal_src/jak1/import/plunger-lurker-ag.gc") +(import "goal_src/jak1/import/flying-lurker-ag.gc") (defskelgroup *ogrecam-sg* ogrecam ogrecam-lod0-jg -1 ((ogrecam-lod0-mg (meters 999999))) diff --git a/goal_src/levels/ogre/ogre-obs.gc b/goal_src/jak1/levels/ogre/ogre-obs.gc similarity index 99% rename from goal_src/levels/ogre/ogre-obs.gc rename to goal_src/jak1/levels/ogre/ogre-obs.gc index 191258d630..f715eb0b90 100644 --- a/goal_src/levels/ogre/ogre-obs.gc +++ b/goal_src/jak1/levels/ogre/ogre-obs.gc @@ -8,13 +8,13 @@ ;; DECOMP BEGINS -(import "goal_src/import/ogre-step-ag.gc") -(import "goal_src/import/tntbarrel-ag.gc") -(import "goal_src/import/ogre-bridge-ag.gc") -(import "goal_src/import/shortcut-boulder-ag.gc") -(import "goal_src/import/medres-snow-ag.gc") -(import "goal_src/import/ogre-bridgeend-ag.gc") -(import "goal_src/import/ogre-isle-ag.gc") +(import "goal_src/jak1/import/ogre-step-ag.gc") +(import "goal_src/jak1/import/tntbarrel-ag.gc") +(import "goal_src/jak1/import/ogre-bridge-ag.gc") +(import "goal_src/jak1/import/shortcut-boulder-ag.gc") +(import "goal_src/jak1/import/medres-snow-ag.gc") +(import "goal_src/jak1/import/ogre-bridgeend-ag.gc") +(import "goal_src/jak1/import/ogre-isle-ag.gc") (defskelgroup *med-res-snow-sg* medres-snow medres-snow-lod0-jg medres-snow-idle-ja ((medres-snow-lod0-mg (meters 999999))) diff --git a/goal_src/levels/ogre/ogre-part.gc b/goal_src/jak1/levels/ogre/ogre-part.gc similarity index 100% rename from goal_src/levels/ogre/ogre-part.gc rename to goal_src/jak1/levels/ogre/ogre-part.gc diff --git a/goal_src/levels/ogre/ogreboss.gc b/goal_src/jak1/levels/ogre/ogreboss.gc similarity index 99% rename from goal_src/levels/ogre/ogreboss.gc rename to goal_src/jak1/levels/ogre/ogreboss.gc index 6853b0965c..b7d0cede39 100644 --- a/goal_src/levels/ogre/ogreboss.gc +++ b/goal_src/jak1/levels/ogre/ogreboss.gc @@ -10,7 +10,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/ogreboss-ag.gc") +(import "goal_src/jak1/import/ogreboss-ag.gc") (defskelgroup *ogreboss-sg* ogreboss ogreboss-lod0-jg ogreboss-idle-ja ((ogreboss-lod0-mg (meters 999999))) diff --git a/goal_src/levels/racer_common/collide-reaction-racer.gc b/goal_src/jak1/levels/racer_common/collide-reaction-racer.gc similarity index 100% rename from goal_src/levels/racer_common/collide-reaction-racer.gc rename to goal_src/jak1/levels/racer_common/collide-reaction-racer.gc diff --git a/goal_src/levels/racer_common/racer-part.gc b/goal_src/jak1/levels/racer_common/racer-part.gc similarity index 100% rename from goal_src/levels/racer_common/racer-part.gc rename to goal_src/jak1/levels/racer_common/racer-part.gc diff --git a/goal_src/levels/racer_common/racer-states.gc b/goal_src/jak1/levels/racer_common/racer-states.gc similarity index 100% rename from goal_src/levels/racer_common/racer-states.gc rename to goal_src/jak1/levels/racer_common/racer-states.gc diff --git a/goal_src/levels/racer_common/racer.gc b/goal_src/jak1/levels/racer_common/racer.gc similarity index 99% rename from goal_src/levels/racer_common/racer.gc rename to goal_src/jak1/levels/racer_common/racer.gc index 893d4d01fd..6477a8b8e8 100644 --- a/goal_src/levels/racer_common/racer.gc +++ b/goal_src/jak1/levels/racer_common/racer.gc @@ -10,7 +10,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/racer-ag.gc") +(import "goal_src/jak1/import/racer-ag.gc") (if (not (nmember "racerp" *kernel-packages*)) (set! *kernel-packages* (cons "racerp" *kernel-packages*)) diff --git a/goal_src/levels/racer_common/target-racer-h.gc b/goal_src/jak1/levels/racer_common/target-racer-h.gc similarity index 99% rename from goal_src/levels/racer_common/target-racer-h.gc rename to goal_src/jak1/levels/racer_common/target-racer-h.gc index cfa1e5d4e1..00e336d0a3 100644 --- a/goal_src/levels/racer_common/target-racer-h.gc +++ b/goal_src/jak1/levels/racer_common/target-racer-h.gc @@ -17,7 +17,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/balloon-ag.gc") +(import "goal_src/jak1/import/balloon-ag.gc") (deftype racer-info (basic) ((entity entity-actor :offset-assert 4) diff --git a/goal_src/levels/racer_common/target-racer.gc b/goal_src/jak1/levels/racer_common/target-racer.gc similarity index 100% rename from goal_src/levels/racer_common/target-racer.gc rename to goal_src/jak1/levels/racer_common/target-racer.gc diff --git a/goal_src/levels/robocave/cave-trap.gc b/goal_src/jak1/levels/robocave/cave-trap.gc similarity index 100% rename from goal_src/levels/robocave/cave-trap.gc rename to goal_src/jak1/levels/robocave/cave-trap.gc diff --git a/goal_src/levels/robocave/robocave-part.gc b/goal_src/jak1/levels/robocave/robocave-part.gc similarity index 100% rename from goal_src/levels/robocave/robocave-part.gc rename to goal_src/jak1/levels/robocave/robocave-part.gc diff --git a/goal_src/levels/robocave/spider-egg.gc b/goal_src/jak1/levels/robocave/spider-egg.gc similarity index 99% rename from goal_src/levels/robocave/spider-egg.gc rename to goal_src/jak1/levels/robocave/spider-egg.gc index a93f1b86f6..b90dc3dfd5 100644 --- a/goal_src/levels/robocave/spider-egg.gc +++ b/goal_src/jak1/levels/robocave/spider-egg.gc @@ -8,7 +8,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/spider-egg-ag.gc") +(import "goal_src/jak1/import/spider-egg-ag.gc") (deftype spider-egg (process-drawable) ((root-override collide-shape-moving :offset 112) diff --git a/goal_src/levels/rolling/rolling-lightning-mole.gc b/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc similarity index 99% rename from goal_src/levels/rolling/rolling-lightning-mole.gc rename to goal_src/jak1/levels/rolling/rolling-lightning-mole.gc index 37ecb572cb..6aa9bef0f5 100644 --- a/goal_src/levels/rolling/rolling-lightning-mole.gc +++ b/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/lightning-mole-ag.gc") +(import "goal_src/jak1/import/lightning-mole-ag.gc") (defun find-adjacent-bounds-one ((arg0 nav-mesh) (arg1 nav-poly) (arg2 int) (arg3 (array int8)) (arg4 (array int8)) (arg5 vector)) (local-vars (v0-2 object) (v1-2 int) (v1-30 int) (a0-2 int) (a0-12 int) (sv-16 nav-poly) (sv-32 int)) diff --git a/goal_src/levels/rolling/rolling-obs.gc b/goal_src/jak1/levels/rolling/rolling-obs.gc similarity index 99% rename from goal_src/levels/rolling/rolling-obs.gc rename to goal_src/jak1/levels/rolling/rolling-obs.gc index d06e69a281..19db86e8a0 100644 --- a/goal_src/levels/rolling/rolling-obs.gc +++ b/goal_src/jak1/levels/rolling/rolling-obs.gc @@ -7,11 +7,11 @@ ;; DECOMP BEGINS -(import "goal_src/import/rollingcam-ag.gc") -(import "goal_src/import/pusher-ag.gc") -(import "goal_src/import/happy-plant-ag.gc") -(import "goal_src/import/dark-plant-ag.gc") -(import "goal_src/import/rolling-start-ag.gc") +(import "goal_src/jak1/import/rollingcam-ag.gc") +(import "goal_src/jak1/import/pusher-ag.gc") +(import "goal_src/jak1/import/happy-plant-ag.gc") +(import "goal_src/jak1/import/dark-plant-ag.gc") +(import "goal_src/jak1/import/rolling-start-ag.gc") (deftype rolling-part (part-spawner) ((root-override basic :offset 112) diff --git a/goal_src/levels/rolling/rolling-race-ring.gc b/goal_src/jak1/levels/rolling/rolling-race-ring.gc similarity index 99% rename from goal_src/levels/rolling/rolling-race-ring.gc rename to goal_src/jak1/levels/rolling/rolling-race-ring.gc index 6e34fb32cf..60f96eceec 100644 --- a/goal_src/levels/rolling/rolling-race-ring.gc +++ b/goal_src/jak1/levels/rolling/rolling-race-ring.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/race-ring-ag.gc") +(import "goal_src/jak1/import/race-ring-ag.gc") (deftype race-ring (process-drawable) ((rot-y float :offset-assert 176) diff --git a/goal_src/levels/rolling/rolling-robber.gc b/goal_src/jak1/levels/rolling/rolling-robber.gc similarity index 99% rename from goal_src/levels/rolling/rolling-robber.gc rename to goal_src/jak1/levels/rolling/rolling-robber.gc index 46679b3ebb..eb2fbf83f1 100644 --- a/goal_src/levels/rolling/rolling-robber.gc +++ b/goal_src/jak1/levels/rolling/rolling-robber.gc @@ -8,7 +8,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/robber-ag.gc") +(import "goal_src/jak1/import/robber-ag.gc") (defstate fuel-cell-spline-slider (fuel-cell) :trans (the-as (function none :behavior fuel-cell) hide-hud-quick) diff --git a/goal_src/levels/snow/ice-cube.gc b/goal_src/jak1/levels/snow/ice-cube.gc similarity index 99% rename from goal_src/levels/snow/ice-cube.gc rename to goal_src/jak1/levels/snow/ice-cube.gc index f4717ff782..66643b5239 100644 --- a/goal_src/levels/snow/ice-cube.gc +++ b/goal_src/jak1/levels/snow/ice-cube.gc @@ -7,8 +7,8 @@ ;; DECOMP BEGINS -(import "goal_src/import/ice-cube-ag.gc") -(import "goal_src/import/ice-cube-break-ag.gc") +(import "goal_src/jak1/import/ice-cube-ag.gc") +(import "goal_src/jak1/import/ice-cube-break-ag.gc") (defskelgroup *ice-cube-break-sg* ice-cube-break ice-cube-break-lod0-jg -1 ((ice-cube-break-lod0-mg (meters 999999))) diff --git a/goal_src/levels/snow/snow-ball.gc b/goal_src/jak1/levels/snow/snow-ball.gc similarity index 99% rename from goal_src/levels/snow/snow-ball.gc rename to goal_src/jak1/levels/snow/snow-ball.gc index 489c9138a5..0bd388c4d6 100644 --- a/goal_src/levels/snow/snow-ball.gc +++ b/goal_src/jak1/levels/snow/snow-ball.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/snow-ball-ag.gc") +(import "goal_src/jak1/import/snow-ball-ag.gc") (deftype snow-ball-shadow (process-drawable) () diff --git a/goal_src/levels/snow/snow-bumper.gc b/goal_src/jak1/levels/snow/snow-bumper.gc similarity index 99% rename from goal_src/levels/snow/snow-bumper.gc rename to goal_src/jak1/levels/snow/snow-bumper.gc index 388e08eb7a..2825b1066b 100644 --- a/goal_src/levels/snow/snow-bumper.gc +++ b/goal_src/jak1/levels/snow/snow-bumper.gc @@ -8,7 +8,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/snow-bumper-ag.gc") +(import "goal_src/jak1/import/snow-bumper-ag.gc") (deftype snow-bumper (process-drawable) ((bumper-id int32 :offset-assert 176) diff --git a/goal_src/levels/snow/snow-bunny.gc b/goal_src/jak1/levels/snow/snow-bunny.gc similarity index 99% rename from goal_src/levels/snow/snow-bunny.gc rename to goal_src/jak1/levels/snow/snow-bunny.gc index e68bb61456..91562d1a21 100644 --- a/goal_src/levels/snow/snow-bunny.gc +++ b/goal_src/jak1/levels/snow/snow-bunny.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/snow-bunny-ag.gc") +(import "goal_src/jak1/import/snow-bunny-ag.gc") (deftype snow-bunny (nav-enemy) ((patrol-rand-distraction int32 :offset-assert 400) diff --git a/goal_src/levels/snow/snow-flutflut-obs.gc b/goal_src/jak1/levels/snow/snow-flutflut-obs.gc similarity index 99% rename from goal_src/levels/snow/snow-flutflut-obs.gc rename to goal_src/jak1/levels/snow/snow-flutflut-obs.gc index 09403e80ee..3c15dbe4f7 100644 --- a/goal_src/levels/snow/snow-flutflut-obs.gc +++ b/goal_src/jak1/levels/snow/snow-flutflut-obs.gc @@ -8,10 +8,10 @@ ;; DECOMP BEGINS -(import "goal_src/import/snow-button-ag.gc") -(import "goal_src/import/flutflut-plat-med-ag.gc") -(import "goal_src/import/flutflut-plat-small-ag.gc") -(import "goal_src/import/flutflut-plat-large-ag.gc") +(import "goal_src/jak1/import/snow-button-ag.gc") +(import "goal_src/jak1/import/flutflut-plat-med-ag.gc") +(import "goal_src/jak1/import/flutflut-plat-small-ag.gc") +(import "goal_src/jak1/import/flutflut-plat-large-ag.gc") (deftype flutflut-plat (plat) ((has-path? symbol :offset-assert 264) diff --git a/goal_src/levels/snow/snow-obs.gc b/goal_src/jak1/levels/snow/snow-obs.gc similarity index 99% rename from goal_src/levels/snow/snow-obs.gc rename to goal_src/jak1/levels/snow/snow-obs.gc index bd50ba6b29..11fe18cfd0 100644 --- a/goal_src/levels/snow/snow-obs.gc +++ b/goal_src/jak1/levels/snow/snow-obs.gc @@ -7,14 +7,14 @@ ;; DECOMP BEGINS -(import "goal_src/import/snowcam-ag.gc") -(import "goal_src/import/snow-fort-gate-ag.gc") -(import "goal_src/import/snow-eggtop-ag.gc") -(import "goal_src/import/snow-spatula-ag.gc") -(import "goal_src/import/snow-switch-ag.gc") -(import "goal_src/import/snow-gears-ag.gc") -(import "goal_src/import/snowpusher-ag.gc") -(import "goal_src/import/snow-log-ag.gc") +(import "goal_src/jak1/import/snowcam-ag.gc") +(import "goal_src/jak1/import/snow-fort-gate-ag.gc") +(import "goal_src/jak1/import/snow-eggtop-ag.gc") +(import "goal_src/jak1/import/snow-spatula-ag.gc") +(import "goal_src/jak1/import/snow-switch-ag.gc") +(import "goal_src/jak1/import/snow-gears-ag.gc") +(import "goal_src/jak1/import/snowpusher-ag.gc") +(import "goal_src/jak1/import/snow-log-ag.gc") (deftype snowcam (pov-camera) ((seq uint64 :offset-assert 224) diff --git a/goal_src/levels/snow/snow-part.gc b/goal_src/jak1/levels/snow/snow-part.gc similarity index 100% rename from goal_src/levels/snow/snow-part.gc rename to goal_src/jak1/levels/snow/snow-part.gc diff --git a/goal_src/levels/snow/snow-ram-boss.gc b/goal_src/jak1/levels/snow/snow-ram-boss.gc similarity index 99% rename from goal_src/levels/snow/snow-ram-boss.gc rename to goal_src/jak1/levels/snow/snow-ram-boss.gc index 5c363ad4d3..48cf24932f 100644 --- a/goal_src/levels/snow/snow-ram-boss.gc +++ b/goal_src/jak1/levels/snow/snow-ram-boss.gc @@ -9,7 +9,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/ram-boss-ag.gc") +(import "goal_src/jak1/import/ram-boss-ag.gc") (deftype ram-boss-proj (projectile) ((parent-override (pointer ram-boss) :offset 12) diff --git a/goal_src/levels/snow/snow-ram-h.gc b/goal_src/jak1/levels/snow/snow-ram-h.gc similarity index 100% rename from goal_src/levels/snow/snow-ram-h.gc rename to goal_src/jak1/levels/snow/snow-ram-h.gc diff --git a/goal_src/levels/snow/snow-ram.gc b/goal_src/jak1/levels/snow/snow-ram.gc similarity index 99% rename from goal_src/levels/snow/snow-ram.gc rename to goal_src/jak1/levels/snow/snow-ram.gc index 68abde7133..110fb95a1f 100644 --- a/goal_src/levels/snow/snow-ram.gc +++ b/goal_src/jak1/levels/snow/snow-ram.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/ram-ag.gc") +(import "goal_src/jak1/import/ram-ag.gc") (defskelgroup *ram-sg* ram ram-lod0-jg ram-cock-ja ((ram-lod0-mg (meters 20)) (ram-lod1-mg (meters 40)) (ram-lod2-mg (meters 999999))) diff --git a/goal_src/levels/snow/target-ice.gc b/goal_src/jak1/levels/snow/target-ice.gc similarity index 100% rename from goal_src/levels/snow/target-ice.gc rename to goal_src/jak1/levels/snow/target-ice.gc diff --git a/goal_src/levels/snow/target-snowball.gc b/goal_src/jak1/levels/snow/target-snowball.gc similarity index 100% rename from goal_src/levels/snow/target-snowball.gc rename to goal_src/jak1/levels/snow/target-snowball.gc diff --git a/goal_src/levels/snow/yeti.gc b/goal_src/jak1/levels/snow/yeti.gc similarity index 99% rename from goal_src/levels/snow/yeti.gc rename to goal_src/jak1/levels/snow/yeti.gc index 30caa0344b..190d702e82 100644 --- a/goal_src/levels/snow/yeti.gc +++ b/goal_src/jak1/levels/snow/yeti.gc @@ -10,7 +10,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/yeti-ag.gc") +(import "goal_src/jak1/import/yeti-ag.gc") (deftype yeti-slave (nav-enemy) ((ground-y float :offset-assert 400) diff --git a/goal_src/levels/sunken/bully.gc b/goal_src/jak1/levels/sunken/bully.gc similarity index 99% rename from goal_src/levels/sunken/bully.gc rename to goal_src/jak1/levels/sunken/bully.gc index e4f17be3ea..60154b300f 100644 --- a/goal_src/levels/sunken/bully.gc +++ b/goal_src/jak1/levels/sunken/bully.gc @@ -9,7 +9,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/bully-ag.gc") +(import "goal_src/jak1/import/bully-ag.gc") (deftype bully-broken-cage (process-drawable) ((parent-override (pointer bully) :offset 12) diff --git a/goal_src/levels/sunken/double-lurker.gc b/goal_src/jak1/levels/sunken/double-lurker.gc similarity index 99% rename from goal_src/levels/sunken/double-lurker.gc rename to goal_src/jak1/levels/sunken/double-lurker.gc index f0364f9bf8..7fcf1c3e08 100644 --- a/goal_src/levels/sunken/double-lurker.gc +++ b/goal_src/jak1/levels/sunken/double-lurker.gc @@ -9,8 +9,8 @@ ;; DECOMP BEGINS -(import "goal_src/import/double-lurker-ag.gc") -(import "goal_src/import/double-lurker-top-ag.gc") +(import "goal_src/jak1/import/double-lurker-ag.gc") +(import "goal_src/jak1/import/double-lurker-top-ag.gc") (deftype double-lurker-top (nav-enemy) ((parent-process (pointer double-lurker) :offset 12) diff --git a/goal_src/levels/sunken/floating-launcher.gc b/goal_src/jak1/levels/sunken/floating-launcher.gc similarity index 98% rename from goal_src/levels/sunken/floating-launcher.gc rename to goal_src/jak1/levels/sunken/floating-launcher.gc index 24b5b9ec09..b0bcf6a8de 100644 --- a/goal_src/levels/sunken/floating-launcher.gc +++ b/goal_src/jak1/levels/sunken/floating-launcher.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/floating-launcher-ag.gc") +(import "goal_src/jak1/import/floating-launcher-ag.gc") (deftype floating-launcher (baseplat) ((trigger-height float :offset-assert 228) diff --git a/goal_src/levels/sunken/helix-water.gc b/goal_src/jak1/levels/sunken/helix-water.gc similarity index 99% rename from goal_src/levels/sunken/helix-water.gc rename to goal_src/jak1/levels/sunken/helix-water.gc index 06ed974368..bbc561a372 100644 --- a/goal_src/levels/sunken/helix-water.gc +++ b/goal_src/jak1/levels/sunken/helix-water.gc @@ -14,8 +14,8 @@ ;; DECOMP BEGINS -(import "goal_src/import/helix-slide-door-ag.gc") -(import "goal_src/import/helix-button-ag.gc") +(import "goal_src/jak1/import/helix-slide-door-ag.gc") +(import "goal_src/jak1/import/helix-button-ag.gc") (deftype helix-slide-door (process-drawable) ((root-override collide-shape :offset 112) diff --git a/goal_src/levels/sunken/orbit-plat.gc b/goal_src/jak1/levels/sunken/orbit-plat.gc similarity index 99% rename from goal_src/levels/sunken/orbit-plat.gc rename to goal_src/jak1/levels/sunken/orbit-plat.gc index e3cd038d55..54e31c3842 100644 --- a/goal_src/levels/sunken/orbit-plat.gc +++ b/goal_src/jak1/levels/sunken/orbit-plat.gc @@ -9,8 +9,8 @@ ;; DECOMP BEGINS -(import "goal_src/import/orbit-plat-ag.gc") -(import "goal_src/import/orbit-plat-bottom-ag.gc") +(import "goal_src/jak1/import/orbit-plat-ag.gc") +(import "goal_src/jak1/import/orbit-plat-bottom-ag.gc") (deftype orbit-plat-bottom (process-drawable) ((parent-override (pointer orbit-plat) :offset 12) diff --git a/goal_src/levels/sunken/puffer.gc b/goal_src/jak1/levels/sunken/puffer.gc similarity index 99% rename from goal_src/levels/sunken/puffer.gc rename to goal_src/jak1/levels/sunken/puffer.gc index 7b40bb9eb5..3b63cb666e 100644 --- a/goal_src/levels/sunken/puffer.gc +++ b/goal_src/jak1/levels/sunken/puffer.gc @@ -8,7 +8,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/puffer-ag.gc") +(import "goal_src/jak1/import/puffer-ag.gc") (deftype puffer (process-drawable) ((root-override collide-shape-moving :offset 112) diff --git a/goal_src/levels/sunken/qbert-plat.gc b/goal_src/jak1/levels/sunken/qbert-plat.gc similarity index 99% rename from goal_src/levels/sunken/qbert-plat.gc rename to goal_src/jak1/levels/sunken/qbert-plat.gc index d462519a7c..b80a724fc7 100644 --- a/goal_src/levels/sunken/qbert-plat.gc +++ b/goal_src/jak1/levels/sunken/qbert-plat.gc @@ -10,8 +10,8 @@ ;; DECOMP BEGINS -(import "goal_src/import/qbert-plat-ag.gc") -(import "goal_src/import/qbert-plat-on-ag.gc") +(import "goal_src/jak1/import/qbert-plat-ag.gc") +(import "goal_src/jak1/import/qbert-plat-on-ag.gc") (deftype qbert-plat-on (process-drawable) () diff --git a/goal_src/levels/sunken/shover.gc b/goal_src/jak1/levels/sunken/shover.gc similarity index 99% rename from goal_src/levels/sunken/shover.gc rename to goal_src/jak1/levels/sunken/shover.gc index 957020a036..32b7bec01e 100644 --- a/goal_src/levels/sunken/shover.gc +++ b/goal_src/jak1/levels/sunken/shover.gc @@ -10,7 +10,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/shover-ag.gc") +(import "goal_src/jak1/import/shover-ag.gc") (deftype shover (process-drawable) ((root-override collide-shape :offset 112) diff --git a/goal_src/levels/sunken/square-platform.gc b/goal_src/jak1/levels/sunken/square-platform.gc similarity index 99% rename from goal_src/levels/sunken/square-platform.gc rename to goal_src/jak1/levels/sunken/square-platform.gc index c1b1dc828b..5fa2d3766d 100644 --- a/goal_src/levels/sunken/square-platform.gc +++ b/goal_src/jak1/levels/sunken/square-platform.gc @@ -10,7 +10,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/square-platform-ag.gc") +(import "goal_src/jak1/import/square-platform-ag.gc") (deftype square-platform (baseplat) ((plat-id int32 :offset-assert 228) diff --git a/goal_src/levels/sunken/steam-cap.gc b/goal_src/jak1/levels/sunken/steam-cap.gc similarity index 99% rename from goal_src/levels/sunken/steam-cap.gc rename to goal_src/jak1/levels/sunken/steam-cap.gc index a6b57508a8..c36170b290 100644 --- a/goal_src/levels/sunken/steam-cap.gc +++ b/goal_src/jak1/levels/sunken/steam-cap.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/steam-cap-ag.gc") +(import "goal_src/jak1/import/steam-cap-ag.gc") (deftype steam-cap-control-pt (structure) ((trans vector :inline :offset-assert 0) diff --git a/goal_src/levels/sunken/sun-exit-chamber.gc b/goal_src/jak1/levels/sunken/sun-exit-chamber.gc similarity index 99% rename from goal_src/levels/sunken/sun-exit-chamber.gc rename to goal_src/jak1/levels/sunken/sun-exit-chamber.gc index b6041d69d3..2eda240d22 100644 --- a/goal_src/levels/sunken/sun-exit-chamber.gc +++ b/goal_src/jak1/levels/sunken/sun-exit-chamber.gc @@ -10,9 +10,9 @@ ;; DECOMP BEGINS -(import "goal_src/import/exit-chamber-ag.gc") -(import "goal_src/import/blue-eco-charger-ag.gc") -(import "goal_src/import/blue-eco-charger-orb-ag.gc") +(import "goal_src/jak1/import/exit-chamber-ag.gc") +(import "goal_src/jak1/import/blue-eco-charger-ag.gc") +(import "goal_src/jak1/import/blue-eco-charger-orb-ag.gc") (deftype blue-eco-charger-orb (process-drawable) ((parent-process (pointer blue-eco-charger) :offset 12) diff --git a/goal_src/levels/sunken/sun-iris-door.gc b/goal_src/jak1/levels/sunken/sun-iris-door.gc similarity index 99% rename from goal_src/levels/sunken/sun-iris-door.gc rename to goal_src/jak1/levels/sunken/sun-iris-door.gc index 058ec92f03..b0673a2aad 100644 --- a/goal_src/levels/sunken/sun-iris-door.gc +++ b/goal_src/jak1/levels/sunken/sun-iris-door.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/sun-iris-door-ag.gc") +(import "goal_src/jak1/import/sun-iris-door-ag.gc") (deftype sun-iris-door (process-drawable) ((root-override collide-shape :offset 112) diff --git a/goal_src/levels/sunken/sunken-fish.gc b/goal_src/jak1/levels/sunken/sunken-fish.gc similarity index 99% rename from goal_src/levels/sunken/sunken-fish.gc rename to goal_src/jak1/levels/sunken/sunken-fish.gc index 3a88a47f3c..bcb3e8d72c 100644 --- a/goal_src/levels/sunken/sunken-fish.gc +++ b/goal_src/jak1/levels/sunken/sunken-fish.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/sunkenfisha-ag.gc") +(import "goal_src/jak1/import/sunkenfisha-ag.gc") (deftype sunkenfisha (process-drawable) ((path-u float :offset-assert 176) diff --git a/goal_src/levels/sunken/sunken-obs.gc b/goal_src/jak1/levels/sunken/sunken-obs.gc similarity index 98% rename from goal_src/levels/sunken/sunken-obs.gc rename to goal_src/jak1/levels/sunken/sunken-obs.gc index bb5c3b3ded..4854637806 100644 --- a/goal_src/levels/sunken/sunken-obs.gc +++ b/goal_src/jak1/levels/sunken/sunken-obs.gc @@ -10,9 +10,9 @@ ;; DECOMP BEGINS -(import "goal_src/import/seaweed-ag.gc") -(import "goal_src/import/sunkencam-ag.gc") -(import "goal_src/import/side-to-side-plat-ag.gc") +(import "goal_src/jak1/import/seaweed-ag.gc") +(import "goal_src/jak1/import/sunkencam-ag.gc") +(import "goal_src/jak1/import/side-to-side-plat-ag.gc") (deftype water-vol-deadly (process-hidden) () diff --git a/goal_src/levels/sunken/sunken-part.gc b/goal_src/jak1/levels/sunken/sunken-part.gc similarity index 100% rename from goal_src/levels/sunken/sunken-part.gc rename to goal_src/jak1/levels/sunken/sunken-part.gc diff --git a/goal_src/levels/sunken/sunken-part2.gc b/goal_src/jak1/levels/sunken/sunken-part2.gc similarity index 100% rename from goal_src/levels/sunken/sunken-part2.gc rename to goal_src/jak1/levels/sunken/sunken-part2.gc diff --git a/goal_src/levels/sunken/sunken-part3.gc b/goal_src/jak1/levels/sunken/sunken-part3.gc similarity index 100% rename from goal_src/levels/sunken/sunken-part3.gc rename to goal_src/jak1/levels/sunken/sunken-part3.gc diff --git a/goal_src/levels/sunken/sunken-part4.gc b/goal_src/jak1/levels/sunken/sunken-part4.gc similarity index 100% rename from goal_src/levels/sunken/sunken-part4.gc rename to goal_src/jak1/levels/sunken/sunken-part4.gc diff --git a/goal_src/levels/sunken/sunken-part5.gc b/goal_src/jak1/levels/sunken/sunken-part5.gc similarity index 100% rename from goal_src/levels/sunken/sunken-part5.gc rename to goal_src/jak1/levels/sunken/sunken-part5.gc diff --git a/goal_src/levels/sunken/sunken-pipegame.gc b/goal_src/jak1/levels/sunken/sunken-pipegame.gc similarity index 100% rename from goal_src/levels/sunken/sunken-pipegame.gc rename to goal_src/jak1/levels/sunken/sunken-pipegame.gc diff --git a/goal_src/levels/sunken/sunken-water.gc b/goal_src/jak1/levels/sunken/sunken-water.gc similarity index 100% rename from goal_src/levels/sunken/sunken-water.gc rename to goal_src/jak1/levels/sunken/sunken-water.gc diff --git a/goal_src/levels/sunken/target-tube.gc b/goal_src/jak1/levels/sunken/target-tube.gc similarity index 100% rename from goal_src/levels/sunken/target-tube.gc rename to goal_src/jak1/levels/sunken/target-tube.gc diff --git a/goal_src/levels/sunken/wall-plat.gc b/goal_src/jak1/levels/sunken/wall-plat.gc similarity index 99% rename from goal_src/levels/sunken/wall-plat.gc rename to goal_src/jak1/levels/sunken/wall-plat.gc index 01f1a9e413..93eecfe22c 100644 --- a/goal_src/levels/sunken/wall-plat.gc +++ b/goal_src/jak1/levels/sunken/wall-plat.gc @@ -9,7 +9,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/wall-plat-ag.gc") +(import "goal_src/jak1/import/wall-plat-ag.gc") (deftype wall-plat (process-drawable) ((root-override collide-shape-moving :offset 112) diff --git a/goal_src/levels/sunken/wedge-plats.gc b/goal_src/jak1/levels/sunken/wedge-plats.gc similarity index 99% rename from goal_src/levels/sunken/wedge-plats.gc rename to goal_src/jak1/levels/sunken/wedge-plats.gc index 625e27a6b8..dcacc4bf05 100644 --- a/goal_src/levels/sunken/wedge-plats.gc +++ b/goal_src/jak1/levels/sunken/wedge-plats.gc @@ -11,8 +11,8 @@ ;; DECOMP BEGINS -(import "goal_src/import/wedge-plat-outer-ag.gc") -(import "goal_src/import/wedge-plat-ag.gc") +(import "goal_src/jak1/import/wedge-plat-outer-ag.gc") +(import "goal_src/jak1/import/wedge-plat-ag.gc") (deftype wedge-plat-master (process) ((center vector :inline :offset-assert 112) diff --git a/goal_src/levels/sunken/whirlpool.gc b/goal_src/jak1/levels/sunken/whirlpool.gc similarity index 99% rename from goal_src/levels/sunken/whirlpool.gc rename to goal_src/jak1/levels/sunken/whirlpool.gc index 171c19a553..ec660c7467 100644 --- a/goal_src/levels/sunken/whirlpool.gc +++ b/goal_src/jak1/levels/sunken/whirlpool.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/whirlpool-ag.gc") +(import "goal_src/jak1/import/whirlpool-ag.gc") (deftype whirlpool (process-drawable) ((root-override collide-shape :offset 112) diff --git a/goal_src/levels/swamp/billy.gc b/goal_src/jak1/levels/swamp/billy.gc similarity index 99% rename from goal_src/levels/swamp/billy.gc rename to goal_src/jak1/levels/swamp/billy.gc index 15156e13cb..27af39cc8d 100644 --- a/goal_src/levels/swamp/billy.gc +++ b/goal_src/jak1/levels/swamp/billy.gc @@ -9,9 +9,9 @@ ;; DECOMP BEGINS -(import "goal_src/import/farthy-snack-ag.gc") -(import "goal_src/import/billy-ag.gc") -(import "goal_src/import/billy-sidekick-ag.gc") +(import "goal_src/jak1/import/farthy-snack-ag.gc") +(import "goal_src/jak1/import/billy-ag.gc") +(import "goal_src/jak1/import/billy-sidekick-ag.gc") (deftype billy (process-taskable) ((child-override (pointer billy-snack) :offset 20) diff --git a/goal_src/levels/swamp/kermit.gc b/goal_src/jak1/levels/swamp/kermit.gc similarity index 99% rename from goal_src/levels/swamp/kermit.gc rename to goal_src/jak1/levels/swamp/kermit.gc index f4f7be0df7..4b7b3fb757 100644 --- a/goal_src/levels/swamp/kermit.gc +++ b/goal_src/jak1/levels/swamp/kermit.gc @@ -9,7 +9,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/kermit-ag.gc") +(import "goal_src/jak1/import/kermit-ag.gc") (defpartgroup group-kermit-charging-up :id 298 diff --git a/goal_src/levels/swamp/swamp-bat.gc b/goal_src/jak1/levels/swamp/swamp-bat.gc similarity index 99% rename from goal_src/levels/swamp/swamp-bat.gc rename to goal_src/jak1/levels/swamp/swamp-bat.gc index 9373c49981..52d333580e 100644 --- a/goal_src/levels/swamp/swamp-bat.gc +++ b/goal_src/jak1/levels/swamp/swamp-bat.gc @@ -10,7 +10,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/swamp-bat-ag.gc") +(import "goal_src/jak1/import/swamp-bat-ag.gc") (deftype swamp-bat-idle-path (structure) ((origin vector :inline :offset-assert 0) diff --git a/goal_src/levels/swamp/swamp-obs.gc b/goal_src/jak1/levels/swamp/swamp-obs.gc similarity index 99% rename from goal_src/levels/swamp/swamp-obs.gc rename to goal_src/jak1/levels/swamp/swamp-obs.gc index e6f3485e49..6f0769e2ec 100644 --- a/goal_src/levels/swamp/swamp-obs.gc +++ b/goal_src/jak1/levels/swamp/swamp-obs.gc @@ -11,11 +11,11 @@ ;; DECOMP BEGINS -(import "goal_src/import/swamp-rock-ag.gc") -(import "goal_src/import/swamp-spike-ag.gc") -(import "goal_src/import/swampcam-ag.gc") -(import "goal_src/import/tar-plat-ag.gc") -(import "goal_src/import/balance-plat-ag.gc") +(import "goal_src/jak1/import/swamp-rock-ag.gc") +(import "goal_src/jak1/import/swamp-spike-ag.gc") +(import "goal_src/jak1/import/swampcam-ag.gc") +(import "goal_src/jak1/import/tar-plat-ag.gc") +(import "goal_src/jak1/import/balance-plat-ag.gc") (defpartgroup group-swamp-spike-up :id 289 diff --git a/goal_src/levels/swamp/swamp-part.gc b/goal_src/jak1/levels/swamp/swamp-part.gc similarity index 100% rename from goal_src/levels/swamp/swamp-part.gc rename to goal_src/jak1/levels/swamp/swamp-part.gc diff --git a/goal_src/levels/swamp/swamp-rat-nest.gc b/goal_src/jak1/levels/swamp/swamp-rat-nest.gc similarity index 99% rename from goal_src/levels/swamp/swamp-rat-nest.gc rename to goal_src/jak1/levels/swamp/swamp-rat-nest.gc index 5cb9a19661..197f65b46f 100644 --- a/goal_src/levels/swamp/swamp-rat-nest.gc +++ b/goal_src/jak1/levels/swamp/swamp-rat-nest.gc @@ -11,7 +11,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/swamp-rat-nest-ag.gc") +(import "goal_src/jak1/import/swamp-rat-nest-ag.gc") (defpartgroup group-swamp-rat-nest-a-explosion :id 292 diff --git a/goal_src/levels/swamp/swamp-rat.gc b/goal_src/jak1/levels/swamp/swamp-rat.gc similarity index 99% rename from goal_src/levels/swamp/swamp-rat.gc rename to goal_src/jak1/levels/swamp/swamp-rat.gc index cd780d4379..7f3faafe5e 100644 --- a/goal_src/levels/swamp/swamp-rat.gc +++ b/goal_src/jak1/levels/swamp/swamp-rat.gc @@ -10,7 +10,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/swamp-rat-ag.gc") +(import "goal_src/jak1/import/swamp-rat-ag.gc") (deftype swamp-rat (nav-enemy) ((up-vector vector :inline :offset-assert 400) diff --git a/goal_src/levels/title/title-obs.gc b/goal_src/jak1/levels/title/title-obs.gc similarity index 98% rename from goal_src/levels/title/title-obs.gc rename to goal_src/jak1/levels/title/title-obs.gc index e6ebcdee8c..d5b68c8493 100644 --- a/goal_src/levels/title/title-obs.gc +++ b/goal_src/jak1/levels/title/title-obs.gc @@ -7,13 +7,13 @@ ;; DECOMP BEGINS -(import "goal_src/import/logo-cam-ag.gc") -(import "goal_src/import/logo-black-ag.gc") -(import "goal_src/import/logo-ag.gc") -(import "goal_src/import/logo-volumes-ag.gc") -(import "goal_src/import/ndi-cam-ag.gc") -(import "goal_src/import/ndi-ag.gc") -(import "goal_src/import/ndi-volumes-ag.gc") +(import "goal_src/jak1/import/logo-cam-ag.gc") +(import "goal_src/jak1/import/logo-black-ag.gc") +(import "goal_src/jak1/import/logo-ag.gc") +(import "goal_src/jak1/import/logo-volumes-ag.gc") +(import "goal_src/jak1/import/ndi-cam-ag.gc") +(import "goal_src/jak1/import/ndi-ag.gc") +(import "goal_src/jak1/import/ndi-volumes-ag.gc") (deftype logo (process-drawable) ((camera handle :offset-assert 176) diff --git a/goal_src/levels/training/training-obs.gc b/goal_src/jak1/levels/training/training-obs.gc similarity index 99% rename from goal_src/levels/training/training-obs.gc rename to goal_src/jak1/levels/training/training-obs.gc index 40ae53f4d0..0911a379ee 100644 --- a/goal_src/levels/training/training-obs.gc +++ b/goal_src/jak1/levels/training/training-obs.gc @@ -7,11 +7,11 @@ ;; DECOMP BEGINS -(import "goal_src/import/scarecrow-b-ag.gc") -(import "goal_src/import/pontoonfive-ag.gc") -(import "goal_src/import/trainingcam-ag.gc") -(import "goal_src/import/scarecrow-a-ag.gc") -(import "goal_src/import/jng-iris-door-ag.gc") +(import "goal_src/jak1/import/scarecrow-b-ag.gc") +(import "goal_src/jak1/import/pontoonfive-ag.gc") +(import "goal_src/jak1/import/trainingcam-ag.gc") +(import "goal_src/jak1/import/scarecrow-a-ag.gc") +(import "goal_src/jak1/import/jng-iris-door-ag.gc") (deftype training-water (water-anim) () diff --git a/goal_src/levels/training/training-part.gc b/goal_src/jak1/levels/training/training-part.gc similarity index 100% rename from goal_src/levels/training/training-part.gc rename to goal_src/jak1/levels/training/training-part.gc diff --git a/goal_src/levels/village1/assistant.gc b/goal_src/jak1/levels/village1/assistant.gc similarity index 99% rename from goal_src/levels/village1/assistant.gc rename to goal_src/jak1/levels/village1/assistant.gc index 0ffdeff23b..d53f20a2b0 100644 --- a/goal_src/levels/village1/assistant.gc +++ b/goal_src/jak1/levels/village1/assistant.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/assistant-ag.gc") +(import "goal_src/jak1/import/assistant-ag.gc") (deftype assistant (process-taskable) ((sound-id sound-id :offset-assert 380) diff --git a/goal_src/levels/village1/explorer.gc b/goal_src/jak1/levels/village1/explorer.gc similarity index 99% rename from goal_src/levels/village1/explorer.gc rename to goal_src/jak1/levels/village1/explorer.gc index 2923dc38b2..f1d411d9e1 100644 --- a/goal_src/levels/village1/explorer.gc +++ b/goal_src/jak1/levels/village1/explorer.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/explorer-ag.gc") +(import "goal_src/jak1/import/explorer-ag.gc") (deftype explorer (process-taskable) () diff --git a/goal_src/levels/village1/farmer.gc b/goal_src/jak1/levels/village1/farmer.gc similarity index 99% rename from goal_src/levels/village1/farmer.gc rename to goal_src/jak1/levels/village1/farmer.gc index 78500ca77c..35521df52a 100644 --- a/goal_src/levels/village1/farmer.gc +++ b/goal_src/jak1/levels/village1/farmer.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/farmer-ag.gc") +(import "goal_src/jak1/import/farmer-ag.gc") (deftype farmer (process-taskable) () diff --git a/goal_src/levels/village1/fishermans-boat.gc b/goal_src/jak1/levels/village1/fishermans-boat.gc similarity index 99% rename from goal_src/levels/village1/fishermans-boat.gc rename to goal_src/jak1/levels/village1/fishermans-boat.gc index ed5a3c28a5..125a9794ef 100644 --- a/goal_src/levels/village1/fishermans-boat.gc +++ b/goal_src/jak1/levels/village1/fishermans-boat.gc @@ -9,9 +9,9 @@ ;; DECOMP BEGINS -(import "goal_src/import/evilbro-ag.gc") -(import "goal_src/import/fishermans-boat-ag.gc") -(import "goal_src/import/evilsis-ag.gc") +(import "goal_src/jak1/import/evilbro-ag.gc") +(import "goal_src/jak1/import/fishermans-boat-ag.gc") +(import "goal_src/jak1/import/evilsis-ag.gc") (define *fishermans-boat-constants* (new 'static 'rigid-body-platform-constants :drag-factor 2.0 diff --git a/goal_src/levels/village1/sage.gc b/goal_src/jak1/levels/village1/sage.gc similarity index 99% rename from goal_src/levels/village1/sage.gc rename to goal_src/jak1/levels/village1/sage.gc index deb39e091d..cf8be68b9e 100644 --- a/goal_src/levels/village1/sage.gc +++ b/goal_src/jak1/levels/village1/sage.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/sage-ag.gc") +(import "goal_src/jak1/import/sage-ag.gc") (deftype sage (process-taskable) ((reminder-played basic :offset-assert 380) diff --git a/goal_src/levels/village1/sequence-a-village1.gc b/goal_src/jak1/levels/village1/sequence-a-village1.gc similarity index 100% rename from goal_src/levels/village1/sequence-a-village1.gc rename to goal_src/jak1/levels/village1/sequence-a-village1.gc diff --git a/goal_src/levels/village1/village-obs.gc b/goal_src/jak1/levels/village1/village-obs.gc similarity index 96% rename from goal_src/levels/village1/village-obs.gc rename to goal_src/jak1/levels/village1/village-obs.gc index 94916e6f22..4afe1675b6 100644 --- a/goal_src/levels/village1/village-obs.gc +++ b/goal_src/jak1/levels/village1/village-obs.gc @@ -8,28 +8,28 @@ ;; DECOMP BEGINS -(import "goal_src/import/windmill-sail-ag.gc") -(import "goal_src/import/medres-beach3-ag.gc") -(import "goal_src/import/mayorgears-ag.gc") -(import "goal_src/import/medres-village11-ag.gc") -(import "goal_src/import/revcycleprop-ag.gc") -(import "goal_src/import/medres-jungle2-ag.gc") -(import "goal_src/import/revcycle-ag.gc") -(import "goal_src/import/medres-misty-ag.gc") -(import "goal_src/import/sagesail-ag.gc") -(import "goal_src/import/windspinner-ag.gc") -(import "goal_src/import/medres-jungle1-ag.gc") -(import "goal_src/import/medres-village12-ag.gc") -(import "goal_src/import/hutlamp-ag.gc") -(import "goal_src/import/medres-jungle-ag.gc") -(import "goal_src/import/medres-village13-ag.gc") -(import "goal_src/import/medres-beach2-ag.gc") -(import "goal_src/import/villa-starfish-ag.gc") -(import "goal_src/import/medres-training-ag.gc") -(import "goal_src/import/medres-beach-ag.gc") -(import "goal_src/import/reflector-middle-ag.gc") -(import "goal_src/import/medres-beach1-ag.gc") -(import "goal_src/import/evilplant-ag.gc") +(import "goal_src/jak1/import/windmill-sail-ag.gc") +(import "goal_src/jak1/import/medres-beach3-ag.gc") +(import "goal_src/jak1/import/mayorgears-ag.gc") +(import "goal_src/jak1/import/medres-village11-ag.gc") +(import "goal_src/jak1/import/revcycleprop-ag.gc") +(import "goal_src/jak1/import/medres-jungle2-ag.gc") +(import "goal_src/jak1/import/revcycle-ag.gc") +(import "goal_src/jak1/import/medres-misty-ag.gc") +(import "goal_src/jak1/import/sagesail-ag.gc") +(import "goal_src/jak1/import/windspinner-ag.gc") +(import "goal_src/jak1/import/medres-jungle1-ag.gc") +(import "goal_src/jak1/import/medres-village12-ag.gc") +(import "goal_src/jak1/import/hutlamp-ag.gc") +(import "goal_src/jak1/import/medres-jungle-ag.gc") +(import "goal_src/jak1/import/medres-village13-ag.gc") +(import "goal_src/jak1/import/medres-beach2-ag.gc") +(import "goal_src/jak1/import/villa-starfish-ag.gc") +(import "goal_src/jak1/import/medres-training-ag.gc") +(import "goal_src/jak1/import/medres-beach-ag.gc") +(import "goal_src/jak1/import/reflector-middle-ag.gc") +(import "goal_src/jak1/import/medres-beach1-ag.gc") +(import "goal_src/jak1/import/evilplant-ag.gc") (defskelgroup *med-res-jungle-sg* medres-jungle medres-jungle-lod0-jg medres-jungle-idle-ja ((medres-jungle-lod0-mg (meters 999999))) diff --git a/goal_src/levels/village1/village1-part.gc b/goal_src/jak1/levels/village1/village1-part.gc similarity index 100% rename from goal_src/levels/village1/village1-part.gc rename to goal_src/jak1/levels/village1/village1-part.gc diff --git a/goal_src/levels/village1/village1-part2.gc b/goal_src/jak1/levels/village1/village1-part2.gc similarity index 100% rename from goal_src/levels/village1/village1-part2.gc rename to goal_src/jak1/levels/village1/village1-part2.gc diff --git a/goal_src/levels/village1/yakow.gc b/goal_src/jak1/levels/village1/yakow.gc similarity index 99% rename from goal_src/levels/village1/yakow.gc rename to goal_src/jak1/levels/village1/yakow.gc index 79c329f8d7..2a386bee11 100644 --- a/goal_src/levels/village1/yakow.gc +++ b/goal_src/jak1/levels/village1/yakow.gc @@ -9,8 +9,8 @@ ;; DECOMP BEGINS -(import "goal_src/import/village1cam-ag.gc") -(import "goal_src/import/yakow-ag.gc") +(import "goal_src/jak1/import/village1cam-ag.gc") +(import "goal_src/jak1/import/yakow-ag.gc") (defskelgroup *village1cam-sg* village1cam village1cam-lod0-jg village1cam-anim-ja ((village1cam-lod0-mg (meters 999999))) diff --git a/goal_src/levels/village2/assistant-village2.gc b/goal_src/jak1/levels/village2/assistant-village2.gc similarity index 99% rename from goal_src/levels/village2/assistant-village2.gc rename to goal_src/jak1/levels/village2/assistant-village2.gc index 7161b86d80..3460f681eb 100644 --- a/goal_src/levels/village2/assistant-village2.gc +++ b/goal_src/jak1/levels/village2/assistant-village2.gc @@ -7,8 +7,8 @@ ;; DECOMP BEGINS -(import "goal_src/import/jaws-ag.gc") -(import "goal_src/import/assistant-village2-ag.gc") +(import "goal_src/jak1/import/jaws-ag.gc") +(import "goal_src/jak1/import/assistant-village2-ag.gc") (deftype assistant-levitator (process-taskable) ((boulder entity-actor :offset-assert 380) diff --git a/goal_src/levels/village2/flutflut-bluehut.gc b/goal_src/jak1/levels/village2/flutflut-bluehut.gc similarity index 98% rename from goal_src/levels/village2/flutflut-bluehut.gc rename to goal_src/jak1/levels/village2/flutflut-bluehut.gc index cf42b5308b..18f90b2190 100644 --- a/goal_src/levels/village2/flutflut-bluehut.gc +++ b/goal_src/jak1/levels/village2/flutflut-bluehut.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/flutflut-bluehut-ag.gc") +(import "goal_src/jak1/import/flutflut-bluehut-ag.gc") (deftype flutflut-bluehut (process-taskable) () diff --git a/goal_src/levels/village2/gambler.gc b/goal_src/jak1/levels/village2/gambler.gc similarity index 99% rename from goal_src/levels/village2/gambler.gc rename to goal_src/jak1/levels/village2/gambler.gc index 3562f0e4ac..08b019c70e 100644 --- a/goal_src/levels/village2/gambler.gc +++ b/goal_src/jak1/levels/village2/gambler.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/gambler-ag.gc") +(import "goal_src/jak1/import/gambler-ag.gc") (deftype gambler (process-taskable) () diff --git a/goal_src/levels/village2/geologist.gc b/goal_src/jak1/levels/village2/geologist.gc similarity index 99% rename from goal_src/levels/village2/geologist.gc rename to goal_src/jak1/levels/village2/geologist.gc index 3ff140861a..26fd564ca5 100644 --- a/goal_src/levels/village2/geologist.gc +++ b/goal_src/jak1/levels/village2/geologist.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/geologist-ag.gc") +(import "goal_src/jak1/import/geologist-ag.gc") (deftype geologist (process-taskable) () diff --git a/goal_src/levels/village2/sage-bluehut.gc b/goal_src/jak1/levels/village2/sage-bluehut.gc similarity index 99% rename from goal_src/levels/village2/sage-bluehut.gc rename to goal_src/jak1/levels/village2/sage-bluehut.gc index 7f6e6a026e..d5409c5dbd 100644 --- a/goal_src/levels/village2/sage-bluehut.gc +++ b/goal_src/jak1/levels/village2/sage-bluehut.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/sage-bluehut-ag.gc") +(import "goal_src/jak1/import/sage-bluehut-ag.gc") (deftype assistant-bluehut (process-taskable) ((sound-id sound-id :offset-assert 380) diff --git a/goal_src/levels/village2/sunken-elevator.gc b/goal_src/jak1/levels/village2/sunken-elevator.gc similarity index 99% rename from goal_src/levels/village2/sunken-elevator.gc rename to goal_src/jak1/levels/village2/sunken-elevator.gc index 057d257233..8d9fc36674 100644 --- a/goal_src/levels/village2/sunken-elevator.gc +++ b/goal_src/jak1/levels/village2/sunken-elevator.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/sunken-elevator-ag.gc") +(import "goal_src/jak1/import/sunken-elevator-ag.gc") (deftype sunken-elevator (plat-button) ((play-at-top-going-up-camera? symbol :offset-assert 240) diff --git a/goal_src/levels/village2/swamp-blimp.gc b/goal_src/jak1/levels/village2/swamp-blimp.gc similarity index 99% rename from goal_src/levels/village2/swamp-blimp.gc rename to goal_src/jak1/levels/village2/swamp-blimp.gc index 96aceefecb..179f1dd0ec 100644 --- a/goal_src/levels/village2/swamp-blimp.gc +++ b/goal_src/jak1/levels/village2/swamp-blimp.gc @@ -10,11 +10,11 @@ ;; DECOMP BEGINS -(import "goal_src/import/swamp-tetherrock-ag.gc") -(import "goal_src/import/swamp-rope-ag.gc") -(import "goal_src/import/swamp-tetherrock-explode-ag.gc") -(import "goal_src/import/precursor-arm-ag.gc") -(import "goal_src/import/swamp-blimp-ag.gc") +(import "goal_src/jak1/import/swamp-tetherrock-ag.gc") +(import "goal_src/jak1/import/swamp-rope-ag.gc") +(import "goal_src/jak1/import/swamp-tetherrock-explode-ag.gc") +(import "goal_src/jak1/import/precursor-arm-ag.gc") +(import "goal_src/jak1/import/swamp-blimp-ag.gc") (defskelgroup *swamp-tetherrock-sg* swamp-tetherrock swamp-tetherrock-lod0-jg swamp-tetherrock-idle-ja ((swamp-tetherrock-lod0-mg (meters 999999))) diff --git a/goal_src/levels/village2/village2-obs.gc b/goal_src/jak1/levels/village2/village2-obs.gc similarity index 98% rename from goal_src/levels/village2/village2-obs.gc rename to goal_src/jak1/levels/village2/village2-obs.gc index 5778888a04..a41ed613c1 100644 --- a/goal_src/levels/village2/village2-obs.gc +++ b/goal_src/jak1/levels/village2/village2-obs.gc @@ -8,17 +8,17 @@ ;; DECOMP BEGINS -(import "goal_src/import/pontoonfive-ag.gc") -(import "goal_src/import/allpontoons-ag.gc") -(import "goal_src/import/medres-village2-ag.gc") -(import "goal_src/import/exit-chamber-dummy-ag.gc") -(import "goal_src/import/village2cam-ag.gc") -(import "goal_src/import/fireboulder-ag.gc") -(import "goal_src/import/ogreboss-village2-ag.gc") -(import "goal_src/import/ceilingflag-ag.gc") -(import "goal_src/import/medres-rolling1-ag.gc") -(import "goal_src/import/medres-rolling-ag.gc") -(import "goal_src/import/pontoonten-ag.gc") +(import "goal_src/jak1/import/pontoonfive-ag.gc") +(import "goal_src/jak1/import/allpontoons-ag.gc") +(import "goal_src/jak1/import/medres-village2-ag.gc") +(import "goal_src/jak1/import/exit-chamber-dummy-ag.gc") +(import "goal_src/jak1/import/village2cam-ag.gc") +(import "goal_src/jak1/import/fireboulder-ag.gc") +(import "goal_src/jak1/import/ogreboss-village2-ag.gc") +(import "goal_src/jak1/import/ceilingflag-ag.gc") +(import "goal_src/jak1/import/medres-rolling1-ag.gc") +(import "goal_src/jak1/import/medres-rolling-ag.gc") +(import "goal_src/jak1/import/pontoonten-ag.gc") (deftype village2cam (pov-camera) ((seq uint64 :offset-assert 224) diff --git a/goal_src/levels/village2/village2-part.gc b/goal_src/jak1/levels/village2/village2-part.gc similarity index 100% rename from goal_src/levels/village2/village2-part.gc rename to goal_src/jak1/levels/village2/village2-part.gc diff --git a/goal_src/levels/village2/village2-part2.gc b/goal_src/jak1/levels/village2/village2-part2.gc similarity index 100% rename from goal_src/levels/village2/village2-part2.gc rename to goal_src/jak1/levels/village2/village2-part2.gc diff --git a/goal_src/levels/village2/warrior.gc b/goal_src/jak1/levels/village2/warrior.gc similarity index 99% rename from goal_src/levels/village2/warrior.gc rename to goal_src/jak1/levels/village2/warrior.gc index eaf7da09b0..0fcbe34a7d 100644 --- a/goal_src/levels/village2/warrior.gc +++ b/goal_src/jak1/levels/village2/warrior.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/warrior-ag.gc") +(import "goal_src/jak1/import/warrior-ag.gc") (deftype warrior (process-taskable) () diff --git a/goal_src/levels/village3/assistant-village3.gc b/goal_src/jak1/levels/village3/assistant-village3.gc similarity index 99% rename from goal_src/levels/village3/assistant-village3.gc rename to goal_src/jak1/levels/village3/assistant-village3.gc index 632c4d7a12..3648c90e91 100644 --- a/goal_src/levels/village3/assistant-village3.gc +++ b/goal_src/jak1/levels/village3/assistant-village3.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/assistant-village3-ag.gc") +(import "goal_src/jak1/import/assistant-village3-ag.gc") (deftype assistant-villagec (process-taskable) () diff --git a/goal_src/levels/village3/minecart.gc b/goal_src/jak1/levels/village3/minecart.gc similarity index 99% rename from goal_src/levels/village3/minecart.gc rename to goal_src/jak1/levels/village3/minecart.gc index c31bd2781f..3471984d50 100644 --- a/goal_src/levels/village3/minecart.gc +++ b/goal_src/jak1/levels/village3/minecart.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/minecartsteel-ag.gc") +(import "goal_src/jak1/import/minecartsteel-ag.gc") (defskelgroup *minecartsteel-sg* minecartsteel minecartsteel-lod0-jg minecartsteel-idle-ja ((minecartsteel-lod0-mg (meters 20)) diff --git a/goal_src/levels/village3/miners.gc b/goal_src/jak1/levels/village3/miners.gc similarity index 99% rename from goal_src/levels/village3/miners.gc rename to goal_src/jak1/levels/village3/miners.gc index 49718bb9ce..efd8aca35d 100644 --- a/goal_src/levels/village3/miners.gc +++ b/goal_src/jak1/levels/village3/miners.gc @@ -9,9 +9,9 @@ ;; DECOMP BEGINS -(import "goal_src/import/minershort-ag.gc") -(import "goal_src/import/cavegem-ag.gc") -(import "goal_src/import/minertall-ag.gc") +(import "goal_src/jak1/import/minershort-ag.gc") +(import "goal_src/jak1/import/cavegem-ag.gc") +(import "goal_src/jak1/import/minertall-ag.gc") (defbehavior miners-anim-loop minershort () (when (!= (ja-group) (get-art-elem self)) diff --git a/goal_src/levels/village3/sage-village3.gc b/goal_src/jak1/levels/village3/sage-village3.gc similarity index 98% rename from goal_src/levels/village3/sage-village3.gc rename to goal_src/jak1/levels/village3/sage-village3.gc index 6f0b290c2d..924a1ff328 100644 --- a/goal_src/levels/village3/sage-village3.gc +++ b/goal_src/jak1/levels/village3/sage-village3.gc @@ -7,9 +7,9 @@ ;; DECOMP BEGINS -(import "goal_src/import/evilsis-village3-ag.gc") -(import "goal_src/import/sage-village3-ag.gc") -(import "goal_src/import/evilbro-village3-ag.gc") +(import "goal_src/jak1/import/evilsis-village3-ag.gc") +(import "goal_src/jak1/import/sage-village3-ag.gc") +(import "goal_src/jak1/import/evilbro-village3-ag.gc") (deftype sage-villagec (process-taskable) ((evilbro handle :offset-assert 384) diff --git a/goal_src/levels/village3/village3-obs.gc b/goal_src/jak1/levels/village3/village3-obs.gc similarity index 98% rename from goal_src/levels/village3/village3-obs.gc rename to goal_src/jak1/levels/village3/village3-obs.gc index 58a289600d..ac3426dbda 100644 --- a/goal_src/levels/village3/village3-obs.gc +++ b/goal_src/jak1/levels/village3/village3-obs.gc @@ -7,13 +7,13 @@ ;; DECOMP BEGINS -(import "goal_src/import/medres-ogre-ag.gc") -(import "goal_src/import/medres-finalboss-ag.gc") -(import "goal_src/import/pistons-ag.gc") -(import "goal_src/import/gondola-ag.gc") -(import "goal_src/import/medres-ogre2-ag.gc") -(import "goal_src/import/medres-ogre3-ag.gc") -(import "goal_src/import/gondolacables-ag.gc") +(import "goal_src/jak1/import/medres-ogre-ag.gc") +(import "goal_src/jak1/import/medres-finalboss-ag.gc") +(import "goal_src/jak1/import/pistons-ag.gc") +(import "goal_src/jak1/import/gondola-ag.gc") +(import "goal_src/jak1/import/medres-ogre2-ag.gc") +(import "goal_src/jak1/import/medres-ogre3-ag.gc") +(import "goal_src/jak1/import/gondolacables-ag.gc") (defskelgroup *med-res-ogre-sg* medres-ogre medres-ogre-lod0-jg medres-ogre-idle-ja ((medres-ogre-lod0-mg (meters 999999))) diff --git a/goal_src/levels/village3/village3-part.gc b/goal_src/jak1/levels/village3/village3-part.gc similarity index 100% rename from goal_src/levels/village3/village3-part.gc rename to goal_src/jak1/levels/village3/village3-part.gc diff --git a/goal_src/levels/village_common/oracle.gc b/goal_src/jak1/levels/village_common/oracle.gc similarity index 99% rename from goal_src/levels/village_common/oracle.gc rename to goal_src/jak1/levels/village_common/oracle.gc index f22c235805..eac127ebe7 100644 --- a/goal_src/levels/village_common/oracle.gc +++ b/goal_src/jak1/levels/village_common/oracle.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(import "goal_src/import/oracle-ag.gc") +(import "goal_src/jak1/import/oracle-ag.gc") (deftype oracle (process-taskable) ((first-task uint8 :offset-assert 380) diff --git a/goal_src/levels/village_common/villagep-obs.gc b/goal_src/jak1/levels/village_common/villagep-obs.gc similarity index 99% rename from goal_src/levels/village_common/villagep-obs.gc rename to goal_src/jak1/levels/village_common/villagep-obs.gc index 603c6a9191..4391acdb7f 100644 --- a/goal_src/levels/village_common/villagep-obs.gc +++ b/goal_src/jak1/levels/village_common/villagep-obs.gc @@ -8,8 +8,8 @@ ;; DECOMP BEGINS -(import "goal_src/import/warp-gate-switch-ag.gc") -(import "goal_src/import/village-cam-ag.gc") +(import "goal_src/jak1/import/warp-gate-switch-ag.gc") +(import "goal_src/jak1/import/village-cam-ag.gc") (deftype warpgate (process-hidden) () diff --git a/goal_src/old/cavegeyserrock.gc b/goal_src/jak1/old/cavegeyserrock.gc similarity index 100% rename from goal_src/old/cavegeyserrock.gc rename to goal_src/jak1/old/cavegeyserrock.gc diff --git a/goal_src/old/citb-drop-plat-OLD.gc b/goal_src/jak1/old/citb-drop-plat-OLD.gc similarity index 100% rename from goal_src/old/citb-drop-plat-OLD.gc rename to goal_src/jak1/old/citb-drop-plat-OLD.gc diff --git a/goal_src/old/fisher-OLD.gc b/goal_src/jak1/old/fisher-OLD.gc similarity index 100% rename from goal_src/old/fisher-OLD.gc rename to goal_src/jak1/old/fisher-OLD.gc diff --git a/goal_src/old/lava/lava.gc b/goal_src/jak1/old/lava/lava.gc similarity index 100% rename from goal_src/old/lava/lava.gc rename to goal_src/jak1/old/lava/lava.gc diff --git a/goal_src/old/racer-states-OLD.gc b/goal_src/jak1/old/racer-states-OLD.gc similarity index 100% rename from goal_src/old/racer-states-OLD.gc rename to goal_src/jak1/old/racer-states-OLD.gc diff --git a/goal_src/old/sage-finalboss-OLD.gc b/goal_src/jak1/old/sage-finalboss-OLD.gc similarity index 100% rename from goal_src/old/sage-finalboss-OLD.gc rename to goal_src/jak1/old/sage-finalboss-OLD.gc diff --git a/goal_src/old/target-racer-OLD.gc b/goal_src/jak1/old/target-racer-OLD.gc similarity index 100% rename from goal_src/old/target-racer-OLD.gc rename to goal_src/jak1/old/target-racer-OLD.gc diff --git a/goal_src/old/target-racer-h-OLD.gc b/goal_src/jak1/old/target-racer-h-OLD.gc similarity index 100% rename from goal_src/old/target-racer-h-OLD.gc rename to goal_src/jak1/old/target-racer-h-OLD.gc diff --git a/goal_src/old/village-obs-OLD.gc b/goal_src/jak1/old/village-obs-OLD.gc similarity index 100% rename from goal_src/old/village-obs-OLD.gc rename to goal_src/jak1/old/village-obs-OLD.gc diff --git a/goal_src/pc/README.md b/goal_src/jak1/pc/README.md similarity index 100% rename from goal_src/pc/README.md rename to goal_src/jak1/pc/README.md diff --git a/goal_src/pc/anim-tester-x.gc b/goal_src/jak1/pc/anim-tester-x.gc similarity index 100% rename from goal_src/pc/anim-tester-x.gc rename to goal_src/jak1/pc/anim-tester-x.gc diff --git a/goal_src/pc/hud-classes-pc.gc b/goal_src/jak1/pc/hud-classes-pc.gc similarity index 100% rename from goal_src/pc/hud-classes-pc.gc rename to goal_src/jak1/pc/hud-classes-pc.gc diff --git a/goal_src/pc/pckernel-h.gc b/goal_src/jak1/pc/pckernel-h.gc similarity index 100% rename from goal_src/pc/pckernel-h.gc rename to goal_src/jak1/pc/pckernel-h.gc diff --git a/goal_src/pc/pckernel.gc b/goal_src/jak1/pc/pckernel.gc similarity index 100% rename from goal_src/pc/pckernel.gc rename to goal_src/jak1/pc/pckernel.gc diff --git a/goal_src/pc/progress-pc.gc b/goal_src/jak1/pc/progress-pc.gc similarity index 100% rename from goal_src/pc/progress-pc.gc rename to goal_src/jak1/pc/progress-pc.gc diff --git a/goal_src/pc/subtitle.gc b/goal_src/jak1/pc/subtitle.gc similarity index 100% rename from goal_src/pc/subtitle.gc rename to goal_src/jak1/pc/subtitle.gc diff --git a/goal_src/pc_debug/font-encode-test.gc b/goal_src/jak1/pc_debug/font-encode-test.gc similarity index 100% rename from goal_src/pc_debug/font-encode-test.gc rename to goal_src/jak1/pc_debug/font-encode-test.gc diff --git a/goal_src/pc_debug/pc-pad-utils.gc b/goal_src/jak1/pc_debug/pc-pad-utils.gc similarity index 100% rename from goal_src/pc_debug/pc-pad-utils.gc rename to goal_src/jak1/pc_debug/pc-pad-utils.gc diff --git a/goal_src/user/.gitignore b/goal_src/jak1/user/.gitignore similarity index 100% rename from goal_src/user/.gitignore rename to goal_src/jak1/user/.gitignore diff --git a/goal_src/user/readme.md b/goal_src/jak1/user/readme.md similarity index 100% rename from goal_src/user/readme.md rename to goal_src/jak1/user/readme.md diff --git a/goal_src/jak2/build/all_objs.json b/goal_src/jak2/build/all_objs.json new file mode 100644 index 0000000000..ccb2b24f91 --- /dev/null +++ b/goal_src/jak2/build/all_objs.json @@ -0,0 +1,2252 @@ +[ +["dir-tpages-ART", "dir-tpages", 4, ["ART"], "levels/common"], +["dir-tpages-GAME", "dir-tpages", 4, ["GAME"], "levels/common"], +["tpage-11", "tpage-11", 4, ["ART", "GAME"], "levels/common"], +["tpage-31", "tpage-31", 4, ["ART", "GAME"], "levels/common"], +["tpage-1804", "tpage-1804", 4, ["ART", "GAME"], "levels/common"], +["texture-upload", "texture-upload", 3, ["ART", "GAME"], "engine/gfx/texture"], +["tpage-12", "tpage-12", 4, ["ART", "GAME"], "levels/common"], +["tpage-917", "tpage-917", 4, ["ART", "GAME"], "levels/common"], +["tpage-918", "tpage-918", 4, ["ART", "GAME"], "levels/common"], +["tpage-1106", "tpage-1106", 4, ["ART", "GAME"], "levels/common"], +["tpage-1141", "tpage-1141", 4, ["ART", "GAME"], "levels/common"], +["tpage-1658", "tpage-1658", 4, ["ART", "GAME"], "levels/common"], +["tpage-2841", "tpage-2841", 4, ["ART", "GAME"], "levels/common"], +["tpage-2932", "tpage-2932", 4, ["ART", "GAME"], "levels/common"], +["tpage-3076", "tpage-3076", 4, ["ART", "GAME"], "levels/common"], +["texture-finish", "texture-finish", 3, ["ART", "GAME"], "engine/gfx/texture"], +["collectables-ag", "collectables", 4, ["ART", "GAME"], "levels/common"], +["ctywide-arrow-ag", "ctywide-arrow", 4, ["ART", "GAME"], "levels/common"], +["crate-ag", "crate", 4, ["ART", "GAME"], "levels/common"], +["talk-box-ag", "talk-box", 4, ["ART", "GAME"], "levels/common"], +["scenecamera-ag", "scenecamera", 4, ["ART", "GAME"], "levels/common"], +["eco-canister-ag", "eco-canister", 4, ["ART", "GAME"], "levels/common"], +["hud-ring-ag", "hud-ring", 4, ["ART", "GAME"], "levels/common"], +["jakb-ag", "jakb", 4, ["ART", "GAME"], "levels/common"], +["daxter-ag", "daxter", 4, ["ART", "GAME"], "levels/common"], +["board-ag", "board", 4, ["ART", "GAME"], "levels/common"], +["gun-ag", "gun", 4, ["ART", "GAME"], "levels/common"], +["jak-gun+0-ag", "jak-gun+0", 4, ["ART", "GAME"], "levels/common"], +["jak-board+0-ag", "jak-board+0", 4, ["ART", "GAME"], "levels/common"], +["jak-dark+0-ag", "jak-dark+0", 4, ["ART", "GAME"], "levels/common"], +["jak-swim+0-ag", "jak-swim+0", 4, ["ART", "GAME"], "levels/common"], +["blocking-plane-ag", "blocking-plane", 4, ["ART", "GAME"], "levels/common"], +["gcommon", "gcommon", 3, ["KERNEL"], "kernel"], +["gstring-h", "gstring-h", 3, ["KERNEL"], "kernel"], +["gkernel-h", "gkernel-h", 3, ["KERNEL"], "kernel"], +["gkernel", "gkernel", 3, ["KERNEL"], "kernel"], +["pskernel", "pskernel", 3, ["KERNEL"], "kernel"], +["gstring", "gstring", 3, ["KERNEL"], "kernel"], +["dgo-h", "dgo-h", 3, ["KERNEL"], "kernel"], +["gstate", "gstate", 3, ["KERNEL"], "kernel"], +["types-h", "types-h", 3, ["ENGINE", "GAME"], "engine/util"], +["vu1-macros", "vu1-macros", 3, ["ENGINE", "GAME"], "engine/ps2"], +["math", "math", 3, ["ENGINE", "GAME"], "engine/math"], +["vector-h", "vector-h", 3, ["ENGINE", "GAME"], "engine/math"], +["gravity-h", "gravity-h", 3, ["ENGINE", "GAME"], "engine/physics"], +["bounding-box-h", "bounding-box-h", 3, ["ENGINE", "GAME"], "engine/geometry"], +["matrix-h", "matrix-h", 3, ["ENGINE", "GAME"], "engine/math"], +["quaternion-h", "quaternion-h", 3, ["ENGINE", "GAME"], "engine/math"], +["euler-h", "euler-h", 3, ["ENGINE", "GAME"], "engine/math"], +["transform-h", "transform-h", 3, ["ENGINE", "GAME"], "engine/math"], +["geometry-h", "geometry-h", 3, ["ENGINE", "GAME"], "engine/geometry"], +["trigonometry-h", "trigonometry-h", 3, ["ENGINE", "GAME"], "engine/math"], +["transformq-h", "transformq-h", 3, ["ENGINE", "GAME"], "engine/math"], +["bounding-box", "bounding-box", 3, ["ENGINE", "GAME"], "engine/geometry"], +["matrix", "matrix", 3, ["ENGINE", "GAME"], "engine/math"], +["transform", "transform", 3, ["ENGINE", "GAME"], "engine/math"], +["quaternion", "quaternion", 3, ["ENGINE", "GAME"], "engine/math"], +["euler", "euler", 3, ["ENGINE", "GAME"], "engine/math"], +["trigonometry", "trigonometry", 3, ["ENGINE", "GAME"], "engine/math"], +["gsound-h", "gsound-h", 3, ["ENGINE", "GAME"], "engine/sound"], +["timer-h", "timer-h", 3, ["ENGINE", "GAME"], "engine/ps2"], +["vif-h", "vif-h", 3, ["ENGINE", "GAME"], "engine/ps2"], +["dma-h", "dma-h", 3, ["ENGINE", "GAME"], "engine/dma"], +["video-h", "video-h", 3, ["ENGINE", "GAME"], "engine/gfx/hw"], +["vu1-user-h", "vu1-user-h", 3, ["ENGINE", "GAME"], "engine/gfx"], +["profile-h", "profile-h", 3, ["ENGINE", "GAME"], "engine/util"], +["dma", "dma", 3, ["ENGINE", "GAME"], "engine/dma"], +["dma-buffer", "dma-buffer", 3, ["ENGINE", "GAME"], "engine/dma"], +["dma-bucket", "dma-bucket", 3, ["ENGINE", "GAME"], "engine/dma"], +["dma-disasm", "dma-disasm", 3, ["ENGINE", "GAME"], "engine/dma"], +["pad", "pad", 3, ["ENGINE", "GAME"], "engine/ps2"], +["gs", "gs", 3, ["ENGINE", "GAME"], "engine/gfx/hw"], +["display-h", "display-h", 3, ["ENGINE", "GAME"], "engine/gfx/hw"], +["geometry", "geometry", 3, ["ENGINE", "GAME"], "engine/geometry"], +["timer", "timer", 3, ["ENGINE", "GAME"], "engine/ps2"], +["vector", "vector", 3, ["ENGINE", "GAME"], "engine/math"], +["file-io", "file-io", 3, ["ENGINE", "GAME"], "engine/load"], +["loader-h", "loader-h", 3, ["ENGINE", "GAME"], "engine/load"], +["texture-h", "texture-h", 3, ["ENGINE", "GAME"], "engine/gfx/texture"], +["texture-anim-h", "texture-anim-h", 3, ["ENGINE", "GAME"], "engine/gfx/texture"], +["lights-h", "lights-h", 3, ["ENGINE", "GAME"], "engine/gfx"], +["mood-h", "mood-h", 3, ["ENGINE", "GAME"], "engine/gfx/mood"], +["level-h", "level-h", 3, ["ENGINE", "GAME"], "engine/level"], +["capture-h", "capture-h", 3, ["ENGINE", "GAME"], "engine/util"], +["math-camera-h", "math-camera-h", 3, ["ENGINE", "GAME"], "engine/gfx"], +["math-camera", "math-camera", 3, ["ENGINE", "GAME"], "engine/gfx"], +["font-h", "font-h", 3, ["ENGINE", "GAME"], "engine/gfx"], +["decomp-h", "decomp-h", 3, ["ENGINE", "GAME"], "engine/load"], +["profile", "profile", 3, ["ENGINE", "GAME"], "engine/util"], +["display", "display", 3, ["ENGINE", "GAME"], "engine/gfx/hw"], +["connect", "connect", 3, ["ENGINE", "GAME"], "engine/engine"], +["text-id-h", "text-id-h", 3, ["ENGINE", "GAME"], "engine/ui"], +["text-h", "text-h", 3, ["ENGINE", "GAME"], "engine/ui"], +["camera-defs-h", "camera-defs-h", 3, ["ENGINE", "GAME"], "engine/camera"], +["trail-h", "trail-h", 3, ["ENGINE", "GAME"], "levels/city/common"], +["minimap-h", "minimap-h", 3, ["ENGINE", "GAME"], "engine/ui"], +["bigmap-h", "bigmap-h", 3, ["ENGINE", "GAME"], "engine/ui"], +["settings-h", "settings-h", 3, ["ENGINE", "GAME"], "engine/game"], +["capture", "capture", 3, ["ENGINE", "GAME"], "engine/util"], +["memory-usage-h", "memory-usage-h", 3, ["ENGINE", "GAME"], "engine/debug"], +["blit-displays-h", "blit-displays-h", 3, ["ENGINE", "GAME"], "engine/gfx"], +["texture", "texture", 3, ["ENGINE", "GAME"], "engine/gfx/texture"], +["main-h", "main-h", 3, ["ENGINE", "GAME"], "engine/game"], +["mspace-h", "mspace-h", 3, ["ENGINE", "GAME"], "engine/anim"], +["drawable-h", "drawable-h", 3, ["ENGINE", "GAME"], "engine/draw"], +["drawable-group-h", "drawable-group-h", 3, ["ENGINE", "GAME"], "engine/draw"], +["drawable-inline-array-h", "drawable-inline-array-h", 3, ["ENGINE", "GAME"], "engine/draw"], +["draw-node-h", "draw-node-h", 3, ["ENGINE", "GAME"], "engine/draw"], +["drawable-tree-h", "drawable-tree-h", 3, ["ENGINE", "GAME"], "engine/draw"], +["drawable-actor-h", "drawable-actor-h", 3, ["ENGINE", "GAME"], "engine/draw"], +["region-h", "region-h", 3, ["ENGINE", "GAME"], "engine/level"], +["traffic-h", "traffic-h", 3, ["ENGINE", "GAME"], "engine/ai"], +["game-task-h", "game-task-h", 3, ["ENGINE", "GAME"], "engine/game/task"], +["task-control-h", "task-control-h", 3, ["ENGINE", "GAME"], "engine/game/task"], +["generic-h", "generic-h", 3, ["ENGINE", "GAME"], "engine/gfx/generic"], +["sky-h", "sky-h", 3, ["ENGINE", "GAME"], "engine/gfx/sky"], +["ocean-h", "ocean-h", 3, ["ENGINE", "GAME"], "engine/gfx/ocean"], +["ocean-trans-tables", "ocean-trans-tables", 3, ["ENGINE", "GAME"], "engine/gfx/ocean"], +["ocean-tables", "ocean-tables", 3, ["ENGINE", "GAME"], "engine/gfx/ocean"], +["ocean-frames", "ocean-frames", 3, ["ENGINE", "GAME"], "engine/gfx/ocean"], +["time-of-day-h", "time-of-day-h", 3, ["ENGINE", "GAME"], "engine/gfx/mood"], +["art-h", "art-h", 3, ["ENGINE", "GAME"], "engine/data"], +["generic-vu1-h", "generic-vu1-h", 3, ["ENGINE", "GAME"], "engine/gfx/generic"], +["merc-h", "merc-h", 3, ["ENGINE", "GAME"], "engine/gfx/merc"], +["generic-merc-h", "generic-merc-h", 3, ["ENGINE", "GAME"], "engine/gfx/merc"], +["generic-tie-h", "generic-tie-h", 3, ["ENGINE", "GAME"], "engine/gfx/tie"], +["generic-work-h", "generic-work-h", 3, ["ENGINE", "GAME"], "engine/gfx/generic"], +["shadow-cpu-h", "shadow-cpu-h", 3, ["ENGINE", "GAME"], "engine/gfx/foreground"], +["shadow-vu1-h", "shadow-vu1-h", 3, ["ENGINE", "GAME"], "engine/gfx/foreground"], +["memcard-h", "memcard-h", 3, ["ENGINE", "GAME"], "engine/ps2"], +["game-info-h", "game-info-h", 3, ["ENGINE", "GAME"], "engine/game"], +["gui-h", "gui-h", 3, ["ENGINE", "GAME"], "engine/ui"], +["ambient-h", "ambient-h", 3, ["ENGINE", "GAME"], "engine/ambient"], +["speech-h", "speech-h", 3, ["ENGINE", "GAME"], "engine/sound"], +["wind-h", "wind-h", 3, ["ENGINE", "GAME"], "engine/gfx/background"], +["prototype-h", "prototype-h", 3, ["ENGINE", "GAME"], "engine/gfx/background"], +["joint-h", "joint-h", 3, ["ENGINE", "GAME"], "engine/anim"], +["bones-h", "bones-h", 3, ["ENGINE", "GAME"], "engine/gfx/foreground"], +["foreground-h", "foreground-h", 3, ["ENGINE", "GAME"], "engine/gfx/foreground"], +["engines", "engines", 3, ["ENGINE", "GAME"], "engine/engine"], +["lightning-h", "lightning-h", 3, ["ENGINE", "GAME"], "engine/gfx"], +["res-h", "res-h", 3, ["ENGINE", "GAME"], "engine/entity"], +["res", "res", 3, ["ENGINE", "GAME"], "engine/entity"], +["lights", "lights", 3, ["ENGINE", "GAME"], "engine/gfx"], +["dynamics-h", "dynamics-h", 3, ["ENGINE", "GAME"], "engine/physics"], +["surface-h", "surface-h", 3, ["ENGINE", "GAME"], "engine/target"], +["pat-h", "pat-h", 3, ["ENGINE", "GAME"], "engine/collide"], +["fact-h", "fact-h", 3, ["ENGINE", "GAME"], "engine/game"], +["aligner-h", "aligner-h", 3, ["ENGINE", "GAME"], "engine/anim"], +["penetrate-h", "penetrate-h", 3, ["ENGINE", "GAME"], "engine/game"], +["game-h", "game-h", 3, ["ENGINE", "GAME"], "engine/game"], +["script-h", "script-h", 3, ["ENGINE", "GAME"], "engine/util"], +["scene-h", "scene-h", 3, ["ENGINE", "GAME"], "engine/scene"], +["sync-info-h", "sync-info-h", 3, ["ENGINE", "GAME"], "engine/util"], +["pov-camera-h", "pov-camera-h", 3, ["ENGINE", "GAME"], "engine/camera"], +["smush-control-h", "smush-control-h", 3, ["ENGINE", "GAME"], "engine/util"], +["debug-h", "debug-h", 3, ["ENGINE", "GAME"], "engine/debug"], +["joint-mod-h", "joint-mod-h", 3, ["ENGINE", "GAME"], "engine/anim"], +["collide-func-h", "collide-func-h", 3, ["ENGINE", "GAME"], "engine/collide"], +["collide-mesh-h", "collide-mesh-h", 3, ["ENGINE", "GAME"], "engine/collide"], +["collide-shape-h", "collide-shape-h", 3, ["ENGINE", "GAME"], "engine/collide"], +["generic-obs-h", "generic-obs-h", 3, ["ENGINE", "GAME"], "engine/common_objs"], +["trajectory-h", "trajectory-h", 3, ["ENGINE", "GAME"], "engine/physics"], +["collide-target-h", "collide-target-h", 3, ["ENGINE", "GAME"], "engine/collide"], +["collide-touch-h", "collide-touch-h", 3, ["ENGINE", "GAME"], "engine/collide"], +["collide-edge-grab-h", "collide-edge-grab-h", 3, ["ENGINE", "GAME"], "engine/collide"], +["process-drawable-h", "process-drawable-h", 3, ["ENGINE", "GAME"], "engine/process-drawable"], +["process-focusable", "process-focusable", 3, ["ENGINE", "GAME"], "engine/process-drawable"], +["process-taskable-h", "process-taskable-h", 3, ["ENGINE", "GAME"], "engine/process-drawable"], +["focus", "focus", 3, ["ENGINE", "GAME"], "engine/process-drawable"], +["effect-control-h", "effect-control-h", 3, ["ENGINE", "GAME"], "engine/game"], +["collide-frag-h", "collide-frag-h", 3, ["ENGINE", "GAME"], "engine/collide"], +["collide-hash-h", "collide-hash-h", 3, ["ENGINE", "GAME"], "engine/spatial-hash"], +["chain-physics-h", "chain-physics-h", 3, ["ENGINE", "GAME"], "engine/physics"], +["projectile-h", "projectile-h", 3, ["ENGINE", "GAME"], "engine/common_objs"], +["find-nearest-h", "find-nearest-h", 3, ["ENGINE", "GAME"], "engine/collide"], +["target-h", "target-h", 3, ["ENGINE", "GAME"], "engine/target"], +["stats-h", "stats-h", 3, ["ENGINE", "GAME"], "engine/debug"], +["bsp-h", "bsp-h", 3, ["ENGINE", "GAME"], "engine/level"], +["collide-cache-h", "collide-cache-h", 3, ["ENGINE", "GAME"], "engine/collide"], +["collide-h", "collide-h", 3, ["ENGINE", "GAME"], "engine/collide"], +["shrubbery-h", "shrubbery-h", 3, ["ENGINE", "GAME"], "engine/gfx/shrub"], +["tie-h", "tie-h", 3, ["ENGINE", "GAME"], "engine/gfx/tie"], +["tfrag-h", "tfrag-h", 3, ["ENGINE", "GAME"], "engine/gfx/tfrag"], +["background-h", "background-h", 3, ["ENGINE", "GAME"], "engine/gfx/background"], +["subdivide-h", "subdivide-h", 3, ["ENGINE", "GAME"], "engine/gfx/background"], +["entity-h", "entity-h", 3, ["ENGINE", "GAME"], "engine/entity"], +["sprite-h", "sprite-h", 3, ["ENGINE", "GAME"], "engine/gfx/sprite"], +["simple-sprite-h", "simple-sprite-h", 3, ["ENGINE", "GAME"], "engine/gfx/sprite"], +["eye-h", "eye-h", 3, ["ENGINE", "GAME"], "engine/gfx/foreground"], +["sparticle-launcher-h", "sparticle-launcher-h", 3, ["ENGINE", "GAME"], "engine/gfx/sprite/particles"], +["sparticle-h", "sparticle-h", 3, ["ENGINE", "GAME"], "engine/gfx/sprite/particles"], +["actor-link-h", "actor-link-h", 3, ["ENGINE", "GAME"], "engine/entity"], +["camera-h", "camera-h", 3, ["ENGINE", "GAME"], "engine/camera"], +["cam-debug-h", "cam-debug-h", 3, ["ENGINE", "GAME"], "engine/camera"], +["cam-interface-h", "cam-interface-h", 3, ["ENGINE", "GAME"], "engine/camera"], +["cam-update-h", "cam-update-h", 3, ["ENGINE", "GAME"], "engine/camera"], +["hud-h", "hud-h", 3, ["ENGINE", "GAME"], "engine/ui"], +["progress-h", "progress-h", 3, ["ENGINE", "GAME"], "engine/ui/progress"], +["rpc-h", "rpc-h", 3, ["ENGINE", "GAME"], "engine/ps2"], +["path-h", "path-h", 3, ["ENGINE", "GAME"], "engine/geometry"], +["nav-mesh-h", "nav-mesh-h", 3, ["ENGINE", "GAME"], "engine/nav"], +["nav-control-h", "nav-control-h", 3, ["ENGINE", "GAME"], "engine/nav"], +["spatial-hash-h", "spatial-hash-h", 3, ["ENGINE", "GAME"], "engine/spatial-hash"], +["actor-hash-h", "actor-hash-h", 3, ["ENGINE", "GAME"], "engine/spatial-hash"], +["load-dgo", "load-dgo", 3, ["ENGINE", "GAME"], "engine/load"], +["ramdisk", "ramdisk", 3, ["ENGINE", "GAME"], "engine/load"], +["gsound", "gsound", 3, ["ENGINE", "GAME"], "engine/sound"], +["transformq", "transformq", 3, ["ENGINE", "GAME"], "engine/math"], +["collide-func", "collide-func", 3, ["ENGINE", "GAME"], "engine/collide"], +["joint", "joint", 3, ["ENGINE", "GAME"], "engine/anim"], +["joint-mod", "joint-mod", 3, ["ENGINE", "GAME"], "engine/anim"], +["chain-physics", "chain-physics", 3, ["ENGINE", "GAME"], "engine/physics"], +["cylinder", "cylinder", 3, ["ENGINE", "GAME"], "engine/geometry"], +["wind-work", "wind-work", 3, ["ENGINE", "GAME"], "engine/gfx/background"], +["wind", "wind", 3, ["ENGINE", "GAME"], "engine/gfx/background"], +["bsp", "bsp", 3, ["ENGINE", "GAME"], "engine/level"], +["subdivide", "subdivide", 3, ["ENGINE", "GAME"], "engine/gfx/background"], +["sprite", "sprite", 3, ["ENGINE", "GAME"], "engine/gfx/sprite"], +["sprite-distort", "sprite-distort", 3, ["ENGINE", "GAME"], "engine/gfx/sprite"], +["sprite-glow", "sprite-glow", 3, ["ENGINE", "GAME"], "engine/gfx/sprite"], +["debug-sphere", "debug-sphere", 3, ["ENGINE", "GAME"], "engine/debug"], +["debug", "debug", 3, ["ENGINE", "GAME"], "engine/debug"], +["history", "history", 3, ["ENGINE", "GAME"], "engine/debug"], +["merc-vu1", "merc-vu1", 3, ["ENGINE", "GAME"], "engine/gfx/merc"], +["emerc-vu1", "emerc-vu1", 3, ["ENGINE", "GAME"], "engine/gfx/merc"], +["merc-blend-shape", "merc-blend-shape", 3, ["ENGINE", "GAME"], "engine/gfx/merc"], +["merc", "merc", 3, ["ENGINE", "GAME"], "engine/gfx/merc"], +["emerc", "emerc", 3, ["ENGINE", "GAME"], "engine/gfx/merc"], +["ripple", "ripple", 3, ["ENGINE", "GAME"], "engine/gfx/foreground"], +["bones", "bones", 3, ["ENGINE", "GAME"], "engine/gfx/foreground"], +["debug-foreground", "debug-foreground", 3, ["ENGINE", "GAME"], "engine/gfx/foreground"], +["foreground", "foreground", 3, ["ENGINE", "GAME"], "engine/gfx/foreground"], +["generic-vu0", "generic-vu0", 3, ["ENGINE", "GAME"], "engine/gfx/generic"], +["generic-vu1", "generic-vu1", 3, ["ENGINE", "GAME"], "engine/gfx/generic"], +["generic-effect", "generic-effect", 3, ["ENGINE", "GAME"], "engine/gfx/generic"], +["generic-merc", "generic-merc", 3, ["ENGINE", "GAME"], "engine/gfx/generic"], +["generic-tie", "generic-tie", 3, ["ENGINE", "GAME"], "engine/gfx/generic"], +["shadow-cpu", "shadow-cpu", 3, ["ENGINE", "GAME"], "engine/gfx/foreground"], +["shadow-vu1", "shadow-vu1", 3, ["ENGINE", "GAME"], "engine/gfx/foreground"], +["warp", "warp", 3, ["ENGINE", "GAME"], "engine/gfx"], +["texture-anim", "texture-anim", 3, ["ENGINE", "GAME"], "engine/gfx/texture"], +["texture-anim-funcs", "texture-anim-funcs", 3, ["ENGINE", "GAME"], "engine/gfx/texture"], +["texture-anim-tables", "texture-anim-tables", 3, ["ENGINE", "GAME"], "engine/gfx/texture"], +["blit-displays", "blit-displays", 3, ["ENGINE", "GAME"], "engine/gfx"], +["font-data", "font-data", 3, ["ENGINE", "GAME"], "engine/data"], +["font", "font", 3, ["ENGINE", "GAME"], "engine/gfx"], +["decomp", "decomp", 3, ["ENGINE", "GAME"], "engine/load"], +["background", "background", 3, ["ENGINE", "GAME"], "engine/gfx/background"], +["draw-node", "draw-node", 3, ["ENGINE", "GAME"], "engine/draw"], +["shrubbery", "shrubbery", 3, ["ENGINE", "GAME"], "engine/gfx/shrub"], +["shrub-work", "shrub-work", 3, ["ENGINE", "GAME"], "engine/gfx/shrub"], +["tfrag-near", "tfrag-near", 3, ["ENGINE", "GAME"], "engine/gfx/tfrag"], +["tfrag", "tfrag", 3, ["ENGINE", "GAME"], "engine/gfx/tfrag"], +["tfrag-methods", "tfrag-methods", 3, ["ENGINE", "GAME"], "engine/gfx/tfrag"], +["tfrag-work", "tfrag-work", 3, ["ENGINE", "GAME"], "engine/gfx/tfrag"], +["tie", "tie", 3, ["ENGINE", "GAME"], "engine/gfx/tie"], +["etie-vu1", "etie-vu1", 3, ["ENGINE", "GAME"], "engine/gfx/tie"], +["etie-near-vu1", "etie-near-vu1", 3, ["ENGINE", "GAME"], "engine/gfx/tie"], +["tie-near", "tie-near", 3, ["ENGINE", "GAME"], "engine/gfx/tie"], +["tie-work", "tie-work", 3, ["ENGINE", "GAME"], "engine/gfx/tie"], +["tie-methods", "tie-methods", 3, ["ENGINE", "GAME"], "engine/gfx/tie"], +["sync-info", "sync-info", 3, ["ENGINE", "GAME"], "engine/util"], +["trajectory", "trajectory", 3, ["ENGINE", "GAME"], "engine/physics"], +["sparticle-launcher", "sparticle-launcher", 3, ["ENGINE", "GAME"], "engine/gfx/sprite/particles"], +["sparticle", "sparticle", 3, ["ENGINE", "GAME"], "engine/gfx/sprite/particles"], +["entity-table", "entity-table", 3, ["ENGINE", "GAME"], "engine/entity"], +["loader", "loader", 3, ["ENGINE", "GAME"], "engine/load"], +["game-info", "game-info", 3, ["ENGINE", "GAME"], "engine/game"], +["game-task", "game-task", 3, ["ENGINE", "GAME"], "engine/game/task"], +["game-save", "game-save", 3, ["ENGINE", "GAME"], "engine/game"], +["settings", "settings", 3, ["ENGINE", "GAME"], "engine/game"], +["mood-tables", "mood-tables", 3, ["ENGINE", "GAME"], "engine/gfx/mood"], +["mood-tables2", "mood-tables2", 3, ["ENGINE", "GAME"], "engine/gfx/mood"], +["mood", "mood", 3, ["ENGINE", "GAME"], "engine/gfx/mood"], +["mood-funcs", "mood-funcs", 3, ["ENGINE", "GAME"], "engine/gfx/mood"], +["mood-funcs2", "mood-funcs2", 3, ["ENGINE", "GAME"], "engine/gfx/mood"], +["weather-part", "weather-part", 3, ["ENGINE", "GAME"], "engine/gfx/mood"], +["time-of-day", "time-of-day", 3, ["ENGINE", "GAME"], "engine/gfx/mood"], +["sky-data", "sky-data", 3, ["ENGINE", "GAME"], "engine/gfx/sky"], +["sky-tng", "sky-tng", 3, ["ENGINE", "GAME"], "engine/gfx/sky"], +["load-state", "load-state", 3, ["ENGINE", "GAME"], "engine/load"], +["level-info", "level-info", 3, ["ENGINE", "GAME"], "engine/level"], +["level", "level", 3, ["ENGINE", "GAME"], "engine/level"], +["text", "text", 3, ["ENGINE", "GAME"], "engine/ui"], +["collide-hash", "collide-hash", 3, ["ENGINE", "GAME"], "engine/spatial-hash"], +["collide-probe", "collide-probe", 3, ["ENGINE", "GAME"], "engine/collide"], +["collide-frag", "collide-frag", 3, ["ENGINE", "GAME"], "engine/collide"], +["collide-mesh", "collide-mesh", 3, ["ENGINE", "GAME"], "engine/collide"], +["collide-touch", "collide-touch", 3, ["ENGINE", "GAME"], "engine/collide"], +["collide-edge-grab", "collide-edge-grab", 3, ["ENGINE", "GAME"], "engine/collide"], +["collide-shape", "collide-shape", 3, ["ENGINE", "GAME"], "engine/collide"], +["collide-shape-rider", "collide-shape-rider", 3, ["ENGINE", "GAME"], "engine/collide"], +["collide", "collide", 3, ["ENGINE", "GAME"], "engine/collide"], +["collide-planes", "collide-planes", 3, ["ENGINE", "GAME"], "engine/collide"], +["spatial-hash", "spatial-hash", 3, ["ENGINE", "GAME"], "engine/spatial-hash"], +["actor-hash", "actor-hash", 3, ["ENGINE", "GAME"], "engine/spatial-hash"], +["merc-death", "merc-death", 3, ["ENGINE", "GAME"], "engine/gfx/merc"], +["water-flow", "water-flow", 3, ["ENGINE", "GAME"], "engine/common_objs"], +["water-h", "water-h", 3, ["ENGINE", "GAME"], "engine/common_objs"], +["camera", "camera", 3, ["ENGINE", "GAME"], "engine/camera"], +["cam-interface", "cam-interface", 3, ["ENGINE", "GAME"], "engine/camera"], +["cam-master", "cam-master", 3, ["ENGINE", "GAME"], "engine/camera"], +["cam-states", "cam-states", 3, ["ENGINE", "GAME"], "engine/camera"], +["cam-states-dbg", "cam-states-dbg", 3, ["ENGINE", "GAME"], "engine/camera"], +["cam-combiner", "cam-combiner", 3, ["ENGINE", "GAME"], "engine/camera"], +["cam-update", "cam-update", 3, ["ENGINE", "GAME"], "engine/camera"], +["vol-h", "vol-h", 3, ["ENGINE", "GAME"], "engine/geometry"], +["cam-layout", "cam-layout", 3, ["ENGINE", "GAME"], "engine/camera"], +["cam-debug", "cam-debug", 3, ["ENGINE", "GAME"], "engine/camera"], +["cam-start", "cam-start", 3, ["ENGINE", "GAME"], "engine/camera"], +["process-drawable", "process-drawable", 3, ["ENGINE", "GAME"], "engine/process-drawable"], +["ambient", "ambient", 3, ["ENGINE", "GAME"], "engine/ambient"], +["speech", "speech", 3, ["ENGINE", "GAME"], "engine/sound"], +["region", "region", 3, ["ENGINE", "GAME"], "engine/level"], +["fma-sphere", "fma-sphere", 3, ["ENGINE", "GAME"], "engine/anim"], +["script", "script", 3, ["ENGINE", "GAME"], "engine/util"], +["generic-obs", "generic-obs", 3, ["ENGINE", "GAME"], "engine/common_objs"], +["lightning", "lightning", 3, ["ENGINE", "GAME"], "engine/gfx"], +["carry-h", "carry-h", 3, ["ENGINE", "GAME"], "engine/target/mech_suit"], +["pilot-h", "pilot-h", 3, ["ENGINE", "GAME"], "engine/game"], +["gun-h", "gun-h", 3, ["ENGINE", "GAME"], "engine/target/gun"], +["board-h", "board-h", 3, ["ENGINE", "GAME"], "engine/target/board"], +["darkjak-h", "darkjak-h", 3, ["ENGINE", "GAME"], "engine/target"], +["target-util", "target-util", 3, ["ENGINE", "GAME"], "engine/target"], +["target-part", "target-part", 3, ["ENGINE", "GAME"], "engine/target"], +["gun-part", "gun-part", 3, ["ENGINE", "GAME"], "engine/target/gun"], +["collide-reaction-target", "collide-reaction-target", 3, ["ENGINE", "GAME"], "engine/target"], +["logic-target", "logic-target", 3, ["ENGINE", "GAME"], "engine/target"], +["sidekick", "sidekick", 3, ["ENGINE", "GAME"], "engine/target"], +["voicebox", "voicebox", 3, ["ENGINE", "GAME"], "engine/common_objs"], +["collectables-part", "collectables-part", 3, ["ENGINE", "GAME"], "engine/common_objs"], +["debug-part", "debug-part", 3, ["ENGINE", "GAME"], "engine/debug"], +["find-nearest", "find-nearest", 3, ["ENGINE", "GAME"], "engine/collide"], +["task-arrow", "task-arrow", 3, ["ENGINE", "GAME"], "engine/game/task"], +["projectile", "projectile", 3, ["ENGINE", "GAME"], "engine/common_objs"], +["target-handler", "target-handler", 3, ["ENGINE", "GAME"], "engine/target"], +["target-anim", "target-anim", 3, ["ENGINE", "GAME"], "engine/target"], +["target", "target", 3, ["ENGINE", "GAME"], "engine/target"], +["target2", "target2", 3, ["ENGINE", "GAME"], "engine/target"], +["target-swim", "target-swim", 3, ["ENGINE", "GAME"], "engine/target"], +["target-carry", "target-carry", 3, ["ENGINE", "GAME"], "engine/target"], +["target-darkjak", "target-darkjak", 3, ["ENGINE", "GAME"], "engine/target"], +["target-death", "target-death", 3, ["ENGINE", "GAME"], "engine/target"], +["target-gun", "target-gun", 3, ["ENGINE", "GAME"], "engine/target"], +["gun-util", "gun-util", 3, ["ENGINE", "GAME"], "engine/target/gun"], +["gun-blue-shot", "gun-blue-shot", 3, ["ENGINE", "GAME"], "engine/target/gun"], +["gun-yellow-shot", "gun-yellow-shot", 3, ["ENGINE", "GAME"], "engine/target/gun"], +["gun-red-shot", "gun-red-shot", 3, ["ENGINE", "GAME"], "engine/target/gun"], +["gun-dark-shot", "gun-dark-shot", 3, ["ENGINE", "GAME"], "engine/target/gun"], +["gun-states", "gun-states", 3, ["ENGINE", "GAME"], "engine/target/gun"], +["board-util", "board-util", 3, ["ENGINE", "GAME"], "engine/target/board"], +["target-board", "target-board", 3, ["ENGINE", "GAME"], "engine/target/board"], +["board-part", "board-part", 3, ["ENGINE", "GAME"], "engine/target/board"], +["board-states", "board-states", 3, ["ENGINE", "GAME"], "engine/target/board"], +["mech-h", "mech-h", 3, ["ENGINE", "GAME"], "engine/target/mech_suit"], +["menu", "menu", 3, ["ENGINE", "GAME"], "engine/debug"], +["drawable", "drawable", 3, ["ENGINE", "GAME"], "engine/draw"], +["drawable-group", "drawable-group", 3, ["ENGINE", "GAME"], "engine/draw"], +["drawable-inline-array", "drawable-inline-array", 3, ["ENGINE", "GAME"], "engine/draw"], +["drawable-tree", "drawable-tree", 3, ["ENGINE", "GAME"], "engine/draw"], +["prototype", "prototype", 3, ["ENGINE", "GAME"], "engine/gfx/background"], +["main-collide", "main-collide", 3, ["ENGINE", "GAME"], "engine/collide"], +["video", "video", 3, ["ENGINE", "GAME"], "engine/gfx/hw"], +["main", "main", 3, ["ENGINE", "GAME"], "engine/game"], +["collide-cache", "collide-cache", 3, ["ENGINE", "GAME"], "engine/collide"], +["collide-debug", "collide-debug", 3, ["ENGINE", "GAME"], "engine/collide"], +["relocate", "relocate", 3, ["ENGINE", "GAME"], "engine/entity"], +["memory-usage", "memory-usage", 3, ["ENGINE", "GAME"], "engine/debug"], +["entity", "entity", 3, ["ENGINE", "GAME"], "engine/entity"], +["path", "path", 3, ["ENGINE", "GAME"], "engine/geometry"], +["vol", "vol", 3, ["ENGINE", "GAME"], "engine/geometry"], +["nav-mesh", "nav-mesh", 3, ["ENGINE", "GAME"], "engine/nav"], +["nav-control", "nav-control", 3, ["ENGINE", "GAME"], "engine/nav"], +["aligner", "aligner", 3, ["ENGINE", "GAME"], "engine/anim"], +["water", "water", 3, ["ENGINE", "GAME"], "engine/common_objs"], +["collectables", "collectables", 3, ["ENGINE", "GAME"], "engine/common_objs"], +["task-control", "task-control", 3, ["ENGINE", "GAME"], "engine/game/task"], +["scene", "scene", 3, ["ENGINE", "GAME"], "engine/scene"], +["pov-camera", "pov-camera", 3, ["ENGINE", "GAME"], "engine/camera"], +["powerups", "powerups", 3, ["ENGINE", "GAME"], "engine/common_objs"], +["crates", "crates", 3, ["ENGINE", "GAME"], "engine/common_objs"], +["hud", "hud", 3, ["ENGINE", "GAME"], "engine/ui"], +["hud-classes", "hud-classes", 3, ["ENGINE", "GAME"], "engine/ui"], +["progress-static", "progress-static", 3, ["ENGINE", "GAME"], "engine/ui/progress"], +["progress", "progress", 3, ["ENGINE", "GAME"], "engine/ui/progress"], +["progress-draw", "progress-draw", 3, ["ENGINE", "GAME"], "engine/ui/progress"], +["ocean", "ocean", 3, ["ENGINE", "GAME"], "engine/gfx/ocean"], +["ocean-vu0", "ocean-vu0", 3, ["ENGINE", "GAME"], "engine/gfx/ocean"], +["ocean-texture", "ocean-texture", 3, ["ENGINE", "GAME"], "engine/gfx/ocean"], +["ocean-mid", "ocean-mid", 3, ["ENGINE", "GAME"], "engine/gfx/ocean"], +["ocean-transition", "ocean-transition", 3, ["ENGINE", "GAME"], "engine/gfx/ocean"], +["ocean-near", "ocean-near", 3, ["ENGINE", "GAME"], "engine/gfx/ocean"], +["minimap", "minimap", 3, ["ENGINE", "GAME"], "engine/ui"], +["bigmap-data", "bigmap-data", 3, ["ENGINE", "GAME"], "engine/ui"], +["bigmap", "bigmap", 3, ["ENGINE", "GAME"], "engine/ui"], +["eye", "eye", 3, ["ENGINE", "GAME"], "engine/gfx/foreground"], +["glist-h", "glist-h", 3, ["ENGINE", "GAME"], "engine/util"], +["glist", "glist", 3, ["ENGINE", "GAME"], "engine/util"], +["anim-tester", "anim-tester", 3, ["ENGINE", "GAME"], "engine/debug"], +["viewer", "viewer", 3, ["ENGINE", "GAME"], "engine/debug"], +["part-tester", "part-tester", 3, ["ENGINE", "GAME"], "engine/debug"], +["editable-h", "editable-h", 3, ["ENGINE", "GAME"], "engine/debug"], +["editable", "editable", 3, ["ENGINE", "GAME"], "engine/debug"], +["editable-player", "editable-player", 3, ["ENGINE", "GAME"], "engine/debug"], +["mysql-nav-graph", "mysql-nav-graph", 3, ["ENGINE", "GAME"], "engine/debug/nav"], +["nav-graph-editor", "nav-graph-editor", 3, ["ENGINE", "GAME"], "engine/debug/nav"], +["sampler", "sampler", 3, ["ENGINE", "GAME"], "engine/debug"], +["default-menu", "default-menu", 3, ["ENGINE", "GAME"], "engine/debug"], +["los-control-h", "los-control-h", 3, ["GAME", "COMMON"], "engine/collide"], +["airlock", "airlock", 3, ["GAME", "COMMON"], "levels/common"], +["water-anim", "water-anim", 3, ["GAME", "COMMON"], "engine/common_objs"], +["blocking-plane", "blocking-plane", 3, ["GAME", "COMMON"], "engine/common_objs"], +["idle-control", "idle-control", 3, ["GAME", "COMMON"], "engine/game"], +["dark-eco-pool", "dark-eco-pool", 3, ["GAME", "COMMON"], "engine/common_objs"], +["enemy-h", "enemy-h", 3, ["GAME", "COMMON"], "engine/ai"], +["nav-enemy-h", "nav-enemy-h", 3, ["GAME", "COMMON"], "engine/nav"], +["rigid-body-h", "rigid-body-h", 3, ["GAME", "COMMON"], "engine/physics"], +["enemy", "enemy", 3, ["GAME", "COMMON"], "engine/ai"], +["nav-enemy", "nav-enemy", 3, ["GAME", "COMMON"], "engine/nav"], +["base-plat", "base-plat", 3, ["GAME", "COMMON"], "engine/common_objs"], +["plat", "plat", 3, ["GAME", "COMMON"], "engine/common_objs"], +["basebutton", "basebutton", 3, ["GAME", "COMMON"], "engine/common_objs"], +["bouncer", "bouncer", 3, ["GAME", "COMMON"], "levels/common/enemy"], +["conveyor", "conveyor", 3, ["GAME", "COMMON"], "engine/common_objs"], +["elevator", "elevator", 3, ["GAME", "COMMON"], "engine/common_objs"], +["rigid-body", "rigid-body", 3, ["GAME", "COMMON"], "engine/physics"], +["rigid-body-queue", "rigid-body-queue", 3, ["GAME", "COMMON"], "engine/physics"], +["rigid-body-plat", "rigid-body-plat", 3, ["GAME", "COMMON"], "engine/common_objs"], +["joint-exploder", "joint-exploder", 3, ["GAME", "COMMON"], "engine/anim"], +["simple-focus", "simple-focus", 3, ["GAME", "COMMON"], "engine/process-drawable"], +["simple-nav-sphere", "simple-nav-sphere", 3, ["GAME", "COMMON"], "engine/process-drawable"], +["process-taskable", "process-taskable", 3, ["GAME", "COMMON"], "engine/process-drawable"], +["scene-actor", "scene-actor", 3, ["GAME", "COMMON"], "levels/common"], +["scene-looper", "scene-looper", 3, ["GAME", "COMMON"], "levels/common"], +["warp-gate", "warp-gate", 3, ["GAME", "COMMON"], "levels/common"], +["guard-projectile", "guard-projectile", 3, ["GAME", "COMMON"], "levels/common"], +["metalhead-projectile", "metalhead-projectile", 3, ["GAME", "COMMON"], "levels/common"], +["los-control", "los-control", 3, ["GAME", "COMMON"], "engine/collide"], +["grunt", "grunt", 3, ["GAME", "COMMON"], "levels/common"], +["flitter", "flitter", 3, ["GAME", "COMMON"], "levels/common"], +["battle", "battle", 3, ["GAME", "COMMON"], "levels/common"], +["elec-gate", "elec-gate", 3, ["GAME", "COMMON"], "levels/common"], +["cty-guard-turret-button", "cty-guard-turret-button", 3, ["GAME", "COMMON"], "levels/common"], +["tpage-2972", "tpage-2972", 4, ["LWIDEB"], "levels/city/common"], +["grunt-ag", "grunt", 4, ["LWIDEB", "STR", "DRILLMTN", "STADBLMP", "HALFPIPE", "SEW", "UNB", "RUI", "CTYASHA"], "levels/common/enemy/metalhead_grunt"], +["citizen-norm-ag", "citizen-norm", 4, ["LWIDEB", "LWIDEC", "LWIDEA"], "levels/city/common"], +["crimson-guard-ag", "crimson-guard", 4, ["LWIDEB", "DG1", "FRA", "FOB", "LWIDEC", "CAS", "PAE", "FEA", "FDB", "LWIDEA"], "characters/guards"], +["predator-ag", "predator", 4, ["LWIDEB", "FOR"], "levels/forest"], +["flitter-ag", "flitter", 4, ["LWIDEB", "STR", "NEB", "D3A", "STADBLMP", "RUI"], "levels/common/enemy/metalhead_scout"], +["cara-ag", "cara", 4, ["LWIDEB", "LWIDEC", "LWIDEA"], "levels/city/common"], +["citizen-norm-rider-ag-LWIDEB", "citizen-norm-rider", 4, ["LWIDEB"], "levels/city/common"], +["citizen-norm-rider-ag-LWIDEA", "citizen-norm-rider", 4, ["LWIDEA"], "levels/city/common"], +["crimson-bike-ag-LWIDEA-LWIDEB", "crimson-bike", 4, ["LWIDEB", "LWIDEA"], "levels/city/common"], +["crimson-bike-ag-LWIDEC", "crimson-bike", 4, ["LWIDEC"], "levels/city/common"], +["bikea-ag-LWIDEB", "bikea", 4, ["LWIDEB"], "levels/city/common"], +["bikea-ag-LWIDEA-LWIDEC", "bikea", 4, ["LWIDEC", "LWIDEA"], "levels/city/common"], +["lwideb", "lwideb", 4, ["LWIDEB"], "levels/city/common"], +["meet-brutter", "meet-brutter", 3, ["LMEETBRT"], "levels/city/market/west/brutter_kiosk"], +["tpage-2438", "tpage-2438", 4, ["LMEETBRT"], "levels/city/market/west/brutter_kiosk"], +["babak-ag", "babak", 4, ["LMEETBRT", "STADBLMP"], "levels/common"], +["paddy-wagon-ag", "paddy-wagon", 4, ["LMEETBRT"], "levels/city/market/west/brutter_kiosk"], +["lmeetbrt", "lmeetbrt", 4, ["LMEETBRT"], "levels/city/market/west/brutter_kiosk"], +["ctysluma-part", "ctysluma-part", 3, ["CTA"], "levels/city/slums"], +["neon-baron-part", "neon-baron-part", 3, ["CTA"], "levels/city/slums"], +["tpage-974", "tpage-974", 4, ["CTA"], "levels/city/slums"], +["tpage-973", "tpage-973", 4, ["CTA"], "levels/city/slums"], +["tpage-1680", "tpage-1680", 4, ["CTA"], "levels/city/slums"], +["tpage-1021", "tpage-1021", 4, ["CTA"], "levels/city/slums"], +["tpage-1646", "tpage-1646", 4, ["CTA"], "levels/city/slums"], +["fort-entry-gate-ag-CTA", "fort-entry-gate", 4, ["CTA"], "levels/city/slums"], +["fort-entry-gate-ag-CTB", "fort-entry-gate", 4, ["CTB"], "levels/city/slums"], +["fort-entry-gate-ag-FEB", "fort-entry-gate", 4, ["FEB"], "levels/fortress/exit"], +["fort-entry-gate-ag-FRA", "fort-entry-gate", 4, ["FRA"], "levels/fortress/rescue"], +["fort-entry-gate-ag-FORDUMPC", "fort-entry-gate", 4, ["FORDUMPC"], "levels/fortress/ammo_dump"], +["fort-entry-gate-ag-PRI", "fort-entry-gate", 4, ["PRI"], "levels/fortress/prison"], +["fort-entry-gate-ag-FDA", "fort-entry-gate", 4, ["FDA"], "levels/fortress/ammo_dump"], +["fort-entry-gate-ag-FRB", "fort-entry-gate", 4, ["FRB"], "levels/fortress/rescue"], +["fort-entry-gate-ag-GGA", "fort-entry-gate", 4, ["GGA"], "levels/gungame"], +["cty-fruit-stand-ag-CTA", "cty-fruit-stand", 4, ["CTA"], "levels/city/slums"], +["cty-fruit-stand-ag-CMA-CMB", "cty-fruit-stand", 4, ["CMA", "CMB"], "levels/city/market"], +["hide-door-a-ag", "hide-door-a", 4, ["CTA"], "levels/city/slums"], +["ctysluma-vis", "ctysluma-vis", 4, ["CTA"], "levels/city/slums"], +["palace-ocean", "palace-ocean", 3, ["PALOUT"], "levels/palace/outside"], +["tpage-2572", "tpage-2572", 4, ["PALOUT"], "levels/palace/outside"], +["tpage-2573", "tpage-2573", 4, ["PALOUT"], "levels/palace/outside"], +["palout", "palout", 4, ["PALOUT"], "levels/palace/outside"], +["race-h", "race-h", 3, ["STD", "STC", "LERLCHAL", "STB", "LPRTRACE"], "levels/common/races"], +["race-mesh", "race-mesh", 3, ["STD", "STC", "LERLCHAL", "STB", "LPRTRACE"], "levels/common/races"], +["race-part", "race-part", 3, ["STD", "STC", "LERLCHAL", "STB", "LPRTRACE"], "levels/common/races"], +["race-obs", "race-obs", 3, ["STD", "STC", "LERLCHAL", "STB", "LPRTRACE"], "levels/common/races"], +["vehicle-racer", "vehicle-racer", 3, ["STD", "STC", "LERLCHAL", "STB", "LPRTRACE"], "levels/common/races"], +["race-info", "race-info", 3, ["STD", "STC", "LERLCHAL", "STB", "LPRTRACE"], "levels/common/races"], +["race-manager", "race-manager", 3, ["STD", "STC", "LERLCHAL", "STB", "LPRTRACE"], "levels/common/races"], +["race-hud", "race-hud", 3, ["STD", "STC", "LERLCHAL", "STB", "LPRTRACE"], "levels/common/races"], +["pilot-recorder", "pilot-recorder", 3, ["STD", "STC", "LERLCHAL", "STB", "LPRTRACE"], "levels/common/races"], +["racebike", "racebike", 3, ["STD", "STC", "STB"], "levels/stadium"], +["stadium-race-obs", "stadium-race-obs", 3, ["STD", "STC", "STB"], "levels/stadium"], +["jak-pidax+0-ag-STC-STD", "jak-pidax+0", 4, ["STD", "STC"], "levels/stadium"], +["jak-pidax+0-ag-STB", "jak-pidax+0", 4, ["STB"], "levels/stadium/races/class3"], +["tpage-3447", "tpage-3447", 4, ["STD"], "levels/stadium/races/class1"], +["tpage-3450", "tpage-3450", 4, ["STD"], "levels/stadium/races/class1"], +["tpage-3448", "tpage-3448", 4, ["STD"], "levels/stadium/races/class1"], +["tpage-3449", "tpage-3449", 4, ["STD"], "levels/stadium/races/class1"], +["tpage-3352", "tpage-3352", 4, ["STD"], "levels/stadium/races/class1"], +["race-bike-c-ag", "race-bike-c", 4, ["STD", "STC", "STB"], "levels/stadium"], +["race-bike-b-ag", "race-bike-b", 4, ["STD", "STC", "STB"], "levels/stadium"], +["race-bike-a-ag", "race-bike-a", 4, ["STD", "STC", "STB"], "levels/stadium"], +["stdmb-race-hatch-ag", "stdmb-race-hatch", 4, ["STD", "STC", "STB"], "levels/stadium"], +["stad-d-force-field-ag", "stad-d-force-field", 4, ["STD"], "levels/stadium/races/class1"], +["stadiumd-vis", "stadiumd-vis", 4, ["STD"], "levels/stadium/races/class1"], +["spyder", "spyder", 3, ["FOR", "ATE"], "levels/common/enemy"], +["crimson-guard-level", "crimson-guard-level", 3, ["FOR", "DG1", "FRA", "CAS", "PAE", "FEA", "FDB"], "levels/common/enemy/guards"], +["guard-conversation", "guard-conversation", 3, ["FOR", "DG1", "FRA", "CAS", "PAE", "FEA", "FDB"], "levels/common/enemy/guards"], +["transport-level", "transport-level", 3, ["FOR", "DG1", "FRA", "CAS", "PAE", "FEA", "FDB"], "levels/common/enemy/guards"], +["hover-formation-h", "hover-formation-h", 3, ["FOR", "DMI", "FRA", "STR", "NEB", "D3A", "UNB"], "levels/common/enemy/hover"], +["hover-nav-control-h", "hover-nav-control-h", 3, ["FOR", "DMI", "FRA", "STR", "NEB", "D3A", "UNB"], "levels/common/enemy/hover"], +["hover-enemy-h", "hover-enemy-h", 3, ["FOR", "DMI", "FRA", "STR", "NEB", "D3A", "UNB"], "levels/common/enemy/hover"], +["hover-nav-network", "hover-nav-network", 3, ["FOR", "DMI", "FRA", "STR", "NEB", "D3A", "UNB"], "levels/common/enemy/hover"], +["hover-nav-control", "hover-nav-control", 3, ["FOR", "DMI", "FRA", "STR", "NEB", "D3A", "UNB"], "levels/common/enemy/hover"], +["hover-enemy", "hover-enemy", 3, ["FOR", "DMI", "FRA", "STR", "NEB", "D3A", "UNB"], "levels/common/enemy/hover"], +["hover-enemy-battle", "hover-enemy-battle", 3, ["FOR", "DMI", "FRA", "STR", "NEB", "D3A", "UNB"], "levels/common/enemy/hover"], +["hover-formation", "hover-formation", 3, ["FOR", "DMI", "FRA", "STR", "NEB", "D3A", "UNB"], "levels/common/enemy/hover"], +["hover-nav-edit", "hover-nav-edit", 3, ["FOR", "DMI", "FRA", "STR", "NEB", "D3A", "UNB"], "levels/common/enemy/hover"], +["wasp-part", "wasp-part", 3, ["FOR", "DMI", "FRA", "STR", "NEB", "D3A", "UNB"], "levels/common/enemy/hover"], +["wasp", "wasp", 3, ["FOR", "DMI", "FRA", "STR", "NEB", "D3A", "UNB"], "levels/common/enemy/hover"], +["crimson-guard-hover", "crimson-guard-hover", 3, ["FOR", "DMI", "FRA", "STR", "NEB", "D3A", "UNB"], "levels/common/enemy/hover"], +["flamer", "flamer", 3, ["FOR", "DMI", "FRA", "STR", "NEB", "D3A", "UNB"], "levels/common/enemy/hover"], +["forest-part", "forest-part", 3, ["FOR"], "levels/forest"], +["forest-obs", "forest-obs", 3, ["FOR"], "levels/forest"], +["jak-pegasus+0-ag", "jak-pegasus+0", 4, ["FOR"], "levels/forest"], +["pegasus", "pegasus", 3, ["FOR"], "levels/forest"], +["wren", "wren", 3, ["FOR"], "levels/forest"], +["fish", "fish", 3, ["FOR"], "levels/forest"], +["predator-h", "predator-h", 3, ["FOR"], "levels/forest"], +["predator-graph", "predator-graph", 3, ["FOR"], "levels/forest"], +["predator", "predator", 3, ["FOR"], "levels/forest"], +["forest-scenes", "forest-scenes", 3, ["FOR"], "levels/forest"], +["tpage-1414", "tpage-1414", 4, ["FOR"], "levels/forest"], +["tpage-1416", "tpage-1416", 4, ["FOR"], "levels/forest"], +["tpage-1415", "tpage-1415", 4, ["FOR"], "levels/forest"], +["tpage-1413", "tpage-1413", 4, ["FOR"], "levels/forest"], +["tpage-2335", "tpage-2335", 4, ["FOR"], "levels/forest"], +["tpage-1411", "tpage-1411", 4, ["FOR"], "levels/forest"], +["tpage-2845", "tpage-2845", 4, ["FOR"], "levels/forest"], +["pegasus-ag", "pegasus", 4, ["FOR"], "levels/forest"], +["spyder-ag", "spyder", 4, ["FOR", "ATE"], "levels/common/enemy"], +["wren-ag", "wren", 4, ["FOR"], "levels/forest"], +["minnow-ag", "minnow", 4, ["FOR"], "levels/forest"], +["forest-vis", "forest-vis", 4, ["FOR"], "levels/forest"], +["tpage-2597", "tpage-2597", 4, ["CASEXT"], "levels/castle/pad"], +["tpage-3424", "tpage-3424", 4, ["CASEXT"], "levels/castle/pad"], +["tpage-3315", "tpage-3315", 4, ["CASEXT"], "levels/castle/pad"], +["daxter-highres-ag", "daxter-highres", 4, ["CASEXT", "HIDEOUT", "KIOSK", "ORACLE", "INTROCST", "ATE", "FOB", "LJAKDAX", "FORDUMPC", "LTRNTESS", "THR", "PRI", "SAG", "NEB", "DEMO", "MTX", "LJKDXASH", "COA", "TOMBEXT", "PALBOSS", "TITLE", "ONINTENT", "STA", "TOA", "UND", "LYSKDCD", "D3B", "SWE", "GGA", "TOD", "MCN", "SEW", "VIN", "CAP", "CTYKORA", "CTYASHA", "HIPHOG", "VI1"], "characters/high-res/daxter"], +["jak-highres-ag", "jak-highres", 4, ["CASEXT", "HIDEOUT", "KIOSK", "ATE", "LPRSNCST", "FOB", "LJAKDAX", "FORDUMPC", "LTRNTESS", "THR", "SAG", "MTX", "LJKDXASH", "COA", "PALBOSS", "ONINTENT", "STA", "TOA", "UND", "LYSKDCD", "D3B", "SWE", "GGA", "TOD", "MCN", "SEW", "VIN", "CAP", "CTYKORA", "CTYASHA", "HIPHOG"], "characters/high-res/jak"], +["ashelin-highres-ag", "ashelin-highres", 4, ["CASEXT", "LTHRNOUT", "LGARCSTA", "ATE", "LASHTHRN", "LJKDXASH", "LASHGRD", "CTYASHA"], "characters/high-res/ashelin"], +["hellcat-ag", "hellcat", 4, ["CASEXT", "LWIDEC", "LWIDEA"], "levels/common/entities"], +["heart-of-mar-ag-CASEXT", "heart-of-mar", 4, ["CASEXT"], "levels/castle/pad"], +["heart-of-mar-ag-SWE", "heart-of-mar", 4, ["SWE"], "levels/sewer/escort"], +["gun-upgrade-a-ag-CASEXT", "gun-upgrade-a", 4, ["CASEXT"], "levels/castle/pad"], +["gun-upgrade-a-ag-LGUARD", "gun-upgrade-a", 4, ["LGUARD"], "characters/guards"], +["particleman-ag-CASEXT", "particleman", 4, ["CASEXT"], "levels/castle/pad"], +["particleman-ag-HIDEOUT", "particleman", 4, ["HIDEOUT"], "levels/hideout"], +["particleman-ag-ATE-LWIDESTA-VIN", "particleman", 4, ["LWIDESTA", "ATE", "VIN"], "levels/common/particls"], +["particleman-ag-KIOSK", "particleman", 4, ["KIOSK"], "levels/city/market/west/brutter_kiosk"], +["particleman-ag-ORACLE", "particleman", 4, ["ORACLE"], "levels/city/oracle"], +["particleman-ag-INTROCST", "particleman", 4, ["INTROCST"], "levels/intro"], +["particleman-ag-LOUTCSTB", "particleman", 4, ["LOUTCSTB"], "levels/outro"], +["particleman-ag-FORDUMPC", "particleman", 4, ["FORDUMPC"], "levels/fortress/ammo_dump"], +["particleman-ag-LTRNTESS", "particleman", 4, ["LTRNTESS"], "levels/hideout"], +["particleman-ag-TBO", "particleman", 4, ["TBO"], "levels/mars_tomb/baron"], +["particleman-ag-THR", "particleman", 4, ["THR"], "levels/palace/throne_room"], +["particleman-ag-NEB", "particleman", 4, ["NEB"], "levels/nest/boss"], +["particleman-ag-LHIPOUT", "particleman", 4, ["LHIPOUT"], "levels/hideout"], +["particleman-ag-MCN-MTX", "particleman", 4, ["MTX", "MCN"], "levels/temple"], +["particleman-ag-LWHACK", "particleman", 4, ["LWHACK"], "levels/hiphog"], +["particleman-ag-ONINTENT", "particleman", 4, ["ONINTENT"], "levels/city/onin_tent"], +["particleman-ag-UND", "particleman", 4, ["UND"], "levels/underport"], +["particleman-ag-LYSKDCD", "particleman", 4, ["LYSKDCD"], "characters/youngsamos_kid_dog"], +["particleman-ag-GARAGE", "particleman", 4, ["GARAGE"], "levels/city/stadium/garage"], +["particleman-ag-SWE", "particleman", 4, ["SWE"], "levels/sewer/escort"], +["particleman-ag-CAP", "particleman", 4, ["CAP"], "levels/castle/pad"], +["particleman-ag-VI1", "particleman", 4, ["VI1"], "levels/jak1/village1"], +["casext", "casext", 4, ["CASEXT"], "levels/castle/pad"], +["hideout-scenes", "hideout-scenes", 3, ["HIDEOUT"], "levels/hideout"], +["hideout-part", "hideout-part", 3, ["HIDEOUT"], "levels/hideout"], +["hideout-obs", "hideout-obs", 3, ["HIDEOUT"], "levels/hideout"], +["tpage-932", "tpage-932", 4, ["HIDEOUT"], "levels/hideout"], +["tpage-933", "tpage-933", 4, ["HIDEOUT"], "levels/hideout"], +["tpage-2404", "tpage-2404", 4, ["HIDEOUT"], "levels/hideout"], +["tpage-999", "tpage-999", 4, ["HIDEOUT"], "levels/hideout"], +["hide-light-ag", "hide-light", 4, ["HIDEOUT"], "levels/hideout"], +["hide-bike-ag", "hide-bike", 4, ["HIDEOUT"], "levels/hideout"], +["hide-door-b-ag", "hide-door-b", 4, ["HIDEOUT"], "levels/hideout"], +["gun-barrel-ag", "gun-barrel", 4, ["HIDEOUT"], "levels/hideout"], +["hide-faucet-ag", "hide-faucet", 4, ["HIDEOUT"], "levels/hideout"], +["hideout", "hideout", 4, ["HIDEOUT"], "levels/hideout"], +["tpage-2964", "tpage-2964", 4, ["LWIDESTA"], "levels/stadium"], +["tpage-3257", "tpage-3257", 4, ["LWIDESTA"], "levels/stadium"], +["errol-highres-ag", "errol-highres", 4, ["LWIDESTA", "LERLTESS", "LBRNERMK", "INTROCST", "LERROL", "LSAMERGD"], "characters/high-res/errol"], +["baron-highres-ag", "baron-highres", 4, ["LWIDESTA", "LBRNERMK", "LERBRNGD", "COA", "TOMBEXT", "PALBOSS", "LDJAKBRN"], "characters/high-res/baron"], +["crimson-guard-highres-ag", "crimson-guard-highres", 4, ["LWIDESTA", "LERBRNGD", "COA", "LCGUARD", "FORDUMPD", "LSAMERGD", "LASHGRD", "LGUARD", "CTYKORA", "CTYASHA"], "characters/high-res/guard"], +["stdm-baron-box-ag", "stdm-baron-box", 4, ["LWIDESTA"], "levels/stadium"], +["crimson-guard-lowres-ag-LWIDESTA", "crimson-guard-lowres", 4, ["LWIDESTA"], "levels/stadium"], +["crimson-guard-lowres-ag-INTROCST", "crimson-guard-lowres", 4, ["INTROCST"], "levels/intro"], +["crimson-guard-lowres-ag-LERBRNGD-LSAMERGD", "crimson-guard-lowres", 4, ["LERBRNGD", "LSAMERGD"], "characters/low-res/guard"], +["crimson-guard-lowres-ag-COA", "crimson-guard-lowres", 4, ["COA"], "levels/consite"], +["crimson-guard-lowres-ag-FORDUMPD", "crimson-guard-lowres", 4, ["FORDUMPD"], "levels/fortress/ammo_dump"], +["crimson-guard-lowres-ag-LASHGRD", "crimson-guard-lowres", 4, ["LASHGRD"], "characters/ashelin_guard"], +["crimson-guard-lowres-ag-CTYKORA", "crimson-guard-lowres", 4, ["CTYKORA"], "levels/city/slums/kor"], +["crimson-guard-lowres-ag-CTYASHA", "crimson-guard-lowres", 4, ["CTYASHA"], "levels/city/market/east/ashelin"], +["stdm-barrels-ag", "stdm-barrels", 4, ["LWIDESTA"], "levels/stadium"], +["palmpilot-ag-LWIDESTA", "palmpilot", 4, ["LWIDESTA"], "levels/stadium"], +["palmpilot-ag-LTHRNOUT-NEB", "palmpilot", 4, ["LTHRNOUT", "NEB"], "levels/common/entities"], +["palmpilot-ag-ATE", "palmpilot", 4, ["ATE"], "levels/atoll"], +["palmpilot-ag-LASHTHRN", "palmpilot", 4, ["LASHTHRN"], "levels/palace/throne_room"], +["palmpilot-ag-FORDUMPD", "palmpilot", 4, ["FORDUMPD"], "levels/fortress/ammo_dump"], +["palmpilot-ag-VIN", "palmpilot", 4, ["VIN"], "levels/power_station"], +["palmpilot-ag-LGUARD", "palmpilot", 4, ["LGUARD"], "characters/guards"], +["lwidesta", "lwidesta", 4, ["LWIDESTA"], "levels/stadium"], +["tpage-3162", "tpage-3162", 4, ["LRACELIT"], "levels/stadium/races"], +["tpage-3374", "tpage-3374", 4, ["LRACELIT"], "levels/stadium/races"], +["stadium-racer-ag", "stadium-racer", 4, ["LRACELIT"], "levels/stadium/races"], +["race-start-light-ag", "race-start-light", 4, ["LRACELIT"], "levels/stadium/races"], +["race-start-light-banner-ag", "race-start-light-banner", 4, ["LRACELIT"], "levels/stadium/races"], +["lracelit", "lracelit", 4, ["LRACELIT"], "levels/stadium/races"], +["ctyslumb-part", "ctyslumb-part", 3, ["CTB"], "levels/city/slums"], +["tpage-977", "tpage-977", 4, ["CTB"], "levels/city/slums"], +["tpage-1308", "tpage-1308", 4, ["CTB"], "levels/city/slums"], +["tpage-978", "tpage-978", 4, ["CTB"], "levels/city/slums"], +["tpage-1022", "tpage-1022", 4, ["CTB"], "levels/city/slums"], +["tpage-1647", "tpage-1647", 4, ["CTB"], "levels/city/slums"], +["com-airlock-outer-ag-CTB", "com-airlock-outer", 4, ["CTB"], "levels/city/slums"], +["com-airlock-outer-ag-CAS-CFA-COA-CPA-CTC-MTN","com-airlock-outer", 4, ["CTC", "MTN", "CAS", "COA", "CFA", "CPA"], "levels/common/entities"], +["com-airlock-outer-ag-CAB", "com-airlock-outer", 4, ["CAB"], "levels/castle/boss"], +["com-airlock-outer-ag-ATO", "com-airlock-outer", 4, ["ATO"], "levels/atoll"], +["com-airlock-outer-ag-SEB", "com-airlock-outer", 4, ["SEB"], "levels/sewer"], +["com-airlock-outer-ag-SWB", "com-airlock-outer", 4, ["SWB"], "levels/sewer/escort"], +["com-airlock-outer-ag-CAP-CIB", "com-airlock-outer", 4, ["CIB", "CAP"], "levels/common/entities"], +["com-airlock-outer-ag-PAR", "com-airlock-outer", 4, ["PAR"], "levels/palace/roof"], +["com-airlock-outer-ag-PAE", "com-airlock-outer", 4, ["PAE"], "levels/palace/explore"], +["com-airlock-outer-ag-PAC", "com-airlock-outer", 4, ["PAC"], "levels/palace/cable"], +["com-airlock-outer-ag-PAS", "com-airlock-outer", 4, ["PAS"], "levels/palace/shaft"], +["com-airlock-outer-ag-CGB", "com-airlock-outer", 4, ["CGB"], "levels/city/generic"], +["com-airlock-outer-ag-TOD", "com-airlock-outer", 4, ["TOD"], "levels/mars_tomb/entrance"], +["com-airlock-outer-ag-RUI", "com-airlock-outer", 4, ["RUI"], "levels/ruins"], +["com-airlock-inner-ag-CFA-CPA-CTB-PAS-SEB-SWB","com-airlock-inner", 4, ["CTB", "SEB", "SWB", "CFA", "PAS", "CPA"], "levels/common/entities"], +["com-airlock-inner-ag-ATE", "com-airlock-inner", 4, ["ATE"], "levels/atoll"], +["com-airlock-inner-ag-COB", "com-airlock-inner", 4, ["COB"], "levels/consite"], +["com-airlock-inner-ag-UND", "com-airlock-inner", 4, ["UND"], "levels/underport"], +["com-airlock-inner-ag-UNB", "com-airlock-inner", 4, ["UNB"], "levels/underport"], +["ctyslumb-vis", "ctyslumb-vis", 4, ["CTB"], "levels/city/slums"], +["kiosk-part", "kiosk-part", 3, ["KIOSK"], "levels/city/market/west/brutter_kiosk"], +["tpage-2192", "tpage-2192", 4, ["KIOSK"], "levels/city/market/west/brutter_kiosk"], +["tpage-2212", "tpage-2212", 4, ["KIOSK"], "levels/city/market/west/brutter_kiosk"], +["tpage-2225", "tpage-2225", 4, ["KIOSK"], "levels/city/market/west/brutter_kiosk"], +["tpage-2911", "tpage-2911", 4, ["KIOSK"], "levels/city/market/west/brutter_kiosk"], +["tpage-2334", "tpage-2334", 4, ["KIOSK"], "levels/city/market/west/brutter_kiosk"], +["brutter-highres-ag", "brutter-highres", 4, ["KIOSK", "LOUTCSTB", "STADBLMP", "LSMYSBRT"], "characters/high-res/brutter"], +["kiosk-fish-sign-ag", "kiosk-fish-sign", 4, ["KIOSK"], "levels/city/market/west/brutter_kiosk"], +["kiosk-banner-ag", "kiosk-banner", 4, ["KIOSK"], "levels/city/market/west/brutter_kiosk"], +["kiosk", "kiosk", 4, ["KIOSK"], "levels/city/market/west/brutter_kiosk"], +["dig-digger", "dig-digger", 3, ["DG1", "D3A"], "levels/dig"], +["dig-obs", "dig-obs", 3, ["DG1", "D3A"], "levels/dig"], +["dig1-obs", "dig1-obs", 3, ["DG1", "D3A"], "levels/dig"], +["dig2-obs", "dig2-obs", 3, ["DG1", "D3A"], "levels/dig"], +["dig3-obs", "dig3-obs", 3, ["DG1", "D3A"], "levels/dig"], +["tomb-baby-spider", "tomb-baby-spider", 3, ["DG1", "D3A", "TOA"], "levels/common/enemy/baby_spider"], +["grenadier", "grenadier", 3, ["DG1", "D3A", "UNB", "RUI"], "levels/common/enemy/metalhead_slinger"], +["metalmonk", "metalmonk", 3, ["DG1", "MTN", "ATE", "D3A"], "levels/common/enemy/metalhead_brown"], +["dig-texture", "dig-texture", 3, ["DG1", "D3A"], "levels/dig"], +["dig-scenes", "dig-scenes", 3, ["DG1", "D3A"], "levels/dig"], +["dig-part", "dig-part", 3, ["DG1", "D3A"], "levels/dig"], +["tpage-2282", "tpage-2282", 4, ["DG1"], "levels/dig/drill_equipment"], +["tpage-2284", "tpage-2284", 4, ["DG1"], "levels/dig/drill_equipment"], +["tpage-2283", "tpage-2283", 4, ["DG1"], "levels/dig/drill_equipment"], +["tpage-2419", "tpage-2419", 4, ["DG1"], "levels/dig/drill_equipment"], +["tpage-2844", "tpage-2844", 4, ["DG1"], "levels/dig/drill_equipment"], +["dig-digger-ag", "dig-digger", 4, ["DG1"], "levels/dig/drill_equipment"], +["dig-bomb-crate-ag", "dig-bomb-crate", 4, ["DG1"], "levels/dig/drill_equipment"], +["dig-conveyor-ag", "dig-conveyor", 4, ["DG1"], "levels/dig/drill_equipment"], +["dig-clasp-ag", "dig-clasp", 4, ["DG1"], "levels/dig/drill_equipment"], +["dig-tether-ag", "dig-tether", 4, ["DG1"], "levels/dig/drill_equipment"], +["dig-jump-pad-ag", "dig-jump-pad", 4, ["DG1"], "levels/dig/drill_equipment"], +["dig-breakable-door-ag", "dig-breakable-door", 4, ["DG1"], "levels/dig/drill_equipment"], +["dig-sinking-plat-ag-DG1", "dig-sinking-plat", 4, ["DG1"], "levels/dig/drill_equipment"], +["dig-sinking-plat-ag-D3A", "dig-sinking-plat", 4, ["D3A"], "levels/dig/lurker_village"], +["dig-clasp-b-ag", "dig-clasp-b", 4, ["DG1"], "levels/dig/drill_equipment"], +["dig-bomb-crate-cylinder-ag", "dig-bomb-crate-cylinder", 4, ["DG1"], "levels/dig/drill_equipment"], +["dig1-vis", "dig1-vis", 4, ["DG1"], "levels/dig/drill_equipment"], +["target-tube", "target-tube", 3, ["FEB"], "engine/target"], +["jak-tube+0-ag", "jak-tube+0", 4, ["FEB"], "levels/fortress/exit"], +["fortress-obs", "fortress-obs", 3, ["FEB", "FDB"], "levels/fortress"], +["forexitb-part", "forexitb-part", 3, ["FEB"], "levels/fortress/exit"], +["tpage-1584", "tpage-1584", 4, ["FEB"], "levels/fortress/exit"], +["tpage-1587", "tpage-1587", 4, ["FEB"], "levels/fortress/exit"], +["tpage-1585", "tpage-1585", 4, ["FEB"], "levels/fortress/exit"], +["tpage-1586", "tpage-1586", 4, ["FEB"], "levels/fortress/exit"], +["tpage-1712", "tpage-1712", 4, ["FEB"], "levels/fortress/exit"], +["water-anim-fortress-ag", "water-anim-fortress", 4, ["FEB"], "levels/fortress/exit"], +["fort-trap-door-ag-FEB", "fort-trap-door", 4, ["FEB"], "levels/fortress/exit"], +["fort-trap-door-ag-FDB", "fort-trap-door", 4, ["FDB"], "levels/fortress/ammo_dump"], +["forexitb-vis", "forexitb-vis", 4, ["FEB"], "levels/fortress/exit"], +["jak-pole+0-ag-DMI", "jak-pole+0", 4, ["DMI"], "levels/drill_platform"], +["jak-pole+0-ag-FDA-FEA-TOB", "jak-pole+0", 4, ["FDA", "FEA", "TOB"], "levels/common/entities"], +["jak-pole+0-ag-COA", "jak-pole+0", 4, ["COA"], "levels/consite"], +["jak-pole+0-ag-PAE", "jak-pole+0", 4, ["PAE"], "levels/palace/explore"], +["jak-pole+0-ag-HALFPIPE-PAC", "jak-pole+0", 4, ["PAC", "HALFPIPE"], "levels/common/entities"], +["jak-pole+0-ag-D3B-RUI", "jak-pole+0", 4, ["D3B", "RUI"], "levels/common/entities"], +["target-turret-shot", "target-turret-shot", 3, ["DMI"], "levels/drill_platform"], +["target-turret", "target-turret", 3, ["DMI"], "levels/drill_platform"], +["jak-turret+0-ag", "jak-turret+0", 4, ["DMI"], "levels/drill_platform"], +["drill-turret", "drill-turret", 3, ["DMI"], "levels/drill_platform"], +["drillmid-obs", "drillmid-obs", 3, ["DMI"], "levels/drill_platform"], +["drill-part", "drill-part", 3, ["DMI"], "levels/drill_platform"], +["drill-part2", "drill-part2", 3, ["DMI"], "levels/drill_platform"], +["drill-mech-master", "drill-mech-master", 3, ["DMI"], "levels/drill_platform"], +["drill-obs", "drill-obs", 3, ["DMI"], "levels/drill_platform"], +["drill-panel", "drill-panel", 3, ["DMI"], "levels/drill_platform"], +["drill-obs2", "drill-obs2", 3, ["DMI"], "levels/drill_platform"], +["drill-spool", "drill-spool", 3, ["DMI"], "levels/drill_platform"], +["drill-baron", "drill-baron", 3, ["DMI"], "levels/drill_platform"], +["drill-scenes", "drill-scenes", 3, ["DMI"], "levels/drill_platform"], +["centurion", "centurion", 3, ["DMI", "MTN"], "levels/common/enemy/metalhead_bearer"], +["ginsu", "ginsu", 3, ["DMI"], "levels/drill_platform"], +["tpage-2300", "tpage-2300", 4, ["DMI"], "levels/drill_platform"], +["tpage-2302", "tpage-2302", 4, ["DMI"], "levels/drill_platform"], +["tpage-2301", "tpage-2301", 4, ["DMI"], "levels/drill_platform"], +["tpage-2493", "tpage-2493", 4, ["DMI"], "levels/drill_platform"], +["tpage-2303", "tpage-2303", 4, ["DMI"], "levels/drill_platform"], +["tpage-2565", "tpage-2565", 4, ["DMI"], "levels/drill_platform"], +["tpage-2846", "tpage-2846", 4, ["DMI"], "levels/drill_platform"], +["mech-ag-DMI-RUI", "mech", 4, ["DMI", "RUI"], "levels/target/mech_suit"], +["mech-ag-DRI-DRILLMTN", "mech", 4, ["DRI", "DRILLMTN"], "levels/drill_platform"], +["mech-ag-UNB", "mech", 4, ["UNB"], "levels/underport"], +["warp-gate-ag-DMI", "warp-gate", 4, ["DMI"], "levels/drill_platform"], +["warp-gate-ag-DRI", "warp-gate", 4, ["DRI"], "levels/drill_platform"], +["warp-gate-ag-MTN", "warp-gate", 4, ["MTN"], "levels/temple"], +["warp-gate-ag-STR", "warp-gate", 4, ["STR"], "levels/strip"], +["warp-gate-ag-D3A", "warp-gate", 4, ["D3A"], "levels/dig/lurker_village"], +["warp-gate-ag-VIN", "warp-gate", 4, ["VIN"], "levels/power_station"], +["drill-falling-door-ag-DMI", "drill-falling-door", 4, ["DMI"], "levels/drill_platform"], +["drill-falling-door-ag-DRB", "drill-falling-door", 4, ["DRB"], "levels/drill_platform/tower"], +["drillmid-vis", "drillmid-vis", 4, ["DMI"], "levels/drill_platform"], +["oracle-texture", "oracle-texture", 3, ["ORACLE"], "levels/city/oracle"], +["oracle-part", "oracle-part", 3, ["ORACLE"], "levels/city/oracle"], +["oracle-scenes", "oracle-scenes", 3, ["ORACLE"], "levels/city/oracle"], +["oracle-training", "oracle-training", 3, ["ORACLE"], "levels/city/oracle"], +["tpage-2553", "tpage-2553", 4, ["ORACLE"], "levels/city/oracle"], +["tpage-2863", "tpage-2863", 4, ["ORACLE"], "levels/city/oracle"], +["tpage-2557", "tpage-2557", 4, ["ORACLE"], "levels/city/oracle"], +["darkjak-highres-ag", "darkjak-highres", 4, ["ORACLE", "NEB", "VI1"], "characters/high-res/darkjak"], +["oracle-roof-banner-b-ag", "oracle-roof-banner-b", 4, ["ORACLE"], "levels/city/oracle"], +["oracle-roof-banner-ag", "oracle-roof-banner", 4, ["ORACLE"], "levels/city/oracle"], +["oracle-door-ag-ORACLE", "oracle-door", 4, ["ORACLE"], "levels/city/oracle"], +["oracle-door-ag-CTC", "oracle-door", 4, ["CTC"], "levels/city/slums"], +["oracle-wall-banner-ag", "oracle-wall-banner", 4, ["ORACLE"], "levels/city/oracle"], +["oracle", "oracle", 4, ["ORACLE"], "levels/city/oracle"], +["tess-lhiphog+0-ag", "tess-lhiphog+0", 4, ["LERLTESS", "LTESS"], "characters/tess"], +["tpage-2949", "tpage-2949", 4, ["LERLTESS"], "characters/errol_tess"], +["tpage-3269", "tpage-3269", 4, ["LERLTESS"], "characters/errol_tess"], +["krew-highres-ag", "krew-highres", 4, ["LERLTESS", "LGARCSTA", "CAB", "LTESS", "LGUARD"], "characters/high-res/krew"], +["tess-highres-ag", "tess-highres", 4, ["LERLTESS", "LGARCSTA", "LPRSNCST", "LTRNTESS", "OUTROCST", "LWHACK", "LTESS"], "characters/high-res/tess"], +["lerltess", "lerltess", 4, ["LERLTESS"], "characters/errol_tess"], +["tpage-1204", "tpage-1204", 4, ["DRI"], "levels/drill_platform"], +["tpage-1205", "tpage-1205", 4, ["DRI"], "levels/drill_platform"], +["tpage-1239", "tpage-1239", 4, ["DRI"], "levels/drill_platform"], +["tpage-1203", "tpage-1203", 4, ["DRI"], "levels/drill_platform"], +["tpage-1206", "tpage-1206", 4, ["DRI"], "levels/drill_platform"], +["centurion-ag", "centurion", 4, ["DRI", "MTX"], "levels/common/enemy/metalhead_bearer"], +["drill-turret-ext-ag", "drill-turret-ext", 4, ["DRI", "DRILLMTN"], "levels/drill_platform"], +["port-turret-ag-DRI", "port-turret", 4, ["DRI"], "levels/drill_platform"], +["port-turret-ag-DRILLMTN", "port-turret", 4, ["DRILLMTN"], "levels/drill_platform/bg_mountain"], +["ginsu-ag", "ginsu", 4, ["DRI"], "levels/drill_platform"], +["drill-elevator-ag", "drill-elevator", 4, ["DRI", "DRB"], "levels/common/entities"], +["drill-plat-falling-ag", "drill-plat-falling", 4, ["DRI"], "levels/drill_platform"], +["drill-bridge-shot-ag", "drill-bridge-shot", 4, ["DRI"], "levels/drill_platform"], +["drill-elevator-base-ag-DRI", "drill-elevator-base", 4, ["DRI"], "levels/drill_platform"], +["drill-elevator-base-ag-DRB", "drill-elevator-base", 4, ["DRB"], "levels/drill_platform/tower"], +["drill-wall-ag-DRI", "drill-wall", 4, ["DRI"], "levels/drill_platform"], +["drill-wall-ag-DRILLMTN", "drill-wall", 4, ["DRILLMTN"], "levels/drill_platform/bg_mountain"], +["drill-metalhead-eggs-c-ag", "drill-metalhead-eggs-c", 4, ["DRI", "DRILLMTN"], "levels/drill_platform"], +["drill-metalhead-eggs-b-ag", "drill-metalhead-eggs-b", 4, ["DRI", "DRILLMTN"], "levels/drill_platform"], +["drill-metalhead-eggs-a-ag", "drill-metalhead-eggs-a", 4, ["DRI", "DRILLMTN"], "levels/drill_platform"], +["drill-turret-int-ag-DRI", "drill-turret-int", 4, ["DRI"], "levels/drill_platform"], +["drill-turret-int-ag-DRILLMTN", "drill-turret-int", 4, ["DRILLMTN"], "levels/drill_platform/bg_mountain"], +["drill-vis", "drill-vis", 4, ["DRI"], "levels/drill_platform"], +["metalkor-texture", "metalkor-texture", 3, ["LBRNERMK"], "characters/baron_errol_metalkor"], +["tpage-2558", "tpage-2558", 4, ["LBRNERMK"], "characters/baron_errol_metalkor"], +["tpage-2801", "tpage-2801", 4, ["LBRNERMK"], "characters/baron_errol_metalkor"], +["tpage-3267", "tpage-3267", 4, ["LBRNERMK"], "characters/baron_errol_metalkor"], +["metalkor-head-ag", "metalkor-head", 4, ["LBRNERMK"], "characters/baron_errol_metalkor"], +["lbrnermk", "lbrnermk", 4, ["LBRNERMK"], "characters/baron_errol_metalkor"], +["tpage-3430", "tpage-3430", 4, ["LRACECF"], "levels/stadium/races/class2"], +["lracecf", "lracecf", 4, ["LRACECF"], "levels/stadium/races/class2"], +["ctyslumc-part", "ctyslumc-part", 3, ["CTC"], "levels/city/slums"], +["tpage-1268", "tpage-1268", 4, ["CTC"], "levels/city/slums"], +["tpage-1303", "tpage-1303", 4, ["CTC"], "levels/city/slums"], +["tpage-1269", "tpage-1269", 4, ["CTC"], "levels/city/slums"], +["tpage-1023", "tpage-1023", 4, ["CTC"], "levels/city/slums"], +["tpage-1648", "tpage-1648", 4, ["CTC"], "levels/city/slums"], +["ctyslumc-vis", "ctyslumc-vis", 4, ["CTC"], "levels/city/slums"], +["tpage-3194", "tpage-3194", 4, ["LTHRNOUT"], "levels/hideout"], +["tpage-3252", "tpage-3252", 4, ["LTHRNOUT"], "levels/hideout"], +["torn-highres-ag", "torn-highres", 4, ["LTHRNOUT", "LTRNYSAM", "LTRNTESS", "SAG", "LTRNKRKD"], "characters/high-res/torn"], +["lthrnout", "lthrnout", 4, ["LTHRNOUT"], "levels/hideout"], +["forresca-part", "forresca-part", 3, ["FRA"], "levels/fortress/rescue"], +["forresca-obs", "forresca-obs", 3, ["FRA"], "levels/fortress/rescue"], +["tpage-3190", "tpage-3190", 4, ["FRA"], "levels/fortress/rescue"], +["tpage-3192", "tpage-3192", 4, ["FRA"], "levels/fortress/rescue"], +["tpage-3191", "tpage-3191", 4, ["FRA"], "levels/fortress/rescue"], +["crimson-guard-hover-ag", "crimson-guard-hover", 4, ["FRA", "FOB", "DRILLMTN"], "characters/hover_guards"], +["cty-guard-turret-button-ag-FRA-FRB", "cty-guard-turret-button", 4, ["FRA", "FRB"], "levels/common/entities"], +["cty-guard-turret-button-ag-LPOWER", "cty-guard-turret-button", 4, ["LPOWER"], "levels/power_station/power_switches"], +["fort-led-ag", "fort-led", 4, ["FRA"], "levels/fortress/rescue"], +["forresca-vis", "forresca-vis", 4, ["FRA"], "levels/fortress/rescue"], +["tpage-2699", "tpage-2699", 4, ["LGARCSTA"], "levels/outro"], +["tpage-3512", "tpage-3512", 4, ["LGARCSTA"], "levels/outro"], +["tpage-3271", "tpage-3271", 4, ["LGARCSTA"], "levels/outro"], +["samos-highres-ag", "samos-highres", 4, ["LGARCSTA", "LPRSNCST", "OUTROCST", "LERBRNGD", "STADBLMP", "LSAMERGD", "LINTCSTB", "LSMYSBRT", "LYSAMSAM"], "characters/high-res/samos"], +["sew-gold-key-ag-LGARCSTA", "sew-gold-key", 4, ["LGARCSTA"], "levels/outro"], +["sew-gold-key-ag-LHIPOUT", "sew-gold-key", 4, ["LHIPOUT"], "levels/hideout"], +["sew-gold-key-ag-SEW", "sew-gold-key", 4, ["SEW"], "levels/sewer"], +["lgarcsta", "lgarcsta", 4, ["LGARCSTA"], "levels/outro"], +["rhino", "rhino", 3, ["MTN"], "levels/temple"], +["rhino-wall", "rhino-wall", 3, ["MTN"], "levels/temple"], +["mountain-ocean", "mountain-ocean", 3, ["MTN"], "levels/temple"], +["mountain-obs", "mountain-obs", 3, ["MTN"], "levels/temple"], +["mountain-obs2", "mountain-obs2", 3, ["MTN"], "levels/temple"], +["mountain-scenes", "mountain-scenes", 3, ["MTN"], "levels/temple"], +["mountain-part", "mountain-part", 3, ["MTN"], "levels/temple"], +["hopper", "hopper", 3, ["MTN", "STA"], "levels/common/enemy"], +["tpage-1254", "tpage-1254", 4, ["MTN"], "levels/temple"], +["tpage-1256", "tpage-1256", 4, ["MTN"], "levels/temple"], +["tpage-1255", "tpage-1255", 4, ["MTN"], "levels/temple"], +["tpage-1253", "tpage-1253", 4, ["MTN"], "levels/temple"], +["tpage-1257", "tpage-1257", 4, ["MTN"], "levels/temple"], +["tpage-3470", "tpage-3470", 4, ["MTN"], "levels/temple"], +["tpage-1275", "tpage-1275", 4, ["MTN"], "levels/temple"], +["mtn-plat-buried-ag-MTN", "mtn-plat-buried", 4, ["MTN"], "levels/temple"], +["mtn-plat-buried-ag-MTX", "mtn-plat-buried", 4, ["MTX"], "levels/temple"], +["mtn-plat-return-ag-MTN", "mtn-plat-return", 4, ["MTN"], "levels/temple"], +["mtn-plat-return-ag-MTX", "mtn-plat-return", 4, ["MTX"], "levels/temple"], +["water-anim-mountain-ag", "water-anim-mountain", 4, ["MTN"], "levels/temple"], +["mtn-shard-ag-MTN", "mtn-shard", 4, ["MTN"], "levels/temple"], +["mtn-shard-ag-MCN", "mtn-shard", 4, ["MCN"], "levels/temple/canyon"], +["mtn-gate-ag", "mtn-gate", 4, ["MTN"], "levels/temple"], +["mtn-lens-base-ag", "mtn-lens-base", 4, ["MTN"], "levels/temple"], +["mtn-plat-long-ag", "mtn-plat-long", 4, ["MTN"], "levels/temple"], +["mtn-iris-door-ag-MTN", "mtn-iris-door", 4, ["MTN"], "levels/temple"], +["mtn-iris-door-ag-MTX", "mtn-iris-door", 4, ["MTX"], "levels/temple"], +["mtn-plat-elevator-ag", "mtn-plat-elevator", 4, ["MTN"], "levels/temple"], +["mtn-plat-shoot-ag", "mtn-plat-shoot", 4, ["MTN"], "levels/temple"], +["mtn-lens-floor-ag", "mtn-lens-floor", 4, ["MTN"], "levels/temple"], +["mtn-plat-updown-ag", "mtn-plat-updown", 4, ["MTN"], "levels/temple"], +["pal-windmill-ag-MTN", "pal-windmill", 4, ["MTN"], "levels/temple"], +["pal-windmill-ag-CASCITY-LCITYLOW-PAC", "pal-windmill", 4, ["PAC", "LCITYLOW", "CASCITY"], "levels/common/entities"], +["mountain-vis", "mountain-vis", 4, ["MTN"], "levels/temple"], +["intro-ocean", "intro-ocean", 3, ["INTROCST"], "levels/intro"], +["intro-scenes", "intro-scenes", 3, ["INTROCST"], "levels/intro"], +["intro-obs", "intro-obs", 3, ["INTROCST"], "levels/intro"], +["vortex-data", "vortex-data", 3, ["INTROCST"], "levels/intro"], +["vortex", "vortex", 3, ["INTROCST"], "levels/intro"], +["tpage-2568", "tpage-2568", 4, ["INTROCST"], "levels/intro"], +["tpage-2570", "tpage-2570", 4, ["INTROCST"], "levels/intro"], +["tpage-3264", "tpage-3264", 4, ["INTROCST"], "levels/intro"], +["jakone-highres-ag", "jakone-highres", 4, ["INTROCST"], "levels/intro"], +["time-map-ag-INTROCST", "time-map", 4, ["INTROCST"], "levels/intro"], +["time-map-ag-LWHACK", "time-map", 4, ["LWHACK"], "levels/hiphog"], +["rift-rider-heart-of-mar-ag", "rift-rider-heart-of-mar", 4, ["INTROCST"], "levels/intro"], +["rift-rider-dash-ag", "rift-rider-dash", 4, ["INTROCST"], "levels/intro"], +["meteor-ag", "meteor", 4, ["INTROCST"], "levels/intro"], +["rift-rider-break-b-ag", "rift-rider-break-b", 4, ["INTROCST"], "levels/intro"], +["vortex-light-ag", "vortex-light", 4, ["INTROCST"], "levels/intro"], +["rift-rider-chunk-a-ag", "rift-rider-chunk-a", 4, ["INTROCST"], "levels/intro"], +["rift-rider-break-c-ag", "rift-rider-break-c", 4, ["INTROCST"], "levels/intro"], +["rift-rider-bar-ag", "rift-rider-bar", 4, ["INTROCST"], "levels/intro"], +["introcst", "introcst", 4, ["INTROCST"], "levels/intro"], +["tpage-2298", "tpage-2298", 4, ["DRB"], "levels/drill_platform/tower"], +["tpage-2299", "tpage-2299", 4, ["DRB"], "levels/drill_platform/tower"], +["tpage-2492", "tpage-2492", 4, ["DRB"], "levels/drill_platform/tower"], +["drill-flip-step-ag-DRB", "drill-flip-step", 4, ["DRB"], "levels/drill_platform/tower"], +["drill-flip-step-ag-DRILLMTN", "drill-flip-step", 4, ["DRILLMTN"], "levels/drill_platform/bg_mountain"], +["drill-drop-plat-ag", "drill-drop-plat", 4, ["DRB"], "levels/drill_platform/tower"], +["drill-switch-ag-DRB", "drill-switch", 4, ["DRB"], "levels/drill_platform/tower"], +["drill-switch-ag-DRILLMTN", "drill-switch", 4, ["DRILLMTN"], "levels/drill_platform/bg_mountain"], +["drillb-vis", "drillb-vis", 4, ["DRB"], "levels/drill_platform/tower"], +["ai-task-h", "ai-task-h", 3, ["ATE", "SEB", "SWB", "LKIDDOGE", "UNB", "CTYKORA", "CTYASHA"], "levels/common/ai"], +["bot-h", "bot-h", 3, ["ATE", "SEB", "SWB", "LKIDDOGE", "UNB", "CTYKORA", "CTYASHA"], "levels/common/ai"], +["bot", "bot", 3, ["ATE", "SEB", "SWB", "LKIDDOGE", "UNB", "CTYKORA", "CTYASHA"], "levels/common/ai"], +["bot-states", "bot-states", 3, ["ATE", "SEB", "SWB", "LKIDDOGE", "UNB", "CTYKORA", "CTYASHA"], "levels/common/ai"], +["sig-h", "sig-h", 3, ["ATE", "UNB"], "characters/sig"], +["sig-task", "sig-task", 3, ["ATE", "UNB"], "characters/sig"], +["sig-shot", "sig-shot", 3, ["ATE", "UNB"], "characters/sig"], +["sig-plasma", "sig-plasma", 3, ["ATE", "UNB"], "characters/sig"], +["sig", "sig", 3, ["ATE", "UNB"], "characters/sig"], +["sig-states", "sig-states", 3, ["ATE", "UNB"], "characters/sig"], +["ash-h", "ash-h", 3, ["ATE", "CTYASHA"], "levels/atoll/ashelin"], +["ash-task", "ash-task", 3, ["ATE", "CTYASHA"], "levels/atoll/ashelin"], +["ash-shot", "ash-shot", 3, ["ATE", "CTYASHA"], "levels/atoll/ashelin"], +["ash", "ash", 3, ["ATE", "CTYASHA"], "levels/atoll/ashelin"], +["ash-states", "ash-states", 3, ["ATE", "CTYASHA"], "levels/atoll/ashelin"], +["sig0-course", "sig0-course", 3, ["ATE"], "levels/atoll"], +["ash1-course", "ash1-course", 3, ["ATE"], "levels/atoll"], +["atoll-tank", "atoll-tank", 3, ["ATE"], "levels/atoll"], +["atoll-scenes", "atoll-scenes", 3, ["ATE"], "levels/atoll"], +["sniper", "sniper", 3, ["ATE"], "levels/atoll"], +["amphibian", "amphibian", 3, ["ATE", "SEB", "SWB", "RUI"], "levels/common/enemy/amphibian"], +["juicer", "juicer", 3, ["ATE", "CTYASHA"], "levels/atoll/ashelin"], +["tpage-1606", "tpage-1606", 4, ["ATE"], "levels/atoll"], +["tpage-1607", "tpage-1607", 4, ["ATE"], "levels/atoll"], +["tpage-2461", "tpage-2461", 4, ["ATE"], "levels/atoll"], +["tpage-3237", "tpage-3237", 4, ["ATE"], "levels/atoll"], +["tpage-3412", "tpage-3412", 4, ["ATE"], "levels/atoll"], +["sig-ag", "sig", 4, ["ATE", "UNB"], "characters/sig"], +["atoll-tank-ag", "atoll-tank", 4, ["ATE"], "levels/atoll"], +["sig-highres-ag", "sig-highres", 4, ["ATE", "LHIPOUT", "LTESS", "UND", "LGUARD"], "characters/high-res/sig"], +["juicer-ag", "juicer", 4, ["ATE", "CTYASHA"], "levels/atoll/ashelin"], +["atoll-hellcat-ag", "atoll-hellcat", 4, ["ATE", "CTYKORA"], "levels/common/entities"], +["ashelin-ag", "ashelin", 4, ["ATE", "CTYASHA"], "levels/atoll/ashelin"], +["metalmonk-ag", "metalmonk", 4, ["ATE", "MTX", "D3A"], "levels/common/enemy/metalhead_brown"], +["amphibian-ag", "amphibian", 4, ["ATE", "SEW", "RUI"], "levels/common/enemy/amphibian"], +["atollext-vis", "atollext-vis", 4, ["ATE"], "levels/atoll"], +["tpage-3270", "tpage-3270", 4, ["LERROL"], "characters/errol"], +["lerrol", "lerrol", 4, ["LERROL"], "characters/errol"], +["youngsamos-ltrnysam+0-ag", "youngsamos-ltrnysam+0", 4, ["LTRNYSAM"], "characters/torn_youngsamos"], +["tpage-1774", "tpage-1774", 4, ["LTRNYSAM"], "characters/torn_youngsamos"], +["tpage-3255", "tpage-3255", 4, ["LTRNYSAM"], "characters/torn_youngsamos"], +["youngsamos-highres-ag", "youngsamos-highres", 4, ["LTRNYSAM", "LOUTCSTB", "LPRSNCST", "FOB", "STADBLMP", "LYSKDCD", "TOD", "LTENTOUT", "LSMYSBRT", "LYSAMSAM"], "characters/high-res/youngsamos"], +["ltrnysam", "ltrnysam", 4, ["LTRNYSAM"], "characters/torn_youngsamos"], +["tpage-3186", "tpage-3186", 4, ["LOUTCSTB"], "levels/outro"], +["tpage-3185", "tpage-3185", 4, ["LOUTCSTB"], "levels/outro"], +["tpage-3187", "tpage-3187", 4, ["LOUTCSTB"], "levels/outro"], +["tpage-3245", "tpage-3245", 4, ["LOUTCSTB"], "levels/outro"], +["kid-highres-ag", "kid-highres", 4, ["LOUTCSTB", "NEB", "LTRNKRKD", "LYSKDCD", "TOD", "VIN", "CTYKORA"], "characters/high-res/kid"], +["rift-ring-ag", "rift-ring", 4, ["LOUTCSTB", "VI1"], "levels/common/entities"], +["brutter-balloon-norift-ag", "brutter-balloon-norift", 4, ["LOUTCSTB"], "levels/outro"], +["metalkor-chopped-ag", "metalkor-chopped", 4, ["LOUTCSTB", "LHIPOUT"], "levels/common/entities"], +["rift-rider-ag-LOUTCSTB", "rift-rider", 4, ["LOUTCSTB"], "levels/outro"], +["rift-rider-ag-LINTCSTB-LKEIRIFT", "rift-rider", 4, ["LKEIRIFT", "LINTCSTB"], "levels/common/entities"], +["rift-rider-ag-GARAGE", "rift-rider", 4, ["GARAGE"], "levels/city/stadium/garage"], +["precursor-stone-ag-LOUTCSTB", "precursor-stone", 4, ["LOUTCSTB"], "levels/outro"], +["precursor-stone-ag-NEB", "precursor-stone", 4, ["NEB"], "levels/nest/boss"], +["precursor-stone-ag-COA", "precursor-stone", 4, ["COA"], "levels/consite"], +["loutcstb", "loutcstb", 4, ["LOUTCSTB"], "levels/outro"], +["tpage-2953", "tpage-2953", 4, ["LASHTHRN"], "levels/palace/throne_room"], +["tpage-3266", "tpage-3266", 4, ["LASHTHRN"], "levels/palace/throne_room"], +["lashthrn", "lashthrn", 4, ["LASHTHRN"], "levels/palace/throne_room"], +["tpage-1598", "tpage-1598", 4, ["TOC"], "levels/mars_tomb/right"], +["tpage-1599", "tpage-1599", 4, ["TOC"], "levels/mars_tomb/right"], +["tpage-1832", "tpage-1832", 4, ["TOC"], "levels/mars_tomb/right"], +["water-anim-tomb-ag", "water-anim-tomb", 4, ["TOC", "TOA"], "levels/mars_tomb"], +["tomb-baby-spider-ag", "tomb-baby-spider", 4, ["TOC", "TOE", "TOB"], "levels/mars_tomb"], +["tomb-beetle-ag", "tomb-beetle", 4, ["TOC"], "levels/mars_tomb/right"], +["tomb-door-ag", "tomb-door", 4, ["TOC"], "levels/mars_tomb/right"], +["tomb-vibe-ag", "tomb-vibe", 4, ["TOC"], "levels/mars_tomb/right"], +["tomb-simon-button-ag-TOC", "tomb-simon-button", 4, ["TOC"], "levels/mars_tomb/right"], +["tomb-simon-button-ag-TOA", "tomb-simon-button", 4, ["TOA"], "levels/mars_tomb"], +["tomb-plat-simon-ag", "tomb-plat-simon", 4, ["TOC"], "levels/mars_tomb/right"], +["tomb-wing-door-ag-TOC", "tomb-wing-door", 4, ["TOC"], "levels/mars_tomb/right"], +["tomb-wing-door-ag-TBO", "tomb-wing-door", 4, ["TBO"], "levels/mars_tomb/baron"], +["tomb-wing-door-ag-TOA", "tomb-wing-door", 4, ["TOA"], "levels/mars_tomb"], +["tomb-button-ag-TOC", "tomb-button", 4, ["TOC"], "levels/mars_tomb/right"], +["tomb-button-ag-TOB", "tomb-button", 4, ["TOB"], "levels/mars_tomb/left"], +["tomb-beetle-door-ag", "tomb-beetle-door", 4, ["TOC"], "levels/mars_tomb/right"], +["tombc-vis", "tombc-vis", 4, ["TOC"], "levels/mars_tomb/right"], +["ctyfarm-obs", "ctyfarm-obs", 3, ["CFB", "CFA"], "levels/city/farm"], +["ctyfarma-part", "ctyfarma-part", 3, ["CFB", "CFA"], "levels/city/farm"], +["ctyfarmb-part", "ctyfarmb-part", 3, ["CFB", "CFA"], "levels/city/farm"], +["yakow", "yakow", 3, ["CFB", "CFA"], "levels/city/farm"], +["tpage-3005", "tpage-3005", 4, ["CFB"], "levels/city/farm"], +["tpage-3009", "tpage-3009", 4, ["CFB"], "levels/city/farm"], +["tpage-3007", "tpage-3007", 4, ["CFB"], "levels/city/farm"], +["tpage-3008", "tpage-3008", 4, ["CFB"], "levels/city/farm"], +["tpage-3006", "tpage-3006", 4, ["CFB"], "levels/city/farm"], +["tpage-3004", "tpage-3004", 4, ["CFB"], "levels/city/farm"], +["tpage-2442", "tpage-2442", 4, ["CFB"], "levels/city/farm"], +["yakow-ag", "yakow", 4, ["CFB"], "levels/city/farm"], +["farm-chilirots-ag-CFB", "farm-chilirots", 4, ["CFB"], "levels/city/farm"], +["farm-chilirots-ag-CFA", "farm-chilirots", 4, ["CFA"], "levels/city/farm"], +["farm-cabbage-ag", "farm-cabbage", 4, ["CFB", "CFA"], "levels/city/farm"], +["farm-marrow-ag", "farm-marrow", 4, ["CFB", "CFA"], "levels/city/farm"], +["farm-beetree-ag", "farm-beetree", 4, ["CFB", "CFA"], "levels/city/farm"], +["farm-small-cabbage-ag", "farm-small-cabbage", 4, ["CFB", "CFA"], "levels/city/farm"], +["farm-sprinkler-barrels-ag", "farm-sprinkler-barrels", 4, ["CFB", "CFA"], "levels/city/farm"], +["ctyfarmb-vis", "ctyfarmb-vis", 4, ["CFB"], "levels/city/farm"], +["casboss-texture", "casboss-texture", 3, ["CAB"], "levels/castle/boss"], +["castle-baron", "castle-baron", 3, ["CAB"], "levels/castle/boss"], +["castle-scenes", "castle-scenes", 3, ["CAB"], "levels/castle/boss"], +["casboss-part", "casboss-part", 3, ["CAB"], "levels/castle/boss"], +["tpage-2996", "tpage-2996", 4, ["CAB"], "levels/castle/boss"], +["tpage-2997", "tpage-2997", 4, ["CAB"], "levels/castle/boss"], +["tpage-3435", "tpage-3435", 4, ["CAB"], "levels/castle/boss"], +["tpage-3458", "tpage-3458", 4, ["CAB"], "levels/castle/boss"], +["tpage-3429", "tpage-3429", 4, ["CAB"], "levels/castle/boss"], +["krew-lowres-ag", "krew-lowres", 4, ["CAB"], "levels/castle/boss"], +["cboss-tractor-ag", "cboss-tractor", 4, ["CAB"], "levels/castle/boss"], +["krew-clone-ag", "krew-clone", 4, ["CAB"], "levels/castle/boss"], +["cboss-bomb-ag", "cboss-bomb", 4, ["CAB"], "levels/castle/boss"], +["cboss-elevator-ag", "cboss-elevator", 4, ["CAB"], "levels/castle/boss"], +["casboss-vis", "casboss-vis", 4, ["CAB"], "levels/castle/boss"], +["tpage-3442", "tpage-3442", 4, ["STC"], "levels/stadium/races/class2"], +["tpage-3445", "tpage-3445", 4, ["STC"], "levels/stadium/races/class2"], +["tpage-3443", "tpage-3443", 4, ["STC"], "levels/stadium/races/class2"], +["tpage-3444", "tpage-3444", 4, ["STC"], "levels/stadium/races/class2"], +["tpage-3351", "tpage-3351", 4, ["STC"], "levels/stadium/races/class2"], +["stad-c-force-field-ag", "stad-c-force-field", 4, ["STC"], "levels/stadium/races/class2"], +["stadiumc-vis", "stadiumc-vis", 4, ["STC"], "levels/stadium/races/class2"], +["strip-scenes", "strip-scenes", 3, ["STR"], "levels/strip"], +["strip-part", "strip-part", 3, ["STR"], "levels/strip"], +["strip-ocean", "strip-ocean", 3, ["STR"], "levels/strip"], +["strip-rescue", "strip-rescue", 3, ["STR"], "levels/strip"], +["strip-drop", "strip-drop", 3, ["STR"], "levels/strip"], +["strip-obs", "strip-obs", 3, ["STR"], "levels/strip"], +["chaincrate", "chaincrate", 3, ["STR"], "levels/strip"], +["tpage-787", "tpage-787", 4, ["STR"], "levels/strip"], +["tpage-789", "tpage-789", 4, ["STR"], "levels/strip"], +["tpage-788", "tpage-788", 4, ["STR"], "levels/strip"], +["tpage-786", "tpage-786", 4, ["STR"], "levels/strip"], +["tpage-1272", "tpage-1272", 4, ["STR"], "levels/strip"], +["tpage-2854", "tpage-2854", 4, ["STR"], "levels/strip"], +["flamer-ag", "flamer", 4, ["STR"], "levels/strip"], +["water-anim-strip-dark-eco-ag", "water-anim-strip-dark-eco", 4, ["STR"], "levels/strip"], +["cranecrate-ag", "cranecrate", 4, ["STR"], "levels/strip"], +["strip-game-crate-ag", "strip-game-crate", 4, ["STR"], "levels/strip"], +["drill-plat-ag", "drill-plat", 4, ["STR"], "levels/strip"], +["curtainsaw-ag", "curtainsaw", 4, ["STR"], "levels/strip"], +["fencespikes-ag", "fencespikes", 4, ["STR"], "levels/strip"], +["lgconveyor-ag", "lgconveyor", 4, ["STR"], "levels/strip"], +["pitspikes-ag", "pitspikes", 4, ["STR"], "levels/strip"], +["grunt-egg-b-ag", "grunt-egg-b", 4, ["STR"], "levels/strip"], +["grunt-egg-a-ag", "grunt-egg-a", 4, ["STR"], "levels/strip"], +["grunt-egg-d-ag", "grunt-egg-d", 4, ["STR"], "levels/strip"], +["crane-ag", "crane", 4, ["STR"], "levels/strip"], +["strip-chain-crate-ag", "strip-chain-crate", 4, ["STR"], "levels/strip"], +["grunt-egg-c-ag", "grunt-egg-c", 4, ["STR"], "levels/strip"], +["cable-ag", "cable", 4, ["STR"], "levels/strip"], +["cntrlrm-door-ag", "cntrlrm-door", 4, ["STR"], "levels/strip"], +["plasmitebomb-ag", "plasmitebomb", 4, ["STR"], "levels/strip"], +["strip-conveyor-ag", "strip-conveyor", 4, ["STR"], "levels/strip"], +["cntrlrm-button-ag", "cntrlrm-button", 4, ["STR"], "levels/strip"], +["strip-vis", "strip-vis", 4, ["STR"], "levels/strip"], +["gun-buoy", "gun-buoy", 3, ["ATO", "NESTT", "NES", "LPROTECT"], "levels/common/entities"], +["atoll-part", "atoll-part", 3, ["ATO"], "levels/atoll"], +["atoll-obs", "atoll-obs", 3, ["ATO"], "levels/atoll"], +["fodder", "fodder", 3, ["ATO", "SEB", "SWB", "RUI"], "levels/common/enemy/fodder"], +["tpage-856", "tpage-856", 4, ["ATO"], "levels/atoll"], +["tpage-858", "tpage-858", 4, ["ATO"], "levels/atoll"], +["tpage-857", "tpage-857", 4, ["ATO"], "levels/atoll"], +["tpage-855", "tpage-855", 4, ["ATO"], "levels/atoll"], +["tpage-1083", "tpage-1083", 4, ["ATO"], "levels/atoll"], +["fodder-ag-ATO", "fodder", 4, ["ATO"], "levels/atoll"], +["fodder-ag-SEW", "fodder", 4, ["SEW"], "levels/sewer"], +["fodder-ag-RUI", "fodder", 4, ["RUI"], "levels/ruins"], +["liftcat-ag", "liftcat", 4, ["ATO"], "levels/atoll"], +["atoll-windmill-ag", "atoll-windmill", 4, ["ATO"], "levels/atoll"], +["turbine-ag", "turbine", 4, ["ATO"], "levels/atoll"], +["slider-ag", "slider", 4, ["ATO"], "levels/atoll"], +["gun-buoy-ag-ATO", "gun-buoy", 4, ["ATO"], "levels/atoll"], +["gun-buoy-ag-NES-NESTT", "gun-buoy", 4, ["NESTT", "NES"], "levels/nest"], +["gun-buoy-ag-LPROTECT", "gun-buoy", 4, ["LPROTECT"], "levels/forest/lifeseed"], +["atoll-hatch-ag", "atoll-hatch", 4, ["ATO"], "levels/atoll"], +["atoll-valve-ag", "atoll-valve", 4, ["ATO"], "levels/atoll"], +["piston-ag-ATO", "piston", 4, ["ATO"], "levels/atoll"], +["piston-ag-NES-NESTT", "piston", 4, ["NESTT", "NES"], "levels/nest"], +["atollrotpipe-ag", "atollrotpipe", 4, ["ATO"], "levels/atoll"], +["atoll-mar-symbol-ag", "atoll-mar-symbol", 4, ["ATO"], "levels/atoll"], +["atoll-vis", "atoll-vis", 4, ["ATO"], "levels/atoll"], +["hal-h", "hal-h", 3, ["SEB", "SWB", "LKIDDOGE", "UNB", "CTYKORA"], "levels/undefined"], +["hal-task", "hal-task", 3, ["SEB", "SWB", "LKIDDOGE", "UNB", "CTYKORA"], "levels/undefined"], +["hal", "hal", 3, ["SEB", "SWB", "LKIDDOGE", "UNB", "CTYKORA"], "levels/undefined"], +["ruf-h", "ruf-h", 3, ["SEB", "SWB", "UNB"], "levels/sewer/escort"], +["ruf-task", "ruf-task", 3, ["SEB", "SWB", "UNB"], "levels/sewer/escort"], +["ruf", "ruf", 3, ["SEB", "SWB", "UNB"], "levels/sewer/escort"], +["ruf-states", "ruf-states", 3, ["SEB", "SWB", "UNB"], "levels/sewer/escort"], +["jinx-h", "jinx-h", 3, ["SEB", "SWB", "UNB"], "levels/sewer/escort"], +["jinx-shot", "jinx-shot", 3, ["SEB", "SWB", "UNB"], "levels/sewer/escort"], +["jinx-bomb", "jinx-bomb", 3, ["SEB", "SWB", "UNB"], "levels/sewer/escort"], +["jinx", "jinx", 3, ["SEB", "SWB", "UNB"], "levels/sewer/escort"], +["jinx-states", "jinx-states", 3, ["SEB", "SWB", "UNB"], "levels/sewer/escort"], +["mog-h", "mog-h", 3, ["SEB", "SWB", "UNB"], "levels/sewer/escort"], +["mog", "mog", 3, ["SEB", "SWB", "UNB"], "levels/sewer/escort"], +["grim-h", "grim-h", 3, ["SEB", "SWB", "UNB"], "levels/sewer/escort"], +["grim", "grim", 3, ["SEB", "SWB", "UNB"], "levels/sewer/escort"], +["sewer-part", "sewer-part", 3, ["SEB", "SWB"], "levels/sewer"], +["sewer-ocean", "sewer-ocean", 3, ["SEB", "SWB"], "levels/sewer"], +["sewer-obs", "sewer-obs", 3, ["SEB", "SWB"], "levels/sewer"], +["sewer-obs2", "sewer-obs2", 3, ["SEB", "SWB"], "levels/sewer"], +["hosehead", "hosehead", 3, ["SEB", "SWB"], "levels/sewer"], +["hosehead-fake", "hosehead-fake", 3, ["SEB", "SWB"], "levels/sewer"], +["gator", "gator", 3, ["SEB", "SWB"], "levels/sewer"], +["hal2-course", "hal2-course", 3, ["SEB", "SWB"], "levels/sewer"], +["mog2-course", "mog2-course", 3, ["SEB", "SWB"], "levels/sewer"], +["jinx2-course", "jinx2-course", 3, ["SEB", "SWB"], "levels/sewer"], +["grim2-course", "grim2-course", 3, ["SEB", "SWB"], "levels/sewer"], +["sewer-scenes", "sewer-scenes", 3, ["SEB", "SWB"], "levels/sewer"], +["sew-gunturret", "sew-gunturret", 3, ["SEB", "SWB", "PAE", "PAC"], "levels/common/entities"], +["tpage-1133", "tpage-1133", 4, ["SEB"], "levels/sewer"], +["tpage-1135", "tpage-1135", 4, ["SEB"], "levels/sewer"], +["tpage-1134", "tpage-1134", 4, ["SEB"], "levels/sewer"], +["tpage-3383", "tpage-3383", 4, ["SEB"], "levels/sewer"], +["sew-elevator-ag", "sew-elevator", 4, ["SEB", "SWB"], "levels/sewer"], +["sewerb-vis", "sewerb-vis", 4, ["SEB"], "levels/sewer"], +["tpage-2658", "tpage-2658", 4, ["LPRSNCST"], "levels/fortress/prison"], +["tpage-3246", "tpage-3246", 4, ["LPRSNCST"], "levels/fortress/prison"], +["lprsncst", "lprsncst", 4, ["LPRSNCST"], "levels/fortress/prison"], +["tpage-1372", "tpage-1372", 4, ["SWB"], "levels/sewer/escort"], +["tpage-1373", "tpage-1373", 4, ["SWB"], "levels/sewer/escort"], +["tpage-1458", "tpage-1458", 4, ["SWB"], "levels/sewer/escort"], +["sewescb-vis", "sewescb-vis", 4, ["SWB"], "levels/sewer/escort"], +["ctypower", "ctypower", 3, ["LPOWER"], "levels/power_station/power_switches"], +["tpage-3348", "tpage-3348", 4, ["LPOWER"], "levels/power_station/power_switches"], +["lpower", "lpower", 4, ["LPOWER"], "levels/power_station/power_switches"], +["youngsamos-forestb+0-ag", "youngsamos-forestb+0", 4, ["FOB"], "levels/forest/lifeseed"], +["tpage-2280", "tpage-2280", 4, ["FOB"], "levels/forest/lifeseed"], +["tpage-2574", "tpage-2574", 4, ["FOB"], "levels/forest/lifeseed"], +["tpage-2281", "tpage-2281", 4, ["FOB"], "levels/forest/lifeseed"], +["tpage-3262", "tpage-3262", 4, ["FOB"], "levels/forest/lifeseed"], +["tpage-3417", "tpage-3417", 4, ["FOB"], "levels/forest/lifeseed"], +["transport-ag-FOB", "transport", 4, ["FOB"], "levels/forest/lifeseed"], +["transport-ag-LPROTECT-NES-NESTT", "transport", 4, ["NESTT", "NES", "LPROTECT"], "levels/common/entities"], +["transport-ag-CTYKORA", "transport", 4, ["CTYKORA"], "levels/city/slums/kor"], +["life-seed-ag-FOB", "life-seed", 4, ["FOB"], "levels/forest/lifeseed"], +["life-seed-ag-SAG", "life-seed", 4, ["SAG"], "levels/ruins/hut"], +["life-seed-ag-ONINTENT", "life-seed", 4, ["ONINTENT"], "levels/city/onin_tent"], +["forestb-vis", "forestb-vis", 4, ["FOB"], "levels/forest/lifeseed"], +["ctyindb-part", "ctyindb-part", 3, ["CIB"], "levels/city/industrial"], +["ctyindb-obs", "ctyindb-obs", 3, ["CIB"], "levels/city/industrial"], +["tpage-1565", "tpage-1565", 4, ["CIB"], "levels/city/industrial"], +["tpage-1577", "tpage-1577", 4, ["CIB"], "levels/city/industrial"], +["tpage-1601", "tpage-1601", 4, ["CIB"], "levels/city/industrial"], +["tpage-1614", "tpage-1614", 4, ["CIB"], "levels/city/industrial"], +["tpage-1642", "tpage-1642", 4, ["CIB"], "levels/city/industrial"], +["ctyindb-vis", "ctyindb-vis", 4, ["CIB"], "levels/city/industrial"], +["shuttle", "shuttle", 3, ["LSHUTTLE"], "characters/underground_fighters"], +["tpage-3214", "tpage-3214", 4, ["LSHUTTLE"], "characters/underground_fighters"], +["citizen-rebel-ag", "citizen-rebel", 4, ["LSHUTTLE"], "characters/underground_fighters"], +["krew-package-ag-LSHUTTLE", "krew-package", 4, ["LSHUTTLE"], "characters/underground_fighters"], +["krew-package-ag-LPACKAGE", "krew-package", 4, ["LPACKAGE"], "level/haven/misc/delivery"], +["lshuttle", "lshuttle", 4, ["LSHUTTLE"], "characters/underground_fighters"], +["tpage-1879", "tpage-1879", 4, ["LJAKDAX"], "characters/jak_daxter"], +["ljakdax", "ljakdax", 4, ["LJAKDAX"], "characters/jak_daxter"], +["fordumpa-texture", "fordumpa-texture", 3, ["FORDUMPC", "FDA"], "levels/fortress/ammo_dump"], +["fort-robotank-turret", "fort-robotank-turret", 3, ["FORDUMPC", "FDA"], "levels/fortress/ammo_dump"], +["fort-robotank", "fort-robotank", 3, ["FORDUMPC", "FDA"], "levels/fortress/ammo_dump"], +["fordumpc-part", "fordumpc-part", 3, ["FORDUMPC"], "levels/fortress/ammo_dump"], +["fordumpc-obs", "fordumpc-obs", 3, ["FORDUMPC"], "levels/fortress/ammo_dump"], +["fortress-scenes", "fortress-scenes", 3, ["FORDUMPC"], "levels/fortress/ammo_dump"], +["tpage-1570", "tpage-1570", 4, ["FORDUMPC"], "levels/fortress/ammo_dump"], +["tpage-1573", "tpage-1573", 4, ["FORDUMPC"], "levels/fortress/ammo_dump"], +["tpage-1571", "tpage-1571", 4, ["FORDUMPC"], "levels/fortress/ammo_dump"], +["tpage-2917", "tpage-2917", 4, ["FORDUMPC"], "levels/fortress/ammo_dump"], +["tpage-2847", "tpage-2847", 4, ["FORDUMPC"], "levels/fortress/ammo_dump"], +["fort-robotank-ag", "fort-robotank", 4, ["FORDUMPC", "FDA"], "levels/fortress/ammo_dump"], +["fort-missile-target-ag", "fort-missile-target", 4, ["FORDUMPC"], "levels/fortress/ammo_dump"], +["fort-robotank-top-ag-FORDUMPC", "fort-robotank-top", 4, ["FORDUMPC"], "levels/fortress/ammo_dump"], +["fort-robotank-top-ag-FDA", "fort-robotank-top", 4, ["FDA"], "levels/fortress/ammo_dump"], +["fort-roboscreen-ag-FORDUMPC", "fort-roboscreen", 4, ["FORDUMPC"], "levels/fortress/ammo_dump"], +["fort-roboscreen-ag-FDA", "fort-roboscreen", 4, ["FDA"], "levels/fortress/ammo_dump"], +["fort-missile-ag", "fort-missile", 4, ["FORDUMPC"], "levels/fortress/ammo_dump"], +["fort-robotank-sight-ag", "fort-robotank-sight", 4, ["FORDUMPC", "FDA"], "levels/fortress/ammo_dump"], +["fort-dump-bomb-a-ag", "fort-dump-bomb-a", 4, ["FORDUMPC"], "levels/fortress/ammo_dump"], +["fordumpc", "fordumpc", 4, ["FORDUMPC"], "levels/fortress/ammo_dump"], +["tess-ltrntess+0-ag", "tess-ltrntess+0", 4, ["LTRNTESS"], "levels/hideout"], +["tpage-1764", "tpage-1764", 4, ["LTRNTESS"], "levels/hideout"], +["tpage-3254", "tpage-3254", 4, ["LTRNTESS"], "levels/hideout"], +["ltrntess", "ltrntess", 4, ["LTRNTESS"], "levels/hideout"], +["baron-widow+0-ag", "baron-widow+0", 4, ["TBO"], "levels/mars_tomb/baron"], +["tpage-1628", "tpage-1628", 4, ["TBO"], "levels/mars_tomb/baron"], +["tpage-1629", "tpage-1629", 4, ["TBO"], "levels/mars_tomb/baron"], +["tpage-2229", "tpage-2229", 4, ["TBO"], "levels/mars_tomb/baron"], +["tpage-2247", "tpage-2247", 4, ["TBO"], "levels/mars_tomb/baron"], +["tomb-boss-catwalk-ag", "tomb-boss-catwalk", 4, ["TBO"], "levels/mars_tomb/baron"], +["tomb-boss-bridge-ag", "tomb-boss-bridge", 4, ["TBO"], "levels/mars_tomb/baron"], +["widow-ag", "widow", 4, ["TBO"], "levels/mars_tomb/baron"], +["tomb-boss-pillar-ag", "tomb-boss-pillar", 4, ["TBO"], "levels/mars_tomb/baron"], +["spydroid-ag", "spydroid", 4, ["TBO", "FRB"], "levels/common/entities"], +["baron-pod-ag", "baron-pod", 4, ["TBO"], "levels/mars_tomb/baron"], +["tomb-boss-firepot-ag", "tomb-boss-firepot", 4, ["TBO"], "levels/mars_tomb/baron"], +["baron-ag-TBO", "baron", 4, ["TBO"], "levels/mars_tomb/baron"], +["baron-ag-PALBOSS", "baron", 4, ["PALBOSS"], "levels/palace/boss"], +["tomb-boss-debris-ag", "tomb-boss-debris", 4, ["TBO"], "levels/mars_tomb/baron"], +["heart-mar-ag", "heart-mar", 4, ["TBO"], "levels/mars_tomb/baron"], +["widow-bomb-ag", "widow-bomb", 4, ["TBO"], "levels/mars_tomb/baron"], +["tombboss-vis", "tombboss-vis", 4, ["TBO"], "levels/mars_tomb/baron"], +["throne-part", "throne-part", 3, ["THR"], "levels/palace/throne_room"], +["palace-scenes", "palace-scenes", 3, ["THR"], "levels/palace/throne_room"], +["tpage-2731", "tpage-2731", 4, ["THR"], "levels/palace/throne_room"], +["tpage-2733", "tpage-2733", 4, ["THR"], "levels/palace/throne_room"], +["tpage-3372", "tpage-3372", 4, ["THR"], "levels/palace/throne_room"], +["throne-throne-ag", "throne-throne", 4, ["THR"], "levels/palace/throne_room"], +["pal-throne-door-ag-THR", "pal-throne-door", 4, ["THR"], "levels/palace/throne_room"], +["pal-throne-door-ag-PAE", "pal-throne-door", 4, ["PAE"], "levels/palace/explore"], +["throne-vis", "throne-vis", 4, ["THR"], "levels/palace/throne_room"], +["intro-texture", "intro-texture", 3, ["PRI"], "levels/fortress/prison"], +["prison-part", "prison-part", 3, ["PRI"], "levels/fortress/prison"], +["prison-obs", "prison-obs", 3, ["PRI"], "levels/fortress/prison"], +["tpage-1578", "tpage-1578", 4, ["PRI"], "levels/fortress/prison"], +["tpage-1950", "tpage-1950", 4, ["PRI"], "levels/fortress/prison"], +["tpage-1579", "tpage-1579", 4, ["PRI"], "levels/fortress/prison"], +["tpage-2647", "tpage-2647", 4, ["PRI"], "levels/fortress/prison"], +["prsn-torture-ag", "prsn-torture", 4, ["PRI"], "levels/fortress/prison"], +["prsn-chair-shackle-ag", "prsn-chair-shackle", 4, ["PRI"], "levels/fortress/prison"], +["prsn-hang-cell-ag", "prsn-hang-cell", 4, ["PRI"], "levels/fortress/prison"], +["warp-gate-b-ag", "warp-gate-b", 4, ["PRI"], "levels/fortress/prison"], +["prsn-vent-fan-ag", "prsn-vent-fan", 4, ["PRI"], "levels/fortress/prison"], +["prsn-cell-door-ag", "prsn-cell-door", 4, ["PRI"], "levels/fortress/prison"], +["prison-vis", "prison-vis", 4, ["PRI"], "levels/fortress/prison"], +["kidesc-h", "kidesc-h", 3, ["LKIDDOGE"], "levels/city/kid_escort"], +["crocesc-h", "crocesc-h", 3, ["LKIDDOGE"], "levels/city/kid_escort"], +["hal4-course", "hal4-course", 3, ["LKIDDOGE"], "levels/city/kid_escort"], +["kidesc-task", "kidesc-task", 3, ["LKIDDOGE"], "levels/city/kid_escort"], +["kidesc", "kidesc", 3, ["LKIDDOGE"], "levels/city/kid_escort"], +["kidesc-states", "kidesc-states", 3, ["LKIDDOGE"], "levels/city/kid_escort"], +["crocesc-task", "crocesc-task", 3, ["LKIDDOGE"], "levels/city/kid_escort"], +["crocesc", "crocesc", 3, ["LKIDDOGE"], "levels/city/kid_escort"], +["crocesc-states", "crocesc-states", 3, ["LKIDDOGE"], "levels/city/kid_escort"], +["kidesc4-course", "kidesc4-course", 3, ["LKIDDOGE"], "levels/city/kid_escort"], +["crocesc4-course", "crocesc4-course", 3, ["LKIDDOGE"], "levels/city/kid_escort"], +["tpage-2209", "tpage-2209", 4, ["LKIDDOGE"], "levels/city/kid_escort"], +["crocadog-escort-ag", "crocadog-escort", 4, ["LKIDDOGE"], "levels/city/kid_escort"], +["kid-escort-ag", "kid-escort", 4, ["LKIDDOGE"], "levels/city/kid_escort"], +["lkiddoge", "lkiddoge", 4, ["LKIDDOGE"], "levels/city/kid_escort"], +["nest-obs", "nest-obs", 3, ["NESTT", "NES"], "levels/nest"], +["mantis", "mantis", 3, ["NESTT", "NES"], "levels/nest"], +["mammoth", "mammoth", 3, ["NESTT", "NES"], "levels/nest"], +["flying-spider", "flying-spider", 3, ["NESTT", "NES"], "levels/nest"], +["nest-ocean", "nest-ocean", 3, ["NESTT", "NES"], "levels/nest"], +["nest-scenes", "nest-scenes", 3, ["NESTT", "NES"], "levels/nest"], +["nest-part", "nest-part", 3, ["NESTT", "NES"], "levels/nest"], +["tpage-2988", "tpage-2988", 4, ["NESTT", "NES"], "levels/nest"], +["tpage-2990", "tpage-2990", 4, ["NESTT", "NES"], "levels/nest"], +["tpage-2989", "tpage-2989", 4, ["NESTT", "NES"], "levels/nest"], +["tpage-2991", "tpage-2991", 4, ["NESTT", "NES"], "levels/nest"], +["tpage-3349", "tpage-3349", 4, ["NESTT", "NES"], "levels/nest"], +["mammoth-ag", "mammoth", 4, ["NESTT", "NES"], "levels/nest"], +["flying-spider-ag", "flying-spider", 4, ["NESTT", "NES"], "levels/nest"], +["mantis-ag", "mantis", 4, ["NESTT", "NES"], "levels/nest"], +["nest-break-rocks-ag", "nest-break-rocks", 4, ["NESTT", "NES"], "levels/nest"], +["water-anim-nest-dark-eco-ag", "water-anim-nest-dark-eco", 4, ["NESTT", "NES"], "levels/nest"], +["cas-switch-ag-NES-NESTT", "cas-switch", 4, ["NESTT", "NES"], "levels/nest"], +["cas-switch-ag-CAS", "cas-switch", 4, ["CAS"], "levels/landing_pad"], +["air-train-ag-NES-NESTT", "air-train", 4, ["NESTT", "NES"], "levels/nest"], +["air-train-ag-CPO", "air-train", 4, ["CPO"], "levels/city/port"], +["air-train-ag-CAP", "air-train", 4, ["CAP"], "levels/castle/pad"], +["nestt", "nestt", 4, ["NESTT"], "levels/nest"], +["tpage-3039", "tpage-3039", 4, ["LWIDEC"], "levels/city/common"], +["tpage-3041", "tpage-3041", 4, ["LWIDEC"], "levels/city/common"], +["roboguard-ag", "roboguard", 4, ["LWIDEC", "CAS"], "levels/common/entities"], +["citizen-chick-ag", "citizen-chick", 4, ["LWIDEC", "LWIDEA"], "levels/city/common"], +["carc-ag", "carc", 4, ["LWIDEC", "LWIDEA"], "levels/city/common"], +["carb-ag", "carb", 4, ["LWIDEC", "LWIDEA"], "levels/city/common"], +["bikec-ag", "bikec", 4, ["LWIDEC", "LWIDEA"], "levels/city/common"], +["bikeb-ag", "bikeb", 4, ["LWIDEC", "LWIDEA"], "levels/city/common"], +["lwidec", "lwidec", 4, ["LWIDEC"], "levels/city/common"], +["tpage-881", "tpage-881", 4, ["SAG"], "levels/ruins/hut"], +["tpage-1131", "tpage-1131", 4, ["SAG"], "levels/ruins/hut"], +["tpage-882", "tpage-882", 4, ["SAG"], "levels/ruins/hut"], +["tpage-880", "tpage-880", 4, ["SAG"], "levels/ruins/hut"], +["ruins-tower-a-ag", "ruins-tower-a", 4, ["SAG"], "levels/ruins/hut"], +["ruins-tower-c-ag", "ruins-tower-c", 4, ["SAG"], "levels/ruins/hut"], +["ruins-tower-e-ag", "ruins-tower-e", 4, ["SAG"], "levels/ruins/hut"], +["ruins-tower-b-ag", "ruins-tower-b", 4, ["SAG"], "levels/ruins/hut"], +["ruins-tower-f-ag", "ruins-tower-f", 4, ["SAG"], "levels/ruins/hut"], +["ruins-tower-d-ag", "ruins-tower-d", 4, ["SAG"], "levels/ruins/hut"], +["ruins-tower-rp-ag", "ruins-tower-rp", 4, ["SAG"], "levels/ruins/hut"], +["sagehut-vis", "sagehut-vis", 4, ["SAG"], "levels/ruins/hut"], +["nest-texture", "nest-texture", 3, ["NEB"], "levels/nest/boss"], +["metalkor-part", "metalkor-part", 3, ["NEB"], "levels/nest/boss"], +["metalkor-setup", "metalkor-setup", 3, ["NEB"], "levels/nest/boss"], +["metalkor-states", "metalkor-states", 3, ["NEB"], "levels/nest/boss"], +["metalkor-extras", "metalkor-extras", 3, ["NEB"], "levels/nest/boss"], +["nestb-scenes", "nestb-scenes", 3, ["NEB"], "levels/nest/boss"], +["nestb-part", "nestb-part", 3, ["NEB"], "levels/nest/boss"], +["kid-nestb+0-ag", "kid-nestb+0", 4, ["NEB"], "levels/nest/boss"], +["tpage-2985", "tpage-2985", 4, ["NEB"], "levels/nest/boss"], +["tpage-2986", "tpage-2986", 4, ["NEB"], "levels/nest/boss"], +["tpage-3122", "tpage-3122", 4, ["NEB"], "levels/nest/boss"], +["tpage-3121", "tpage-3121", 4, ["NEB"], "levels/nest/boss"], +["tpage-2987", "tpage-2987", 4, ["NEB"], "levels/nest/boss"], +["tpage-3092", "tpage-3092", 4, ["NEB"], "levels/nest/boss"], +["tpage-3378", "tpage-3378", 4, ["NEB"], "levels/nest/boss"], +["metalkor-ag", "metalkor", 4, ["NEB"], "levels/nest/boss"], +["metalkor-lowtorso-ag", "metalkor-lowtorso", 4, ["NEB"], "levels/nest/boss"], +["metalkor-highres-ag", "metalkor-highres", 4, ["NEB", "COB"], "characters/high-res/metalkor"], +["metalkor-legs-ag", "metalkor-legs", 4, ["NEB"], "levels/nest/boss"], +["metalkor-explode-ag", "metalkor-explode", 4, ["NEB"], "levels/nest/boss"], +["nest-gun-parts-ag", "nest-gun-parts", 4, ["NEB"], "levels/nest/boss"], +["wasp-ag", "wasp", 4, ["NEB", "DRILLMTN"], "levels/common/enemy/metalhead_wasp"], +["kid-ag", "kid", 4, ["NEB", "CTYKORA"], "characters/kid"], +["nest-break-precipice-ag", "nest-break-precipice", 4, ["NEB"], "levels/nest/boss"], +["metalkor-bomb-ag", "metalkor-bomb", 4, ["NEB"], "levels/nest/boss"], +["metalkor-wings-ag", "metalkor-wings", 4, ["NEB"], "levels/nest/boss"], +["metalkor-egg-ag", "metalkor-egg", 4, ["NEB"], "levels/nest/boss"], +["rift-ring-in-game-ag", "rift-ring-in-game", 4, ["NEB"], "levels/nest/boss"], +["nest-unbroken-rocks-ag", "nest-unbroken-rocks", 4, ["NEB"], "levels/nest/boss"], +["metalkor-distort-ag", "metalkor-distort", 4, ["NEB"], "levels/nest/boss"], +["metalkor-rays-ag", "metalkor-rays", 4, ["NEB"], "levels/nest/boss"], +["nest-gun-elevator-ag", "nest-gun-elevator", 4, ["NEB"], "levels/nest/boss"], +["metalkor-fma-spinner-ag", "metalkor-fma-spinner", 4, ["NEB"], "levels/nest/boss"], +["nestb-tail-bound-ag", "nestb-tail-bound", 4, ["NEB"], "levels/nest/boss"], +["rift-occlude-ag", "rift-occlude", 4, ["NEB"], "levels/nest/boss"], +["nestb-vis", "nestb-vis", 4, ["NEB"], "levels/nest/boss"], +["consiteb-part", "consiteb-part", 3, ["COB"], "levels/consite"], +["tpage-3032", "tpage-3032", 4, ["COB"], "levels/consite"], +["tpage-3033", "tpage-3033", 4, ["COB"], "levels/consite"], +["tpage-3142", "tpage-3142", 4, ["COB"], "levels/consite"], +["tpage-3180", "tpage-3180", 4, ["COB"], "levels/consite"], +["tpage-3239", "tpage-3239", 4, ["COB"], "levels/consite"], +["kor-transform-ag", "kor-transform", 4, ["COB"], "levels/consite"], +["kor-break-ag", "kor-break", 4, ["COB"], "levels/consite"], +["vin-door-ctyinda-ag-COB", "vin-door-ctyinda", 4, ["COB"], "levels/consite"], +["vin-door-ctyinda-ag-CIA", "vin-door-ctyinda", 4, ["CIA"], "levels/city/industrial"], +["kor-break-ray-ag", "kor-break-ray", 4, ["COB"], "levels/consite"], +["consiteb-vis", "consiteb-vis", 4, ["COB"], "levels/consite"], +["bombbot-h", "bombbot-h", 3, ["LBOMBBOT"], "levels/common/enemy/bombots"], +["bombbot-path", "bombbot-path", 3, ["LBOMBBOT"], "levels/common/enemy/bombots"], +["bombbot", "bombbot", 3, ["LBOMBBOT"], "levels/common/enemy/bombots"], +["tpage-2751", "tpage-2751", 4, ["LBOMBBOT"], "levels/common/enemy/bombots"], +["bombbot-ag", "bombbot", 4, ["LBOMBBOT"], "levels/common/enemy/bombots"], +["lbombbot", "lbombbot", 4, ["LBOMBBOT"], "levels/common/enemy/bombots"], +["demo-obs", "demo-obs", 3, ["DEMO"], "levels/demo"], +["tpage-1872", "tpage-1872", 4, ["DEMO"], "levels/demo"], +["tpage-1876", "tpage-1876", 4, ["DEMO"], "levels/demo"], +["tpage-1868", "tpage-1868", 4, ["DEMO"], "levels/demo"], +["jak-logo-ag", "jak-logo", 4, ["DEMO", "TITLE"], "levels/demo"], +["jak-stand-ag", "jak-stand", 4, ["DEMO", "TITLE"], "levels/demo"], +["demo", "demo", 4, ["DEMO"], "levels/demo"], +["lracedf", "lracedf", 4, ["LRACEDF"], "levels/stadium/races/class1"], +["errol-chal-part", "errol-chal-part", 3, ["LERLCHAL", "LPRTRACE"], "levels/city/port/race"], +["errol-chal", "errol-chal", 3, ["LERLCHAL", "LPRTRACE"], "levels/city/port/race"], +["tpage-3159", "tpage-3159", 4, ["LERLCHAL"], "levels/city/port/race/errol"], +["tpage-3337", "tpage-3337", 4, ["LERLCHAL"], "levels/city/port/race/errol"], +["errol-racer-ag", "errol-racer", 4, ["LERLCHAL"], "levels/city/port/race/errol"], +["lerlchal", "lerlchal", 4, ["LERLCHAL"], "levels/city/port/race/errol"], +["tpage-3440", "tpage-3440", 4, ["LHIPOUT"], "levels/hideout"], +["tpage-3199", "tpage-3199", 4, ["LHIPOUT"], "levels/hideout"], +["tpage-3200", "tpage-3200", 4, ["LHIPOUT"], "levels/hideout"], +["tpage-3486", "tpage-3486", 4, ["LHIPOUT"], "levels/hideout"], +["tpage-3242", "tpage-3242", 4, ["LHIPOUT"], "levels/hideout"], +["tpage-3544", "tpage-3544", 4, ["LHIPOUT"], "levels/hideout"], +["pecker-highres-ag", "pecker-highres", 4, ["LHIPOUT", "ONINTENT"], "characters/high-res/pecker"], +["crocadog-highres-ag", "crocadog-highres", 4, ["LHIPOUT", "LYSKDCD", "TOD", "VIN"], "characters/high-res/crocadog"], +["kid-medallion-ag", "kid-medallion", 4, ["LHIPOUT"], "levels/hideout"], +["hip-bottle-c-ag-LHIPOUT", "hip-bottle-c", 4, ["LHIPOUT"], "levels/hideout"], +["hip-bottle-c-ag-LTESS", "hip-bottle-c", 4, ["LTESS"], "characters/tess"], +["hip-mug-ag-LHIPOUT", "hip-mug", 4, ["LHIPOUT"], "levels/hideout"], +["hip-mug-ag-LGUARD", "hip-mug", 4, ["LGUARD"], "characters/guards"], +["lhipout", "lhipout", 4, ["LHIPOUT"], "levels/hideout"], +["0credits-tx", "0credits-tx", 4, ["OUTROCST"], "levels/outro"], +["1credits-tx", "1credits-tx", 4, ["OUTROCST"], "levels/outro"], +["2credits-tx", "2credits-tx", 4, ["OUTROCST"], "levels/outro"], +["3credits-tx", "3credits-tx", 4, ["OUTROCST"], "levels/outro"], +["4credits-tx", "4credits-tx", 4, ["OUTROCST"], "levels/outro"], +["5credits-tx", "5credits-tx", 4, ["OUTROCST"], "levels/outro"], +["6credits-tx", "6credits-tx", 4, ["OUTROCST"], "levels/outro"], +["7credits-tx", "7credits-tx", 4, ["OUTROCST"], "levels/outro"], +["credits", "credits", 3, ["OUTROCST"], "engine/ui"], +["outro-scenes", "outro-scenes", 3, ["OUTROCST"], "levels/outro"], +["tpage-3182", "tpage-3182", 4, ["OUTROCST"], "levels/outro"], +["tpage-3183", "tpage-3183", 4, ["OUTROCST"], "levels/outro"], +["tpage-3263", "tpage-3263", 4, ["OUTROCST"], "levels/outro"], +["tpage-3513", "tpage-3513", 4, ["OUTROCST"], "levels/outro"], +["keira-highres-ag", "keira-highres", 4, ["OUTROCST", "LKEIRIFT", "LINTCSTB", "GARAGE"], "characters/high-res/keira"], +["onin-highres-ag", "onin-highres", 4, ["OUTROCST", "ONINTENT"], "characters/high-res/onin"], +["rift-break-ring-ag", "rift-break-ring", 4, ["OUTROCST"], "levels/outro"], +["precursor-ag", "precursor", 4, ["OUTROCST"], "levels/outro"], +["outrocst", "outrocst", 4, ["OUTROCST"], "levels/outro"], +["nest-vis", "nest-vis", 4, ["NES"], "levels/nest"], +["palroof-part", "palroof-part", 3, ["PAR"], "levels/palace/roof"], +["palroof-obs", "palroof-obs", 3, ["PAR"], "levels/palace/roof"], +["palboss-texture", "palboss-texture", 3, ["PAR"], "levels/palace/roof"], +["palboss-part", "palboss-part", 3, ["PAR"], "levels/palace/roof"], +["palboss-scenes", "palboss-scenes", 3, ["PAR"], "levels/palace/roof"], +["tpage-2360", "tpage-2360", 4, ["PAR"], "levels/palace/roof"], +["tpage-2363", "tpage-2363", 4, ["PAR"], "levels/palace/roof"], +["tpage-2361", "tpage-2361", 4, ["PAR"], "levels/palace/roof"], +["tpage-2362", "tpage-2362", 4, ["PAR"], "levels/palace/roof"], +["tpage-2521", "tpage-2521", 4, ["PAR"], "levels/palace/roof"], +["tpage-2746", "tpage-2746", 4, ["PAR"], "levels/palace/roof"], +["pal-prong-ag", "pal-prong", 4, ["PAR"], "levels/palace/roof"], +["pal-flip-step-ag-PAR", "pal-flip-step", 4, ["PAR"], "levels/palace/roof"], +["pal-flip-step-ag-PAC", "pal-flip-step", 4, ["PAC"], "levels/palace/cable"], +["pal-lowrez-throne-ag", "pal-lowrez-throne", 4, ["PAR"], "levels/palace/roof"], +["palroof-vis", "palroof-vis", 4, ["PAR"], "levels/palace/roof"], +["tpage-2703", "tpage-2703", 4, ["LERBRNGD"], "characters/errol_baron_guard"], +["tpage-3268", "tpage-3268", 4, ["LERBRNGD"], "characters/errol_baron_guard"], +["lerbrngd", "lerbrngd", 4, ["LERBRNGD"], "characters/errol_baron_guard"], +["tpage-1719", "tpage-1719", 4, ["MTX"], "levels/temple"], +["tpage-1721", "tpage-1721", 4, ["MTX"], "levels/temple"], +["tpage-1720", "tpage-1720", 4, ["MTX"], "levels/temple"], +["tpage-1722", "tpage-1722", 4, ["MTX"], "levels/temple"], +["tpage-3506", "tpage-3506", 4, ["MTX"], "levels/temple"], +["mtn-gear-device-ag", "mtn-gear-device", 4, ["MTX"], "levels/temple"], +["mtn-step-plat-rocks-ag", "mtn-step-plat-rocks", 4, ["MTX"], "levels/temple"], +["rhino-ag", "rhino", 4, ["MTX"], "levels/temple"], +["mtn-plat-buried-rocks-ag", "mtn-plat-buried-rocks", 4, ["MTX"], "levels/temple"], +["rhino-wall-ag", "rhino-wall", 4, ["MTX"], "levels/temple"], +["hopper-ag", "hopper", 4, ["MTX", "STADBLMP"], "levels/common/enemy"], +["water-anim-mountain-dark-eco-ag", "water-anim-mountain-dark-eco",4, ["MTX"], "levels/temple"], +["mtn-aval-rocks-ag", "mtn-aval-rocks", 4, ["MTX"], "levels/temple"], +["mtn-dice-ag", "mtn-dice", 4, ["MTX"], "levels/temple"], +["seal-of-mar-ag-MTX", "seal-of-mar", 4, ["MTX"], "levels/temple"], +["seal-of-mar-ag-LTENTOB", "seal-of-mar", 4, ["LTENTOB"], "levels/city/onin_tent"], +["seal-of-mar-ag-LPROTECT", "seal-of-mar", 4, ["LPROTECT"], "levels/forest/lifeseed"], +["mtn-dice-button-ag", "mtn-dice-button", 4, ["MTX"], "levels/temple"], +["mtn-plat-eject-ag", "mtn-plat-eject", 4, ["MTX"], "levels/temple"], +["mtn-button-ag", "mtn-button", 4, ["MTX"], "levels/temple"], +["mtn-gear-device-gear-ag-MTX", "mtn-gear-device-gear", 4, ["MTX"], "levels/temple"], +["mtn-gear-device-gear-ag-MCN", "mtn-gear-device-gear", 4, ["MCN"], "levels/temple/canyon"], +["mtn-lens-ag", "mtn-lens", 4, ["MTX", "MCN"], "levels/temple"], +["mtnext-vis", "mtnext-vis", 4, ["MTX"], "levels/temple"], +["fordumpa-part", "fordumpa-part", 3, ["FDA"], "levels/fortress/ammo_dump"], +["fordumpa-obs", "fordumpa-obs", 3, ["FDA"], "levels/fortress/ammo_dump"], +["fort-turret", "fort-turret", 3, ["FDA", "FRB"], "levels/fortress"], +["tpage-1589", "tpage-1589", 4, ["FDA"], "levels/fortress/ammo_dump"], +["tpage-1588", "tpage-1588", 4, ["FDA"], "levels/fortress/ammo_dump"], +["tpage-1590", "tpage-1590", 4, ["FDA"], "levels/fortress/ammo_dump"], +["tpage-2490", "tpage-2490", 4, ["FDA"], "levels/fortress/ammo_dump"], +["tpage-2909", "tpage-2909", 4, ["FDA"], "levels/fortress/ammo_dump"], +["fort-fence-ag", "fort-fence", 4, ["FDA"], "levels/fortress/ammo_dump"], +["fort-turret-ag", "fort-turret", 4, ["FDA", "FRB"], "levels/fortress"], +["fort-elec-switch-ag", "fort-elec-switch", 4, ["FDA"], "levels/fortress/ammo_dump"], +["fordumpa-vis", "fordumpa-vis", 4, ["FDA"], "levels/fortress/ammo_dump"], +["keira-anim+0-ag", "keira-anim+0", 4, ["LKEIRIFT"], "characters/keira_riftrider"], +["tpage-3023", "tpage-3023", 4, ["LKEIRIFT"], "characters/keira_riftrider"], +["tpage-3024", "tpage-3024", 4, ["LKEIRIFT"], "characters/keira_riftrider"], +["lkeirift", "lkeirift", 4, ["LKEIRIFT"], "characters/keira_riftrider"], +["daxter-mole+0-ag", "daxter-mole+0", 4, ["LWHACK"], "levels/hiphog"], +["tess-lwhack+0-ag", "tess-lwhack+0", 4, ["LWHACK"], "levels/hiphog"], +["whack", "whack", 3, ["LWHACK"], "levels/hiphog"], +["tpage-2889", "tpage-2889", 4, ["LWHACK"], "levels/hiphog"], +["tpage-3256", "tpage-3256", 4, ["LWHACK"], "levels/hiphog"], +["grunt-fma-ag-LWHACK", "grunt-fma", 4, ["LWHACK"], "levels/hiphog"], +["grunt-fma-ag-FORDUMPD", "grunt-fma", 4, ["FORDUMPD"], "levels/fortress/ammo_dump"], +["grunt-fma-ag-UND", "grunt-fma", 4, ["UND"], "levels/underport"], +["hip-mole-ag", "hip-mole", 4, ["LWHACK"], "levels/hiphog"], +["big-bopper-ag", "big-bopper", 4, ["LWHACK"], "levels/hiphog"], +["lwhack", "lwhack", 4, ["LWHACK"], "levels/hiphog"], +["tpage-3188", "tpage-3188", 4, ["LJKDXASH"], "characters/jak_daxter_ashelin"], +["tpage-3244", "tpage-3244", 4, ["LJKDXASH"], "characters/jak_daxter_ashelin"], +["ljkdxash", "ljkdxash", 4, ["LJKDXASH"], "characters/jak_daxter_ashelin"], +["roboguard-level", "roboguard-level", 3, ["CAS"], "levels/landing_pad"], +["castle-texture", "castle-texture", 3, ["CAS"], "levels/landing_pad"], +["castle-obs", "castle-obs", 3, ["CAS"], "levels/landing_pad"], +["castle-part", "castle-part", 3, ["CAS"], "levels/landing_pad"], +["tpage-2865", "tpage-2865", 4, ["CAS"], "levels/landing_pad"], +["tpage-2867", "tpage-2867", 4, ["CAS"], "levels/landing_pad"], +["tpage-2866", "tpage-2866", 4, ["CAS"], "levels/landing_pad"], +["tpage-3124", "tpage-3124", 4, ["CAS"], "levels/landing_pad"], +["tpage-2970", "tpage-2970", 4, ["CAS"], "levels/landing_pad"], +["cas-rot-bridge-ag", "cas-rot-bridge", 4, ["CAS"], "levels/landing_pad"], +["cas-electric-fence-ag", "cas-electric-fence", 4, ["CAS"], "levels/landing_pad"], +["cas-rot-blade-ag", "cas-rot-blade", 4, ["CAS"], "levels/landing_pad"], +["cas-conveyor-switch-ag", "cas-conveyor-switch", 4, ["CAS"], "levels/landing_pad"], +["cas-robot-door-ag", "cas-robot-door", 4, ["CAS"], "levels/landing_pad"], +["cas-trapdoor-ag", "cas-trapdoor", 4, ["CAS"], "levels/landing_pad"], +["cas-chain-plat-ag", "cas-chain-plat", 4, ["CAS"], "levels/landing_pad"], +["cas-elevator-ag", "cas-elevator", 4, ["CAS"], "levels/landing_pad"], +["cas-button-ag", "cas-button", 4, ["CAS"], "levels/landing_pad"], +["cas-flag-a-ag", "cas-flag-a", 4, ["CAS"], "levels/landing_pad"], +["cas-flag-b-ag", "cas-flag-b", 4, ["CAS"], "levels/landing_pad"], +["castle-vis", "castle-vis", 4, ["CAS"], "levels/landing_pad"], +["consite-texture", "consite-texture", 3, ["COA"], "levels/consite"], +["consite-part", "consite-part", 3, ["COA"], "levels/consite"], +["consite-scenes", "consite-scenes", 3, ["COA"], "levels/consite"], +["consite-obs", "consite-obs", 3, ["COA"], "levels/consite"], +["baron-consite+0-ag", "baron-consite+0", 4, ["COA"], "levels/consite"], +["tpage-3030", "tpage-3030", 4, ["COA"], "levels/consite"], +["tpage-3031", "tpage-3031", 4, ["COA"], "levels/consite"], +["tpage-3029", "tpage-3029", 4, ["COA"], "levels/consite"], +["tpage-3141", "tpage-3141", 4, ["COA"], "levels/consite"], +["consite-break-scaffold-a-ag", "consite-break-scaffold-a", 4, ["COA"], "levels/consite"], +["consite-break-scaffold-ag", "consite-break-scaffold", 4, ["COA"], "levels/consite"], +["consite-bomb-elevator-ag", "consite-bomb-elevator", 4, ["COA"], "levels/consite"], +["consite-silo-doors-ag", "consite-silo-doors", 4, ["COA"], "levels/consite"], +["bomb-trigger-ag", "bomb-trigger", 4, ["COA"], "levels/consite"], +["consite-vis", "consite-vis", 4, ["COA"], "levels/consite"], +["tpage-1862", "tpage-1862", 4, ["LTESS"], "characters/tess"], +["tpage-1756", "tpage-1756", 4, ["LTESS"], "characters/tess"], +["tpage-2881", "tpage-2881", 4, ["LTESS"], "characters/tess"], +["tpage-3241", "tpage-3241", 4, ["LTESS"], "characters/tess"], +["hip-bottle-b-ag", "hip-bottle-b", 4, ["LTESS"], "characters/tess"], +["ltess", "ltess", 4, ["LTESS"], "characters/tess"], +["tpage-2444", "tpage-2444", 4, ["CFA"], "levels/city/farm"], +["tpage-2445", "tpage-2445", 4, ["CFA"], "levels/city/farm"], +["tpage-2645", "tpage-2645", 4, ["CFA"], "levels/city/farm"], +["tpage-2644", "tpage-2644", 4, ["CFA"], "levels/city/farm"], +["tpage-2744", "tpage-2744", 4, ["CFA"], "levels/city/farm"], +["tpage-2791", "tpage-2791", 4, ["CFA"], "levels/city/farm"], +["tpage-2441", "tpage-2441", 4, ["CFA"], "levels/city/farm"], +["ctyfarma-vis", "ctyfarma-vis", 4, ["CFA"], "levels/city/farm"], +["tpage-2525", "tpage-2525", 4, ["TOMBEXT"], "levels/mars_tomb/baron"], +["tomb-boss-explode-ag", "tomb-boss-explode", 4, ["TOMBEXT"], "levels/mars_tomb/baron"], +["tombext", "tombext", 4, ["TOMBEXT"], "levels/mars_tomb/baron"], +["tpage-2691", "tpage-2691", 4, ["LCGUARD"], "characters/guards"], +["lcguard", "lcguard", 4, ["LCGUARD"], "characters/guards"], +["target-indax", "target-indax", 3, ["TOE"], "levels/mars_tomb/left/chase"], +["jak-indax+0-ag", "jak-indax+0", 4, ["TOE"], "levels/mars_tomb/left/chase"], +["tomb-boulder", "tomb-boulder", 3, ["TOE"], "levels/mars_tomb/left/chase"], +["tpage-2374", "tpage-2374", 4, ["TOE"], "levels/mars_tomb/left/chase"], +["tpage-2375", "tpage-2375", 4, ["TOE"], "levels/mars_tomb/left/chase"], +["tpage-2376", "tpage-2376", 4, ["TOE"], "levels/mars_tomb/left/chase"], +["tomb-boulder-ag", "tomb-boulder", 4, ["TOE"], "levels/mars_tomb/left/chase"], +["tomb-plat-pillar-ag", "tomb-plat-pillar", 4, ["TOE"], "levels/mars_tomb/left/chase"], +["spider-eyes-ag", "spider-eyes", 4, ["TOE"], "levels/mars_tomb/left/chase"], +["tomb-bounce-web-ag", "tomb-bounce-web", 4, ["TOE"], "levels/mars_tomb/left/chase"], +["tombe-vis", "tombe-vis", 4, ["TOE"], "levels/mars_tomb/left/chase"], +["squid-part", "squid-part", 3, ["PALBOSS"], "levels/palace/boss"], +["squid-setup", "squid-setup", 3, ["PALBOSS"], "levels/palace/boss"], +["squid-extras", "squid-extras", 3, ["PALBOSS"], "levels/palace/boss"], +["squid-states", "squid-states", 3, ["PALBOSS"], "levels/palace/boss"], +["baron-squid+0-ag", "baron-squid+0", 4, ["PALBOSS"], "levels/palace/boss"], +["tpage-2679", "tpage-2679", 4, ["PALBOSS"], "levels/palace/boss"], +["tpage-2680", "tpage-2680", 4, ["PALBOSS"], "levels/palace/boss"], +["tpage-2797", "tpage-2797", 4, ["PALBOSS"], "levels/palace/boss"], +["tpage-3419", "tpage-3419", 4, ["PALBOSS"], "levels/palace/boss"], +["squid-ag", "squid", 4, ["PALBOSS"], "levels/palace/boss"], +["squid-break-ag", "squid-break", 4, ["PALBOSS"], "levels/palace/boss"], +["squid-collision-ag", "squid-collision", 4, ["PALBOSS"], "levels/palace/boss"], +["palboss", "palboss", 4, ["PALBOSS"], "levels/palace/boss"], +["fort-floor-spike", "fort-floor-spike", 3, ["FRB", "FDB"], "levels/common/entities"], +["forrescb-part", "forrescb-part", 3, ["FRB"], "levels/fortress/rescue"], +["forrescb-obs", "forrescb-obs", 3, ["FRB"], "levels/fortress/rescue"], +["spydroid", "spydroid", 3, ["FRB", "TOA"], "levels/common/entities"], +["tpage-3172", "tpage-3172", 4, ["FRB"], "levels/fortress/rescue"], +["tpage-3175", "tpage-3175", 4, ["FRB"], "levels/fortress/rescue"], +["tpage-3173", "tpage-3173", 4, ["FRB"], "levels/fortress/rescue"], +["tpage-3174", "tpage-3174", 4, ["FRB"], "levels/fortress/rescue"], +["fort-elec-belt-ag", "fort-elec-belt", 4, ["FRB"], "levels/fortress/rescue"], +["forrescb-vis", "forrescb-vis", 4, ["FRB"], "levels/fortress/rescue"], +["palent-part", "palent-part", 3, ["PAE"], "levels/palace/explore"], +["pal-obs", "pal-obs", 3, ["PAE", "PAC"], "levels/palace"], +["tpage-3169", "tpage-3169", 4, ["PAE"], "levels/palace/explore"], +["tpage-3171", "tpage-3171", 4, ["PAE"], "levels/palace/explore"], +["tpage-3170", "tpage-3170", 4, ["PAE"], "levels/palace/explore"], +["tpage-3168", "tpage-3168", 4, ["PAE"], "levels/palace/explore"], +["palent-turret-ag", "palent-turret", 4, ["PAE"], "levels/palace/explore"], +["pal-breakable-window-ag", "pal-breakable-window", 4, ["PAE"], "levels/palace/explore"], +["pal-grind-ring-ag", "pal-grind-ring", 4, ["PAE"], "levels/palace/explore"], +["pal-grind-ring-center-ag", "pal-grind-ring-center", 4, ["PAE"], "levels/palace/explore"], +["pal-falling-plat-ag-PAE", "pal-falling-plat", 4, ["PAE"], "levels/palace/explore"], +["pal-falling-plat-ag-PAC", "pal-falling-plat", 4, ["PAC"], "levels/palace/cable"], +["pal-ent-door-ag", "pal-ent-door", 4, ["PAE"], "levels/palace/explore"], +["pal-ent-glass-ag", "pal-ent-glass", 4, ["PAE"], "levels/palace/explore"], +["palent-vis", "palent-vis", 4, ["PAE"], "levels/palace/explore"], +["title-obs", "title-obs", 3, ["TITLE"], "levels/title"], +["tpage-3091", "tpage-3091", 4, ["TITLE"], "levels/title"], +["tpage-3090", "tpage-3090", 4, ["TITLE"], "levels/title"], +["title", "title", 4, ["TITLE"], "levels/title"], +["tpage-1574", "tpage-1574", 4, ["FORDUMPD"], "levels/fortress/ammo_dump"], +["fordumpd", "fordumpd", 4, ["FORDUMPD"], "levels/fortress/ammo_dump"], +["tpage-2290", "tpage-2290", 4, ["D3A"], "levels/dig/lurker_village"], +["tpage-2292", "tpage-2292", 4, ["D3A"], "levels/dig/lurker_village"], +["tpage-2291", "tpage-2291", 4, ["D3A"], "levels/dig/lurker_village"], +["tpage-2782", "tpage-2782", 4, ["D3A"], "levels/dig/lurker_village"], +["tpage-3361", "tpage-3361", 4, ["D3A"], "levels/dig/lurker_village"], +["grenadier-ag", "grenadier", 4, ["D3A", "RUI"], "levels/common/enemy/metalhead_slinger"], +["dig-balloon-lurker-ag", "dig-balloon-lurker", 4, ["D3A"], "levels/dig/lurker_village"], +["dig-spikey-sphere-ag", "dig-spikey-sphere", 4, ["D3A"], "levels/dig/lurker_village"], +["dig-totem-ag", "dig-totem", 4, ["D3A"], "levels/dig/lurker_village"], +["dig-wheel-step-ag", "dig-wheel-step", 4, ["D3A"], "levels/dig/lurker_village"], +["dig-spikey-step-ag", "dig-spikey-step", 4, ["D3A"], "levels/dig/lurker_village"], +["dig-stomp-block-ag", "dig-stomp-block", 4, ["D3A"], "levels/dig/lurker_village"], +["dig-totem-fish-ag", "dig-totem-fish", 4, ["D3A"], "levels/dig/lurker_village"], +["seal-of-mar-base-ag", "seal-of-mar-base", 4, ["D3A"], "levels/dig/lurker_village"], +["dig-tipping-rock-ag", "dig-tipping-rock", 4, ["D3A"], "levels/dig/lurker_village"], +["dig-log-ag", "dig-log", 4, ["D3A"], "levels/dig/lurker_village"], +["dig-spikey-sphere-door-ag", "dig-spikey-sphere-door", 4, ["D3A"], "levels/dig/lurker_village"], +["dig-button-ag", "dig-button", 4, ["D3A"], "levels/dig/lurker_village"], +["dig3a-vis", "dig3a-vis", 4, ["D3A"], "levels/dig/lurker_village"], +["jak-mech+0-ag", "jak-mech+0", 4, ["DRILLMTN", "UNB", "RUI"], "levels/target/mech_suit"], +["grunt-mech-anims+0-ag-DRILLMTN", "grunt-mech-anims+0", 4, ["DRILLMTN"], "levels/drill_platform/bg_mountain"], +["grunt-mech-anims+0-ag-RUI-UNB", "grunt-mech-anims+0", 4, ["UNB", "RUI"], "levels/target/mech_suit"], +["mech-part", "mech-part", 3, ["DRILLMTN", "UNB", "RUI"], "levels/target/mech_suit"], +["mech", "mech", 3, ["DRILLMTN", "UNB", "RUI"], "engine/target/mech_suit"], +["target-mech", "target-mech", 3, ["DRILLMTN", "UNB", "RUI"], "levels/target/mech_suit"], +["mech-states", "mech-states", 3, ["DRILLMTN", "UNB", "RUI"], "levels/target/mech_suit"], +["grunt-mech", "grunt-mech", 3, ["DRILLMTN", "UNB", "RUI"], "levels/target/mech_suit"], +["tpage-1877", "tpage-1877", 4, ["DRILLMTN"], "levels/drill_platform/bg_mountain"], +["tpage-2535", "tpage-2535", 4, ["DRILLMTN"], "levels/drill_platform/bg_mountain"], +["tpage-2624", "tpage-2624", 4, ["DRILLMTN"], "levels/drill_platform/bg_mountain"], +["drill-top-break-ag", "drill-top-break", 4, ["DRILLMTN"], "levels/drill_platform/bg_mountain"], +["drill-barons-ship-ag", "drill-barons-ship", 4, ["DRILLMTN"], "levels/drill_platform/bg_mountain"], +["drill-control-panel-ag", "drill-control-panel", 4, ["DRILLMTN"], "levels/drill_platform/bg_mountain"], +["drill-crane-ag", "drill-crane", 4, ["DRILLMTN"], "levels/drill_platform/bg_mountain"], +["drill-drill-ag", "drill-drill", 4, ["DRILLMTN"], "levels/drill_platform/bg_mountain"], +["drill-lift-ag", "drill-lift", 4, ["DRILLMTN"], "levels/drill_platform/bg_mountain"], +["drill-elevator-doors-ag", "drill-elevator-doors", 4, ["DRILLMTN"], "levels/drill_platform/bg_mountain"], +["drill-moving-staircase-ag", "drill-moving-staircase", 4, ["DRILLMTN"], "levels/drill_platform/bg_mountain"], +["drillmtn", "drillmtn", 4, ["DRILLMTN"], "levels/drill_platform/bg_mountain"], +["palcab-part", "palcab-part", 3, ["PAC"], "levels/palace/cable"], +["palcab-obs", "palcab-obs", 3, ["PAC"], "levels/palace/cable"], +["searchlight", "searchlight", 3, ["PAC", "CWI"], "levels/city/common"], +["tpage-2354", "tpage-2354", 4, ["PAC"], "levels/palace/cable"], +["tpage-2357", "tpage-2357", 4, ["PAC"], "levels/palace/cable"], +["tpage-2355", "tpage-2355", 4, ["PAC"], "levels/palace/cable"], +["tpage-2356", "tpage-2356", 4, ["PAC"], "levels/palace/cable"], +["tpage-3371", "tpage-3371", 4, ["PAC"], "levels/palace/cable"], +["tpage-2619", "tpage-2619", 4, ["PAC"], "levels/palace/cable"], +["pal-gun-turret-ag", "pal-gun-turret", 4, ["PAC"], "levels/palace/cable"], +["pal-electric-fan-ag", "pal-electric-fan", 4, ["PAC"], "levels/palace/cable"], +["pal-cable-nut-ag", "pal-cable-nut", 4, ["PAC"], "levels/palace/cable"], +["pal-rot-gun-ag", "pal-rot-gun", 4, ["PAC"], "levels/palace/cable"], +["searchlight-ag-PAC", "searchlight", 4, ["PAC"], "levels/palace/cable"], +["searchlight-ag-LCITYLOW", "searchlight", 4, ["LCITYLOW"], "levels/city/low-quality"], +["searchlight-ag-CWI", "searchlight", 4, ["CWI"], "levels/city/common"], +["searchlight-ag-CASCITY", "searchlight", 4, ["CASCITY"], "levels/city/low-quality"], +["palcab-vis", "palcab-vis", 4, ["PAC"], "levels/palace/cable"], +["tpage-3073", "tpage-3073", 4, ["LTENTOB"], "levels/city/onin_tent"], +["tpage-3112", "tpage-3112", 4, ["LTENTOB"], "levels/city/onin_tent"], +["tpage-3250", "tpage-3250", 4, ["LTENTOB"], "levels/city/onin_tent"], +["kor-highres-ag", "kor-highres", 4, ["LTENTOB", "LTRNKRKD", "TOD", "VIN", "CTYKORA"], "characters/high-res/kor"], +["ltentob", "ltentob", 4, ["LTENTOB"], "levels/city/onin_tent"], +["lracebf", "lracebf", 4, ["LRACEBF"], "levels/stadium/races/class3"], +["protect", "protect", 3, ["LPROTECT"], "levels/forest/lifeseed"], +["tpage-2869", "tpage-2869", 4, ["LPROTECT"], "levels/forest/lifeseed"], +["seal-of-mar-top-ag", "seal-of-mar-top", 4, ["LPROTECT"], "levels/forest/lifeseed"], +["lprotect", "lprotect", 4, ["LPROTECT"], "levels/forest/lifeseed"], +["forexita-part", "forexita-part", 3, ["FEA"], "levels/fortress/exit"], +["forexita-obs", "forexita-obs", 3, ["FEA"], "levels/fortress/exit"], +["tpage-1580", "tpage-1580", 4, ["FEA"], "levels/fortress/exit"], +["tpage-1583", "tpage-1583", 4, ["FEA"], "levels/fortress/exit"], +["tpage-1581", "tpage-1581", 4, ["FEA"], "levels/fortress/exit"], +["fort-lift-plat-ag", "fort-lift-plat", 4, ["FEA"], "levels/fortress/exit"], +["forexita-vis", "forexita-vis", 4, ["FEA"], "levels/fortress/exit"], +["onintent-part", "onintent-part", 3, ["ONINTENT"], "levels/city/onin_tent"], +["onintent-scenes", "onintent-scenes", 3, ["ONINTENT"], "levels/city/onin_tent"], +["onin-game", "onin-game", 3, ["ONINTENT"], "levels/city/onin_tent"], +["onin-game+0-ag", "onin-game+0", 4, ["ONINTENT"], "levels/city/onin_tent"], +["tpage-1031", "tpage-1031", 4, ["ONINTENT"], "levels/city/onin_tent"], +["tpage-1183", "tpage-1183", 4, ["ONINTENT"], "levels/city/onin_tent"], +["tpage-2676", "tpage-2676", 4, ["ONINTENT"], "levels/city/onin_tent"], +["tpage-1035", "tpage-1035", 4, ["ONINTENT"], "levels/city/onin_tent"], +["onin-brain-ag", "onin-brain", 4, ["ONINTENT"], "levels/city/onin_tent"], +["son-of-particleman-ag", "son-of-particleman", 4, ["ONINTENT"], "levels/city/onin_tent"], +["onintent", "onintent", 4, ["ONINTENT"], "levels/city/onin_tent"], +["stadiumb-texture", "stadiumb-texture", 3, ["STA"], "levels/stadium"], +["stadium-part", "stadium-part", 3, ["STA"], "levels/stadium"], +["stadiumb-part", "stadiumb-part", 3, ["STA"], "levels/stadium"], +["stadium-obs", "stadium-obs", 3, ["STA"], "levels/stadium"], +["stadium-scenes", "stadium-scenes", 3, ["STA"], "levels/stadium"], +["tpage-2423", "tpage-2423", 4, ["STA"], "levels/stadium"], +["tpage-2426", "tpage-2426", 4, ["STA"], "levels/stadium"], +["tpage-2424", "tpage-2424", 4, ["STA"], "levels/stadium"], +["tpage-2575", "tpage-2575", 4, ["STA"], "levels/stadium"], +["tpage-1641", "tpage-1641", 4, ["STA"], "levels/stadium"], +["water-anim-stadium-ag", "water-anim-stadium", 4, ["STA"], "levels/stadium"], +["gar-door-ag", "gar-door", 4, ["STA"], "levels/stadium"], +["stadium-vis", "stadium-vis", 4, ["STA"], "levels/stadium"], +["ctygenc-part", "ctygenc-part", 3, ["CGC"], "levels/city/generic"], +["tpage-1605", "tpage-1605", 4, ["CGC"], "levels/city/generic"], +["tpage-2285", "tpage-2285", 4, ["CGC"], "levels/city/generic"], +["tpage-1612", "tpage-1612", 4, ["CGC"], "levels/city/generic"], +["tpage-1639", "tpage-1639", 4, ["CGC"], "levels/city/generic"], +["ctyn-lamp-ag-CGC", "ctyn-lamp", 4, ["CGC"], "levels/city/generic"], +["ctyn-lamp-ag-CGA", "ctyn-lamp", 4, ["CGA"], "levels/city/generic"], +["ctygenc-vis", "ctygenc-vis", 4, ["CGC"], "levels/city/generic"], +["ctymark-obs", "ctymark-obs", 3, ["CMA", "CMB"], "levels/city/market"], +["ctymarka-part", "ctymarka-part", 3, ["CMA", "CMB"], "levels/city/market"], +["ctymarkb-part", "ctymarkb-part", 3, ["CMA", "CMB"], "levels/city/market"], +["tpage-2739", "tpage-2739", 4, ["CMA"], "levels/city/market/west"], +["tpage-2743", "tpage-2743", 4, ["CMA"], "levels/city/market/west"], +["tpage-2740", "tpage-2740", 4, ["CMA"], "levels/city/market/west"], +["tpage-2741", "tpage-2741", 4, ["CMA"], "levels/city/market/west"], +["tpage-2742", "tpage-2742", 4, ["CMA"], "levels/city/market/west"], +["tpage-1615", "tpage-1615", 4, ["CMA"], "levels/city/market/west"], +["tpage-1643", "tpage-1643", 4, ["CMA"], "levels/city/market/west"], +["market-sack-b-ag-CMA", "market-sack-b", 4, ["CMA"], "levels/city/market/west"], +["market-sack-b-ag-CMB", "market-sack-b", 4, ["CMB"], "levels/city/market/east"], +["market-sack-a-ag", "market-sack-a", 4, ["CMA", "CMB"], "levels/city/market"], +["market-crate-ag", "market-crate", 4, ["CMA", "CMB"], "levels/city/market"], +["market-basket-b-ag", "market-basket-b", 4, ["CMA", "CMB"], "levels/city/market"], +["market-basket-a-ag", "market-basket-a", 4, ["CMA", "CMB"], "levels/city/market"], +["ctymarka-vis", "ctymarka-vis", 4, ["CMA"], "levels/city/market/west"], +["fordumpb-obs", "fordumpb-obs", 3, ["FDB"], "levels/fortress/ammo_dump"], +["fordumpb-part", "fordumpb-part", 3, ["FDB"], "levels/fortress/ammo_dump"], +["tpage-1592", "tpage-1592", 4, ["FDB"], "levels/fortress/ammo_dump"], +["tpage-1621", "tpage-1621", 4, ["FDB"], "levels/fortress/ammo_dump"], +["tpage-1593", "tpage-1593", 4, ["FDB"], "levels/fortress/ammo_dump"], +["fort-plat-orbit-ag", "fort-plat-orbit", 4, ["FDB"], "levels/fortress/ammo_dump"], +["fort-floor-spike-c-ag", "fort-floor-spike-c", 4, ["FDB"], "levels/fortress/ammo_dump"], +["fort-floor-spike-b-ag", "fort-floor-spike-b", 4, ["FDB"], "levels/fortress/ammo_dump"], +["fort-plat-shuttle-ag", "fort-plat-shuttle", 4, ["FDB"], "levels/fortress/ammo_dump"], +["fort-conveyor-ag", "fort-conveyor", 4, ["FDB"], "levels/fortress/ammo_dump"], +["fordumpb-vis", "fordumpb-vis", 4, ["FDB"], "levels/fortress/ammo_dump"], +["skatea-part", "skatea-part", 3, ["SKA"], "levels/stadium/jetboard"], +["skatea-obs", "skatea-obs", 3, ["SKA"], "levels/stadium/jetboard"], +["tpage-2992", "tpage-2992", 4, ["SKA"], "levels/stadium/jetboard"], +["tpage-3131", "tpage-3131", 4, ["SKA"], "levels/stadium/jetboard"], +["tpage-2995", "tpage-2995", 4, ["SKA"], "levels/stadium/jetboard"], +["tpage-3573", "tpage-3573", 4, ["SKA"], "levels/stadium/jetboard"], +["skate-training-ramp-ag", "skate-training-ramp", 4, ["SKA"], "levels/stadium/jetboard"], +["skatea-jump-pad-ag", "skatea-jump-pad", 4, ["SKA"], "levels/stadium/jetboard"], +["skatea-floating-ring-ag", "skatea-floating-ring", 4, ["SKA"], "levels/stadium/jetboard"], +["skate-gate-ag", "skate-gate", 4, ["SKA"], "levels/stadium/jetboard"], +["skatea-vis", "skatea-vis", 4, ["SKA"], "levels/stadium/jetboard"], +["kid-ltrnkrkd+0-ag", "kid-ltrnkrkd+0", 4, ["LTRNKRKD"], "levels/hideout"], +["tpage-1773", "tpage-1773", 4, ["LTRNKRKD"], "levels/hideout"], +["tpage-3253", "tpage-3253", 4, ["LTRNKRKD"], "levels/hideout"], +["ltrnkrkd", "ltrnkrkd", 4, ["LTRNKRKD"], "levels/hideout"], +["ctyinda-part", "ctyinda-part", 3, ["CIA"], "levels/city/industrial"], +["ctyinda-obs", "ctyinda-obs", 3, ["CIA"], "levels/city/industrial"], +["tpage-1561", "tpage-1561", 4, ["CIA"], "levels/city/industrial"], +["tpage-1562", "tpage-1562", 4, ["CIA"], "levels/city/industrial"], +["tpage-1361", "tpage-1361", 4, ["CIA"], "levels/city/industrial"], +["tpage-1640", "tpage-1640", 4, ["CIA"], "levels/city/industrial"], +["ctyinda-vis", "ctyinda-vis", 4, ["CIA"], "levels/city/industrial"], +["tpage-1596", "tpage-1596", 4, ["TOB"], "levels/mars_tomb/left"], +["tpage-1597", "tpage-1597", 4, ["TOB"], "levels/mars_tomb/left"], +["tomb-stair-block-ag", "tomb-stair-block", 4, ["TOB"], "levels/mars_tomb/left"], +["water-anim-tomb-dark-eco-ag", "water-anim-tomb-dark-eco", 4, ["TOB"], "levels/mars_tomb/left"], +["tomb-elevator-ag", "tomb-elevator", 4, ["TOB"], "levels/mars_tomb/left"], +["tomb-plat-wall-ag", "tomb-plat-wall", 4, ["TOB"], "levels/mars_tomb/left"], +["tomb-stair-block-spikes-ag", "tomb-stair-block-spikes", 4, ["TOB"], "levels/mars_tomb/left"], +["tomb-boulder-door-ag", "tomb-boulder-door", 4, ["TOB"], "levels/mars_tomb/left"], +["tomb-move-swing-pole-ag", "tomb-move-swing-pole", 4, ["TOB"], "levels/mars_tomb/left"], +["tombb-vis", "tombb-vis", 4, ["TOB"], "levels/mars_tomb/left"], +["lracedb", "lracedb", 4, ["LRACEDB"], "levels/common/races"], +["tpage-2662", "tpage-2662", 4, ["LDJAKBRN"], "characters/jak/intro_clothes"], +["tpage-2657", "tpage-2657", 4, ["LDJAKBRN"], "characters/jak/intro_clothes"], +["tpage-3094", "tpage-3094", 4, ["LDJAKBRN"], "characters/jak/intro_clothes"], +["jak-highres-prison-ag", "jak-highres-prison", 4, ["LDJAKBRN"], "characters/jak/intro_clothes"], +["prsn-daxter-plat-ag", "prsn-daxter-plat", 4, ["LDJAKBRN"], "characters/jak/intro_clothes"], +["jak-clothes-ag", "jak-clothes", 4, ["LDJAKBRN"], "characters/jak/intro_clothes"], +["ldjakbrn", "ldjakbrn", 4, ["LDJAKBRN"], "characters/jak/intro_clothes"], +["tomb-part", "tomb-part", 3, ["TOA"], "levels/mars_tomb"], +["tomb-obs", "tomb-obs", 3, ["TOA"], "levels/mars_tomb"], +["tomb-water", "tomb-water", 3, ["TOA"], "levels/mars_tomb"], +["tomb-beetle", "tomb-beetle", 3, ["TOA"], "levels/mars_tomb"], +["widow-part", "widow-part", 3, ["TOA"], "levels/mars_tomb"], +["widow-baron", "widow-baron", 3, ["TOA"], "levels/mars_tomb"], +["widow-extras", "widow-extras", 3, ["TOA"], "levels/mars_tomb"], +["widow-more-extras", "widow-more-extras", 3, ["TOA"], "levels/mars_tomb"], +["widow", "widow", 3, ["TOA"], "levels/mars_tomb"], +["widow2", "widow2", 3, ["TOA"], "levels/mars_tomb"], +["monster-frog", "monster-frog", 3, ["TOA"], "levels/mars_tomb"], +["tomb-scenes", "tomb-scenes", 3, ["TOA"], "levels/mars_tomb"], +["tpage-1594", "tpage-1594", 4, ["TOA"], "levels/mars_tomb"], +["tpage-1595", "tpage-1595", 4, ["TOA"], "levels/mars_tomb"], +["tpage-1831", "tpage-1831", 4, ["TOA"], "levels/mars_tomb"], +["tpage-1467", "tpage-1467", 4, ["TOA"], "levels/mars_tomb"], +["monster-frog-ag", "monster-frog", 4, ["TOA"], "levels/mars_tomb"], +["tomb-boss-door-ag", "tomb-boss-door", 4, ["TOA"], "levels/mars_tomb"], +["tomb-mar-door-ag-TOA", "tomb-mar-door", 4, ["TOA"], "levels/mars_tomb"], +["tomb-mar-door-ag-TOD", "tomb-mar-door", 4, ["TOD"], "levels/mars_tomb/entrance"], +["tomb-plat-return-ag", "tomb-plat-return", 4, ["TOA"], "levels/mars_tomb"], +["tomba-vis", "tomba-vis", 4, ["TOA"], "levels/mars_tomb"], +["tpage-2956", "tpage-2956", 4, ["STADBLMP"], "levels/city/stadium/defend"], +["tpage-2957", "tpage-2957", 4, ["STADBLMP"], "levels/city/stadium/defend"], +["tpage-2958", "tpage-2958", 4, ["STADBLMP"], "levels/city/stadium/defend"], +["tpage-3280", "tpage-3280", 4, ["STADBLMP"], "levels/city/stadium/defend"], +["tpage-3457", "tpage-3457", 4, ["STADBLMP"], "levels/city/stadium/defend"], +["tpage-3418", "tpage-3418", 4, ["STADBLMP"], "levels/city/stadium/defend"], +["samos-ag", "samos", 4, ["STADBLMP"], "levels/city/stadium/defend"], +["keira-ag", "keira", 4, ["STADBLMP"], "levels/city/stadium/defend"], +["brutter-balloon-ag", "brutter-balloon", 4, ["STADBLMP"], "levels/city/stadium/defend"], +["brutter-low-ag", "brutter-low", 4, ["STADBLMP"], "levels/city/stadium/defend"], +["stadblmp", "stadblmp", 4, ["STADBLMP"], "levels/city/stadium/defend"], +["tpage-3045", "tpage-3045", 4, ["UND"], "levels/underport"], +["tpage-3048", "tpage-3048", 4, ["UND"], "levels/underport"], +["tpage-3049", "tpage-3049", 4, ["UND"], "levels/underport"], +["tpage-3047", "tpage-3047", 4, ["UND"], "levels/underport"], +["tpage-3276", "tpage-3276", 4, ["UND"], "levels/underport"], +["centipede-fma-ag", "centipede-fma", 4, ["UND"], "levels/underport"], +["under-break-bridge-b-ag", "under-break-bridge-b", 4, ["UND"], "levels/underport"], +["under-break-bridge-ag", "under-break-bridge", 4, ["UND"], "levels/underport"], +["under-break-door-ag", "under-break-door", 4, ["UND"], "levels/underport"], +["under-break-ceiling-ag", "under-break-ceiling", 4, ["UND"], "levels/underport"], +["under-seaweed-c-ag", "under-seaweed-c", 4, ["UND"], "levels/underport"], +["under-seaweed-b-ag", "under-seaweed-b", 4, ["UND"], "levels/underport"], +["under-seaweed-d-ag", "under-seaweed-d", 4, ["UND"], "levels/underport"], +["under-seaweed-a-ag", "under-seaweed-a", 4, ["UND"], "levels/underport"], +["under-vis", "under-vis", 4, ["UND"], "levels/underport"], +["youngsamos-lyskdcd+0-ag", "youngsamos-lyskdcd+0", 4, ["LYSKDCD"], "characters/youngsamos_kid_dog"], +["kid-lyskdcd+0-ag", "kid-lyskdcd+0", 4, ["LYSKDCD"], "characters/youngsamos_kid_dog"], +["tpage-1772", "tpage-1772", 4, ["LYSKDCD"], "characters/youngsamos_kid_dog"], +["tpage-3261", "tpage-3261", 4, ["LYSKDCD"], "characters/youngsamos_kid_dog"], +["lyskdcd", "lyskdcd", 4, ["LYSKDCD"], "characters/youngsamos_kid_dog"], +["tpage-43", "tpage-43", 4, ["HALFPIPE"], "levels/test/halfpipe"], +["tpage-623", "tpage-623", 4, ["HALFPIPE"], "levels/test/halfpipe"], +["tpage-42", "tpage-42", 4, ["HALFPIPE"], "levels/test/halfpipe"], +["halfpipe", "halfpipe", 4, ["HALFPIPE"], "levels/test/halfpipe"], +["samos-lsamergd+0-ag", "samos-lsamergd+0", 4, ["LSAMERGD"], "characters/samos_errol_guard"], +["tpage-2701", "tpage-2701", 4, ["LSAMERGD"], "characters/samos_errol_guard"], +["tpage-3248", "tpage-3248", 4, ["LSAMERGD"], "characters/samos_errol_guard"], +["lsamergd", "lsamergd", 4, ["LSAMERGD"], "characters/samos_errol_guard"], +["com-elevator", "com-elevator", 3, ["PAS", "TOD"], "levels/common/entities"], +["palshaft-part", "palshaft-part", 3, ["PAS"], "levels/palace/shaft"], +["tpage-2371", "tpage-2371", 4, ["PAS"], "levels/palace/shaft"], +["tpage-2372", "tpage-2372", 4, ["PAS"], "levels/palace/shaft"], +["tpage-2692", "tpage-2692", 4, ["PAS"], "levels/palace/shaft"], +["com-elevator-ag-PAS", "com-elevator", 4, ["PAS"], "levels/palace/shaft"], +["com-elevator-ag-TOD", "com-elevator", 4, ["TOD"], "levels/mars_tomb/entrance"], +["palshaft-vis", "palshaft-vis", 4, ["PAS"], "levels/palace/shaft"], +["ctywide-bbush", "ctywide-bbush", 3, ["LBBUSH"], "levels/city/side_missions"], +["tpage-3336", "tpage-3336", 4, ["LBBUSH"], "levels/city/side_missions"], +["tpage-3465", "tpage-3465", 4, ["LBBUSH"], "levels/city/side_missions"], +["hovering-mine-ag", "hovering-mine", 4, ["LBBUSH"], "levels/city/side_missions"], +["homing-beacon-ag", "homing-beacon", 4, ["LBBUSH"], "levels/city/side_missions"], +["lbbush", "lbbush", 4, ["LBBUSH"], "levels/city/side_missions"], +["delivery-task", "delivery-task", 3, ["LPACKAGE"], "level/haven/misc/delivery"], +["tpage-2459", "tpage-2459", 4, ["LPACKAGE"], "level/haven/misc/delivery"], +["lpackage", "lpackage", 4, ["LPACKAGE"], "level/haven/misc/delivery"], +["tpage-2752", "tpage-2752", 4, ["LINTCSTB"], "levels/intro"], +["tpage-2754", "tpage-2754", 4, ["LINTCSTB"], "levels/intro"], +["tpage-3243", "tpage-3243", 4, ["LINTCSTB"], "levels/intro"], +["rift-rider-break-ag", "rift-rider-break", 4, ["LINTCSTB"], "levels/intro"], +["lintcstb", "lintcstb", 4, ["LINTCSTB"], "levels/intro"], +["portrun", "portrun", 3, ["LPORTRUN"], "levels/city/port/mines"], +["tpage-2817", "tpage-2817", 4, ["LPORTRUN"], "levels/city/port/mines"], +["tpage-2373", "tpage-2373", 4, ["LPORTRUN"], "levels/city/port/mines"], +["ctyport-cargo-ag", "ctyport-cargo", 4, ["LPORTRUN"], "levels/city/port/mines"], +["ctyport-spy-ag", "ctyport-spy", 4, ["LPORTRUN"], "levels/city/port/mines"], +["sew-mine-b-ag-LPORTRUN", "sew-mine-b", 4, ["LPORTRUN"], "levels/city/port/mines"], +["sew-mine-b-ag-SWE", "sew-mine-b", 4, ["SWE"], "levels/sewer/escort"], +["sew-mine-b-ag-SEW", "sew-mine-b", 4, ["SEW"], "levels/sewer"], +["ctyport-mine-ag", "ctyport-mine", 4, ["LPORTRUN"], "levels/city/port/mines"], +["lportrun", "lportrun", 4, ["LPORTRUN"], "levels/city/port/mines"], +["tpage-2707", "tpage-2707", 4, ["LASHGRD"], "characters/ashelin_guard"], +["tpage-3265", "tpage-3265", 4, ["LASHGRD"], "characters/ashelin_guard"], +["lashgrd", "lashgrd", 4, ["LASHGRD"], "characters/ashelin_guard"], +["ctygenb-part", "ctygenb-part", 3, ["CGB"], "levels/city/generic"], +["tpage-955", "tpage-955", 4, ["CGB"], "levels/city/generic"], +["tpage-957", "tpage-957", 4, ["CGB"], "levels/city/generic"], +["tpage-956", "tpage-956", 4, ["CGB"], "levels/city/generic"], +["tpage-958", "tpage-958", 4, ["CGB"], "levels/city/generic"], +["tpage-1019", "tpage-1019", 4, ["CGB"], "levels/city/generic"], +["tpage-1638", "tpage-1638", 4, ["CGB"], "levels/city/generic"], +["ctygenb-vis", "ctygenb-vis", 4, ["CGB"], "levels/city/generic"], +["tpage-2406", "tpage-2406", 4, ["D3B"], "levels/dig/lurker_village"], +["tpage-2407", "tpage-2407", 4, ["D3B"], "levels/dig/lurker_village"], +["tpage-3548", "tpage-3548", 4, ["D3B"], "levels/dig/lurker_village"], +["dig3b-vis", "dig3b-vis", 4, ["D3B"], "levels/dig/lurker_village"], +["tpage-3451", "tpage-3451", 4, ["STB"], "levels/stadium/races/class3"], +["tpage-3454", "tpage-3454", 4, ["STB"], "levels/stadium/races/class3"], +["tpage-3452", "tpage-3452", 4, ["STB"], "levels/stadium/races/class3"], +["tpage-3453", "tpage-3453", 4, ["STB"], "levels/stadium/races/class3"], +["tpage-3109", "tpage-3109", 4, ["STB"], "levels/stadium/races/class3"], +["stad-force-field-ag", "stad-force-field", 4, ["STB"], "levels/stadium/races/class3"], +["stadiumb-vis", "stadiumb-vis", 4, ["STB"], "levels/stadium/races/class3"], +["keira-garage+0-ag", "keira-garage+0", 4, ["GARAGE"], "levels/city/stadium/garage"], +["tpage-1369", "tpage-1369", 4, ["GARAGE"], "levels/city/stadium/garage"], +["tpage-1430", "tpage-1430", 4, ["GARAGE"], "levels/city/stadium/garage"], +["tpage-1786", "tpage-1786", 4, ["GARAGE"], "levels/city/stadium/garage"], +["tpage-1787", "tpage-1787", 4, ["GARAGE"], "levels/city/stadium/garage"], +["tpage-3025", "tpage-3025", 4, ["GARAGE"], "levels/city/stadium/garage"], +["gar-curtain-ag", "gar-curtain", 4, ["GARAGE"], "levels/city/stadium/garage"], +["gar-trophy-ca-ag", "gar-trophy-ca", 4, ["GARAGE"], "levels/city/stadium/garage"], +["gar-trophy-cb-ag", "gar-trophy-cb", 4, ["GARAGE"], "levels/city/stadium/garage"], +["gar-trophy-cc-ag", "gar-trophy-cc", 4, ["GARAGE"], "levels/city/stadium/garage"], +["garage-bikec-ag", "garage-bikec", 4, ["GARAGE"], "levels/city/stadium/garage"], +["gar-weld-project-ag", "gar-weld-project", 4, ["GARAGE"], "levels/city/stadium/garage"], +["garage-bikeb-ag", "garage-bikeb", 4, ["GARAGE"], "levels/city/stadium/garage"], +["spotlight-ag", "spotlight", 4, ["GARAGE"], "levels/city/stadium/garage"], +["garage", "garage", 4, ["GARAGE"], "levels/city/stadium/garage"], +["tpage-3181", "tpage-3181", 4, ["PORTWALL"], "levels/city/port"], +["tpage-3323", "tpage-3323", 4, ["PORTWALL"], "levels/city/port"], +["mecha-daxter-ag-PORTWALL", "mecha-daxter", 4, ["PORTWALL"], "levels/city/port"], +["mecha-daxter-ag-CPO", "mecha-daxter", 4, ["CPO"], "levels/city/port"], +["portwall", "portwall", 4, ["PORTWALL"], "levels/city/port"], +["helldog", "helldog", 3, ["LHELLDOG"], "levels/common/enemy/hellcat"], +["tpage-2324", "tpage-2324", 4, ["LHELLDOG"], "levels/common/enemy/hellcat"], +["tpage-3273", "tpage-3273", 4, ["LHELLDOG"], "levels/common/enemy/hellcat"], +["helldog-ag", "helldog", 4, ["LHELLDOG"], "levels/common/enemy/hellcat"], +["lhelldog", "lhelldog", 4, ["LHELLDOG"], "levels/common/enemy/hellcat"], +["tpage-1370", "tpage-1370", 4, ["SWE"], "levels/sewer/escort"], +["tpage-1387", "tpage-1387", 4, ["SWE"], "levels/sewer/escort"], +["tpage-1371", "tpage-1371", 4, ["SWE"], "levels/sewer/escort"], +["tpage-2293", "tpage-2293", 4, ["SWE"], "levels/sewer/escort"], +["tpage-3478", "tpage-3478", 4, ["SWE"], "levels/sewer/escort"], +["tpage-3415", "tpage-3415", 4, ["SWE"], "levels/sewer/escort"], +["jinx-ag", "jinx", 4, ["SWE"], "levels/sewer/escort"], +["hosehead-ag", "hosehead", 4, ["SWE"], "levels/sewer/escort"], +["sew-wall-ag", "sew-wall", 4, ["SWE"], "levels/sewer/escort"], +["sew-mar-statue-explode-ag", "sew-mar-statue-explode", 4, ["SWE"], "levels/sewer/escort"], +["sew-multi-blade-ag", "sew-multi-blade", 4, ["SWE", "SEW"], "levels/sewer"], +["sew-mar-statue-ag-SWE", "sew-mar-statue", 4, ["SWE"], "levels/sewer/escort"], +["sew-mar-statue-ag-SEW", "sew-mar-statue", 4, ["SEW"], "levels/sewer"], +["sew-twist-blade-ag", "sew-twist-blade", 4, ["SWE", "SEW"], "levels/sewer"], +["sew-mine-a-ag-SWE", "sew-mine-a", 4, ["SWE"], "levels/sewer/escort"], +["sew-mine-a-ag-SEW", "sew-mine-a", 4, ["SEW"], "levels/sewer"], +["sew-arm-blade-ag", "sew-arm-blade", 4, ["SWE", "SEW"], "levels/sewer"], +["sew-light-switch-ag-SWE", "sew-light-switch", 4, ["SWE"], "levels/sewer/escort"], +["sew-light-switch-ag-SEW", "sew-light-switch", 4, ["SEW"], "levels/sewer"], +["jinx-bomb-ag", "jinx-bomb", 4, ["SWE"], "levels/sewer/escort"], +["sew-grill-ag-SWE", "sew-grill", 4, ["SWE"], "levels/sewer/escort"], +["sew-grill-ag-SEW", "sew-grill", 4, ["SEW"], "levels/sewer"], +["sewesc-vis", "sewesc-vis", 4, ["SWE"], "levels/sewer/escort"], +["tpage-3432", "tpage-3432", 4, ["LRACECB"], "levels/common/races"], +["lracecb", "lracecb", 4, ["LRACECB"], "levels/common/races"], +["gun-dummy", "gun-dummy", 3, ["GGA"], "levels/gungame"], +["gungame-data", "gungame-data", 3, ["GGA"], "levels/gungame"], +["gungame-obs", "gungame-obs", 3, ["GGA"], "levels/gungame"], +["gungame-part", "gungame-part", 3, ["GGA"], "levels/gungame"], +["tpage-1733", "tpage-1733", 4, ["GGA"], "levels/gungame"], +["tpage-1735", "tpage-1735", 4, ["GGA"], "levels/gungame"], +["tpage-1734", "tpage-1734", 4, ["GGA"], "levels/gungame"], +["tpage-2405", "tpage-2405", 4, ["GGA"], "levels/gungame"], +["gun-dummy-yellow-gun-ag", "gun-dummy-yellow-gun", 4, ["GGA"], "levels/gungame"], +["gun-cit-d-ag", "gun-cit-d", 4, ["GGA"], "levels/gungame"], +["gun-cit-a-ag", "gun-cit-a", 4, ["GGA"], "levels/gungame"], +["gun-cit-b-ag", "gun-cit-b", 4, ["GGA"], "levels/gungame"], +["gun-dummy-gold-ag", "gun-dummy-gold", 4, ["GGA"], "levels/gungame"], +["gun-dummy-a-ag", "gun-dummy-a", 4, ["GGA"], "levels/gungame"], +["gun-dummy-c-ag", "gun-dummy-c", 4, ["GGA"], "levels/gungame"], +["gun-dummy-b-ag", "gun-dummy-b", 4, ["GGA"], "levels/gungame"], +["gun-cit-c-ag", "gun-cit-c", 4, ["GGA"], "levels/gungame"], +["gun-dummy-big-ag", "gun-dummy-big", 4, ["GGA"], "levels/gungame"], +["hip-door-a-ag-GGA", "hip-door-a", 4, ["GGA"], "levels/gungame"], +["hip-door-a-ag-UNB", "hip-door-a", 4, ["UNB"], "levels/underport"], +["hip-door-a-ag-CPO", "hip-door-a", 4, ["CPO"], "levels/city/port"], +["hip-door-a-ag-HIPHOG", "hip-door-a", 4, ["HIPHOG"], "levels/hiphog"], +["yellow-barrel-ag", "yellow-barrel", 4, ["GGA"], "levels/gungame"], +["dark-barrel-ag", "dark-barrel", 4, ["GGA"], "levels/gungame"], +["gungame-vis", "gungame-vis", 4, ["GGA"], "levels/gungame"], +["youngsamos-tombd+0-ag", "youngsamos-tombd+0", 4, ["TOD"], "levels/mars_tomb/entrance"], +["kid-tombd+0-ag-TOD", "kid-tombd+0", 4, ["TOD"], "levels/mars_tomb/entrance"], +["kid-tombd+0-ag-VIN", "kid-tombd+0", 4, ["VIN"], "levels/power_station"], +["tpage-1626", "tpage-1626", 4, ["TOD"], "levels/mars_tomb/entrance"], +["tpage-1627", "tpage-1627", 4, ["TOD"], "levels/mars_tomb/entrance"], +["tpage-3275", "tpage-3275", 4, ["TOD"], "levels/mars_tomb/entrance"], +["tombd-vis", "tombd-vis", 4, ["TOD"], "levels/mars_tomb/entrance"], +["mincan-obs", "mincan-obs", 3, ["MCN"], "levels/temple/canyon"], +["canyon-scenes", "canyon-scenes", 3, ["MCN"], "levels/temple/canyon"], +["tpage-3341", "tpage-3341", 4, ["MCN"], "levels/temple/canyon"], +["tpage-3343", "tpage-3343", 4, ["MCN"], "levels/temple/canyon"], +["tpage-3342", "tpage-3342", 4, ["MCN"], "levels/temple/canyon"], +["tpage-3344", "tpage-3344", 4, ["MCN"], "levels/temple/canyon"], +["tpage-3471", "tpage-3471", 4, ["MCN"], "levels/temple/canyon"], +["ctypal-baron-statue-break-ag", "ctypal-baron-statue-break", 4, ["MCN"], "levels/temple/canyon"], +["mincan-cogs-ag", "mincan-cogs", 4, ["MCN"], "levels/temple/canyon"], +["ctypal-break-wall-ag", "ctypal-break-wall", 4, ["MCN"], "levels/temple/canyon"], +["mincan-lighthouse-ag", "mincan-lighthouse", 4, ["MCN"], "levels/temple/canyon"], +["water-anim-mincan-ag", "water-anim-mincan", 4, ["MCN"], "levels/temple/canyon"], +["mincan-lens-ag", "mincan-lens", 4, ["MCN"], "levels/temple/canyon"], +["mincan-vis", "mincan-vis", 4, ["MCN"], "levels/temple/canyon"], +["tpage-1059", "tpage-1059", 4, ["SEW"], "levels/sewer"], +["tpage-1060", "tpage-1060", 4, ["SEW"], "levels/sewer"], +["tpage-1066", "tpage-1066", 4, ["SEW"], "levels/sewer"], +["tpage-2270", "tpage-2270", 4, ["SEW"], "levels/sewer"], +["tpage-3479", "tpage-3479", 4, ["SEW"], "levels/sewer"], +["sew-catwalk-ag", "sew-catwalk", 4, ["SEW"], "levels/sewer"], +["sew-gunturret-ag", "sew-gunturret", 4, ["SEW"], "levels/sewer"], +["sew-tri-blade-ag", "sew-tri-blade", 4, ["SEW"], "levels/sewer"], +["sew-single-blade-ag", "sew-single-blade", 4, ["SEW"], "levels/sewer"], +["sew-valve-ag", "sew-valve", 4, ["SEW"], "levels/sewer"], +["sewer-vis", "sewer-vis", 4, ["SEW"], "levels/sewer"], +["vinroom-part", "vinroom-part", 3, ["VIN"], "levels/power_station"], +["vinroom-scenes", "vinroom-scenes", 3, ["VIN"], "levels/power_station"], +["vinroom-obs", "vinroom-obs", 3, ["VIN"], "levels/power_station"], +["tpage-778", "tpage-778", 4, ["VIN"], "levels/power_station"], +["tpage-779", "tpage-779", 4, ["VIN"], "levels/power_station"], +["tpage-3278", "tpage-3278", 4, ["VIN"], "levels/power_station"], +["tpage-979", "tpage-979", 4, ["VIN"], "levels/power_station"], +["vin-ag", "vin", 4, ["VIN"], "levels/power_station"], +["ecowell-a-ag", "ecowell-a", 4, ["VIN"], "levels/power_station"], +["ecowell-b-ag", "ecowell-b", 4, ["VIN"], "levels/power_station"], +["ecowell-c-ag", "ecowell-c", 4, ["VIN"], "levels/power_station"], +["ecowell-d-ag", "ecowell-d", 4, ["VIN"], "levels/power_station"], +["plasmitebox-ag", "plasmitebox", 4, ["VIN"], "levels/power_station"], +["vin-door-ag", "vin-door", 4, ["VIN"], "levels/power_station"], +["vin-turbine-ag", "vin-turbine", 4, ["VIN"], "levels/power_station"], +["pow-mov-plat-ag", "pow-mov-plat", 4, ["VIN"], "levels/power_station"], +["vinroom-vis", "vinroom-vis", 4, ["VIN"], "levels/power_station"], +["ctygena-part", "ctygena-part", 3, ["CGA"], "levels/city/generic"], +["neon-praxis-part", "neon-praxis-part", 3, ["CGA"], "levels/city/generic"], +["tpage-1137", "tpage-1137", 4, ["CGA"], "levels/city/generic"], +["tpage-1138", "tpage-1138", 4, ["CGA"], "levels/city/generic"], +["tpage-1117", "tpage-1117", 4, ["CGA"], "levels/city/generic"], +["tpage-1637", "tpage-1637", 4, ["CGA"], "levels/city/generic"], +["ctygena-vis", "ctygena-vis", 4, ["CGA"], "levels/city/generic"], +["tpage-2734", "tpage-2734", 4, ["CMB"], "levels/city/market/east"], +["tpage-2738", "tpage-2738", 4, ["CMB"], "levels/city/market/east"], +["tpage-2735", "tpage-2735", 4, ["CMB"], "levels/city/market/east"], +["tpage-2737", "tpage-2737", 4, ["CMB"], "levels/city/market/east"], +["tpage-2736", "tpage-2736", 4, ["CMB"], "levels/city/market/east"], +["tpage-1616", "tpage-1616", 4, ["CMB"], "levels/city/market/east"], +["tpage-1644", "tpage-1644", 4, ["CMB"], "levels/city/market/east"], +["ctymarkb-vis", "ctymarkb-vis", 4, ["CMB"], "levels/city/market/east"], +["tpage-1753", "tpage-1753", 4, ["LGUARD"], "characters/guards"], +["tpage-2883", "tpage-2883", 4, ["LGUARD"], "characters/guards"], +["tpage-3272", "tpage-3272", 4, ["LGUARD"], "characters/guards"], +["computerpaper-ag", "computerpaper", 4, ["LGUARD"], "characters/guards"], +["lguard", "lguard", 4, ["LGUARD"], "characters/guards"], +["ctypal-part", "ctypal-part", 3, ["CPA"], "levels/city/palace"], +["ctypal-obs", "ctypal-obs", 3, ["CPA"], "levels/city/palace"], +["tpage-2526", "tpage-2526", 4, ["CPA"], "levels/city/palace"], +["tpage-2527", "tpage-2527", 4, ["CPA"], "levels/city/palace"], +["tpage-3423", "tpage-3423", 4, ["CPA"], "levels/city/palace"], +["tpage-2528", "tpage-2528", 4, ["CPA"], "levels/city/palace"], +["tpage-1636", "tpage-1636", 4, ["CPA"], "levels/city/palace"], +["ctypal-baron-statue-broken-ag", "ctypal-baron-statue-broken", 4, ["CPA"], "levels/city/palace"], +["water-anim-ctypal-ag", "water-anim-ctypal", 4, ["CPA"], "levels/city/palace"], +["palace-door-ag", "palace-door", 4, ["CPA"], "levels/city/palace"], +["ctypal-broke-wall-ag", "ctypal-broke-wall", 4, ["CPA"], "levels/city/palace"], +["ctypal-vis", "ctypal-vis", 4, ["CPA"], "levels/city/palace"], +["tpage-2755", "tpage-2755", 4, ["LCITYLOW"], "levels/city/low-quality"], +["tpage-2756", "tpage-2756", 4, ["LCITYLOW"], "levels/city/low-quality"], +["tpage-3388", "tpage-3388", 4, ["LCITYLOW"], "levels/city/low-quality"], +["barons-ship-lores-ag-LCITYLOW", "barons-ship-lores", 4, ["LCITYLOW"], "levels/city/low-quality"], +["barons-ship-lores-ag-CWI", "barons-ship-lores", 4, ["CWI"], "levels/city/common"], +["lcitylow", "lcitylow", 4, ["LCITYLOW"], "levels/city/low-quality"], +["youngsamos-onintent+0-ag", "youngsamos-onintent+0", 4, ["LTENTOUT"], "levels/city/onin_tent"], +["tpage-2618", "tpage-2618", 4, ["LTENTOUT"], "levels/city/onin_tent"], +["tpage-3251", "tpage-3251", 4, ["LTENTOUT"], "levels/city/onin_tent"], +["ltentout", "ltentout", 4, ["LTENTOUT"], "levels/city/onin_tent"], +["under-shoot-block", "under-shoot-block", 3, ["UNB"], "levels/underport"], +["underb-master", "underb-master", 3, ["UNB"], "levels/underport"], +["under-obs", "under-obs", 3, ["UNB"], "levels/underport"], +["under-sig-obs", "under-sig-obs", 3, ["UNB"], "levels/underport"], +["under-laser", "under-laser", 3, ["UNB"], "levels/underport"], +["pipe-grunt", "pipe-grunt", 3, ["UNB"], "levels/underport"], +["jellyfish", "jellyfish", 3, ["UNB"], "levels/underport"], +["under-part", "under-part", 3, ["UNB"], "levels/underport"], +["centipede", "centipede", 3, ["UNB"], "levels/underport"], +["sig5-cent1-path0", "sig5-cent1-path0", 3, ["UNB"], "levels/underport"], +["sig5-cent2-path0", "sig5-cent2-path0", 3, ["UNB"], "levels/underport"], +["sig5-course", "sig5-course", 3, ["UNB"], "levels/underport"], +["under-scenes", "under-scenes", 3, ["UNB"], "levels/underport"], +["sig-recorder", "sig-recorder", 3, ["UNB"], "levels/underport"], +["tpage-3051", "tpage-3051", 4, ["UNB"], "levels/underport"], +["tpage-3053", "tpage-3053", 4, ["UNB"], "levels/underport"], +["tpage-3054", "tpage-3054", 4, ["UNB"], "levels/underport"], +["tpage-3413", "tpage-3413", 4, ["UNB"], "levels/underport"], +["under-mine-ag", "under-mine", 4, ["UNB"], "levels/underport"], +["jellyfish-ag", "jellyfish", 4, ["UNB"], "levels/underport"], +["under-shoot-block-ag", "under-shoot-block", 4, ["UNB"], "levels/underport"], +["under-break-floor-ag", "under-break-floor", 4, ["UNB"], "levels/underport"], +["centipede-ag", "centipede", 4, ["UNB"], "levels/underport"], +["under-int-door-ag", "under-int-door", 4, ["UNB"], "levels/underport"], +["under-break-wall-b-ag", "under-break-wall-b", 4, ["UNB"], "levels/underport"], +["under-break-wall-ag", "under-break-wall", 4, ["UNB"], "levels/underport"], +["under-rise-plat-ag", "under-rise-plat", 4, ["UNB"], "levels/underport"], +["under-lift-ag", "under-lift", 4, ["UNB"], "levels/underport"], +["under-buoy-base-ag", "under-buoy-base", 4, ["UNB"], "levels/underport"], +["under-buoy-chain-ag", "under-buoy-chain", 4, ["UNB"], "levels/underport"], +["under-buoy-plat-ag", "under-buoy-plat", 4, ["UNB"], "levels/underport"], +["water-anim-under-ag", "water-anim-under", 4, ["UNB"], "levels/underport"], +["under-plat-shoot-ag", "under-plat-shoot", 4, ["UNB"], "levels/underport"], +["under-plat-wall-ag", "under-plat-wall", 4, ["UNB"], "levels/underport"], +["under-plat-long-ag", "under-plat-long", 4, ["UNB"], "levels/underport"], +["under-warp-ag", "under-warp", 4, ["UNB"], "levels/underport"], +["under-laser-ag", "under-laser", 4, ["UNB"], "levels/underport"], +["under-laser-shadow-ag", "under-laser-shadow", 4, ["UNB"], "levels/underport"], +["underb-vis", "underb-vis", 4, ["UNB"], "levels/underport"], +["ctyport-part", "ctyport-part", 3, ["CPO"], "levels/city/port"], +["tpage-1557", "tpage-1557", 4, ["CPO"], "levels/city/port"], +["tpage-1560", "tpage-1560", 4, ["CPO"], "levels/city/port"], +["tpage-1558", "tpage-1558", 4, ["CPO"], "levels/city/port"], +["tpage-1325", "tpage-1325", 4, ["CPO"], "levels/city/port"], +["tpage-1645", "tpage-1645", 4, ["CPO"], "levels/city/port"], +["barge-ag", "barge", 4, ["CPO"], "levels/city/port"], +["farthy-ag", "farthy", 4, ["CPO"], "levels/city/port"], +["ctyport-vis", "ctyport-vis", 4, ["CPO"], "levels/city/port"], +["caspad-obs", "caspad-obs", 3, ["CAP"], "levels/castle/pad"], +["caspad-part", "caspad-part", 3, ["CAP"], "levels/castle/pad"], +["castle-tasks", "castle-tasks", 3, ["CAP"], "levels/castle/pad"], +["tpage-2537", "tpage-2537", 4, ["CAP"], "levels/castle/pad"], +["tpage-2539", "tpage-2539", 4, ["CAP"], "levels/castle/pad"], +["tpage-2538", "tpage-2538", 4, ["CAP"], "levels/castle/pad"], +["tpage-3498", "tpage-3498", 4, ["CAP"], "levels/castle/pad"], +["cpad-elevator-ag", "cpad-elevator", 4, ["CAP"], "levels/castle/pad"], +["caspad-vis", "caspad-vis", 4, ["CAP"], "levels/castle/pad"], +["nav-graph-h", "nav-graph-h", 3, ["CWI"], "levels/city/common"], +["traffic-engine-h", "traffic-engine-h", 3, ["CWI"], "levels/city/common"], +["vehicle-h", "vehicle-h", 3, ["CWI"], "levels/city/common"], +["citizen-h", "citizen-h", 3, ["CWI"], "levels/city/common"], +["height-map-h", "height-map-h", 3, ["CWI"], "levels/city/common"], +["ctywide-obs-h", "ctywide-obs-h", 3, ["CWI"], "levels/city/common"], +["height-map", "height-map", 3, ["CWI"], "levels/city/common"], +["traffic-height-map", "traffic-height-map", 3, ["CWI"], "levels/city/common"], +["nav-graph", "nav-graph", 3, ["CWI"], "levels/city/common"], +["vehicle-rider", "vehicle-rider", 3, ["CWI"], "levels/city/common"], +["vehicle-control", "vehicle-control", 3, ["CWI"], "levels/city/common"], +["vehicle-part", "vehicle-part", 3, ["CWI"], "levels/city/common"], +["vehicle-effects", "vehicle-effects", 3, ["CWI"], "levels/city/common"], +["vehicle", "vehicle", 3, ["CWI"], "levels/city/common"], +["vehicle-util", "vehicle-util", 3, ["CWI"], "levels/city/common"], +["vehicle-physics", "vehicle-physics", 3, ["CWI"], "levels/city/common"], +["vehicle-states", "vehicle-states", 3, ["CWI"], "levels/city/common"], +["vehicle-guard", "vehicle-guard", 3, ["CWI"], "levels/city/common"], +["transport", "transport", 3, ["CWI"], "levels/city/common"], +["bike", "bike", 3, ["CWI"], "levels/city/common"], +["car", "car", 3, ["CWI"], "levels/city/common"], +["test-bike", "test-bike", 3, ["CWI"], "levels/city/common"], +["test-car", "test-car", 3, ["CWI"], "levels/city/common"], +["citizen", "citizen", 3, ["CWI"], "levels/city/common"], +["civilian", "civilian", 3, ["CWI"], "levels/city/common"], +["guard", "guard", 3, ["CWI"], "levels/city/common"], +["citizen-norm", "citizen-norm", 3, ["CWI"], "levels/city/common"], +["citizen-fat", "citizen-fat", 3, ["CWI"], "levels/city/common"], +["citizen-chick", "citizen-chick", 3, ["CWI"], "levels/city/common"], +["citizen-enemy", "citizen-enemy", 3, ["CWI"], "levels/city/common"], +["metalhead-predator", "metalhead-predator", 3, ["CWI"], "levels/city/common"], +["metalhead-grunt", "metalhead-grunt", 3, ["CWI"], "levels/city/common"], +["metalhead-flitter", "metalhead-flitter", 3, ["CWI"], "levels/city/common"], +["traffic-engine", "traffic-engine", 3, ["CWI"], "levels/city/common"], +["trail-graph", "trail-graph", 3, ["CWI"], "levels/city/common"], +["trail", "trail", 3, ["CWI"], "levels/city/common"], +["traffic-manager", "traffic-manager", 3, ["CWI"], "levels/city/common"], +["ctywide-texture", "ctywide-texture", 3, ["CWI"], "levels/city/common"], +["ctywide-part", "ctywide-part", 3, ["CWI"], "levels/city/common"], +["ctywide-obs", "ctywide-obs", 3, ["CWI"], "levels/city/common"], +["ctywide-tasks", "ctywide-tasks", 3, ["CWI"], "levels/city/common"], +["ctywide-scenes", "ctywide-scenes", 3, ["CWI"], "levels/city/common"], +["ctywide-speech", "ctywide-speech", 3, ["CWI"], "levels/city/common"], +["ctyport-obs", "ctyport-obs", 3, ["CWI"], "levels/city/common"], +["target-pilot", "target-pilot", 3, ["CWI"], "levels/city/common"], +["pilot-states", "pilot-states", 3, ["CWI"], "levels/city/common"], +["jak-pilot+0-ag", "jak-pilot+0", 4, ["CWI"], "levels/city/common"], +["tpage-1264", "tpage-1264", 4, ["CWI"], "levels/city/common"], +["tpage-1266", "tpage-1266", 4, ["CWI"], "levels/city/common"], +["tpage-1265", "tpage-1265", 4, ["CWI"], "levels/city/common"], +["tpage-1674", "tpage-1674", 4, ["CWI"], "levels/city/common"], +["tpage-1118", "tpage-1118", 4, ["CWI"], "levels/city/common"], +["tpage-1657", "tpage-1657", 4, ["CWI"], "levels/city/common"], +["baron-statue-ag", "baron-statue", 4, ["CWI"], "levels/city/common"], +["cty-guard-turret-ag", "cty-guard-turret", 4, ["CWI"], "levels/city/common"], +["vehicle-explosion-ag", "vehicle-explosion", 4, ["CWI"], "levels/city/common"], +["propa-ag", "propa", 4, ["CWI"], "levels/city/common"], +["vehicle-turret-ag", "vehicle-turret", 4, ["CWI"], "levels/city/common"], +["lurker-pipe-lid-ag", "lurker-pipe-lid", 4, ["CWI"], "levels/city/common"], +["burning-bush-ag", "burning-bush", 4, ["CWI"], "levels/city/common"], +["stadium-barrier-ag", "stadium-barrier", 4, ["CWI"], "levels/city/common"], +["security-wall-ag", "security-wall", 4, ["CWI"], "levels/city/common"], +["ctywide-vis", "ctywide-vis", 4, ["CWI"], "levels/city/common"], +["kid-h", "kid-h", 3, ["CTYKORA"], "levels/city/slums/kor"], +["kor-h", "kor-h", 3, ["CTYKORA"], "levels/city/slums/kor"], +["hal3-course", "hal3-course", 3, ["CTYKORA"], "levels/city/slums/kor"], +["kid-task", "kid-task", 3, ["CTYKORA"], "levels/city/slums/kor"], +["kid", "kid", 3, ["CTYKORA"], "levels/city/slums/kor"], +["kid-states", "kid-states", 3, ["CTYKORA"], "levels/city/slums/kor"], +["kor-task", "kor-task", 3, ["CTYKORA"], "levels/city/slums/kor"], +["kor", "kor", 3, ["CTYKORA"], "levels/city/slums/kor"], +["kor-states", "kor-states", 3, ["CTYKORA"], "levels/city/slums/kor"], +["kid3-course", "kid3-course", 3, ["CTYKORA"], "levels/city/slums/kor"], +["kor3-course", "kor3-course", 3, ["CTYKORA"], "levels/city/slums/kor"], +["jak-dark-on+0-ag", "jak-dark-on+0", 4, ["CTYKORA"], "levels/city/slums/kor"], +["tpage-1451", "tpage-1451", 4, ["CTYKORA"], "levels/city/slums/kor"], +["tpage-2727", "tpage-2727", 4, ["CTYKORA"], "levels/city/slums/kor"], +["tpage-3224", "tpage-3224", 4, ["CTYKORA"], "levels/city/slums/kor"], +["kor-ag", "kor", 4, ["CTYKORA"], "levels/city/slums/kor"], +["ctykora", "ctykora", 4, ["CTYKORA"], "levels/city/slums/kor"], +["ruins-ocean", "ruins-ocean", 3, ["RUI"], "levels/ruins"], +["ruins-scenes", "ruins-scenes", 3, ["RUI"], "levels/ruins"], +["mechtest-obs", "mechtest-obs", 3, ["RUI"], "levels/ruins"], +["ruins-part", "ruins-part", 3, ["RUI"], "levels/ruins"], +["breakable-wall", "breakable-wall", 3, ["RUI"], "levels/ruins"], +["pillar-collapse", "pillar-collapse", 3, ["RUI"], "levels/ruins"], +["ruins-obs", "ruins-obs", 3, ["RUI"], "levels/ruins"], +["rapid-gunner", "rapid-gunner", 3, ["RUI"], "levels/ruins"], +["tpage-851", "tpage-851", 4, ["RUI"], "levels/ruins"], +["tpage-853", "tpage-853", 4, ["RUI"], "levels/ruins"], +["tpage-852", "tpage-852", 4, ["RUI"], "levels/ruins"], +["tpage-2205", "tpage-2205", 4, ["RUI"], "levels/ruins"], +["tpage-1000", "tpage-1000", 4, ["RUI"], "levels/ruins"], +["ruins-breakable-wall-ag", "ruins-breakable-wall", 4, ["RUI"], "levels/ruins"], +["ruins-drop-plat-ag", "ruins-drop-plat", 4, ["RUI"], "levels/ruins"], +["rapid-gunner-ag", "rapid-gunner", 4, ["RUI"], "levels/ruins"], +["ruins-pillar-collapse-ag", "ruins-pillar-collapse", 4, ["RUI"], "levels/ruins"], +["ruins-bridge-ag", "ruins-bridge", 4, ["RUI"], "levels/ruins"], +["shield-gunner-ag", "shield-gunner", 4, ["RUI"], "levels/ruins"], +["precipice-b-ag", "precipice-b", 4, ["RUI"], "levels/ruins"], +["ruins-precipice-ag", "ruins-precipice", 4, ["RUI"], "levels/ruins"], +["precipice-a-ag", "precipice-a", 4, ["RUI"], "levels/ruins"], +["pushblock-ag", "pushblock", 4, ["RUI"], "levels/ruins"], +["throwblock-ag", "throwblock", 4, ["RUI"], "levels/ruins"], +["zipline-ag", "zipline", 4, ["RUI"], "levels/ruins"], +["flag-ag", "flag", 4, ["RUI"], "levels/ruins"], +["sinking-plat-ag", "sinking-plat", 4, ["RUI"], "levels/ruins"], +["awning-ag", "awning", 4, ["RUI"], "levels/ruins"], +["beam-ag", "beam", 4, ["RUI"], "levels/ruins"], +["ruins-vis", "ruins-vis", 4, ["RUI"], "levels/ruins"], +["collection-task", "collection-task", 3, ["LSACK"], "level/haven/misc/collection_task"], +["tpage-2605", "tpage-2605", 4, ["LSACK"], "level/haven/misc/collection_task"], +["krew-moneybag-ag", "krew-moneybag", 4, ["LSACK"], "level/haven/misc/collection_task"], +["lsack", "lsack", 4, ["LSACK"], "level/haven/misc/collection_task"], +["ctyasha-obs", "ctyasha-obs", 3, ["CTYASHA"], "levels/city/market/east/ashelin"], +["ash4-course", "ash4-course", 3, ["CTYASHA"], "levels/city/market/east/ashelin"], +["tpage-1496", "tpage-1496", 4, ["CTYASHA"], "levels/city/market/east/ashelin"], +["tpage-1409", "tpage-1409", 4, ["CTYASHA"], "levels/city/market/east/ashelin"], +["tpage-3240", "tpage-3240", 4, ["CTYASHA"], "levels/city/market/east/ashelin"], +["tpage-3416", "tpage-3416", 4, ["CTYASHA"], "levels/city/market/east/ashelin"], +["tanker-ag", "tanker", 4, ["CTYASHA"], "levels/city/market/east/ashelin"], +["tanker-roof-break-ag", "tanker-roof-break", 4, ["CTYASHA"], "levels/city/market/east/ashelin"], +["tanker-crash-ag", "tanker-crash", 4, ["CTYASHA"], "levels/city/market/east/ashelin"], +["tanker-barrels-ag", "tanker-barrels", 4, ["CTYASHA"], "levels/city/market/east/ashelin"], +["tanker-container-ag", "tanker-container", 4, ["CTYASHA"], "levels/city/market/east/ashelin"], +["tanker-one-barrel-ag", "tanker-one-barrel", 4, ["CTYASHA"], "levels/city/market/east/ashelin"], +["ctyasha", "ctyasha", 4, ["CTYASHA"], "levels/city/market/east/ashelin"], +["tpage-3427", "tpage-3427", 4, ["LPRTRACE"], "levels/city/port/race/side_mission"], +["lprtrace", "lprtrace", 4, ["LPRTRACE"], "levels/city/port/race/side_mission"], +["tpage-2929", "tpage-2929", 4, ["LWIDEA"], "levels/city/common"], +["tpage-2930", "tpage-2930", 4, ["LWIDEA"], "levels/city/common"], +["citizen-fat-ag", "citizen-fat", 4, ["LWIDEA"], "levels/city/common"], +["lwidea", "lwidea", 4, ["LWIDEA"], "levels/city/common"], +["hiphog-obs", "hiphog-obs", 3, ["HIPHOG"], "levels/hiphog"], +["hiphog-part", "hiphog-part", 3, ["HIPHOG"], "levels/hiphog"], +["hiphog-scenes", "hiphog-scenes", 3, ["HIPHOG"], "levels/hiphog"], +["tpage-929", "tpage-929", 4, ["HIPHOG"], "levels/hiphog"], +["tpage-930", "tpage-930", 4, ["HIPHOG"], "levels/hiphog"], +["tpage-3042", "tpage-3042", 4, ["HIPHOG"], "levels/hiphog"], +["tpage-998", "tpage-998", 4, ["HIPHOG"], "levels/hiphog"], +["hip-whack-a-metal-ag", "hip-whack-a-metal", 4, ["HIPHOG"], "levels/hiphog"], +["hip-trophy-g-ag", "hip-trophy-g", 4, ["HIPHOG"], "levels/hiphog"], +["hip-trophy-d-ag", "hip-trophy-d", 4, ["HIPHOG"], "levels/hiphog"], +["hip-trophy-c-ag", "hip-trophy-c", 4, ["HIPHOG"], "levels/hiphog"], +["hip-trophy-a-ag", "hip-trophy-a", 4, ["HIPHOG"], "levels/hiphog"], +["hip-trophy-f-ag", "hip-trophy-f", 4, ["HIPHOG"], "levels/hiphog"], +["hip-trophy-i-ag", "hip-trophy-i", 4, ["HIPHOG"], "levels/hiphog"], +["hip-trophy-m-ag", "hip-trophy-m", 4, ["HIPHOG"], "levels/hiphog"], +["hip-trophy-n-ag", "hip-trophy-n", 4, ["HIPHOG"], "levels/hiphog"], +["hip-trophy-j-ag", "hip-trophy-j", 4, ["HIPHOG"], "levels/hiphog"], +["hip-mirror-ag", "hip-mirror", 4, ["HIPHOG"], "levels/hiphog"], +["hiphog", "hiphog", 4, ["HIPHOG"], "levels/hiphog"], +["tpage-2705", "tpage-2705", 4, ["LSMYSBRT"], "characters/samos_youngsamos_brutter"], +["tpage-3249", "tpage-3249", 4, ["LSMYSBRT"], "characters/samos_youngsamos_brutter"], +["lsmysbrt", "lsmysbrt", 4, ["LSMYSBRT"], "characters/samos_youngsamos_brutter"], +["lracebb", "lracebb", 4, ["LRACEBB"], "levels/common/races"], +["tpage-3221", "tpage-3221", 4, ["CASCITY"], "levels/city/low-quality"], +["tpage-3222", "tpage-3222", 4, ["CASCITY"], "levels/city/low-quality"], +["tpage-3425", "tpage-3425", 4, ["CASCITY"], "levels/city/low-quality"], +["cascity", "cascity", 4, ["CASCITY"], "levels/city/low-quality"], +["youngsamos-lysamsam+0-ag", "youngsamos-lysamsam+0", 4, ["LYSAMSAM"], "characters/youngsamos_and_samos"], +["tpage-3260", "tpage-3260", 4, ["LYSAMSAM"], "characters/youngsamos_and_samos"], +["lysamsam", "lysamsam", 4, ["LYSAMSAM"], "characters/youngsamos_and_samos"], +["tpage-3034", "tpage-3034", 4, ["VI1"], "levels/jak1/village1"], +["tpage-3037", "tpage-3037", 4, ["VI1"], "levels/jak1/village1"], +["tpage-3035", "tpage-3035", 4, ["VI1"], "levels/jak1/village1"], +["tpage-3038", "tpage-3038", 4, ["VI1"], "levels/jak1/village1"], +["tpage-3036", "tpage-3036", 4, ["VI1"], "levels/jak1/village1"], +["tpage-2761", "tpage-2761", 4, ["VI1"], "levels/jak1/village1"], +["tpage-3516", "tpage-3516", 4, ["VI1"], "levels/jak1/village1"], +["metalkor-torso-ag", "metalkor-torso", 4, ["VI1"], "levels/jak1/village1"], +["vil-break-support-ag", "vil-break-support", 4, ["VI1"], "levels/jak1/village1"], +["intro-flamer-ag", "intro-flamer", 4, ["VI1"], "levels/jak1/village1"], +["rift-rider-donut-ag", "rift-rider-donut", 4, ["VI1"], "levels/jak1/village1"], +["vil-windmill-sail-ag", "vil-windmill-sail", 4, ["VI1"], "levels/jak1/village1"], +["vil-windspinner-ag", "vil-windspinner", 4, ["VI1"], "levels/jak1/village1"], +["vil-sagesail-ag", "vil-sagesail", 4, ["VI1"], "levels/jak1/village1"], +["village1-vis", "village1-vis", 4, ["VI1"], "levels/jak1/village1"], +["0COMMON", "0COMMON", 2, ["NO-XGO"], ""], +["1COMMON", "1COMMON", 2, ["NO-XGO"], ""], +["2COMMON", "2COMMON", 2, ["NO-XGO"], ""], +["3COMMON", "3COMMON", 2, ["NO-XGO"], ""], +["4COMMON", "4COMMON", 2, ["NO-XGO"], ""], +["5COMMON", "5COMMON", 2, ["NO-XGO"], ""], +["6COMMON", "6COMMON", 2, ["NO-XGO"], ""], +["7COMMON", "7COMMON", 2, ["NO-XGO"], ""] +] diff --git a/goal_src/test/test-bad-math.gc b/goal_src/test/test-bad-math.gc deleted file mode 100644 index 3bb479b140..0000000000 --- a/goal_src/test/test-bad-math.gc +++ /dev/null @@ -1,7 +0,0 @@ -;;-*-Lisp-*- -(in-package goal) - -(defun bad-math () - "bad math" - (/ 10 0) ;; oh no! - ) diff --git a/goalc/compiler/Compiler.cpp b/goalc/compiler/Compiler.cpp index d0cdda805a..2b6409ba00 100644 --- a/goalc/compiler/Compiler.cpp +++ b/goalc/compiler/Compiler.cpp @@ -32,6 +32,7 @@ Compiler::Compiler(const std::string& user_profile, std::unique_ptr m_make.add_tool(std::make_shared(this)); // load GOAL library + // TODO - Jak2 - BAD! Object library_code = m_goos.reader.read_from_file({"goal_src", "goal-lib.gc"}); compile_object_file("goal-lib", library_code, false); diff --git a/scripts/initial_gsrc_creation/check_for_identical_objs.py b/scripts/initial_gsrc_creation/check_for_identical_objs.py new file mode 100644 index 0000000000..84fa833d77 --- /dev/null +++ b/scripts/initial_gsrc_creation/check_for_identical_objs.py @@ -0,0 +1,69 @@ +jak2_files = None + +import json +import hashlib + +def get_md5_from_file(filename): + file_bytes = open(filename, "rb").read() + # Remove the last 16bytes of the data as it's 16-byte aligned + # if this is the only difference in the entire file, it is very likely identical + # but this data is potentially garbage + length_bytes = bytes([file_bytes[12], file_bytes[13], file_bytes[14], file_bytes[15]]) + offset_to_truncate = int.from_bytes(length_bytes, "little") + bytes_chopped = len(file_bytes) - offset_to_truncate + file_bytes = file_bytes[:offset_to_truncate] + + return [hashlib.md5(file_bytes).hexdigest(), bytes_chopped] + +# print(get_md5_from_file("../../decompiler_out/jak2/raw_obj/air-train-ag-CAP.go")) + +with open("../../goal_src/jak2/build/all_objs.json", "r") as f: + jak2_files = json.load(f) + +dgos = set() + +for file in jak2_files: + for dgo in file[3]: + dgos.add(dgo.lower()) + +import glob +from pathlib import Path + +obj_files = glob.glob("../../decompiler_out/jak2/raw_obj/*") + +print(len(obj_files)) + +# Find all the files that have the same name, but a different prefix +potentially_identical_files = {} + +for file in obj_files: + name = Path(file).stem + base_name = None + duplicate = False + for dgo in dgos: + if name.lower().endswith("-{}".format(dgo)): + # some files have multiple dgos in the name + base_name_parts = [] + for token in name.split("-"): + if token.lower() not in dgos: + base_name_parts.append(token) + base_name = "-".join(base_name_parts) + duplicate = True + if duplicate: + # Calculate the hash of the file + hash = get_md5_from_file(file) + if base_name not in potentially_identical_files: + potentially_identical_files[base_name] = [{"path": file, "hash": hash[0], "bytes_dropped": hash[1]}] + else: + potentially_identical_files[base_name].append({"path": file, "hash": hash[0], "bytes_dropped": hash[1]}) + +# Log any that actually differ +for base_file in potentially_identical_files: + common_hash = potentially_identical_files[base_file][0]["hash"] + for file in potentially_identical_files[base_file]: + if common_hash != file["hash"]: + print("{} is different!".format(base_name)) + break + +with open('./potentially-identical-files.json', 'w') as json_file: + json.dump(potentially_identical_files, json_file) diff --git a/scripts/initial_gsrc_creation/init_folder_struct_jak2.py b/scripts/initial_gsrc_creation/init_folder_struct_jak2.py new file mode 100644 index 0000000000..ac3d867cca --- /dev/null +++ b/scripts/initial_gsrc_creation/init_folder_struct_jak2.py @@ -0,0 +1,583 @@ +# Reduces work and tries to maintain consistency by placing objects in the same folder +# as they were in the previous game. +jak1_files = None +jak2_files = None + +import json + +with open('../../goal_src/jak1/build/all_objs.json', 'r') as f: + jak1_files = json.load(f) +with open('../../goal_src/jak2/build/all_objs.json', 'r') as f: + jak2_files = json.load(f) + +num_replicated = 0 +num_left = 0 + +engine_files = { + "profile": "util", + "texture-anim": "gfx/texture", + "capture": "util", + "text-id": "ui", + "camera-defs": "camera", + "minimap": "ui", + "bigmap": "ui", + "blit-displays": "gfx", + "region": "level", + "traffic": "ai", + "gui": "ui", + "ambient": "ambient", + "speech": "sound", + "lightning": "gfx", + "penetrate": "game", + "script": "util", + "scene": "scene", + "process-focusable": "process-drawable", + "focus": "process-drawable", + "collide-hash": "spatial-hash", + "chain-physics": "physics", + "projectile": "game", + "find-nearest": "collide", + "simple-sprite": "gfx/sprite", + "nav-mesh": "nav", + "nav-control": "nav", + "spatial-hash": "spatial-hash", + "actor-hash": "spatial-hash", + "joint-mod": "anim", + "wind-work": "gfx", + "sprite-glow": "gfx/sprite", + "history": "debug", + "emerc-vu1": "gfx/merc", + "emerc": "gfx/merc", + "warp": "gfx", + "texture-anim-funcs": "gfx/texture", + "texture-anim-tables": "gfx/texture", + "font-data": "data", + "etie-vu1": "gfx/tie", + "etie-near-vu1": "gfx/tie", + "game-task": "game/task", + "mood-tables": "gfx/mood", + "mood-tables2": "gfx/mood", + "mood-funcs": "gfx/mood", + "mood-funcs2": "gfx/mood", + "mood": "gfx/mood", + "sky-data": "gfx/sky", + "load-state": "load", + "fma-sphere": "anim", + "carry": "game", + "pilot": "game", + "board": "target/board", + "darkjak": "target", + "collide-reaction-target": "target", + "gun-part": "target/gun", + "debug-part": "debug", + "task-arrow": "game/task", + "target-anim": "target", + "target-swim": "target", + "target-carry": "target", + "target-darkjak": "target", + "target-gun": "target", + "gun-util": "target/gun", + "gun-blue-shot": "target/gun", + "gun-yellow-shot": "target/gun", + "gun-red-shot": "target/gun", + "gun-dark-shot": "target/gun", + "gun-states": "target/gun", + "board-util": "target/board", + "target-board": "target/board", + "board-part": "target/board", + "board-states": "target/board", + "mech": "game", + "simple-nav-sphere": "process-drawable", + "process-taskable": "process-drawable", + "gun": "target/gun", + "collide-debug": "collide", + "bigmap-data": "ui", + "editable": "debug", + "editable-player": "debug", + "mysql-nav-graph": "debug/nav", + "nav-graph-editor": "debug/nav", + "sampler": "debug", + "weather-part": "gfx/mood", + "time-of-day": "gfx/mood", + "path": "geometry", + "progress": "ui/progress", + "sparticle": "gfx/sprite/particles", + "sparticle-launcher": "gfx/sprite/particles", + "video": "gfx/hw", + "target-tube": "target", + "texture-upload": "gfx/texture", + "texture-finish": "gfx/texture", + "vu1-user-h": "gfx", + "math-camera": "gfx", + "decomp": "load", + "texture": "gfx/texture", + "shadow-cpu": "gfx/foreground", + "shadow-vu1": "gfx/foreground", + "bones": "gfx/foreground", + "eye": "gfx/foreground", + "foreground": "gfx/foreground", + "debug-foreground": "gfx/foreground", + "ripple": "gfx/foreground", + "res": "entity", + "pat": "collide", + "wind": "gfx/background", + "wind-work": "gfx/background", + "prototype": "gfx/background", + "process-drawable": "process-drawable", + "simple-focus": "process-drawable", + "bsp": "level", + "idle-control": "game", + "joint-exploder": "anim", + "background": "gfx/background", + "subdivide": "gfx/background", + "water": "common_objs", + "enemy": "ai", + "water-flow": "common_objs", + "generic-obs": "common_objs", + "voicebox": "common_objs", + "projectile": "common_objs", + "water-anim": "common_objs", + "blocking-plane": "common_objs", + "dark-eco-pool": "common_objs", + "collectables-part": "common_objs", + "crates": "common_objs", + "collectables": "common_objs", + "powerups": "common_objs", + "los-control": "collide", + "carry": "target/mech_suit", + "mech": "target/mech_suit", + "nav-enemy": "nav", + "base-plat": "common_objs", + "plat": "common_objs", + "basebutton": "common_objs", + "bouncer": "common_objs", + "conveyor": "common_objs", + "elevator": "common_objs", + "rigid-body-plat": "common_objs", + "rigid-body": "physics", + "rigid-body-queue": "physics", +} + +path_overrides = { + "hopper-ag": "levels/common/enemy", + "oracle": "levels/city/oracle", + "hopper": "levels/common/enemy", + "bouncer": "levels/common/enemy", + "yakow": "levels/city/farm", + "yakow-ag": "levels/city/farm", + "trail": "levels/city/common", + "village1-vis": "levels/jak1/village1" +} + +# i can be smarter than this...i swear....refactor eventually! +def level_name(file_meta): + dgos = file_meta[3] + # Handle files unique to one level + if dgos == ["HIDEOUT"] or dgos == ["LHIPOUT"] or dgos == ["LTHRNOUT"] or dgos == ["LTRNTESS"] or dgos == ["LTRNKRKD"]: + return "levels/hideout" + elif dgos == ["ORACLE"]: + return "levels/city/oracle" + elif dgos == ["DEMO"] or dgos == ["DEMO", "TITLE"]: + return "levels/demo" + elif dgos == ["ONINTENT"] or dgos == ["LTENTOB"] or dgos == ["LTENTOUT"]: + return "levels/city/onin_tent" + elif dgos == ["VI1"]: + return "levels/jak1/village1" + elif dgos == ["INTROCST"] or dgos == ["LINTCSTB"]: + return "levels/intro" + elif dgos == ["OUTROCST"] or dgos == ["LOUTCSTB"] or dgos == ["LGARCSTA"]: + return "levels/outro" + elif dgos == ["ART", "GAME"] or dgos == ["ART"] or dgos == ["GAME"]: + return "levels/common" + elif dgos == ["MTX"] or dgos == ["MTN"] or dgos == ["MTX", "MCN"]: + return "levels/temple" + elif dgos == ["FOR"] or dgos == ["LWIDEB", "FOR"]: + return "levels/forest" + elif dgos == ["FOB"] or dgos == ["LPROTECT"]: + return "levels/forest/lifeseed" + elif dgos == ["HIPHOG"] or dgos == ["LHIPOUT"] or dgos == ["LWHACK"]: + return "levels/hiphog" + elif dgos == ["GGA"]: + return "levels/gungame" + elif dgos == ["DMI"]: + return "levels/drill_platform" + elif dgos == ["DRI"] or dgos == ["DRI", "DRILLMTN"]: + return "levels/drill_platform" + elif dgos == ["PAC"]: + return "levels/palace/cable" + elif dgos == ["PAE", "PAC"]: + return "levels/palace" + elif dgos == ["PALBOSS"]: + return "levels/palace/boss" + elif dgos == ["THR"] or dgos == ["LASHTHRN"]: + return "levels/palace/throne_room" + elif dgos == ["PAS"]: + return "levels/palace/shaft" + elif dgos == ["PAR"]: + return "levels/palace/roof" + elif dgos == ["PALOUT"]: + return "levels/palace/outside" + elif dgos == ["PAE"]: + return "levels/palace/explore" + elif dgos == ["STR"]: + return "levels/strip" + elif dgos == ["DG1", "D3A"]: + return "levels/dig" + elif dgos == ["D3A"] or dgos == ["D3B"]: + return "levels/dig/lurker_village" + elif dgos == ["DG1"]: + return "levels/dig/drill_equipment" + elif dgos == ["DRILLMTN"]: + return "levels/drill_platform/bg_mountain" + elif dgos == ["DRB"]: + return "levels/drill_platform/tower" + elif dgos == ["FEA"] or dgos == ["FEB"]: + return "levels/fortress/exit" + elif dgos == ["FRA"] or dgos == ["FRB"]: + return "levels/fortress/rescue" + elif dgos == ["PRI"] or dgos == ["LPRSNCST"]: + return "levels/fortress/prison" + elif dgos == ["CAS"]: + return "levels/landing_pad" + elif dgos == ["CAP"] or dgos == ["CASEXT"]: + return "levels/castle/pad" + elif dgos == ["CAB"]: + return "levels/castle/boss" + elif dgos == ["FDB"] or dgos == ["FORDUMPC"] or dgos == ["FDA"] or dgos == ["FORDUMPD"] or dgos == ["FORDUMPC", "FDA"]: + return "levels/fortress/ammo_dump" + elif dgos == ["FDA", "FRB"] or dgos == ["FEB", "FDB"]: + return "levels/fortress" + elif dgos == ["TOA"] or dgos == ["TOC", "TOA"] or dgos == ["TOC", "TOE", "TOB"]: + return "levels/mars_tomb" + elif dgos == ["TOB"]: + return "levels/mars_tomb/left" + elif dgos == ["TOC"]: + return "levels/mars_tomb/right" + elif dgos == ["TOD"]: + return "levels/mars_tomb/entrance" + elif dgos == ["TOE"]: + return "levels/mars_tomb/left/chase" + elif dgos == ["VIN"]: + return "levels/power_station" + elif dgos == ["LPOWER"]: + return "levels/power_station/power_switches" + elif dgos == ["ATO"] or dgos == ["ATE"]: + return "levels/atoll" + elif dgos == ["ATE", "CTYASHA"]: + return "levels/atoll/ashelin" + elif dgos == ["TBO"] or dgos == ["TOMBEXT"]: + return "levels/mars_tomb/baron" + elif dgos == ["CTYKORA"]: + return "levels/city/slums/kor" + elif dgos == ["LKIDDOGE"]: + return "levels/city/kid_escort" + elif dgos == ["CTYASHA"]: + return "levels/city/market/east/ashelin" + elif dgos == ["CMA", "CMB"]: + return "levels/city/market" + elif dgos == ["CMB"]: + return "levels/city/market/east" + elif dgos == ["CMA"]: + return "levels/city/market/west" + elif dgos == ["KIOSK"] or dgos == ["LMEETBRT"]: + return "levels/city/market/west/brutter_kiosk" + elif dgos == ["LPORTRUN"]: + return "levels/city/port/mines" + elif dgos == ["TITLE"]: + return "levels/title" + elif dgos == ["LSACK"]: + return "level/haven/misc/collection_task" + elif dgos == ["LPACKAGE"]: + return "level/haven/misc/delivery" + elif dgos == ["GARAGE"]: + return "levels/city/stadium/garage" + elif dgos == ["LRACELIT"]: + return "levels/stadium/races" + elif dgos == ["STADBLMP"]: + return "levels/city/stadium/defend" + elif dgos == ["SKA"]: + return "levels/stadium/jetboard" + elif dgos == ["LWIDESTA"] or dgos == ["STA"] or dgos == ["STD", "STC", "STB"] or dgos == ["STD", "STC"]: + return "levels/stadium" + elif dgos == ["STB"] or dgos == ["LRACEBF"]: + return "levels/stadium/races/class3" + elif dgos == ["STC"] or dgos == ["LRACECF"]: + return "levels/stadium/races/class2" + elif dgos == ["STD"] or dgos == ["LRACEDF"]: + return "levels/stadium/races/class1" + elif dgos == ["MCN"]: + return "levels/temple/canyon" + elif dgos == ["COA"] or dgos == ["COB"]: + return "levels/consite" + elif dgos == ["RUI"]: + return "levels/ruins" + elif dgos == ["SAG"]: + return "levels/ruins/hut" + elif dgos == ["SEW"] or dgos == ["SEB", "SWB"] or dgos == ["SEB"] or dgos == ["SWE", "SEW"] : + return "levels/sewer" + elif dgos == ["NES"] or dgos == ["NESTT", "NES"] or dgos == ["NESTT"]: + return "levels/nest" + elif dgos == ["NEB"]: + return "levels/nest/boss" + elif dgos == ["SWE"] or dgos == ["SWB"] or dgos == ["SEB", "SWB", "UNB"]: # interesting this is in underport too... who is 'ruf' and 'hal'? + return "levels/sewer/escort" + elif dgos == ["HALFPIPE"]: + return "levels/test/halfpipe" + elif dgos == ["CWI"] or dgos == ["PAC", "CWI"] or dgos == ["LWIDEA"] or dgos == ["LWIDEB"] or dgos == ["LWIDEB", "LWIDEA"] or dgos == ["LWIDEC"] or dgos == ["LWIDEC", "LWIDEA"] or dgos == ["LWIDEB", "LWIDEC", "LWIDEA"]: + return "levels/city/common" + elif dgos == ["LBBUSH"]: + return "levels/city/side_missions" + elif dgos == ["CTA"] or dgos == ["CTB"] or dgos == ["CTC"]: + return "levels/city/slums" + elif dgos == ["CPA"]: + return "levels/city/palace" + elif dgos == ["CIA"] or dgos == ["CIB"]: + return "levels/city/industrial" + elif dgos == ["CPO"] or dgos == ["PORTWALL"]: + return "levels/city/port" + elif dgos == ["LPRTRACE"]: + return "levels/city/port/race/side_mission" + elif dgos == ["LERLCHAL"]: + return "levels/city/port/race/errol" + elif dgos == ["LERLCHAL", "LPRTRACE"]: + return "levels/city/port/race" + elif dgos == ["CFB"] or dgos == ["CFA"] or dgos == ["CFB", "CFA"]: + return "levels/city/farm" + elif dgos == ["LBOMBBOT"]: + return "levels/common/enemy/bombots" + elif dgos == ["LTESS"] or dgos == ["LERLTESS", "LTESS"]: + return "characters/tess" + elif dgos == ["ATE", "UNB"]: + return "characters/sig" + elif dgos == ["LGUARD"] or dgos == ["LWIDEB", "DG1", "FRA", "FOB", "LWIDEC", "CAS", "PAE", "FEA", "FDB", "LWIDEA"] or dgos == ["LCGUARD"]: + return "characters/guards" + elif dgos == ["FRA", "FOB", "DRILLMTN"]: + return "characters/hover_guards" + elif dgos == ["FOR", "DMI", "FRA", "STR", "NEB", "D3A", "UNB"]: + return "levels/common/enemy/hover" + elif dgos == ["FOR", "DG1", "FRA", "CAS", "PAE", "FEA", "FDB"]: + return "levels/common/enemy/guards" + elif dgos == ["FOR", "ATE"]: + return "levels/common/enemy" + elif dgos == ["STD", "STC", "LERLCHAL", "STB", "LPRTRACE"] or dgos == ["LRACEDF"] or dgos == ["LRACECF"] or dgos == ["LRACECB"] or dgos == ["LRACEBB"] or dgos == ["LRACEDB"] or dgos == ["LRACEBF"]: + return "levels/common/races" + elif dgos == ["LTHRNOUT", "NEB"] or dgos == ["PAS", "TOD"] or dgos == ["FRB", "TOA"] or dgos == ["FRB", "FDB"] or dgos == ["LWIDEC", "CAS"] or dgos == ["TBO", "FRB"] or dgos == ["NESTT", "NES", "LPROTECT"] or dgos == ["SEB", "SWB", "PAE", "PAC"] or dgos == ["ATO", "NESTT", "NES", "LPROTECT"] or dgos == ["ATE", "CTYKORA"] or dgos == ["PAC", "LCITYLOW", "CASCITY"] or dgos == ["FRA", "FRB"] or dgos == ["DRI", "DRB"] or dgos == ["D3B", "RUI"] or dgos == ["PAC", "HALFPIPE"] or dgos == ["CASEXT", "LWIDEC", "LWIDEA"] or dgos == ["LOUTCSTB", "LHIPOUT"] or dgos == ["CTC", "MTN", "CAS", "COA", "CFA", "CPA"] or dgos == ["LOUTCSTB", "VI1"] or dgos == ["CIB", "CAP"] or dgos == ["LKEIRIFT", "LINTCSTB"] or dgos == ["FDA", "FEA", "TOB"] or dgos == ["CTB", "SEB", "SWB", "CFA", "PAS", "CPA"]: + return "levels/common/entities" + elif dgos == ["LKEIRIFT"]: + return "characters/keira_riftrider" + elif dgos == ["LERLTESS"]: + return "characters/errol_tess" + elif dgos == ["LERROL"]: + return "characters/errol" + elif dgos == ["LWIDESTA", "ATE", "VIN"]: + return "levels/common/particls" + elif dgos == ["LSHUTTLE"]: + return "characters/underground_fighters" + elif dgos == ["ATO", "SEB", "SWB", "RUI"]: + return "levels/common/enemy/fodder" + elif dgos == ["LHELLDOG"]: + return "levels/common/enemy/hellcat" + elif dgos == ["LJAKDAX"]: + return "characters/jak_daxter" + elif dgos == ["ATE", "SEB", "SWB", "RUI"] or dgos == ["ATE", "SEW", "RUI"]: + return "levels/common/enemy/amphibian" + elif dgos == ["LWIDEB", "STR", "DRILLMTN", "STADBLMP", "HALFPIPE", "SEW", "UNB", "RUI", "CTYASHA"]: + return "levels/common/enemy/metalhead_grunt" + elif dgos == ["LWIDEB", "STR", "NEB", "D3A", "STADBLMP", "RUI"]: + return "levels/common/enemy/metalhead_scout" + elif dgos == ["NEB", "DRILLMTN"]: + return "levels/common/enemy/metalhead_wasp" + elif dgos == ["DMI", "MTN"] or dgos == ["DRI", "MTX"]: + return "levels/common/enemy/metalhead_bearer" + elif dgos == ["DG1", "D3A", "UNB", "RUI"] or dgos == ["D3A", "RUI"]: + return "levels/common/enemy/metalhead_slinger" + elif dgos == ["DG1", "MTN", "ATE", "D3A"] or dgos == ["ATE", "MTX", "D3A"]: + return "levels/common/enemy/metalhead_brown" + elif dgos == ["LSAMERGD"]: + return "characters/samos_errol_guard" + elif dgos == ["DG1", "D3A", "TOA"]: + return "levels/common/enemy/baby_spider" + elif dgos == ["LERBRNGD"]: + return "characters/errol_baron_guard" + elif dgos == ["LSMYSBRT"]: + return "characters/samos_youngsamos_brutter" + elif dgos == ["LBRNERMK"]: + return "characters/baron_errol_metalkor" + elif dgos == ["LDJAKBRN"]: + return "characters/jak/intro_clothes" + elif dgos == ["NEB", "CTYKORA"]: + return "characters/kid" + elif dgos == ["LYSKDCD"]: + return "characters/youngsamos_kid_dog" + elif dgos == ["LYSAMSAM"]: + return "characters/youngsamos_and_samos" + elif dgos == ["LTRNYSAM"]: + return "characters/torn_youngsamos" + elif dgos == ["LJKDXASH"]: + return "characters/jak_daxter_ashelin" + elif dgos == ["LWIDESTA", "LERLTESS", "LBRNERMK", "INTROCST", "LERROL", "LSAMERGD"]: + return "characters/high-res/errol" + elif dgos == ["NEB", "COB"]: + return "characters/high-res/metalkor" + elif dgos == ["ATE", "LHIPOUT", "LTESS", "UND", "LGUARD"]: + return "characters/high-res/sig" + elif dgos == ["LTHRNOUT", "LTRNYSAM", "LTRNTESS", "SAG", "LTRNKRKD"]: + return "characters/high-res/torn" + elif dgos == ["ORACLE", "NEB", "VI1"]: + return "characters/high-res/darkjak" + elif dgos == ["LERLTESS", "LGARCSTA", "CAB", "LTESS", "LGUARD"]: + return "characters/high-res/krew" + elif dgos == ["LERLTESS", "LGARCSTA", "LPRSNCST", "LTRNTESS", "OUTROCST", "LWHACK", "LTESS"]: + return "characters/high-res/tess" + elif dgos == ["KIOSK", "LOUTCSTB", "STADBLMP", "LSMYSBRT"]: + return "characters/high-res/brutter" + elif dgos == ["OUTROCST", "ONINTENT"]: + return "characters/high-res/onin" + elif dgos == ["LERBRNGD", "LSAMERGD"]: + return "characters/low-res/guard" + elif dgos == ["LGARCSTA", "LPRSNCST", "OUTROCST", "LERBRNGD", "STADBLMP", "LSAMERGD", "LINTCSTB", "LSMYSBRT", "LYSAMSAM"]: + return "characters/high-res/samos" + elif dgos == ["LTRNYSAM", "LOUTCSTB", "LPRSNCST", "FOB", "STADBLMP", "LYSKDCD", "TOD", "LTENTOUT", "LSMYSBRT", "LYSAMSAM"]: + return "characters/high-res/youngsamos" + elif dgos == ["LOUTCSTB", "NEB", "LTRNKRKD", "LYSKDCD", "TOD", "VIN", "CTYKORA"]: + return "characters/high-res/kid" + elif dgos == ["LHIPOUT", "LYSKDCD", "TOD", "VIN"]: + return "characters/high-res/crocadog" + elif dgos == ["LHIPOUT", "ONINTENT"]: + return "characters/high-res/pecker" + elif dgos == ["LTENTOB", "LTRNKRKD", "TOD", "VIN", "CTYKORA"]: + return "characters/high-res/kor" + elif dgos == ["OUTROCST", "LKEIRIFT", "LINTCSTB", "GARAGE"]: + return "characters/high-res/keira" + elif dgos == ["LWIDESTA", "LBRNERMK", "LERBRNGD", "COA", "TOMBEXT", "PALBOSS", "LDJAKBRN"]: + return "characters/high-res/baron" + elif dgos == ["LWIDESTA", "LERBRNGD", "COA", "LCGUARD", "FORDUMPD", "LSAMERGD", "LASHGRD", "LGUARD", "CTYKORA", "CTYASHA"]: + return "characters/high-res/guard" + elif dgos == ["CASEXT", "HIDEOUT", "KIOSK", "ORACLE", "INTROCST", "ATE", "FOB", "LJAKDAX", "FORDUMPC", "LTRNTESS", "THR", "PRI", "SAG", "NEB", "DEMO", "MTX", "LJKDXASH", "COA", "TOMBEXT", "PALBOSS", "TITLE", "ONINTENT", "STA", "TOA", "UND", "LYSKDCD", "D3B", "SWE", "GGA", "TOD", "MCN", "SEW", "VIN", "CAP", "CTYKORA", "CTYASHA", "HIPHOG", "VI1"]: + return "characters/high-res/daxter" + elif dgos == ["CASEXT", "HIDEOUT", "KIOSK", "ATE", "LPRSNCST", "FOB", "LJAKDAX", "FORDUMPC", "LTRNTESS", "THR", "SAG", "MTX", "LJKDXASH", "COA", "PALBOSS", "ONINTENT", "STA", "TOA", "UND", "LYSKDCD", "D3B", "SWE", "GGA", "TOD", "MCN", "SEW", "VIN", "CAP", "CTYKORA", "CTYASHA", "HIPHOG"]: + return "characters/high-res/jak" + elif dgos == ["CASEXT", "LTHRNOUT", "LGARCSTA", "ATE", "LASHTHRN", "LJKDXASH", "LASHGRD", "CTYASHA"]: + return "characters/high-res/ashelin" + elif dgos == ["UND"] or dgos == ["UNB"]: + return "levels/underport" + elif dgos == ["CGB"] or dgos == ["CGA"] or dgos == ["CGC"]: + return "levels/city/generic" + elif dgos == ["LCITYLOW"] or dgos == ["CASCITY"]: + return "levels/city/low-quality" + elif dgos == ["GAME", "COMMON"]: + return "levels/common" + elif dgos == ["ATE", "SEB", "SWB", "LKIDDOGE", "UNB", "CTYKORA", "CTYASHA"]: + return "levels/common/ai" + elif dgos == ["LASHGRD"]: + return "characters/ashelin_guard" + elif dgos == ["SEB", "SWB", "LKIDDOGE", "UNB", "CTYKORA"]: # TODO - wtf is 'hal' + return "levels/undefined" + elif dgos == ["DRILLMTN", "UNB", "RUI"] or dgos == ["UNB", "RUI"] or dgos == ["DMI", "RUI"]: + return "levels/target/mech_suit" + +remaining_dgos = {} + +folders = {} + +for jak2_file in jak2_files: + if jak2_file[3] == ["NO-XGO"]: + num_replicated = num_replicated + 1 + continue + # manual overrides + if jak2_file[0] in path_overrides or jak2_file[0].removesuffix("-h") in path_overrides: + num_replicated = num_replicated + 1 + if jak2_file[0] in path_overrides: + jak2_file[4] = path_overrides[jak2_file[0]] + else: + jak2_file[4] = path_overrides[jak2_file[0].removesuffix("-h")] + if jak2_file[4] not in folders: + folders[jak2_file[4]] = 1 + else: + folders[jak2_file[4]] = folders[jak2_file[4]] + 1 + continue + # port over manually specified engine files + if jak2_file[0] in engine_files or jak2_file[0].removesuffix("-h") in engine_files: + num_replicated = num_replicated + 1 + if jak2_file[0] in engine_files: + jak2_file[4] = str.format("engine/{}", engine_files[jak2_file[0]]) + else: + jak2_file[4] = str.format("engine/{}", engine_files[jak2_file[0].removesuffix("-h")]) + if jak2_file[4] not in folders: + folders[jak2_file[4]] = 1 + else: + folders[jak2_file[4]] = folders[jak2_file[4]] + 1 + continue + # attempt to find the object with the same name in jak1 + jak1_path = None + if not jak2_file[0].startswith("tpage"): + for jak1_file in jak1_files: + if jak1_file[0] == jak2_file[0]: + jak1_path = jak1_file[4] + if (jak1_path.startswith("levels")): + print("{} - {}".format(jak1_path, jak2_file[0])) + break + if jak1_path is not None: + jak2_file[4] = jak1_path + num_replicated = num_replicated + 1 + elif level_name(jak2_file): + jak2_file[4] = level_name(jak2_file) + num_replicated = num_replicated + 1 + else: + num_left = num_left + 1 + if ",".join(jak2_file[3]) in remaining_dgos: + remaining_dgos[",".join(jak2_file[3])] = remaining_dgos[",".join(jak2_file[3])] + 1 + else: + remaining_dgos[",".join(jak2_file[3])] = 1 + if jak2_file[4] not in folders: + folders[jak2_file[4]] = 1 + else: + folders[jak2_file[4]] = folders[jak2_file[4]] + 1 + +with open('../../goal_src/jak2/build/all_objs.json', 'w') as json_file: + # Calculate these to make the file as compact as possible + longest_name = 0 + longest_name_in_dgo = 0 + for jak2_file in jak2_files: + if len(jak2_file[0]) > longest_name: + longest_name = len(jak2_file[0]) + if len(jak2_file[1]) > longest_name_in_dgo: + longest_name_in_dgo = len(jak2_file[1]) + # Actually write things out + json_file.write("[\n") + i = 0 + for jak2_file in jak2_files: + name = '{: <{}}'.format("\"{}\",".format(jak2_file[0]), longest_name + 2) + name_in_dgo = '{: <{}}'.format("\"{}\",".format(jak2_file[1]), longest_name_in_dgo + 2) + dgo_set = "[" + for dgo in jak2_file[3]: + dgo_set += "\"{}\", ".format(dgo) + dgo_set = dgo_set.removesuffix(", ") + dgo_set += "]" + if i == (len(jak2_files) - 1): + json_file.write("[{}{}{}, {}, \"{}\"]\n".format(name, name_in_dgo, jak2_file[2], dgo_set, jak2_file[4])) + else: + json_file.write("[{}{}{}, {}, \"{}\"],\n".format(name, name_in_dgo, jak2_file[2], dgo_set, jak2_file[4])) + i = i + 1 + json_file.write("]\n") + +print("Mapped: {} and Left: {}".format(num_replicated, num_left)) + +limit = 0 +for dgo_set in dict(sorted(remaining_dgos.items(), reverse=True, key=lambda item: item[1])): + dgo_set_nice = "" + for dgo in dgo_set.split(","): + dgo_set_nice += "\"{}\", ".format(dgo) + dgo_set_nice = dgo_set_nice.removesuffix(", ") + print("or dgos == [{}]: {}".format(dgo_set_nice, remaining_dgos[dgo_set])) + if limit > 100: + break + limit = limit + 1 +print(len(remaining_dgos)) + +print("Folder | Number of Files") +for folder in dict(sorted(folders.items(), reverse=True, key=lambda item: item[1])): + print("{}: {}".format(folder, folders[folder])) + if limit > 100: + break + limit = limit + 1 diff --git a/scripts/make_empty_obj_files.py b/scripts/initial_gsrc_creation/make_empty_obj_files.py old mode 100755 new mode 100644 similarity index 100% rename from scripts/make_empty_obj_files.py rename to scripts/initial_gsrc_creation/make_empty_obj_files.py diff --git a/test/decompiler/reference/engine/game/collectables_REF.gc b/test/decompiler/reference/engine/game/collectables_REF.gc index 9d98dff75d..4b46205116 100644 --- a/test/decompiler/reference/engine/game/collectables_REF.gc +++ b/test/decompiler/reference/engine/game/collectables_REF.gc @@ -1,10 +1,10 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/buzzer-ag.gc") -(import "goal_src/import/ecovalve-ag.gc") -(import "goal_src/import/money-ag.gc") -(import "goal_src/import/fuel-cell-ag.gc") +(import "goal_src/jak1/import/buzzer-ag.gc") +(import "goal_src/jak1/import/ecovalve-ag.gc") +(import "goal_src/jak1/import/money-ag.gc") +(import "goal_src/jak1/import/fuel-cell-ag.gc") ;; definition for symbol *eco-pill-count*, type int (define *eco-pill-count* 0) diff --git a/test/decompiler/reference/engine/game/crates_REF.gc b/test/decompiler/reference/engine/game/crates_REF.gc index e7622401f0..f3d418bd38 100644 --- a/test/decompiler/reference/engine/game/crates_REF.gc +++ b/test/decompiler/reference/engine/game/crates_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/crate-ag.gc") +(import "goal_src/jak1/import/crate-ag.gc") ;; failed to figure out what this is: (defskelgroup *crate-barrel-sg* crate crate-barrel-lod0-jg crate-barrel-idle-ja diff --git a/test/decompiler/reference/engine/game/voicebox_REF.gc b/test/decompiler/reference/engine/game/voicebox_REF.gc index a521272b00..88bcc07796 100644 --- a/test/decompiler/reference/engine/game/voicebox_REF.gc +++ b/test/decompiler/reference/engine/game/voicebox_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/speaker-ag.gc") +(import "goal_src/jak1/import/speaker-ag.gc") ;; definition of type camera-voicebox (deftype camera-voicebox (camera-slave) diff --git a/test/decompiler/reference/engine/target/sidekick_REF.gc b/test/decompiler/reference/engine/target/sidekick_REF.gc index 014c25b6e3..2c44bbfd1b 100644 --- a/test/decompiler/reference/engine/target/sidekick_REF.gc +++ b/test/decompiler/reference/engine/target/sidekick_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/sidekick-ag.gc") +(import "goal_src/jak1/import/sidekick-ag.gc") ;; definition for symbol *sidekick-remap*, type pair (define *sidekick-remap* '(("run-to-stance-left" "run-to-stance") diff --git a/test/decompiler/reference/engine/target/target-death_REF.gc b/test/decompiler/reference/engine/target/target-death_REF.gc index 0cd02afaf1..b11beaeaa0 100644 --- a/test/decompiler/reference/engine/target/target-death_REF.gc +++ b/test/decompiler/reference/engine/target/target-death_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/deathcam-ag.gc") +(import "goal_src/jak1/import/deathcam-ag.gc") ;; failed to figure out what this is: (defskelgroup *deathcam-sg* deathcam deathcam-lod0-jg deathcam-idle-ja diff --git a/test/decompiler/reference/engine/target/target-util_REF.gc b/test/decompiler/reference/engine/target/target-util_REF.gc index 085a75f5c1..43f21b60cb 100644 --- a/test/decompiler/reference/engine/target/target-util_REF.gc +++ b/test/decompiler/reference/engine/target/target-util_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/eichar-ag.gc") +(import "goal_src/jak1/import/eichar-ag.gc") ;; failed to figure out what this is: (defskelgroup *jchar-sg* eichar eichar-lod0-jg -1 diff --git a/test/decompiler/reference/engine/ui/hud-classes_REF.gc b/test/decompiler/reference/engine/ui/hud-classes_REF.gc index b11c9b30b7..6defa147d9 100644 --- a/test/decompiler/reference/engine/ui/hud-classes_REF.gc +++ b/test/decompiler/reference/engine/ui/hud-classes_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/fuelcell-naked-ag.gc") +(import "goal_src/jak1/import/fuelcell-naked-ag.gc") ;; failed to figure out what this is: (defpartgroup group-part-hud-pickup diff --git a/test/decompiler/reference/levels/beach/beach-obs_REF.gc b/test/decompiler/reference/levels/beach/beach-obs_REF.gc index aa85a83081..354bb822d4 100644 --- a/test/decompiler/reference/levels/beach/beach-obs_REF.gc +++ b/test/decompiler/reference/levels/beach/beach-obs_REF.gc @@ -1,15 +1,15 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/ecoventrock-ag.gc") -(import "goal_src/import/beachcam-ag.gc") -(import "goal_src/import/windmill-one-ag.gc") -(import "goal_src/import/kickrock-ag.gc") -(import "goal_src/import/harvester-ag.gc") -(import "goal_src/import/flutflutegg-ag.gc") -(import "goal_src/import/grottopole-ag.gc") -(import "goal_src/import/flutflut-ag.gc") -(import "goal_src/import/bladeassm-ag.gc") +(import "goal_src/jak1/import/ecoventrock-ag.gc") +(import "goal_src/jak1/import/beachcam-ag.gc") +(import "goal_src/jak1/import/windmill-one-ag.gc") +(import "goal_src/jak1/import/kickrock-ag.gc") +(import "goal_src/jak1/import/harvester-ag.gc") +(import "goal_src/jak1/import/flutflutegg-ag.gc") +(import "goal_src/jak1/import/grottopole-ag.gc") +(import "goal_src/jak1/import/flutflut-ag.gc") +(import "goal_src/jak1/import/bladeassm-ag.gc") ;; failed to figure out what this is: (defskelgroup *beachcam-sg* beachcam beachcam-lod0-jg beachcam-anim-ja diff --git a/test/decompiler/reference/levels/beach/beach-rocks_REF.gc b/test/decompiler/reference/levels/beach/beach-rocks_REF.gc index e051ae3992..c15b68b7c3 100644 --- a/test/decompiler/reference/levels/beach/beach-rocks_REF.gc +++ b/test/decompiler/reference/levels/beach/beach-rocks_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/lrocklrg-ag.gc") +(import "goal_src/jak1/import/lrocklrg-ag.gc") ;; failed to figure out what this is: (defskelgroup *lrocklrg-sg* lrocklrg lrocklrg-lod0-jg lrocklrg-idle-ja diff --git a/test/decompiler/reference/levels/beach/bird-lady-beach_REF.gc b/test/decompiler/reference/levels/beach/bird-lady-beach_REF.gc index cb05e50b39..602f30d7d6 100644 --- a/test/decompiler/reference/levels/beach/bird-lady-beach_REF.gc +++ b/test/decompiler/reference/levels/beach/bird-lady-beach_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/bird-lady-beach-ag.gc") +(import "goal_src/jak1/import/bird-lady-beach-ag.gc") ;; definition of type bird-lady-beach (deftype bird-lady-beach (process-taskable) diff --git a/test/decompiler/reference/levels/beach/bird-lady_REF.gc b/test/decompiler/reference/levels/beach/bird-lady_REF.gc index 552df8f6aa..e1d129fafd 100644 --- a/test/decompiler/reference/levels/beach/bird-lady_REF.gc +++ b/test/decompiler/reference/levels/beach/bird-lady_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/bird-lady-ag.gc") +(import "goal_src/jak1/import/bird-lady-ag.gc") ;; definition of type bird-lady (deftype bird-lady (process-taskable) diff --git a/test/decompiler/reference/levels/beach/lurkercrab_REF.gc b/test/decompiler/reference/levels/beach/lurkercrab_REF.gc index f6a8690611..fe4b8395c9 100644 --- a/test/decompiler/reference/levels/beach/lurkercrab_REF.gc +++ b/test/decompiler/reference/levels/beach/lurkercrab_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/lurkercrab-ag.gc") +(import "goal_src/jak1/import/lurkercrab-ag.gc") ;; failed to figure out what this is: (defpartgroup group-lurkercrab-slide diff --git a/test/decompiler/reference/levels/beach/lurkerpuppy_REF.gc b/test/decompiler/reference/levels/beach/lurkerpuppy_REF.gc index 23794ed792..ee5dfcf3c8 100644 --- a/test/decompiler/reference/levels/beach/lurkerpuppy_REF.gc +++ b/test/decompiler/reference/levels/beach/lurkerpuppy_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/lurkerpuppy-ag.gc") +(import "goal_src/jak1/import/lurkerpuppy-ag.gc") ;; definition of type lurkerpuppy (deftype lurkerpuppy (nav-enemy) diff --git a/test/decompiler/reference/levels/beach/lurkerworm_REF.gc b/test/decompiler/reference/levels/beach/lurkerworm_REF.gc index 1690fc68fc..0e619c73cb 100644 --- a/test/decompiler/reference/levels/beach/lurkerworm_REF.gc +++ b/test/decompiler/reference/levels/beach/lurkerworm_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/lurkerworm-ag.gc") +(import "goal_src/jak1/import/lurkerworm-ag.gc") ;; definition of type lurkerworm (deftype lurkerworm (process-drawable) diff --git a/test/decompiler/reference/levels/beach/mayor_REF.gc b/test/decompiler/reference/levels/beach/mayor_REF.gc index d3729fdfee..710b273e5e 100644 --- a/test/decompiler/reference/levels/beach/mayor_REF.gc +++ b/test/decompiler/reference/levels/beach/mayor_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/mayor-ag.gc") +(import "goal_src/jak1/import/mayor-ag.gc") ;; definition of type mayor (deftype mayor (process-taskable) diff --git a/test/decompiler/reference/levels/beach/pelican_REF.gc b/test/decompiler/reference/levels/beach/pelican_REF.gc index 6b11c1319b..898cf0a983 100644 --- a/test/decompiler/reference/levels/beach/pelican_REF.gc +++ b/test/decompiler/reference/levels/beach/pelican_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/pelican-ag.gc") +(import "goal_src/jak1/import/pelican-ag.gc") ;; definition of type pelican-bank (deftype pelican-bank (basic) diff --git a/test/decompiler/reference/levels/beach/sculptor_REF.gc b/test/decompiler/reference/levels/beach/sculptor_REF.gc index 5b0c5f59d6..54c8448c73 100644 --- a/test/decompiler/reference/levels/beach/sculptor_REF.gc +++ b/test/decompiler/reference/levels/beach/sculptor_REF.gc @@ -1,8 +1,8 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/sculptor-muse-ag.gc") -(import "goal_src/import/sculptor-ag.gc") +(import "goal_src/jak1/import/sculptor-muse-ag.gc") +(import "goal_src/jak1/import/sculptor-ag.gc") ;; definition of type sculptor (deftype sculptor (process-taskable) diff --git a/test/decompiler/reference/levels/beach/seagull_REF.gc b/test/decompiler/reference/levels/beach/seagull_REF.gc index 3850b8ac21..c4e9e9f178 100644 --- a/test/decompiler/reference/levels/beach/seagull_REF.gc +++ b/test/decompiler/reference/levels/beach/seagull_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/seagull-ag.gc") +(import "goal_src/jak1/import/seagull-ag.gc") ;; failed to figure out what this is: (defpartgroup group-seagull-takeoff diff --git a/test/decompiler/reference/levels/citadel/assistant-citadel_REF.gc b/test/decompiler/reference/levels/citadel/assistant-citadel_REF.gc index 071c464428..93d7ea3b2e 100644 --- a/test/decompiler/reference/levels/citadel/assistant-citadel_REF.gc +++ b/test/decompiler/reference/levels/citadel/assistant-citadel_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/assistant-lavatube-end-ag.gc") +(import "goal_src/jak1/import/assistant-lavatube-end-ag.gc") ;; definition of type assistant-lavatube-end (deftype assistant-lavatube-end (process-taskable) diff --git a/test/decompiler/reference/levels/citadel/citadel-obs_REF.gc b/test/decompiler/reference/levels/citadel/citadel-obs_REF.gc index 26941b813c..17166a09ac 100644 --- a/test/decompiler/reference/levels/citadel/citadel-obs_REF.gc +++ b/test/decompiler/reference/levels/citadel/citadel-obs_REF.gc @@ -1,17 +1,17 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/citb-generator-ag.gc") -(import "goal_src/import/citb-launcher-ag.gc") -(import "goal_src/import/citb-button-ag.gc") -(import "goal_src/import/citadelcam-ag.gc") -(import "goal_src/import/citb-hose-ag.gc") -(import "goal_src/import/citb-robotboss-ag.gc") -(import "goal_src/import/citb-coil-ag.gc") -(import "goal_src/import/citb-arm-shoulder-ag.gc") -(import "goal_src/import/citb-iris-door-ag.gc") -(import "goal_src/import/citb-disc-ag.gc") -(import "goal_src/import/citb-arm-ag.gc") +(import "goal_src/jak1/import/citb-generator-ag.gc") +(import "goal_src/jak1/import/citb-launcher-ag.gc") +(import "goal_src/jak1/import/citb-button-ag.gc") +(import "goal_src/jak1/import/citadelcam-ag.gc") +(import "goal_src/jak1/import/citb-hose-ag.gc") +(import "goal_src/jak1/import/citb-robotboss-ag.gc") +(import "goal_src/jak1/import/citb-coil-ag.gc") +(import "goal_src/jak1/import/citb-arm-shoulder-ag.gc") +(import "goal_src/jak1/import/citb-iris-door-ag.gc") +(import "goal_src/jak1/import/citb-disc-ag.gc") +(import "goal_src/jak1/import/citb-arm-ag.gc") ;; definition of type citb-arm-section (deftype citb-arm-section (process-drawable) diff --git a/test/decompiler/reference/levels/citadel/citadel-sages_REF.gc b/test/decompiler/reference/levels/citadel/citadel-sages_REF.gc index d9bb2f503d..4713fdfc54 100644 --- a/test/decompiler/reference/levels/citadel/citadel-sages_REF.gc +++ b/test/decompiler/reference/levels/citadel/citadel-sages_REF.gc @@ -1,13 +1,13 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/green-sagecage-ag.gc") -(import "goal_src/import/yellowsage-ag.gc") -(import "goal_src/import/redsage-ag.gc") -(import "goal_src/import/evilbro-citadel-ag.gc") -(import "goal_src/import/evilsis-citadel-ag.gc") -(import "goal_src/import/citb-sagecage-ag.gc") -(import "goal_src/import/bluesage-ag.gc") +(import "goal_src/jak1/import/green-sagecage-ag.gc") +(import "goal_src/jak1/import/yellowsage-ag.gc") +(import "goal_src/jak1/import/redsage-ag.gc") +(import "goal_src/jak1/import/evilbro-citadel-ag.gc") +(import "goal_src/jak1/import/evilsis-citadel-ag.gc") +(import "goal_src/jak1/import/citb-sagecage-ag.gc") +(import "goal_src/jak1/import/bluesage-ag.gc") ;; failed to figure out what this is: (defskelgroup *citb-sagecage-sg* citb-sagecage citb-sagecage-lod0-jg citb-sagecage-redsage-idle-ja diff --git a/test/decompiler/reference/levels/citadel/citb-bunny_REF.gc b/test/decompiler/reference/levels/citadel/citb-bunny_REF.gc index b975f2f08f..9a7f87b3b4 100644 --- a/test/decompiler/reference/levels/citadel/citb-bunny_REF.gc +++ b/test/decompiler/reference/levels/citadel/citb-bunny_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/citb-bunny-ag.gc") +(import "goal_src/jak1/import/citb-bunny-ag.gc") ;; definition of type citb-bunny (deftype citb-bunny (snow-bunny) diff --git a/test/decompiler/reference/levels/citadel/citb-drop-plat_REF.gc b/test/decompiler/reference/levels/citadel/citb-drop-plat_REF.gc index 5fa6a8d8d3..eecc07fa81 100644 --- a/test/decompiler/reference/levels/citadel/citb-drop-plat_REF.gc +++ b/test/decompiler/reference/levels/citadel/citb-drop-plat_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/citb-drop-plat-ag.gc") +(import "goal_src/jak1/import/citb-drop-plat-ag.gc") ;; failed to figure out what this is: (defskelgroup *citb-drop-plat-sg* citb-drop-plat citb-drop-plat-lod0-jg citb-drop-plat-idle-ja diff --git a/test/decompiler/reference/levels/citadel/citb-plat_REF.gc b/test/decompiler/reference/levels/citadel/citb-plat_REF.gc index d940438865..967dd2295c 100644 --- a/test/decompiler/reference/levels/citadel/citb-plat_REF.gc +++ b/test/decompiler/reference/levels/citadel/citb-plat_REF.gc @@ -1,14 +1,14 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/citb-exit-plat-ag.gc") -(import "goal_src/import/plat-eco-citb-ag.gc") -(import "goal_src/import/plat-citb-ag.gc") -(import "goal_src/import/citb-stopbox-ag.gc") -(import "goal_src/import/citb-firehose-ag.gc") -(import "goal_src/import/citb-rotatebox-ag.gc") -(import "goal_src/import/citb-chain-plat-ag.gc") -(import "goal_src/import/citb-donut-ag.gc") +(import "goal_src/jak1/import/citb-exit-plat-ag.gc") +(import "goal_src/jak1/import/plat-eco-citb-ag.gc") +(import "goal_src/jak1/import/plat-citb-ag.gc") +(import "goal_src/jak1/import/citb-stopbox-ag.gc") +(import "goal_src/jak1/import/citb-firehose-ag.gc") +(import "goal_src/jak1/import/citb-rotatebox-ag.gc") +(import "goal_src/jak1/import/citb-chain-plat-ag.gc") +(import "goal_src/jak1/import/citb-donut-ag.gc") ;; failed to figure out what this is: (defskelgroup *plat-citb-sg* plat-citb plat-citb-lod0-jg plat-citb-idle-ja diff --git a/test/decompiler/reference/levels/common/babak_REF.gc b/test/decompiler/reference/levels/common/babak_REF.gc index c5563de16a..bc4f00b318 100644 --- a/test/decompiler/reference/levels/common/babak_REF.gc +++ b/test/decompiler/reference/levels/common/babak_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/babak-ag.gc") +(import "goal_src/jak1/import/babak-ag.gc") ;; definition of type babak (deftype babak (nav-enemy) diff --git a/test/decompiler/reference/levels/common/basebutton_REF.gc b/test/decompiler/reference/levels/common/basebutton_REF.gc index 1942505f2d..6ce327163d 100644 --- a/test/decompiler/reference/levels/common/basebutton_REF.gc +++ b/test/decompiler/reference/levels/common/basebutton_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/generic-button-ag.gc") +(import "goal_src/jak1/import/generic-button-ag.gc") ;; definition of type basebutton (deftype basebutton (process-drawable) diff --git a/test/decompiler/reference/levels/common/blocking-plane_REF.gc b/test/decompiler/reference/levels/common/blocking-plane_REF.gc index e60e602151..9c1d684878 100644 --- a/test/decompiler/reference/levels/common/blocking-plane_REF.gc +++ b/test/decompiler/reference/levels/common/blocking-plane_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/ef-plane-ag.gc") +(import "goal_src/jak1/import/ef-plane-ag.gc") ;; definition of type blocking-plane (deftype blocking-plane (process-drawable) diff --git a/test/decompiler/reference/levels/common/launcherdoor_REF.gc b/test/decompiler/reference/levels/common/launcherdoor_REF.gc index 5465a5cc9f..0f16c43cee 100644 --- a/test/decompiler/reference/levels/common/launcherdoor_REF.gc +++ b/test/decompiler/reference/levels/common/launcherdoor_REF.gc @@ -1,8 +1,8 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/launcherdoor-maincave-ag.gc") -(import "goal_src/import/launcherdoor-ag.gc") +(import "goal_src/jak1/import/launcherdoor-maincave-ag.gc") +(import "goal_src/jak1/import/launcherdoor-ag.gc") ;; definition of type launcherdoor (deftype launcherdoor (process-drawable) diff --git a/test/decompiler/reference/levels/common/orb-cache_REF.gc b/test/decompiler/reference/levels/common/orb-cache_REF.gc index cdb80d8835..18677dd8da 100644 --- a/test/decompiler/reference/levels/common/orb-cache_REF.gc +++ b/test/decompiler/reference/levels/common/orb-cache_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/orb-cache-top-ag.gc") +(import "goal_src/jak1/import/orb-cache-top-ag.gc") ;; definition of type orb-cache-top (deftype orb-cache-top (baseplat) diff --git a/test/decompiler/reference/levels/common/plat-button_REF.gc b/test/decompiler/reference/levels/common/plat-button_REF.gc index fa35e2c824..a8ed46570b 100644 --- a/test/decompiler/reference/levels/common/plat-button_REF.gc +++ b/test/decompiler/reference/levels/common/plat-button_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/plat-button-ag.gc") +(import "goal_src/jak1/import/plat-button-ag.gc") ;; definition of type plat-button (deftype plat-button (process-drawable) diff --git a/test/decompiler/reference/levels/common/plat-eco_REF.gc b/test/decompiler/reference/levels/common/plat-eco_REF.gc index e4b8af0465..aeac1e3ae4 100644 --- a/test/decompiler/reference/levels/common/plat-eco_REF.gc +++ b/test/decompiler/reference/levels/common/plat-eco_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/plat-eco-ag.gc") +(import "goal_src/jak1/import/plat-eco-ag.gc") ;; definition of type plat-eco (deftype plat-eco (plat) diff --git a/test/decompiler/reference/levels/common/plat_REF.gc b/test/decompiler/reference/levels/common/plat_REF.gc index 8aada5fcbf..6d938c0f3c 100644 --- a/test/decompiler/reference/levels/common/plat_REF.gc +++ b/test/decompiler/reference/levels/common/plat_REF.gc @@ -1,9 +1,9 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/plat-sunken-ag.gc") -(import "goal_src/import/plat-ag.gc") -(import "goal_src/import/plat-jungleb-ag.gc") +(import "goal_src/jak1/import/plat-sunken-ag.gc") +(import "goal_src/jak1/import/plat-ag.gc") +(import "goal_src/jak1/import/plat-jungleb-ag.gc") ;; failed to figure out what this is: (defpartgroup group-standard-plat diff --git a/test/decompiler/reference/levels/common/ropebridge_REF.gc b/test/decompiler/reference/levels/common/ropebridge_REF.gc index 6056629afd..edd9faaa92 100644 --- a/test/decompiler/reference/levels/common/ropebridge_REF.gc +++ b/test/decompiler/reference/levels/common/ropebridge_REF.gc @@ -1,12 +1,12 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/vil3-bridge-36-ag.gc") -(import "goal_src/import/ropebridge-36-ag.gc") -(import "goal_src/import/ropebridge-32-ag.gc") -(import "goal_src/import/ropebridge-52-ag.gc") -(import "goal_src/import/snow-bridge-36-ag.gc") -(import "goal_src/import/ropebridge-70-ag.gc") +(import "goal_src/jak1/import/vil3-bridge-36-ag.gc") +(import "goal_src/jak1/import/ropebridge-36-ag.gc") +(import "goal_src/jak1/import/ropebridge-32-ag.gc") +(import "goal_src/jak1/import/ropebridge-52-ag.gc") +(import "goal_src/jak1/import/snow-bridge-36-ag.gc") +(import "goal_src/jak1/import/ropebridge-70-ag.gc") ;; definition of type ropebridge-tuning (deftype ropebridge-tuning (structure) diff --git a/test/decompiler/reference/levels/common/sharkey_REF.gc b/test/decompiler/reference/levels/common/sharkey_REF.gc index 7626a8f1db..06afebb474 100644 --- a/test/decompiler/reference/levels/common/sharkey_REF.gc +++ b/test/decompiler/reference/levels/common/sharkey_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/sharkey-ag.gc") +(import "goal_src/jak1/import/sharkey-ag.gc") ;; failed to figure out what this is: (defpartgroup group-sharkey-splash diff --git a/test/decompiler/reference/levels/common/water-anim_REF.gc b/test/decompiler/reference/levels/common/water-anim_REF.gc index d786cc15a9..a8f542111d 100644 --- a/test/decompiler/reference/levels/common/water-anim_REF.gc +++ b/test/decompiler/reference/levels/common/water-anim_REF.gc @@ -1,22 +1,22 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/water-anim-maincave-ag.gc") -(import "goal_src/import/water-anim-village3-ag.gc") -(import "goal_src/import/water-anim-finalboss-ag.gc") -(import "goal_src/import/water-anim-maincave-water-ag.gc") -(import "goal_src/import/water-anim-sunken-ag.gc") -(import "goal_src/import/water-anim-lavatube-ag.gc") -(import "goal_src/import/water-anim-robocave-ag.gc") -(import "goal_src/import/water-anim-jungle-ag.gc") -(import "goal_src/import/water-anim-ogre-ag.gc") -(import "goal_src/import/water-anim-training-ag.gc") -(import "goal_src/import/water-anim-darkcave-ag.gc") -(import "goal_src/import/water-anim-village1-ag.gc") -(import "goal_src/import/water-anim-rolling-ag.gc") -(import "goal_src/import/water-anim-misty-ag.gc") -(import "goal_src/import/water-anim-sunken-dark-eco-ag.gc") -(import "goal_src/import/water-anim-village2-ag.gc") +(import "goal_src/jak1/import/water-anim-maincave-ag.gc") +(import "goal_src/jak1/import/water-anim-village3-ag.gc") +(import "goal_src/jak1/import/water-anim-finalboss-ag.gc") +(import "goal_src/jak1/import/water-anim-maincave-water-ag.gc") +(import "goal_src/jak1/import/water-anim-sunken-ag.gc") +(import "goal_src/jak1/import/water-anim-lavatube-ag.gc") +(import "goal_src/jak1/import/water-anim-robocave-ag.gc") +(import "goal_src/jak1/import/water-anim-jungle-ag.gc") +(import "goal_src/jak1/import/water-anim-ogre-ag.gc") +(import "goal_src/jak1/import/water-anim-training-ag.gc") +(import "goal_src/jak1/import/water-anim-darkcave-ag.gc") +(import "goal_src/jak1/import/water-anim-village1-ag.gc") +(import "goal_src/jak1/import/water-anim-rolling-ag.gc") +(import "goal_src/jak1/import/water-anim-misty-ag.gc") +(import "goal_src/jak1/import/water-anim-sunken-dark-eco-ag.gc") +(import "goal_src/jak1/import/water-anim-village2-ag.gc") ;; definition of type water-anim (deftype water-anim (water-vol) diff --git a/test/decompiler/reference/levels/darkcave/darkcave-obs_REF.gc b/test/decompiler/reference/levels/darkcave/darkcave-obs_REF.gc index f3787e726c..c3ab14695a 100644 --- a/test/decompiler/reference/levels/darkcave/darkcave-obs_REF.gc +++ b/test/decompiler/reference/levels/darkcave/darkcave-obs_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/cavecrystal-ag.gc") +(import "goal_src/jak1/import/cavecrystal-ag.gc") ;; definition of type cavecrystal (deftype cavecrystal (process-drawable) diff --git a/test/decompiler/reference/levels/finalboss/final-door_REF.gc b/test/decompiler/reference/levels/finalboss/final-door_REF.gc index 3ec6d518f6..cff26908e5 100644 --- a/test/decompiler/reference/levels/finalboss/final-door_REF.gc +++ b/test/decompiler/reference/levels/finalboss/final-door_REF.gc @@ -1,9 +1,9 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/power-left-ag.gc") -(import "goal_src/import/power-right-ag.gc") -(import "goal_src/import/powercellalt-ag.gc") +(import "goal_src/jak1/import/power-left-ag.gc") +(import "goal_src/jak1/import/power-right-ag.gc") +(import "goal_src/jak1/import/powercellalt-ag.gc") ;; definition of type fin-door (deftype fin-door (process-hidden) diff --git a/test/decompiler/reference/levels/finalboss/green-eco-lurker_REF.gc b/test/decompiler/reference/levels/finalboss/green-eco-lurker_REF.gc index db8c0277af..36a028cfab 100644 --- a/test/decompiler/reference/levels/finalboss/green-eco-lurker_REF.gc +++ b/test/decompiler/reference/levels/finalboss/green-eco-lurker_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/green-eco-lurker-ag.gc") +(import "goal_src/jak1/import/green-eco-lurker-ag.gc") ;; definition of type green-eco-lurker (deftype green-eco-lurker (nav-enemy) diff --git a/test/decompiler/reference/levels/finalboss/light-eco_REF.gc b/test/decompiler/reference/levels/finalboss/light-eco_REF.gc index 4107c6d9d3..482b8a43be 100644 --- a/test/decompiler/reference/levels/finalboss/light-eco_REF.gc +++ b/test/decompiler/reference/levels/finalboss/light-eco_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/light-eco-ag.gc") +(import "goal_src/jak1/import/light-eco-ag.gc") ;; definition of type light-eco-child (deftype light-eco-child (process-drawable) diff --git a/test/decompiler/reference/levels/finalboss/robotboss-h_REF.gc b/test/decompiler/reference/levels/finalboss/robotboss-h_REF.gc index 8c354e403e..65d22c77e3 100644 --- a/test/decompiler/reference/levels/finalboss/robotboss-h_REF.gc +++ b/test/decompiler/reference/levels/finalboss/robotboss-h_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/robotboss-ag.gc") +(import "goal_src/jak1/import/robotboss-ag.gc") ;; definition of type robotboss-dda (deftype robotboss-dda (structure) diff --git a/test/decompiler/reference/levels/finalboss/robotboss-misc_REF.gc b/test/decompiler/reference/levels/finalboss/robotboss-misc_REF.gc index ef1a30f04b..179114e617 100644 --- a/test/decompiler/reference/levels/finalboss/robotboss-misc_REF.gc +++ b/test/decompiler/reference/levels/finalboss/robotboss-misc_REF.gc @@ -1,9 +1,9 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/silodoor-ag.gc") -(import "goal_src/import/ecoclaw-ag.gc") -(import "goal_src/import/finalbosscam-ag.gc") +(import "goal_src/jak1/import/silodoor-ag.gc") +(import "goal_src/jak1/import/ecoclaw-ag.gc") +(import "goal_src/jak1/import/finalbosscam-ag.gc") ;; failed to figure out what this is: (defskelgroup *med-res-snow1-sg* medres-snowback 0 2 diff --git a/test/decompiler/reference/levels/finalboss/robotboss-weapon_REF.gc b/test/decompiler/reference/levels/finalboss/robotboss-weapon_REF.gc index 674985b8c0..a86921209e 100644 --- a/test/decompiler/reference/levels/finalboss/robotboss-weapon_REF.gc +++ b/test/decompiler/reference/levels/finalboss/robotboss-weapon_REF.gc @@ -1,9 +1,9 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/darkecobomb-ag.gc") -(import "goal_src/import/greenshot-ag.gc") -(import "goal_src/import/redring-ag.gc") +(import "goal_src/jak1/import/darkecobomb-ag.gc") +(import "goal_src/jak1/import/greenshot-ag.gc") +(import "goal_src/jak1/import/redring-ag.gc") ;; definition of type torus (deftype torus (structure) diff --git a/test/decompiler/reference/levels/finalboss/robotboss_REF.gc b/test/decompiler/reference/levels/finalboss/robotboss_REF.gc index 41a54c85d0..aa5355d24f 100644 --- a/test/decompiler/reference/levels/finalboss/robotboss_REF.gc +++ b/test/decompiler/reference/levels/finalboss/robotboss_REF.gc @@ -1,9 +1,9 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/robotboss-redeco-ag.gc") -(import "goal_src/import/robotboss-blueeco-ag.gc") -(import "goal_src/import/robotboss-yelloweco-ag.gc") +(import "goal_src/jak1/import/robotboss-redeco-ag.gc") +(import "goal_src/jak1/import/robotboss-blueeco-ag.gc") +(import "goal_src/jak1/import/robotboss-yelloweco-ag.gc") ;; definition for method 20 of type robotboss (defmethod ease-loc-t robotboss ((obj robotboss)) diff --git a/test/decompiler/reference/levels/finalboss/sage-finalboss_REF.gc b/test/decompiler/reference/levels/finalboss/sage-finalboss_REF.gc index 01a9c0ae7b..14525a628c 100644 --- a/test/decompiler/reference/levels/finalboss/sage-finalboss_REF.gc +++ b/test/decompiler/reference/levels/finalboss/sage-finalboss_REF.gc @@ -1,10 +1,10 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/plat-eco-finalboss-ag.gc") -(import "goal_src/import/green-sagecage-ag.gc") -(import "goal_src/import/jak-white-ag.gc") -(import "goal_src/import/robotboss-cinematic-ag.gc") +(import "goal_src/jak1/import/plat-eco-finalboss-ag.gc") +(import "goal_src/jak1/import/green-sagecage-ag.gc") +(import "goal_src/jak1/import/jak-white-ag.gc") +(import "goal_src/jak1/import/robotboss-cinematic-ag.gc") ;; failed to figure out what this is: (defskelgroup *robotboss-cinematic-sg* robotboss-cinematic robotboss-cinematic-lod0-jg robotboss-cinematic-idle-ja diff --git a/test/decompiler/reference/levels/firecanyon/assistant-firecanyon_REF.gc b/test/decompiler/reference/levels/firecanyon/assistant-firecanyon_REF.gc index 9553cc3346..e043ed6b8f 100644 --- a/test/decompiler/reference/levels/firecanyon/assistant-firecanyon_REF.gc +++ b/test/decompiler/reference/levels/firecanyon/assistant-firecanyon_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/assistant-firecanyon-ag.gc") +(import "goal_src/jak1/import/assistant-firecanyon-ag.gc") ;; definition of type assistant-firecanyon (deftype assistant-firecanyon (process-taskable) diff --git a/test/decompiler/reference/levels/firecanyon/firecanyon-obs_REF.gc b/test/decompiler/reference/levels/firecanyon/firecanyon-obs_REF.gc index 2c66093dc5..a9bd6b6b89 100644 --- a/test/decompiler/reference/levels/firecanyon/firecanyon-obs_REF.gc +++ b/test/decompiler/reference/levels/firecanyon/firecanyon-obs_REF.gc @@ -1,8 +1,8 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/crate-darkeco-cluster-ag.gc") -(import "goal_src/import/spike-ag.gc") +(import "goal_src/jak1/import/crate-darkeco-cluster-ag.gc") +(import "goal_src/jak1/import/spike-ag.gc") ;; definition of type balloon (deftype balloon (process-drawable) diff --git a/test/decompiler/reference/levels/flut_common/flutflut_REF.gc b/test/decompiler/reference/levels/flut_common/flutflut_REF.gc index f8bf862176..1f511a6ffc 100644 --- a/test/decompiler/reference/levels/flut_common/flutflut_REF.gc +++ b/test/decompiler/reference/levels/flut_common/flutflut_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/flut-saddle-ag.gc") +(import "goal_src/jak1/import/flut-saddle-ag.gc") ;; failed to figure out what this is: (if (not (nmember "flutp" *kernel-packages*)) diff --git a/test/decompiler/reference/levels/intro/evilbro_REF.gc b/test/decompiler/reference/levels/intro/evilbro_REF.gc index ee12c1a4be..be0c728e15 100644 --- a/test/decompiler/reference/levels/intro/evilbro_REF.gc +++ b/test/decompiler/reference/levels/intro/evilbro_REF.gc @@ -1,8 +1,8 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/evilbro-ag.gc") -(import "goal_src/import/evilsis-ag.gc") +(import "goal_src/jak1/import/evilbro-ag.gc") +(import "goal_src/jak1/import/evilsis-ag.gc") ;; definition of type evilbro (deftype evilbro (process-taskable) diff --git a/test/decompiler/reference/levels/jungle/bouncer_REF.gc b/test/decompiler/reference/levels/jungle/bouncer_REF.gc index f478c03956..92bed6abce 100644 --- a/test/decompiler/reference/levels/jungle/bouncer_REF.gc +++ b/test/decompiler/reference/levels/jungle/bouncer_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/bounceytarp-ag.gc") +(import "goal_src/jak1/import/bounceytarp-ag.gc") ;; definition of type springbox (deftype springbox (process-drawable) diff --git a/test/decompiler/reference/levels/jungle/darkvine_REF.gc b/test/decompiler/reference/levels/jungle/darkvine_REF.gc index cde0b31a3e..1cbd96aad5 100644 --- a/test/decompiler/reference/levels/jungle/darkvine_REF.gc +++ b/test/decompiler/reference/levels/jungle/darkvine_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/darkvine-ag.gc") +(import "goal_src/jak1/import/darkvine-ag.gc") ;; definition of type darkvine (deftype darkvine (process-drawable) diff --git a/test/decompiler/reference/levels/jungle/fisher_REF.gc b/test/decompiler/reference/levels/jungle/fisher_REF.gc index c1719ed3f0..f4ad8a5248 100644 --- a/test/decompiler/reference/levels/jungle/fisher_REF.gc +++ b/test/decompiler/reference/levels/jungle/fisher_REF.gc @@ -1,11 +1,11 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/fish-net-ag.gc") -(import "goal_src/import/fisher-ag.gc") -(import "goal_src/import/catch-fisha-ag.gc") -(import "goal_src/import/catch-fishb-ag.gc") -(import "goal_src/import/catch-fishc-ag.gc") +(import "goal_src/jak1/import/fish-net-ag.gc") +(import "goal_src/jak1/import/fisher-ag.gc") +(import "goal_src/jak1/import/catch-fisha-ag.gc") +(import "goal_src/jak1/import/catch-fishb-ag.gc") +(import "goal_src/jak1/import/catch-fishc-ag.gc") ;; definition of type fisher-bank (deftype fisher-bank (basic) diff --git a/test/decompiler/reference/levels/jungle/hopper_REF.gc b/test/decompiler/reference/levels/jungle/hopper_REF.gc index 760ae2e06d..374e10ecd2 100644 --- a/test/decompiler/reference/levels/jungle/hopper_REF.gc +++ b/test/decompiler/reference/levels/jungle/hopper_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/hopper-ag.gc") +(import "goal_src/jak1/import/hopper-ag.gc") ;; definition of type hopper (deftype hopper (nav-enemy) diff --git a/test/decompiler/reference/levels/jungle/jungle-mirrors_REF.gc b/test/decompiler/reference/levels/jungle/jungle-mirrors_REF.gc index 55505b8be0..48fddba6c4 100644 --- a/test/decompiler/reference/levels/jungle/jungle-mirrors_REF.gc +++ b/test/decompiler/reference/levels/jungle/jungle-mirrors_REF.gc @@ -1,8 +1,8 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/periscope-ag.gc") -(import "goal_src/import/reflector-mirror-ag.gc") +(import "goal_src/jak1/import/periscope-ag.gc") +(import "goal_src/jak1/import/reflector-mirror-ag.gc") ;; failed to figure out what this is: (defpartgroup group-jungle-binoculars diff --git a/test/decompiler/reference/levels/jungle/jungle-obs_REF.gc b/test/decompiler/reference/levels/jungle/jungle-obs_REF.gc index d2b98859fa..db14263e27 100644 --- a/test/decompiler/reference/levels/jungle/jungle-obs_REF.gc +++ b/test/decompiler/reference/levels/jungle/jungle-obs_REF.gc @@ -1,16 +1,16 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/maindoor-ag.gc") -(import "goal_src/import/junglecam-ag.gc") -(import "goal_src/import/precurbridge-ag.gc") -(import "goal_src/import/sidedoor-ag.gc") -(import "goal_src/import/towertop-ag.gc") -(import "goal_src/import/logtrap-ag.gc") -(import "goal_src/import/lurkerm-tall-sail-ag.gc") -(import "goal_src/import/medres-firecanyon-ag.gc") -(import "goal_src/import/lurkerm-piston-ag.gc") -(import "goal_src/import/accordian-ag.gc") +(import "goal_src/jak1/import/maindoor-ag.gc") +(import "goal_src/jak1/import/junglecam-ag.gc") +(import "goal_src/jak1/import/precurbridge-ag.gc") +(import "goal_src/jak1/import/sidedoor-ag.gc") +(import "goal_src/jak1/import/towertop-ag.gc") +(import "goal_src/jak1/import/logtrap-ag.gc") +(import "goal_src/jak1/import/lurkerm-tall-sail-ag.gc") +(import "goal_src/jak1/import/medres-firecanyon-ag.gc") +(import "goal_src/jak1/import/lurkerm-piston-ag.gc") +(import "goal_src/jak1/import/accordian-ag.gc") ;; failed to figure out what this is: (defskelgroup *med-res-firecanyon-sg* medres-firecanyon medres-firecanyon-lod0-jg medres-firecanyon-idle-ja diff --git a/test/decompiler/reference/levels/jungle/junglefish_REF.gc b/test/decompiler/reference/levels/jungle/junglefish_REF.gc index 9e70ff6ce3..cb6cf84da3 100644 --- a/test/decompiler/reference/levels/jungle/junglefish_REF.gc +++ b/test/decompiler/reference/levels/jungle/junglefish_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/junglefish-ag.gc") +(import "goal_src/jak1/import/junglefish-ag.gc") ;; definition of type junglefish (deftype junglefish (nav-enemy) diff --git a/test/decompiler/reference/levels/jungle/junglesnake_REF.gc b/test/decompiler/reference/levels/jungle/junglesnake_REF.gc index d1dab83b2d..6f98629ba3 100644 --- a/test/decompiler/reference/levels/jungle/junglesnake_REF.gc +++ b/test/decompiler/reference/levels/jungle/junglesnake_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/junglesnake-ag.gc") +(import "goal_src/jak1/import/junglesnake-ag.gc") ;; failed to figure out what this is: (defskelgroup *junglesnake-sg* junglesnake junglesnake-lod0-jg junglesnake-idle-ja diff --git a/test/decompiler/reference/levels/jungleb/aphid_REF.gc b/test/decompiler/reference/levels/jungleb/aphid_REF.gc index 357b72936d..3928d51b56 100644 --- a/test/decompiler/reference/levels/jungleb/aphid_REF.gc +++ b/test/decompiler/reference/levels/jungleb/aphid_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/aphid-lurker-ag.gc") +(import "goal_src/jak1/import/aphid-lurker-ag.gc") ;; definition of type aphid (deftype aphid (nav-enemy) diff --git a/test/decompiler/reference/levels/jungleb/jungleb-obs_REF.gc b/test/decompiler/reference/levels/jungleb/jungleb-obs_REF.gc index a9916d350e..1a9c856dbb 100644 --- a/test/decompiler/reference/levels/jungleb/jungleb-obs_REF.gc +++ b/test/decompiler/reference/levels/jungleb/jungleb-obs_REF.gc @@ -1,8 +1,8 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/eggtop-ag.gc") -(import "goal_src/import/jng-iris-door-ag.gc") +(import "goal_src/jak1/import/eggtop-ag.gc") +(import "goal_src/jak1/import/jng-iris-door-ag.gc") ;; definition of type eggtop (deftype eggtop (process-drawable) diff --git a/test/decompiler/reference/levels/jungleb/plant-boss_REF.gc b/test/decompiler/reference/levels/jungleb/plant-boss_REF.gc index 6fe0d2977d..fa6dece8bc 100644 --- a/test/decompiler/reference/levels/jungleb/plant-boss_REF.gc +++ b/test/decompiler/reference/levels/jungleb/plant-boss_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/plant-boss-ag.gc") +(import "goal_src/jak1/import/plant-boss-ag.gc") ;; definition of type plant-boss (deftype plant-boss (process-drawable) diff --git a/test/decompiler/reference/levels/jungleb/plat-flip_REF.gc b/test/decompiler/reference/levels/jungleb/plat-flip_REF.gc index b0de0b306a..e077e44452 100644 --- a/test/decompiler/reference/levels/jungleb/plat-flip_REF.gc +++ b/test/decompiler/reference/levels/jungleb/plat-flip_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/plat-flip-ag.gc") +(import "goal_src/jak1/import/plat-flip-ag.gc") ;; definition of type plat-flip (deftype plat-flip (process-drawable) diff --git a/test/decompiler/reference/levels/lavatube/assistant-lavatube_REF.gc b/test/decompiler/reference/levels/lavatube/assistant-lavatube_REF.gc index 30ff5e2639..af63ef6e92 100644 --- a/test/decompiler/reference/levels/lavatube/assistant-lavatube_REF.gc +++ b/test/decompiler/reference/levels/lavatube/assistant-lavatube_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/assistant-lavatube-start-ag.gc") +(import "goal_src/jak1/import/assistant-lavatube-start-ag.gc") ;; definition of type assistant-lavatube-start (deftype assistant-lavatube-start (process-taskable) diff --git a/test/decompiler/reference/levels/lavatube/lavatube-energy_REF.gc b/test/decompiler/reference/levels/lavatube/lavatube-energy_REF.gc index bda9eaf67a..2d96e6460e 100644 --- a/test/decompiler/reference/levels/lavatube/lavatube-energy_REF.gc +++ b/test/decompiler/reference/levels/lavatube/lavatube-energy_REF.gc @@ -1,11 +1,11 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/energyball-ag.gc") -(import "goal_src/import/energybase-ag.gc") -(import "goal_src/import/energyhub-ag.gc") -(import "goal_src/import/energyarm-ag.gc") -(import "goal_src/import/energydoor-ag.gc") +(import "goal_src/jak1/import/energyball-ag.gc") +(import "goal_src/jak1/import/energybase-ag.gc") +(import "goal_src/jak1/import/energyhub-ag.gc") +(import "goal_src/jak1/import/energyarm-ag.gc") +(import "goal_src/jak1/import/energydoor-ag.gc") ;; failed to figure out what this is: (defpartgroup group-energyarm diff --git a/test/decompiler/reference/levels/lavatube/lavatube-obs_REF.gc b/test/decompiler/reference/levels/lavatube/lavatube-obs_REF.gc index 92e9cc3c55..b678f50766 100644 --- a/test/decompiler/reference/levels/lavatube/lavatube-obs_REF.gc +++ b/test/decompiler/reference/levels/lavatube/lavatube-obs_REF.gc @@ -1,15 +1,15 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/lavafallsewerb-ag.gc") -(import "goal_src/import/lavashortcut-ag.gc") -(import "goal_src/import/lavabase-ag.gc") -(import "goal_src/import/lavafallsewera-ag.gc") -(import "goal_src/import/chainmine-ag.gc") -(import "goal_src/import/lavafall-ag.gc") -(import "goal_src/import/lavaballoon-ag.gc") -(import "goal_src/import/darkecobarrel-ag.gc") -(import "goal_src/import/lavayellowtarp-ag.gc") +(import "goal_src/jak1/import/lavafallsewerb-ag.gc") +(import "goal_src/jak1/import/lavashortcut-ag.gc") +(import "goal_src/jak1/import/lavabase-ag.gc") +(import "goal_src/jak1/import/lavafallsewera-ag.gc") +(import "goal_src/jak1/import/chainmine-ag.gc") +(import "goal_src/jak1/import/lavafall-ag.gc") +(import "goal_src/jak1/import/lavaballoon-ag.gc") +(import "goal_src/jak1/import/darkecobarrel-ag.gc") +(import "goal_src/jak1/import/lavayellowtarp-ag.gc") ;; definition of type lavabase (deftype lavabase (process-drawable) diff --git a/test/decompiler/reference/levels/maincave/baby-spider_REF.gc b/test/decompiler/reference/levels/maincave/baby-spider_REF.gc index 70bd01b4f5..b303ab0ae5 100644 --- a/test/decompiler/reference/levels/maincave/baby-spider_REF.gc +++ b/test/decompiler/reference/levels/maincave/baby-spider_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/baby-spider-ag.gc") +(import "goal_src/jak1/import/baby-spider-ag.gc") ;; definition of type baby-spider-spawn-params (deftype baby-spider-spawn-params (structure) diff --git a/test/decompiler/reference/levels/maincave/dark-crystal_REF.gc b/test/decompiler/reference/levels/maincave/dark-crystal_REF.gc index 73f5c78e8e..d062d401ab 100644 --- a/test/decompiler/reference/levels/maincave/dark-crystal_REF.gc +++ b/test/decompiler/reference/levels/maincave/dark-crystal_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/dark-crystal-ag.gc") +(import "goal_src/jak1/import/dark-crystal-ag.gc") ;; definition of type dark-crystal (deftype dark-crystal (process-drawable) diff --git a/test/decompiler/reference/levels/maincave/driller-lurker_REF.gc b/test/decompiler/reference/levels/maincave/driller-lurker_REF.gc index 5f4cde9285..55d1a5c246 100644 --- a/test/decompiler/reference/levels/maincave/driller-lurker_REF.gc +++ b/test/decompiler/reference/levels/maincave/driller-lurker_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/driller-lurker-ag.gc") +(import "goal_src/jak1/import/driller-lurker-ag.gc") ;; definition of type driller-lurker (deftype driller-lurker (process-drawable) diff --git a/test/decompiler/reference/levels/maincave/gnawer_REF.gc b/test/decompiler/reference/levels/maincave/gnawer_REF.gc index a5575782de..702d9dc36c 100644 --- a/test/decompiler/reference/levels/maincave/gnawer_REF.gc +++ b/test/decompiler/reference/levels/maincave/gnawer_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/gnawer-ag.gc") +(import "goal_src/jak1/import/gnawer-ag.gc") ;; definition of type gnawer-falling-segment (deftype gnawer-falling-segment (process-drawable) diff --git a/test/decompiler/reference/levels/maincave/maincave-obs_REF.gc b/test/decompiler/reference/levels/maincave/maincave-obs_REF.gc index a682c32741..c02565990e 100644 --- a/test/decompiler/reference/levels/maincave/maincave-obs_REF.gc +++ b/test/decompiler/reference/levels/maincave/maincave-obs_REF.gc @@ -1,12 +1,12 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/caveelevator-ag.gc") -(import "goal_src/import/cavespatulatwo-ag.gc") -(import "goal_src/import/cavetrapdoor-ag.gc") -(import "goal_src/import/maincavecam-ag.gc") -(import "goal_src/import/cavecrusher-ag.gc") -(import "goal_src/import/cavespatula-darkcave-ag.gc") +(import "goal_src/jak1/import/caveelevator-ag.gc") +(import "goal_src/jak1/import/cavespatulatwo-ag.gc") +(import "goal_src/jak1/import/cavetrapdoor-ag.gc") +(import "goal_src/jak1/import/maincavecam-ag.gc") +(import "goal_src/jak1/import/cavecrusher-ag.gc") +(import "goal_src/jak1/import/cavespatula-darkcave-ag.gc") ;; definition of type maincavecam (deftype maincavecam (pov-camera) diff --git a/test/decompiler/reference/levels/maincave/mother-spider-egg_REF.gc b/test/decompiler/reference/levels/maincave/mother-spider-egg_REF.gc index 694e91eb18..fb74f80e2b 100644 --- a/test/decompiler/reference/levels/maincave/mother-spider-egg_REF.gc +++ b/test/decompiler/reference/levels/maincave/mother-spider-egg_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/spider-egg-ag.gc") +(import "goal_src/jak1/import/spider-egg-ag.gc") ;; definition of type mother-spider-egg (deftype mother-spider-egg (process-drawable) diff --git a/test/decompiler/reference/levels/maincave/mother-spider_REF.gc b/test/decompiler/reference/levels/maincave/mother-spider_REF.gc index b3b3853982..a94db29380 100644 --- a/test/decompiler/reference/levels/maincave/mother-spider_REF.gc +++ b/test/decompiler/reference/levels/maincave/mother-spider_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/mother-spider-ag.gc") +(import "goal_src/jak1/import/mother-spider-ag.gc") ;; failed to figure out what this is: (defskelgroup *mother-spider-sg* mother-spider mother-spider-lod0-jg -1 diff --git a/test/decompiler/reference/levels/maincave/spiderwebs_REF.gc b/test/decompiler/reference/levels/maincave/spiderwebs_REF.gc index 65fe25d035..313fa966d8 100644 --- a/test/decompiler/reference/levels/maincave/spiderwebs_REF.gc +++ b/test/decompiler/reference/levels/maincave/spiderwebs_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/spiderwebs-ag.gc") +(import "goal_src/jak1/import/spiderwebs-ag.gc") ;; definition for symbol *spider-jump-mods*, type surface (define *spider-jump-mods* (new 'static 'surface diff --git a/test/decompiler/reference/levels/misty/balloonlurker_REF.gc b/test/decompiler/reference/levels/misty/balloonlurker_REF.gc index fd2b0cdbf7..884fcf601f 100644 --- a/test/decompiler/reference/levels/misty/balloonlurker_REF.gc +++ b/test/decompiler/reference/levels/misty/balloonlurker_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/balloonlurker-ag.gc") +(import "goal_src/jak1/import/balloonlurker-ag.gc") ;; failed to figure out what this is: (defpartgroup group-balloonlurker-pilot-death diff --git a/test/decompiler/reference/levels/misty/bonelurker_REF.gc b/test/decompiler/reference/levels/misty/bonelurker_REF.gc index 4e6563cb35..eac2be0a00 100644 --- a/test/decompiler/reference/levels/misty/bonelurker_REF.gc +++ b/test/decompiler/reference/levels/misty/bonelurker_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/bonelurker-ag.gc") +(import "goal_src/jak1/import/bonelurker-ag.gc") ;; definition of type bonelurker (deftype bonelurker (nav-enemy) diff --git a/test/decompiler/reference/levels/misty/misty-conveyor_REF.gc b/test/decompiler/reference/levels/misty/misty-conveyor_REF.gc index a9fb874dfc..59d2748de1 100644 --- a/test/decompiler/reference/levels/misty/misty-conveyor_REF.gc +++ b/test/decompiler/reference/levels/misty/misty-conveyor_REF.gc @@ -1,9 +1,9 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/keg-conveyor-ag.gc") -(import "goal_src/import/keg-conveyor-paddle-ag.gc") -(import "goal_src/import/keg-ag.gc") +(import "goal_src/jak1/import/keg-conveyor-ag.gc") +(import "goal_src/jak1/import/keg-conveyor-paddle-ag.gc") +(import "goal_src/jak1/import/keg-ag.gc") ;; failed to figure out what this is: (defpartgroup group-keg-bounce diff --git a/test/decompiler/reference/levels/misty/misty-obs_REF.gc b/test/decompiler/reference/levels/misty/misty-obs_REF.gc index e538664a10..373103d6b5 100644 --- a/test/decompiler/reference/levels/misty/misty-obs_REF.gc +++ b/test/decompiler/reference/levels/misty/misty-obs_REF.gc @@ -1,14 +1,14 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/breakaway-right-ag.gc") -(import "goal_src/import/boatpaddle-ag.gc") -(import "goal_src/import/breakaway-mid-ag.gc") -(import "goal_src/import/mis-bone-platform-ag.gc") -(import "goal_src/import/breakaway-left-ag.gc") -(import "goal_src/import/windturbine-ag.gc") -(import "goal_src/import/mistycam-ag.gc") -(import "goal_src/import/mis-bone-bridge-ag.gc") +(import "goal_src/jak1/import/breakaway-right-ag.gc") +(import "goal_src/jak1/import/boatpaddle-ag.gc") +(import "goal_src/jak1/import/breakaway-mid-ag.gc") +(import "goal_src/jak1/import/mis-bone-platform-ag.gc") +(import "goal_src/jak1/import/breakaway-left-ag.gc") +(import "goal_src/jak1/import/windturbine-ag.gc") +(import "goal_src/jak1/import/mistycam-ag.gc") +(import "goal_src/jak1/import/mis-bone-bridge-ag.gc") ;; failed to figure out what this is: (defpartgroup group-windturbine-particles diff --git a/test/decompiler/reference/levels/misty/misty-teetertotter_REF.gc b/test/decompiler/reference/levels/misty/misty-teetertotter_REF.gc index c067b59d0f..26400b1d1f 100644 --- a/test/decompiler/reference/levels/misty/misty-teetertotter_REF.gc +++ b/test/decompiler/reference/levels/misty/misty-teetertotter_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/teetertotter-ag.gc") +(import "goal_src/jak1/import/teetertotter-ag.gc") ;; definition of type teetertotter (deftype teetertotter (process-drawable) diff --git a/test/decompiler/reference/levels/misty/misty-warehouse_REF.gc b/test/decompiler/reference/levels/misty/misty-warehouse_REF.gc index 4baf00f137..42da64d90c 100644 --- a/test/decompiler/reference/levels/misty/misty-warehouse_REF.gc +++ b/test/decompiler/reference/levels/misty/misty-warehouse_REF.gc @@ -1,8 +1,8 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/silostep-ag.gc") -(import "goal_src/import/rounddoor-ag.gc") +(import "goal_src/jak1/import/silostep-ag.gc") +(import "goal_src/jak1/import/rounddoor-ag.gc") ;; definition of type silostep (deftype silostep (process-drawable) diff --git a/test/decompiler/reference/levels/misty/mistycannon_REF.gc b/test/decompiler/reference/levels/misty/mistycannon_REF.gc index 64441cdb5d..162c9bce92 100644 --- a/test/decompiler/reference/levels/misty/mistycannon_REF.gc +++ b/test/decompiler/reference/levels/misty/mistycannon_REF.gc @@ -1,8 +1,8 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/sack-ag.gc") -(import "goal_src/import/mistycannon-ag.gc") +(import "goal_src/jak1/import/sack-ag.gc") +(import "goal_src/jak1/import/mistycannon-ag.gc") ;; definition of type angle-tracker (deftype angle-tracker (structure) diff --git a/test/decompiler/reference/levels/misty/muse_REF.gc b/test/decompiler/reference/levels/misty/muse_REF.gc index 2c381abd12..3b51bece7d 100644 --- a/test/decompiler/reference/levels/misty/muse_REF.gc +++ b/test/decompiler/reference/levels/misty/muse_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/muse-ag.gc") +(import "goal_src/jak1/import/muse-ag.gc") ;; definition of type muse (deftype muse (nav-enemy) diff --git a/test/decompiler/reference/levels/misty/quicksandlurker_REF.gc b/test/decompiler/reference/levels/misty/quicksandlurker_REF.gc index c88b5388ca..ba69c67184 100644 --- a/test/decompiler/reference/levels/misty/quicksandlurker_REF.gc +++ b/test/decompiler/reference/levels/misty/quicksandlurker_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/quicksandlurker-ag.gc") +(import "goal_src/jak1/import/quicksandlurker-ag.gc") ;; failed to figure out what this is: (defpartgroup group-quicksandlurker-missile diff --git a/test/decompiler/reference/levels/misty/sidekick-human_REF.gc b/test/decompiler/reference/levels/misty/sidekick-human_REF.gc index ef6666bf3d..612d1772ce 100644 --- a/test/decompiler/reference/levels/misty/sidekick-human_REF.gc +++ b/test/decompiler/reference/levels/misty/sidekick-human_REF.gc @@ -1,10 +1,10 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/darkecocan-ag.gc") -(import "goal_src/import/sidekick-human-ag.gc") -(import "goal_src/import/evilbro-ag.gc") -(import "goal_src/import/evilsis-ag.gc") +(import "goal_src/jak1/import/darkecocan-ag.gc") +(import "goal_src/jak1/import/sidekick-human-ag.gc") +(import "goal_src/jak1/import/evilbro-ag.gc") +(import "goal_src/jak1/import/evilsis-ag.gc") ;; definition of type sequenceA (deftype sequenceA (process-hidden) diff --git a/test/decompiler/reference/levels/ogre/flying-lurker_REF.gc b/test/decompiler/reference/levels/ogre/flying-lurker_REF.gc index c13593f241..718516f8e8 100644 --- a/test/decompiler/reference/levels/ogre/flying-lurker_REF.gc +++ b/test/decompiler/reference/levels/ogre/flying-lurker_REF.gc @@ -1,9 +1,9 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/ogrecam-ag.gc") -(import "goal_src/import/plunger-lurker-ag.gc") -(import "goal_src/import/flying-lurker-ag.gc") +(import "goal_src/jak1/import/ogrecam-ag.gc") +(import "goal_src/jak1/import/plunger-lurker-ag.gc") +(import "goal_src/jak1/import/flying-lurker-ag.gc") ;; failed to figure out what this is: (defskelgroup *ogrecam-sg* ogrecam ogrecam-lod0-jg -1 diff --git a/test/decompiler/reference/levels/ogre/ogre-obs_REF.gc b/test/decompiler/reference/levels/ogre/ogre-obs_REF.gc index 92b59956cb..249af0bf39 100644 --- a/test/decompiler/reference/levels/ogre/ogre-obs_REF.gc +++ b/test/decompiler/reference/levels/ogre/ogre-obs_REF.gc @@ -1,13 +1,13 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/ogre-step-ag.gc") -(import "goal_src/import/tntbarrel-ag.gc") -(import "goal_src/import/ogre-bridge-ag.gc") -(import "goal_src/import/shortcut-boulder-ag.gc") -(import "goal_src/import/medres-snow-ag.gc") -(import "goal_src/import/ogre-bridgeend-ag.gc") -(import "goal_src/import/ogre-isle-ag.gc") +(import "goal_src/jak1/import/ogre-step-ag.gc") +(import "goal_src/jak1/import/tntbarrel-ag.gc") +(import "goal_src/jak1/import/ogre-bridge-ag.gc") +(import "goal_src/jak1/import/shortcut-boulder-ag.gc") +(import "goal_src/jak1/import/medres-snow-ag.gc") +(import "goal_src/jak1/import/ogre-bridgeend-ag.gc") +(import "goal_src/jak1/import/ogre-isle-ag.gc") ;; failed to figure out what this is: (defskelgroup *med-res-snow-sg* medres-snow medres-snow-lod0-jg medres-snow-idle-ja diff --git a/test/decompiler/reference/levels/ogre/ogreboss_REF.gc b/test/decompiler/reference/levels/ogre/ogreboss_REF.gc index 2a13424ffd..fea5aa2b2c 100644 --- a/test/decompiler/reference/levels/ogre/ogreboss_REF.gc +++ b/test/decompiler/reference/levels/ogre/ogreboss_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/ogreboss-ag.gc") +(import "goal_src/jak1/import/ogreboss-ag.gc") ;; failed to figure out what this is: (defskelgroup *ogreboss-sg* ogreboss ogreboss-lod0-jg ogreboss-idle-ja diff --git a/test/decompiler/reference/levels/racer_common/racer_REF.gc b/test/decompiler/reference/levels/racer_common/racer_REF.gc index fb27c72f22..0306b27999 100644 --- a/test/decompiler/reference/levels/racer_common/racer_REF.gc +++ b/test/decompiler/reference/levels/racer_common/racer_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/racer-ag.gc") +(import "goal_src/jak1/import/racer-ag.gc") ;; failed to figure out what this is: (if (not (nmember "racerp" *kernel-packages*)) diff --git a/test/decompiler/reference/levels/racer_common/target-racer-h_REF.gc b/test/decompiler/reference/levels/racer_common/target-racer-h_REF.gc index 9f2fe9cc62..8e91853f01 100644 --- a/test/decompiler/reference/levels/racer_common/target-racer-h_REF.gc +++ b/test/decompiler/reference/levels/racer_common/target-racer-h_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/balloon-ag.gc") +(import "goal_src/jak1/import/balloon-ag.gc") ;; definition of type racer-info (deftype racer-info (basic) diff --git a/test/decompiler/reference/levels/robocave/spider-egg_REF.gc b/test/decompiler/reference/levels/robocave/spider-egg_REF.gc index 4bab2056b9..0e5a0afc90 100644 --- a/test/decompiler/reference/levels/robocave/spider-egg_REF.gc +++ b/test/decompiler/reference/levels/robocave/spider-egg_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/spider-egg-ag.gc") +(import "goal_src/jak1/import/spider-egg-ag.gc") ;; definition of type spider-egg (deftype spider-egg (process-drawable) diff --git a/test/decompiler/reference/levels/rolling/rolling-lightning-mole_REF.gc b/test/decompiler/reference/levels/rolling/rolling-lightning-mole_REF.gc index e7bd98e07b..220efb9663 100644 --- a/test/decompiler/reference/levels/rolling/rolling-lightning-mole_REF.gc +++ b/test/decompiler/reference/levels/rolling/rolling-lightning-mole_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/lightning-mole-ag.gc") +(import "goal_src/jak1/import/lightning-mole-ag.gc") ;; definition for function find-adjacent-bounds-one ;; Used lq/sq diff --git a/test/decompiler/reference/levels/rolling/rolling-obs_REF.gc b/test/decompiler/reference/levels/rolling/rolling-obs_REF.gc index ae2e0532b1..04729c3607 100644 --- a/test/decompiler/reference/levels/rolling/rolling-obs_REF.gc +++ b/test/decompiler/reference/levels/rolling/rolling-obs_REF.gc @@ -1,11 +1,11 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/rollingcam-ag.gc") -(import "goal_src/import/pusher-ag.gc") -(import "goal_src/import/happy-plant-ag.gc") -(import "goal_src/import/dark-plant-ag.gc") -(import "goal_src/import/rolling-start-ag.gc") +(import "goal_src/jak1/import/rollingcam-ag.gc") +(import "goal_src/jak1/import/pusher-ag.gc") +(import "goal_src/jak1/import/happy-plant-ag.gc") +(import "goal_src/jak1/import/dark-plant-ag.gc") +(import "goal_src/jak1/import/rolling-start-ag.gc") ;; definition of type rolling-part (deftype rolling-part (part-spawner) diff --git a/test/decompiler/reference/levels/rolling/rolling-race-ring_REF.gc b/test/decompiler/reference/levels/rolling/rolling-race-ring_REF.gc index 94e21c8a71..ffe38daa09 100644 --- a/test/decompiler/reference/levels/rolling/rolling-race-ring_REF.gc +++ b/test/decompiler/reference/levels/rolling/rolling-race-ring_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/race-ring-ag.gc") +(import "goal_src/jak1/import/race-ring-ag.gc") ;; definition of type race-ring (deftype race-ring (process-drawable) diff --git a/test/decompiler/reference/levels/rolling/rolling-robber_REF.gc b/test/decompiler/reference/levels/rolling/rolling-robber_REF.gc index cb4297efea..9a8a2e0064 100644 --- a/test/decompiler/reference/levels/rolling/rolling-robber_REF.gc +++ b/test/decompiler/reference/levels/rolling/rolling-robber_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/robber-ag.gc") +(import "goal_src/jak1/import/robber-ag.gc") ;; failed to figure out what this is: (defstate fuel-cell-spline-slider (fuel-cell) diff --git a/test/decompiler/reference/levels/snow/ice-cube_REF.gc b/test/decompiler/reference/levels/snow/ice-cube_REF.gc index c7681adafc..2bd1a22d9f 100644 --- a/test/decompiler/reference/levels/snow/ice-cube_REF.gc +++ b/test/decompiler/reference/levels/snow/ice-cube_REF.gc @@ -1,8 +1,8 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/ice-cube-ag.gc") -(import "goal_src/import/ice-cube-break-ag.gc") +(import "goal_src/jak1/import/ice-cube-ag.gc") +(import "goal_src/jak1/import/ice-cube-break-ag.gc") ;; failed to figure out what this is: (defskelgroup *ice-cube-break-sg* ice-cube-break ice-cube-break-lod0-jg -1 diff --git a/test/decompiler/reference/levels/snow/snow-ball_REF.gc b/test/decompiler/reference/levels/snow/snow-ball_REF.gc index 65d83f8060..e3235b6029 100644 --- a/test/decompiler/reference/levels/snow/snow-ball_REF.gc +++ b/test/decompiler/reference/levels/snow/snow-ball_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/snow-ball-ag.gc") +(import "goal_src/jak1/import/snow-ball-ag.gc") ;; definition of type snow-ball-shadow (deftype snow-ball-shadow (process-drawable) diff --git a/test/decompiler/reference/levels/snow/snow-bumper_REF.gc b/test/decompiler/reference/levels/snow/snow-bumper_REF.gc index de9689d3a7..996494a86a 100644 --- a/test/decompiler/reference/levels/snow/snow-bumper_REF.gc +++ b/test/decompiler/reference/levels/snow/snow-bumper_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/snow-bumper-ag.gc") +(import "goal_src/jak1/import/snow-bumper-ag.gc") ;; definition of type snow-bumper (deftype snow-bumper (process-drawable) diff --git a/test/decompiler/reference/levels/snow/snow-bunny_REF.gc b/test/decompiler/reference/levels/snow/snow-bunny_REF.gc index 0c58a9219b..4aa1f4001c 100644 --- a/test/decompiler/reference/levels/snow/snow-bunny_REF.gc +++ b/test/decompiler/reference/levels/snow/snow-bunny_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/snow-bunny-ag.gc") +(import "goal_src/jak1/import/snow-bunny-ag.gc") ;; definition of type snow-bunny (deftype snow-bunny (nav-enemy) diff --git a/test/decompiler/reference/levels/snow/snow-flutflut-obs_REF.gc b/test/decompiler/reference/levels/snow/snow-flutflut-obs_REF.gc index 553bf2380b..dca1f85a10 100644 --- a/test/decompiler/reference/levels/snow/snow-flutflut-obs_REF.gc +++ b/test/decompiler/reference/levels/snow/snow-flutflut-obs_REF.gc @@ -1,10 +1,10 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/snow-button-ag.gc") -(import "goal_src/import/flutflut-plat-med-ag.gc") -(import "goal_src/import/flutflut-plat-small-ag.gc") -(import "goal_src/import/flutflut-plat-large-ag.gc") +(import "goal_src/jak1/import/snow-button-ag.gc") +(import "goal_src/jak1/import/flutflut-plat-med-ag.gc") +(import "goal_src/jak1/import/flutflut-plat-small-ag.gc") +(import "goal_src/jak1/import/flutflut-plat-large-ag.gc") ;; definition of type flutflut-plat (deftype flutflut-plat (plat) diff --git a/test/decompiler/reference/levels/snow/snow-obs_REF.gc b/test/decompiler/reference/levels/snow/snow-obs_REF.gc index e3a62795c3..b1828b1b40 100644 --- a/test/decompiler/reference/levels/snow/snow-obs_REF.gc +++ b/test/decompiler/reference/levels/snow/snow-obs_REF.gc @@ -1,14 +1,14 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/snowcam-ag.gc") -(import "goal_src/import/snow-fort-gate-ag.gc") -(import "goal_src/import/snow-eggtop-ag.gc") -(import "goal_src/import/snow-spatula-ag.gc") -(import "goal_src/import/snow-switch-ag.gc") -(import "goal_src/import/snow-gears-ag.gc") -(import "goal_src/import/snowpusher-ag.gc") -(import "goal_src/import/snow-log-ag.gc") +(import "goal_src/jak1/import/snowcam-ag.gc") +(import "goal_src/jak1/import/snow-fort-gate-ag.gc") +(import "goal_src/jak1/import/snow-eggtop-ag.gc") +(import "goal_src/jak1/import/snow-spatula-ag.gc") +(import "goal_src/jak1/import/snow-switch-ag.gc") +(import "goal_src/jak1/import/snow-gears-ag.gc") +(import "goal_src/jak1/import/snowpusher-ag.gc") +(import "goal_src/jak1/import/snow-log-ag.gc") ;; definition of type snowcam (deftype snowcam (pov-camera) diff --git a/test/decompiler/reference/levels/snow/snow-ram-boss_REF.gc b/test/decompiler/reference/levels/snow/snow-ram-boss_REF.gc index 71a16fae12..b21946c68e 100644 --- a/test/decompiler/reference/levels/snow/snow-ram-boss_REF.gc +++ b/test/decompiler/reference/levels/snow/snow-ram-boss_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/ram-boss-ag.gc") +(import "goal_src/jak1/import/ram-boss-ag.gc") ;; definition of type ram-boss-proj (deftype ram-boss-proj (projectile) diff --git a/test/decompiler/reference/levels/snow/snow-ram_REF.gc b/test/decompiler/reference/levels/snow/snow-ram_REF.gc index c6eba93e3e..3dc728b922 100644 --- a/test/decompiler/reference/levels/snow/snow-ram_REF.gc +++ b/test/decompiler/reference/levels/snow/snow-ram_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/ram-ag.gc") +(import "goal_src/jak1/import/ram-ag.gc") ;; failed to figure out what this is: (defskelgroup *ram-sg* ram ram-lod0-jg ram-cock-ja diff --git a/test/decompiler/reference/levels/snow/yeti_REF.gc b/test/decompiler/reference/levels/snow/yeti_REF.gc index 48bc94ae0e..86f736b4a6 100644 --- a/test/decompiler/reference/levels/snow/yeti_REF.gc +++ b/test/decompiler/reference/levels/snow/yeti_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/yeti-ag.gc") +(import "goal_src/jak1/import/yeti-ag.gc") ;; definition of type yeti-slave (deftype yeti-slave (nav-enemy) diff --git a/test/decompiler/reference/levels/sunken/bully_REF.gc b/test/decompiler/reference/levels/sunken/bully_REF.gc index 05f782ab2c..4f4c137124 100644 --- a/test/decompiler/reference/levels/sunken/bully_REF.gc +++ b/test/decompiler/reference/levels/sunken/bully_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/bully-ag.gc") +(import "goal_src/jak1/import/bully-ag.gc") ;; definition of type bully-broken-cage (deftype bully-broken-cage (process-drawable) diff --git a/test/decompiler/reference/levels/sunken/double-lurker_REF.gc b/test/decompiler/reference/levels/sunken/double-lurker_REF.gc index 907e3b6469..5b0f7b8e8f 100644 --- a/test/decompiler/reference/levels/sunken/double-lurker_REF.gc +++ b/test/decompiler/reference/levels/sunken/double-lurker_REF.gc @@ -1,8 +1,8 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/double-lurker-ag.gc") -(import "goal_src/import/double-lurker-top-ag.gc") +(import "goal_src/jak1/import/double-lurker-ag.gc") +(import "goal_src/jak1/import/double-lurker-top-ag.gc") ;; definition of type double-lurker-top (deftype double-lurker-top (nav-enemy) diff --git a/test/decompiler/reference/levels/sunken/floating-launcher_REF.gc b/test/decompiler/reference/levels/sunken/floating-launcher_REF.gc index 92a7f48754..f002ce2478 100644 --- a/test/decompiler/reference/levels/sunken/floating-launcher_REF.gc +++ b/test/decompiler/reference/levels/sunken/floating-launcher_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/floating-launcher-ag.gc") +(import "goal_src/jak1/import/floating-launcher-ag.gc") ;; definition of type floating-launcher (deftype floating-launcher (baseplat) diff --git a/test/decompiler/reference/levels/sunken/helix-water_REF.gc b/test/decompiler/reference/levels/sunken/helix-water_REF.gc index c45fb7e719..8341c76ecb 100644 --- a/test/decompiler/reference/levels/sunken/helix-water_REF.gc +++ b/test/decompiler/reference/levels/sunken/helix-water_REF.gc @@ -1,8 +1,8 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/helix-slide-door-ag.gc") -(import "goal_src/import/helix-button-ag.gc") +(import "goal_src/jak1/import/helix-slide-door-ag.gc") +(import "goal_src/jak1/import/helix-button-ag.gc") ;; definition of type helix-slide-door (deftype helix-slide-door (process-drawable) diff --git a/test/decompiler/reference/levels/sunken/orbit-plat_REF.gc b/test/decompiler/reference/levels/sunken/orbit-plat_REF.gc index c330d42703..5b6d1d2a4b 100644 --- a/test/decompiler/reference/levels/sunken/orbit-plat_REF.gc +++ b/test/decompiler/reference/levels/sunken/orbit-plat_REF.gc @@ -1,8 +1,8 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/orbit-plat-ag.gc") -(import "goal_src/import/orbit-plat-bottom-ag.gc") +(import "goal_src/jak1/import/orbit-plat-ag.gc") +(import "goal_src/jak1/import/orbit-plat-bottom-ag.gc") ;; definition of type orbit-plat-bottom (deftype orbit-plat-bottom (process-drawable) diff --git a/test/decompiler/reference/levels/sunken/puffer_REF.gc b/test/decompiler/reference/levels/sunken/puffer_REF.gc index 9956cd48a2..a8ec708a1e 100644 --- a/test/decompiler/reference/levels/sunken/puffer_REF.gc +++ b/test/decompiler/reference/levels/sunken/puffer_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/puffer-ag.gc") +(import "goal_src/jak1/import/puffer-ag.gc") ;; definition of type puffer (deftype puffer (process-drawable) diff --git a/test/decompiler/reference/levels/sunken/qbert-plat_REF.gc b/test/decompiler/reference/levels/sunken/qbert-plat_REF.gc index 14a74eaee5..4d3db1a066 100644 --- a/test/decompiler/reference/levels/sunken/qbert-plat_REF.gc +++ b/test/decompiler/reference/levels/sunken/qbert-plat_REF.gc @@ -1,8 +1,8 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/qbert-plat-ag.gc") -(import "goal_src/import/qbert-plat-on-ag.gc") +(import "goal_src/jak1/import/qbert-plat-ag.gc") +(import "goal_src/jak1/import/qbert-plat-on-ag.gc") ;; definition of type qbert-plat-on (deftype qbert-plat-on (process-drawable) diff --git a/test/decompiler/reference/levels/sunken/shover_REF.gc b/test/decompiler/reference/levels/sunken/shover_REF.gc index 3ac9d9bb30..cc0f7202f1 100644 --- a/test/decompiler/reference/levels/sunken/shover_REF.gc +++ b/test/decompiler/reference/levels/sunken/shover_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/shover-ag.gc") +(import "goal_src/jak1/import/shover-ag.gc") ;; definition of type shover (deftype shover (process-drawable) diff --git a/test/decompiler/reference/levels/sunken/square-platform_REF.gc b/test/decompiler/reference/levels/sunken/square-platform_REF.gc index e6980b6234..2e27f6e021 100644 --- a/test/decompiler/reference/levels/sunken/square-platform_REF.gc +++ b/test/decompiler/reference/levels/sunken/square-platform_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/square-platform-ag.gc") +(import "goal_src/jak1/import/square-platform-ag.gc") ;; definition of type square-platform (deftype square-platform (baseplat) diff --git a/test/decompiler/reference/levels/sunken/steam-cap_REF.gc b/test/decompiler/reference/levels/sunken/steam-cap_REF.gc index 54bef1c7be..c8396b2b72 100644 --- a/test/decompiler/reference/levels/sunken/steam-cap_REF.gc +++ b/test/decompiler/reference/levels/sunken/steam-cap_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/steam-cap-ag.gc") +(import "goal_src/jak1/import/steam-cap-ag.gc") ;; definition of type steam-cap-control-pt (deftype steam-cap-control-pt (structure) diff --git a/test/decompiler/reference/levels/sunken/sun-exit-chamber_REF.gc b/test/decompiler/reference/levels/sunken/sun-exit-chamber_REF.gc index f32bc5c2ad..898ea77fd1 100644 --- a/test/decompiler/reference/levels/sunken/sun-exit-chamber_REF.gc +++ b/test/decompiler/reference/levels/sunken/sun-exit-chamber_REF.gc @@ -1,9 +1,9 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/exit-chamber-ag.gc") -(import "goal_src/import/blue-eco-charger-ag.gc") -(import "goal_src/import/blue-eco-charger-orb-ag.gc") +(import "goal_src/jak1/import/exit-chamber-ag.gc") +(import "goal_src/jak1/import/blue-eco-charger-ag.gc") +(import "goal_src/jak1/import/blue-eco-charger-orb-ag.gc") ;; definition of type blue-eco-charger-orb (deftype blue-eco-charger-orb (process-drawable) diff --git a/test/decompiler/reference/levels/sunken/sun-iris-door_REF.gc b/test/decompiler/reference/levels/sunken/sun-iris-door_REF.gc index 3c9a2eea0d..0a0e3ee19b 100644 --- a/test/decompiler/reference/levels/sunken/sun-iris-door_REF.gc +++ b/test/decompiler/reference/levels/sunken/sun-iris-door_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/sun-iris-door-ag.gc") +(import "goal_src/jak1/import/sun-iris-door-ag.gc") ;; definition of type sun-iris-door (deftype sun-iris-door (process-drawable) diff --git a/test/decompiler/reference/levels/sunken/sunken-fish_REF.gc b/test/decompiler/reference/levels/sunken/sunken-fish_REF.gc index 3dbfe9b3f0..6dfd80475b 100644 --- a/test/decompiler/reference/levels/sunken/sunken-fish_REF.gc +++ b/test/decompiler/reference/levels/sunken/sunken-fish_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/sunkenfisha-ag.gc") +(import "goal_src/jak1/import/sunkenfisha-ag.gc") ;; definition of type sunkenfisha (deftype sunkenfisha (process-drawable) diff --git a/test/decompiler/reference/levels/sunken/sunken-obs_REF.gc b/test/decompiler/reference/levels/sunken/sunken-obs_REF.gc index 940a4a0a50..37df5dc337 100644 --- a/test/decompiler/reference/levels/sunken/sunken-obs_REF.gc +++ b/test/decompiler/reference/levels/sunken/sunken-obs_REF.gc @@ -1,9 +1,9 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/seaweed-ag.gc") -(import "goal_src/import/sunkencam-ag.gc") -(import "goal_src/import/side-to-side-plat-ag.gc") +(import "goal_src/jak1/import/seaweed-ag.gc") +(import "goal_src/jak1/import/sunkencam-ag.gc") +(import "goal_src/jak1/import/side-to-side-plat-ag.gc") ;; definition of type water-vol-deadly (deftype water-vol-deadly (process-hidden) diff --git a/test/decompiler/reference/levels/sunken/wall-plat_REF.gc b/test/decompiler/reference/levels/sunken/wall-plat_REF.gc index d395b98519..5418e37ebe 100644 --- a/test/decompiler/reference/levels/sunken/wall-plat_REF.gc +++ b/test/decompiler/reference/levels/sunken/wall-plat_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/wall-plat-ag.gc") +(import "goal_src/jak1/import/wall-plat-ag.gc") ;; definition of type wall-plat (deftype wall-plat (process-drawable) diff --git a/test/decompiler/reference/levels/sunken/wedge-plats_REF.gc b/test/decompiler/reference/levels/sunken/wedge-plats_REF.gc index 1e82d285c6..1eb8261c17 100644 --- a/test/decompiler/reference/levels/sunken/wedge-plats_REF.gc +++ b/test/decompiler/reference/levels/sunken/wedge-plats_REF.gc @@ -1,8 +1,8 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/wedge-plat-outer-ag.gc") -(import "goal_src/import/wedge-plat-ag.gc") +(import "goal_src/jak1/import/wedge-plat-outer-ag.gc") +(import "goal_src/jak1/import/wedge-plat-ag.gc") ;; definition of type wedge-plat-master (deftype wedge-plat-master (process) diff --git a/test/decompiler/reference/levels/sunken/whirlpool_REF.gc b/test/decompiler/reference/levels/sunken/whirlpool_REF.gc index 0b5d49b9c3..3aa19cbc02 100644 --- a/test/decompiler/reference/levels/sunken/whirlpool_REF.gc +++ b/test/decompiler/reference/levels/sunken/whirlpool_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/whirlpool-ag.gc") +(import "goal_src/jak1/import/whirlpool-ag.gc") ;; definition of type whirlpool (deftype whirlpool (process-drawable) diff --git a/test/decompiler/reference/levels/swamp/billy_REF.gc b/test/decompiler/reference/levels/swamp/billy_REF.gc index c481e03565..39b7f9af4f 100644 --- a/test/decompiler/reference/levels/swamp/billy_REF.gc +++ b/test/decompiler/reference/levels/swamp/billy_REF.gc @@ -1,9 +1,9 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/farthy-snack-ag.gc") -(import "goal_src/import/billy-ag.gc") -(import "goal_src/import/billy-sidekick-ag.gc") +(import "goal_src/jak1/import/farthy-snack-ag.gc") +(import "goal_src/jak1/import/billy-ag.gc") +(import "goal_src/jak1/import/billy-sidekick-ag.gc") ;; definition of type billy (deftype billy (process-taskable) diff --git a/test/decompiler/reference/levels/swamp/kermit_REF.gc b/test/decompiler/reference/levels/swamp/kermit_REF.gc index a763b9a214..65b26acf6e 100644 --- a/test/decompiler/reference/levels/swamp/kermit_REF.gc +++ b/test/decompiler/reference/levels/swamp/kermit_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/kermit-ag.gc") +(import "goal_src/jak1/import/kermit-ag.gc") ;; failed to figure out what this is: (defpartgroup group-kermit-charging-up diff --git a/test/decompiler/reference/levels/swamp/swamp-bat_REF.gc b/test/decompiler/reference/levels/swamp/swamp-bat_REF.gc index 641891a78d..ad5b66fd5a 100644 --- a/test/decompiler/reference/levels/swamp/swamp-bat_REF.gc +++ b/test/decompiler/reference/levels/swamp/swamp-bat_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/swamp-bat-ag.gc") +(import "goal_src/jak1/import/swamp-bat-ag.gc") ;; definition of type swamp-bat-idle-path (deftype swamp-bat-idle-path (structure) diff --git a/test/decompiler/reference/levels/swamp/swamp-obs_REF.gc b/test/decompiler/reference/levels/swamp/swamp-obs_REF.gc index 39bd500c62..1c3d1c31b0 100644 --- a/test/decompiler/reference/levels/swamp/swamp-obs_REF.gc +++ b/test/decompiler/reference/levels/swamp/swamp-obs_REF.gc @@ -1,11 +1,11 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/swamp-rock-ag.gc") -(import "goal_src/import/swamp-spike-ag.gc") -(import "goal_src/import/swampcam-ag.gc") -(import "goal_src/import/tar-plat-ag.gc") -(import "goal_src/import/balance-plat-ag.gc") +(import "goal_src/jak1/import/swamp-rock-ag.gc") +(import "goal_src/jak1/import/swamp-spike-ag.gc") +(import "goal_src/jak1/import/swampcam-ag.gc") +(import "goal_src/jak1/import/tar-plat-ag.gc") +(import "goal_src/jak1/import/balance-plat-ag.gc") ;; failed to figure out what this is: (defpartgroup group-swamp-spike-up diff --git a/test/decompiler/reference/levels/swamp/swamp-rat-nest_REF.gc b/test/decompiler/reference/levels/swamp/swamp-rat-nest_REF.gc index f783602882..b85f369280 100644 --- a/test/decompiler/reference/levels/swamp/swamp-rat-nest_REF.gc +++ b/test/decompiler/reference/levels/swamp/swamp-rat-nest_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/swamp-rat-nest-ag.gc") +(import "goal_src/jak1/import/swamp-rat-nest-ag.gc") ;; failed to figure out what this is: (defpartgroup group-swamp-rat-nest-a-explosion diff --git a/test/decompiler/reference/levels/swamp/swamp-rat_REF.gc b/test/decompiler/reference/levels/swamp/swamp-rat_REF.gc index 5bc2b97256..925bf973f3 100644 --- a/test/decompiler/reference/levels/swamp/swamp-rat_REF.gc +++ b/test/decompiler/reference/levels/swamp/swamp-rat_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/swamp-rat-ag.gc") +(import "goal_src/jak1/import/swamp-rat-ag.gc") ;; definition of type swamp-rat (deftype swamp-rat (nav-enemy) diff --git a/test/decompiler/reference/levels/title/title-obs_REF.gc b/test/decompiler/reference/levels/title/title-obs_REF.gc index 33a3af4de0..0f211192b5 100644 --- a/test/decompiler/reference/levels/title/title-obs_REF.gc +++ b/test/decompiler/reference/levels/title/title-obs_REF.gc @@ -1,13 +1,13 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/logo-cam-ag.gc") -(import "goal_src/import/logo-black-ag.gc") -(import "goal_src/import/logo-ag.gc") -(import "goal_src/import/logo-volumes-ag.gc") -(import "goal_src/import/ndi-cam-ag.gc") -(import "goal_src/import/ndi-ag.gc") -(import "goal_src/import/ndi-volumes-ag.gc") +(import "goal_src/jak1/import/logo-cam-ag.gc") +(import "goal_src/jak1/import/logo-black-ag.gc") +(import "goal_src/jak1/import/logo-ag.gc") +(import "goal_src/jak1/import/logo-volumes-ag.gc") +(import "goal_src/jak1/import/ndi-cam-ag.gc") +(import "goal_src/jak1/import/ndi-ag.gc") +(import "goal_src/jak1/import/ndi-volumes-ag.gc") ;; definition of type logo (deftype logo (process-drawable) diff --git a/test/decompiler/reference/levels/training/training-obs_REF.gc b/test/decompiler/reference/levels/training/training-obs_REF.gc index 741801c6d4..6b221d5a23 100644 --- a/test/decompiler/reference/levels/training/training-obs_REF.gc +++ b/test/decompiler/reference/levels/training/training-obs_REF.gc @@ -1,11 +1,11 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/scarecrow-b-ag.gc") -(import "goal_src/import/pontoonfive-ag.gc") -(import "goal_src/import/trainingcam-ag.gc") -(import "goal_src/import/scarecrow-a-ag.gc") -(import "goal_src/import/jng-iris-door-ag.gc") +(import "goal_src/jak1/import/scarecrow-b-ag.gc") +(import "goal_src/jak1/import/pontoonfive-ag.gc") +(import "goal_src/jak1/import/trainingcam-ag.gc") +(import "goal_src/jak1/import/scarecrow-a-ag.gc") +(import "goal_src/jak1/import/jng-iris-door-ag.gc") ;; definition of type training-water (deftype training-water (water-anim) diff --git a/test/decompiler/reference/levels/village1/assistant_REF.gc b/test/decompiler/reference/levels/village1/assistant_REF.gc index 178aa3b6b2..49285b525b 100644 --- a/test/decompiler/reference/levels/village1/assistant_REF.gc +++ b/test/decompiler/reference/levels/village1/assistant_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/assistant-ag.gc") +(import "goal_src/jak1/import/assistant-ag.gc") ;; definition of type assistant (deftype assistant (process-taskable) diff --git a/test/decompiler/reference/levels/village1/explorer_REF.gc b/test/decompiler/reference/levels/village1/explorer_REF.gc index c88ec98291..644e2a84ad 100644 --- a/test/decompiler/reference/levels/village1/explorer_REF.gc +++ b/test/decompiler/reference/levels/village1/explorer_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/explorer-ag.gc") +(import "goal_src/jak1/import/explorer-ag.gc") ;; definition of type explorer (deftype explorer (process-taskable) diff --git a/test/decompiler/reference/levels/village1/farmer_REF.gc b/test/decompiler/reference/levels/village1/farmer_REF.gc index 0cf8506044..20ca9ecb6e 100644 --- a/test/decompiler/reference/levels/village1/farmer_REF.gc +++ b/test/decompiler/reference/levels/village1/farmer_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/farmer-ag.gc") +(import "goal_src/jak1/import/farmer-ag.gc") ;; definition of type farmer (deftype farmer (process-taskable) diff --git a/test/decompiler/reference/levels/village1/fishermans-boat_REF.gc b/test/decompiler/reference/levels/village1/fishermans-boat_REF.gc index 2bfafa80cc..f2b0f986bf 100644 --- a/test/decompiler/reference/levels/village1/fishermans-boat_REF.gc +++ b/test/decompiler/reference/levels/village1/fishermans-boat_REF.gc @@ -1,9 +1,9 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/evilbro-ag.gc") -(import "goal_src/import/fishermans-boat-ag.gc") -(import "goal_src/import/evilsis-ag.gc") +(import "goal_src/jak1/import/evilbro-ag.gc") +(import "goal_src/jak1/import/fishermans-boat-ag.gc") +(import "goal_src/jak1/import/evilsis-ag.gc") ;; definition for symbol *fishermans-boat-constants*, type rigid-body-platform-constants (define *fishermans-boat-constants* (new 'static 'rigid-body-platform-constants diff --git a/test/decompiler/reference/levels/village1/sage_REF.gc b/test/decompiler/reference/levels/village1/sage_REF.gc index 7f57a35865..75579c56e6 100644 --- a/test/decompiler/reference/levels/village1/sage_REF.gc +++ b/test/decompiler/reference/levels/village1/sage_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/sage-ag.gc") +(import "goal_src/jak1/import/sage-ag.gc") ;; definition of type sage (deftype sage (process-taskable) diff --git a/test/decompiler/reference/levels/village1/village-obs_REF.gc b/test/decompiler/reference/levels/village1/village-obs_REF.gc index d0edc3414c..0350257c59 100644 --- a/test/decompiler/reference/levels/village1/village-obs_REF.gc +++ b/test/decompiler/reference/levels/village1/village-obs_REF.gc @@ -1,27 +1,27 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/windmill-sail-ag.gc") -(import "goal_src/import/medres-beach3-ag.gc") -(import "goal_src/import/mayorgears-ag.gc") -(import "goal_src/import/medres-village11-ag.gc") -(import "goal_src/import/revcycleprop-ag.gc") -(import "goal_src/import/medres-jungle2-ag.gc") -(import "goal_src/import/revcycle-ag.gc") -(import "goal_src/import/medres-misty-ag.gc") -(import "goal_src/import/sagesail-ag.gc") -(import "goal_src/import/windspinner-ag.gc") -(import "goal_src/import/medres-jungle1-ag.gc") -(import "goal_src/import/medres-village12-ag.gc") -(import "goal_src/import/hutlamp-ag.gc") -(import "goal_src/import/medres-jungle-ag.gc") -(import "goal_src/import/medres-village13-ag.gc") -(import "goal_src/import/medres-beach2-ag.gc") -(import "goal_src/import/villa-starfish-ag.gc") -(import "goal_src/import/medres-training-ag.gc") -(import "goal_src/import/medres-beach-ag.gc") -(import "goal_src/import/reflector-middle-ag.gc") -(import "goal_src/import/medres-beach1-ag.gc") +(import "goal_src/jak1/import/windmill-sail-ag.gc") +(import "goal_src/jak1/import/medres-beach3-ag.gc") +(import "goal_src/jak1/import/mayorgears-ag.gc") +(import "goal_src/jak1/import/medres-village11-ag.gc") +(import "goal_src/jak1/import/revcycleprop-ag.gc") +(import "goal_src/jak1/import/medres-jungle2-ag.gc") +(import "goal_src/jak1/import/revcycle-ag.gc") +(import "goal_src/jak1/import/medres-misty-ag.gc") +(import "goal_src/jak1/import/sagesail-ag.gc") +(import "goal_src/jak1/import/windspinner-ag.gc") +(import "goal_src/jak1/import/medres-jungle1-ag.gc") +(import "goal_src/jak1/import/medres-village12-ag.gc") +(import "goal_src/jak1/import/hutlamp-ag.gc") +(import "goal_src/jak1/import/medres-jungle-ag.gc") +(import "goal_src/jak1/import/medres-village13-ag.gc") +(import "goal_src/jak1/import/medres-beach2-ag.gc") +(import "goal_src/jak1/import/villa-starfish-ag.gc") +(import "goal_src/jak1/import/medres-training-ag.gc") +(import "goal_src/jak1/import/medres-beach-ag.gc") +(import "goal_src/jak1/import/reflector-middle-ag.gc") +(import "goal_src/jak1/import/medres-beach1-ag.gc") ;; failed to figure out what this is: (defskelgroup *med-res-jungle-sg* medres-jungle medres-jungle-lod0-jg medres-jungle-idle-ja diff --git a/test/decompiler/reference/levels/village1/yakow_REF.gc b/test/decompiler/reference/levels/village1/yakow_REF.gc index 02af99fbdf..9b1b3fad4b 100644 --- a/test/decompiler/reference/levels/village1/yakow_REF.gc +++ b/test/decompiler/reference/levels/village1/yakow_REF.gc @@ -1,8 +1,8 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/village1cam-ag.gc") -(import "goal_src/import/yakow-ag.gc") +(import "goal_src/jak1/import/village1cam-ag.gc") +(import "goal_src/jak1/import/yakow-ag.gc") ;; failed to figure out what this is: (defskelgroup *village1cam-sg* village1cam village1cam-lod0-jg village1cam-anim-ja diff --git a/test/decompiler/reference/levels/village2/assistant-village2_REF.gc b/test/decompiler/reference/levels/village2/assistant-village2_REF.gc index 49bdb08148..6844e0d6e9 100644 --- a/test/decompiler/reference/levels/village2/assistant-village2_REF.gc +++ b/test/decompiler/reference/levels/village2/assistant-village2_REF.gc @@ -1,8 +1,8 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/jaws-ag.gc") -(import "goal_src/import/assistant-village2-ag.gc") +(import "goal_src/jak1/import/jaws-ag.gc") +(import "goal_src/jak1/import/assistant-village2-ag.gc") ;; definition of type assistant-levitator (deftype assistant-levitator (process-taskable) diff --git a/test/decompiler/reference/levels/village2/flutflut-bluehut_REF.gc b/test/decompiler/reference/levels/village2/flutflut-bluehut_REF.gc index 5d90893691..6ba730c0f6 100644 --- a/test/decompiler/reference/levels/village2/flutflut-bluehut_REF.gc +++ b/test/decompiler/reference/levels/village2/flutflut-bluehut_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/flutflut-bluehut-ag.gc") +(import "goal_src/jak1/import/flutflut-bluehut-ag.gc") ;; definition of type flutflut-bluehut (deftype flutflut-bluehut (process-taskable) diff --git a/test/decompiler/reference/levels/village2/gambler_REF.gc b/test/decompiler/reference/levels/village2/gambler_REF.gc index e4824116f7..759687984a 100644 --- a/test/decompiler/reference/levels/village2/gambler_REF.gc +++ b/test/decompiler/reference/levels/village2/gambler_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/gambler-ag.gc") +(import "goal_src/jak1/import/gambler-ag.gc") ;; definition of type gambler (deftype gambler (process-taskable) diff --git a/test/decompiler/reference/levels/village2/geologist_REF.gc b/test/decompiler/reference/levels/village2/geologist_REF.gc index 914a44a867..928d1408f8 100644 --- a/test/decompiler/reference/levels/village2/geologist_REF.gc +++ b/test/decompiler/reference/levels/village2/geologist_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/geologist-ag.gc") +(import "goal_src/jak1/import/geologist-ag.gc") ;; definition of type geologist (deftype geologist (process-taskable) diff --git a/test/decompiler/reference/levels/village2/sage-bluehut_REF.gc b/test/decompiler/reference/levels/village2/sage-bluehut_REF.gc index ad970867aa..194d7b2419 100644 --- a/test/decompiler/reference/levels/village2/sage-bluehut_REF.gc +++ b/test/decompiler/reference/levels/village2/sage-bluehut_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/sage-bluehut-ag.gc") +(import "goal_src/jak1/import/sage-bluehut-ag.gc") ;; definition of type assistant-bluehut (deftype assistant-bluehut (process-taskable) diff --git a/test/decompiler/reference/levels/village2/sunken-elevator_REF.gc b/test/decompiler/reference/levels/village2/sunken-elevator_REF.gc index 9767c560ed..617e24b449 100644 --- a/test/decompiler/reference/levels/village2/sunken-elevator_REF.gc +++ b/test/decompiler/reference/levels/village2/sunken-elevator_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/sunken-elevator-ag.gc") +(import "goal_src/jak1/import/sunken-elevator-ag.gc") ;; definition of type sunken-elevator (deftype sunken-elevator (plat-button) diff --git a/test/decompiler/reference/levels/village2/swamp-blimp_REF.gc b/test/decompiler/reference/levels/village2/swamp-blimp_REF.gc index 8cf7eff5ba..55809fe9e6 100644 --- a/test/decompiler/reference/levels/village2/swamp-blimp_REF.gc +++ b/test/decompiler/reference/levels/village2/swamp-blimp_REF.gc @@ -1,11 +1,11 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/swamp-tetherrock-ag.gc") -(import "goal_src/import/swamp-rope-ag.gc") -(import "goal_src/import/swamp-tetherrock-explode-ag.gc") -(import "goal_src/import/precursor-arm-ag.gc") -(import "goal_src/import/swamp-blimp-ag.gc") +(import "goal_src/jak1/import/swamp-tetherrock-ag.gc") +(import "goal_src/jak1/import/swamp-rope-ag.gc") +(import "goal_src/jak1/import/swamp-tetherrock-explode-ag.gc") +(import "goal_src/jak1/import/precursor-arm-ag.gc") +(import "goal_src/jak1/import/swamp-blimp-ag.gc") ;; failed to figure out what this is: (defskelgroup *swamp-tetherrock-sg* swamp-tetherrock swamp-tetherrock-lod0-jg swamp-tetherrock-idle-ja diff --git a/test/decompiler/reference/levels/village2/village2-obs_REF.gc b/test/decompiler/reference/levels/village2/village2-obs_REF.gc index 6cd2459fab..fdf2392df2 100644 --- a/test/decompiler/reference/levels/village2/village2-obs_REF.gc +++ b/test/decompiler/reference/levels/village2/village2-obs_REF.gc @@ -1,17 +1,17 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/pontoonfive-ag.gc") -(import "goal_src/import/allpontoons-ag.gc") -(import "goal_src/import/medres-village2-ag.gc") -(import "goal_src/import/exit-chamber-dummy-ag.gc") -(import "goal_src/import/village2cam-ag.gc") -(import "goal_src/import/fireboulder-ag.gc") -(import "goal_src/import/ogreboss-village2-ag.gc") -(import "goal_src/import/ceilingflag-ag.gc") -(import "goal_src/import/medres-rolling1-ag.gc") -(import "goal_src/import/medres-rolling-ag.gc") -(import "goal_src/import/pontoonten-ag.gc") +(import "goal_src/jak1/import/pontoonfive-ag.gc") +(import "goal_src/jak1/import/allpontoons-ag.gc") +(import "goal_src/jak1/import/medres-village2-ag.gc") +(import "goal_src/jak1/import/exit-chamber-dummy-ag.gc") +(import "goal_src/jak1/import/village2cam-ag.gc") +(import "goal_src/jak1/import/fireboulder-ag.gc") +(import "goal_src/jak1/import/ogreboss-village2-ag.gc") +(import "goal_src/jak1/import/ceilingflag-ag.gc") +(import "goal_src/jak1/import/medres-rolling1-ag.gc") +(import "goal_src/jak1/import/medres-rolling-ag.gc") +(import "goal_src/jak1/import/pontoonten-ag.gc") ;; definition of type village2cam (deftype village2cam (pov-camera) diff --git a/test/decompiler/reference/levels/village2/warrior_REF.gc b/test/decompiler/reference/levels/village2/warrior_REF.gc index 35e41bbba4..038c5c112b 100644 --- a/test/decompiler/reference/levels/village2/warrior_REF.gc +++ b/test/decompiler/reference/levels/village2/warrior_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/warrior-ag.gc") +(import "goal_src/jak1/import/warrior-ag.gc") ;; definition of type warrior (deftype warrior (process-taskable) diff --git a/test/decompiler/reference/levels/village3/assistant-village3_REF.gc b/test/decompiler/reference/levels/village3/assistant-village3_REF.gc index b3d05604c7..8130d49a5a 100644 --- a/test/decompiler/reference/levels/village3/assistant-village3_REF.gc +++ b/test/decompiler/reference/levels/village3/assistant-village3_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/assistant-village3-ag.gc") +(import "goal_src/jak1/import/assistant-village3-ag.gc") ;; definition of type assistant-villagec (deftype assistant-villagec (process-taskable) diff --git a/test/decompiler/reference/levels/village3/minecart_REF.gc b/test/decompiler/reference/levels/village3/minecart_REF.gc index 17e0ad74a5..d221c00246 100644 --- a/test/decompiler/reference/levels/village3/minecart_REF.gc +++ b/test/decompiler/reference/levels/village3/minecart_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/minecartsteel-ag.gc") +(import "goal_src/jak1/import/minecartsteel-ag.gc") ;; failed to figure out what this is: (defskelgroup *minecartsteel-sg* minecartsteel minecartsteel-lod0-jg minecartsteel-idle-ja diff --git a/test/decompiler/reference/levels/village3/miners_REF.gc b/test/decompiler/reference/levels/village3/miners_REF.gc index fddac569ae..a422533c26 100644 --- a/test/decompiler/reference/levels/village3/miners_REF.gc +++ b/test/decompiler/reference/levels/village3/miners_REF.gc @@ -1,9 +1,9 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/minershort-ag.gc") -(import "goal_src/import/cavegem-ag.gc") -(import "goal_src/import/minertall-ag.gc") +(import "goal_src/jak1/import/minershort-ag.gc") +(import "goal_src/jak1/import/cavegem-ag.gc") +(import "goal_src/jak1/import/minertall-ag.gc") ;; definition for function miners-anim-loop (defbehavior miners-anim-loop minershort () diff --git a/test/decompiler/reference/levels/village3/sage-village3_REF.gc b/test/decompiler/reference/levels/village3/sage-village3_REF.gc index 7218ca3a65..28d692f156 100644 --- a/test/decompiler/reference/levels/village3/sage-village3_REF.gc +++ b/test/decompiler/reference/levels/village3/sage-village3_REF.gc @@ -1,9 +1,9 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/evilsis-village3-ag.gc") -(import "goal_src/import/sage-village3-ag.gc") -(import "goal_src/import/evilbro-village3-ag.gc") +(import "goal_src/jak1/import/evilsis-village3-ag.gc") +(import "goal_src/jak1/import/sage-village3-ag.gc") +(import "goal_src/jak1/import/evilbro-village3-ag.gc") ;; definition of type sage-villagec (deftype sage-villagec (process-taskable) diff --git a/test/decompiler/reference/levels/village3/village3-obs_REF.gc b/test/decompiler/reference/levels/village3/village3-obs_REF.gc index c77c89b0a4..72c8a5bf6f 100644 --- a/test/decompiler/reference/levels/village3/village3-obs_REF.gc +++ b/test/decompiler/reference/levels/village3/village3-obs_REF.gc @@ -1,13 +1,13 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/medres-ogre-ag.gc") -(import "goal_src/import/medres-finalboss-ag.gc") -(import "goal_src/import/pistons-ag.gc") -(import "goal_src/import/gondola-ag.gc") -(import "goal_src/import/medres-ogre2-ag.gc") -(import "goal_src/import/medres-ogre3-ag.gc") -(import "goal_src/import/gondolacables-ag.gc") +(import "goal_src/jak1/import/medres-ogre-ag.gc") +(import "goal_src/jak1/import/medres-finalboss-ag.gc") +(import "goal_src/jak1/import/pistons-ag.gc") +(import "goal_src/jak1/import/gondola-ag.gc") +(import "goal_src/jak1/import/medres-ogre2-ag.gc") +(import "goal_src/jak1/import/medres-ogre3-ag.gc") +(import "goal_src/jak1/import/gondolacables-ag.gc") ;; failed to figure out what this is: (defskelgroup *med-res-ogre-sg* medres-ogre medres-ogre-lod0-jg medres-ogre-idle-ja diff --git a/test/decompiler/reference/levels/village_common/oracle_REF.gc b/test/decompiler/reference/levels/village_common/oracle_REF.gc index 4626b08f25..8340be2b8e 100644 --- a/test/decompiler/reference/levels/village_common/oracle_REF.gc +++ b/test/decompiler/reference/levels/village_common/oracle_REF.gc @@ -1,7 +1,7 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/oracle-ag.gc") +(import "goal_src/jak1/import/oracle-ag.gc") ;; definition of type oracle (deftype oracle (process-taskable) diff --git a/test/decompiler/reference/levels/village_common/villagep-obs_REF.gc b/test/decompiler/reference/levels/village_common/villagep-obs_REF.gc index d4b856b8ad..8c8687319a 100644 --- a/test/decompiler/reference/levels/village_common/villagep-obs_REF.gc +++ b/test/decompiler/reference/levels/village_common/villagep-obs_REF.gc @@ -1,8 +1,8 @@ ;;-*-Lisp-*- (in-package goal) -(import "goal_src/import/warp-gate-switch-ag.gc") -(import "goal_src/import/village-cam-ag.gc") +(import "goal_src/jak1/import/warp-gate-switch-ag.gc") +(import "goal_src/jak1/import/village-cam-ag.gc") ;; definition of type warpgate (deftype warpgate (process-hidden) diff --git a/goal_src/test/test-format.gc b/test/goalc/source_templates/with_game/test-format.gc similarity index 100% rename from goal_src/test/test-format.gc rename to test/goalc/source_templates/with_game/test-format.gc diff --git a/test/goalc/test_with_game.cpp b/test/goalc/test_with_game.cpp index 04e0608cae..848d555b7f 100644 --- a/test/goalc/test_with_game.cpp +++ b/test/goalc/test_with_game.cpp @@ -88,7 +88,7 @@ class WithMinimalGameTests : public ::testing::Test { "(dgo-load \"kernel\" global (link-flag output-load-msg output-load-true-msg execute-login " "print-login) #x200000)"); - const auto minimal_files = {"goal_src/engine/math/vector-h.gc"}; + const auto minimal_files = {"goal_src/jak1/engine/math/vector-h.gc"}; for (auto& file : minimal_files) { shared_compiler->compiler.run_test_from_string(fmt::format("(ml \"{}\")", file)); } diff --git a/test/offline/offline_test_main.cpp b/test/offline/offline_test_main.cpp index 7f4743af95..838b7753d4 100644 --- a/test/offline/offline_test_main.cpp +++ b/test/offline/offline_test_main.cpp @@ -121,9 +121,11 @@ std::vector find_files(const std::vector& dgos) { fmt::print(" Found {} reference files\n", files_with_ref.size()); // use the all_objs.json file to place them in the correct build order + // TODO - jak2 - Bad! auto j = parse_commented_json( file_util::read_text_file( - (file_util::get_jak_project_dir() / "goal_src" / "build" / "all_objs.json").string()), + (file_util::get_jak_project_dir() / "goal_src" / "jak1" / "build" / "all_objs.json") + .string()), "all_objs.json"); std::unordered_set matched_files; @@ -183,7 +185,8 @@ std::vector find_art_files(const std::vector& dg // use the all_objs.json file to place them in the correct build order auto j = parse_commented_json( file_util::read_text_file( - (file_util::get_jak_project_dir() / "goal_src" / "build" / "all_objs.json").string()), + (file_util::get_jak_project_dir() / "goal_src" / "jak1" / "build" / "all_objs.json") + .string()), "all_objs.json"); for (auto& x : j) { diff --git a/test/test_pretty_print.cpp b/test/test_pretty_print.cpp index 6885091db6..745c2b59e9 100644 --- a/test/test_pretty_print.cpp +++ b/test/test_pretty_print.cpp @@ -37,7 +37,7 @@ TEST(PrettyPrinter, Basics) { TEST(PrettyPrinter, ReadAgain) { // first read the gcommon file auto gcommon_code = pretty_print::get_pretty_printer_reader().read_from_file( - {"goal_src", "kernel", "gcommon.gc"}); + {"goal_src", "jak1", "kernel", "gcommon.gc"}); // pretty print it auto printed_gcommon = pretty_print::to_string(gcommon_code); auto gcommon_code2 = pretty_print::get_pretty_printer_reader() @@ -52,7 +52,7 @@ TEST(PrettyPrinter, ReadAgain) { TEST(PrettyPrinter, ReadAgainVeryShortLines) { // first read the gcommon file auto gcommon_code = pretty_print::get_pretty_printer_reader().read_from_file( - {"goal_src", "kernel", "gcommon.gc"}); + {"goal_src", "jak1", "kernel", "gcommon.gc"}); // pretty print it but with a very short line length. This looks terrible but will hopefully // hit many of the cases for line breaking. auto printed_gcommon = pretty_print::to_string(gcommon_code, 80); @@ -92,7 +92,7 @@ TEST(PrettyPrinter, DefunNoArgs) { TEST(PrettyPrinter2, Debugging) { // first read the gcommon file auto gcommon_code = pretty_print::get_pretty_printer_reader().read_from_file( - {"goal_src", "kernel", "gcommon.gc"}); + {"goal_src", "jak1", "kernel", "gcommon.gc"}); // pretty print it auto printed_gcommon = pretty_print::to_string(gcommon_code); auto gcommon_code2 = pretty_print::get_pretty_printer_reader() @@ -318,4 +318,4 @@ TEST(PrettyPrint2, AnotherBug) { " (t9-2 vector-xz-normalize!)\n" " )\n" " )"); -} \ No newline at end of file +}