From 324def1303d0e2eedb51bceeb9607642c502410a Mon Sep 17 00:00:00 2001 From: ManDude <7569514+ManDude@users.noreply.github.com> Date: Mon, 13 Feb 2023 21:39:14 +0000 Subject: [PATCH] split new pc features in some files into their own code files + address some old issues + ripple graphics improvements (#2216) Moves PC-specific entity and debug menu things to `entity-debug.gc` and `default-menu-pc.gc` respectively and makes `(declare-file (debug))` work as it should (no need to wrap the entire file in `(when *debug-segment*` now!). Also changes the DGO descriptor format so that it's less verbose. It might break custom levels, but the format change is very simple so it should not be difficult for anyone to update to the new format. Sadly, you lose the completely useless ability to use DGO object names that don't match the source file name. The horror! I've also gone ahead and expanded the force envmap option to also force the ripple effect to be active. I did not notice any performance or visual drawbacks from this. Gets rid of some distracting LOD and some water pools appearing super flat (and pitch back for dark eco). Fixes #1424 --- custom_levels/test-zone/testzone.gd | 6 +- decompiler/analysis/final_output.cpp | 9 +- goal_src/jak1/dgos/bea.gd | 103 +- goal_src/jak1/dgos/cit.gd | 105 +- goal_src/jak1/dgos/dar.gd | 35 +- goal_src/jak1/dgos/dem.gd | 37 +- goal_src/jak1/dgos/engine.gd | 604 +++++------ goal_src/jak1/dgos/fic.gd | 53 +- goal_src/jak1/dgos/fin.gd | 77 +- goal_src/jak1/dgos/game.gd | 684 ++++++------ goal_src/jak1/dgos/int.gd | 19 +- goal_src/jak1/dgos/jub.gd | 39 +- goal_src/jak1/dgos/jun.gd | 102 +- goal_src/jak1/dgos/kernel.gd | 18 +- goal_src/jak1/dgos/lav.gd | 77 +- goal_src/jak1/dgos/mai.gd | 69 +- goal_src/jak1/dgos/mis.gd | 121 ++- goal_src/jak1/dgos/ogr.gd | 73 +- goal_src/jak1/dgos/rob.gd | 47 +- goal_src/jak1/dgos/rol.gd | 67 +- goal_src/jak1/dgos/sno.gd | 105 +- goal_src/jak1/dgos/sub.gd | 45 +- goal_src/jak1/dgos/sun.gd | 124 +-- goal_src/jak1/dgos/swa.gd | 75 +- goal_src/jak1/dgos/tit.gd | 32 +- goal_src/jak1/dgos/tra.gd | 40 +- goal_src/jak1/dgos/vi1.gd | 112 +- goal_src/jak1/dgos/vi2.gd | 106 +- goal_src/jak1/dgos/vi3.gd | 72 +- goal_src/jak1/engine/camera/cam-debug-h.gc | 4 +- goal_src/jak1/engine/camera/cam-debug.gc | 4 +- goal_src/jak1/engine/camera/cam-layout.gc | 4 +- .../engine/common-obs/process-drawable.gc | 3 +- goal_src/jak1/engine/debug/anim-tester.gc | 4 +- goal_src/jak1/engine/debug/default-menu.gc | 973 +---------------- goal_src/jak1/engine/debug/memory-usage.gc | 4 +- goal_src/jak1/engine/debug/menu.gc | 4 +- goal_src/jak1/engine/debug/part-tester.gc | 4 +- goal_src/jak1/engine/dma/dma-disasm.gc | 1 + goal_src/jak1/engine/entity/entity.gc | 228 ---- goal_src/jak1/engine/gfx/foreground/bones.gc | 14 +- goal_src/jak1/engine/util/glist-h.gc | 4 +- goal_src/jak1/engine/util/glist.gc | 6 +- goal_src/jak1/game.gp | 8 +- .../jak1/pc/{util => debug}/anim-tester-x.gc | 5 +- goal_src/jak1/pc/debug/default-menu-pc.gc | 976 ++++++++++++++++++ goal_src/jak1/pc/debug/entity-debug.gc | 230 +++++ goal_src/jak2/dgos/art.gd | 64 +- goal_src/jak2/dgos/ate.gd | 92 +- goal_src/jak2/dgos/ato.gd | 46 +- goal_src/jak2/dgos/cab.gd | 36 +- goal_src/jak2/dgos/cap.gd | 30 +- goal_src/jak2/dgos/cas.gd | 58 +- goal_src/jak2/dgos/cascity.gd | 14 +- goal_src/jak2/dgos/casext.gd | 24 +- goal_src/jak2/dgos/cfa.gd | 42 +- goal_src/jak2/dgos/cfb.gd | 40 +- goal_src/jak2/dgos/cga.gd | 18 +- goal_src/jak2/dgos/cgb.gd | 20 +- goal_src/jak2/dgos/cgc.gd | 16 +- goal_src/jak2/dgos/cia.gd | 18 +- goal_src/jak2/dgos/cib.gd | 20 +- goal_src/jak2/dgos/cma.gd | 36 +- goal_src/jak2/dgos/cmb.gd | 36 +- goal_src/jak2/dgos/coa.gd | 48 +- goal_src/jak2/dgos/cob.gd | 28 +- goal_src/jak2/dgos/common.gd | 72 +- goal_src/jak2/dgos/cpa.gd | 30 +- goal_src/jak2/dgos/cpo.gd | 26 +- goal_src/jak2/dgos/cta.gd | 24 +- goal_src/jak2/dgos/ctb.gd | 22 +- goal_src/jak2/dgos/ctc.gd | 20 +- goal_src/jak2/dgos/ctyasha.gd | 64 +- goal_src/jak2/dgos/ctykora.gd | 68 +- goal_src/jak2/dgos/cwi.gd | 134 +-- goal_src/jak2/dgos/d3a.gd | 96 +- goal_src/jak2/dgos/d3b.gd | 16 +- goal_src/jak2/dgos/demo.gd | 18 +- goal_src/jak2/dgos/dg1.gd | 64 +- goal_src/jak2/dgos/dmi.gd | 84 +- goal_src/jak2/dgos/drb.gd | 22 +- goal_src/jak2/dgos/dri.gd | 44 +- goal_src/jak2/dgos/drillmtn.gd | 66 +- goal_src/jak2/dgos/engine.gd | 746 ++++++------- goal_src/jak2/dgos/fda.gd | 44 +- goal_src/jak2/dgos/fdb.gd | 38 +- goal_src/jak2/dgos/fea.gd | 26 +- goal_src/jak2/dgos/feb.gd | 28 +- goal_src/jak2/dgos/fob.gd | 30 +- goal_src/jak2/dgos/for.gd | 82 +- goal_src/jak2/dgos/fordumpc.gd | 48 +- goal_src/jak2/dgos/fordumpd.gd | 14 +- goal_src/jak2/dgos/fra.gd | 56 +- goal_src/jak2/dgos/frb.gd | 32 +- goal_src/jak2/dgos/game.gd | 880 ++++++++-------- goal_src/jak2/dgos/garage.gd | 38 +- goal_src/jak2/dgos/gga.gd | 52 +- goal_src/jak2/dgos/halfpipe.gd | 14 +- goal_src/jak2/dgos/hideout.gd | 34 +- goal_src/jak2/dgos/hiphog.gd | 46 +- goal_src/jak2/dgos/introcst.gd | 48 +- goal_src/jak2/dgos/kernel.gd | 18 +- goal_src/jak2/dgos/kiosk.gd | 28 +- goal_src/jak2/dgos/lashgrd.gd | 14 +- goal_src/jak2/dgos/lashthrn.gd | 12 +- goal_src/jak2/dgos/lbbush.gd | 14 +- goal_src/jak2/dgos/lbombbot.gd | 14 +- goal_src/jak2/dgos/lbrnermk.gd | 18 +- goal_src/jak2/dgos/lcguard.gd | 8 +- goal_src/jak2/dgos/lcitylow.gd | 16 +- goal_src/jak2/dgos/ldjakbrn.gd | 18 +- goal_src/jak2/dgos/lerbrngd.gd | 16 +- goal_src/jak2/dgos/lerlchal.gd | 32 +- goal_src/jak2/dgos/lerltess.gd | 16 +- goal_src/jak2/dgos/lerrol.gd | 8 +- goal_src/jak2/dgos/lgarcsta.gd | 20 +- goal_src/jak2/dgos/lguard.gd | 24 +- goal_src/jak2/dgos/lhelldog.gd | 12 +- goal_src/jak2/dgos/lhipout.gd | 34 +- goal_src/jak2/dgos/lintcstb.gd | 18 +- goal_src/jak2/dgos/ljakdax.gd | 10 +- goal_src/jak2/dgos/ljkdxash.gd | 14 +- goal_src/jak2/dgos/lkeirift.gd | 14 +- goal_src/jak2/dgos/lkiddoge.gd | 46 +- goal_src/jak2/dgos/lmeetbrt.gd | 12 +- goal_src/jak2/dgos/loutcstb.gd | 30 +- goal_src/jak2/dgos/lpackage.gd | 10 +- goal_src/jak2/dgos/lportrun.gd | 18 +- goal_src/jak2/dgos/lpower.gd | 10 +- goal_src/jak2/dgos/lprotect.gd | 18 +- goal_src/jak2/dgos/lprsncst.gd | 16 +- goal_src/jak2/dgos/lprtrace.gd | 28 +- goal_src/jak2/dgos/lracebb.gd | 4 +- goal_src/jak2/dgos/lracebf.gd | 4 +- goal_src/jak2/dgos/lracecb.gd | 6 +- goal_src/jak2/dgos/lracecf.gd | 6 +- goal_src/jak2/dgos/lracedb.gd | 4 +- goal_src/jak2/dgos/lracedf.gd | 4 +- goal_src/jak2/dgos/lracelit.gd | 14 +- goal_src/jak2/dgos/lsack.gd | 10 +- goal_src/jak2/dgos/lsamergd.gd | 18 +- goal_src/jak2/dgos/lshuttle.gd | 12 +- goal_src/jak2/dgos/lsmysbrt.gd | 14 +- goal_src/jak2/dgos/ltentob.gd | 14 +- goal_src/jak2/dgos/ltentout.gd | 12 +- goal_src/jak2/dgos/ltess.gd | 24 +- goal_src/jak2/dgos/lthrnout.gd | 14 +- goal_src/jak2/dgos/ltrnkrkd.gd | 16 +- goal_src/jak2/dgos/ltrntess.gd | 20 +- goal_src/jak2/dgos/ltrnysam.gd | 14 +- goal_src/jak2/dgos/lwhack.gd | 26 +- goal_src/jak2/dgos/lwidea.gd | 34 +- goal_src/jak2/dgos/lwideb.gd | 24 +- goal_src/jak2/dgos/lwidec.gd | 32 +- goal_src/jak2/dgos/lwidesta.gd | 24 +- goal_src/jak2/dgos/lysamsam.gd | 12 +- goal_src/jak2/dgos/lyskdcd.gd | 24 +- goal_src/jak2/dgos/mcn.gd | 42 +- goal_src/jak2/dgos/mtn.gd | 68 +- goal_src/jak2/dgos/mtx.gd | 60 +- goal_src/jak2/dgos/neb.gd | 114 +- goal_src/jak2/dgos/nes.gd | 50 +- goal_src/jak2/dgos/nestt.gd | 50 +- goal_src/jak2/dgos/onintent.gd | 36 +- goal_src/jak2/dgos/oracle.gd | 32 +- goal_src/jak2/dgos/outrocst.gd | 44 +- goal_src/jak2/dgos/pac.gd | 46 +- goal_src/jak2/dgos/pae.gd | 46 +- goal_src/jak2/dgos/palboss.gd | 36 +- goal_src/jak2/dgos/palout.gd | 10 +- goal_src/jak2/dgos/par.gd | 34 +- goal_src/jak2/dgos/pas.gd | 20 +- goal_src/jak2/dgos/portwall.gd | 10 +- goal_src/jak2/dgos/pri.gd | 34 +- goal_src/jak2/dgos/rui.gd | 98 +- goal_src/jak2/dgos/sag.gd | 34 +- goal_src/jak2/dgos/seb.gd | 88 +- goal_src/jak2/dgos/sew.gd | 52 +- goal_src/jak2/dgos/ska.gd | 24 +- goal_src/jak2/dgos/sta.gd | 34 +- goal_src/jak2/dgos/stadblmp.gd | 38 +- goal_src/jak2/dgos/stb.gd | 48 +- goal_src/jak2/dgos/stc.gd | 48 +- goal_src/jak2/dgos/std.gd | 48 +- goal_src/jak2/dgos/str.gd | 102 +- goal_src/jak2/dgos/swb.gd | 86 +- goal_src/jak2/dgos/swe.gd | 50 +- goal_src/jak2/dgos/tbo.gd | 40 +- goal_src/jak2/dgos/thr.gd | 24 +- goal_src/jak2/dgos/title.gd | 16 +- goal_src/jak2/dgos/toa.gd | 58 +- goal_src/jak2/dgos/tob.gd | 28 +- goal_src/jak2/dgos/toc.gd | 30 +- goal_src/jak2/dgos/tod.gd | 34 +- goal_src/jak2/dgos/toe.gd | 26 +- goal_src/jak2/dgos/tombext.gd | 12 +- goal_src/jak2/dgos/unb.gd | 184 ++-- goal_src/jak2/dgos/und.gd | 44 +- goal_src/jak2/dgos/vi1.gd | 40 +- goal_src/jak2/dgos/vin.gd | 54 +- goal_src/jak2/engine/camera/cam-debug-h.gc | 4 +- goal_src/jak2/engine/camera/cam-debug.gc | 4 +- goal_src/jak2/engine/camera/cam-layout.gc | 4 +- goal_src/jak2/engine/collide/collide-debug.gc | 3 - goal_src/jak2/engine/debug/debug-part.gc | 7 +- goal_src/jak2/engine/debug/default-menu.gc | 4 +- goal_src/jak2/engine/debug/editable-h.gc | 4 +- goal_src/jak2/engine/debug/editable-player.gc | 4 +- goal_src/jak2/engine/debug/editable.gc | 4 +- goal_src/jak2/engine/debug/history.gc | 4 +- goal_src/jak2/engine/debug/memory-usage-h.gc | 4 +- goal_src/jak2/engine/debug/memory-usage.gc | 4 +- goal_src/jak2/engine/debug/menu.gc | 4 +- .../jak2/engine/debug/nav/mysql-nav-graph.gc | 4 +- goal_src/jak2/engine/debug/part-tester.gc | 4 +- goal_src/jak2/engine/debug/sampler.gc | 4 +- goal_src/jak2/engine/dma/dma-disasm.gc | 3 - goal_src/jak2/engine/gfx/mood/mood-tables2.gc | 4 +- goal_src/jak2/engine/util/capture-h.gc | 4 +- goal_src/jak2/engine/util/capture.gc | 4 +- goal_src/jak2/engine/util/glist-h.gc | 4 +- goal_src/jak2/engine/util/glist.gc | 4 +- goal_src/jak2/levels/common/scene-looper.gc | 4 +- goal_src/jak2/lib/project-lib.gp | 11 +- goalc/compiler/Compiler.cpp | 18 +- goalc/compiler/CompilerException.h | 7 +- goalc/compiler/Env.h | 2 + goalc/compiler/compilation/Function.cpp | 7 +- goalc/make/Tools.cpp | 27 +- .../jak1/engine/camera/cam-debug-h_REF.gc | 4 +- .../jak1/engine/camera/cam-layout_REF.gc | 4 +- .../jak1/engine/debug/anim-tester_REF.gc | 4 +- .../jak1/engine/debug/default-menu_REF.gc | 4 +- .../jak1/engine/debug/memory-usage-h_REF.gc | 4 +- .../jak1/engine/debug/memory-usage_REF.gc | 4 +- .../reference/jak1/engine/debug/menu_REF.gc | 8 +- .../jak1/engine/debug/part-tester_REF.gc | 4 +- .../jak1/engine/dma/dma-disasm_REF.gc | 4 +- .../reference/jak1/engine/gfx/capture_REF.gc | 4 +- .../reference/jak1/engine/util/glist-h_REF.gc | 7 +- .../reference/jak1/engine/util/glist_REF.gc | 4 +- .../jak2/engine/camera/cam-debug-h_REF.gc | 4 +- .../jak2/engine/camera/cam-debug_REF.gc | 7 +- .../jak2/engine/camera/cam-layout_REF.gc | 7 +- .../jak2/engine/collide/collide-debug_REF.gc | 7 +- .../jak2/engine/debug/debug-part_REF.gc | 7 +- .../jak2/engine/debug/default-menu_REF.gc | 4 +- .../jak2/engine/debug/editable-h_REF.gc | 4 +- .../jak2/engine/debug/editable-player_REF.gc | 4 +- .../jak2/engine/debug/editable_REF.gc | 4 +- .../jak2/engine/debug/history_REF.gc | 4 +- .../jak2/engine/debug/memory-usage-h_REF.gc | 5 +- .../jak2/engine/debug/memory-usage_REF.gc | 5 +- .../reference/jak2/engine/debug/menu_REF.gc | 85 +- .../engine/debug/nav/mysql-nav-graph_REF.gc | 4 +- .../jak2/engine/debug/part-tester_REF.gc | 4 +- .../jak2/engine/debug/sampler_REF.gc | 4 +- .../jak2/engine/dma/dma-disasm_REF.gc | 4 +- .../jak2/engine/gfx/mood/mood-tables2_REF.gc | 4 +- .../jak2/engine/util/capture-h_REF.gc | 4 +- .../reference/jak2/engine/util/capture_REF.gc | 4 +- .../reference/jak2/engine/util/glist-h_REF.gc | 7 +- .../reference/jak2/engine/util/glist_REF.gc | 4 +- .../jak2/levels/common/scene-looper_REF.gc | 4 +- 264 files changed, 6364 insertions(+), 6414 deletions(-) rename goal_src/jak1/pc/{util => debug}/anim-tester-x.gc (99%) create mode 100644 goal_src/jak1/pc/debug/default-menu-pc.gc create mode 100644 goal_src/jak1/pc/debug/entity-debug.gc diff --git a/custom_levels/test-zone/testzone.gd b/custom_levels/test-zone/testzone.gd index 0ecd61c2ae..f9b189743c 100644 --- a/custom_levels/test-zone/testzone.gd +++ b/custom_levels/test-zone/testzone.gd @@ -3,6 +3,6 @@ ;; the actual file name still needs to be 8.3 ("TSZ.DGO" - ("static-screen.o" "static-screen") - ("test-zone.go" "test-zone") - ) \ No newline at end of file + ("static-screen.o" + "test-zone.go" + )) \ No newline at end of file diff --git a/decompiler/analysis/final_output.cpp b/decompiler/analysis/final_output.cpp index 14a769f890..80c7f94916 100644 --- a/decompiler/analysis/final_output.cpp +++ b/decompiler/analysis/final_output.cpp @@ -334,7 +334,6 @@ std::string write_from_top_level_form(Form* top_form, } // look for the whole thing being in a (when *debug-segment* ....) - bool in_debug_only_file = false; if (forms.size() == 1) { auto as_cne = dynamic_cast(forms.at(0)); if (as_cne && as_cne->entries.size() == 1) { @@ -343,9 +342,7 @@ std::string write_from_top_level_form(Form* top_form, if (entry.condition->to_string(env) == "*debug-segment*") { forms = entry.body->elts(); result += ";; this file is debug only\n"; - result += "(declare-file (debug))\n"; - result += "(when *debug-segment*\n"; - in_debug_only_file = true; + result += "(declare-file (debug))\n\n"; } } } @@ -559,10 +556,6 @@ std::string write_from_top_level_form(Form* top_form, } } - if (in_debug_only_file) { - result += ")\n"; - } - if (in_rlet) { result += ")\n"; } diff --git a/goal_src/jak1/dgos/bea.gd b/goal_src/jak1/dgos/bea.gd index 256483eba7..827c600796 100644 --- a/goal_src/jak1/dgos/bea.gd +++ b/goal_src/jak1/dgos/bea.gd @@ -1,53 +1,52 @@ - ("BEA.DGO" - ("mistycannon.o" "mistycannon") - ("babak-with-cannon.o" "babak-with-cannon") - ("air-h.o" "air-h") - ("air.o" "air") - ("wobbler.o" "wobbler") - ("twister.o" "twister") - ("beach-obs.o" "beach-obs") - ("bird-lady.o" "bird-lady") - ("bird-lady-beach.o" "bird-lady-beach") - ("mayor.o" "mayor") - ("sculptor.o" "sculptor") - ("pelican.o" "pelican") - ("lurkerworm.o" "lurkerworm") - ("lurkercrab.o" "lurkercrab") - ("lurkerpuppy.o" "lurkerpuppy") - ("beach-rocks.o" "beach-rocks") - ("seagull.o" "seagull") - ("beach-part.o" "beach-part") - ("tpage-212.go" "tpage-212") - ("tpage-214.go" "tpage-214") - ("tpage-213.go" "tpage-213") - ("tpage-215.go" "tpage-215") - ("babak-ag.go" "babak") - ("barrel-ag.go" "barrel") - ("beachcam-ag.go" "beachcam") - ("bird-lady-ag.go" "bird-lady") - ("bird-lady-beach-ag.go" "bird-lady-beach") - ("bladeassm-ag.go" "bladeassm") - ("ecovalve-ag.go" "ecovalve") - ("ecoventrock-ag.go" "ecoventrock") - ("flutflut-ag.go" "flutflut") - ("flutflutegg-ag.go" "flutflutegg") - ("grottopole-ag.go" "grottopole") - ("harvester-ag.go" "harvester") - ("kickrock-ag.go" "kickrock") - ("lrocklrg-ag.go" "lrocklrg") - ("lurkercrab-ag.go" "lurkercrab") - ("lurkerpuppy-ag.go" "lurkerpuppy") - ("lurkerworm-ag.go" "lurkerworm") - ("mayor-ag.go" "mayor") - ("mistycannon-ag.go" "mistycannon") - ("orb-cache-top-ag.go" "orb-cache-top") - ("pelican-ag.go" "pelican") - ("sack-ag.go" "sack") - ("sculptor-ag.go" "sculptor") - ("sculptor-muse-ag.go" "sculptor-muse") - ("seagull-ag.go" "seagull") - ("sharkey-ag.go" "sharkey") - ("windmill-one-ag.go" "windmill-one") - ("beach-vis.go" "beach-vis") - ) + ("mistycannon.o" + "babak-with-cannon.o" + "air-h.o" + "air.o" + "wobbler.o" + "twister.o" + "beach-obs.o" + "bird-lady.o" + "bird-lady-beach.o" + "mayor.o" + "sculptor.o" + "pelican.o" + "lurkerworm.o" + "lurkercrab.o" + "lurkerpuppy.o" + "beach-rocks.o" + "seagull.o" + "beach-part.o" + "tpage-212.go" + "tpage-214.go" + "tpage-213.go" + "tpage-215.go" + "babak-ag.go" + "barrel-ag.go" + "beachcam-ag.go" + "bird-lady-ag.go" + "bird-lady-beach-ag.go" + "bladeassm-ag.go" + "ecovalve-ag.go" + "ecoventrock-ag.go" + "flutflut-ag.go" + "flutflutegg-ag.go" + "grottopole-ag.go" + "harvester-ag.go" + "kickrock-ag.go" + "lrocklrg-ag.go" + "lurkercrab-ag.go" + "lurkerpuppy-ag.go" + "lurkerworm-ag.go" + "mayor-ag.go" + "mistycannon-ag.go" + "orb-cache-top-ag.go" + "pelican-ag.go" + "sack-ag.go" + "sculptor-ag.go" + "sculptor-muse-ag.go" + "seagull-ag.go" + "sharkey-ag.go" + "windmill-one-ag.go" + "beach-vis.go" + )) diff --git a/goal_src/jak1/dgos/cit.gd b/goal_src/jak1/dgos/cit.gd index 56f8a358f9..fd86e3872e 100644 --- a/goal_src/jak1/dgos/cit.gd +++ b/goal_src/jak1/dgos/cit.gd @@ -1,54 +1,53 @@ - ("CIT.DGO" - ("villagep-obs.o" "villagep-obs") - ("oracle.o" "oracle") - ("battlecontroller.o" "battlecontroller") - ("citadel-part.o" "citadel-part") - ("citadel-obs.o" "citadel-obs") - ("citb-plat.o" "citb-plat") - ("citadel-sages.o" "citadel-sages") - ("snow-bunny.o" "snow-bunny") - ("citb-bunny.o" "citb-bunny") - ("citb-drop-plat.o" "citb-drop-plat") - ("assistant-citadel.o" "assistant-citadel") - ("tpage-1415.go" "tpage-1415") - ("tpage-1417.go" "tpage-1417") - ("tpage-1416.go" "tpage-1416") - ("tpage-1414.go" "tpage-1414") - ("assistant-lavatube-end-ag.go" "assistant-lavatube-end") - ("babak-ag.go" "babak") - ("bluesage-ag.go" "bluesage") - ("citadelcam-ag.go" "citadelcam") - ("citb-arm-ag.go" "citb-arm") - ("citb-arm-shoulder-ag.go" "citb-arm-shoulder") - ("citb-bunny-ag.go" "citb-bunny") - ("citb-button-ag.go" "citb-button") - ("citb-chain-plat-ag.go" "citb-chain-plat") - ("citb-chains-ag.go" "citb-chains") - ("citb-coil-ag.go" "citb-coil") - ("citb-disc-ag.go" "citb-disc") - ("citb-donut-ag.go" "citb-donut") - ("citb-drop-plat-ag.go" "citb-drop-plat") - ("citb-exit-plat-ag.go" "citb-exit-plat") - ("citb-firehose-ag.go" "citb-firehose") - ("citb-generator-ag.go" "citb-generator") - ("citb-hose-ag.go" "citb-hose") - ("citb-iris-door-ag.go" "citb-iris-door") - ("citb-launcher-ag.go" "citb-launcher") - ("citb-robotboss-ag.go" "citb-robotboss") - ("citb-rotatebox-ag.go" "citb-rotatebox") - ("citb-sagecage-ag.go" "citb-sagecage") - ("citb-stopbox-ag.go" "citb-stopbox") - ("ecovalve-ag.go" "ecovalve") - ("evilbro-citadel-ag.go" "evilbro-citadel") - ("evilsis-citadel-ag.go" "evilsis-citadel") - ("green-sagecage-ag.go" "green-sagecage") - ("orb-cache-top-ag.go" "orb-cache-top") - ("plat-citb-ag.go" "plat-citb") - ("plat-eco-citb-ag.go" "plat-eco-citb") - ("redsage-ag.go" "redsage") - ("warp-gate-switch-ag.go" "warp-gate-switch") - ("warpgate-ag.go" "warpgate") - ("yellowsage-ag.go" "yellowsage") - ("citadel-vis.go" "citadel-vis") - ) \ No newline at end of file + ("villagep-obs.o" + "oracle.o" + "battlecontroller.o" + "citadel-part.o" + "citadel-obs.o" + "citb-plat.o" + "citadel-sages.o" + "snow-bunny.o" + "citb-bunny.o" + "citb-drop-plat.o" + "assistant-citadel.o" + "tpage-1415.go" + "tpage-1417.go" + "tpage-1416.go" + "tpage-1414.go" + "assistant-lavatube-end-ag.go" + "babak-ag.go" + "bluesage-ag.go" + "citadelcam-ag.go" + "citb-arm-ag.go" + "citb-arm-shoulder-ag.go" + "citb-bunny-ag.go" + "citb-button-ag.go" + "citb-chain-plat-ag.go" + "citb-chains-ag.go" + "citb-coil-ag.go" + "citb-disc-ag.go" + "citb-donut-ag.go" + "citb-drop-plat-ag.go" + "citb-exit-plat-ag.go" + "citb-firehose-ag.go" + "citb-generator-ag.go" + "citb-hose-ag.go" + "citb-iris-door-ag.go" + "citb-launcher-ag.go" + "citb-robotboss-ag.go" + "citb-rotatebox-ag.go" + "citb-sagecage-ag.go" + "citb-stopbox-ag.go" + "ecovalve-ag.go" + "evilbro-citadel-ag.go" + "evilsis-citadel-ag.go" + "green-sagecage-ag.go" + "orb-cache-top-ag.go" + "plat-citb-ag.go" + "plat-eco-citb-ag.go" + "redsage-ag.go" + "warp-gate-switch-ag.go" + "warpgate-ag.go" + "yellowsage-ag.go" + "citadel-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/dar.gd b/goal_src/jak1/dgos/dar.gd index 01005d2bf9..801215c9e4 100644 --- a/goal_src/jak1/dgos/dar.gd +++ b/goal_src/jak1/dgos/dar.gd @@ -1,19 +1,18 @@ - ("DAR.DGO" - ("darkcave-obs.o" "darkcave-obs") - ("tpage-1306.go" "tpage-1306") - ("tpage-1307.go" "tpage-1307") - ("tpage-1305.go" "tpage-1305") - ("tpage-1304.go" "tpage-1304") - ("tpage-1352.go" "tpage-1352") - ("baby-spider-ag.go" "baby-spider") - ("cavecrystal-ag.go" "cavecrystal") - ("caveelevator-ag.go" "caveelevator") - ("cavespatula-darkcave-ag.go" "cavespatula-darkcave") - ("cavetrapdoor-ag.go" "cavetrapdoor") - ("dark-crystal-ag.go" "dark-crystal") - ("mother-spider-ag.go" "mother-spider") - ("spider-egg-ag.go" "spider-egg") - ("water-anim-darkcave-ag.go" "water-anim-darkcave") - ("darkcave-vis.go" "darkcave-vis") - ) \ No newline at end of file + ("darkcave-obs.o" + "tpage-1306.go" + "tpage-1307.go" + "tpage-1305.go" + "tpage-1304.go" + "tpage-1352.go" + "baby-spider-ag.go" + "cavecrystal-ag.go" + "caveelevator-ag.go" + "cavespatula-darkcave-ag.go" + "cavetrapdoor-ag.go" + "dark-crystal-ag.go" + "mother-spider-ag.go" + "spider-egg-ag.go" + "water-anim-darkcave-ag.go" + "darkcave-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/dem.gd b/goal_src/jak1/dgos/dem.gd index 561a54c735..4fe08293f4 100644 --- a/goal_src/jak1/dgos/dem.gd +++ b/goal_src/jak1/dgos/dem.gd @@ -1,20 +1,19 @@ - ("DEM.DGO" - ("demo-obs.o" "demo-obs") - ("tpage-1485.go" "tpage-1485") - ("tpage-1486.go" "tpage-1486") - ("tpage-1487.go" "tpage-1487") - ("tpage-1599.go" "tpage-1599") - ("tpage-1600.go" "tpage-1600") - ("tpage-1601.go" "tpage-1601") - ("tpage-1602.go" "tpage-1602") - ("tpage-1603.go" "tpage-1603") - ("tpage-1604.go" "tpage-1604") - ("tpage-1605.go" "tpage-1605") - ("tpage-1606.go" "tpage-1606") - ("tpage-1607.go" "tpage-1607") - ("static-screen.o" "static-screen") - ("tpage-1480.go" "tpage-1480") - ("tpage-1479.go" "tpage-1479") - ("demo-vis.go" "demo-vis") - ) \ No newline at end of file + ("demo-obs.o" + "tpage-1485.go" + "tpage-1486.go" + "tpage-1487.go" + "tpage-1599.go" + "tpage-1600.go" + "tpage-1601.go" + "tpage-1602.go" + "tpage-1603.go" + "tpage-1604.go" + "tpage-1605.go" + "tpage-1606.go" + "tpage-1607.go" + "static-screen.o" + "tpage-1480.go" + "tpage-1479.go" + "demo-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/engine.gd b/goal_src/jak1/dgos/engine.gd index 3494134f89..ad5fd1d5a6 100644 --- a/goal_src/jak1/dgos/engine.gd +++ b/goal_src/jak1/dgos/engine.gd @@ -1,307 +1,309 @@ ("ENGINE.CGO" - ("types-h.o" "types-h") - ("vu1-macros.o" "vu1-macros") + ("types-h.o" + "vu1-macros.o" ;; the "math" section - ("math.o" "math") - ("vector-h.o" "vector-h") - ("gravity-h.o" "gravity-h") - ("bounding-box-h.o" "bounding-box-h") - ("matrix-h.o" "matrix-h") - ("quaternion-h.o" "quaternion-h") - ("euler-h.o" "euler-h") - ("transform-h.o" "transform-h") - ("geometry-h.o" "geometry-h") - ("trigonometry-h.o" "trigonometry-h") - ("transformq-h.o" "transformq-h") - ("bounding-box.o" "bounding-box") - ("matrix.o" "matrix") - ("transform.o" "transform") - ("quaternion.o" "quaternion") - ("euler.o" "euler") - ("geometry.o" "geometry") - ("trigonometry.o" "trigonometry") + "math.o" + "vector-h.o" + "gravity-h.o" + "bounding-box-h.o" + "matrix-h.o" + "quaternion-h.o" + "euler-h.o" + "transform-h.o" + "geometry-h.o" + "trigonometry-h.o" + "transformq-h.o" + "bounding-box.o" + "matrix.o" + "transform.o" + "quaternion.o" + "euler.o" + "geometry.o" + "trigonometry.o" - ("gsound-h.o" "gsound-h") - ("timer-h.o" "timer-h") - ("timer.o" "timer") - ("vif-h.o" "vif-h") - ("dma-h.o" "dma-h") - ("video-h.o" "video-h") - ("vu1-user-h.o" "vu1-user-h") - ("dma.o" "dma") - ("dma-buffer.o" "dma-buffer") - ("dma-bucket.o" "dma-bucket") - ("dma-disasm.o" "dma-disasm") - ("pckernel-h.o" "pckernel-h") ;; added - ("pad.o" "pad") - ("gs.o" "gs") - ("display-h.o" "display-h") - ("vector.o" "vector") - ("file-io.o" "file-io") - ("loader-h.o" "loader-h") - ("texture-h.o" "texture-h") - ("level-h.o" "level-h") - ("math-camera-h.o" "math-camera-h") - ("math-camera.o" "math-camera") - ("font-h.o" "font-h") - ("decomp-h.o" "decomp-h") - ("display.o" "display") - ("connect.o" "connect") - ("text-h.o" "text-h") - ("settings-h.o" "settings-h") - ("knuth-rand.o" "knuth-rand") ;; added - ("capture.o" "capture") - ("memory-usage-h.o" "memory-usage-h") - ("texture.o" "texture") - ("main-h.o" "main-h") - ("mspace-h.o" "mspace-h") - ("drawable-h.o" "drawable-h") - ("drawable-group-h.o" "drawable-group-h") - ("drawable-inline-array-h.o" "drawable-inline-array-h") - ("draw-node-h.o" "draw-node-h") - ("drawable-tree-h.o" "drawable-tree-h") - ("drawable-actor-h.o" "drawable-actor-h") - ("drawable-ambient-h.o" "drawable-ambient-h") - ("game-task-h.o" "game-task-h") - ("hint-control-h.o" "hint-control-h") - ("generic-h.o" "generic-h") - ("lights-h.o" "lights-h") - ("ocean-h.o" "ocean-h") - ("ocean-trans-tables.o" "ocean-trans-tables") - ("ocean-tables.o" "ocean-tables") - ("ocean-frames.o" "ocean-frames") - ("sky-h.o" "sky-h") - ("mood-h.o" "mood-h") - ("time-of-day-h.o" "time-of-day-h") - ("art-h.o" "art-h") - ("generic-vu1-h.o" "generic-vu1-h") - ("merc-h.o" "merc-h") - ("generic-merc-h.o" "generic-merc-h") - ("generic-tie-h.o" "generic-tie-h") - ("generic-work-h.o" "generic-work-h") - ("shadow-cpu-h.o" "shadow-cpu-h") - ("shadow-vu1-h.o" "shadow-vu1-h") - ("memcard-h.o" "memcard-h") - ("game-info-h.o" "game-info-h") - ("wind-h.o" "wind-h") - ("prototype-h.o" "prototype-h") - ("joint-h.o" "joint-h") - ("bones-h.o" "bones-h") - ("engines.o" "engines") - ("res-h.o" "res-h") - ("res.o" "res") - ("lights.o" "lights") - ("dynamics-h.o" "dynamics-h") - ("surface-h.o" "surface-h") - ("pat-h.o" "pat-h") - ("fact-h.o" "fact-h") - ("aligner-h.o" "aligner-h") - ("game-h.o" "game-h") - ("generic-obs-h.o" "generic-obs-h") - ("pov-camera-h.o" "pov-camera-h") - ("sync-info-h.o" "sync-info-h") - ("smush-control-h.o" "smush-control-h") - ("trajectory-h.o" "trajectory-h") - ("debug-h.o" "debug-h") - ("joint-mod-h.o" "joint-mod-h") - ("collide-func-h.o" "collide-func-h") - ("collide-mesh-h.o" "collide-mesh-h") - ("collide-shape-h.o" "collide-shape-h") - ("collide-target-h.o" "collide-target-h") - ("collide-touch-h.o" "collide-touch-h") - ("collide-edge-grab-h.o" "collide-edge-grab-h") - ("process-drawable-h.o" "process-drawable-h") - ("effect-control-h.o" "effect-control-h") - ("collide-frag-h.o" "collide-frag-h") - ("projectiles-h.o" "projectiles-h") - ("target-h.o" "target-h") - ("depth-cue-h.o" "depth-cue-h") - ("stats-h.o" "stats-h") - ("bsp-h.o" "bsp-h") - ("collide-cache-h.o" "collide-cache-h") - ("collide-h.o" "collide-h") - ("shrubbery-h.o" "shrubbery-h") - ("tie-h.o" "tie-h") - ("tfrag-h.o" "tfrag-h") - ("background-h.o" "background-h") - ("subdivide-h.o" "subdivide-h") - ("entity-h.o" "entity-h") - ("sprite-h.o" "sprite-h") - ("shadow-h.o" "shadow-h") - ("eye-h.o" "eye-h") - ("sparticle-launcher-h.o" "sparticle-launcher-h") - ("sparticle-h.o" "sparticle-h") - ("actor-link-h.o" "actor-link-h") - ("camera-h.o" "camera-h") - ("cam-debug-h.o" "cam-debug-h") - ("cam-interface-h.o" "cam-interface-h") - ("cam-update-h.o" "cam-update-h") - ("assert-h.o" "assert-h") - ("hud-h.o" "hud-h") - ("progress-h.o" "progress-h") - ("rpc-h.o" "rpc-h") - ("path-h.o" "path-h") - ("navigate-h.o" "navigate-h") - ("load-dgo.o" "load-dgo") - ("ramdisk.o" "ramdisk") - ("gsound.o" "gsound") - ("transformq.o" "transformq") - ("collide-func.o" "collide-func") - ("joint.o" "joint") - ("cylinder.o" "cylinder") - ("wind.o" "wind") - ("bsp.o" "bsp") - ("subdivide.o" "subdivide") - ("sprite.o" "sprite") - ("sprite-distort.o" "sprite-distort") - ("debug-sphere.o" "debug-sphere") - ("debug.o" "debug") - ("merc-vu1.o" "merc-vu1") - ("merc-blend-shape.o" "merc-blend-shape") - ("merc.o" "merc") - ("ripple.o" "ripple") - ("bones.o" "bones") - ("generic-vu0.o" "generic-vu0") - ("generic.o" "generic") - ("generic-vu1.o" "generic-vu1") - ("generic-effect.o" "generic-effect") - ("generic-merc.o" "generic-merc") - ("generic-tie.o" "generic-tie") - ("shadow-cpu.o" "shadow-cpu") - ("shadow-vu1.o" "shadow-vu1") - ("depth-cue.o" "depth-cue") - ("font.o" "font") - ("decomp.o" "decomp") - ("background.o" "background") - ("draw-node.o" "draw-node") - ("shrubbery.o" "shrubbery") - ("shrub-work.o" "shrub-work") - ("tfrag-near.o" "tfrag-near") - ("tfrag.o" "tfrag") - ("tfrag-methods.o" "tfrag-methods") - ("tfrag-work.o" "tfrag-work") - ("tie.o" "tie") - ("tie-near.o" "tie-near") - ("tie-work.o" "tie-work") - ("tie-methods.o" "tie-methods") - ("sync-info.o" "sync-info") - ("trajectory.o" "trajectory") - ("sparticle-launcher.o" "sparticle-launcher") - ("sparticle.o" "sparticle") - ("entity-table.o" "entity-table") - ("loader.o" "loader") - ("task-control-h.o" "task-control-h") - ("game-info.o" "game-info") - ("game-save.o" "game-save") - ("settings.o" "settings") - ("pc-anim-util.o" "pc-anim-util") ;; added - ("autosplit-h.o" "autosplit-h") ;; added - ("autosplit.o" "autosplit") ;; added - ("speedruns-h.o" "speedruns-h") ;; added - ("speedruns.o" "speedruns") ;; added - ("pckernel.o" "pckernel") ;; added - ("mood-tables.o" "mood-tables") - ("mood.o" "mood") - ("weather-part.o" "weather-part") - ("time-of-day.o" "time-of-day") - ("sky-utils.o" "sky-utils") - ("sky.o" "sky") - ("sky-tng.o" "sky-tng") - ("load-boundary-h.o" "load-boundary-h") - ("load-boundary.o" "load-boundary") - ("load-boundary-data.o" "load-boundary-data") - ("level-info.o" "level-info") - ("level.o" "level") - ("text.o" "text") - ("collide-probe.o" "collide-probe") - ("collide-frag.o" "collide-frag") - ("collide-mesh.o" "collide-mesh") - ("collide-touch.o" "collide-touch") - ("collide-edge-grab.o" "collide-edge-grab") - ("collide-shape.o" "collide-shape") - ("collide-shape-rider.o" "collide-shape-rider") - ("collide.o" "collide") - ;; ("collide-planes.o" "collide-planes") - ("merc-death.o" "merc-death") - ("water-h.o" "water-h") - ("camera.o" "camera") - ("cam-interface.o" "cam-interface") - ("cam-master.o" "cam-master") - ("cam-states.o" "cam-states") - ("cam-states-dbg.o" "cam-states-dbg") - ("cam-combiner.o" "cam-combiner") - ("cam-update.o" "cam-update") - ("vol-h.o" "vol-h") - ("cam-layout.o" "cam-layout") - ("cam-debug.o" "cam-debug") - ("cam-start.o" "cam-start") - ("process-drawable.o" "process-drawable") - ("hint-control.o" "hint-control") - ("ambient.o" "ambient") - ("assert.o" "assert") - ("generic-obs.o" "generic-obs") - ("target-util.o" "target-util") - ("target-part.o" "target-part") - ("collide-reaction-target.o" "collide-reaction-target") - ("logic-target.o" "logic-target") - ("sidekick.o" "sidekick") - ("voicebox.o" "voicebox") - ("target-handler.o" "target-handler") - ("target.o" "target") - ("target2.o" "target2") - ("target-death.o" "target-death") - ("menu.o" "menu") - ("drawable.o" "drawable") - ("drawable-group.o" "drawable-group") - ("drawable-inline-array.o" "drawable-inline-array") - ("drawable-tree.o" "drawable-tree") - ("prototype.o" "prototype") - ("main-collide.o" "main-collide") - ("video.o" "video") - ("main.o" "main") - ("collide-cache.o" "collide-cache") - ("relocate.o" "relocate") - ("memory-usage.o" "memory-usage") - ("entity.o" "entity") - ("path.o" "path") - ("vol.o" "vol") - ("navigate.o" "navigate") - ("aligner.o" "aligner") - ("effect-control.o" "effect-control") - ("water.o" "water") - ("collectables-part.o" "collectables-part") - ("collectables.o" "collectables") - ("task-control.o" "task-control") - ("process-taskable.o" "process-taskable") - ("pov-camera.o" "pov-camera") - ("powerups.o" "powerups") - ("crates.o" "crates") - ("hud.o" "hud") - ("hud-classes.o" "hud-classes") - ("progress-static.o" "progress-static") - ("progress-part.o" "progress-part") - ("progress-draw.o" "progress-draw") - ("progress.o" "progress") - ("progress-pc.o" "progress-pc") ;; added - ("credits.o" "credits") - ("projectiles.o" "projectiles") - ("ocean.o" "ocean") - ("ocean-vu0.o" "ocean-vu0") - ("ocean-texture.o" "ocean-texture") - ("ocean-mid.o" "ocean-mid") - ("ocean-transition.o" "ocean-transition") - ("ocean-near.o" "ocean-near") - ("shadow.o" "shadow") - ("eye.o" "eye") - ("glist-h.o" "glist-h") - ("glist.o" "glist") - ("anim-tester.o" "anim-tester") - ("viewer.o" "viewer") - ("part-tester.o" "part-tester") - ("anim-tester-x.o" "anim-tester-x") ;; added - ("default-menu.o" "default-menu") - ("subtitle.o" "subtitle") ;; added - ) + "gsound-h.o" + "timer-h.o" + "timer.o" + "vif-h.o" + "dma-h.o" + "video-h.o" + "vu1-user-h.o" + "dma.o" + "dma-buffer.o" + "dma-bucket.o" + "dma-disasm.o" + "pckernel-h.o" ;; added + "pad.o" + "gs.o" + "display-h.o" + "vector.o" + "file-io.o" + "loader-h.o" + "texture-h.o" + "level-h.o" + "math-camera-h.o" + "math-camera.o" + "font-h.o" + "decomp-h.o" + "display.o" + "connect.o" + "text-h.o" + "settings-h.o" + "knuth-rand.o" ;; added + "capture.o" + "memory-usage-h.o" + "texture.o" + "main-h.o" + "mspace-h.o" + "drawable-h.o" + "drawable-group-h.o" + "drawable-inline-array-h.o" + "draw-node-h.o" + "drawable-tree-h.o" + "drawable-actor-h.o" + "drawable-ambient-h.o" + "game-task-h.o" + "hint-control-h.o" + "generic-h.o" + "lights-h.o" + "ocean-h.o" + "ocean-trans-tables.o" + "ocean-tables.o" + "ocean-frames.o" + "sky-h.o" + "mood-h.o" + "time-of-day-h.o" + "art-h.o" + "generic-vu1-h.o" + "merc-h.o" + "generic-merc-h.o" + "generic-tie-h.o" + "generic-work-h.o" + "shadow-cpu-h.o" + "shadow-vu1-h.o" + "memcard-h.o" + "game-info-h.o" + "wind-h.o" + "prototype-h.o" + "joint-h.o" + "bones-h.o" + "engines.o" + "res-h.o" + "res.o" + "lights.o" + "dynamics-h.o" + "surface-h.o" + "pat-h.o" + "fact-h.o" + "aligner-h.o" + "game-h.o" + "generic-obs-h.o" + "pov-camera-h.o" + "sync-info-h.o" + "smush-control-h.o" + "trajectory-h.o" + "debug-h.o" + "joint-mod-h.o" + "collide-func-h.o" + "collide-mesh-h.o" + "collide-shape-h.o" + "collide-target-h.o" + "collide-touch-h.o" + "collide-edge-grab-h.o" + "process-drawable-h.o" + "effect-control-h.o" + "collide-frag-h.o" + "projectiles-h.o" + "target-h.o" + "depth-cue-h.o" + "stats-h.o" + "bsp-h.o" + "collide-cache-h.o" + "collide-h.o" + "shrubbery-h.o" + "tie-h.o" + "tfrag-h.o" + "background-h.o" + "subdivide-h.o" + "entity-h.o" + "sprite-h.o" + "shadow-h.o" + "eye-h.o" + "sparticle-launcher-h.o" + "sparticle-h.o" + "actor-link-h.o" + "camera-h.o" + "cam-debug-h.o" + "cam-interface-h.o" + "cam-update-h.o" + "assert-h.o" + "hud-h.o" + "progress-h.o" + "rpc-h.o" + "path-h.o" + "navigate-h.o" + "load-dgo.o" + "ramdisk.o" + "gsound.o" + "transformq.o" + "collide-func.o" + "joint.o" + "cylinder.o" + "wind.o" + "bsp.o" + "subdivide.o" + "sprite.o" + "sprite-distort.o" + "debug-sphere.o" + "debug.o" + "merc-vu1.o" + "merc-blend-shape.o" + "merc.o" + "ripple.o" + "bones.o" + "generic-vu0.o" + "generic.o" + "generic-vu1.o" + "generic-effect.o" + "generic-merc.o" + "generic-tie.o" + "shadow-cpu.o" + "shadow-vu1.o" + "depth-cue.o" + "font.o" + "decomp.o" + "background.o" + "draw-node.o" + "shrubbery.o" + "shrub-work.o" + "tfrag-near.o" + "tfrag.o" + "tfrag-methods.o" + "tfrag-work.o" + "tie.o" + "tie-near.o" + "tie-work.o" + "tie-methods.o" + "sync-info.o" + "trajectory.o" + "sparticle-launcher.o" + "sparticle.o" + "entity-table.o" + "loader.o" + "task-control-h.o" + "game-info.o" + "game-save.o" + "settings.o" + "pc-anim-util.o" ;; added + "autosplit-h.o" ;; added + "autosplit.o" ;; added + "speedruns-h.o" ;; added + "speedruns.o" ;; added + "pckernel.o" ;; added + "mood-tables.o" + "mood.o" + "weather-part.o" + "time-of-day.o" + "sky-utils.o" + "sky.o" + "sky-tng.o" + "load-boundary-h.o" + "load-boundary.o" + "load-boundary-data.o" + "level-info.o" + "level.o" + "text.o" + "collide-probe.o" + "collide-frag.o" + "collide-mesh.o" + "collide-touch.o" + "collide-edge-grab.o" + "collide-shape.o" + "collide-shape-rider.o" + "collide.o" + ;; "collide-planes.o" + "merc-death.o" + "water-h.o" + "camera.o" + "cam-interface.o" + "cam-master.o" + "cam-states.o" + "cam-states-dbg.o" + "cam-combiner.o" + "cam-update.o" + "vol-h.o" + "cam-layout.o" + "cam-debug.o" + "cam-start.o" + "process-drawable.o" + "hint-control.o" + "ambient.o" + "assert.o" + "generic-obs.o" + "target-util.o" + "target-part.o" + "collide-reaction-target.o" + "logic-target.o" + "sidekick.o" + "voicebox.o" + "target-handler.o" + "target.o" + "target2.o" + "target-death.o" + "menu.o" + "drawable.o" + "drawable-group.o" + "drawable-inline-array.o" + "drawable-tree.o" + "prototype.o" + "main-collide.o" + "video.o" + "main.o" + "collide-cache.o" + "relocate.o" + "memory-usage.o" + "entity.o" + "path.o" + "vol.o" + "navigate.o" + "aligner.o" + "effect-control.o" + "water.o" + "collectables-part.o" + "collectables.o" + "task-control.o" + "process-taskable.o" + "pov-camera.o" + "powerups.o" + "crates.o" + "hud.o" + "hud-classes.o" + "progress-static.o" + "progress-part.o" + "progress-draw.o" + "progress.o" + "progress-pc.o" ;; added + "credits.o" + "projectiles.o" + "ocean.o" + "ocean-vu0.o" + "ocean-texture.o" + "ocean-mid.o" + "ocean-transition.o" + "ocean-near.o" + "shadow.o" + "eye.o" + "glist-h.o" + "glist.o" + "anim-tester.o" + "viewer.o" + "part-tester.o" + "default-menu.o" + "anim-tester-x.o" ;; added + "entity-debug.o" ;; added + "subtitle.o" ;; added + "default-menu-pc.o" ;; added + )) diff --git a/goal_src/jak1/dgos/fic.gd b/goal_src/jak1/dgos/fic.gd index 5d278239db..323a30b621 100644 --- a/goal_src/jak1/dgos/fic.gd +++ b/goal_src/jak1/dgos/fic.gd @@ -1,28 +1,27 @@ - ("FIC.DGO" - ("target-racer-h.o" "target-racer-h") - ("racer-part.o" "racer-part") - ("racer.o" "racer") - ("target-racer.o" "target-racer") - ("racer-states.o" "racer-states") - ("collide-reaction-racer.o" "collide-reaction-racer") - ("eichar-racer+0-ag.go" "eichar-racer+0") - ("tpage-1119.go" "tpage-1119") - ("blocking-plane.o" "blocking-plane") - ("firecanyon-part.o" "firecanyon-part") - ("assistant-firecanyon.o" "assistant-firecanyon") - ("firecanyon-obs.o" "firecanyon-obs") - ("tpage-815.go" "tpage-815") - ("tpage-822.go" "tpage-822") - ("tpage-854.go" "tpage-854") - ("tpage-1123.go" "tpage-1123") - ("assistant-firecanyon-ag.go" "assistant-firecanyon") - ("babak-ag.go" "babak") - ("balloon-ag.go" "balloon") - ("crate-darkeco-cluster-ag.go" "crate-darkeco-cluster") - ("ecovalve-ag.go" "ecovalve") - ("ef-plane-ag.go" "ef-plane") - ("racer-ag.go" "racer") - ("spike-ag.go" "spike") - ("firecanyon-vis.go" "firecanyon-vis") - ) \ No newline at end of file + ("target-racer-h.o" + "racer-part.o" + "racer.o" + "target-racer.o" + "racer-states.o" + "collide-reaction-racer.o" + "eichar-racer+0-ag.go" + "tpage-1119.go" + "blocking-plane.o" + "firecanyon-part.o" + "assistant-firecanyon.o" + "firecanyon-obs.o" + "tpage-815.go" + "tpage-822.go" + "tpage-854.go" + "tpage-1123.go" + "assistant-firecanyon-ag.go" + "babak-ag.go" + "balloon-ag.go" + "crate-darkeco-cluster-ag.go" + "ecovalve-ag.go" + "ef-plane-ag.go" + "racer-ag.go" + "spike-ag.go" + "firecanyon-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/fin.gd b/goal_src/jak1/dgos/fin.gd index 6d1e928f29..823a8b4e6e 100644 --- a/goal_src/jak1/dgos/fin.gd +++ b/goal_src/jak1/dgos/fin.gd @@ -1,40 +1,39 @@ - ("FIN.DGO" - ("robotboss-h.o" "robotboss-h") - ("robotboss-part.o" "robotboss-part") - ("sage-finalboss-part.o" "sage-finalboss-part") - ("light-eco.o" "light-eco") - ("robotboss-weapon.o" "robotboss-weapon") - ("robotboss-misc.o" "robotboss-misc") - ("green-eco-lurker.o" "green-eco-lurker") - ("robotboss.o" "robotboss") - ("final-door.o" "final-door") - ("sage-finalboss.o" "sage-finalboss") - ("tpage-1419.go" "tpage-1419") - ("tpage-1420.go" "tpage-1420") - ("tpage-634.go" "tpage-634") - ("tpage-1418.go" "tpage-1418") - ("tpage-545.go" "tpage-545") - ("darkecobomb-ag.go" "darkecobomb") - ("ecoclaw-ag.go" "ecoclaw") - ("ecovalve-ag.go" "ecovalve") - ("finalbosscam-ag.go" "finalbosscam") - ("green-eco-lurker-ag.go" "green-eco-lurker") - ("green-sagecage-ag.go" "green-sagecage") - ("greenshot-ag.go" "greenshot") - ("jak-white-ag.go" "jak-white") - ("light-eco-ag.go" "light-eco") - ("plat-eco-finalboss-ag.go" "plat-eco-finalboss") - ("power-left-ag.go" "power-left") - ("power-right-ag.go" "power-right") - ("powercellalt-ag.go" "powercellalt") - ("redring-ag.go" "redring") - ("robotboss-ag.go" "robotboss") - ("robotboss-blueeco-ag.go" "robotboss-blueeco") - ("robotboss-cinematic-ag.go" "robotboss-cinematic") - ("robotboss-redeco-ag.go" "robotboss-redeco") - ("robotboss-yelloweco-ag.go" "robotboss-yelloweco") - ("silodoor-ag.go" "silodoor") - ("water-anim-finalboss-ag.go" "water-anim-finalboss") - ("finalboss-vis.go" "finalboss-vis") - ) \ No newline at end of file + ("robotboss-h.o" + "robotboss-part.o" + "sage-finalboss-part.o" + "light-eco.o" + "robotboss-weapon.o" + "robotboss-misc.o" + "green-eco-lurker.o" + "robotboss.o" + "final-door.o" + "sage-finalboss.o" + "tpage-1419.go" + "tpage-1420.go" + "tpage-634.go" + "tpage-1418.go" + "tpage-545.go" + "darkecobomb-ag.go" + "ecoclaw-ag.go" + "ecovalve-ag.go" + "finalbosscam-ag.go" + "green-eco-lurker-ag.go" + "green-sagecage-ag.go" + "greenshot-ag.go" + "jak-white-ag.go" + "light-eco-ag.go" + "plat-eco-finalboss-ag.go" + "power-left-ag.go" + "power-right-ag.go" + "powercellalt-ag.go" + "redring-ag.go" + "robotboss-ag.go" + "robotboss-blueeco-ag.go" + "robotboss-cinematic-ag.go" + "robotboss-redeco-ag.go" + "robotboss-yelloweco-ag.go" + "silodoor-ag.go" + "water-anim-finalboss-ag.go" + "finalboss-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/game.gd b/goal_src/jak1/dgos/game.gd index 360581abb4..7ca7df2099 100644 --- a/goal_src/jak1/dgos/game.gd +++ b/goal_src/jak1/dgos/game.gd @@ -1,342 +1,344 @@ ("GAME.CGO" - ("types-h.o" "types-h") - ("vu1-macros.o" "vu1-macros") - ("math.o" "math") - ("vector-h.o" "vector-h") - ("gravity-h.o" "gravity-h") - ("bounding-box-h.o" "bounding-box-h") - ("matrix-h.o" "matrix-h") - ("quaternion-h.o" "quaternion-h") - ("euler-h.o" "euler-h") - ("transform-h.o" "transform-h") - ("geometry-h.o" "geometry-h") - ("trigonometry-h.o" "trigonometry-h") - ("transformq-h.o" "transformq-h") - ("bounding-box.o" "bounding-box") - ("matrix.o" "matrix") - ("transform.o" "transform") - ("quaternion.o" "quaternion") - ("euler.o" "euler") - ("geometry.o" "geometry") - ("trigonometry.o" "trigonometry") - ("gsound-h.o" "gsound-h") - ("timer-h.o" "timer-h") - ("timer.o" "timer") - ("vif-h.o" "vif-h") - ("dma-h.o" "dma-h") - ("video-h.o" "video-h") - ("vu1-user-h.o" "vu1-user-h") - ("dma.o" "dma") - ("dma-buffer.o" "dma-buffer") - ("dma-bucket.o" "dma-bucket") - ("dma-disasm.o" "dma-disasm") - ("pckernel-h.o" "pckernel-h") ;; added - ("pad.o" "pad") - ("gs.o" "gs") - ("display-h.o" "display-h") - ("vector.o" "vector") - ("file-io.o" "file-io") - ("loader-h.o" "loader-h") - ("texture-h.o" "texture-h") - ("level-h.o" "level-h") - ("math-camera-h.o" "math-camera-h") - ("math-camera.o" "math-camera") - ("font-h.o" "font-h") - ("decomp-h.o" "decomp-h") - ("display.o" "display") - ("connect.o" "connect") - ("text-h.o" "text-h") - ("settings-h.o" "settings-h") - ("knuth-rand.o" "knuth-rand") ;; added - ("capture.o" "capture") - ("memory-usage-h.o" "memory-usage-h") - ("texture.o" "texture") - ("main-h.o" "main-h") - ("mspace-h.o" "mspace-h") - ("drawable-h.o" "drawable-h") - ("drawable-group-h.o" "drawable-group-h") - ("drawable-inline-array-h.o" "drawable-inline-array-h") - ("draw-node-h.o" "draw-node-h") - ("drawable-tree-h.o" "drawable-tree-h") - ("drawable-actor-h.o" "drawable-actor-h") - ("drawable-ambient-h.o" "drawable-ambient-h") - ("game-task-h.o" "game-task-h") - ("hint-control-h.o" "hint-control-h") - ("generic-h.o" "generic-h") - ("lights-h.o" "lights-h") - ("ocean-h.o" "ocean-h") - ("ocean-trans-tables.o" "ocean-trans-tables") - ("ocean-tables.o" "ocean-tables") - ("ocean-frames.o" "ocean-frames") - ("sky-h.o" "sky-h") - ("mood-h.o" "mood-h") - ("time-of-day-h.o" "time-of-day-h") - ("art-h.o" "art-h") - ("generic-vu1-h.o" "generic-vu1-h") - ("merc-h.o" "merc-h") - ("generic-merc-h.o" "generic-merc-h") - ("generic-tie-h.o" "generic-tie-h") - ("generic-work-h.o" "generic-work-h") - ("shadow-cpu-h.o" "shadow-cpu-h") - ("shadow-vu1-h.o" "shadow-vu1-h") - ("memcard-h.o" "memcard-h") - ("game-info-h.o" "game-info-h") - ("wind-h.o" "wind-h") - ("prototype-h.o" "prototype-h") - ("joint-h.o" "joint-h") - ("bones-h.o" "bones-h") - ("engines.o" "engines") - ("res-h.o" "res-h") - ("res.o" "res") - ("lights.o" "lights") - ("dynamics-h.o" "dynamics-h") - ("surface-h.o" "surface-h") - ("pat-h.o" "pat-h") - ("fact-h.o" "fact-h") - ("aligner-h.o" "aligner-h") - ("game-h.o" "game-h") - ("generic-obs-h.o" "generic-obs-h") - ("pov-camera-h.o" "pov-camera-h") - ("sync-info-h.o" "sync-info-h") - ("smush-control-h.o" "smush-control-h") - ("trajectory-h.o" "trajectory-h") - ("debug-h.o" "debug-h") - ("joint-mod-h.o" "joint-mod-h") - ("collide-func-h.o" "collide-func-h") - ("collide-mesh-h.o" "collide-mesh-h") - ("collide-shape-h.o" "collide-shape-h") - ("collide-target-h.o" "collide-target-h") - ("collide-touch-h.o" "collide-touch-h") - ("collide-edge-grab-h.o" "collide-edge-grab-h") - ("process-drawable-h.o" "process-drawable-h") - ("effect-control-h.o" "effect-control-h") - ("collide-frag-h.o" "collide-frag-h") - ("projectiles-h.o" "projectiles-h") - ("target-h.o" "target-h") - ("depth-cue-h.o" "depth-cue-h") - ("stats-h.o" "stats-h") - ("bsp-h.o" "bsp-h") - ("collide-cache-h.o" "collide-cache-h") - ("collide-h.o" "collide-h") - ("shrubbery-h.o" "shrubbery-h") - ("tie-h.o" "tie-h") - ("tfrag-h.o" "tfrag-h") - ("background-h.o" "background-h") - ("subdivide-h.o" "subdivide-h") - ("entity-h.o" "entity-h") - ("sprite-h.o" "sprite-h") - ("shadow-h.o" "shadow-h") - ("eye-h.o" "eye-h") - ("sparticle-launcher-h.o" "sparticle-launcher-h") - ("sparticle-h.o" "sparticle-h") - ("actor-link-h.o" "actor-link-h") - ("camera-h.o" "camera-h") - ("cam-debug-h.o" "cam-debug-h") - ("cam-interface-h.o" "cam-interface-h") - ("cam-update-h.o" "cam-update-h") - ("assert-h.o" "assert-h") - ("hud-h.o" "hud-h") - ("progress-h.o" "progress-h") - ("rpc-h.o" "rpc-h") - ("path-h.o" "path-h") - ("navigate-h.o" "navigate-h") - ("load-dgo.o" "load-dgo") - ("ramdisk.o" "ramdisk") - ("gsound.o" "gsound") - ("transformq.o" "transformq") - ("collide-func.o" "collide-func") - ("joint.o" "joint") - ("cylinder.o" "cylinder") - ("wind.o" "wind") - ("bsp.o" "bsp") - ("subdivide.o" "subdivide") - ("sprite.o" "sprite") - ("sprite-distort.o" "sprite-distort") - ("debug-sphere.o" "debug-sphere") - ("debug.o" "debug") - ("merc-vu1.o" "merc-vu1") - ("merc-blend-shape.o" "merc-blend-shape") - ("merc.o" "merc") - ("ripple.o" "ripple") - ("bones.o" "bones") - ("generic-vu0.o" "generic-vu0") - ("generic.o" "generic") - ("generic-vu1.o" "generic-vu1") - ("generic-effect.o" "generic-effect") - ("generic-merc.o" "generic-merc") - ("generic-tie.o" "generic-tie") - ("shadow-cpu.o" "shadow-cpu") - ("shadow-vu1.o" "shadow-vu1") - ("depth-cue.o" "depth-cue") - ("font.o" "font") - ("decomp.o" "decomp") - ("background.o" "background") - ("draw-node.o" "draw-node") - ("shrubbery.o" "shrubbery") - ("shrub-work.o" "shrub-work") - ("tfrag-near.o" "tfrag-near") - ("tfrag.o" "tfrag") - ("tfrag-methods.o" "tfrag-methods") - ("tfrag-work.o" "tfrag-work") - ("tie.o" "tie") - ("tie-near.o" "tie-near") - ("tie-work.o" "tie-work") - ("tie-methods.o" "tie-methods") - ("sync-info.o" "sync-info") - ("trajectory.o" "trajectory") - ("sparticle-launcher.o" "sparticle-launcher") - ("sparticle.o" "sparticle") - ("entity-table.o" "entity-table") - ("loader.o" "loader") - ("task-control-h.o" "task-control-h") - ("speedruns-h.o" "speedruns-h") ;; added - ("game-info.o" "game-info") - ("game-save.o" "game-save") - ("settings.o" "settings") - ("pc-anim-util.o" "pc-anim-util") ;; added - ("autosplit-h.o" "autosplit-h") ;; added - ("autosplit.o" "autosplit") ;; added - ("speedruns.o" "speedruns") ;; added - ("pckernel.o" "pckernel") ;; added - ("mood-tables.o" "mood-tables") - ("mood.o" "mood") - ("weather-part.o" "weather-part") - ("time-of-day.o" "time-of-day") - ("sky-utils.o" "sky-utils") - ("sky.o" "sky") - ("sky-tng.o" "sky-tng") - ("load-boundary-h.o" "load-boundary-h") - ("load-boundary.o" "load-boundary") - ("load-boundary-data.o" "load-boundary-data") - ("level-info.o" "level-info") - ("level.o" "level") - ("text.o" "text") - ("collide-probe.o" "collide-probe") - ("collide-frag.o" "collide-frag") - ("collide-mesh.o" "collide-mesh") - ("collide-touch.o" "collide-touch") - ("collide-edge-grab.o" "collide-edge-grab") - ("collide-shape.o" "collide-shape") - ("collide-shape-rider.o" "collide-shape-rider") - ("collide.o" "collide") - ;; ("collide-planes.o" "collide-planes") - ("merc-death.o" "merc-death") - ("water-h.o" "water-h") - ("camera.o" "camera") - ("cam-interface.o" "cam-interface") - ("cam-master.o" "cam-master") - ("cam-states.o" "cam-states") - ("cam-states-dbg.o" "cam-states-dbg") - ("cam-combiner.o" "cam-combiner") - ("cam-update.o" "cam-update") - ("vol-h.o" "vol-h") - ("cam-layout.o" "cam-layout") - ("cam-debug.o" "cam-debug") - ("cam-start.o" "cam-start") - ("process-drawable.o" "process-drawable") - ("hint-control.o" "hint-control") - ("ambient.o" "ambient") - ("assert.o" "assert") - ("generic-obs.o" "generic-obs") - ("target-util.o" "target-util") - ("target-part.o" "target-part") - ("collide-reaction-target.o" "collide-reaction-target") - ("logic-target.o" "logic-target") - ("sidekick.o" "sidekick") - ("voicebox.o" "voicebox") - ("target-handler.o" "target-handler") - ("target.o" "target") - ("target2.o" "target2") - ("target-death.o" "target-death") - ("menu.o" "menu") - ("drawable.o" "drawable") - ("drawable-group.o" "drawable-group") - ("drawable-inline-array.o" "drawable-inline-array") - ("drawable-tree.o" "drawable-tree") - ("prototype.o" "prototype") - ("main-collide.o" "main-collide") - ("video.o" "video") - ("main.o" "main") - ("collide-cache.o" "collide-cache") - ("relocate.o" "relocate") - ("memory-usage.o" "memory-usage") - ("entity.o" "entity") - ("path.o" "path") - ("vol.o" "vol") - ("navigate.o" "navigate") - ("aligner.o" "aligner") - ("effect-control.o" "effect-control") - ("water.o" "water") - ("collectables-part.o" "collectables-part") - ("collectables.o" "collectables") - ("task-control.o" "task-control") - ("process-taskable.o" "process-taskable") - ("pov-camera.o" "pov-camera") - ("powerups.o" "powerups") - ("crates.o" "crates") - ("hud.o" "hud") - ("hud-classes.o" "hud-classes") - ("progress-static.o" "progress-static") - ("progress-part.o" "progress-part") - ("progress-draw.o" "progress-draw") - ("progress.o" "progress") - ("progress-pc.o" "progress-pc") ;; added - ("credits.o" "credits") - ("projectiles.o" "projectiles") - ("ocean.o" "ocean") - ("ocean-vu0.o" "ocean-vu0") - ("ocean-texture.o" "ocean-texture") - ("ocean-mid.o" "ocean-mid") - ("ocean-transition.o" "ocean-transition") - ("ocean-near.o" "ocean-near") - ("shadow.o" "shadow") - ("eye.o" "eye") - ("glist-h.o" "glist-h") - ("glist.o" "glist") - ("anim-tester.o" "anim-tester") - ("viewer.o" "viewer") - ("part-tester.o" "part-tester") - ("anim-tester-x.o" "anim-tester-x") ;; added - ("default-menu.o" "default-menu") - ("subtitle.o" "subtitle") ;; added - ("dir-tpages.go" "dir-tpages") - ("tpage-463.go" "tpage-463") - ("tpage-2.go" "tpage-2") - ("tpage-880.go" "tpage-880") - ("tpage-256.go" "tpage-256") - ("tpage-1278.go" "tpage-1278") - ("texture-upload.o" "texture-upload") - ("tpage-1032.go" "tpage-1032") - ("tpage-62.go" "tpage-62") - ("tpage-1532.go" "tpage-1532") - ("fuel-cell-ag.go" "fuel-cell") - ("money-ag.go" "money") - ("buzzer-ag.go" "buzzer") - ("ecovalve-ag.go" "ecovalve") - ("crate-ag.go" "crate") - ("speaker-ag.go" "speaker") - ("fuelcell-naked-ag.go" "fuelcell-naked") - ("eichar-ag.go" "eichar") - ("sidekick-ag.go" "sidekick") - ("deathcam-ag.go" "deathcam") - ("game-cnt.go" "game-cnt") - ("rigid-body-h.o" "rigid-body-h") - ("water-anim.o" "water-anim") - ("dark-eco-pool.o" "dark-eco-pool") - ("rigid-body.o" "rigid-body") - ("nav-enemy-h.o" "nav-enemy-h") - ("nav-enemy.o" "nav-enemy") - ("baseplat.o" "baseplat") - ("basebutton.o" "basebutton") - ("tippy.o" "tippy") - ("joint-exploder.o" "joint-exploder") - ("babak.o" "babak") - ("sharkey.o" "sharkey") - ("orb-cache.o" "orb-cache") - ("plat.o" "plat") - ("plat-button.o" "plat-button") - ("plat-eco.o" "plat-eco") - ("ropebridge.o" "ropebridge") - ("ticky.o" "ticky") - ("hud-classes-pc.o" "hud-classes-pc") ;; added - ) + ("types-h.o" + "vu1-macros.o" + "math.o" + "vector-h.o" + "gravity-h.o" + "bounding-box-h.o" + "matrix-h.o" + "quaternion-h.o" + "euler-h.o" + "transform-h.o" + "geometry-h.o" + "trigonometry-h.o" + "transformq-h.o" + "bounding-box.o" + "matrix.o" + "transform.o" + "quaternion.o" + "euler.o" + "geometry.o" + "trigonometry.o" + "gsound-h.o" + "timer-h.o" + "timer.o" + "vif-h.o" + "dma-h.o" + "video-h.o" + "vu1-user-h.o" + "dma.o" + "dma-buffer.o" + "dma-bucket.o" + "dma-disasm.o" + "pckernel-h.o" ;; added + "pad.o" + "gs.o" + "display-h.o" + "vector.o" + "file-io.o" + "loader-h.o" + "texture-h.o" + "level-h.o" + "math-camera-h.o" + "math-camera.o" + "font-h.o" + "decomp-h.o" + "display.o" + "connect.o" + "text-h.o" + "settings-h.o" + "knuth-rand.o" ;; added + "capture.o" + "memory-usage-h.o" + "texture.o" + "main-h.o" + "mspace-h.o" + "drawable-h.o" + "drawable-group-h.o" + "drawable-inline-array-h.o" + "draw-node-h.o" + "drawable-tree-h.o" + "drawable-actor-h.o" + "drawable-ambient-h.o" + "game-task-h.o" + "hint-control-h.o" + "generic-h.o" + "lights-h.o" + "ocean-h.o" + "ocean-trans-tables.o" + "ocean-tables.o" + "ocean-frames.o" + "sky-h.o" + "mood-h.o" + "time-of-day-h.o" + "art-h.o" + "generic-vu1-h.o" + "merc-h.o" + "generic-merc-h.o" + "generic-tie-h.o" + "generic-work-h.o" + "shadow-cpu-h.o" + "shadow-vu1-h.o" + "memcard-h.o" + "game-info-h.o" + "wind-h.o" + "prototype-h.o" + "joint-h.o" + "bones-h.o" + "engines.o" + "res-h.o" + "res.o" + "lights.o" + "dynamics-h.o" + "surface-h.o" + "pat-h.o" + "fact-h.o" + "aligner-h.o" + "game-h.o" + "generic-obs-h.o" + "pov-camera-h.o" + "sync-info-h.o" + "smush-control-h.o" + "trajectory-h.o" + "debug-h.o" + "joint-mod-h.o" + "collide-func-h.o" + "collide-mesh-h.o" + "collide-shape-h.o" + "collide-target-h.o" + "collide-touch-h.o" + "collide-edge-grab-h.o" + "process-drawable-h.o" + "effect-control-h.o" + "collide-frag-h.o" + "projectiles-h.o" + "target-h.o" + "depth-cue-h.o" + "stats-h.o" + "bsp-h.o" + "collide-cache-h.o" + "collide-h.o" + "shrubbery-h.o" + "tie-h.o" + "tfrag-h.o" + "background-h.o" + "subdivide-h.o" + "entity-h.o" + "sprite-h.o" + "shadow-h.o" + "eye-h.o" + "sparticle-launcher-h.o" + "sparticle-h.o" + "actor-link-h.o" + "camera-h.o" + "cam-debug-h.o" + "cam-interface-h.o" + "cam-update-h.o" + "assert-h.o" + "hud-h.o" + "progress-h.o" + "rpc-h.o" + "path-h.o" + "navigate-h.o" + "load-dgo.o" + "ramdisk.o" + "gsound.o" + "transformq.o" + "collide-func.o" + "joint.o" + "cylinder.o" + "wind.o" + "bsp.o" + "subdivide.o" + "sprite.o" + "sprite-distort.o" + "debug-sphere.o" + "debug.o" + "merc-vu1.o" + "merc-blend-shape.o" + "merc.o" + "ripple.o" + "bones.o" + "generic-vu0.o" + "generic.o" + "generic-vu1.o" + "generic-effect.o" + "generic-merc.o" + "generic-tie.o" + "shadow-cpu.o" + "shadow-vu1.o" + "depth-cue.o" + "font.o" + "decomp.o" + "background.o" + "draw-node.o" + "shrubbery.o" + "shrub-work.o" + "tfrag-near.o" + "tfrag.o" + "tfrag-methods.o" + "tfrag-work.o" + "tie.o" + "tie-near.o" + "tie-work.o" + "tie-methods.o" + "sync-info.o" + "trajectory.o" + "sparticle-launcher.o" + "sparticle.o" + "entity-table.o" + "loader.o" + "task-control-h.o" + "speedruns-h.o" ;; added + "game-info.o" + "game-save.o" + "settings.o" + "pc-anim-util.o" ;; added + "autosplit-h.o" ;; added + "autosplit.o" ;; added + "speedruns.o" ;; added + "pckernel.o" ;; added + "mood-tables.o" + "mood.o" + "weather-part.o" + "time-of-day.o" + "sky-utils.o" + "sky.o" + "sky-tng.o" + "load-boundary-h.o" + "load-boundary.o" + "load-boundary-data.o" + "level-info.o" + "level.o" + "text.o" + "collide-probe.o" + "collide-frag.o" + "collide-mesh.o" + "collide-touch.o" + "collide-edge-grab.o" + "collide-shape.o" + "collide-shape-rider.o" + "collide.o" + ;; "collide-planes.o" + "merc-death.o" + "water-h.o" + "camera.o" + "cam-interface.o" + "cam-master.o" + "cam-states.o" + "cam-states-dbg.o" + "cam-combiner.o" + "cam-update.o" + "vol-h.o" + "cam-layout.o" + "cam-debug.o" + "cam-start.o" + "process-drawable.o" + "hint-control.o" + "ambient.o" + "assert.o" + "generic-obs.o" + "target-util.o" + "target-part.o" + "collide-reaction-target.o" + "logic-target.o" + "sidekick.o" + "voicebox.o" + "target-handler.o" + "target.o" + "target2.o" + "target-death.o" + "menu.o" + "drawable.o" + "drawable-group.o" + "drawable-inline-array.o" + "drawable-tree.o" + "prototype.o" + "main-collide.o" + "video.o" + "main.o" + "collide-cache.o" + "relocate.o" + "memory-usage.o" + "entity.o" + "path.o" + "vol.o" + "navigate.o" + "aligner.o" + "effect-control.o" + "water.o" + "collectables-part.o" + "collectables.o" + "task-control.o" + "process-taskable.o" + "pov-camera.o" + "powerups.o" + "crates.o" + "hud.o" + "hud-classes.o" + "progress-static.o" + "progress-part.o" + "progress-draw.o" + "progress.o" + "progress-pc.o" ;; added + "credits.o" + "projectiles.o" + "ocean.o" + "ocean-vu0.o" + "ocean-texture.o" + "ocean-mid.o" + "ocean-transition.o" + "ocean-near.o" + "shadow.o" + "eye.o" + "glist-h.o" + "glist.o" + "anim-tester.o" + "viewer.o" + "part-tester.o" + "default-menu.o" + "anim-tester-x.o" ;; added + "entity-debug.o" ;; added + "subtitle.o" ;; added + "default-menu-pc.o" ;; added + "dir-tpages.go" + "tpage-463.go" + "tpage-2.go" + "tpage-880.go" + "tpage-256.go" + "tpage-1278.go" + "texture-upload.o" + "tpage-1032.go" + "tpage-62.go" + "tpage-1532.go" + "fuel-cell-ag.go" + "money-ag.go" + "buzzer-ag.go" + "ecovalve-ag.go" + "crate-ag.go" + "speaker-ag.go" + "fuelcell-naked-ag.go" + "eichar-ag.go" + "sidekick-ag.go" + "deathcam-ag.go" + "game-cnt.go" + "rigid-body-h.o" + "water-anim.o" + "dark-eco-pool.o" + "rigid-body.o" + "nav-enemy-h.o" + "nav-enemy.o" + "baseplat.o" + "basebutton.o" + "tippy.o" + "joint-exploder.o" + "babak.o" + "sharkey.o" + "orb-cache.o" + "plat.o" + "plat-button.o" + "plat-eco.o" + "ropebridge.o" + "ticky.o" + "hud-classes-pc.o" ;; added + )) diff --git a/goal_src/jak1/dgos/int.gd b/goal_src/jak1/dgos/int.gd index 77eef135e9..e0da6e8077 100644 --- a/goal_src/jak1/dgos/int.gd +++ b/goal_src/jak1/dgos/int.gd @@ -1,11 +1,10 @@ - ("INT.DGO" - ("evilbro.o" "evilbro") - ("tpage-1455.go" "tpage-1455") - ("tpage-1457.go" "tpage-1457") - ("tpage-1456.go" "tpage-1456") - ("tpage-1454.go" "tpage-1454") - ("evilbro-ag.go" "evilbro") - ("evilsis-ag.go" "evilsis") - ("intro-vis.go" "intro-vis") - ) \ No newline at end of file + ("evilbro.o" + "tpage-1455.go" + "tpage-1457.go" + "tpage-1456.go" + "tpage-1454.go" + "evilbro-ag.go" + "evilsis-ag.go" + "intro-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/jub.gd b/goal_src/jak1/dgos/jub.gd index b140e9a552..7cab87c331 100644 --- a/goal_src/jak1/dgos/jub.gd +++ b/goal_src/jak1/dgos/jub.gd @@ -1,21 +1,20 @@ - ("JUB.DGO" - ("jungleb-obs.o" "jungleb-obs") - ("plat-flip.o" "plat-flip") - ("plant-boss-main+0-ag.go" "plant-boss-main+0") - ("aphid.o" "aphid") - ("plant-boss.o" "plant-boss") - ("tpage-485.go" "tpage-485") - ("tpage-510.go" "tpage-510") - ("tpage-507.go" "tpage-507") - ("tpage-966.go" "tpage-966") - ("aphid-lurker-ag.go" "aphid-lurker") - ("darkvine-ag.go" "darkvine") - ("ecovalve-ag.go" "ecovalve") - ("eggtop-ag.go" "eggtop") - ("jng-iris-door-ag.go" "jng-iris-door") - ("plant-boss-ag.go" "plant-boss") - ("plat-flip-ag.go" "plat-flip") - ("plat-jungleb-ag.go" "plat-jungleb") - ("jungleb-vis.go" "jungleb-vis") - ) \ No newline at end of file + ("jungleb-obs.o" + "plat-flip.o" + "plant-boss-main+0-ag.go" + "aphid.o" + "plant-boss.o" + "tpage-485.go" + "tpage-510.go" + "tpage-507.go" + "tpage-966.go" + "aphid-lurker-ag.go" + "darkvine-ag.go" + "ecovalve-ag.go" + "eggtop-ag.go" + "jng-iris-door-ag.go" + "plant-boss-ag.go" + "plat-flip-ag.go" + "plat-jungleb-ag.go" + "jungleb-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/jun.gd b/goal_src/jak1/dgos/jun.gd index 6f6592a491..242b449cc5 100644 --- a/goal_src/jak1/dgos/jun.gd +++ b/goal_src/jak1/dgos/jun.gd @@ -1,52 +1,52 @@ ("JUN.DGO" - ("eichar-fish+0-ag.go" "eichar-fish+0") - ("jungle-elevator.o" "jungle-elevator") - ("bouncer.o" "bouncer") - ("hopper.o" "hopper") - ("junglesnake.o" "junglesnake") - ("darkvine.o" "darkvine") - ("jungle-obs.o" "jungle-obs") - ("jungle-mirrors.o" "jungle-mirrors") - ("junglefish.o" "junglefish") - ("fisher.o" "fisher") - ("jungle-part.o" "jungle-part") - ("launcherdoor.o" "launcherdoor") - ("tpage-385.go" "tpage-385") - ("tpage-531.go" "tpage-531") - ("tpage-386.go" "tpage-386") - ("tpage-388.go" "tpage-388") - ("tpage-765.go" "tpage-765") - ("accordian-ag.go" "accordian") - ("babak-ag.go" "babak") - ("bounceytarp-ag.go" "bounceytarp") - ("catch-fisha-ag.go" "catch-fisha") - ("catch-fishb-ag.go" "catch-fishb") - ("catch-fishc-ag.go" "catch-fishc") - ("darkvine-ag.go" "darkvine") - ("ecovalve-ag.go" "ecovalve") - ("fish-net-ag.go" "fish-net") - ("fisher-ag.go" "fisher") - ("hopper-ag.go" "hopper") - ("junglecam-ag.go" "junglecam") - ("junglefish-ag.go" "junglefish") - ("junglesnake-ag.go" "junglesnake") - ("launcherdoor-ag.go" "launcherdoor") - ("logtrap-ag.go" "logtrap") - ("lurkerm-piston-ag.go" "lurkerm-piston") - ("lurkerm-tall-sail-ag.go" "lurkerm-tall-sail") - ("maindoor-ag.go" "maindoor") - ("medres-firecanyon-ag.go" "medres-firecanyon") - ("orb-cache-top-ag.go" "orb-cache-top") - ("periscope-ag.go" "periscope") - ("plat-button-ag.go" "plat-button") - ("plat-eco-ag.go" "plat-eco") - ("precurbridge-ag.go" "precurbridge") - ("reflector-mirror-ag.go" "reflector-mirror") - ("ropebridge-52-ag.go" "ropebridge-52") - ("ropebridge-70-ag.go" "ropebridge-70") - ("sharkey-ag.go" "sharkey") - ("sidedoor-ag.go" "sidedoor") - ("towertop-ag.go" "towertop") - ("water-anim-jungle-ag.go" "water-anim-jungle") - ("jungle-vis.go" "jungle-vis") - ) \ No newline at end of file + ("eichar-fish+0-ag.go" + "jungle-elevator.o" + "bouncer.o" + "hopper.o" + "junglesnake.o" + "darkvine.o" + "jungle-obs.o" + "jungle-mirrors.o" + "junglefish.o" + "fisher.o" + "jungle-part.o" + "launcherdoor.o" + "tpage-385.go" + "tpage-531.go" + "tpage-386.go" + "tpage-388.go" + "tpage-765.go" + "accordian-ag.go" + "babak-ag.go" + "bounceytarp-ag.go" + "catch-fisha-ag.go" + "catch-fishb-ag.go" + "catch-fishc-ag.go" + "darkvine-ag.go" + "ecovalve-ag.go" + "fish-net-ag.go" + "fisher-ag.go" + "hopper-ag.go" + "junglecam-ag.go" + "junglefish-ag.go" + "junglesnake-ag.go" + "launcherdoor-ag.go" + "logtrap-ag.go" + "lurkerm-piston-ag.go" + "lurkerm-tall-sail-ag.go" + "maindoor-ag.go" + "medres-firecanyon-ag.go" + "orb-cache-top-ag.go" + "periscope-ag.go" + "plat-button-ag.go" + "plat-eco-ag.go" + "precurbridge-ag.go" + "reflector-mirror-ag.go" + "ropebridge-52-ag.go" + "ropebridge-70-ag.go" + "sharkey-ag.go" + "sidedoor-ag.go" + "towertop-ag.go" + "water-anim-jungle-ag.go" + "jungle-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/kernel.gd b/goal_src/jak1/dgos/kernel.gd index 4df9a0e142..2c5f9d6811 100644 --- a/goal_src/jak1/dgos/kernel.gd +++ b/goal_src/jak1/dgos/kernel.gd @@ -1,10 +1,10 @@ ("KERNEL.CGO" - ("gcommon.o" "gcommon") - ("gstring-h.o" "gstring-h") - ("gkernel-h.o" "gkernel-h") - ("gkernel.o" "gkernel") - ("pskernel.o" "pskernel") - ("gstring.o" "gstring") - ("dgo-h.o" "dgo-h") - ("gstate.o" "gstate") - ) \ No newline at end of file + ("gcommon.o" + "gstring-h.o" + "gkernel-h.o" + "gkernel.o" + "pskernel.o" + "gstring.o" + "dgo-h.o" + "gstate.o" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/lav.gd b/goal_src/jak1/dgos/lav.gd index 37da6c55c4..7f1a1fb8c7 100644 --- a/goal_src/jak1/dgos/lav.gd +++ b/goal_src/jak1/dgos/lav.gd @@ -1,40 +1,39 @@ - ("LAV.DGO" - ("target-racer-h.o" "target-racer-h") - ("racer-part.o" "racer-part") - ("racer.o" "racer") - ("target-racer.o" "target-racer") - ("racer-states.o" "racer-states") - ("collide-reaction-racer.o" "collide-reaction-racer") - ("eichar-racer+0-ag.go" "eichar-racer+0") - ("tpage-1119.go" "tpage-1119") - ("blocking-plane.o" "blocking-plane") - ("lavatube-obs.o" "lavatube-obs") - ("lavatube-energy.o" "lavatube-energy") - ("lavatube-part.o" "lavatube-part") - ("assistant-lavatube.o" "assistant-lavatube") - ("tpage-1338.go" "tpage-1338") - ("tpage-1340.go" "tpage-1340") - ("tpage-1339.go" "tpage-1339") - ("tpage-1337.go" "tpage-1337") - ("assistant-lavatube-start-ag.go" "assistant-lavatube-start") - ("chainmine-ag.go" "chainmine") - ("darkecobarrel-ag.go" "darkecobarrel") - ("ecovalve-ag.go" "ecovalve") - ("ef-plane-ag.go" "ef-plane") - ("energyarm-ag.go" "energyarm") - ("energyball-ag.go" "energyball") - ("energybase-ag.go" "energybase") - ("energydoor-ag.go" "energydoor") - ("energyhub-ag.go" "energyhub") - ("lavaballoon-ag.go" "lavaballoon") - ("lavabase-ag.go" "lavabase") - ("lavafall-ag.go" "lavafall") - ("lavafallsewera-ag.go" "lavafallsewera") - ("lavafallsewerb-ag.go" "lavafallsewerb") - ("lavashortcut-ag.go" "lavashortcut") - ("lavayellowtarp-ag.go" "lavayellowtarp") - ("racer-ag.go" "racer") - ("water-anim-lavatube-ag.go" "water-anim-lavatube") - ("lavatube-vis.go" "lavatube-vis") - ) \ No newline at end of file + ("target-racer-h.o" + "racer-part.o" + "racer.o" + "target-racer.o" + "racer-states.o" + "collide-reaction-racer.o" + "eichar-racer+0-ag.go" + "tpage-1119.go" + "blocking-plane.o" + "lavatube-obs.o" + "lavatube-energy.o" + "lavatube-part.o" + "assistant-lavatube.o" + "tpage-1338.go" + "tpage-1340.go" + "tpage-1339.go" + "tpage-1337.go" + "assistant-lavatube-start-ag.go" + "chainmine-ag.go" + "darkecobarrel-ag.go" + "ecovalve-ag.go" + "ef-plane-ag.go" + "energyarm-ag.go" + "energyball-ag.go" + "energybase-ag.go" + "energydoor-ag.go" + "energyhub-ag.go" + "lavaballoon-ag.go" + "lavabase-ag.go" + "lavafall-ag.go" + "lavafallsewera-ag.go" + "lavafallsewerb-ag.go" + "lavashortcut-ag.go" + "lavayellowtarp-ag.go" + "racer-ag.go" + "water-anim-lavatube-ag.go" + "lavatube-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/mai.gd b/goal_src/jak1/dgos/mai.gd index e291a10913..7f64bb87e8 100644 --- a/goal_src/jak1/dgos/mai.gd +++ b/goal_src/jak1/dgos/mai.gd @@ -1,36 +1,35 @@ - ("MAI.DGO" - ("cavecrystal-light.o" "cavecrystal-light") - ("maincave-obs.o" "maincave-obs") - ("maincave-part.o" "maincave-part") - ("spiderwebs.o" "spiderwebs") - ("dark-crystal.o" "dark-crystal") - ("baby-spider.o" "baby-spider") - ("mother-spider-h.o" "mother-spider-h") - ("mother-spider-egg.o" "mother-spider-egg") - ("mother-spider-proj.o" "mother-spider-proj") - ("mother-spider.o" "mother-spider") - ("gnawer.o" "gnawer") - ("driller-lurker.o" "driller-lurker") - ("launcherdoor.o" "launcherdoor") - ("tpage-1313.go" "tpage-1313") - ("tpage-1315.go" "tpage-1315") - ("tpage-1314.go" "tpage-1314") - ("tpage-1312.go" "tpage-1312") - ("tpage-767.go" "tpage-767") - ("baby-spider-ag.go" "baby-spider") - ("cavetrapdoor-ag.go" "cavetrapdoor") - ("dark-crystal-ag.go" "dark-crystal") - ("driller-lurker-ag.go" "driller-lurker") - ("ecovalve-ag.go" "ecovalve") - ("gnawer-ag.go" "gnawer") - ("launcherdoor-maincave-ag.go" "launcherdoor-maincave") - ("maincavecam-ag.go" "maincavecam") - ("mother-spider-ag.go" "mother-spider") - ("plat-ag.go" "plat") - ("spider-egg-ag.go" "spider-egg") - ("spiderwebs-ag.go" "spiderwebs") - ("water-anim-maincave-ag.go" "water-anim-maincave") - ("water-anim-maincave-water-ag.go" "water-anim-maincave-water") - ("maincave-vis.go" "maincave-vis") - ) \ No newline at end of file + ("cavecrystal-light.o" + "maincave-obs.o" + "maincave-part.o" + "spiderwebs.o" + "dark-crystal.o" + "baby-spider.o" + "mother-spider-h.o" + "mother-spider-egg.o" + "mother-spider-proj.o" + "mother-spider.o" + "gnawer.o" + "driller-lurker.o" + "launcherdoor.o" + "tpage-1313.go" + "tpage-1315.go" + "tpage-1314.go" + "tpage-1312.go" + "tpage-767.go" + "baby-spider-ag.go" + "cavetrapdoor-ag.go" + "dark-crystal-ag.go" + "driller-lurker-ag.go" + "ecovalve-ag.go" + "gnawer-ag.go" + "launcherdoor-maincave-ag.go" + "maincavecam-ag.go" + "mother-spider-ag.go" + "plat-ag.go" + "spider-egg-ag.go" + "spiderwebs-ag.go" + "water-anim-maincave-ag.go" + "water-anim-maincave-water-ag.go" + "maincave-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/mis.gd b/goal_src/jak1/dgos/mis.gd index eaacd5f087..981be01bf4 100644 --- a/goal_src/jak1/dgos/mis.gd +++ b/goal_src/jak1/dgos/mis.gd @@ -1,62 +1,61 @@ - ("MIS.DGO" - ("target-racer-h.o" "target-racer-h") - ("racer-part.o" "racer-part") - ("racer.o" "racer") - ("target-racer.o" "target-racer") - ("racer-states.o" "racer-states") - ("collide-reaction-racer.o" "collide-reaction-racer") - ("eichar-racer+0-ag.go" "eichar-racer+0") - ("tpage-1119.go" "tpage-1119") - ("battlecontroller.o" "battlecontroller") - ("mistycannon.o" "mistycannon") - ("babak-with-cannon.o" "babak-with-cannon") - ("blocking-plane.o" "blocking-plane") - ("misty-obs.o" "misty-obs") - ("misty-warehouse.o" "misty-warehouse") - ("misty-conveyor.o" "misty-conveyor") - ("mud.o" "mud") - ("muse.o" "muse") - ("bonelurker.o" "bonelurker") - ("quicksandlurker.o" "quicksandlurker") - ("misty-teetertotter.o" "misty-teetertotter") - ("balloonlurker.o" "balloonlurker") - ("misty-part.o" "misty-part") - ("sidekick-human.o" "sidekick-human") - ("tpage-516.go" "tpage-516") - ("tpage-521.go" "tpage-521") - ("tpage-518.go" "tpage-518") - ("tpage-520.go" "tpage-520") - ("babak-ag.go" "babak") - ("balloonlurker-ag.go" "balloonlurker") - ("boatpaddle-ag.go" "boatpaddle") - ("bonelurker-ag.go" "bonelurker") - ("breakaway-left-ag.go" "breakaway-left") - ("breakaway-mid-ag.go" "breakaway-mid") - ("breakaway-right-ag.go" "breakaway-right") - ("darkecocan-ag.go" "darkecocan") - ("ef-plane-ag.go" "ef-plane") - ("keg-ag.go" "keg") - ("keg-conveyor-ag.go" "keg-conveyor") - ("keg-conveyor-paddle-ag.go" "keg-conveyor-paddle") - ("mis-bone-bridge-ag.go" "mis-bone-bridge") - ("mis-bone-platform-ag.go" "mis-bone-platform") - ("mistycam-ag.go" "mistycam") - ("mistycannon-ag.go" "mistycannon") - ("muse-ag.go" "muse") - ("orb-cache-top-ag.go" "orb-cache-top") - ("plat-eco-ag.go" "plat-eco") - ("quicksandlurker-ag.go" "quicksandlurker") - ("racer-ag.go" "racer") - ("ropebridge-36-ag.go" "ropebridge-36") - ("rounddoor-ag.go" "rounddoor") - ("sack-ag.go" "sack") - ("sharkey-ag.go" "sharkey") - ("sidekick-human-ag.go" "sidekick-human") - ("silostep-ag.go" "silostep") - ("teetertotter-ag.go" "teetertotter") - ("water-anim-misty-ag.go" "water-anim-misty") - ("wheel-ag.go" "wheel") - ("windturbine-ag.go" "windturbine") - ("misty-vis.go" "misty-vis") - ) \ No newline at end of file + ("target-racer-h.o" + "racer-part.o" + "racer.o" + "target-racer.o" + "racer-states.o" + "collide-reaction-racer.o" + "eichar-racer+0-ag.go" + "tpage-1119.go" + "battlecontroller.o" + "mistycannon.o" + "babak-with-cannon.o" + "blocking-plane.o" + "misty-obs.o" + "misty-warehouse.o" + "misty-conveyor.o" + "mud.o" + "muse.o" + "bonelurker.o" + "quicksandlurker.o" + "misty-teetertotter.o" + "balloonlurker.o" + "misty-part.o" + "sidekick-human.o" + "tpage-516.go" + "tpage-521.go" + "tpage-518.go" + "tpage-520.go" + "babak-ag.go" + "balloonlurker-ag.go" + "boatpaddle-ag.go" + "bonelurker-ag.go" + "breakaway-left-ag.go" + "breakaway-mid-ag.go" + "breakaway-right-ag.go" + "darkecocan-ag.go" + "ef-plane-ag.go" + "keg-ag.go" + "keg-conveyor-ag.go" + "keg-conveyor-paddle-ag.go" + "mis-bone-bridge-ag.go" + "mis-bone-platform-ag.go" + "mistycam-ag.go" + "mistycannon-ag.go" + "muse-ag.go" + "orb-cache-top-ag.go" + "plat-eco-ag.go" + "quicksandlurker-ag.go" + "racer-ag.go" + "ropebridge-36-ag.go" + "rounddoor-ag.go" + "sack-ag.go" + "sharkey-ag.go" + "sidekick-human-ag.go" + "silostep-ag.go" + "teetertotter-ag.go" + "water-anim-misty-ag.go" + "wheel-ag.go" + "windturbine-ag.go" + "misty-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/ogr.gd b/goal_src/jak1/dgos/ogr.gd index c736829492..34df743238 100644 --- a/goal_src/jak1/dgos/ogr.gd +++ b/goal_src/jak1/dgos/ogr.gd @@ -1,38 +1,37 @@ - ("OGR.DGO" - ("target-racer-h.o" "target-racer-h") - ("racer-part.o" "racer-part") - ("racer.o" "racer") - ("target-racer.o" "target-racer") - ("racer-states.o" "racer-states") - ("collide-reaction-racer.o" "collide-reaction-racer") - ("eichar-racer+0-ag.go" "eichar-racer+0") - ("tpage-1119.go" "tpage-1119") - ("blocking-plane.o" "blocking-plane") - ("firecanyon-obs.o" "firecanyon-obs") - ("ogre-part.o" "ogre-part") - ("ogreboss.o" "ogreboss") - ("ogre-obs.o" "ogre-obs") - ("flying-lurker.o" "flying-lurker") - ("tpage-875.go" "tpage-875") - ("tpage-967.go" "tpage-967") - ("tpage-884.go" "tpage-884") - ("tpage-1117.go" "tpage-1117") - ("crate-darkeco-cluster-ag.go" "crate-darkeco-cluster") - ("ecovalve-ag.go" "ecovalve") - ("ef-plane-ag.go" "ef-plane") - ("flying-lurker-ag.go" "flying-lurker") - ("medres-snow-ag.go" "medres-snow") - ("ogre-bridge-ag.go" "ogre-bridge") - ("ogre-bridgeend-ag.go" "ogre-bridgeend") - ("ogre-isle-ag.go" "ogre-isle") - ("ogre-step-ag.go" "ogre-step") - ("ogreboss-ag.go" "ogreboss") - ("ogrecam-ag.go" "ogrecam") - ("plunger-lurker-ag.go" "plunger-lurker") - ("racer-ag.go" "racer") - ("shortcut-boulder-ag.go" "shortcut-boulder") - ("tntbarrel-ag.go" "tntbarrel") - ("water-anim-ogre-ag.go" "water-anim-ogre") - ("ogre-vis.go" "ogre-vis") - ) \ No newline at end of file + ("target-racer-h.o" + "racer-part.o" + "racer.o" + "target-racer.o" + "racer-states.o" + "collide-reaction-racer.o" + "eichar-racer+0-ag.go" + "tpage-1119.go" + "blocking-plane.o" + "firecanyon-obs.o" + "ogre-part.o" + "ogreboss.o" + "ogre-obs.o" + "flying-lurker.o" + "tpage-875.go" + "tpage-967.go" + "tpage-884.go" + "tpage-1117.go" + "crate-darkeco-cluster-ag.go" + "ecovalve-ag.go" + "ef-plane-ag.go" + "flying-lurker-ag.go" + "medres-snow-ag.go" + "ogre-bridge-ag.go" + "ogre-bridgeend-ag.go" + "ogre-isle-ag.go" + "ogre-step-ag.go" + "ogreboss-ag.go" + "ogrecam-ag.go" + "plunger-lurker-ag.go" + "racer-ag.go" + "shortcut-boulder-ag.go" + "tntbarrel-ag.go" + "water-anim-ogre-ag.go" + "ogre-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/rob.gd b/goal_src/jak1/dgos/rob.gd index 6648602de8..3798079b82 100644 --- a/goal_src/jak1/dgos/rob.gd +++ b/goal_src/jak1/dgos/rob.gd @@ -1,25 +1,24 @@ - ("ROB.DGO" - ("cave-trap.o" "cave-trap") - ("spider-egg.o" "spider-egg") - ("robocave-part.o" "robocave-part") - ("eichar-pole+0-ag.go" "eichar-pole+0") - ("tpage-1318.go" "tpage-1318") - ("tpage-1319.go" "tpage-1319") - ("tpage-1317.go" "tpage-1317") - ("tpage-1316.go" "tpage-1316") - ("babak-ag.go" "babak") - ("baby-spider-ag.go" "baby-spider") - ("cavecrusher-ag.go" "cavecrusher") - ("caveelevator-ag.go" "caveelevator") - ("cavespatulatwo-ag.go" "cavespatulatwo") - ("cavetrapdoor-ag.go" "cavetrapdoor") - ("driller-lurker-ag.go" "driller-lurker") - ("ecovalve-ag.go" "ecovalve") - ("plat-ag.go" "plat") - ("plat-eco-ag.go" "plat-eco") - ("spider-egg-ag.go" "spider-egg") - ("spiderwebs-ag.go" "spiderwebs") - ("water-anim-robocave-ag.go" "water-anim-robocave") - ("robocave-vis.go" "robocave-vis") - ) \ No newline at end of file + ("cave-trap.o" + "spider-egg.o" + "robocave-part.o" + "eichar-pole+0-ag.go" + "tpage-1318.go" + "tpage-1319.go" + "tpage-1317.go" + "tpage-1316.go" + "babak-ag.go" + "baby-spider-ag.go" + "cavecrusher-ag.go" + "caveelevator-ag.go" + "cavespatulatwo-ag.go" + "cavetrapdoor-ag.go" + "driller-lurker-ag.go" + "ecovalve-ag.go" + "plat-ag.go" + "plat-eco-ag.go" + "spider-egg-ag.go" + "spiderwebs-ag.go" + "water-anim-robocave-ag.go" + "robocave-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/rol.gd b/goal_src/jak1/dgos/rol.gd index 6c153961dd..f108ba9ef7 100644 --- a/goal_src/jak1/dgos/rol.gd +++ b/goal_src/jak1/dgos/rol.gd @@ -1,35 +1,34 @@ - ("ROL.DGO" - ("target-racer-h.o" "target-racer-h") - ("racer-part.o" "racer-part") - ("racer.o" "racer") - ("target-racer.o" "target-racer") - ("racer-states.o" "racer-states") - ("collide-reaction-racer.o" "collide-reaction-racer") - ("eichar-racer+0-ag.go" "eichar-racer+0") - ("tpage-1119.go" "tpage-1119") - ("blocking-plane.o" "blocking-plane") - ("rolling-obs.o" "rolling-obs") - ("rolling-lightning-mole.o" "rolling-lightning-mole") - ("rolling-robber.o" "rolling-robber") - ("rolling-race-ring.o" "rolling-race-ring") - ("tpage-923.go" "tpage-923") - ("tpage-926.go" "tpage-926") - ("tpage-924.go" "tpage-924") - ("tpage-925.go" "tpage-925") - ("tpage-1353.go" "tpage-1353") - ("babak-ag.go" "babak") - ("dark-plant-ag.go" "dark-plant") - ("ecovalve-ag.go" "ecovalve") - ("ef-plane-ag.go" "ef-plane") - ("happy-plant-ag.go" "happy-plant") - ("lightning-mole-ag.go" "lightning-mole") - ("pusher-ag.go" "pusher") - ("race-ring-ag.go" "race-ring") - ("racer-ag.go" "racer") - ("robber-ag.go" "robber") - ("rolling-start-ag.go" "rolling-start") - ("rollingcam-ag.go" "rollingcam") - ("water-anim-rolling-ag.go" "water-anim-rolling") - ("rolling-vis.go" "rolling-vis") - ) \ No newline at end of file + ("target-racer-h.o" + "racer-part.o" + "racer.o" + "target-racer.o" + "racer-states.o" + "collide-reaction-racer.o" + "eichar-racer+0-ag.go" + "tpage-1119.go" + "blocking-plane.o" + "rolling-obs.o" + "rolling-lightning-mole.o" + "rolling-robber.o" + "rolling-race-ring.o" + "tpage-923.go" + "tpage-926.go" + "tpage-924.go" + "tpage-925.go" + "tpage-1353.go" + "babak-ag.go" + "dark-plant-ag.go" + "ecovalve-ag.go" + "ef-plane-ag.go" + "happy-plant-ag.go" + "lightning-mole-ag.go" + "pusher-ag.go" + "race-ring-ag.go" + "racer-ag.go" + "robber-ag.go" + "rolling-start-ag.go" + "rollingcam-ag.go" + "water-anim-rolling-ag.go" + "rolling-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/sno.gd b/goal_src/jak1/dgos/sno.gd index 36227e51f3..bbc161f3db 100644 --- a/goal_src/jak1/dgos/sno.gd +++ b/goal_src/jak1/dgos/sno.gd @@ -1,54 +1,53 @@ - ("SNO.DGO" - ("blocking-plane.o" "blocking-plane") - ("flut-part.o" "flut-part") - ("flutflut.o" "flutflut") - ("target-flut.o" "target-flut") - ("eichar-flut+0-ag.go" "eichar-flut+0") - ("target-snowball.o" "target-snowball") - ("target-ice.o" "target-ice") - ("ice-cube.o" "ice-cube") - ("snow-ball.o" "snow-ball") - ("snow-obs.o" "snow-obs") - ("snow-flutflut-obs.o" "snow-flutflut-obs") - ("snow-bumper.o" "snow-bumper") - ("snow-ram-h.o" "snow-ram-h") - ("snow-ram-boss.o" "snow-ram-boss") - ("snow-ram.o" "snow-ram") - ("snow-part.o" "snow-part") - ("yeti.o" "yeti") - ("eichar-pole+0-ag.go" "eichar-pole+0") - ("eichar-ice+0-ag.go" "eichar-ice+0") - ("snow-bunny.o" "snow-bunny") - ("tpage-710.go" "tpage-710") - ("tpage-842.go" "tpage-842") - ("tpage-711.go" "tpage-711") - ("tpage-712.go" "tpage-712") - ("babak-ag.go" "babak") - ("ecovalve-ag.go" "ecovalve") - ("ef-plane-ag.go" "ef-plane") - ("flut-saddle-ag.go" "flut-saddle") - ("flutflut-plat-large-ag.go" "flutflut-plat-large") - ("flutflut-plat-med-ag.go" "flutflut-plat-med") - ("flutflut-plat-small-ag.go" "flutflut-plat-small") - ("ice-cube-ag.go" "ice-cube") - ("ice-cube-break-ag.go" "ice-cube-break") - ("orb-cache-top-ag.go" "orb-cache-top") - ("ram-ag.go" "ram") - ("ram-boss-ag.go" "ram-boss") - ("snow-ball-ag.go" "snow-ball") - ("snow-bridge-36-ag.go" "snow-bridge-36") - ("snow-bumper-ag.go" "snow-bumper") - ("snow-bunny-ag.go" "snow-bunny") - ("snow-button-ag.go" "snow-button") - ("snow-eggtop-ag.go" "snow-eggtop") - ("snow-fort-gate-ag.go" "snow-fort-gate") - ("snow-gears-ag.go" "snow-gears") - ("snow-log-ag.go" "snow-log") - ("snow-spatula-ag.go" "snow-spatula") - ("snow-switch-ag.go" "snow-switch") - ("snowcam-ag.go" "snowcam") - ("snowpusher-ag.go" "snowpusher") - ("yeti-ag.go" "yeti") - ("snow-vis.go" "snow-vis") - ) \ No newline at end of file + ("blocking-plane.o" + "flut-part.o" + "flutflut.o" + "target-flut.o" + "eichar-flut+0-ag.go" + "target-snowball.o" + "target-ice.o" + "ice-cube.o" + "snow-ball.o" + "snow-obs.o" + "snow-flutflut-obs.o" + "snow-bumper.o" + "snow-ram-h.o" + "snow-ram-boss.o" + "snow-ram.o" + "snow-part.o" + "yeti.o" + "eichar-pole+0-ag.go" + "eichar-ice+0-ag.go" + "snow-bunny.o" + "tpage-710.go" + "tpage-842.go" + "tpage-711.go" + "tpage-712.go" + "babak-ag.go" + "ecovalve-ag.go" + "ef-plane-ag.go" + "flut-saddle-ag.go" + "flutflut-plat-large-ag.go" + "flutflut-plat-med-ag.go" + "flutflut-plat-small-ag.go" + "ice-cube-ag.go" + "ice-cube-break-ag.go" + "orb-cache-top-ag.go" + "ram-ag.go" + "ram-boss-ag.go" + "snow-ball-ag.go" + "snow-bridge-36-ag.go" + "snow-bumper-ag.go" + "snow-bunny-ag.go" + "snow-button-ag.go" + "snow-eggtop-ag.go" + "snow-fort-gate-ag.go" + "snow-gears-ag.go" + "snow-log-ag.go" + "snow-spatula-ag.go" + "snow-switch-ag.go" + "snowcam-ag.go" + "snowpusher-ag.go" + "yeti-ag.go" + "snow-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/sub.gd b/goal_src/jak1/dgos/sub.gd index c8263ec863..4857d94b53 100644 --- a/goal_src/jak1/dgos/sub.gd +++ b/goal_src/jak1/dgos/sub.gd @@ -1,24 +1,23 @@ - ("SUB.DGO" - ("tpage-163.go" "tpage-163") - ("tpage-164.go" "tpage-164") - ("tpage-166.go" "tpage-166") - ("tpage-162.go" "tpage-162") - ("tpage-764.go" "tpage-764") - ("babak-ag.go" "babak") - ("blue-eco-charger-ag.go" "blue-eco-charger") - ("blue-eco-charger-orb-ag.go" "blue-eco-charger-orb") - ("bully-ag.go" "bully") - ("ecovalve-ag.go" "ecovalve") - ("floating-launcher-ag.go" "floating-launcher") - ("helix-button-ag.go" "helix-button") - ("helix-slide-door-ag.go" "helix-slide-door") - ("shover-ag.go" "shover") - ("steam-cap-ag.go" "steam-cap") - ("sunkencam-ag.go" "sunkencam") - ("sunkenfisha-ag.go" "sunkenfisha") - ("wall-plat-ag.go" "wall-plat") - ("water-anim-sunken-ag.go" "water-anim-sunken") - ("water-anim-sunken-dark-eco-ag.go" "water-anim-sunken-dark-eco") - ("sunkenb-vis.go" "sunkenb-vis") - ) \ No newline at end of file + ("tpage-163.go" + "tpage-164.go" + "tpage-166.go" + "tpage-162.go" + "tpage-764.go" + "babak-ag.go" + "blue-eco-charger-ag.go" + "blue-eco-charger-orb-ag.go" + "bully-ag.go" + "ecovalve-ag.go" + "floating-launcher-ag.go" + "helix-button-ag.go" + "helix-slide-door-ag.go" + "shover-ag.go" + "steam-cap-ag.go" + "sunkencam-ag.go" + "sunkenfisha-ag.go" + "wall-plat-ag.go" + "water-anim-sunken-ag.go" + "water-anim-sunken-dark-eco-ag.go" + "sunkenb-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/sun.gd b/goal_src/jak1/dgos/sun.gd index e3778959fb..70dcea6268 100644 --- a/goal_src/jak1/dgos/sun.gd +++ b/goal_src/jak1/dgos/sun.gd @@ -1,63 +1,63 @@ ("SUN.DGO" - ("sunken-part.o" "sunken-part") - ("sunken-part2.o" "sunken-part2") - ("sunken-part3.o" "sunken-part3") - ("sunken-part4.o" "sunken-part4") - ("sunken-part5.o" "sunken-part5") - ("target-tube.o" "target-tube") - ("eichar-tube+0-ag.go" "eichar-tube+0") - ("sunken-obs.o" "sunken-obs") - ("shover.o" "shover") - ("launcherdoor.o" "launcherdoor") - ("square-platform.o" "square-platform") - ("sun-iris-door.o" "sun-iris-door") - ("orbit-plat.o" "orbit-plat") - ("wedge-plats.o" "wedge-plats") - ("wall-plat.o" "wall-plat") - ("qbert-plat.o" "qbert-plat") - ("steam-cap.o" "steam-cap") - ("sun-exit-chamber.o" "sun-exit-chamber") - ("floating-launcher.o" "floating-launcher") - ("sunken-water.o" "sunken-water") - ("whirlpool.o" "whirlpool") - ("sunken-pipegame.o" "sunken-pipegame") - ("bully.o" "bully") - ("double-lurker.o" "double-lurker") - ("helix-water.o" "helix-water") - ("puffer.o" "puffer") - ("sunken-fish.o" "sunken-fish") - ("tpage-661.go" "tpage-661") - ("tpage-663.go" "tpage-663") - ("tpage-714.go" "tpage-714") - ("tpage-662.go" "tpage-662") - ("tpage-766.go" "tpage-766") - ("babak-ag.go" "babak") - ("bully-ag.go" "bully") - ("double-lurker-ag.go" "double-lurker") - ("double-lurker-top-ag.go" "double-lurker-top") - ("exit-chamber-ag.go" "exit-chamber") - ("generic-button-ag.go" "generic-button") - ("launcherdoor-ag.go" "launcherdoor") - ("orb-cache-top-ag.go" "orb-cache-top") - ("orbit-plat-ag.go" "orbit-plat") - ("orbit-plat-bottom-ag.go" "orbit-plat-bottom") - ("plat-sunken-ag.go" "plat-sunken") - ("puffer-ag.go" "puffer") - ("qbert-plat-ag.go" "qbert-plat") - ("qbert-plat-on-ag.go" "qbert-plat-on") - ("seaweed-ag.go" "seaweed") - ("shover-ag.go" "shover") - ("side-to-side-plat-ag.go" "side-to-side-plat") - ("square-platform-ag.go" "square-platform") - ("steam-cap-ag.go" "steam-cap") - ("sun-iris-door-ag.go" "sun-iris-door") - ("sunkencam-ag.go" "sunkencam") - ("sunkenfisha-ag.go" "sunkenfisha") - ("wall-plat-ag.go" "wall-plat") - ("water-anim-sunken-ag.go" "water-anim-sunken") - ("water-anim-sunken-dark-eco-ag.go" "water-anim-sunken-dark-eco") - ("wedge-plat-ag.go" "wedge-plat") - ("wedge-plat-outer-ag.go" "wedge-plat-outer") - ("whirlpool-ag.go" "whirlpool") - ("sunken-vis.go" "sunken-vis") - ) \ No newline at end of file + ("sunken-part.o" + "sunken-part2.o" + "sunken-part3.o" + "sunken-part4.o" + "sunken-part5.o" + "target-tube.o" + "eichar-tube+0-ag.go" + "sunken-obs.o" + "shover.o" + "launcherdoor.o" + "square-platform.o" + "sun-iris-door.o" + "orbit-plat.o" + "wedge-plats.o" + "wall-plat.o" + "qbert-plat.o" + "steam-cap.o" + "sun-exit-chamber.o" + "floating-launcher.o" + "sunken-water.o" + "whirlpool.o" + "sunken-pipegame.o" + "bully.o" + "double-lurker.o" + "helix-water.o" + "puffer.o" + "sunken-fish.o" + "tpage-661.go" + "tpage-663.go" + "tpage-714.go" + "tpage-662.go" + "tpage-766.go" + "babak-ag.go" + "bully-ag.go" + "double-lurker-ag.go" + "double-lurker-top-ag.go" + "exit-chamber-ag.go" + "generic-button-ag.go" + "launcherdoor-ag.go" + "orb-cache-top-ag.go" + "orbit-plat-ag.go" + "orbit-plat-bottom-ag.go" + "plat-sunken-ag.go" + "puffer-ag.go" + "qbert-plat-ag.go" + "qbert-plat-on-ag.go" + "seaweed-ag.go" + "shover-ag.go" + "side-to-side-plat-ag.go" + "square-platform-ag.go" + "steam-cap-ag.go" + "sun-iris-door-ag.go" + "sunkencam-ag.go" + "sunkenfisha-ag.go" + "wall-plat-ag.go" + "water-anim-sunken-ag.go" + "water-anim-sunken-dark-eco-ag.go" + "wedge-plat-ag.go" + "wedge-plat-outer-ag.go" + "whirlpool-ag.go" + "sunken-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/swa.gd b/goal_src/jak1/dgos/swa.gd index ebd822a8a5..8527e59b8b 100644 --- a/goal_src/jak1/dgos/swa.gd +++ b/goal_src/jak1/dgos/swa.gd @@ -1,39 +1,38 @@ - ("SWA.DGO" - ("battlecontroller.o" "battlecontroller") - ("blocking-plane.o" "blocking-plane") - ("flut-part.o" "flut-part") - ("flutflut.o" "flutflut") - ("target-flut.o" "target-flut") - ("eichar-flut+0-ag.go" "eichar-flut+0") - ("swamp-obs.o" "swamp-obs") - ("swamp-bat.o" "swamp-bat") - ("swamp-rat.o" "swamp-rat") - ("swamp-rat-nest.o" "swamp-rat-nest") - ("kermit.o" "kermit") - ("swamp-part.o" "swamp-part") - ("billy.o" "billy") - ("eichar-pole+0-ag.go" "eichar-pole+0") - ("tpage-358.go" "tpage-358") - ("tpage-659.go" "tpage-659") - ("tpage-629.go" "tpage-629") - ("tpage-630.go" "tpage-630") - ("babak-ag.go" "babak") - ("balance-plat-ag.go" "balance-plat") - ("billy-ag.go" "billy") - ("billy-sidekick-ag.go" "billy-sidekick") - ("ecovalve-ag.go" "ecovalve") - ("ef-plane-ag.go" "ef-plane") - ("farthy-snack-ag.go" "farthy-snack") - ("flut-saddle-ag.go" "flut-saddle") - ("kermit-ag.go" "kermit") - ("sharkey-ag.go" "sharkey") - ("swamp-bat-ag.go" "swamp-bat") - ("swamp-rat-ag.go" "swamp-rat") - ("swamp-rat-nest-ag.go" "swamp-rat-nest") - ("swamp-rock-ag.go" "swamp-rock") - ("swamp-spike-ag.go" "swamp-spike") - ("swampcam-ag.go" "swampcam") - ("tar-plat-ag.go" "tar-plat") - ("swamp-vis.go" "swamp-vis") - ) \ No newline at end of file + ("battlecontroller.o" + "blocking-plane.o" + "flut-part.o" + "flutflut.o" + "target-flut.o" + "eichar-flut+0-ag.go" + "swamp-obs.o" + "swamp-bat.o" + "swamp-rat.o" + "swamp-rat-nest.o" + "kermit.o" + "swamp-part.o" + "billy.o" + "eichar-pole+0-ag.go" + "tpage-358.go" + "tpage-659.go" + "tpage-629.go" + "tpage-630.go" + "babak-ag.go" + "balance-plat-ag.go" + "billy-ag.go" + "billy-sidekick-ag.go" + "ecovalve-ag.go" + "ef-plane-ag.go" + "farthy-snack-ag.go" + "flut-saddle-ag.go" + "kermit-ag.go" + "sharkey-ag.go" + "swamp-bat-ag.go" + "swamp-rat-ag.go" + "swamp-rat-nest-ag.go" + "swamp-rock-ag.go" + "swamp-spike-ag.go" + "swampcam-ag.go" + "tar-plat-ag.go" + "swamp-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/tit.gd b/goal_src/jak1/dgos/tit.gd index d40b0f1135..05df21a1b1 100644 --- a/goal_src/jak1/dgos/tit.gd +++ b/goal_src/jak1/dgos/tit.gd @@ -1,17 +1,17 @@ ("TIT.DGO" - ("static-screen.o" "static-screen") - ("title-obs.o" "title-obs") - ("tpage-1609.go" "tpage-1609") - ("tpage-416.go" "tpage-416") - ("tpage-415.go" "tpage-415") - ("tpage-397.go" "tpage-397") - ("tpage-1499.go" "tpage-1499") - ("logo-ag.go" "logo") - ("logo-black-ag.go" "logo-black") - ("logo-cam-ag.go" "logo-cam") - ("logo-volumes-ag.go" "logo-volumes") - ("ndi-ag.go" "ndi") - ("ndi-cam-ag.go" "ndi-cam") - ("ndi-volumes-ag.go" "ndi-volumes") - ("title-vis.go" "title-vis") - ) \ No newline at end of file + ("static-screen.o" + "title-obs.o" + "tpage-1609.go" + "tpage-416.go" + "tpage-415.go" + "tpage-397.go" + "tpage-1499.go" + "logo-ag.go" + "logo-black-ag.go" + "logo-cam-ag.go" + "logo-volumes-ag.go" + "ndi-ag.go" + "ndi-cam-ag.go" + "ndi-volumes-ag.go" + "title-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/tra.gd b/goal_src/jak1/dgos/tra.gd index c9b7faad91..6143084c7c 100644 --- a/goal_src/jak1/dgos/tra.gd +++ b/goal_src/jak1/dgos/tra.gd @@ -1,21 +1,21 @@ ("TRA.DGO" - ("training-obs.o" "training-obs") - ("training-part.o" "training-part") - ("tpage-1309.go" "tpage-1309") - ("tpage-1311.go" "tpage-1311") - ("tpage-1310.go" "tpage-1310") - ("tpage-1308.go" "tpage-1308") - ("tpage-775.go" "tpage-775") - ("ecovalve-ag.go" "ecovalve") - ("jng-iris-door-ag.go" "jng-iris-door") - ("plat-eco-ag.go" "plat-eco") - ("pontoonfive-ag.go" "pontoonfive") - ("scarecrow-a-ag.go" "scarecrow-a") - ("scarecrow-b-ag.go" "scarecrow-b") - ("sharkey-ag.go" "sharkey") - ("trainingcam-ag.go" "trainingcam") - ("warp-gate-switch-ag.go" "warp-gate-switch") - ("warpgate-ag.go" "warpgate") - ("water-anim-training-ag.go" "water-anim-training") - ("training-vis.go" "training-vis") - ) \ No newline at end of file + ("training-obs.o" + "training-part.o" + "tpage-1309.go" + "tpage-1311.go" + "tpage-1310.go" + "tpage-1308.go" + "tpage-775.go" + "ecovalve-ag.go" + "jng-iris-door-ag.go" + "plat-eco-ag.go" + "pontoonfive-ag.go" + "scarecrow-a-ag.go" + "scarecrow-b-ag.go" + "sharkey-ag.go" + "trainingcam-ag.go" + "warp-gate-switch-ag.go" + "warpgate-ag.go" + "water-anim-training-ag.go" + "training-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/vi1.gd b/goal_src/jak1/dgos/vi1.gd index a54ee031a8..f0cc90167a 100644 --- a/goal_src/jak1/dgos/vi1.gd +++ b/goal_src/jak1/dgos/vi1.gd @@ -1,57 +1,57 @@ ("VI1.DGO" - ("villagep-obs.o" "villagep-obs") - ("oracle.o" "oracle") - ("farmer.o" "farmer") - ("explorer.o" "explorer") - ("assistant.o" "assistant") - ("sage.o" "sage") - ("yakow.o" "yakow") - ("village-obs.o" "village-obs") - ("fishermans-boat.o" "fishermans-boat") - ("village1-part.o" "village1-part") - ("village1-part2.o" "village1-part2") - ("sequence-a-village1.o" "sequence-a-village1") - ("tpage-398.go" "tpage-398") - ("tpage-400.go" "tpage-400") - ("tpage-399.go" "tpage-399") - ("tpage-401.go" "tpage-401") - ("tpage-1470.go" "tpage-1470") - ("assistant-ag.go" "assistant") - ("evilplant-ag.go" "evilplant") - ("explorer-ag.go" "explorer") - ("farmer-ag.go" "farmer") - ("fishermans-boat-ag.go" "fishermans-boat") - ("hutlamp-ag.go" "hutlamp") - ("mayorgears-ag.go" "mayorgears") - ("medres-beach-ag.go" "medres-beach") - ("medres-beach1-ag.go" "medres-beach1") - ("medres-beach2-ag.go" "medres-beach2") - ("medres-beach3-ag.go" "medres-beach3") - ("medres-jungle-ag.go" "medres-jungle") - ("medres-jungle1-ag.go" "medres-jungle1") - ("medres-jungle2-ag.go" "medres-jungle2") - ("medres-misty-ag.go" "medres-misty") - ("medres-training-ag.go" "medres-training") - ("medres-village11-ag.go" "medres-village11") - ("medres-village12-ag.go" "medres-village12") - ("medres-village13-ag.go" "medres-village13") - ("oracle-ag.go" "oracle") - ("orb-cache-top-ag.go" "orb-cache-top") - ("reflector-middle-ag.go" "reflector-middle") - ("revcycle-ag.go" "revcycle") - ("revcycleprop-ag.go" "revcycleprop") - ("ropebridge-32-ag.go" "ropebridge-32") - ("sage-ag.go" "sage") - ("sagesail-ag.go" "sagesail") - ("sharkey-ag.go" "sharkey") - ("villa-starfish-ag.go" "villa-starfish") - ("village-cam-ag.go" "village-cam") - ("village1cam-ag.go" "village1cam") - ("warp-gate-switch-ag.go" "warp-gate-switch") - ("warpgate-ag.go" "warpgate") - ("water-anim-village1-ag.go" "water-anim-village1") - ("windmill-sail-ag.go" "windmill-sail") - ("windspinner-ag.go" "windspinner") - ("yakow-ag.go" "yakow") - ("village1-vis.go" "village1-vis") - ) \ No newline at end of file + ("villagep-obs.o" + "oracle.o" + "farmer.o" + "explorer.o" + "assistant.o" + "sage.o" + "yakow.o" + "village-obs.o" + "fishermans-boat.o" + "village1-part.o" + "village1-part2.o" + "sequence-a-village1.o" + "tpage-398.go" + "tpage-400.go" + "tpage-399.go" + "tpage-401.go" + "tpage-1470.go" + "assistant-ag.go" + "evilplant-ag.go" + "explorer-ag.go" + "farmer-ag.go" + "fishermans-boat-ag.go" + "hutlamp-ag.go" + "mayorgears-ag.go" + "medres-beach-ag.go" + "medres-beach1-ag.go" + "medres-beach2-ag.go" + "medres-beach3-ag.go" + "medres-jungle-ag.go" + "medres-jungle1-ag.go" + "medres-jungle2-ag.go" + "medres-misty-ag.go" + "medres-training-ag.go" + "medres-village11-ag.go" + "medres-village12-ag.go" + "medres-village13-ag.go" + "oracle-ag.go" + "orb-cache-top-ag.go" + "reflector-middle-ag.go" + "revcycle-ag.go" + "revcycleprop-ag.go" + "ropebridge-32-ag.go" + "sage-ag.go" + "sagesail-ag.go" + "sharkey-ag.go" + "villa-starfish-ag.go" + "village-cam-ag.go" + "village1cam-ag.go" + "warp-gate-switch-ag.go" + "warpgate-ag.go" + "water-anim-village1-ag.go" + "windmill-sail-ag.go" + "windspinner-ag.go" + "yakow-ag.go" + "village1-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/vi2.gd b/goal_src/jak1/dgos/vi2.gd index 8e57e2adf9..0760ab1574 100644 --- a/goal_src/jak1/dgos/vi2.gd +++ b/goal_src/jak1/dgos/vi2.gd @@ -1,54 +1,54 @@ ("VI2.DGO" - ("villagep-obs.o" "villagep-obs") - ("oracle.o" "oracle") - ("village2-part.o" "village2-part") - ("village2-obs.o" "village2-obs") - ("village2-part2.o" "village2-part2") - ("gambler.o" "gambler") - ("warrior.o" "warrior") - ("geologist.o" "geologist") - ("swamp-blimp.o" "swamp-blimp") - ("sage-bluehut.o" "sage-bluehut") - ("flutflut-bluehut.o" "flutflut-bluehut") - ("assistant-village2.o" "assistant-village2") - ("sunken-elevator.o" "sunken-elevator") - ("tpage-919.go" "tpage-919") - ("tpage-922.go" "tpage-922") - ("tpage-920.go" "tpage-920") - ("tpage-921.go" "tpage-921") - ("tpage-1476.go" "tpage-1476") - ("allpontoons-ag.go" "allpontoons") - ("assistant-village2-ag.go" "assistant-village2") - ("barrel-ag.go" "barrel") - ("ceilingflag-ag.go" "ceilingflag") - ("exit-chamber-dummy-ag.go" "exit-chamber-dummy") - ("fireboulder-ag.go" "fireboulder") - ("flutflut-bluehut-ag.go" "flutflut-bluehut") - ("gambler-ag.go" "gambler") - ("geologist-ag.go" "geologist") - ("jaws-ag.go" "jaws") - ("medres-rolling-ag.go" "medres-rolling") - ("medres-rolling1-ag.go" "medres-rolling1") - ("medres-village2-ag.go" "medres-village2") - ("ogreboss-village2-ag.go" "ogreboss-village2") - ("oracle-ag.go" "oracle") - ("orb-cache-top-ag.go" "orb-cache-top") - ("pontoonfive-ag.go" "pontoonfive") - ("pontoonten-ag.go" "pontoonten") - ("precursor-arm-ag.go" "precursor-arm") - ("sage-bluehut-ag.go" "sage-bluehut") - ("sharkey-ag.go" "sharkey") - ("sunken-elevator-ag.go" "sunken-elevator") - ("swamp-blimp-ag.go" "swamp-blimp") - ("swamp-rope-ag.go" "swamp-rope") - ("swamp-tetherrock-ag.go" "swamp-tetherrock") - ("swamp-tetherrock-explode-ag.go" "swamp-tetherrock-explode") - ("swampcam-ag.go" "swampcam") - ("village-cam-ag.go" "village-cam") - ("village2cam-ag.go" "village2cam") - ("warp-gate-switch-ag.go" "warp-gate-switch") - ("warpgate-ag.go" "warpgate") - ("warrior-ag.go" "warrior") - ("water-anim-village2-ag.go" "water-anim-village2") - ("village2-vis.go" "village2-vis") - ) \ No newline at end of file + ("villagep-obs.o" + "oracle.o" + "village2-part.o" + "village2-obs.o" + "village2-part2.o" + "gambler.o" + "warrior.o" + "geologist.o" + "swamp-blimp.o" + "sage-bluehut.o" + "flutflut-bluehut.o" + "assistant-village2.o" + "sunken-elevator.o" + "tpage-919.go" + "tpage-922.go" + "tpage-920.go" + "tpage-921.go" + "tpage-1476.go" + "allpontoons-ag.go" + "assistant-village2-ag.go" + "barrel-ag.go" + "ceilingflag-ag.go" + "exit-chamber-dummy-ag.go" + "fireboulder-ag.go" + "flutflut-bluehut-ag.go" + "gambler-ag.go" + "geologist-ag.go" + "jaws-ag.go" + "medres-rolling-ag.go" + "medres-rolling1-ag.go" + "medres-village2-ag.go" + "ogreboss-village2-ag.go" + "oracle-ag.go" + "orb-cache-top-ag.go" + "pontoonfive-ag.go" + "pontoonten-ag.go" + "precursor-arm-ag.go" + "sage-bluehut-ag.go" + "sharkey-ag.go" + "sunken-elevator-ag.go" + "swamp-blimp-ag.go" + "swamp-rope-ag.go" + "swamp-tetherrock-ag.go" + "swamp-tetherrock-explode-ag.go" + "swampcam-ag.go" + "village-cam-ag.go" + "village2cam-ag.go" + "warp-gate-switch-ag.go" + "warpgate-ag.go" + "warrior-ag.go" + "water-anim-village2-ag.go" + "village2-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/dgos/vi3.gd b/goal_src/jak1/dgos/vi3.gd index 92cca31148..f00989016f 100644 --- a/goal_src/jak1/dgos/vi3.gd +++ b/goal_src/jak1/dgos/vi3.gd @@ -1,37 +1,37 @@ ("VI3.DGO" - ("villagep-obs.o" "villagep-obs") - ("oracle.o" "oracle") - ("village3-part.o" "village3-part") - ("village3-obs.o" "village3-obs") - ("minecart.o" "minecart") - ("miners.o" "miners") - ("assistant-village3.o" "assistant-village3") - ("sage-village3.o" "sage-village3") - ("tpage-1208.go" "tpage-1208") - ("tpage-1210.go" "tpage-1210") - ("tpage-1209.go" "tpage-1209") - ("tpage-1194.go" "tpage-1194") - ("assistant-village3-ag.go" "assistant-village3") - ("cavegem-ag.go" "cavegem") - ("evilbro-village3-ag.go" "evilbro-village3") - ("evilsis-village3-ag.go" "evilsis-village3") - ("gondola-ag.go" "gondola") - ("gondolacables-ag.go" "gondolacables") - ("lavaspoutdrip-ag.go" "lavaspoutdrip") - ("medres-finalboss-ag.go" "medres-finalboss") - ("medres-ogre-ag.go" "medres-ogre") - ("medres-ogre2-ag.go" "medres-ogre2") - ("medres-ogre3-ag.go" "medres-ogre3") - ("minecartsteel-ag.go" "minecartsteel") - ("minershort-ag.go" "minershort") - ("minertall-ag.go" "minertall") - ("oracle-ag.go" "oracle") - ("pistons-ag.go" "pistons") - ("sage-village3-ag.go" "sage-village3") - ("vil3-bridge-36-ag.go" "vil3-bridge-36") - ("village-cam-ag.go" "village-cam") - ("warp-gate-switch-ag.go" "warp-gate-switch") - ("warpgate-ag.go" "warpgate") - ("water-anim-village3-ag.go" "water-anim-village3") - ("village3-vis.go" "village3-vis") - ) \ No newline at end of file + ("villagep-obs.o" + "oracle.o" + "village3-part.o" + "village3-obs.o" + "minecart.o" + "miners.o" + "assistant-village3.o" + "sage-village3.o" + "tpage-1208.go" + "tpage-1210.go" + "tpage-1209.go" + "tpage-1194.go" + "assistant-village3-ag.go" + "cavegem-ag.go" + "evilbro-village3-ag.go" + "evilsis-village3-ag.go" + "gondola-ag.go" + "gondolacables-ag.go" + "lavaspoutdrip-ag.go" + "medres-finalboss-ag.go" + "medres-ogre-ag.go" + "medres-ogre2-ag.go" + "medres-ogre3-ag.go" + "minecartsteel-ag.go" + "minershort-ag.go" + "minertall-ag.go" + "oracle-ag.go" + "pistons-ag.go" + "sage-village3-ag.go" + "vil3-bridge-36-ag.go" + "village-cam-ag.go" + "warp-gate-switch-ag.go" + "warpgate-ag.go" + "water-anim-village3-ag.go" + "village3-vis.go" + )) \ No newline at end of file diff --git a/goal_src/jak1/engine/camera/cam-debug-h.gc b/goal_src/jak1/engine/camera/cam-debug-h.gc index fbc8c8e3aa..828493b825 100644 --- a/goal_src/jak1/engine/camera/cam-debug-h.gc +++ b/goal_src/jak1/engine/camera/cam-debug-h.gc @@ -45,7 +45,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (define *redline-table* (the-as (pointer float) (malloc 'debug 1600))) (define *redline-index* 0) @@ -150,7 +150,5 @@ 0 -) - diff --git a/goal_src/jak1/engine/camera/cam-debug.gc b/goal_src/jak1/engine/camera/cam-debug.gc index 7a84f68619..3c0828b576 100644 --- a/goal_src/jak1/engine/camera/cam-debug.gc +++ b/goal_src/jak1/engine/camera/cam-debug.gc @@ -7,7 +7,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; failed to figure out what this is: (when (or (not *camera-old-cpu*) (zero? *camera-old-cpu*)) (set! *camera-old-cpu* 0) @@ -1591,8 +1591,6 @@ arg0 ) -) - diff --git a/goal_src/jak1/engine/camera/cam-layout.gc b/goal_src/jak1/engine/camera/cam-layout.gc index 22a08d8617..e5d6b5c53b 100644 --- a/goal_src/jak1/engine/camera/cam-layout.gc +++ b/goal_src/jak1/engine/camera/cam-layout.gc @@ -11,7 +11,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (define *camera-layout-blink* #f) (deftype cam-layout-bank (basic) @@ -3598,7 +3598,5 @@ (none) ) -) - diff --git a/goal_src/jak1/engine/common-obs/process-drawable.gc b/goal_src/jak1/engine/common-obs/process-drawable.gc index 3f1492c7ef..8850fc7b16 100644 --- a/goal_src/jak1/engine/common-obs/process-drawable.gc +++ b/goal_src/jak1/engine/common-obs/process-drawable.gc @@ -389,8 +389,7 @@ ) ) - (#when PC_PORT - (when *debug-segment* + (#when PC_PORT (when *debug-segment* (if *display-bones* (draw-bone-lines obj)) (if *display-joint-names* diff --git a/goal_src/jak1/engine/debug/anim-tester.gc b/goal_src/jak1/engine/debug/anim-tester.gc index 64ba798212..9436af880e 100644 --- a/goal_src/jak1/engine/debug/anim-tester.gc +++ b/goal_src/jak1/engine/debug/anim-tester.gc @@ -31,7 +31,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (deftype list-control (structure) ((listfunc (function int list-control symbol) :offset-assert 0) (list-owner uint32 :offset-assert 4) @@ -2805,7 +2805,5 @@ (none) ) -) - diff --git a/goal_src/jak1/engine/debug/default-menu.gc b/goal_src/jak1/engine/debug/default-menu.gc index c3c9b4b709..01b6358e89 100644 --- a/goal_src/jak1/engine/debug/default-menu.gc +++ b/goal_src/jak1/engine/debug/default-menu.gc @@ -14,7 +14,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (define *debug-menu-context* (new 'debug 'debug-menu-context)) (define *dm-cam-mode-interpolation* 0) @@ -3946,974 +3946,3 @@ (debug-menus-handler *popup-menu-context*) ) -(#when PC_PORT - -(defmacro new-dm-func (text var func) - `(new 'debug 'debug-menu-item-function ,text ,var (the-as (function int object) ,func)) - ) -(defmacro new-dm-flag (text var func) - `(new 'debug 'debug-menu-item-flag ,text ,var (the-as (function int debug-menu-msg object) ,func)) - ) -(defmacro new-dm-bool (text sym func) - `(new-dm-flag ,text (quote ,sym) ,func) - ) -(defmacro new-dm-submenu (text menu) - `(new 'debug 'debug-menu-item-submenu ,text ,menu) - ) -(defmacro new-dm-var-float (text var func inc min max) - `(debug-menu-item-var-make-float (new 'debug 'debug-menu-item-var ,text ,var (* 8 20)) - (the-as (function int debug-menu-msg float float float) ,func) - ,inc #t ,min ,max 1) - ) - -(defun dm-want-level-toggle-pick-func ((arg0 pair) (arg1 debug-menu-msg)) - (let* ((levname (the-as symbol (car arg0))) - (info (the-as level-load-info (-> levname value))) - (idx (the int (cdr arg0))) - (the-level (level-get *level* (-> info name))) - ) - (if (and the-level (!= the-level (-> *level* level idx))) - (return 'invalid) - ) - (if (= arg1 (debug-menu-msg press)) - (load-state-want-levels - (if (= idx 0) (-> info name) (-> *level* level 0 name)) - (if (= idx 1) (-> info name) (-> *level* level 1 name)) - ) - ) - (eq? (-> *level* level idx name) (-> info name)) - ) - ) - -(defun dm-display-level-toggle-pick-func ((arg0 symbol) (arg1 debug-menu-msg)) - (let ((the-level (level-get *level* arg0))) - (if (not the-level) - (return 'invalid) - ) - (if (= arg1 (debug-menu-msg press)) - (when the-level - (load-state-want-display-level arg0 - (if (-> the-level display?) #f 'display) - ) - ) - ) - (and the-level (-> the-level display?)) - ) - ) - -(defun debug-menu-make-load-want-menu ((ctx debug-menu-context) (lev-idx int)) - - (let ((want-menu (new 'debug 'debug-menu ctx "Level want menu"))) - - (let ((iter *level-load-list*)) - (while (not (or (null? iter) (null? (cdr iter)) (null? (cddr iter)))) - (debug-menu-append-item want-menu (new-dm-flag (symbol->string (the-as symbol (car iter))) (dcons (car iter) lev-idx) dm-want-level-toggle-pick-func)) - - (set! iter (cdr iter)) - ) - ) - - (new-dm-submenu (new 'debug 'string 0 (string-format "Want ~D" lev-idx)) want-menu) - ) - ) - -(defun debug-menu-make-load-display-menu ((ctx debug-menu-context)) - - (let ((display-menu (new 'debug 'debug-menu ctx "Level display menu"))) - - (let ((iter *level-load-list*)) - (while (not (or (null? iter) (null? (cdr iter)) (null? (cddr iter)))) - (debug-menu-append-item display-menu (new-dm-flag (symbol->string (the-as symbol (car iter))) (car iter) dm-display-level-toggle-pick-func)) - - (set! iter (cdr iter)) - ) - ) - - (new-dm-submenu "Display" display-menu) - ) - ) - -(defun debug-menu-make-load-teleport-menu ((ctx debug-menu-context)) - - (let ((teleport-menu (new 'debug 'debug-menu ctx "Camera teleport menu"))) - - (let ((iter *level-load-list*)) - (while (not (or (null? iter) (null? (cdr iter)) (null? (cddr iter)))) - (debug-menu-append-item teleport-menu - (new-dm-func (symbol->string (the-as symbol (car iter))) - (-> (the-as symbol (car iter)) value) - (lambda ((info level-load-info)) - (let ((tf (new 'stack-no-clear 'transformq))) - (set! (-> tf trans x) (-> info bsphere x)) - (set! (-> tf trans y) (-> info bsphere y)) - (set! (-> tf trans z) (-> info bsphere z)) - (quaternion-identity! (-> tf quat)) - (vector-identity! (-> tf scale)) - (send-event *camera* 'teleport-to-transformq tf) - ) - ) - )) - - (set! iter (cdr iter)) - ) - ) - - (new-dm-submenu "Camera teleport" teleport-menu) - ) - ) - -(defun debug-menu-make-load-menu ((ctx debug-menu-context)) - (let ((load-menu (new 'debug 'debug-menu ctx "Load menu"))) - (debug-menu-append-item load-menu (new-dm-bool "Level Border" *display-level-border* dm-boolean-toggle-pick-func)) - (debug-menu-append-item load-menu (debug-menu-make-from-template ctx '(flag - "border-mode" - #f - ,(lambda ((arg0 int) (arg1 debug-menu-msg)) - (if (= arg1 (debug-menu-msg press)) - (set! (-> *setting-control* default border-mode) (not (-> *setting-control* default border-mode))) - ) - (-> *setting-control* default border-mode) - ) - ))) - - (debug-menu-append-item load-menu (debug-menu-make-load-want-menu ctx 0)) ;; Want 0 - (debug-menu-append-item load-menu (debug-menu-make-load-want-menu ctx 1)) ;; Want 1 - (debug-menu-append-item load-menu (debug-menu-make-load-display-menu ctx)) ;; Display - (debug-menu-append-item load-menu (debug-menu-make-load-teleport-menu ctx)) ;; Camera teleport - - (new-dm-submenu "Load" load-menu) - ) - ) - -(define *part-pick-menu* (the-as debug-menu #f)) -(define *spawn-part-test* #t) - -(defun dm-part-pick-func ((id int) (msg debug-menu-msg)) - (if (zero? (-> *part-group-id-table* id)) - (return 'invalid)) - (when (= msg (debug-menu-msg press)) - (set! *part-tester-id* id) - (if *spawn-part-test* - (start-part) - ) - ) - (= *part-tester-id* id) - ) - -(defun build-particles-list () - (debug-menu-remove-all-items *part-pick-menu*) - (dotimes (i (-> *part-group-id-table* length)) - (let ((part (-> *part-group-id-table* i))) - (when (and (nonzero? part)) - (debug-menu-append-item *part-pick-menu* (new-dm-flag (-> part name) i dm-part-pick-func)) - ) - ) - ) - (set! (-> *part-pick-menu* items) (sort (-> *part-pick-menu* items) debug-menu-node *entity-debug-inspect* entity) e) - (set-entity! *entity-debug-inspect* (the entity #f)) - (set-entity! *entity-debug-inspect* e)) - ) - (= (-> *entity-debug-inspect* entity) e) - ) - -(defun build-entity-list () - "Fill the entity pick menu" - ;; clear old list - (debug-menu-remove-all-items *entity-pick-menu*) - ;; go through active levels - (dotimes (s5-0 (-> *level* length)) - (let ((s4-0 (-> *level* level s5-0))) - (when (= (-> s4-0 status) 'active) - ;; actor entities - (let ((s3-0 (-> s4-0 bsp actors))) - (when (nonzero? s3-0) - (dotimes (s2-0 (-> s3-0 length)) - (let ((s1-0 (-> s3-0 data s2-0 actor))) - (debug-menu-append-item *entity-pick-menu* (new-dm-flag (res-lump-struct s1-0 'name string) s1-0 dm-entity-pick-func)) - ) - ) - ) - ) - ;; ambients entities - (let ((s3-1 (-> s4-0 bsp ambients))) - (when (nonzero? s3-1) - (dotimes (s2-1 (-> s3-1 length)) - (let ((s1-1 (-> s3-1 data s2-1 ambient))) - (debug-menu-append-item *entity-pick-menu* (new-dm-flag (res-lump-struct s1-1 'name string) s1-1 dm-entity-pick-func)) - ) - ) - ) - ) - ;; camera entities - (let ((s4-1 (-> s4-0 bsp cameras))) - (when (nonzero? s4-1) - (dotimes (s3-2 (-> s4-1 length)) - (let ((s2-2 (-> s4-1 s3-2))) - (debug-menu-append-item *entity-pick-menu* (new-dm-flag (res-lump-struct s2-2 'name string) s2-2 dm-entity-pick-func)) - ) - ) - ) - ) - ) - ) - ) - (set! (-> *entity-pick-menu* items) (sort (-> *entity-pick-menu* items) debug-menu-node *entity-debug-inspect* entity) (return #f)) - (let ((tf (new 'stack 'transformq))) - (vector-copy! (-> tf trans) (-> *entity-debug-inspect* entity trans)) - (quaternion-identity! (-> tf quat)) - (vector-identity! (-> tf scale)) - (send-event *camera* 'teleport-to-transformq tf) - )))) - (debug-menu-append-item entity-menu (new-dm-func "Print entity info" #t dm-display-entities-pick-func)) - (debug-menu-append-item entity-menu (new-dm-func "Print entity info (ag)" 'art-group dm-display-entities-pick-func)) - (debug-menu-append-item entity-menu (new-dm-func "Print entity info (meters)" 'entity-meters dm-display-entities-pick-func)) - (debug-menu-append-item entity-menu (new-dm-func "Print entity info (perm)" 'entity-perm dm-display-entities-pick-func)) - - (new-dm-submenu "Entity" entity-menu) - ) - ) - -(defmacro dm-lambda-boolean-flag (val) - "helper macro for making boolean buttons that don't just access symbols directly" - `,(lambda (arg (msg debug-menu-msg)) - (if (= msg (debug-menu-msg press)) - (not! ,val) - ) - ,val) - ) - -(defmacro dm-lambda-int-var (val) - "helper macro for making int buttons" - `,(lambda (arg (msg debug-menu-msg) (newval int)) - (cond - ((= msg (debug-menu-msg press)) - (set! ,val newval) - ) - (else - ,val - ) - )) - ) - -(defmacro dm-lambda-float-var (val) - "helper macro for making float buttons" - `(lambda (arg (msg debug-menu-msg) (newval float)) - (cond - ((= msg (debug-menu-msg press)) - (set! ,val newval) - ) - (else - ,val - ) - )) - ) - -(defmacro dm-lambda-meters-var (val) - "helper macro for making meters buttons" - `,(lambda (arg (msg debug-menu-msg) (newval float)) - (cond - ((= msg (debug-menu-msg press)) - (set! ,val (meters newval)) - ) - (else - (* (1/ METER_LENGTH) ,val) - ) - )) - ) - -(defun dm-toggle-collision-pick-func ((arg symbol) (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (cond - ((-> arg value) - (false! (-> arg value)) - (logior! *vu1-enable-user-menu* (vu1-renderer-mask tfrag trans-tfrag tie tie-near)) - (true! *generic-tie*) - ) - (else - (true! (-> arg value)) - (logclear! *vu1-enable-user-menu* (vu1-renderer-mask tfrag trans-tfrag tie tie-near)) - (false! *generic-tie*) - ) - ) - ) - (-> arg value) - ) - -(defun dm-collision-mode-pick-func ((arg pc-collision-mode) (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (set! *collision-mode* arg) - ) - (= *collision-mode* arg) - ) - -(defun dm-collision-filter-mode-pick-func ((arg int) (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (pc-set-collision-mask (pc-collision-mode mode) arg (not (pc-get-collision-mask (pc-collision-mode mode) arg))) - ) - (pc-get-collision-mask (pc-collision-mode mode) arg) - ) - -(defun dm-collision-filter-event-pick-func ((arg int) (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (pc-set-collision-mask (pc-collision-mode event) arg (not (pc-get-collision-mask (pc-collision-mode event) arg))) - ) - (pc-get-collision-mask (pc-collision-mode event) arg) - ) - -(defun dm-collision-filter-material-pick-func ((arg int) (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (pc-set-collision-mask (pc-collision-mode material) arg (not (pc-get-collision-mask (pc-collision-mode material) arg))) - ) - (pc-get-collision-mask (pc-collision-mode material) arg) - ) - -(defun dm-collision-filter-skip-pick-func ((arg int) (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (pc-set-collision-mask (pc-collision-mode skip) arg (not (pc-get-collision-mask (pc-collision-mode skip) arg))) - ) - (pc-get-collision-mask (pc-collision-mode skip) arg) - ) - -(defun debug-menu-make-collision-renderer-menu ((ctx debug-menu-context)) - (let ((menu (new 'debug 'debug-menu ctx "Collision renderer menu"))) - ;; master toggle - (debug-menu-append-item menu (new-dm-bool "Enable" *collision-renderer* dm-toggle-collision-pick-func)) - (debug-menu-append-item menu (new-dm-bool "Wireframe" *collision-wireframe* dm-boolean-toggle-pick-func)) - (debug-menu-append-item menu (new-dm-submenu "Mode" - (let ((mode-menu (new 'debug 'debug-menu ctx "Collision renderer mode menu"))) - (doenum (name val pc-collision-mode) - (debug-menu-append-item mode-menu (new-dm-flag name val dm-collision-mode-pick-func)) - ) - mode-menu))) - (debug-menu-append-item menu (new-dm-submenu "Filter mode" - (let ((filter-menu (new 'debug 'debug-menu ctx "Collision renderer filter mode menu"))) - (doenum (name val pat-mode) - (debug-menu-append-item filter-menu (new-dm-flag name val dm-collision-filter-mode-pick-func)) - ) - filter-menu))) - (debug-menu-append-item menu (new-dm-submenu "Filter event" - (let ((filter-menu (new 'debug 'debug-menu ctx "Collision renderer filter event menu"))) - (doenum (name val pat-event) - (debug-menu-append-item filter-menu (new-dm-flag name val dm-collision-filter-event-pick-func)) - ) - filter-menu))) - (debug-menu-append-item menu (new-dm-submenu "Filter material" - (let ((filter-menu (new 'debug 'debug-menu ctx "Collision renderer filter material menu"))) - (doenum (name val pat-material) - (debug-menu-append-item filter-menu (new-dm-flag name val dm-collision-filter-material-pick-func)) - ) - filter-menu))) - (debug-menu-append-item menu (new-dm-submenu "Filter skip" - (let ((filter-menu (new 'debug 'debug-menu ctx "Collision renderer filter skip menu"))) - (doenum (name val pc-pat-skip-hack) - (debug-menu-append-item filter-menu (new-dm-flag name val dm-collision-filter-skip-pick-func)) - ) - filter-menu))) - - (new-dm-submenu "Collision renderer" menu) - ) - ) - -(defun dm-lod-int ((arg0 int) (arg1 debug-menu-msg) (arg2 int) (arg3 int)) - (when (= arg1 (debug-menu-msg press)) - (case (/ arg0 8) - ((0) (set! (-> *pc-settings* lod-force-tfrag) arg2)) - ((1) (set! (-> *pc-settings* lod-force-tie) arg2)) - ((2) (set! (-> *pc-settings* lod-force-ocean) arg2)) - ((3) (set! (-> *pc-settings* lod-force-actor) arg2)) - ) - ) - (case (/ arg0 8) - ((0) (-> *pc-settings* lod-force-tfrag)) - ((1) (-> *pc-settings* lod-force-tie)) - ((2) (-> *pc-settings* lod-force-ocean)) - ((3) (-> *pc-settings* lod-force-actor)) - (else arg3) - ) - ) - -(defun dm-subtitle-language ((blang int) (msg debug-menu-msg)) - (let ((lang (the pc-subtitle-lang (/ blang 8)))) - (when (= msg (debug-menu-msg press)) - (set! (-> *pc-settings* subtitle-language) lang)) - (= (-> *pc-settings* subtitle-language) lang) - ) - ) - -(defun dm-text-language ((blang int) (msg debug-menu-msg)) - (let ((lang (the pc-subtitle-lang (/ blang 8)))) - (when (= msg (debug-menu-msg press)) - (set! (-> *pc-settings* text-language) lang)) - (= (-> *pc-settings* text-language) lang) - ) - ) - -(defun dm-subtitle-setting ((setting symbol) (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (set! (-> *pc-settings* subtitle-speaker?) setting)) - (= (-> *pc-settings* subtitle-speaker?) setting) - ) - -(defun dm-mood-override-palette-pick-func ((bpal int) (msg debug-menu-msg)) - (let* ((pal (/ bpal 8)) - (cur-val (-> *pc-settings* mood-overrides pal))) - - (when (= msg (debug-menu-msg press)) - (set! (-> *pc-settings* mood-overrides pal) (if (= cur-val 0.0) 1.0 0.0)) - - (when (not (= 'mult (-> *pc-settings* mood-override?))) - (set! (-> *pc-settings* mood-override?) #f) - (dotimes (i 8) - (if (!= (-> *pc-settings* mood-overrides i) 0.0) - (set! (-> *pc-settings* mood-override?) 'copy))) - )) - - (= (-> *pc-settings* mood-overrides pal) 1.0) - ) - ) - -(defun dm-mood-override-pick-func ((kind symbol) (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (if (= kind (-> *pc-settings* mood-override?)) - (set! (-> *pc-settings* mood-override?) #f) - (set! (-> *pc-settings* mood-override?) kind))) - (= kind (-> *pc-settings* mood-override?)) - ) - -(defun dm-mood-palette-float ((pal int) (arg1 debug-menu-msg) (newval float) (val float)) - (when (= arg1 (debug-menu-msg press)) - (set! (-> *pc-settings* mood-overrides (/ pal 8)) newval)) - (-> *pc-settings* mood-overrides (/ pal 8)) - ) - -(defun dm-anim-tester-x-flag-func ((action symbol) (msg debug-menu-msg)) - (case action - (('at-show-joint-info) - (if (= msg (debug-menu-msg press)) - (logxor! (-> *ATX-settings* flags) (atx-flags show-joints))) - (return (logtest? (-> *ATX-settings* flags) (atx-flags show-joints))) - ) - ) - #f) - -(defun dm-anim-tester-x-func ((action symbol)) - (unless *atx* - (atx-start)) - - (case action - (('pick-art-group) - (set! (-> *atx* 0 edit-mode) (atx-edit-mode art-group)) - (false! *camera-read-buttons*) - ) - (('at-pick-joint-anim) - (when (-> *atx* 0 cur-art-group) - (set! (-> *atx* 0 edit-mode) (atx-edit-mode anim)) - (false! *camera-read-buttons*) - ) - ) - (('pick-mesh-geo) - (when (-> *atx* 0 cur-art-group) - (set! (-> *atx* 0 edit-mode) (atx-edit-mode mgeo)) - (false! *camera-read-buttons*) - ) - ) - (('pick-joint-geo) - (when (-> *atx* 0 cur-art-group) - (set! (-> *atx* 0 edit-mode) (atx-edit-mode jgeo)) - (false! *camera-read-buttons*) - ) - ) - (('at-cam-free-floating) - (send-event *camera* 'change-state cam-free-floating 0) - ) - (('at-cam-orbit) - (send-event *camera* 'change-state cam-orbit 0) - ) - ) - 0) - -(defun debug-menu-make-anim-tester-x-menu ((ctx debug-menu-context)) - (let ((menu (new 'debug 'debug-menu ctx "Anim Tester X menu"))) - ;; master toggle - (debug-menu-append-item menu (new-dm-func "Start" #f atx-start)) - (debug-menu-append-item menu (new-dm-func "Stop" #f atx-stop)) - (debug-menu-append-item menu (new-dm-var-float "Speed" (the int #f) (dm-lambda-float-var (-> *ATX-settings* speed)) 0.01 -10.0 10.0)) - (debug-menu-append-item menu (new-dm-var-float "Frame Num" (the int #f) (dm-lambda-float-var (-> *ATX-settings* frame-num)) 0.1 0.0 99999.0)) - (debug-menu-append-item menu (new-dm-func "Pick Art Group" 'pick-art-group dm-anim-tester-x-func)) - (debug-menu-append-item menu (new-dm-func "Pick Anim" 'at-pick-joint-anim dm-anim-tester-x-func)) - (debug-menu-append-item menu (new-dm-func "Pick Mesh" 'pick-mesh-geo dm-anim-tester-x-func)) - (debug-menu-append-item menu (new-dm-func "Pick Skeleton" 'pick-joint-geo dm-anim-tester-x-func)) - (debug-menu-append-item menu (new-dm-flag "Show Joint Info" 'at-show-joint-info dm-anim-tester-x-flag-func)) - (debug-menu-append-item menu (new-dm-func "Free Floating cam" 'at-cam-free-floating dm-anim-tester-x-func)) - (debug-menu-append-item menu (new-dm-func "Orbit cam" 'at-cam-orbit dm-anim-tester-x-func)) - - (new-dm-submenu "Anim Tester X" menu) - ) - ) - -(defun dm-music-player-func ((lst object)) - (kill-by-name 'dm-player *active-pool*) - (set! *progress-flava* -1) - (process-spawn-function process :name 'dm-player - (lambda :behavior process ((lst pair)) - (loop - (suspend) - (set-setting! 'music (the-as symbol (car lst)) 0.0 0) - (set! *progress-flava* (the-as int (cdr lst))) - ) - ) - lst - ) - ) - -(defun debug-menu-make-music-player-menu ((ctx debug-menu-context)) - (let ((music-menu (new 'debug 'debug-menu ctx "Music player menu"))) - (dotimes (i (-> *music-flava-name-list* length)) - (let* ((flava-list (-> *music-flava-name-list* i)) - (level-name (new 'debug 'string 30 (game-text-id->string (-> flava-list 0)))) - (lvl-menu (new 'debug 'debug-menu ctx (the-as string #f))) - ) - (dotimes (j (-> flava-list length)) - (let ((flava-name (new 'debug 'string 30 (game-text-id->string (-> flava-list j))))) - (when (and (string= (substring! *temp-string* level-name (- (length level-name) 11) (length level-name)) "-level-name") - (string= (substring! *temp-string* flava-name (- (length flava-name) 11) (length flava-name)) "-level-name")) - (copy-string<-string flava-name (symbol->string (ref *music-list* i))) - ) - (unless (string= flava-name "zero") - (debug-menu-append-item lvl-menu (new-dm-func flava-name (dcons (ref *music-list* i) j) dm-music-player-func)) - ) - ) - ) - (let ((menu-name (new 'debug 'string 30 (symbol->string (ref *music-list* i))))) - (debug-menu-append-item music-menu (new-dm-submenu menu-name lvl-menu)) - ) - ) - ) - (debug-menu-append-item music-menu (new-dm-func "Reset" #f (lambda () (kill-by-name 'dm-player *active-pool*) (set! *progress-flava* -1)))) - (new-dm-submenu "Music player" music-menu) - ) - ) - -(when (-> *debug-menu-context* root-menu) - (debug-menu-append-item (-> *debug-menu-context* root-menu) (debug-menu-make-load-menu *debug-menu-context*)) - (debug-menu-append-item (-> *debug-menu-context* root-menu) (debug-menu-make-part-menu *debug-menu-context*)) - (debug-menu-append-item (-> *debug-menu-context* root-menu) (debug-menu-make-entity-menu *debug-menu-context*)) - ;; Scene menu TODO - - (debug-menu-append-item (-> *debug-menu-context* root-menu) - (debug-menu-make-from-template *debug-menu-context* - '(menu "PC Settings" - (flag "Debug" #f ,(dm-lambda-boolean-flag (-> *pc-settings* debug?))) - (flag "Use native vis" #f ,(dm-lambda-boolean-flag (-> *pc-settings* use-vis?))) - (function "Toggle game aspect" #f ,(lambda () - (cond - ((= (-> *setting-control* default aspect-ratio) 'aspect4x3) - (set! (-> *setting-control* default aspect-ratio) 'aspect16x9) - ) - (else - (set! (-> *setting-control* default aspect-ratio) 'aspect4x3) - ) - ) - (set-aspect-ratio (-> *setting-control* default aspect-ratio)) - )) - (flag "Auto aspect" #f ,(dm-lambda-boolean-flag (-> *pc-settings* aspect-ratio-auto?))) - (menu "Aspect test" - (function "4 x 3" #f ,(lambda () (set-aspect! *pc-settings* 4 3))) - (function "16 x 9" #f ,(lambda () (set-aspect! *pc-settings* 16 9))) - (function "64 x 27 (21:9)" #f ,(lambda () (set-aspect! *pc-settings* 64 27))) - (function "16 x 10" #f ,(lambda () (set-aspect! *pc-settings* 16 10))) - (function "2 x 1" #f ,(lambda () (set-aspect! *pc-settings* 2 1))) - (function "37 x 20" #f ,(lambda () (set-aspect! *pc-settings* 37 20))) - (function "21 x 9" #f ,(lambda () (set-aspect! *pc-settings* 21 9))) - (function "64 x 18" #f ,(lambda () (set-aspect! *pc-settings* 64 18))) - (int-var "Custom aspect X" #f ,(dm-lambda-int-var (-> *pc-settings* aspect-custom-x)) 20 1 #t 1 1000) - (int-var "Custom aspect Y" #f ,(dm-lambda-int-var (-> *pc-settings* aspect-custom-y)) 20 1 #t 1 1000) - (function "Custom" #f ,(lambda () (set-aspect! *pc-settings* (-> *pc-settings* aspect-custom-x) (-> *pc-settings* aspect-custom-y)))) - ) - (menu "Fullscreen" - (function "Windowed" #f ,(lambda () (set-display-mode! *pc-settings* 'windowed))) - (function "Fullscreen" #f ,(lambda () (set-display-mode! *pc-settings* 'fullscreen))) - (function "Borderless" #f ,(lambda () (set-display-mode! *pc-settings* 'borderless))) - ) - (menu "Sizes" - (function "640 x 480" #f ,(lambda () (set-size! *pc-settings* 640 480))) - (function "640 x 360" #f ,(lambda () (set-size! *pc-settings* 640 360))) - (function "720 x 540" #f ,(lambda () (set-size! *pc-settings* 720 540))) - (function "960 x 540" #f ,(lambda () (set-size! *pc-settings* 960 540))) - (function "800 x 600" #f ,(lambda () (set-size! *pc-settings* 800 600))) - (function "960 x 720" #f ,(lambda () (set-size! *pc-settings* 960 720))) - (function "1280 x 720" #f ,(lambda () (set-size! *pc-settings* 1280 720))) - (function "1024 x 768" #f ,(lambda () (set-size! *pc-settings* 1024 768))) - (function "1366 x 768" #f ,(lambda () (set-size! *pc-settings* 1366 768))) - (function "1280 x 960" #f ,(lambda () (set-size! *pc-settings* 1280 960))) - (function "1440 x 1080" #f ,(lambda () (set-size! *pc-settings* 1440 1080))) - (function "1920 x 1080" #f ,(lambda () (set-size! *pc-settings* 1920 1080))) - (function "1920 x 1440" #f ,(lambda () (set-size! *pc-settings* 1920 1440))) - (function "2560 x 1440" #f ,(lambda () (set-size! *pc-settings* 2560 1440))) - (function "2880 x 2160" #f ,(lambda () (set-size! *pc-settings* 2880 2160))) - (function "3840 x 2160" #f ,(lambda () (set-size! *pc-settings* 3840 2160))) - (function "512 x 224" #f ,(lambda () (set-size! *pc-settings* 512 224))) - (function "512 x 256" #f ,(lambda () (set-size! *pc-settings* 512 256))) - (function "512 x 448" #f ,(lambda () (set-size! *pc-settings* 512 448))) - (function "512 x 512" #f ,(lambda () (set-size! *pc-settings* 512 512))) - ) - (menu "Secrets" - (menu "PC cheats" - (flag "Big head jak" #f ,(lambda (arg (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) big-head) - ) - (pc-cheats? (-> *pc-settings* cheats) big-head))) - (flag "Small head jak" #f ,(lambda (arg (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) small-head) - ) - (pc-cheats? (-> *pc-settings* cheats) small-head))) - (flag "Big fist jak" #f ,(lambda (arg (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) big-fist) - ) - (pc-cheats? (-> *pc-settings* cheats) big-fist))) - (flag "Big head npcs" #f ,(lambda (arg (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) big-head-npc) - ) - (pc-cheats? (-> *pc-settings* cheats) big-head-npc))) - (flag "Huge head jak" #f ,(lambda (arg (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) huge-head) - ) - (pc-cheats? (-> *pc-settings* cheats) huge-head))) - (flag "Mirrored mode" #f ,(lambda (arg (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) mirror) - ) - (pc-cheats? (-> *pc-settings* cheats) mirror))) - (flag "Blue eco" #f ,(lambda (arg (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (logclear! (-> *pc-settings* cheats) (pc-cheats eco-red eco-yellow eco-green)) - (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) eco-blue) - ) - (pc-cheats? (-> *pc-settings* cheats) eco-blue))) - (flag "Red eco" #f ,(lambda (arg (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (logclear! (-> *pc-settings* cheats) (pc-cheats eco-blue eco-yellow eco-green)) - (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) eco-red) - ) - (pc-cheats? (-> *pc-settings* cheats) eco-red))) - (flag "Green eco" #f ,(lambda (arg (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (logclear! (-> *pc-settings* cheats) (pc-cheats eco-red eco-yellow eco-blue)) - (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) eco-green) - ) - (pc-cheats? (-> *pc-settings* cheats) eco-green))) - (flag "Yellow eco" #f ,(lambda (arg (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (logclear! (-> *pc-settings* cheats) (pc-cheats eco-red eco-blue eco-green)) - (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) eco-yellow) - ) - (pc-cheats? (-> *pc-settings* cheats) eco-yellow))) - (flag "Invincibility" #f ,(lambda (arg (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (logclear! (-> *target* state-flags) 16) - (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) invinc) - ) - (pc-cheats? (-> *pc-settings* cheats) invinc))) - (flag "Blue sidekick" #f ,(lambda (arg (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) sidekick-blue) - ) - (pc-cheats? (-> *pc-settings* cheats) sidekick-blue))) - (flag "All flavas" #f ,(lambda (arg (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) tunes) - ) - (pc-cheats? (-> *pc-settings* cheats) tunes))) - (flag "Real time tod" #f ,(lambda (arg (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) sky) - ) - (pc-cheats? (-> *pc-settings* cheats) sky))) - (flag "No textures" #f ,(lambda (arg (msg debug-menu-msg)) - (when (= msg (debug-menu-msg press)) - (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) no-tex) - ) - (pc-cheats? (-> *pc-settings* cheats) no-tex))) -;; (flag "Hard rats" #f ,(lambda (arg (msg debug-menu-msg)) -;; (when (= msg (debug-menu-msg press)) -;; (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) hard-rats) -;; ) -;; (pc-cheats? (-> *pc-settings* cheats) hard-rats))) -;; (flag "Hero mode" #f ,(lambda (arg (msg debug-menu-msg)) -;; (when (= msg (debug-menu-msg press)) -;; (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) hero-mode) -;; ) -;; (pc-cheats? (-> *pc-settings* cheats) hero-mode))) - ) - ) - (flag "Letterbox" #f ,(dm-lambda-boolean-flag (-> *pc-settings* letterbox?))) - (flag "Skip movies" #f ,(dm-lambda-boolean-flag (-> *pc-settings* skip-movies?))) - (flag "Money starburst" #f ,(dm-lambda-boolean-flag (-> *pc-settings* money-starburst?))) - (flag "Subtitles" #f ,(dm-lambda-boolean-flag (-> *pc-settings* subtitles?))) - (flag "Hinttitles" #f ,(dm-lambda-boolean-flag (-> *pc-settings* hinttitles?))) - (menu "Subtitle speaker" - (flag "Off" #f dm-subtitle-setting) - (flag "On" #t dm-subtitle-setting) - (flag "Auto" auto dm-subtitle-setting) - ) - (menu "Subtitle language" - (flag "english" 0 dm-subtitle-language) - (flag "french" 1 dm-subtitle-language) - (flag "german" 2 dm-subtitle-language) - (flag "spanish" 3 dm-subtitle-language) - (flag "uk-english" 6 dm-subtitle-language) - (flag "br-portuguese" 13 dm-subtitle-language) - ) - (menu "Text language" - (flag "english" 0 dm-text-language) - (flag "french" 1 dm-text-language) - (flag "german" 2 dm-text-language) - (flag "spanish" 3 dm-text-language) - (flag "italian" 4 dm-text-language) - (flag "japanese" 5 dm-text-language) - (flag "uk-english" 6 dm-text-language) - (flag "br-portuguese" 13 dm-text-language) - (flag "hungarian" 14 dm-text-language) - ) - (flag "Discord RPC" #t ,(dm-lambda-boolean-flag (-> *pc-settings* discord-rpc?))) - (flag "Speedrunner Mode" #t ,(dm-lambda-boolean-flag (-> *pc-settings* speedrunner-mode?))) - (menu "PS2 settings" - ;(flag "PS2 Load speed" #f ,(dm-lambda-boolean-flag (-> *pc-settings* ps2-read-speed?))) - (flag "PS2 Particles" #f ,(dm-lambda-boolean-flag (-> *pc-settings* ps2-parts?))) - ;(flag "PS2 Music" #f ,(dm-lambda-boolean-flag (-> *pc-settings* ps2-music?))) - ;(flag "PS2 Sound effects" #f ,(dm-lambda-boolean-flag (-> *pc-settings* ps2-se?))) - ;(flag "PS2 Hints" #f ,(dm-lambda-boolean-flag (-> *pc-settings* ps2-hints?))) - ) - (menu "Level of detail" - (flag "PS2 LOD " #f ,(dm-lambda-boolean-flag (-> *pc-settings* ps2-lod-dist?))) - (flag "Force Envmap" #f ,(dm-lambda-boolean-flag (-> *pc-settings* force-envmap?))) - (int-var "LOD Tfrag" 0 dm-lod-int 0 1 #t 0 2) - (int-var "LOD Tie" 1 dm-lod-int 0 1 #t 0 3) - ;(int-var "LOD Ocean" 2 dm-lod-int 0 1 #t 0 3) - (int-var "LOD Actor" 3 dm-lod-int 0 1 #t 0 3) - (function "Best quality" #f ,(lambda () (set! (-> *pc-settings* lod-force-tfrag) 0) - (set! (-> *pc-settings* lod-force-tie) 0) - ;(set! (-> *pc-settings* lod-force-ocean) 0) - (set! (-> *pc-settings* lod-force-actor) 0) - )) - (function "Worst quality" #f ,(lambda () (set! (-> *pc-settings* lod-force-tfrag) 2) - (set! (-> *pc-settings* lod-force-tie) 3) - ;(set! (-> *pc-settings* lod-force-ocean) 2) - (set! (-> *pc-settings* lod-force-actor) 3) - )) - ) - (menu "Framerate" - (flag "60" #f ,(lambda (arg (msg debug-menu-msg)) (when (= msg (debug-menu-msg press)) (set-frame-rate! *pc-settings* 60)) - (= (-> *pc-settings* target-fps) 60))) - (flag "100" #f ,(lambda (arg (msg debug-menu-msg)) (when (= msg (debug-menu-msg press)) (set-frame-rate! *pc-settings* 100)) - (= (-> *pc-settings* target-fps) 100))) - (flag "150" #f ,(lambda (arg (msg debug-menu-msg)) (when (= msg (debug-menu-msg press)) (set-frame-rate! *pc-settings* 150)) - (= (-> *pc-settings* target-fps) 150))) - ) - (menu "MSAA" - (flag "Off" #f ,(lambda (arg (msg debug-menu-msg)) (when (= msg (debug-menu-msg press)) (set! (-> *pc-settings* gfx-msaa) 1)) - (= (-> *pc-settings* gfx-msaa) 1))) - (flag "x2" #f ,(lambda (arg (msg debug-menu-msg)) (when (= msg (debug-menu-msg press)) (set! (-> *pc-settings* gfx-msaa) 2)) - (= (-> *pc-settings* gfx-msaa) 2))) - (flag "x4" #f ,(lambda (arg (msg debug-menu-msg)) (when (= msg (debug-menu-msg press)) (set! (-> *pc-settings* gfx-msaa) 4)) - (= (-> *pc-settings* gfx-msaa) 4))) - (flag "x8" #f ,(lambda (arg (msg debug-menu-msg)) (when (= msg (debug-menu-msg press)) (set! (-> *pc-settings* gfx-msaa) 8)) - (= (-> *pc-settings* gfx-msaa) 8))) - (flag "x16" #f ,(lambda (arg (msg debug-menu-msg)) (when (= msg (debug-menu-msg press)) (set! (-> *pc-settings* gfx-msaa) 16)) - (= (-> *pc-settings* gfx-msaa) 16))) - ) - (flag "V-sync" #f ,(dm-lambda-boolean-flag (-> *pc-settings* vsync?))) - ;(flag "Alt load boundaries" #f ,(dm-lambda-boolean-flag (-> *pc-settings* new-lb?))) - (flag "All actors" #f ,(dm-lambda-boolean-flag (-> *pc-settings* force-actors?))) - (flag "Display actor counts" #f ,(dm-lambda-boolean-flag (-> *pc-settings* display-actor-counts))) - (flag "Display git commit" #f ,(dm-lambda-boolean-flag (-> *pc-settings* display-sha))) - (flag "Extra hud elements" #f ,(dm-lambda-boolean-flag (-> *pc-settings* extra-hud?))) - (flag "Music fadein" #f ,(dm-lambda-boolean-flag (-> *pc-settings* music-fadein?))) - (flag "Music fadeout" #f ,(dm-lambda-boolean-flag (-> *pc-settings* music-fadeout?))) - (function "Reset" #f ,(lambda () (reset *pc-settings*))) - (function "Save" #f ,(lambda () (commit-to-file *pc-settings*))) - (function "Load" #f ,(lambda () (load-settings *pc-settings*))) - ) - ) - ) - (let* ((prog-menu (new 'debug 'debug-menu *debug-menu-context* "Progress menu")) - (prog-menu-node (new-dm-submenu "Progress" prog-menu)) - (other-menu-node - (debug-menu-make-from-template *debug-menu-context* - '(menu "Other" - (flag "DECI Count" *display-deci-count* dm-boolean-toggle-pick-func) - ;(flag "Actor graph" *display-actor-graph* dm-boolean-toggle-pick-func) - (flag "Update vis outside bsp" *update-leaf-when-outside-bsp* dm-boolean-toggle-pick-func) - (flag "Pad display" #f ,(dm-lambda-boolean-flag (-> *pc-settings* debug-pad-display))) - (flag "Display actor bank" #f ,(dm-lambda-boolean-flag (-> *pc-settings* display-actor-bank))) - (flag "Heap status" #f ,(dm-lambda-boolean-flag (-> *pc-settings* display-heap-status))) - (flag "Bug report" #f ,(dm-lambda-boolean-flag (-> *pc-settings* display-bug-report))) - (flag "Text boxes" #f ,(dm-lambda-boolean-flag (-> *pc-settings* display-text-box))) - (flag "Sidekick stats" *display-sidekick-stats* dm-boolean-toggle-pick-func) - (float-var "Actor birth dist" #f ,(dm-lambda-meters-var (-> *ACTOR-bank* birth-dist)) 20 1 #t 0 10000 1) - (float-var "Actor pause dist" #f ,(dm-lambda-meters-var (-> *ACTOR-bank* pause-dist)) 20 1 #t 0 10000 1) - (menu "Mood override" - (function "-- SIMPLE OVERRIDE" #f nothing) - (flag "Palette 0" 0 dm-mood-override-palette-pick-func) - (flag "Palette 1" 1 dm-mood-override-palette-pick-func) - (flag "Palette 2" 2 dm-mood-override-palette-pick-func) - (flag "Palette 3" 3 dm-mood-override-palette-pick-func) - (flag "Palette 4" 4 dm-mood-override-palette-pick-func) - (flag "Palette 5" 5 dm-mood-override-palette-pick-func) - (flag "Palette 6" 6 dm-mood-override-palette-pick-func) - (flag "Palette 7" 7 dm-mood-override-palette-pick-func) - (menu "Advanced" - (flag "Overwrite" copy dm-mood-override-pick-func) - (flag "Multiply" mult dm-mood-override-pick-func) - (float-fixed-var "Palette 0 Amt" 0 dm-mood-palette-float 0 10 #t 0 1000 3) - (float-fixed-var "Palette 1 Amt" 1 dm-mood-palette-float 0 10 #t 0 1000 3) - (float-fixed-var "Palette 2 Amt" 2 dm-mood-palette-float 0 10 #t 0 1000 3) - (float-fixed-var "Palette 3 Amt" 3 dm-mood-palette-float 0 10 #t 0 1000 3) - (float-fixed-var "Palette 4 Amt" 4 dm-mood-palette-float 0 10 #t 0 1000 3) - (float-fixed-var "Palette 5 Amt" 5 dm-mood-palette-float 0 10 #t 0 1000 3) - (float-fixed-var "Palette 6 Amt" 6 dm-mood-palette-float 0 10 #t 0 1000 3) - (float-fixed-var "Palette 7 Amt" 7 dm-mood-palette-float 0 10 #t 0 1000 3) - ) - ) - (flag "Joint names" *display-joint-names* dm-boolean-toggle-pick-func) - (flag "Bone lines" *display-bones* dm-boolean-toggle-pick-func) - ) - )) - (other-menu (-> (the-as debug-menu-item-submenu other-menu-node) submenu)) - ) - (dotimes (i (progress-screen max)) - (debug-menu-append-item prog-menu - (new-dm-func (new 'debug 'string 0 (enum->string progress-screen i)) i - (lambda ((val progress-screen)) - (activate-progress *dproc* val) - (set-master-mode 'progress) - ) - )) - ) - (debug-menu-append-item other-menu prog-menu-node) - - (debug-menu-append-item (-> *debug-menu-context* root-menu) other-menu-node) - ) - - (debug-menu-append-item (-> (the debug-menu-item-submenu (ref (-> *debug-menu-context* root-menu items) 4)) submenu) - (debug-menu-make-collision-renderer-menu *debug-menu-context*)) - - (debug-menu-append-item (-> (the debug-menu-item-submenu (car (-> *debug-menu-context* root-menu items))) submenu) - (debug-menu-make-anim-tester-x-menu *debug-menu-context*)) - - (debug-menu-append-item (-> (the debug-menu-item-submenu (ref (-> (the debug-menu-item-submenu (ref (-> *debug-menu-context* root-menu items) 19)) submenu items) 7)) submenu) - (debug-menu-make-music-player-menu *debug-menu-context*)) - - ) - -(defun bg-custom ((level-name symbol)) - "Modified version of bg for the PC Port custom levels." - - ;; lookup info - (format 0 "(bg-custom ~A)%" level-name) - (let ((lev-info (lookup-level-info level-name))) - (when (= lev-info default-level) - (format 0 "Unable to (bg-custom ~A), the level was not found in *level-load-list*~%" level-name) - (return #f) - ) - - ;; kill jak (rip) - (format 0 "doing stop~%") - (stop 'play) - - ;; kill levels - (dotimes (i 2) - (unload! (-> *level* data i)) - ) - - ;; enable visiblity. the custom level won't use it, but we want it on so other levels can be loaded. - (set! (-> *level* vis?) #t) - - ;; disable border and play mode to prevent loading levels - (set! (-> *level* border?) #f) - (set! (-> *setting-control* default border-mode) #f) - (set! (-> *level* play?) #f) - - ;; disable actor vis - (set! *vis-actors* #f) - - (format 0 "doing level load~%") - ;; allocate level. This may start the loading process, but won't finish it. - (let ((lev (level-get-for-use *level* level-name 'active))) - (when (not lev) - (format 0 "Unable to load level, could not level-get-for-use~%") - (return #f) - ) - (format 0 "about to start load loop, game will freeze and hopefully come back soon~%") - - ;; spin in a loop and load it. This will cause the game to freeze during the load, - ;; but this is good enough for now. - (while (or (= (-> lev status) 'loading) - (= (-> lev status) 'loading-bt) - (= (-> lev status) 'login) - ) - (load-continue lev) - ) - - (when (not (-> lev info continues)) - (format 0 "level info has no continues, can't load it.~%") - ) - - (let ((cont (car (-> lev info continues)))) - (start 'play (the continue-point cont)) - ) - - (vis-load lev) - (set! (-> lev all-visible?) #f) - (set! (-> lev force-all-visible?) #t) - - ;; reset things - ;(initialize! *game-info* 'game (the-as game-save #f) (the-as string #f)) - ) - ) - ) - -) - -) diff --git a/goal_src/jak1/engine/debug/memory-usage.gc b/goal_src/jak1/engine/debug/memory-usage.gc index beaa52dfb3..a0786706d0 100644 --- a/goal_src/jak1/engine/debug/memory-usage.gc +++ b/goal_src/jak1/engine/debug/memory-usage.gc @@ -9,7 +9,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (defmethod inspect memory-usage-block ((obj memory-usage-block)) "Print the memory-usage by category. This is a large print." @@ -538,7 +538,5 @@ ) -) - diff --git a/goal_src/jak1/engine/debug/menu.gc b/goal_src/jak1/engine/debug/menu.gc index 271957f92d..e01135db35 100644 --- a/goal_src/jak1/engine/debug/menu.gc +++ b/goal_src/jak1/engine/debug/menu.gc @@ -14,7 +14,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (declare-type debug-menu basic) (declare-type debug-menu-item basic) @@ -1511,7 +1511,5 @@ arg0 ) -) - diff --git a/goal_src/jak1/engine/debug/part-tester.gc b/goal_src/jak1/engine/debug/part-tester.gc index ee53b6a5e1..7372c56107 100644 --- a/goal_src/jak1/engine/debug/part-tester.gc +++ b/goal_src/jak1/engine/debug/part-tester.gc @@ -13,7 +13,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (defpartgroup group-part-tester :id 105 :bounds (static-bspherem 0 0 0 1) :parts ((sp-item 56) (sp-item 57))) (deftype part-tester (process) @@ -120,7 +120,5 @@ (none) ) -) - diff --git a/goal_src/jak1/engine/dma/dma-disasm.gc b/goal_src/jak1/engine/dma/dma-disasm.gc index 81d3bb1655..4163df67e8 100644 --- a/goal_src/jak1/engine/dma/dma-disasm.gc +++ b/goal_src/jak1/engine/dma/dma-disasm.gc @@ -6,6 +6,7 @@ ;; dgos: GAME, ENGINE ;; Debug tool to print out a DMA list. +(declare-file (debug)) (deftype vif-disasm-element (structure) ((mask uint32 :offset-assert 0) diff --git a/goal_src/jak1/engine/entity/entity.gc b/goal_src/jak1/engine/entity/entity.gc index 8392e3507f..acbb55ba5d 100644 --- a/goal_src/jak1/engine/entity/entity.gc +++ b/goal_src/jak1/engine/entity/entity.gc @@ -1890,232 +1890,4 @@ ) ) -(#when PC_PORT - -(when *debug-segment* - ;; temporary string. - (define *debug-temp-string* (new 'debug 'string 4096 (the string #f))) - ) - -;; custom entity functions for pc port -(defun-debug entity-inspect-draw ((inspect-info entity-debug-inspect)) - "draw text about an entity on screen" - - (update-pad inspect-info 0) - (let* ((e (-> inspect-info entity)) (name (res-lump-struct e 'name string))) - (set! *display-actor-anim* (the string (and (-> inspect-info show-actor-info) name))) - ;; draw trans - (add-debug-x #t (bucket-id debug-no-zbuf) (-> e trans) (static-rgba 255 255 0 128)) - (if (or (not (-> inspect-info show-actor-info)) (!= (-> e type) entity-actor) (and (= (-> e type) entity-actor) (not (-> (the entity-actor e) extra process)))) - (add-debug-text-3d #t (bucket-id debug-no-zbuf) name (-> e trans) (font-color red) (new 'static 'vector2h :y 8))) - - ;; start writing text - (let* ((begin-y (- 16 (* (-> inspect-info scroll-y) 8))) (cur-y begin-y) (y-adv 8)) - (with-dma-buffer-add-bucket ((debug-buf (-> (current-frame) debug-buf)) - (bucket-id debug-no-zbuf)) - ;; basic info, actor id, etc - (draw-string-xy - (string-format "~3L~A~0L ~A~%tags: ~D size: ~D aid: #x~x~%R1/L1 scroll L3 toggle display-actor-info~%--------------------" (-> e type) name (length e) (asize-of e) (-> e aid)) - debug-buf 352 cur-y (font-color default) (font-flags shadow kerning middle)) - (+! cur-y (* 8 4)) - (cond - ((type-type? (-> e type) entity-actor) - (let ((actor (the entity-actor e))) - ;; print info for entity-actors - (draw-string-xy - (string-format "etype: ~A~%nav: ~A vis: ~D task: ~S" (-> actor etype) (!= #f (-> actor nav-mesh)) (-> actor vis-id) (game-task->string (-> actor task))) - debug-buf 352 cur-y (font-color default) (font-flags shadow kerning middle)) - (+! cur-y (* 8 2)) - ) - ) - ) - - ;; draw each tag in entity - (dotimes (i (length e)) - (let ((data (get-tag-index-data e i))) - - ;; tag info - (format (clear *debug-temp-string*) "~3L~2D)~0L ~20L~A~0L:" i (-> e tag i name) (-> e tag i elt-type)) - - ;; tag data - special cases first - (cond - ;; some water-height info - ((and (= (-> e tag i name) 'water-height) (= (-> e tag i elt-count) 4) (= (-> e tag i elt-type) float)) - (+! y-adv (* 8 1)) - (format *debug-temp-string* " ~mm ~mm ~mm~%(~S)" - (-> (the (pointer float) data) 0) - (-> (the (pointer float) data) 1) - (-> (the (pointer float) data) 2) - (begin (bit-enum->string water-flags (the int (-> (the (pointer float) data) 3)) (clear *temp-string*)) *temp-string*) - ) - ) - ;; some water-height info but with 5 elts - ((and (= (-> e tag i name) 'water-height) (= (-> e tag i elt-count) 4) (= (-> e tag i elt-type) float)) - (+! y-adv (* 8 2)) - (format *debug-temp-string* " ~mm ~mm ~mm~%(~S)~%~mm" - (-> (the (pointer float) data) 0) - (-> (the (pointer float) data) 1) - (-> (the (pointer float) data) 2) - (begin (bit-enum->string water-flags (the int (-> (the (pointer float) data) 3)) (clear *temp-string*)) *temp-string*) - (-> (the (pointer float) data) 4) - ) - ) - ;; music flava (music ambients) - ((and (= (-> e tag i name) 'flava) (= (-> e tag i elt-count) 1) (= (-> e tag i elt-type) int32)) - (format *debug-temp-string* " (music-flava ~S)" (music-flava->string (-> (the (pointer music-flava) data) 0))) - ) - ;; text id (can be hint ambient) - ((and (= (-> e tag i name) 'text-id) (= (-> e tag i elt-count) 1) (= (-> e tag i elt-type) int32)) - (format *debug-temp-string* " (game-text-id ~S)" (game-text-id->string (-> (the (pointer game-text-id) data) 0))) - ) - ;; eco-info, like in vents, crates, or collectables in general - ((and (= (-> e tag i name) 'eco-info) (= (-> e tag i elt-count) 2) (= (-> e tag i elt-type) int32)) - (format *debug-temp-string* " ~S " (pickup-type->string (the-as pickup-type (-> (the (pointer int32) data) 0)))) - (if (= (pickup-type fuel-cell) (-> (the (pointer int32) data) 0)) - (format *debug-temp-string* "~S" (game-task->string (the-as game-task (-> (the (pointer int32) data) 1)))) - (format *debug-temp-string* "~D" (-> (the (pointer int32) data) 1)) - ) - (if (= (pickup-type buzzer) (-> (the (pointer int32) data) 0)) - (format *debug-temp-string* " ~S" (game-task->string (the-as game-task (logand #xffff (-> (the (pointer int32) data) 1))))) - ) - ) - ;; fact options, usually enemies or crates - ((and (= (-> e tag i name) 'options) (= (-> e tag i elt-count) 1) (= (-> e tag i elt-type) uint32)) - (format *debug-temp-string* " (fact-options ") - (bit-enum->string fact-options (-> (the (pointer uint32) data) 0) *debug-temp-string*) - (format *debug-temp-string* ")") - ) - ;; these can be displayed visually with other tools. - ((and (= (-> e tag i name) 'visvol) (= (-> e tag i elt-count) 2) (= (-> e tag i elt-type) vector)) - (format *debug-temp-string* " display actor-vis!") - ) - ((and (= (-> e tag i name) 'path) (= (-> e tag i elt-type) vector)) - (format *debug-temp-string* " display path marks!") - ) - ((and (= (-> e tag i name) 'vol) (= (-> e tag i elt-type) vector)) - (format *debug-temp-string* " display vol marks!") - ) - (else - ;; more generic tag info - (dotimes (ii (-> e tag i elt-count)) - (format *debug-temp-string* " ") - (case (-> e tag i elt-type) - ((string symbol type) - (format *debug-temp-string* "~A" (-> (the (pointer basic) data) ii))) - ((float) - (case (-> e tag i name) - ;; meters are better here - (('spring-height 'vis-dist 'height-info 'distance 'cam-notice-dist 'cam-vert 'cam-horz 'idle-distance - 'nearest-y-threshold 'center-point 'center-radius 'notice-dist 'trigger-height 'notice-top) - (format *debug-temp-string* "~mm" (-> (the (pointer float) data) ii)) - ) - ;; degrees are better for these - (('rotoffset 'fov 'rotmin 'rotmax 'tiltmin 'tiltmax 'rotspeed) - (format *debug-temp-string* "~rdeg" (-> (the (pointer float) data) ii)) - ) - (else - (format *debug-temp-string* "~f" (-> (the (pointer float) data) ii)) - ) - ) - ) - ((int8) (format *debug-temp-string* "~D" (-> (the (pointer int8) data) ii))) - ((int16) (format *debug-temp-string* "~D" (-> (the (pointer int16) data) ii))) - ((int32) - (case (-> e tag i name) - (('final-pickup 'pickup-type) - (format *debug-temp-string* "~S" (pickup-type->string (the-as pickup-type (-> (the (pointer int32) data) ii)))) - ) - (('alt-task) - (format *debug-temp-string* "~S" (game-task->string (the-as game-task (-> (the (pointer int32) data) ii)))) - ) - (else - (format *debug-temp-string* "~D" (-> (the (pointer int32) data) ii)) - ) - ) - ) - ((uint8) - (case (-> e tag i name) - ;; not sure - (('shadow-mask) - (format *debug-temp-string* "#b~b" (-> (the (pointer uint8) data) ii)) - ) - (else - (format *debug-temp-string* "#x~x" (-> (the (pointer uint8) data) ii)) - ) - ) - ) - ((uint16) (format *debug-temp-string* "#x~x" (-> (the (pointer uint16) data) ii))) - ((uint32) - (case (-> e tag i name) - ;; actually actor-id - (('nav-mesh-actor 'open-actor 'trigger-actor 'path-actor 'state-actor 'alt-actor 'next-actor 'prev-actor - 'spawner-blocker-actor 'spawner-trigger-actor 'kill-actor 'fade-actor 'water-actor 'target-actor) - (format *debug-temp-string* "~%#x~x (~S)" (-> (the (pointer uint32) data) ii) - (res-lump-struct (entity-by-aid (-> (the (pointer uint32) data) ii)) 'name string)) - (+! y-adv 8) - ) - ;; used for fuel-cell - (('movie-mask) - (format *debug-temp-string* "#b~b" (-> (the (pointer uint32) data) ii)) - ) - (else - (format *debug-temp-string* "#x~x" (-> (the (pointer uint32) data) ii)) - ) - ) - ) - ((vector) - (case (-> e tag i name) - ;; guess - (('movie-pos) - (format *debug-temp-string* "~%(~mm ~mm ~mm ~rdeg)" - (-> (the (inline-array vector) data) ii x) - (-> (the (inline-array vector) data) ii y) - (-> (the (inline-array vector) data) ii z) - (-> (the (inline-array vector) data) ii w) - ) - ) - ;; not super useful - (('nav-mesh-sphere) - (format *debug-temp-string* "~%(~mm ~mm ~mm ~mm)" - (-> (the (inline-array vector) data) ii x) - (-> (the (inline-array vector) data) ii y) - (-> (the (inline-array vector) data) ii z) - (-> (the (inline-array vector) data) ii w) - ) - ) - (else - (format *debug-temp-string* "~%(~f ~f ~f ~f)" - (-> (the (inline-array vector) data) ii x) - (-> (the (inline-array vector) data) ii y) - (-> (the (inline-array vector) data) ii z) - (-> (the (inline-array vector) data) ii w) - ) - ) - ) - (+! y-adv 8)) - ;; no clue! please report this. - (else - (format *debug-temp-string* "" (-> e tag i elt-type)) - (set! ii (the int (-> e tag i elt-count))) - ) - ) - ) - ) - ) - - ;; draw a string for each tag instead of all at once. allows using smaller strings. - (draw-string-xy *debug-temp-string* debug-buf 352 cur-y (font-color default) (font-flags shadow kerning middle)) - (+! cur-y y-adv) - (set! y-adv 8) - - )) - ;; set max scroll based on how large the whole text was, ignore first 20 lines. - (set! (-> inspect-info scroll-y-max) (max 0 (+ -20 (/ (- cur-y begin-y) 8)))) - - ) - ))) - - -) - diff --git a/goal_src/jak1/engine/gfx/foreground/bones.gc b/goal_src/jak1/engine/gfx/foreground/bones.gc index 1a93a8fd2d..67f88cfa65 100644 --- a/goal_src/jak1/engine/gfx/foreground/bones.gc +++ b/goal_src/jak1/engine/gfx/foreground/bones.gc @@ -1326,7 +1326,8 @@ ) (set! sv-144 (-> arg0 ripple)) (let* ((f1-4 (/ (- (-> sv-144 far-fade-dist) arg2) (- (-> sv-144 far-fade-dist) (-> sv-144 close-fade-dist)))) - (f1-6 (fmax 0.0 (fmin 1.0 f1-4))) + (f1-6 (#if PC_PORT (if (and *pc-settings* (-> *pc-settings* force-envmap?)) 1.0 (fmax 0.0 (fmin 1.0 f1-4))) + (fmax 0.0 (fmin 1.0 f1-4)))) (f0-4 f1-6) (f30-0 (* f1-6 (-> sv-144 global-scale))) ) @@ -1401,14 +1402,11 @@ ;; the game switches from mercneric to merc after the envmap is faded out. ;; this would normally be fine in the PC port too, but we want the eyes to remain ;; using mercneric (dynamic texture updates) in PC. - ;; so we force mercneric on models with envmap and very few tris. - ;; it seems to work so far... (flutflut has 134 triangles in the eye effect) + ;; so we force mercneric on models with envmap. + ;; it seems to work so far... (#when PC_PORT - (when (and - (< (-> geom effect effect-idx tri-count) 200) - (-> geom header eye-ctrl) - (nonzero? (-> geom header eye-ctrl)) - ) + (when (and (-> geom header eye-ctrl) + (nonzero? (-> geom header eye-ctrl))) (set! pc-force-mercneric #t) ) ) diff --git a/goal_src/jak1/engine/util/glist-h.gc b/goal_src/jak1/engine/util/glist-h.gc index 558490e363..029d2470de 100644 --- a/goal_src/jak1/engine/util/glist-h.gc +++ b/goal_src/jak1/engine/util/glist-h.gc @@ -9,7 +9,7 @@ ;; Very very weird linked list system. ;; TODO add examples because this is extremely confusing. -(when *debug-segment* +(declare-file (debug)) (deftype glst-node (structure) ((next glst-node :offset-assert 0) @@ -108,5 +108,3 @@ (set! (-> node privname) name) ) - ) - diff --git a/goal_src/jak1/engine/util/glist.gc b/goal_src/jak1/engine/util/glist.gc index 5423c70447..2a49410c72 100644 --- a/goal_src/jak1/engine/util/glist.gc +++ b/goal_src/jak1/engine/util/glist.gc @@ -6,9 +6,9 @@ ;; dgos: GAME, ENGINE -;; THIS FILE IS REALLY STUPID PLEASE JUST LOOK AWAY +;; THIS FILE IS REALLY WEIRD PLEASE JUST LOOK AWAY -(when *debug-segment* +(declare-file (debug)) (defun-debug glst-num-elements ((list glst-list)) "Return the number of elements on the list" @@ -177,5 +177,3 @@ ) ) - ) - diff --git a/goal_src/jak1/game.gp b/goal_src/jak1/game.gp index 50172961e4..7231ea8b69 100644 --- a/goal_src/jak1/game.gp +++ b/goal_src/jak1/game.gp @@ -1984,6 +1984,7 @@ "debug/anim-tester.gc" "debug/viewer.gc" "debug/part-tester.gc" + "debug/default-menu.gc" "gfx/texture/texture-upload.gc" "common-obs/rigid-body-h.gc" @@ -2048,11 +2049,10 @@ (goal-src "pc/pckernel.gc" "pc-anim-util" "settings" "video" "target-h" "autosplit-h" "speedruns-h") (goal-src "pc/subtitle.gc" "text" "pckernel" "hint-control" "loader-h" "gsound" "ambient") (goal-src "pc/progress-pc.gc" "progress" "pckernel") -(goal-src "pc/util/anim-tester-x.gc" "pckernel" "gstring" "joint" "process-drawable" "art-h" "effect-control") (goal-src "pc/hud-classes-pc.gc" "pckernel" "hud" "battlecontroller" "generic-obs") - -;; the debug menu is modified to include PC specific options: -(goal-src "engine/debug/default-menu.gc" "anim-tester-x" "part-tester") +(goal-src "pc/debug/anim-tester-x.gc" "pckernel" "gstring" "joint" "process-drawable" "art-h" "effect-control") +(goal-src "pc/debug/entity-debug.gc" "debug" "main-h" "entity" "pckernel" "font") +(goal-src "pc/debug/default-menu-pc.gc" "anim-tester-x" "part-tester" "entity-debug") (group-list "all-code" `(,@(reverse *all-gc*)) diff --git a/goal_src/jak1/pc/util/anim-tester-x.gc b/goal_src/jak1/pc/debug/anim-tester-x.gc similarity index 99% rename from goal_src/jak1/pc/util/anim-tester-x.gc rename to goal_src/jak1/pc/debug/anim-tester-x.gc index 8732ac79ac..75ab693624 100644 --- a/goal_src/jak1/pc/util/anim-tester-x.gc +++ b/goal_src/jak1/pc/debug/anim-tester-x.gc @@ -10,7 +10,7 @@ ;; debug-only file! (declare-file (debug)) -(when *debug-segment* + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;; constants ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -686,6 +686,3 @@ - - -) \ No newline at end of file diff --git a/goal_src/jak1/pc/debug/default-menu-pc.gc b/goal_src/jak1/pc/debug/default-menu-pc.gc new file mode 100644 index 0000000000..a48b152f83 --- /dev/null +++ b/goal_src/jak1/pc/debug/default-menu-pc.gc @@ -0,0 +1,976 @@ +;;-*-Lisp-*- +(in-package goal) + +#| + + Extra debug menus for PC port. + +|# + + +(defmacro new-dm-func (text var func) + `(new 'debug 'debug-menu-item-function ,text ,var (the-as (function int object) ,func)) + ) +(defmacro new-dm-flag (text var func) + `(new 'debug 'debug-menu-item-flag ,text ,var (the-as (function int debug-menu-msg object) ,func)) + ) +(defmacro new-dm-bool (text sym func) + `(new-dm-flag ,text (quote ,sym) ,func) + ) +(defmacro new-dm-submenu (text menu) + `(new 'debug 'debug-menu-item-submenu ,text ,menu) + ) +(defmacro new-dm-var-float (text var func inc min max) + `(debug-menu-item-var-make-float (new 'debug 'debug-menu-item-var ,text ,var (* 8 20)) + (the-as (function int debug-menu-msg float float float) ,func) + ,inc #t ,min ,max 1) + ) + +(defun dm-want-level-toggle-pick-func ((arg0 pair) (arg1 debug-menu-msg)) + (let* ((levname (the-as symbol (car arg0))) + (info (the-as level-load-info (-> levname value))) + (idx (the int (cdr arg0))) + (the-level (level-get *level* (-> info name))) + ) + (if (and the-level (!= the-level (-> *level* level idx))) + (return 'invalid) + ) + (if (= arg1 (debug-menu-msg press)) + (load-state-want-levels + (if (= idx 0) (-> info name) (-> *level* level 0 name)) + (if (= idx 1) (-> info name) (-> *level* level 1 name)) + ) + ) + (eq? (-> *level* level idx name) (-> info name)) + ) + ) + +(defun dm-display-level-toggle-pick-func ((arg0 symbol) (arg1 debug-menu-msg)) + (let ((the-level (level-get *level* arg0))) + (if (not the-level) + (return 'invalid) + ) + (if (= arg1 (debug-menu-msg press)) + (when the-level + (load-state-want-display-level arg0 + (if (-> the-level display?) #f 'display) + ) + ) + ) + (and the-level (-> the-level display?)) + ) + ) + +(defun debug-menu-make-load-want-menu ((ctx debug-menu-context) (lev-idx int)) + + (let ((want-menu (new 'debug 'debug-menu ctx "Level want menu"))) + + (let ((iter *level-load-list*)) + (while (not (or (null? iter) (null? (cdr iter)) (null? (cddr iter)))) + (debug-menu-append-item want-menu (new-dm-flag (symbol->string (the-as symbol (car iter))) (dcons (car iter) lev-idx) dm-want-level-toggle-pick-func)) + + (set! iter (cdr iter)) + ) + ) + + (new-dm-submenu (new 'debug 'string 0 (string-format "Want ~D" lev-idx)) want-menu) + ) + ) + +(defun debug-menu-make-load-display-menu ((ctx debug-menu-context)) + + (let ((display-menu (new 'debug 'debug-menu ctx "Level display menu"))) + + (let ((iter *level-load-list*)) + (while (not (or (null? iter) (null? (cdr iter)) (null? (cddr iter)))) + (debug-menu-append-item display-menu (new-dm-flag (symbol->string (the-as symbol (car iter))) (car iter) dm-display-level-toggle-pick-func)) + + (set! iter (cdr iter)) + ) + ) + + (new-dm-submenu "Display" display-menu) + ) + ) + +(defun debug-menu-make-load-teleport-menu ((ctx debug-menu-context)) + + (let ((teleport-menu (new 'debug 'debug-menu ctx "Camera teleport menu"))) + + (let ((iter *level-load-list*)) + (while (not (or (null? iter) (null? (cdr iter)) (null? (cddr iter)))) + (debug-menu-append-item teleport-menu + (new-dm-func (symbol->string (the-as symbol (car iter))) + (-> (the-as symbol (car iter)) value) + (lambda ((info level-load-info)) + (let ((tf (new 'stack-no-clear 'transformq))) + (set! (-> tf trans x) (-> info bsphere x)) + (set! (-> tf trans y) (-> info bsphere y)) + (set! (-> tf trans z) (-> info bsphere z)) + (quaternion-identity! (-> tf quat)) + (vector-identity! (-> tf scale)) + (send-event *camera* 'teleport-to-transformq tf) + ) + ) + )) + + (set! iter (cdr iter)) + ) + ) + + (new-dm-submenu "Camera teleport" teleport-menu) + ) + ) + +(defun debug-menu-make-load-menu ((ctx debug-menu-context)) + (let ((load-menu (new 'debug 'debug-menu ctx "Load menu"))) + (debug-menu-append-item load-menu (new-dm-bool "Level Border" *display-level-border* dm-boolean-toggle-pick-func)) + (debug-menu-append-item load-menu (debug-menu-make-from-template ctx '(flag + "border-mode" + #f + ,(lambda ((arg0 int) (arg1 debug-menu-msg)) + (if (= arg1 (debug-menu-msg press)) + (set! (-> *setting-control* default border-mode) (not (-> *setting-control* default border-mode))) + ) + (-> *setting-control* default border-mode) + ) + ))) + + (debug-menu-append-item load-menu (debug-menu-make-load-want-menu ctx 0)) ;; Want 0 + (debug-menu-append-item load-menu (debug-menu-make-load-want-menu ctx 1)) ;; Want 1 + (debug-menu-append-item load-menu (debug-menu-make-load-display-menu ctx)) ;; Display + (debug-menu-append-item load-menu (debug-menu-make-load-teleport-menu ctx)) ;; Camera teleport + + (new-dm-submenu "Load" load-menu) + ) + ) + +(define *part-pick-menu* (the-as debug-menu #f)) +(define *spawn-part-test* #t) + +(defun dm-part-pick-func ((id int) (msg debug-menu-msg)) + (if (zero? (-> *part-group-id-table* id)) + (return 'invalid)) + (when (= msg (debug-menu-msg press)) + (set! *part-tester-id* id) + (if *spawn-part-test* + (start-part) + ) + ) + (= *part-tester-id* id) + ) + +(defun build-particles-list () + (debug-menu-remove-all-items *part-pick-menu*) + (dotimes (i (-> *part-group-id-table* length)) + (let ((part (-> *part-group-id-table* i))) + (when (and (nonzero? part)) + (debug-menu-append-item *part-pick-menu* (new-dm-flag (-> part name) i dm-part-pick-func)) + ) + ) + ) + (set! (-> *part-pick-menu* items) (sort (-> *part-pick-menu* items) debug-menu-node *entity-debug-inspect* entity) e) + (set-entity! *entity-debug-inspect* (the entity #f)) + (set-entity! *entity-debug-inspect* e)) + ) + (= (-> *entity-debug-inspect* entity) e) + ) + +(defun build-entity-list () + "Fill the entity pick menu" + ;; clear old list + (debug-menu-remove-all-items *entity-pick-menu*) + ;; go through active levels + (dotimes (s5-0 (-> *level* length)) + (let ((s4-0 (-> *level* level s5-0))) + (when (= (-> s4-0 status) 'active) + ;; actor entities + (let ((s3-0 (-> s4-0 bsp actors))) + (when (nonzero? s3-0) + (dotimes (s2-0 (-> s3-0 length)) + (let ((s1-0 (-> s3-0 data s2-0 actor))) + (debug-menu-append-item *entity-pick-menu* (new-dm-flag (res-lump-struct s1-0 'name string) s1-0 dm-entity-pick-func)) + ) + ) + ) + ) + ;; ambients entities + (let ((s3-1 (-> s4-0 bsp ambients))) + (when (nonzero? s3-1) + (dotimes (s2-1 (-> s3-1 length)) + (let ((s1-1 (-> s3-1 data s2-1 ambient))) + (debug-menu-append-item *entity-pick-menu* (new-dm-flag (res-lump-struct s1-1 'name string) s1-1 dm-entity-pick-func)) + ) + ) + ) + ) + ;; camera entities + (let ((s4-1 (-> s4-0 bsp cameras))) + (when (nonzero? s4-1) + (dotimes (s3-2 (-> s4-1 length)) + (let ((s2-2 (-> s4-1 s3-2))) + (debug-menu-append-item *entity-pick-menu* (new-dm-flag (res-lump-struct s2-2 'name string) s2-2 dm-entity-pick-func)) + ) + ) + ) + ) + ) + ) + ) + (set! (-> *entity-pick-menu* items) (sort (-> *entity-pick-menu* items) debug-menu-node *entity-debug-inspect* entity) (return #f)) + (let ((tf (new 'stack 'transformq))) + (vector-copy! (-> tf trans) (-> *entity-debug-inspect* entity trans)) + (quaternion-identity! (-> tf quat)) + (vector-identity! (-> tf scale)) + (send-event *camera* 'teleport-to-transformq tf) + )))) + (debug-menu-append-item entity-menu (new-dm-func "Print entity info" #t dm-display-entities-pick-func)) + (debug-menu-append-item entity-menu (new-dm-func "Print entity info (ag)" 'art-group dm-display-entities-pick-func)) + (debug-menu-append-item entity-menu (new-dm-func "Print entity info (meters)" 'entity-meters dm-display-entities-pick-func)) + (debug-menu-append-item entity-menu (new-dm-func "Print entity info (perm)" 'entity-perm dm-display-entities-pick-func)) + + (new-dm-submenu "Entity" entity-menu) + ) + ) + +(defmacro dm-lambda-boolean-flag (val) + "helper macro for making boolean buttons that don't just access symbols directly" + `,(lambda (arg (msg debug-menu-msg)) + (if (= msg (debug-menu-msg press)) + (not! ,val) + ) + ,val) + ) + +(defmacro dm-lambda-int-var (val) + "helper macro for making int buttons" + `,(lambda (arg (msg debug-menu-msg) (newval int)) + (cond + ((= msg (debug-menu-msg press)) + (set! ,val newval) + ) + (else + ,val + ) + )) + ) + +(defmacro dm-lambda-float-var (val) + "helper macro for making float buttons" + `(lambda (arg (msg debug-menu-msg) (newval float)) + (cond + ((= msg (debug-menu-msg press)) + (set! ,val newval) + ) + (else + ,val + ) + )) + ) + +(defmacro dm-lambda-meters-var (val) + "helper macro for making meters buttons" + `,(lambda (arg (msg debug-menu-msg) (newval float)) + (cond + ((= msg (debug-menu-msg press)) + (set! ,val (meters newval)) + ) + (else + (* (1/ METER_LENGTH) ,val) + ) + )) + ) + +(defun dm-toggle-collision-pick-func ((arg symbol) (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (cond + ((-> arg value) + (false! (-> arg value)) + (logior! *vu1-enable-user-menu* (vu1-renderer-mask tfrag trans-tfrag tie tie-near)) + (true! *generic-tie*) + ) + (else + (true! (-> arg value)) + (logclear! *vu1-enable-user-menu* (vu1-renderer-mask tfrag trans-tfrag tie tie-near)) + (false! *generic-tie*) + ) + ) + ) + (-> arg value) + ) + +(defun dm-collision-mode-pick-func ((arg pc-collision-mode) (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (set! *collision-mode* arg) + ) + (= *collision-mode* arg) + ) + +(defun dm-collision-filter-mode-pick-func ((arg int) (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (pc-set-collision-mask (pc-collision-mode mode) arg (not (pc-get-collision-mask (pc-collision-mode mode) arg))) + ) + (pc-get-collision-mask (pc-collision-mode mode) arg) + ) + +(defun dm-collision-filter-event-pick-func ((arg int) (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (pc-set-collision-mask (pc-collision-mode event) arg (not (pc-get-collision-mask (pc-collision-mode event) arg))) + ) + (pc-get-collision-mask (pc-collision-mode event) arg) + ) + +(defun dm-collision-filter-material-pick-func ((arg int) (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (pc-set-collision-mask (pc-collision-mode material) arg (not (pc-get-collision-mask (pc-collision-mode material) arg))) + ) + (pc-get-collision-mask (pc-collision-mode material) arg) + ) + +(defun dm-collision-filter-skip-pick-func ((arg int) (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (pc-set-collision-mask (pc-collision-mode skip) arg (not (pc-get-collision-mask (pc-collision-mode skip) arg))) + ) + (pc-get-collision-mask (pc-collision-mode skip) arg) + ) + +(defun debug-menu-make-collision-renderer-menu ((ctx debug-menu-context)) + (let ((menu (new 'debug 'debug-menu ctx "Collision renderer menu"))) + ;; master toggle + (debug-menu-append-item menu (new-dm-bool "Enable" *collision-renderer* dm-toggle-collision-pick-func)) + (debug-menu-append-item menu (new-dm-bool "Wireframe" *collision-wireframe* dm-boolean-toggle-pick-func)) + (debug-menu-append-item menu (new-dm-submenu "Mode" + (let ((mode-menu (new 'debug 'debug-menu ctx "Collision renderer mode menu"))) + (doenum (name val pc-collision-mode) + (debug-menu-append-item mode-menu (new-dm-flag name val dm-collision-mode-pick-func)) + ) + mode-menu))) + (debug-menu-append-item menu (new-dm-submenu "Filter mode" + (let ((filter-menu (new 'debug 'debug-menu ctx "Collision renderer filter mode menu"))) + (doenum (name val pat-mode) + (debug-menu-append-item filter-menu (new-dm-flag name val dm-collision-filter-mode-pick-func)) + ) + filter-menu))) + (debug-menu-append-item menu (new-dm-submenu "Filter event" + (let ((filter-menu (new 'debug 'debug-menu ctx "Collision renderer filter event menu"))) + (doenum (name val pat-event) + (debug-menu-append-item filter-menu (new-dm-flag name val dm-collision-filter-event-pick-func)) + ) + filter-menu))) + (debug-menu-append-item menu (new-dm-submenu "Filter material" + (let ((filter-menu (new 'debug 'debug-menu ctx "Collision renderer filter material menu"))) + (doenum (name val pat-material) + (debug-menu-append-item filter-menu (new-dm-flag name val dm-collision-filter-material-pick-func)) + ) + filter-menu))) + (debug-menu-append-item menu (new-dm-submenu "Filter skip" + (let ((filter-menu (new 'debug 'debug-menu ctx "Collision renderer filter skip menu"))) + (doenum (name val pc-pat-skip-hack) + (debug-menu-append-item filter-menu (new-dm-flag name val dm-collision-filter-skip-pick-func)) + ) + filter-menu))) + + (new-dm-submenu "Collision renderer" menu) + ) + ) + +(defun dm-lod-int ((arg0 int) (arg1 debug-menu-msg) (arg2 int) (arg3 int)) + (when (= arg1 (debug-menu-msg press)) + (case (/ arg0 8) + ((0) (set! (-> *pc-settings* lod-force-tfrag) arg2)) + ((1) (set! (-> *pc-settings* lod-force-tie) arg2)) + ((2) (set! (-> *pc-settings* lod-force-ocean) arg2)) + ((3) (set! (-> *pc-settings* lod-force-actor) arg2)) + ) + ) + (case (/ arg0 8) + ((0) (-> *pc-settings* lod-force-tfrag)) + ((1) (-> *pc-settings* lod-force-tie)) + ((2) (-> *pc-settings* lod-force-ocean)) + ((3) (-> *pc-settings* lod-force-actor)) + (else arg3) + ) + ) + +(defun dm-subtitle-language ((blang int) (msg debug-menu-msg)) + (let ((lang (the pc-subtitle-lang (/ blang 8)))) + (when (= msg (debug-menu-msg press)) + (set! (-> *pc-settings* subtitle-language) lang)) + (= (-> *pc-settings* subtitle-language) lang) + ) + ) + +(defun dm-text-language ((blang int) (msg debug-menu-msg)) + (let ((lang (the pc-subtitle-lang (/ blang 8)))) + (when (= msg (debug-menu-msg press)) + (set! (-> *pc-settings* text-language) lang)) + (= (-> *pc-settings* text-language) lang) + ) + ) + +(defun dm-subtitle-setting ((setting symbol) (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (set! (-> *pc-settings* subtitle-speaker?) setting)) + (= (-> *pc-settings* subtitle-speaker?) setting) + ) + +(defun dm-mood-override-palette-pick-func ((bpal int) (msg debug-menu-msg)) + (let* ((pal (/ bpal 8)) + (cur-val (-> *pc-settings* mood-overrides pal))) + + (when (= msg (debug-menu-msg press)) + (set! (-> *pc-settings* mood-overrides pal) (if (= cur-val 0.0) 1.0 0.0)) + + (when (not (= 'mult (-> *pc-settings* mood-override?))) + (set! (-> *pc-settings* mood-override?) #f) + (dotimes (i 8) + (if (!= (-> *pc-settings* mood-overrides i) 0.0) + (set! (-> *pc-settings* mood-override?) 'copy))) + )) + + (= (-> *pc-settings* mood-overrides pal) 1.0) + ) + ) + +(defun dm-mood-override-pick-func ((kind symbol) (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (if (= kind (-> *pc-settings* mood-override?)) + (set! (-> *pc-settings* mood-override?) #f) + (set! (-> *pc-settings* mood-override?) kind))) + (= kind (-> *pc-settings* mood-override?)) + ) + +(defun dm-mood-palette-float ((pal int) (arg1 debug-menu-msg) (newval float) (val float)) + (when (= arg1 (debug-menu-msg press)) + (set! (-> *pc-settings* mood-overrides (/ pal 8)) newval)) + (-> *pc-settings* mood-overrides (/ pal 8)) + ) + +(defun dm-anim-tester-x-flag-func ((action symbol) (msg debug-menu-msg)) + (case action + (('at-show-joint-info) + (if (= msg (debug-menu-msg press)) + (logxor! (-> *ATX-settings* flags) (atx-flags show-joints))) + (return (logtest? (-> *ATX-settings* flags) (atx-flags show-joints))) + ) + ) + #f) + +(defun dm-anim-tester-x-func ((action symbol)) + (unless *atx* + (atx-start)) + + (case action + (('pick-art-group) + (set! (-> *atx* 0 edit-mode) (atx-edit-mode art-group)) + (false! *camera-read-buttons*) + ) + (('at-pick-joint-anim) + (when (-> *atx* 0 cur-art-group) + (set! (-> *atx* 0 edit-mode) (atx-edit-mode anim)) + (false! *camera-read-buttons*) + ) + ) + (('pick-mesh-geo) + (when (-> *atx* 0 cur-art-group) + (set! (-> *atx* 0 edit-mode) (atx-edit-mode mgeo)) + (false! *camera-read-buttons*) + ) + ) + (('pick-joint-geo) + (when (-> *atx* 0 cur-art-group) + (set! (-> *atx* 0 edit-mode) (atx-edit-mode jgeo)) + (false! *camera-read-buttons*) + ) + ) + (('at-cam-free-floating) + (send-event *camera* 'change-state cam-free-floating 0) + ) + (('at-cam-orbit) + (send-event *camera* 'change-state cam-orbit 0) + ) + ) + 0) + +(defun debug-menu-make-anim-tester-x-menu ((ctx debug-menu-context)) + (let ((menu (new 'debug 'debug-menu ctx "Anim Tester X menu"))) + ;; master toggle + (debug-menu-append-item menu (new-dm-func "Start" #f atx-start)) + (debug-menu-append-item menu (new-dm-func "Stop" #f atx-stop)) + (debug-menu-append-item menu (new-dm-var-float "Speed" (the int #f) (dm-lambda-float-var (-> *ATX-settings* speed)) 0.01 -10.0 10.0)) + (debug-menu-append-item menu (new-dm-var-float "Frame Num" (the int #f) (dm-lambda-float-var (-> *ATX-settings* frame-num)) 0.1 0.0 99999.0)) + (debug-menu-append-item menu (new-dm-func "Pick Art Group" 'pick-art-group dm-anim-tester-x-func)) + (debug-menu-append-item menu (new-dm-func "Pick Anim" 'at-pick-joint-anim dm-anim-tester-x-func)) + (debug-menu-append-item menu (new-dm-func "Pick Mesh" 'pick-mesh-geo dm-anim-tester-x-func)) + (debug-menu-append-item menu (new-dm-func "Pick Skeleton" 'pick-joint-geo dm-anim-tester-x-func)) + (debug-menu-append-item menu (new-dm-flag "Show Joint Info" 'at-show-joint-info dm-anim-tester-x-flag-func)) + (debug-menu-append-item menu (new-dm-func "Free Floating cam" 'at-cam-free-floating dm-anim-tester-x-func)) + (debug-menu-append-item menu (new-dm-func "Orbit cam" 'at-cam-orbit dm-anim-tester-x-func)) + + (new-dm-submenu "Anim Tester X" menu) + ) + ) + +(defun dm-music-player-func ((lst object)) + (kill-by-name 'dm-player *active-pool*) + (set! *progress-flava* -1) + (process-spawn-function process :name 'dm-player + (lambda :behavior process ((lst pair)) + (loop + (suspend) + (set-setting! 'music (the-as symbol (car lst)) 0.0 0) + (set! *progress-flava* (the-as int (cdr lst))) + ) + ) + lst + ) + ) + +(defun debug-menu-make-music-player-menu ((ctx debug-menu-context)) + (let ((music-menu (new 'debug 'debug-menu ctx "Music player menu"))) + (dotimes (i (-> *music-flava-name-list* length)) + (let* ((flava-list (-> *music-flava-name-list* i)) + (level-name (new 'debug 'string 30 (game-text-id->string (-> flava-list 0)))) + (lvl-menu (new 'debug 'debug-menu ctx (the-as string #f))) + ) + (dotimes (j (-> flava-list length)) + (let ((flava-name (new 'debug 'string 30 (game-text-id->string (-> flava-list j))))) + (when (and (string= (substring! *temp-string* level-name (- (length level-name) 11) (length level-name)) "-level-name") + (string= (substring! *temp-string* flava-name (- (length flava-name) 11) (length flava-name)) "-level-name")) + (copy-string<-string flava-name (symbol->string (ref *music-list* i))) + ) + (unless (string= flava-name "zero") + (debug-menu-append-item lvl-menu (new-dm-func flava-name (dcons (ref *music-list* i) j) dm-music-player-func)) + ) + ) + ) + (let ((menu-name (new 'debug 'string 30 (symbol->string (ref *music-list* i))))) + (debug-menu-append-item music-menu (new-dm-submenu menu-name lvl-menu)) + ) + ) + ) + (debug-menu-append-item music-menu (new-dm-func "Reset" #f (lambda () (kill-by-name 'dm-player *active-pool*) (set! *progress-flava* -1)))) + (new-dm-submenu "Music player" music-menu) + ) + ) + +(when (-> *debug-menu-context* root-menu) + (debug-menu-append-item (-> *debug-menu-context* root-menu) (debug-menu-make-load-menu *debug-menu-context*)) + (debug-menu-append-item (-> *debug-menu-context* root-menu) (debug-menu-make-part-menu *debug-menu-context*)) + (debug-menu-append-item (-> *debug-menu-context* root-menu) (debug-menu-make-entity-menu *debug-menu-context*)) + ;; Scene menu TODO + + (debug-menu-append-item (-> *debug-menu-context* root-menu) + (debug-menu-make-from-template *debug-menu-context* + '(menu "PC Settings" + (flag "Debug" #f ,(dm-lambda-boolean-flag (-> *pc-settings* debug?))) + (flag "Use native vis" #f ,(dm-lambda-boolean-flag (-> *pc-settings* use-vis?))) + (function "Toggle game aspect" #f ,(lambda () + (cond + ((= (-> *setting-control* default aspect-ratio) 'aspect4x3) + (set! (-> *setting-control* default aspect-ratio) 'aspect16x9) + ) + (else + (set! (-> *setting-control* default aspect-ratio) 'aspect4x3) + ) + ) + (set-aspect-ratio (-> *setting-control* default aspect-ratio)) + )) + (flag "Auto aspect" #f ,(dm-lambda-boolean-flag (-> *pc-settings* aspect-ratio-auto?))) + (menu "Aspect test" + (function "4 x 3" #f ,(lambda () (set-aspect! *pc-settings* 4 3))) + (function "16 x 9" #f ,(lambda () (set-aspect! *pc-settings* 16 9))) + (function "64 x 27 (21:9)" #f ,(lambda () (set-aspect! *pc-settings* 64 27))) + (function "16 x 10" #f ,(lambda () (set-aspect! *pc-settings* 16 10))) + (function "2 x 1" #f ,(lambda () (set-aspect! *pc-settings* 2 1))) + (function "37 x 20" #f ,(lambda () (set-aspect! *pc-settings* 37 20))) + (function "21 x 9" #f ,(lambda () (set-aspect! *pc-settings* 21 9))) + (function "64 x 18" #f ,(lambda () (set-aspect! *pc-settings* 64 18))) + (int-var "Custom aspect X" #f ,(dm-lambda-int-var (-> *pc-settings* aspect-custom-x)) 20 1 #t 1 1000) + (int-var "Custom aspect Y" #f ,(dm-lambda-int-var (-> *pc-settings* aspect-custom-y)) 20 1 #t 1 1000) + (function "Custom" #f ,(lambda () (set-aspect! *pc-settings* (-> *pc-settings* aspect-custom-x) (-> *pc-settings* aspect-custom-y)))) + ) + (menu "Fullscreen" + (function "Windowed" #f ,(lambda () (set-display-mode! *pc-settings* 'windowed))) + (function "Fullscreen" #f ,(lambda () (set-display-mode! *pc-settings* 'fullscreen))) + (function "Borderless" #f ,(lambda () (set-display-mode! *pc-settings* 'borderless))) + ) + (menu "Sizes" + (function "640 x 480" #f ,(lambda () (set-size! *pc-settings* 640 480))) + (function "640 x 360" #f ,(lambda () (set-size! *pc-settings* 640 360))) + (function "720 x 540" #f ,(lambda () (set-size! *pc-settings* 720 540))) + (function "960 x 540" #f ,(lambda () (set-size! *pc-settings* 960 540))) + (function "800 x 600" #f ,(lambda () (set-size! *pc-settings* 800 600))) + (function "960 x 720" #f ,(lambda () (set-size! *pc-settings* 960 720))) + (function "1280 x 720" #f ,(lambda () (set-size! *pc-settings* 1280 720))) + (function "1024 x 768" #f ,(lambda () (set-size! *pc-settings* 1024 768))) + (function "1366 x 768" #f ,(lambda () (set-size! *pc-settings* 1366 768))) + (function "1280 x 960" #f ,(lambda () (set-size! *pc-settings* 1280 960))) + (function "1440 x 1080" #f ,(lambda () (set-size! *pc-settings* 1440 1080))) + (function "1920 x 1080" #f ,(lambda () (set-size! *pc-settings* 1920 1080))) + (function "1920 x 1440" #f ,(lambda () (set-size! *pc-settings* 1920 1440))) + (function "2560 x 1440" #f ,(lambda () (set-size! *pc-settings* 2560 1440))) + (function "2880 x 2160" #f ,(lambda () (set-size! *pc-settings* 2880 2160))) + (function "3840 x 2160" #f ,(lambda () (set-size! *pc-settings* 3840 2160))) + (function "512 x 224" #f ,(lambda () (set-size! *pc-settings* 512 224))) + (function "512 x 256" #f ,(lambda () (set-size! *pc-settings* 512 256))) + (function "512 x 448" #f ,(lambda () (set-size! *pc-settings* 512 448))) + (function "512 x 512" #f ,(lambda () (set-size! *pc-settings* 512 512))) + ) + (menu "Secrets" + (menu "PC cheats" + (flag "Big head jak" #f ,(lambda (arg (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) big-head) + ) + (pc-cheats? (-> *pc-settings* cheats) big-head))) + (flag "Small head jak" #f ,(lambda (arg (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) small-head) + ) + (pc-cheats? (-> *pc-settings* cheats) small-head))) + (flag "Big fist jak" #f ,(lambda (arg (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) big-fist) + ) + (pc-cheats? (-> *pc-settings* cheats) big-fist))) + (flag "Big head npcs" #f ,(lambda (arg (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) big-head-npc) + ) + (pc-cheats? (-> *pc-settings* cheats) big-head-npc))) + (flag "Huge head jak" #f ,(lambda (arg (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) huge-head) + ) + (pc-cheats? (-> *pc-settings* cheats) huge-head))) + (flag "Mirrored mode" #f ,(lambda (arg (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) mirror) + ) + (pc-cheats? (-> *pc-settings* cheats) mirror))) + (flag "Blue eco" #f ,(lambda (arg (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (logclear! (-> *pc-settings* cheats) (pc-cheats eco-red eco-yellow eco-green)) + (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) eco-blue) + ) + (pc-cheats? (-> *pc-settings* cheats) eco-blue))) + (flag "Red eco" #f ,(lambda (arg (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (logclear! (-> *pc-settings* cheats) (pc-cheats eco-blue eco-yellow eco-green)) + (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) eco-red) + ) + (pc-cheats? (-> *pc-settings* cheats) eco-red))) + (flag "Green eco" #f ,(lambda (arg (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (logclear! (-> *pc-settings* cheats) (pc-cheats eco-red eco-yellow eco-blue)) + (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) eco-green) + ) + (pc-cheats? (-> *pc-settings* cheats) eco-green))) + (flag "Yellow eco" #f ,(lambda (arg (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (logclear! (-> *pc-settings* cheats) (pc-cheats eco-red eco-blue eco-green)) + (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) eco-yellow) + ) + (pc-cheats? (-> *pc-settings* cheats) eco-yellow))) + (flag "Invincibility" #f ,(lambda (arg (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (logclear! (-> *target* state-flags) 16) + (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) invinc) + ) + (pc-cheats? (-> *pc-settings* cheats) invinc))) + (flag "Blue sidekick" #f ,(lambda (arg (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) sidekick-blue) + ) + (pc-cheats? (-> *pc-settings* cheats) sidekick-blue))) + (flag "All flavas" #f ,(lambda (arg (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) tunes) + ) + (pc-cheats? (-> *pc-settings* cheats) tunes))) + (flag "Real time tod" #f ,(lambda (arg (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) sky) + ) + (pc-cheats? (-> *pc-settings* cheats) sky))) + (flag "No textures" #f ,(lambda (arg (msg debug-menu-msg)) + (when (= msg (debug-menu-msg press)) + (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) no-tex) + ) + (pc-cheats? (-> *pc-settings* cheats) no-tex))) +;; (flag "Hard rats" #f ,(lambda (arg (msg debug-menu-msg)) +;; (when (= msg (debug-menu-msg press)) +;; (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) hard-rats) +;; ) +;; (pc-cheats? (-> *pc-settings* cheats) hard-rats))) +;; (flag "Hero mode" #f ,(lambda (arg (msg debug-menu-msg)) +;; (when (= msg (debug-menu-msg press)) +;; (pc-cheat-toggle-and-tune (-> *pc-settings* cheats) hero-mode) +;; ) +;; (pc-cheats? (-> *pc-settings* cheats) hero-mode))) + ) + ) + (flag "Letterbox" #f ,(dm-lambda-boolean-flag (-> *pc-settings* letterbox?))) + (flag "Skip movies" #f ,(dm-lambda-boolean-flag (-> *pc-settings* skip-movies?))) + (flag "Money starburst" #f ,(dm-lambda-boolean-flag (-> *pc-settings* money-starburst?))) + (flag "Subtitles" #f ,(dm-lambda-boolean-flag (-> *pc-settings* subtitles?))) + (flag "Hinttitles" #f ,(dm-lambda-boolean-flag (-> *pc-settings* hinttitles?))) + (menu "Subtitle speaker" + (flag "Off" #f dm-subtitle-setting) + (flag "On" #t dm-subtitle-setting) + (flag "Auto" auto dm-subtitle-setting) + ) + (menu "Subtitle language" + (flag "english" 0 dm-subtitle-language) + (flag "french" 1 dm-subtitle-language) + (flag "german" 2 dm-subtitle-language) + (flag "spanish" 3 dm-subtitle-language) + (flag "uk-english" 6 dm-subtitle-language) + (flag "br-portuguese" 13 dm-subtitle-language) + ) + (menu "Text language" + (flag "english" 0 dm-text-language) + (flag "french" 1 dm-text-language) + (flag "german" 2 dm-text-language) + (flag "spanish" 3 dm-text-language) + (flag "italian" 4 dm-text-language) + (flag "japanese" 5 dm-text-language) + (flag "uk-english" 6 dm-text-language) + (flag "br-portuguese" 13 dm-text-language) + (flag "hungarian" 14 dm-text-language) + ) + (flag "Discord RPC" #t ,(dm-lambda-boolean-flag (-> *pc-settings* discord-rpc?))) + (flag "Speedrunner Mode" #t ,(dm-lambda-boolean-flag (-> *pc-settings* speedrunner-mode?))) + (menu "PS2 settings" + ;(flag "PS2 Load speed" #f ,(dm-lambda-boolean-flag (-> *pc-settings* ps2-read-speed?))) + (flag "PS2 Particles" #f ,(dm-lambda-boolean-flag (-> *pc-settings* ps2-parts?))) + ;(flag "PS2 Music" #f ,(dm-lambda-boolean-flag (-> *pc-settings* ps2-music?))) + ;(flag "PS2 Sound effects" #f ,(dm-lambda-boolean-flag (-> *pc-settings* ps2-se?))) + ;(flag "PS2 Hints" #f ,(dm-lambda-boolean-flag (-> *pc-settings* ps2-hints?))) + ) + (menu "Level of detail" + (flag "PS2 LOD " #f ,(dm-lambda-boolean-flag (-> *pc-settings* ps2-lod-dist?))) + (flag "Force Envmap" #f ,(dm-lambda-boolean-flag (-> *pc-settings* force-envmap?))) + (int-var "LOD Tfrag" 0 dm-lod-int 0 1 #t 0 2) + (int-var "LOD Tie" 1 dm-lod-int 0 1 #t 0 3) + ;(int-var "LOD Ocean" 2 dm-lod-int 0 1 #t 0 3) + (int-var "LOD Actor" 3 dm-lod-int 0 1 #t 0 3) + (function "Best quality" #f ,(lambda () (set! (-> *pc-settings* lod-force-tfrag) 0) + (set! (-> *pc-settings* lod-force-tie) 0) + ;(set! (-> *pc-settings* lod-force-ocean) 0) + (set! (-> *pc-settings* lod-force-actor) 0) + )) + (function "Worst quality" #f ,(lambda () (set! (-> *pc-settings* lod-force-tfrag) 2) + (set! (-> *pc-settings* lod-force-tie) 3) + ;(set! (-> *pc-settings* lod-force-ocean) 2) + (set! (-> *pc-settings* lod-force-actor) 3) + )) + ) + (menu "Framerate" + (flag "60" #f ,(lambda (arg (msg debug-menu-msg)) (when (= msg (debug-menu-msg press)) (set-frame-rate! *pc-settings* 60)) + (= (-> *pc-settings* target-fps) 60))) + (flag "100" #f ,(lambda (arg (msg debug-menu-msg)) (when (= msg (debug-menu-msg press)) (set-frame-rate! *pc-settings* 100)) + (= (-> *pc-settings* target-fps) 100))) + (flag "150" #f ,(lambda (arg (msg debug-menu-msg)) (when (= msg (debug-menu-msg press)) (set-frame-rate! *pc-settings* 150)) + (= (-> *pc-settings* target-fps) 150))) + ) + (menu "MSAA" + (flag "Off" #f ,(lambda (arg (msg debug-menu-msg)) (when (= msg (debug-menu-msg press)) (set! (-> *pc-settings* gfx-msaa) 1)) + (= (-> *pc-settings* gfx-msaa) 1))) + (flag "x2" #f ,(lambda (arg (msg debug-menu-msg)) (when (= msg (debug-menu-msg press)) (set! (-> *pc-settings* gfx-msaa) 2)) + (= (-> *pc-settings* gfx-msaa) 2))) + (flag "x4" #f ,(lambda (arg (msg debug-menu-msg)) (when (= msg (debug-menu-msg press)) (set! (-> *pc-settings* gfx-msaa) 4)) + (= (-> *pc-settings* gfx-msaa) 4))) + (flag "x8" #f ,(lambda (arg (msg debug-menu-msg)) (when (= msg (debug-menu-msg press)) (set! (-> *pc-settings* gfx-msaa) 8)) + (= (-> *pc-settings* gfx-msaa) 8))) + (flag "x16" #f ,(lambda (arg (msg debug-menu-msg)) (when (= msg (debug-menu-msg press)) (set! (-> *pc-settings* gfx-msaa) 16)) + (= (-> *pc-settings* gfx-msaa) 16))) + ) + (flag "V-sync" #f ,(dm-lambda-boolean-flag (-> *pc-settings* vsync?))) + ;(flag "Alt load boundaries" #f ,(dm-lambda-boolean-flag (-> *pc-settings* new-lb?))) + (flag "All actors" #f ,(dm-lambda-boolean-flag (-> *pc-settings* force-actors?))) + (flag "Display actor counts" #f ,(dm-lambda-boolean-flag (-> *pc-settings* display-actor-counts))) + (flag "Display git commit" #f ,(dm-lambda-boolean-flag (-> *pc-settings* display-sha))) + (flag "Extra hud elements" #f ,(dm-lambda-boolean-flag (-> *pc-settings* extra-hud?))) + (flag "Music fadein" #f ,(dm-lambda-boolean-flag (-> *pc-settings* music-fadein?))) + (flag "Music fadeout" #f ,(dm-lambda-boolean-flag (-> *pc-settings* music-fadeout?))) + (function "Reset" #f ,(lambda () (reset *pc-settings*))) + (function "Save" #f ,(lambda () (commit-to-file *pc-settings*))) + (function "Load" #f ,(lambda () (load-settings *pc-settings*))) + ) + ) + ) + (let* ((prog-menu (new 'debug 'debug-menu *debug-menu-context* "Progress menu")) + (prog-menu-node (new-dm-submenu "Progress" prog-menu)) + (other-menu-node + (debug-menu-make-from-template *debug-menu-context* + '(menu "Other" + (flag "DECI Count" *display-deci-count* dm-boolean-toggle-pick-func) + ;(flag "Actor graph" *display-actor-graph* dm-boolean-toggle-pick-func) + (flag "Update vis outside bsp" *update-leaf-when-outside-bsp* dm-boolean-toggle-pick-func) + (flag "Pad display" #f ,(dm-lambda-boolean-flag (-> *pc-settings* debug-pad-display))) + (flag "Display actor bank" #f ,(dm-lambda-boolean-flag (-> *pc-settings* display-actor-bank))) + (flag "Heap status" #f ,(dm-lambda-boolean-flag (-> *pc-settings* display-heap-status))) + (flag "Bug report" #f ,(dm-lambda-boolean-flag (-> *pc-settings* display-bug-report))) + (flag "Text boxes" #f ,(dm-lambda-boolean-flag (-> *pc-settings* display-text-box))) + (flag "Sidekick stats" *display-sidekick-stats* dm-boolean-toggle-pick-func) + (float-var "Actor birth dist" #f ,(dm-lambda-meters-var (-> *ACTOR-bank* birth-dist)) 20 1 #t 0 10000 1) + (float-var "Actor pause dist" #f ,(dm-lambda-meters-var (-> *ACTOR-bank* pause-dist)) 20 1 #t 0 10000 1) + (menu "Mood override" + (function "-- SIMPLE OVERRIDE" #f nothing) + (flag "Palette 0" 0 dm-mood-override-palette-pick-func) + (flag "Palette 1" 1 dm-mood-override-palette-pick-func) + (flag "Palette 2" 2 dm-mood-override-palette-pick-func) + (flag "Palette 3" 3 dm-mood-override-palette-pick-func) + (flag "Palette 4" 4 dm-mood-override-palette-pick-func) + (flag "Palette 5" 5 dm-mood-override-palette-pick-func) + (flag "Palette 6" 6 dm-mood-override-palette-pick-func) + (flag "Palette 7" 7 dm-mood-override-palette-pick-func) + (menu "Advanced" + (flag "Overwrite" copy dm-mood-override-pick-func) + (flag "Multiply" mult dm-mood-override-pick-func) + (float-fixed-var "Palette 0 Amt" 0 dm-mood-palette-float 0 10 #t 0 1000 3) + (float-fixed-var "Palette 1 Amt" 1 dm-mood-palette-float 0 10 #t 0 1000 3) + (float-fixed-var "Palette 2 Amt" 2 dm-mood-palette-float 0 10 #t 0 1000 3) + (float-fixed-var "Palette 3 Amt" 3 dm-mood-palette-float 0 10 #t 0 1000 3) + (float-fixed-var "Palette 4 Amt" 4 dm-mood-palette-float 0 10 #t 0 1000 3) + (float-fixed-var "Palette 5 Amt" 5 dm-mood-palette-float 0 10 #t 0 1000 3) + (float-fixed-var "Palette 6 Amt" 6 dm-mood-palette-float 0 10 #t 0 1000 3) + (float-fixed-var "Palette 7 Amt" 7 dm-mood-palette-float 0 10 #t 0 1000 3) + ) + ) + (flag "Joint names" *display-joint-names* dm-boolean-toggle-pick-func) + (flag "Bone lines" *display-bones* dm-boolean-toggle-pick-func) + ) + )) + (other-menu (-> (the-as debug-menu-item-submenu other-menu-node) submenu)) + ) + (dotimes (i (progress-screen max)) + (debug-menu-append-item prog-menu + (new-dm-func (new 'debug 'string 0 (enum->string progress-screen i)) i + (lambda ((val progress-screen)) + (activate-progress *dproc* val) + (set-master-mode 'progress) + ) + )) + ) + (debug-menu-append-item other-menu prog-menu-node) + + (debug-menu-append-item (-> *debug-menu-context* root-menu) other-menu-node) + ) + + (debug-menu-append-item (-> (the debug-menu-item-submenu (ref (-> *debug-menu-context* root-menu items) 4)) submenu) + (debug-menu-make-collision-renderer-menu *debug-menu-context*)) + + (debug-menu-append-item (-> (the debug-menu-item-submenu (car (-> *debug-menu-context* root-menu items))) submenu) + (debug-menu-make-anim-tester-x-menu *debug-menu-context*)) + + (debug-menu-append-item (-> (the debug-menu-item-submenu (ref (-> (the debug-menu-item-submenu (ref (-> *debug-menu-context* root-menu items) 19)) submenu items) 7)) submenu) + (debug-menu-make-music-player-menu *debug-menu-context*)) + + ) + +(defun bg-custom ((level-name symbol)) + "Modified version of bg for the PC Port custom levels." + + ;; lookup info + (format 0 "(bg-custom ~A)%" level-name) + (let ((lev-info (lookup-level-info level-name))) + (when (= lev-info default-level) + (format 0 "Unable to (bg-custom ~A), the level was not found in *level-load-list*~%" level-name) + (return #f) + ) + + ;; kill jak (rip) + (format 0 "doing stop~%") + (stop 'play) + + ;; kill levels + (dotimes (i 2) + (unload! (-> *level* data i)) + ) + + ;; enable visiblity. the custom level won't use it, but we want it on so other levels can be loaded. + (set! (-> *level* vis?) #t) + + ;; disable border and play mode to prevent loading levels + (set! (-> *level* border?) #f) + (set! (-> *setting-control* default border-mode) #f) + (set! (-> *level* play?) #f) + + ;; disable actor vis + (set! *vis-actors* #f) + + (format 0 "doing level load~%") + ;; allocate level. This may start the loading process, but won't finish it. + (let ((lev (level-get-for-use *level* level-name 'active))) + (when (not lev) + (format 0 "Unable to load level, could not level-get-for-use~%") + (return #f) + ) + (format 0 "about to start load loop, game will freeze and hopefully come back soon~%") + + ;; spin in a loop and load it. This will cause the game to freeze during the load, + ;; but this is good enough for now. + (while (or (= (-> lev status) 'loading) + (= (-> lev status) 'loading-bt) + (= (-> lev status) 'login) + ) + (load-continue lev) + ) + + (when (not (-> lev info continues)) + (format 0 "level info has no continues, can't load it.~%") + ) + + (let ((cont (car (-> lev info continues)))) + (start 'play (the continue-point cont)) + ) + + (vis-load lev) + (set! (-> lev all-visible?) #f) + (set! (-> lev force-all-visible?) #t) + + ;; reset things + ;(initialize! *game-info* 'game (the-as game-save #f) (the-as string #f)) + ) + ) + ) + diff --git a/goal_src/jak1/pc/debug/entity-debug.gc b/goal_src/jak1/pc/debug/entity-debug.gc new file mode 100644 index 0000000000..6eb6a1ee6f --- /dev/null +++ b/goal_src/jak1/pc/debug/entity-debug.gc @@ -0,0 +1,230 @@ +;;-*-Lisp-*- +(in-package goal) + +#| + + Entity debugging utilities. + +|# + +(define *debug-temp-string* (new 'debug 'string 4096 (the string #f))) + +;; custom entity functions for pc port +(defun-debug entity-inspect-draw ((inspect-info entity-debug-inspect)) + "draw text about an entity on screen" + + (update-pad inspect-info 0) + (let* ((e (-> inspect-info entity)) (name (res-lump-struct e 'name string))) + (set! *display-actor-anim* (the string (and (-> inspect-info show-actor-info) name))) + ;; draw trans + (add-debug-x #t (bucket-id debug-no-zbuf) (-> e trans) (static-rgba 255 255 0 128)) + (if (or (not (-> inspect-info show-actor-info)) (!= (-> e type) entity-actor) (and (= (-> e type) entity-actor) (not (-> (the entity-actor e) extra process)))) + (add-debug-text-3d #t (bucket-id debug-no-zbuf) name (-> e trans) (font-color red) (new 'static 'vector2h :y 8))) + + ;; start writing text + (let* ((begin-y (- 16 (* (-> inspect-info scroll-y) 8))) (cur-y begin-y) (y-adv 8)) + (with-dma-buffer-add-bucket ((debug-buf (-> (current-frame) debug-buf)) + (bucket-id debug-no-zbuf)) + ;; basic info, actor id, etc + (draw-string-xy + (string-format "~3L~A~0L ~A~%tags: ~D size: ~D aid: #x~x~%R1/L1 scroll L3 toggle display-actor-info~%--------------------" (-> e type) name (length e) (asize-of e) (-> e aid)) + debug-buf 352 cur-y (font-color default) (font-flags shadow kerning middle)) + (+! cur-y (* 8 4)) + (cond + ((type-type? (-> e type) entity-actor) + (let ((actor (the entity-actor e))) + ;; print info for entity-actors + (draw-string-xy + (string-format "etype: ~A~%nav: ~A vis: ~D task: ~S" (-> actor etype) (!= #f (-> actor nav-mesh)) (-> actor vis-id) (game-task->string (-> actor task))) + debug-buf 352 cur-y (font-color default) (font-flags shadow kerning middle)) + (+! cur-y (* 8 2)) + ) + ) + ) + + ;; draw each tag in entity + (dotimes (i (length e)) + (let ((data (get-tag-index-data e i))) + + ;; tag info + (format (clear *debug-temp-string*) "~3L~2D)~0L ~20L~A~0L:" i (-> e tag i name) (-> e tag i elt-type)) + + ;; tag data - special cases first + (cond + ;; some water-height info + ((and (= (-> e tag i name) 'water-height) (= (-> e tag i elt-count) 4) (= (-> e tag i elt-type) float)) + (+! y-adv (* 8 1)) + (format *debug-temp-string* " ~mm ~mm ~mm~%(~S)" + (-> (the (pointer float) data) 0) + (-> (the (pointer float) data) 1) + (-> (the (pointer float) data) 2) + (begin (bit-enum->string water-flags (the int (-> (the (pointer float) data) 3)) (clear *temp-string*)) *temp-string*) + ) + ) + ;; some water-height info but with 5 elts + ((and (= (-> e tag i name) 'water-height) (= (-> e tag i elt-count) 4) (= (-> e tag i elt-type) float)) + (+! y-adv (* 8 2)) + (format *debug-temp-string* " ~mm ~mm ~mm~%(~S)~%~mm" + (-> (the (pointer float) data) 0) + (-> (the (pointer float) data) 1) + (-> (the (pointer float) data) 2) + (begin (bit-enum->string water-flags (the int (-> (the (pointer float) data) 3)) (clear *temp-string*)) *temp-string*) + (-> (the (pointer float) data) 4) + ) + ) + ;; music flava (music ambients) + ((and (= (-> e tag i name) 'flava) (= (-> e tag i elt-count) 1) (= (-> e tag i elt-type) int32)) + (format *debug-temp-string* " (music-flava ~S)" (music-flava->string (-> (the (pointer music-flava) data) 0))) + ) + ;; text id (can be hint ambient) + ((and (= (-> e tag i name) 'text-id) (= (-> e tag i elt-count) 1) (= (-> e tag i elt-type) int32)) + (format *debug-temp-string* " (game-text-id ~S)" (game-text-id->string (-> (the (pointer game-text-id) data) 0))) + ) + ;; eco-info, like in vents, crates, or collectables in general + ((and (= (-> e tag i name) 'eco-info) (= (-> e tag i elt-count) 2) (= (-> e tag i elt-type) int32)) + (format *debug-temp-string* " ~S " (pickup-type->string (the-as pickup-type (-> (the (pointer int32) data) 0)))) + (if (= (pickup-type fuel-cell) (-> (the (pointer int32) data) 0)) + (format *debug-temp-string* "~S" (game-task->string (the-as game-task (-> (the (pointer int32) data) 1)))) + (format *debug-temp-string* "~D" (-> (the (pointer int32) data) 1)) + ) + (if (= (pickup-type buzzer) (-> (the (pointer int32) data) 0)) + (format *debug-temp-string* " ~S" (game-task->string (the-as game-task (logand #xffff (-> (the (pointer int32) data) 1))))) + ) + ) + ;; fact options, usually enemies or crates + ((and (= (-> e tag i name) 'options) (= (-> e tag i elt-count) 1) (= (-> e tag i elt-type) uint32)) + (format *debug-temp-string* " (fact-options ") + (bit-enum->string fact-options (-> (the (pointer uint32) data) 0) *debug-temp-string*) + (format *debug-temp-string* ")") + ) + ;; these can be displayed visually with other tools. + ((and (= (-> e tag i name) 'visvol) (= (-> e tag i elt-count) 2) (= (-> e tag i elt-type) vector)) + (format *debug-temp-string* " display actor-vis!") + ) + ((and (= (-> e tag i name) 'path) (= (-> e tag i elt-type) vector)) + (format *debug-temp-string* " display path marks!") + ) + ((and (= (-> e tag i name) 'vol) (= (-> e tag i elt-type) vector)) + (format *debug-temp-string* " display vol marks!") + ) + (else + ;; more generic tag info + (dotimes (ii (-> e tag i elt-count)) + (format *debug-temp-string* " ") + (case (-> e tag i elt-type) + ((string symbol type) + (format *debug-temp-string* "~A" (-> (the (pointer basic) data) ii))) + ((float) + (case (-> e tag i name) + ;; meters are better here + (('spring-height 'vis-dist 'height-info 'distance 'cam-notice-dist 'cam-vert 'cam-horz 'idle-distance + 'nearest-y-threshold 'center-point 'center-radius 'notice-dist 'trigger-height 'notice-top) + (format *debug-temp-string* "~mm" (-> (the (pointer float) data) ii)) + ) + ;; degrees are better for these + (('rotoffset 'fov 'rotmin 'rotmax 'tiltmin 'tiltmax 'rotspeed) + (format *debug-temp-string* "~rdeg" (-> (the (pointer float) data) ii)) + ) + (else + (format *debug-temp-string* "~f" (-> (the (pointer float) data) ii)) + ) + ) + ) + ((int8) (format *debug-temp-string* "~D" (-> (the (pointer int8) data) ii))) + ((int16) (format *debug-temp-string* "~D" (-> (the (pointer int16) data) ii))) + ((int32) + (case (-> e tag i name) + (('final-pickup 'pickup-type) + (format *debug-temp-string* "~S" (pickup-type->string (the-as pickup-type (-> (the (pointer int32) data) ii)))) + ) + (('alt-task) + (format *debug-temp-string* "~S" (game-task->string (the-as game-task (-> (the (pointer int32) data) ii)))) + ) + (else + (format *debug-temp-string* "~D" (-> (the (pointer int32) data) ii)) + ) + ) + ) + ((uint8) + (case (-> e tag i name) + ;; not sure + (('shadow-mask) + (format *debug-temp-string* "#b~b" (-> (the (pointer uint8) data) ii)) + ) + (else + (format *debug-temp-string* "#x~x" (-> (the (pointer uint8) data) ii)) + ) + ) + ) + ((uint16) (format *debug-temp-string* "#x~x" (-> (the (pointer uint16) data) ii))) + ((uint32) + (case (-> e tag i name) + ;; actually actor-id + (('nav-mesh-actor 'open-actor 'trigger-actor 'path-actor 'state-actor 'alt-actor 'next-actor 'prev-actor + 'spawner-blocker-actor 'spawner-trigger-actor 'kill-actor 'fade-actor 'water-actor 'target-actor) + (format *debug-temp-string* "~%#x~x (~S)" (-> (the (pointer uint32) data) ii) + (res-lump-struct (entity-by-aid (-> (the (pointer uint32) data) ii)) 'name string)) + (+! y-adv 8) + ) + ;; used for fuel-cell + (('movie-mask) + (format *debug-temp-string* "#b~b" (-> (the (pointer uint32) data) ii)) + ) + (else + (format *debug-temp-string* "#x~x" (-> (the (pointer uint32) data) ii)) + ) + ) + ) + ((vector) + (case (-> e tag i name) + ;; guess + (('movie-pos) + (format *debug-temp-string* "~%(~mm ~mm ~mm ~rdeg)" + (-> (the (inline-array vector) data) ii x) + (-> (the (inline-array vector) data) ii y) + (-> (the (inline-array vector) data) ii z) + (-> (the (inline-array vector) data) ii w) + ) + ) + ;; not super useful + (('nav-mesh-sphere) + (format *debug-temp-string* "~%(~mm ~mm ~mm ~mm)" + (-> (the (inline-array vector) data) ii x) + (-> (the (inline-array vector) data) ii y) + (-> (the (inline-array vector) data) ii z) + (-> (the (inline-array vector) data) ii w) + ) + ) + (else + (format *debug-temp-string* "~%(~f ~f ~f ~f)" + (-> (the (inline-array vector) data) ii x) + (-> (the (inline-array vector) data) ii y) + (-> (the (inline-array vector) data) ii z) + (-> (the (inline-array vector) data) ii w) + ) + ) + ) + (+! y-adv 8)) + ;; no clue! please report this. + (else + (format *debug-temp-string* "" (-> e tag i elt-type)) + (set! ii (the int (-> e tag i elt-count))) + ) + ) + ) + ) + ) + + ;; draw a string for each tag instead of all at once. allows using smaller strings. + (draw-string-xy *debug-temp-string* debug-buf 352 cur-y (font-color default) (font-flags shadow kerning middle)) + (+! cur-y y-adv) + (set! y-adv 8) + + )) + ;; set max scroll based on how large the whole text was, ignore first 20 lines. + (set! (-> inspect-info scroll-y-max) (max 0 (+ -20 (/ (- cur-y begin-y) 8)))) + + ) + ))) + + diff --git a/goal_src/jak2/dgos/art.gd b/goal_src/jak2/dgos/art.gd index 93fbbf0180..4b358d2ea9 100644 --- a/goal_src/jak2/dgos/art.gd +++ b/goal_src/jak2/dgos/art.gd @@ -1,33 +1,33 @@ ("ART.CGO" - ("dir-tpages-ART.go" "dir-tpages") - ("tpage-11.go" "tpage-11") - ("tpage-31.go" "tpage-31") - ("tpage-1804.go" "tpage-1804") - ("texture-upload.o" "texture-upload") - ("tpage-12.go" "tpage-12") - ("tpage-917.go" "tpage-917") - ("tpage-918.go" "tpage-918") - ("tpage-1106.go" "tpage-1106") - ("tpage-1141.go" "tpage-1141") - ("tpage-1658.go" "tpage-1658") - ("tpage-2841.go" "tpage-2841") - ("tpage-2932.go" "tpage-2932") - ("tpage-3076.go" "tpage-3076") - ("texture-finish.o" "texture-finish") - ("collectables-ag.go" "collectables") - ("ctywide-arrow-ag.go" "ctywide-arrow") - ("crate-ag.go" "crate") - ("talk-box-ag.go" "talk-box") - ("scenecamera-ag.go" "scenecamera") - ("eco-canister-ag.go" "eco-canister") - ("hud-ring-ag.go" "hud-ring") - ("jakb-ag.go" "jakb") - ("daxter-ag.go" "daxter") - ("board-ag.go" "board") - ("gun-ag.go" "gun") - ("jak-gun+0-ag.go" "jak-gun+0") - ("jak-board+0-ag.go" "jak-board+0") - ("jak-dark+0-ag.go" "jak-dark+0") - ("jak-swim+0-ag.go" "jak-swim+0") - ("blocking-plane-ag.go" "blocking-plane") - ) + (("dir-tpages-ART.go" "dir-tpages") + "tpage-11.go" + "tpage-31.go" + "tpage-1804.go" + "texture-upload.o" + "tpage-12.go" + "tpage-917.go" + "tpage-918.go" + "tpage-1106.go" + "tpage-1141.go" + "tpage-1658.go" + "tpage-2841.go" + "tpage-2932.go" + "tpage-3076.go" + "texture-finish.o" + "collectables-ag.go" + "ctywide-arrow-ag.go" + "crate-ag.go" + "talk-box-ag.go" + "scenecamera-ag.go" + "eco-canister-ag.go" + "hud-ring-ag.go" + "jakb-ag.go" + "daxter-ag.go" + "board-ag.go" + "gun-ag.go" + "jak-gun+0-ag.go" + "jak-board+0-ag.go" + "jak-dark+0-ag.go" + "jak-swim+0-ag.go" + "blocking-plane-ag.go" + )) diff --git a/goal_src/jak2/dgos/ate.gd b/goal_src/jak2/dgos/ate.gd index 9a319c389f..9e5d844557 100644 --- a/goal_src/jak2/dgos/ate.gd +++ b/goal_src/jak2/dgos/ate.gd @@ -1,47 +1,47 @@ ("ATE.DGO" - ("ai-task-h.o" "ai-task-h") - ("bot-h.o" "bot-h") - ("bot.o" "bot") - ("bot-states.o" "bot-states") - ("sig-h.o" "sig-h") - ("sig-task.o" "sig-task") - ("sig-shot.o" "sig-shot") - ("sig-plasma.o" "sig-plasma") - ("sig.o" "sig") - ("sig-states.o" "sig-states") - ("ash-h.o" "ash-h") - ("ash-task.o" "ash-task") - ("ash-shot.o" "ash-shot") - ("ash.o" "ash") - ("ash-states.o" "ash-states") - ("spyder.o" "spyder") - ("sig0-course.o" "sig0-course") - ("ash1-course.o" "ash1-course") - ("atoll-tank.o" "atoll-tank") - ("atoll-scenes.o" "atoll-scenes") - ("sniper.o" "sniper") - ("amphibian.o" "amphibian") - ("juicer.o" "juicer") - ("metalmonk.o" "metalmonk") - ("tpage-1606.go" "tpage-1606") - ("tpage-1607.go" "tpage-1607") - ("tpage-2461.go" "tpage-2461") - ("tpage-3237.go" "tpage-3237") - ("tpage-3412.go" "tpage-3412") - ("sig-ag.go" "sig") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("atoll-tank-ag.go" "atoll-tank") - ("sig-highres-ag.go" "sig-highres") - ("juicer-ag.go" "juicer") - ("ashelin-highres-ag.go" "ashelin-highres") - ("atoll-hellcat-ag.go" "atoll-hellcat") - ("ashelin-ag.go" "ashelin") - ("metalmonk-ag.go" "metalmonk") - ("amphibian-ag.go" "amphibian") - ("spyder-ag.go" "spyder") - ("com-airlock-inner-ag.go" "com-airlock-inner") - ("palmpilot-ag.go" "palmpilot") - ("particleman-ag.go" "particleman") - ("atollext-vis.go" "atollext-vis") - ) + ("ai-task-h.o" + "bot-h.o" + "bot.o" + "bot-states.o" + "sig-h.o" + "sig-task.o" + "sig-shot.o" + "sig-plasma.o" + "sig.o" + "sig-states.o" + "ash-h.o" + "ash-task.o" + "ash-shot.o" + "ash.o" + "ash-states.o" + "spyder.o" + "sig0-course.o" + "ash1-course.o" + "atoll-tank.o" + "atoll-scenes.o" + "sniper.o" + "amphibian.o" + "juicer.o" + "metalmonk.o" + "tpage-1606.go" + "tpage-1607.go" + "tpage-2461.go" + "tpage-3237.go" + "tpage-3412.go" + "sig-ag.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "atoll-tank-ag.go" + "sig-highres-ag.go" + "juicer-ag.go" + "ashelin-highres-ag.go" + "atoll-hellcat-ag.go" + "ashelin-ag.go" + "metalmonk-ag.go" + "amphibian-ag.go" + "spyder-ag.go" + "com-airlock-inner-ag.go" + "palmpilot-ag.go" + "particleman-ag.go" + "atollext-vis.go" + )) diff --git a/goal_src/jak2/dgos/ato.gd b/goal_src/jak2/dgos/ato.gd index d676f5c43d..059fa814fd 100644 --- a/goal_src/jak2/dgos/ato.gd +++ b/goal_src/jak2/dgos/ato.gd @@ -1,24 +1,24 @@ ("ATO.DGO" - ("gun-buoy.o" "gun-buoy") - ("atoll-part.o" "atoll-part") - ("atoll-obs.o" "atoll-obs") - ("fodder.o" "fodder") - ("tpage-856.go" "tpage-856") - ("tpage-858.go" "tpage-858") - ("tpage-857.go" "tpage-857") - ("tpage-855.go" "tpage-855") - ("tpage-1083.go" "tpage-1083") - ("fodder-ag.go" "fodder") - ("liftcat-ag.go" "liftcat") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("atoll-windmill-ag.go" "atoll-windmill") - ("turbine-ag.go" "turbine") - ("slider-ag.go" "slider") - ("gun-buoy-ag.go" "gun-buoy") - ("atoll-hatch-ag.go" "atoll-hatch") - ("atoll-valve-ag.go" "atoll-valve") - ("piston-ag.go" "piston") - ("atollrotpipe-ag.go" "atollrotpipe") - ("atoll-mar-symbol-ag.go" "atoll-mar-symbol") - ("atoll-vis.go" "atoll-vis") - ) + ("gun-buoy.o" + "atoll-part.o" + "atoll-obs.o" + "fodder.o" + "tpage-856.go" + "tpage-858.go" + "tpage-857.go" + "tpage-855.go" + "tpage-1083.go" + "fodder-ag.go" + "liftcat-ag.go" + "com-airlock-outer-ag.go" + "atoll-windmill-ag.go" + "turbine-ag.go" + "slider-ag.go" + "gun-buoy-ag.go" + "atoll-hatch-ag.go" + "atoll-valve-ag.go" + "piston-ag.go" + "atollrotpipe-ag.go" + "atoll-mar-symbol-ag.go" + "atoll-vis.go" + )) diff --git a/goal_src/jak2/dgos/cab.gd b/goal_src/jak2/dgos/cab.gd index bdca16a85b..b10a64f227 100644 --- a/goal_src/jak2/dgos/cab.gd +++ b/goal_src/jak2/dgos/cab.gd @@ -1,19 +1,19 @@ ("CAB.DGO" - ("casboss-texture.o" "casboss-texture") - ("castle-baron.o" "castle-baron") - ("castle-scenes.o" "castle-scenes") - ("casboss-part.o" "casboss-part") - ("tpage-2996.go" "tpage-2996") - ("tpage-2997.go" "tpage-2997") - ("tpage-3435.go" "tpage-3435") - ("tpage-3458.go" "tpage-3458") - ("tpage-3429.go" "tpage-3429") - ("krew-highres-ag.go" "krew-highres") - ("krew-lowres-ag.go" "krew-lowres") - ("cboss-tractor-ag.go" "cboss-tractor") - ("krew-clone-ag.go" "krew-clone") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("cboss-bomb-ag.go" "cboss-bomb") - ("cboss-elevator-ag.go" "cboss-elevator") - ("casboss-vis.go" "casboss-vis") - ) + ("casboss-texture.o" + "castle-baron.o" + "castle-scenes.o" + "casboss-part.o" + "tpage-2996.go" + "tpage-2997.go" + "tpage-3435.go" + "tpage-3458.go" + "tpage-3429.go" + "krew-highres-ag.go" + "krew-lowres-ag.go" + "cboss-tractor-ag.go" + "krew-clone-ag.go" + "com-airlock-outer-ag.go" + "cboss-bomb-ag.go" + "cboss-elevator-ag.go" + "casboss-vis.go" + )) diff --git a/goal_src/jak2/dgos/cap.gd b/goal_src/jak2/dgos/cap.gd index 4d64d75279..cfb5c018a3 100644 --- a/goal_src/jak2/dgos/cap.gd +++ b/goal_src/jak2/dgos/cap.gd @@ -1,16 +1,16 @@ ("CAP.DGO" - ("caspad-obs.o" "caspad-obs") - ("caspad-part.o" "caspad-part") - ("castle-tasks.o" "castle-tasks") - ("tpage-2537.go" "tpage-2537") - ("tpage-2539.go" "tpage-2539") - ("tpage-2538.go" "tpage-2538") - ("tpage-3498.go" "tpage-3498") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("air-train-ag.go" "air-train") - ("cpad-elevator-ag.go" "cpad-elevator") - ("particleman-ag.go" "particleman") - ("caspad-vis.go" "caspad-vis") - ) + ("caspad-obs.o" + "caspad-part.o" + "castle-tasks.o" + "tpage-2537.go" + "tpage-2539.go" + "tpage-2538.go" + "tpage-3498.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "com-airlock-outer-ag.go" + "air-train-ag.go" + "cpad-elevator-ag.go" + "particleman-ag.go" + "caspad-vis.go" + )) diff --git a/goal_src/jak2/dgos/cas.gd b/goal_src/jak2/dgos/cas.gd index 64c63c7f4c..b946147fc0 100644 --- a/goal_src/jak2/dgos/cas.gd +++ b/goal_src/jak2/dgos/cas.gd @@ -1,30 +1,30 @@ ("CAS.DGO" - ("crimson-guard-level.o" "crimson-guard-level") - ("guard-conversation.o" "guard-conversation") - ("transport-level.o" "transport-level") - ("roboguard-level.o" "roboguard-level") - ("castle-texture.o" "castle-texture") - ("castle-obs.o" "castle-obs") - ("castle-part.o" "castle-part") - ("tpage-2865.go" "tpage-2865") - ("tpage-2867.go" "tpage-2867") - ("tpage-2866.go" "tpage-2866") - ("tpage-3124.go" "tpage-3124") - ("tpage-2970.go" "tpage-2970") - ("roboguard-ag.go" "roboguard") - ("crimson-guard-ag.go" "crimson-guard") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("cas-rot-bridge-ag.go" "cas-rot-bridge") - ("cas-electric-fence-ag.go" "cas-electric-fence") - ("cas-rot-blade-ag.go" "cas-rot-blade") - ("switch-ag.go" "cas-switch") - ("cas-conveyor-switch-ag.go" "cas-conveyor-switch") - ("cas-robot-door-ag.go" "cas-robot-door") - ("cas-trapdoor-ag.go" "cas-trapdoor") - ("cas-chain-plat-ag.go" "cas-chain-plat") - ("cas-elevator-ag.go" "cas-elevator") - ("cas-button-ag.go" "cas-button") - ("cas-flag-a-ag.go" "cas-flag-a") - ("cas-flag-b-ag.go" "cas-flag-b") - ("castle-vis.go" "castle-vis") - ) + ("crimson-guard-level.o" + "guard-conversation.o" + "transport-level.o" + "roboguard-level.o" + "castle-texture.o" + "castle-obs.o" + "castle-part.o" + "tpage-2865.go" + "tpage-2867.go" + "tpage-2866.go" + "tpage-3124.go" + "tpage-2970.go" + "roboguard-ag.go" + "crimson-guard-ag.go" + "com-airlock-outer-ag.go" + "cas-rot-bridge-ag.go" + "cas-electric-fence-ag.go" + "cas-rot-blade-ag.go" + "switch-ag.go" + "cas-conveyor-switch-ag.go" + "cas-robot-door-ag.go" + "cas-trapdoor-ag.go" + "cas-chain-plat-ag.go" + "cas-elevator-ag.go" + "cas-button-ag.go" + "cas-flag-a-ag.go" + "cas-flag-b-ag.go" + "castle-vis.go" + )) diff --git a/goal_src/jak2/dgos/cascity.gd b/goal_src/jak2/dgos/cascity.gd index f0252ddb03..5209735ad7 100644 --- a/goal_src/jak2/dgos/cascity.gd +++ b/goal_src/jak2/dgos/cascity.gd @@ -1,8 +1,8 @@ ("CASCITY.DGO" - ("tpage-3221.go" "tpage-3221") - ("tpage-3222.go" "tpage-3222") - ("tpage-3425.go" "tpage-3425") - ("searchlight-ag.go" "searchlight") - ("pal-windmill-ag.go" "pal-windmill") - ("cascity.go" "cascity") - ) + ("tpage-3221.go" + "tpage-3222.go" + "tpage-3425.go" + "searchlight-ag.go" + "pal-windmill-ag.go" + "cascity.go" + )) diff --git a/goal_src/jak2/dgos/casext.gd b/goal_src/jak2/dgos/casext.gd index ccbbd646b2..028cc561ed 100644 --- a/goal_src/jak2/dgos/casext.gd +++ b/goal_src/jak2/dgos/casext.gd @@ -1,13 +1,13 @@ ("CASEXT.DGO" - ("tpage-2597.go" "tpage-2597") - ("tpage-3424.go" "tpage-3424") - ("tpage-3315.go" "tpage-3315") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("ashelin-highres-ag.go" "ashelin-highres") - ("hellcat-ag.go" "hellcat") - ("heart-of-mar-ag.go" "heart-of-mar") - ("gun-upgrade-a-ag.go" "gun-upgrade-a") - ("particleman-ag.go" "particleman") - ("casext.go" "casext") - ) + ("tpage-2597.go" + "tpage-3424.go" + "tpage-3315.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "ashelin-highres-ag.go" + "hellcat-ag.go" + "heart-of-mar-ag.go" + "gun-upgrade-a-ag.go" + "particleman-ag.go" + "casext.go" + )) diff --git a/goal_src/jak2/dgos/cfa.gd b/goal_src/jak2/dgos/cfa.gd index 7f27691c7d..fd827a9f96 100644 --- a/goal_src/jak2/dgos/cfa.gd +++ b/goal_src/jak2/dgos/cfa.gd @@ -1,22 +1,22 @@ ("CFA.DGO" - ("ctyfarm-obs.o" "ctyfarm-obs") - ("ctyfarma-part.o" "ctyfarma-part") - ("ctyfarmb-part.o" "ctyfarmb-part") - ("yakow.o" "yakow") - ("tpage-2444.go" "tpage-2444") - ("tpage-2445.go" "tpage-2445") - ("tpage-2645.go" "tpage-2645") - ("tpage-2644.go" "tpage-2644") - ("tpage-2744.go" "tpage-2744") - ("tpage-2791.go" "tpage-2791") - ("tpage-2441.go" "tpage-2441") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("com-airlock-inner-ag.go" "com-airlock-inner") - ("farm-chilirots-ag.go" "farm-chilirots") - ("farm-cabbage-ag.go" "farm-cabbage") - ("farm-marrow-ag.go" "farm-marrow") - ("farm-beetree-ag.go" "farm-beetree") - ("farm-small-cabbage-ag.go" "farm-small-cabbage") - ("farm-sprinkler-barrels-ag.go" "farm-sprinkler-barrels") - ("ctyfarma-vis.go" "ctyfarma-vis") - ) + ("ctyfarm-obs.o" + "ctyfarma-part.o" + "ctyfarmb-part.o" + "yakow.o" + "tpage-2444.go" + "tpage-2445.go" + "tpage-2645.go" + "tpage-2644.go" + "tpage-2744.go" + "tpage-2791.go" + "tpage-2441.go" + "com-airlock-outer-ag.go" + "com-airlock-inner-ag.go" + "farm-chilirots-ag.go" + "farm-cabbage-ag.go" + "farm-marrow-ag.go" + "farm-beetree-ag.go" + "farm-small-cabbage-ag.go" + "farm-sprinkler-barrels-ag.go" + "ctyfarma-vis.go" + )) diff --git a/goal_src/jak2/dgos/cfb.gd b/goal_src/jak2/dgos/cfb.gd index 9cac0bef5e..73f999aa74 100644 --- a/goal_src/jak2/dgos/cfb.gd +++ b/goal_src/jak2/dgos/cfb.gd @@ -1,21 +1,21 @@ ("CFB.DGO" - ("ctyfarm-obs.o" "ctyfarm-obs") - ("ctyfarma-part.o" "ctyfarma-part") - ("ctyfarmb-part.o" "ctyfarmb-part") - ("yakow.o" "yakow") - ("tpage-3005.go" "tpage-3005") - ("tpage-3009.go" "tpage-3009") - ("tpage-3007.go" "tpage-3007") - ("tpage-3008.go" "tpage-3008") - ("tpage-3006.go" "tpage-3006") - ("tpage-3004.go" "tpage-3004") - ("tpage-2442.go" "tpage-2442") - ("yakow-ag.go" "yakow") - ("farm-chilirots-ag.go" "farm-chilirots") - ("farm-cabbage-ag.go" "farm-cabbage") - ("farm-marrow-ag.go" "farm-marrow") - ("farm-beetree-ag.go" "farm-beetree") - ("farm-small-cabbage-ag.go" "farm-small-cabbage") - ("farm-sprinkler-barrels-ag.go" "farm-sprinkler-barrels") - ("ctyfarmb-vis.go" "ctyfarmb-vis") - ) + ("ctyfarm-obs.o" + "ctyfarma-part.o" + "ctyfarmb-part.o" + "yakow.o" + "tpage-3005.go" + "tpage-3009.go" + "tpage-3007.go" + "tpage-3008.go" + "tpage-3006.go" + "tpage-3004.go" + "tpage-2442.go" + "yakow-ag.go" + "farm-chilirots-ag.go" + "farm-cabbage-ag.go" + "farm-marrow-ag.go" + "farm-beetree-ag.go" + "farm-small-cabbage-ag.go" + "farm-sprinkler-barrels-ag.go" + "ctyfarmb-vis.go" + )) diff --git a/goal_src/jak2/dgos/cga.gd b/goal_src/jak2/dgos/cga.gd index bc226a7120..7e4340d543 100644 --- a/goal_src/jak2/dgos/cga.gd +++ b/goal_src/jak2/dgos/cga.gd @@ -1,10 +1,10 @@ ("CGA.DGO" - ("ctygena-part.o" "ctygena-part") - ("neon-praxis-part.o" "neon-praxis-part") - ("tpage-1137.go" "tpage-1137") - ("tpage-1138.go" "tpage-1138") - ("tpage-1117.go" "tpage-1117") - ("tpage-1637.go" "tpage-1637") - ("ctyn-lamp-ag.go" "ctyn-lamp") - ("ctygena-vis.go" "ctygena-vis") - ) + ("ctygena-part.o" + "neon-praxis-part.o" + "tpage-1137.go" + "tpage-1138.go" + "tpage-1117.go" + "tpage-1637.go" + "ctyn-lamp-ag.go" + "ctygena-vis.go" + )) diff --git a/goal_src/jak2/dgos/cgb.gd b/goal_src/jak2/dgos/cgb.gd index a6733d2310..3ba599bd59 100644 --- a/goal_src/jak2/dgos/cgb.gd +++ b/goal_src/jak2/dgos/cgb.gd @@ -1,11 +1,11 @@ ("CGB.DGO" - ("ctygenb-part.o" "ctygenb-part") - ("tpage-955.go" "tpage-955") - ("tpage-957.go" "tpage-957") - ("tpage-956.go" "tpage-956") - ("tpage-958.go" "tpage-958") - ("tpage-1019.go" "tpage-1019") - ("tpage-1638.go" "tpage-1638") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("ctygenb-vis.go" "ctygenb-vis") - ) + ("ctygenb-part.o" + "tpage-955.go" + "tpage-957.go" + "tpage-956.go" + "tpage-958.go" + "tpage-1019.go" + "tpage-1638.go" + "com-airlock-outer-ag.go" + "ctygenb-vis.go" + )) diff --git a/goal_src/jak2/dgos/cgc.gd b/goal_src/jak2/dgos/cgc.gd index bfca76cf42..5f7c3f7813 100644 --- a/goal_src/jak2/dgos/cgc.gd +++ b/goal_src/jak2/dgos/cgc.gd @@ -1,9 +1,9 @@ ("CGC.DGO" - ("ctygenc-part.o" "ctygenc-part") - ("tpage-1605.go" "tpage-1605") - ("tpage-2285.go" "tpage-2285") - ("tpage-1612.go" "tpage-1612") - ("tpage-1639.go" "tpage-1639") - ("ctyn-lamp-ag.go" "ctyn-lamp") - ("ctygenc-vis.go" "ctygenc-vis") - ) + ("ctygenc-part.o" + "tpage-1605.go" + "tpage-2285.go" + "tpage-1612.go" + "tpage-1639.go" + "ctyn-lamp-ag.go" + "ctygenc-vis.go" + )) diff --git a/goal_src/jak2/dgos/cia.gd b/goal_src/jak2/dgos/cia.gd index 27f663f1a4..7ffad40746 100644 --- a/goal_src/jak2/dgos/cia.gd +++ b/goal_src/jak2/dgos/cia.gd @@ -1,10 +1,10 @@ ("CIA.DGO" - ("ctyinda-part.o" "ctyinda-part") - ("ctyinda-obs.o" "ctyinda-obs") - ("tpage-1561.go" "tpage-1561") - ("tpage-1562.go" "tpage-1562") - ("tpage-1361.go" "tpage-1361") - ("tpage-1640.go" "tpage-1640") - ("door-ctyinda-ag.go" "vin-door-ctyinda") - ("ctyinda-vis.go" "ctyinda-vis") - ) + ("ctyinda-part.o" + "ctyinda-obs.o" + "tpage-1561.go" + "tpage-1562.go" + "tpage-1361.go" + "tpage-1640.go" + "door-ctyinda-ag.go" + "ctyinda-vis.go" + )) diff --git a/goal_src/jak2/dgos/cib.gd b/goal_src/jak2/dgos/cib.gd index f7840a8f86..4bccbd3f45 100644 --- a/goal_src/jak2/dgos/cib.gd +++ b/goal_src/jak2/dgos/cib.gd @@ -1,11 +1,11 @@ ("CIB.DGO" - ("ctyindb-part.o" "ctyindb-part") - ("ctyindb-obs.o" "ctyindb-obs") - ("tpage-1565.go" "tpage-1565") - ("tpage-1577.go" "tpage-1577") - ("tpage-1601.go" "tpage-1601") - ("tpage-1614.go" "tpage-1614") - ("tpage-1642.go" "tpage-1642") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("ctyindb-vis.go" "ctyindb-vis") - ) + ("ctyindb-part.o" + "ctyindb-obs.o" + "tpage-1565.go" + "tpage-1577.go" + "tpage-1601.go" + "tpage-1614.go" + "tpage-1642.go" + "com-airlock-outer-ag.go" + "ctyindb-vis.go" + )) diff --git a/goal_src/jak2/dgos/cma.gd b/goal_src/jak2/dgos/cma.gd index d005bb3b84..a91a27f101 100644 --- a/goal_src/jak2/dgos/cma.gd +++ b/goal_src/jak2/dgos/cma.gd @@ -1,19 +1,19 @@ ("CMA.DGO" - ("ctymark-obs.o" "ctymark-obs") - ("ctymarka-part.o" "ctymarka-part") - ("ctymarkb-part.o" "ctymarkb-part") - ("tpage-2739.go" "tpage-2739") - ("tpage-2743.go" "tpage-2743") - ("tpage-2740.go" "tpage-2740") - ("tpage-2741.go" "tpage-2741") - ("tpage-2742.go" "tpage-2742") - ("tpage-1615.go" "tpage-1615") - ("tpage-1643.go" "tpage-1643") - ("market-sack-b-ag.go" "market-sack-b") - ("market-sack-a-ag.go" "market-sack-a") - ("market-crate-ag.go" "market-crate") - ("market-basket-b-ag.go" "market-basket-b") - ("market-basket-a-ag.go" "market-basket-a") - ("cty-fruit-stand-ag.go" "cty-fruit-stand") - ("ctymarka-vis.go" "ctymarka-vis") - ) + ("ctymark-obs.o" + "ctymarka-part.o" + "ctymarkb-part.o" + "tpage-2739.go" + "tpage-2743.go" + "tpage-2740.go" + "tpage-2741.go" + "tpage-2742.go" + "tpage-1615.go" + "tpage-1643.go" + "market-sack-b-ag.go" + "market-sack-a-ag.go" + "market-crate-ag.go" + "market-basket-b-ag.go" + "market-basket-a-ag.go" + "cty-fruit-stand-ag.go" + "ctymarka-vis.go" + )) diff --git a/goal_src/jak2/dgos/cmb.gd b/goal_src/jak2/dgos/cmb.gd index 30d8707978..f8821b6fcb 100644 --- a/goal_src/jak2/dgos/cmb.gd +++ b/goal_src/jak2/dgos/cmb.gd @@ -1,19 +1,19 @@ ("CMB.DGO" - ("ctymark-obs.o" "ctymark-obs") - ("ctymarka-part.o" "ctymarka-part") - ("ctymarkb-part.o" "ctymarkb-part") - ("tpage-2734.go" "tpage-2734") - ("tpage-2738.go" "tpage-2738") - ("tpage-2735.go" "tpage-2735") - ("tpage-2737.go" "tpage-2737") - ("tpage-2736.go" "tpage-2736") - ("tpage-1616.go" "tpage-1616") - ("tpage-1644.go" "tpage-1644") - ("market-sack-b-ag.go" "market-sack-b") - ("market-sack-a-ag.go" "market-sack-a") - ("market-crate-ag.go" "market-crate") - ("market-basket-b-ag.go" "market-basket-b") - ("market-basket-a-ag.go" "market-basket-a") - ("cty-fruit-stand-ag.go" "cty-fruit-stand") - ("ctymarkb-vis.go" "ctymarkb-vis") - ) + ("ctymark-obs.o" + "ctymarka-part.o" + "ctymarkb-part.o" + "tpage-2734.go" + "tpage-2738.go" + "tpage-2735.go" + "tpage-2737.go" + "tpage-2736.go" + "tpage-1616.go" + "tpage-1644.go" + "market-sack-b-ag.go" + "market-sack-a-ag.go" + "market-crate-ag.go" + "market-basket-b-ag.go" + "market-basket-a-ag.go" + "cty-fruit-stand-ag.go" + "ctymarkb-vis.go" + )) diff --git a/goal_src/jak2/dgos/coa.gd b/goal_src/jak2/dgos/coa.gd index 688347e5ee..4706907283 100644 --- a/goal_src/jak2/dgos/coa.gd +++ b/goal_src/jak2/dgos/coa.gd @@ -1,25 +1,25 @@ ("COA.DGO" - ("jak-pole+0-ag.go" "jak-pole+0") - ("consite-texture.o" "consite-texture") - ("consite-part.o" "consite-part") - ("consite-scenes.o" "consite-scenes") - ("consite-obs.o" "consite-obs") - ("baron-consite+0-ag.go" "baron-consite+0") - ("tpage-3030.go" "tpage-3030") - ("tpage-3031.go" "tpage-3031") - ("tpage-3029.go" "tpage-3029") - ("tpage-3141.go" "tpage-3141") - ("consite-break-scaffold-a-ag.go" "consite-break-scaffold-a") - ("consite-break-scaffold-ag.go" "consite-break-scaffold") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("baron-highres-ag.go" "baron-highres") - ("crimson-guard-highres-ag.go" "crimson-guard-highres") - ("consite-bomb-elevator-ag.go" "consite-bomb-elevator") - ("crimson-guard-lowres-ag.go" "crimson-guard-lowres") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("consite-silo-doors-ag.go" "consite-silo-doors") - ("precursor-stone-ag.go" "precursor-stone") - ("bomb-trigger-ag.go" "bomb-trigger") - ("consite-vis.go" "consite-vis") - ) + ("jak-pole+0-ag.go" + "consite-texture.o" + "consite-part.o" + "consite-scenes.o" + "consite-obs.o" + "baron-consite+0-ag.go" + "tpage-3030.go" + "tpage-3031.go" + "tpage-3029.go" + "tpage-3141.go" + "consite-break-scaffold-a-ag.go" + "consite-break-scaffold-ag.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "baron-highres-ag.go" + "crimson-guard-highres-ag.go" + "consite-bomb-elevator-ag.go" + "crimson-guard-lowres-ag.go" + "com-airlock-outer-ag.go" + "consite-silo-doors-ag.go" + "precursor-stone-ag.go" + "bomb-trigger-ag.go" + "consite-vis.go" + )) diff --git a/goal_src/jak2/dgos/cob.gd b/goal_src/jak2/dgos/cob.gd index 8b50614704..855d382dc7 100644 --- a/goal_src/jak2/dgos/cob.gd +++ b/goal_src/jak2/dgos/cob.gd @@ -1,15 +1,15 @@ ("COB.DGO" - ("consiteb-part.o" "consiteb-part") - ("tpage-3032.go" "tpage-3032") - ("tpage-3033.go" "tpage-3033") - ("tpage-3142.go" "tpage-3142") - ("tpage-3180.go" "tpage-3180") - ("tpage-3239.go" "tpage-3239") - ("kor-transform-ag.go" "kor-transform") - ("kor-break-ag.go" "kor-break") - ("metalkor-highres-ag.go" "metalkor-highres") - ("com-airlock-inner-ag.go" "com-airlock-inner") - ("door-ctyinda-ag.go" "vin-door-ctyinda") - ("kor-break-ray-ag.go" "kor-break-ray") - ("consiteb-vis.go" "consiteb-vis") - ) + ("consiteb-part.o" + "tpage-3032.go" + "tpage-3033.go" + "tpage-3142.go" + "tpage-3180.go" + "tpage-3239.go" + "kor-transform-ag.go" + "kor-break-ag.go" + "metalkor-highres-ag.go" + "com-airlock-inner-ag.go" + "door-ctyinda-ag.go" + "kor-break-ray-ag.go" + "consiteb-vis.go" + )) diff --git a/goal_src/jak2/dgos/common.gd b/goal_src/jak2/dgos/common.gd index 42f3db7aa3..387bdba557 100644 --- a/goal_src/jak2/dgos/common.gd +++ b/goal_src/jak2/dgos/common.gd @@ -1,37 +1,37 @@ ("COMMON.CGO" - ("los-control-h.o" "los-control-h") - ("airlock.o" "airlock") - ("water-anim.o" "water-anim") - ("blocking-plane.o" "blocking-plane") - ("idle-control.o" "idle-control") - ("dark-eco-pool.o" "dark-eco-pool") - ("enemy-h.o" "enemy-h") - ("nav-enemy-h.o" "nav-enemy-h") - ("rigid-body-h.o" "rigid-body-h") - ("enemy.o" "enemy") - ("nav-enemy.o" "nav-enemy") - ("base-plat.o" "base-plat") - ("plat.o" "plat") - ("basebutton.o" "basebutton") - ("bouncer.o" "bouncer") - ("conveyor.o" "conveyor") - ("elevator.o" "elevator") - ("rigid-body.o" "rigid-body") - ("rigid-body-queue.o" "rigid-body-queue") - ("rigid-body-plat.o" "rigid-body-plat") - ("joint-exploder.o" "joint-exploder") - ("simple-focus.o" "simple-focus") - ("simple-nav-sphere.o" "simple-nav-sphere") - ("process-taskable.o" "process-taskable") - ("scene-actor.o" "scene-actor") - ("scene-looper.o" "scene-looper") - ("warp-gate.o" "warp-gate") - ("guard-projectile.o" "guard-projectile") - ("metalhead-projectile.o" "metalhead-projectile") - ("los-control.o" "los-control") - ("grunt.o" "grunt") - ("flitter.o" "flitter") - ("battle.o" "battle") - ("elec-gate.o" "elec-gate") - ("cty-guard-turret-button.o" "cty-guard-turret-button") - ) + ("los-control-h.o" + "airlock.o" + "water-anim.o" + "blocking-plane.o" + "idle-control.o" + "dark-eco-pool.o" + "enemy-h.o" + "nav-enemy-h.o" + "rigid-body-h.o" + "enemy.o" + "nav-enemy.o" + "base-plat.o" + "plat.o" + "basebutton.o" + "bouncer.o" + "conveyor.o" + "elevator.o" + "rigid-body.o" + "rigid-body-queue.o" + "rigid-body-plat.o" + "joint-exploder.o" + "simple-focus.o" + "simple-nav-sphere.o" + "process-taskable.o" + "scene-actor.o" + "scene-looper.o" + "warp-gate.o" + "guard-projectile.o" + "metalhead-projectile.o" + "los-control.o" + "grunt.o" + "flitter.o" + "battle.o" + "elec-gate.o" + "cty-guard-turret-button.o" + )) diff --git a/goal_src/jak2/dgos/cpa.gd b/goal_src/jak2/dgos/cpa.gd index 8506917654..22d5eb8082 100644 --- a/goal_src/jak2/dgos/cpa.gd +++ b/goal_src/jak2/dgos/cpa.gd @@ -1,16 +1,16 @@ ("CPA.DGO" - ("ctypal-part.o" "ctypal-part") - ("ctypal-obs.o" "ctypal-obs") - ("tpage-2526.go" "tpage-2526") - ("tpage-2527.go" "tpage-2527") - ("tpage-3423.go" "tpage-3423") - ("tpage-2528.go" "tpage-2528") - ("tpage-1636.go" "tpage-1636") - ("ctypal-baron-statue-broken-ag.go" "ctypal-baron-statue-broken") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("com-airlock-inner-ag.go" "com-airlock-inner") - ("water-anim-ctypal-ag.go" "water-anim-ctypal") - ("palace-door-ag.go" "palace-door") - ("ctypal-broke-wall-ag.go" "ctypal-broke-wall") - ("ctypal-vis.go" "ctypal-vis") - ) + ("ctypal-part.o" + "ctypal-obs.o" + "tpage-2526.go" + "tpage-2527.go" + "tpage-3423.go" + "tpage-2528.go" + "tpage-1636.go" + "ctypal-baron-statue-broken-ag.go" + "com-airlock-outer-ag.go" + "com-airlock-inner-ag.go" + "water-anim-ctypal-ag.go" + "palace-door-ag.go" + "ctypal-broke-wall-ag.go" + "ctypal-vis.go" + )) diff --git a/goal_src/jak2/dgos/cpo.gd b/goal_src/jak2/dgos/cpo.gd index 2b25495d09..8b81029dea 100644 --- a/goal_src/jak2/dgos/cpo.gd +++ b/goal_src/jak2/dgos/cpo.gd @@ -1,14 +1,14 @@ ("CPO.DGO" - ("ctyport-part.o" "ctyport-part") - ("tpage-1557.go" "tpage-1557") - ("tpage-1560.go" "tpage-1560") - ("tpage-1558.go" "tpage-1558") - ("tpage-1325.go" "tpage-1325") - ("tpage-1645.go" "tpage-1645") - ("barge-ag.go" "barge") - ("mecha-daxter-ag.go" "mecha-daxter") - ("farthy-ag.go" "farthy") - ("air-train-ag.go" "air-train") - ("hip-door-a-ag.go" "hip-door-a") - ("ctyport-vis.go" "ctyport-vis") - ) + ("ctyport-part.o" + "tpage-1557.go" + "tpage-1560.go" + "tpage-1558.go" + "tpage-1325.go" + "tpage-1645.go" + "barge-ag.go" + "mecha-daxter-ag.go" + "farthy-ag.go" + "air-train-ag.go" + "hip-door-a-ag.go" + "ctyport-vis.go" + )) diff --git a/goal_src/jak2/dgos/cta.gd b/goal_src/jak2/dgos/cta.gd index 25590d4e0d..a9fe91a83b 100644 --- a/goal_src/jak2/dgos/cta.gd +++ b/goal_src/jak2/dgos/cta.gd @@ -1,13 +1,13 @@ ("CTA.DGO" - ("ctysluma-part.o" "ctysluma-part") - ("neon-baron-part.o" "neon-baron-part") - ("tpage-974.go" "tpage-974") - ("tpage-973.go" "tpage-973") - ("tpage-1680.go" "tpage-1680") - ("tpage-1021.go" "tpage-1021") - ("tpage-1646.go" "tpage-1646") - ("fort-entry-gate-ag.go" "fort-entry-gate") - ("cty-fruit-stand-ag.go" "cty-fruit-stand") - ("hide-door-a-ag.go" "hide-door-a") - ("ctysluma-vis.go" "ctysluma-vis") - ) + ("ctysluma-part.o" + "neon-baron-part.o" + "tpage-974.go" + "tpage-973.go" + "tpage-1680.go" + "tpage-1021.go" + "tpage-1646.go" + "fort-entry-gate-ag.go" + "cty-fruit-stand-ag.go" + "hide-door-a-ag.go" + "ctysluma-vis.go" + )) diff --git a/goal_src/jak2/dgos/ctb.gd b/goal_src/jak2/dgos/ctb.gd index bd3ea24484..b9e3348ca1 100644 --- a/goal_src/jak2/dgos/ctb.gd +++ b/goal_src/jak2/dgos/ctb.gd @@ -1,12 +1,12 @@ ("CTB.DGO" - ("ctyslumb-part.o" "ctyslumb-part") - ("tpage-977.go" "tpage-977") - ("tpage-1308.go" "tpage-1308") - ("tpage-978.go" "tpage-978") - ("tpage-1022.go" "tpage-1022") - ("tpage-1647.go" "tpage-1647") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("com-airlock-inner-ag.go" "com-airlock-inner") - ("fort-entry-gate-ag.go" "fort-entry-gate") - ("ctyslumb-vis.go" "ctyslumb-vis") - ) + ("ctyslumb-part.o" + "tpage-977.go" + "tpage-1308.go" + "tpage-978.go" + "tpage-1022.go" + "tpage-1647.go" + "com-airlock-outer-ag.go" + "com-airlock-inner-ag.go" + "fort-entry-gate-ag.go" + "ctyslumb-vis.go" + )) diff --git a/goal_src/jak2/dgos/ctc.gd b/goal_src/jak2/dgos/ctc.gd index 773ed23cee..d392802ed7 100644 --- a/goal_src/jak2/dgos/ctc.gd +++ b/goal_src/jak2/dgos/ctc.gd @@ -1,11 +1,11 @@ ("CTC.DGO" - ("ctyslumc-part.o" "ctyslumc-part") - ("tpage-1268.go" "tpage-1268") - ("tpage-1303.go" "tpage-1303") - ("tpage-1269.go" "tpage-1269") - ("tpage-1023.go" "tpage-1023") - ("tpage-1648.go" "tpage-1648") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("door-ag.go" "oracle-door") - ("ctyslumc-vis.go" "ctyslumc-vis") - ) + ("ctyslumc-part.o" + "tpage-1268.go" + "tpage-1303.go" + "tpage-1269.go" + "tpage-1023.go" + "tpage-1648.go" + "com-airlock-outer-ag.go" + "door-ag.go" + "ctyslumc-vis.go" + )) diff --git a/goal_src/jak2/dgos/ctyasha.gd b/goal_src/jak2/dgos/ctyasha.gd index 9dbeb3d418..8a32d1bb2a 100644 --- a/goal_src/jak2/dgos/ctyasha.gd +++ b/goal_src/jak2/dgos/ctyasha.gd @@ -1,33 +1,33 @@ ("CTYASHA.DGO" - ("ai-task-h.o" "ai-task-h") - ("bot-h.o" "bot-h") - ("bot.o" "bot") - ("bot-states.o" "bot-states") - ("ash-h.o" "ash-h") - ("ash-task.o" "ash-task") - ("ash-shot.o" "ash-shot") - ("ash.o" "ash") - ("ash-states.o" "ash-states") - ("juicer.o" "juicer") - ("ctyasha-obs.o" "ctyasha-obs") - ("ash4-course.o" "ash4-course") - ("tpage-1496.go" "tpage-1496") - ("tpage-1409.go" "tpage-1409") - ("tpage-3240.go" "tpage-3240") - ("tpage-3416.go" "tpage-3416") - ("daxter-highres-ag.go" "daxter-highres") - ("grunt-ag.go" "grunt") - ("jak-highres-ag.go" "jak-highres") - ("juicer-ag.go" "juicer") - ("ashelin-highres-ag.go" "ashelin-highres") - ("ashelin-ag.go" "ashelin") - ("crimson-guard-highres-ag.go" "crimson-guard-highres") - ("tanker-ag.go" "tanker") - ("crimson-guard-lowres-ag.go" "crimson-guard-lowres") - ("tanker-roof-break-ag.go" "tanker-roof-break") - ("tanker-crash-ag.go" "tanker-crash") - ("tanker-barrels-ag.go" "tanker-barrels") - ("tanker-container-ag.go" "tanker-container") - ("tanker-one-barrel-ag.go" "tanker-one-barrel") - ("ctyasha.go" "ctyasha") - ) + ("ai-task-h.o" + "bot-h.o" + "bot.o" + "bot-states.o" + "ash-h.o" + "ash-task.o" + "ash-shot.o" + "ash.o" + "ash-states.o" + "juicer.o" + "ctyasha-obs.o" + "ash4-course.o" + "tpage-1496.go" + "tpage-1409.go" + "tpage-3240.go" + "tpage-3416.go" + "daxter-highres-ag.go" + "grunt-ag.go" + "jak-highres-ag.go" + "juicer-ag.go" + "ashelin-highres-ag.go" + "ashelin-ag.go" + "crimson-guard-highres-ag.go" + "tanker-ag.go" + "crimson-guard-lowres-ag.go" + "tanker-roof-break-ag.go" + "tanker-crash-ag.go" + "tanker-barrels-ag.go" + "tanker-container-ag.go" + "tanker-one-barrel-ag.go" + "ctyasha.go" + )) diff --git a/goal_src/jak2/dgos/ctykora.gd b/goal_src/jak2/dgos/ctykora.gd index 2cf34ca523..a8c92969dc 100644 --- a/goal_src/jak2/dgos/ctykora.gd +++ b/goal_src/jak2/dgos/ctykora.gd @@ -1,35 +1,35 @@ ("CTYKORA.DGO" - ("ai-task-h.o" "ai-task-h") - ("bot-h.o" "bot-h") - ("bot.o" "bot") - ("bot-states.o" "bot-states") - ("hal-h.o" "hal-h") - ("hal-task.o" "hal-task") - ("hal.o" "hal") - ("kid-h.o" "kid-h") - ("kor-h.o" "kor-h") - ("hal3-course.o" "hal3-course") - ("kid-task.o" "kid-task") - ("kid.o" "kid") - ("kid-states.o" "kid-states") - ("kor-task.o" "kor-task") - ("kor.o" "kor") - ("kor-states.o" "kor-states") - ("kid3-course.o" "kid3-course") - ("kor3-course.o" "kor3-course") - ("jak-dark-on+0-ag.go" "jak-dark-on+0") - ("tpage-1451.go" "tpage-1451") - ("tpage-2727.go" "tpage-2727") - ("tpage-3224.go" "tpage-3224") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("kor-highres-ag.go" "kor-highres") - ("atoll-hellcat-ag.go" "atoll-hellcat") - ("kor-ag.go" "kor") - ("kid-highres-ag.go" "kid-highres") - ("crimson-guard-highres-ag.go" "crimson-guard-highres") - ("kid-ag.go" "kid") - ("crimson-guard-lowres-ag.go" "crimson-guard-lowres") - ("transport-ag.go" "transport") - ("ctykora.go" "ctykora") - ) + ("ai-task-h.o" + "bot-h.o" + "bot.o" + "bot-states.o" + "hal-h.o" + "hal-task.o" + "hal.o" + "kid-h.o" + "kor-h.o" + "hal3-course.o" + "kid-task.o" + "kid.o" + "kid-states.o" + "kor-task.o" + "kor.o" + "kor-states.o" + "kid3-course.o" + "kor3-course.o" + "jak-dark-on+0-ag.go" + "tpage-1451.go" + "tpage-2727.go" + "tpage-3224.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "kor-highres-ag.go" + "atoll-hellcat-ag.go" + "kor-ag.go" + "kid-highres-ag.go" + "crimson-guard-highres-ag.go" + "kid-ag.go" + "crimson-guard-lowres-ag.go" + "transport-ag.go" + "ctykora.go" + )) diff --git a/goal_src/jak2/dgos/cwi.gd b/goal_src/jak2/dgos/cwi.gd index 7fae950fdd..98e14147d7 100644 --- a/goal_src/jak2/dgos/cwi.gd +++ b/goal_src/jak2/dgos/cwi.gd @@ -1,68 +1,68 @@ ("CWI.DGO" - ("nav-graph-h.o" "nav-graph-h") - ("traffic-engine-h.o" "traffic-engine-h") - ("vehicle-h.o" "vehicle-h") - ("citizen-h.o" "citizen-h") - ("height-map-h.o" "height-map-h") - ("ctywide-obs-h.o" "ctywide-obs-h") - ("height-map.o" "height-map") - ("traffic-height-map.o" "traffic-height-map") - ("nav-graph.o" "nav-graph") - ("vehicle-rider.o" "vehicle-rider") - ("vehicle-control.o" "vehicle-control") - ("vehicle-part.o" "vehicle-part") - ("vehicle-effects.o" "vehicle-effects") - ("vehicle.o" "vehicle") - ("vehicle-util.o" "vehicle-util") - ("vehicle-physics.o" "vehicle-physics") - ("vehicle-states.o" "vehicle-states") - ("vehicle-guard.o" "vehicle-guard") - ("transport.o" "transport") - ("bike.o" "bike") - ("car.o" "car") - ("test-bike.o" "test-bike") - ("test-car.o" "test-car") - ("citizen.o" "citizen") - ("civilian.o" "civilian") - ("guard.o" "guard") - ("citizen-norm.o" "citizen-norm") - ("citizen-fat.o" "citizen-fat") - ("citizen-chick.o" "citizen-chick") - ("citizen-enemy.o" "citizen-enemy") - ("metalhead-predator.o" "metalhead-predator") - ("metalhead-grunt.o" "metalhead-grunt") - ("metalhead-flitter.o" "metalhead-flitter") - ("traffic-engine.o" "traffic-engine") - ("trail-graph.o" "trail-graph") - ("trail.o" "trail") - ("traffic-manager.o" "traffic-manager") - ("ctywide-texture.o" "ctywide-texture") - ("ctywide-part.o" "ctywide-part") - ("ctywide-obs.o" "ctywide-obs") - ("ctywide-tasks.o" "ctywide-tasks") - ("ctywide-scenes.o" "ctywide-scenes") - ("ctywide-speech.o" "ctywide-speech") - ("ctyport-obs.o" "ctyport-obs") - ("target-pilot.o" "target-pilot") - ("pilot-states.o" "pilot-states") - ("jak-pilot+0-ag.go" "jak-pilot+0") - ("searchlight.o" "searchlight") - ("tpage-1264.go" "tpage-1264") - ("tpage-1266.go" "tpage-1266") - ("tpage-1265.go" "tpage-1265") - ("tpage-1674.go" "tpage-1674") - ("tpage-1118.go" "tpage-1118") - ("tpage-1657.go" "tpage-1657") - ("baron-statue-ag.go" "baron-statue") - ("cty-guard-turret-ag.go" "cty-guard-turret") - ("vehicle-explosion-ag.go" "vehicle-explosion") - ("barons-ship-lores-ag.go" "barons-ship-lores") - ("propa-ag.go" "propa") - ("vehicle-turret-ag.go" "vehicle-turret") - ("lurker-pipe-lid-ag.go" "lurker-pipe-lid") - ("searchlight-ag.go" "searchlight") - ("burning-bush-ag.go" "burning-bush") - ("stadium-barrier-ag.go" "stadium-barrier") - ("security-wall-ag.go" "security-wall") - ("ctywide-vis.go" "ctywide-vis") - ) + ("nav-graph-h.o" + "traffic-engine-h.o" + "vehicle-h.o" + "citizen-h.o" + "height-map-h.o" + "ctywide-obs-h.o" + "height-map.o" + "traffic-height-map.o" + "nav-graph.o" + "vehicle-rider.o" + "vehicle-control.o" + "vehicle-part.o" + "vehicle-effects.o" + "vehicle.o" + "vehicle-util.o" + "vehicle-physics.o" + "vehicle-states.o" + "vehicle-guard.o" + "transport.o" + "bike.o" + "car.o" + "test-bike.o" + "test-car.o" + "citizen.o" + "civilian.o" + "guard.o" + "citizen-norm.o" + "citizen-fat.o" + "citizen-chick.o" + "citizen-enemy.o" + "metalhead-predator.o" + "metalhead-grunt.o" + "metalhead-flitter.o" + "traffic-engine.o" + "trail-graph.o" + "trail.o" + "traffic-manager.o" + "ctywide-texture.o" + "ctywide-part.o" + "ctywide-obs.o" + "ctywide-tasks.o" + "ctywide-scenes.o" + "ctywide-speech.o" + "ctyport-obs.o" + "target-pilot.o" + "pilot-states.o" + "jak-pilot+0-ag.go" + "searchlight.o" + "tpage-1264.go" + "tpage-1266.go" + "tpage-1265.go" + "tpage-1674.go" + "tpage-1118.go" + "tpage-1657.go" + "baron-statue-ag.go" + "cty-guard-turret-ag.go" + "vehicle-explosion-ag.go" + "barons-ship-lores-ag.go" + "propa-ag.go" + "vehicle-turret-ag.go" + "lurker-pipe-lid-ag.go" + "searchlight-ag.go" + "burning-bush-ag.go" + "stadium-barrier-ag.go" + "security-wall-ag.go" + "ctywide-vis.go" + )) diff --git a/goal_src/jak2/dgos/d3a.gd b/goal_src/jak2/dgos/d3a.gd index 4f050d5fc6..9f0562a471 100644 --- a/goal_src/jak2/dgos/d3a.gd +++ b/goal_src/jak2/dgos/d3a.gd @@ -1,49 +1,49 @@ ("D3A.DGO" - ("hover-formation-h.o" "hover-formation-h") - ("hover-nav-control-h.o" "hover-nav-control-h") - ("hover-enemy-h.o" "hover-enemy-h") - ("hover-nav-network.o" "hover-nav-network") - ("hover-nav-control.o" "hover-nav-control") - ("hover-enemy.o" "hover-enemy") - ("hover-enemy-battle.o" "hover-enemy-battle") - ("hover-formation.o" "hover-formation") - ("hover-nav-edit.o" "hover-nav-edit") - ("wasp-part.o" "wasp-part") - ("wasp.o" "wasp") - ("crimson-guard-hover.o" "crimson-guard-hover") - ("flamer.o" "flamer") - ("dig-digger.o" "dig-digger") - ("dig-obs.o" "dig-obs") - ("dig1-obs.o" "dig1-obs") - ("dig2-obs.o" "dig2-obs") - ("dig3-obs.o" "dig3-obs") - ("tomb-baby-spider.o" "tomb-baby-spider") - ("grenadier.o" "grenadier") - ("metalmonk.o" "metalmonk") - ("dig-texture.o" "dig-texture") - ("dig-scenes.o" "dig-scenes") - ("dig-part.o" "dig-part") - ("tpage-2290.go" "tpage-2290") - ("tpage-2292.go" "tpage-2292") - ("tpage-2291.go" "tpage-2291") - ("tpage-2782.go" "tpage-2782") - ("tpage-3361.go" "tpage-3361") - ("grenadier-ag.go" "grenadier") - ("metalmonk-ag.go" "metalmonk") - ("flitter-ag.go" "flitter") - ("dig-balloon-lurker-ag.go" "dig-balloon-lurker") - ("dig-spikey-sphere-ag.go" "dig-spikey-sphere") - ("dig-totem-ag.go" "dig-totem") - ("dig-wheel-step-ag.go" "dig-wheel-step") - ("warp-gate-ag.go" "warp-gate") - ("dig-spikey-step-ag.go" "dig-spikey-step") - ("dig-stomp-block-ag.go" "dig-stomp-block") - ("dig-totem-fish-ag.go" "dig-totem-fish") - ("seal-of-mar-base-ag.go" "seal-of-mar-base") - ("dig-tipping-rock-ag.go" "dig-tipping-rock") - ("dig-sinking-plat-ag.go" "dig-sinking-plat") - ("dig-log-ag.go" "dig-log") - ("dig-spikey-sphere-door-ag.go" "dig-spikey-sphere-door") - ("dig-button-ag.go" "dig-button") - ("dig3a-vis.go" "dig3a-vis") - ) + ("hover-formation-h.o" + "hover-nav-control-h.o" + "hover-enemy-h.o" + "hover-nav-network.o" + "hover-nav-control.o" + "hover-enemy.o" + "hover-enemy-battle.o" + "hover-formation.o" + "hover-nav-edit.o" + "wasp-part.o" + "wasp.o" + "crimson-guard-hover.o" + "flamer.o" + "dig-digger.o" + "dig-obs.o" + "dig1-obs.o" + "dig2-obs.o" + "dig3-obs.o" + "tomb-baby-spider.o" + "grenadier.o" + "metalmonk.o" + "dig-texture.o" + "dig-scenes.o" + "dig-part.o" + "tpage-2290.go" + "tpage-2292.go" + "tpage-2291.go" + "tpage-2782.go" + "tpage-3361.go" + "grenadier-ag.go" + "metalmonk-ag.go" + "flitter-ag.go" + "dig-balloon-lurker-ag.go" + "dig-spikey-sphere-ag.go" + "dig-totem-ag.go" + "dig-wheel-step-ag.go" + "warp-gate-ag.go" + "dig-spikey-step-ag.go" + "dig-stomp-block-ag.go" + "dig-totem-fish-ag.go" + "seal-of-mar-base-ag.go" + "dig-tipping-rock-ag.go" + "dig-sinking-plat-ag.go" + "dig-log-ag.go" + "dig-spikey-sphere-door-ag.go" + "dig-button-ag.go" + "dig3a-vis.go" + )) diff --git a/goal_src/jak2/dgos/d3b.gd b/goal_src/jak2/dgos/d3b.gd index bca6ffc568..979dffec3f 100644 --- a/goal_src/jak2/dgos/d3b.gd +++ b/goal_src/jak2/dgos/d3b.gd @@ -1,9 +1,9 @@ ("D3B.DGO" - ("jak-pole+0-ag.go" "jak-pole+0") - ("tpage-2406.go" "tpage-2406") - ("tpage-2407.go" "tpage-2407") - ("tpage-3548.go" "tpage-3548") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("dig3b-vis.go" "dig3b-vis") - ) + ("jak-pole+0-ag.go" + "tpage-2406.go" + "tpage-2407.go" + "tpage-3548.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "dig3b-vis.go" + )) diff --git a/goal_src/jak2/dgos/demo.gd b/goal_src/jak2/dgos/demo.gd index c3319765d7..e55490ec23 100644 --- a/goal_src/jak2/dgos/demo.gd +++ b/goal_src/jak2/dgos/demo.gd @@ -1,10 +1,10 @@ ("DEMO.DGO" - ("demo-obs.o" "demo-obs") - ("tpage-1872.go" "tpage-1872") - ("tpage-1876.go" "tpage-1876") - ("tpage-1868.go" "tpage-1868") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-logo-ag.go" "jak-logo") - ("jak-stand-ag.go" "jak-stand") - ("demo.go" "demo") - ) + ("demo-obs.o" + "tpage-1872.go" + "tpage-1876.go" + "tpage-1868.go" + "daxter-highres-ag.go" + "jak-logo-ag.go" + "jak-stand-ag.go" + "demo.go" + )) diff --git a/goal_src/jak2/dgos/dg1.gd b/goal_src/jak2/dgos/dg1.gd index 973c7695da..bcc44aee63 100644 --- a/goal_src/jak2/dgos/dg1.gd +++ b/goal_src/jak2/dgos/dg1.gd @@ -1,33 +1,33 @@ ("DG1.DGO" - ("crimson-guard-level.o" "crimson-guard-level") - ("guard-conversation.o" "guard-conversation") - ("transport-level.o" "transport-level") - ("dig-digger.o" "dig-digger") - ("dig-obs.o" "dig-obs") - ("dig1-obs.o" "dig1-obs") - ("dig2-obs.o" "dig2-obs") - ("dig3-obs.o" "dig3-obs") - ("tomb-baby-spider.o" "tomb-baby-spider") - ("grenadier.o" "grenadier") - ("metalmonk.o" "metalmonk") - ("dig-texture.o" "dig-texture") - ("dig-scenes.o" "dig-scenes") - ("dig-part.o" "dig-part") - ("tpage-2282.go" "tpage-2282") - ("tpage-2284.go" "tpage-2284") - ("tpage-2283.go" "tpage-2283") - ("tpage-2419.go" "tpage-2419") - ("tpage-2844.go" "tpage-2844") - ("dig-digger-ag.go" "dig-digger") - ("crimson-guard-ag.go" "crimson-guard") - ("dig-bomb-crate-ag.go" "dig-bomb-crate") - ("dig-conveyor-ag.go" "dig-conveyor") - ("dig-clasp-ag.go" "dig-clasp") - ("dig-tether-ag.go" "dig-tether") - ("dig-jump-pad-ag.go" "dig-jump-pad") - ("dig-breakable-door-ag.go" "dig-breakable-door") - ("dig-sinking-plat-ag.go" "dig-sinking-plat") - ("dig-clasp-b-ag.go" "dig-clasp-b") - ("dig-bomb-crate-cylinder-ag.go" "dig-bomb-crate-cylinder") - ("dig1-vis.go" "dig1-vis") - ) + ("crimson-guard-level.o" + "guard-conversation.o" + "transport-level.o" + "dig-digger.o" + "dig-obs.o" + "dig1-obs.o" + "dig2-obs.o" + "dig3-obs.o" + "tomb-baby-spider.o" + "grenadier.o" + "metalmonk.o" + "dig-texture.o" + "dig-scenes.o" + "dig-part.o" + "tpage-2282.go" + "tpage-2284.go" + "tpage-2283.go" + "tpage-2419.go" + "tpage-2844.go" + "dig-digger-ag.go" + "crimson-guard-ag.go" + "dig-bomb-crate-ag.go" + "dig-conveyor-ag.go" + "dig-clasp-ag.go" + "dig-tether-ag.go" + "dig-jump-pad-ag.go" + "dig-breakable-door-ag.go" + "dig-sinking-plat-ag.go" + "dig-clasp-b-ag.go" + "dig-bomb-crate-cylinder-ag.go" + "dig1-vis.go" + )) diff --git a/goal_src/jak2/dgos/dmi.gd b/goal_src/jak2/dgos/dmi.gd index 017b2637a9..33e00a29df 100644 --- a/goal_src/jak2/dgos/dmi.gd +++ b/goal_src/jak2/dgos/dmi.gd @@ -1,43 +1,43 @@ ("DMI.DGO" - ("jak-pole+0-ag.go" "jak-pole+0") - ("hover-formation-h.o" "hover-formation-h") - ("hover-nav-control-h.o" "hover-nav-control-h") - ("hover-enemy-h.o" "hover-enemy-h") - ("hover-nav-network.o" "hover-nav-network") - ("hover-nav-control.o" "hover-nav-control") - ("hover-enemy.o" "hover-enemy") - ("hover-enemy-battle.o" "hover-enemy-battle") - ("hover-formation.o" "hover-formation") - ("hover-nav-edit.o" "hover-nav-edit") - ("wasp-part.o" "wasp-part") - ("wasp.o" "wasp") - ("crimson-guard-hover.o" "crimson-guard-hover") - ("flamer.o" "flamer") - ("target-turret-shot.o" "target-turret-shot") - ("target-turret.o" "target-turret") - ("jak-turret+0-ag.go" "jak-turret+0") - ("drill-turret.o" "drill-turret") - ("drillmid-obs.o" "drillmid-obs") - ("drill-part.o" "drill-part") - ("drill-part2.o" "drill-part2") - ("drill-mech-master.o" "drill-mech-master") - ("drill-obs.o" "drill-obs") - ("drill-panel.o" "drill-panel") - ("drill-obs2.o" "drill-obs2") - ("drill-spool.o" "drill-spool") - ("drill-baron.o" "drill-baron") - ("drill-scenes.o" "drill-scenes") - ("centurion.o" "centurion") - ("ginsu.o" "ginsu") - ("tpage-2300.go" "tpage-2300") - ("tpage-2302.go" "tpage-2302") - ("tpage-2301.go" "tpage-2301") - ("tpage-2493.go" "tpage-2493") - ("tpage-2303.go" "tpage-2303") - ("tpage-2565.go" "tpage-2565") - ("tpage-2846.go" "tpage-2846") - ("mech-ag.go" "mech") - ("warp-gate-ag.go" "warp-gate") - ("drill-falling-door-ag.go" "drill-falling-door") - ("drillmid-vis.go" "drillmid-vis") - ) + ("jak-pole+0-ag.go" + "hover-formation-h.o" + "hover-nav-control-h.o" + "hover-enemy-h.o" + "hover-nav-network.o" + "hover-nav-control.o" + "hover-enemy.o" + "hover-enemy-battle.o" + "hover-formation.o" + "hover-nav-edit.o" + "wasp-part.o" + "wasp.o" + "crimson-guard-hover.o" + "flamer.o" + "target-turret-shot.o" + "target-turret.o" + "jak-turret+0-ag.go" + "drill-turret.o" + "drillmid-obs.o" + "drill-part.o" + "drill-part2.o" + "drill-mech-master.o" + "drill-obs.o" + "drill-panel.o" + "drill-obs2.o" + "drill-spool.o" + "drill-baron.o" + "drill-scenes.o" + "centurion.o" + "ginsu.o" + "tpage-2300.go" + "tpage-2302.go" + "tpage-2301.go" + "tpage-2493.go" + "tpage-2303.go" + "tpage-2565.go" + "tpage-2846.go" + "mech-ag.go" + "warp-gate-ag.go" + "drill-falling-door-ag.go" + "drillmid-vis.go" + )) diff --git a/goal_src/jak2/dgos/drb.gd b/goal_src/jak2/dgos/drb.gd index 2ffa49b0df..f0fcd8fa04 100644 --- a/goal_src/jak2/dgos/drb.gd +++ b/goal_src/jak2/dgos/drb.gd @@ -1,12 +1,12 @@ ("DRB.DGO" - ("tpage-2298.go" "tpage-2298") - ("tpage-2299.go" "tpage-2299") - ("tpage-2492.go" "tpage-2492") - ("drill-elevator-ag.go" "drill-elevator") - ("drill-flip-step-ag.go" "drill-flip-step") - ("drill-elevator-base-ag.go" "drill-elevator-base") - ("drill-falling-door-ag.go" "drill-falling-door") - ("drill-drop-plat-ag.go" "drill-drop-plat") - ("drill-switch-ag.go" "drill-switch") - ("drillb-vis.go" "drillb-vis") - ) + ("tpage-2298.go" + "tpage-2299.go" + "tpage-2492.go" + "drill-elevator-ag.go" + "drill-flip-step-ag.go" + "drill-elevator-base-ag.go" + "drill-falling-door-ag.go" + "drill-drop-plat-ag.go" + "drill-switch-ag.go" + "drillb-vis.go" + )) diff --git a/goal_src/jak2/dgos/dri.gd b/goal_src/jak2/dgos/dri.gd index b468401ca1..19e6d41ccd 100644 --- a/goal_src/jak2/dgos/dri.gd +++ b/goal_src/jak2/dgos/dri.gd @@ -1,23 +1,23 @@ ("DRI.DGO" - ("tpage-1204.go" "tpage-1204") - ("tpage-1205.go" "tpage-1205") - ("tpage-1239.go" "tpage-1239") - ("tpage-1203.go" "tpage-1203") - ("tpage-1206.go" "tpage-1206") - ("centurion-ag.go" "centurion") - ("drill-turret-ext-ag.go" "drill-turret-ext") - ("mech-ag.go" "mech") - ("port-turret-ag.go" "port-turret") - ("ginsu-ag.go" "ginsu") - ("drill-elevator-ag.go" "drill-elevator") - ("drill-plat-falling-ag.go" "drill-plat-falling") - ("drill-bridge-shot-ag.go" "drill-bridge-shot") - ("warp-gate-ag.go" "warp-gate") - ("drill-elevator-base-ag.go" "drill-elevator-base") - ("drill-wall-ag.go" "drill-wall") - ("drill-metalhead-eggs-c-ag.go" "drill-metalhead-eggs-c") - ("drill-metalhead-eggs-b-ag.go" "drill-metalhead-eggs-b") - ("drill-metalhead-eggs-a-ag.go" "drill-metalhead-eggs-a") - ("drill-turret-int-ag.go" "drill-turret-int") - ("drill-vis.go" "drill-vis") - ) + ("tpage-1204.go" + "tpage-1205.go" + "tpage-1239.go" + "tpage-1203.go" + "tpage-1206.go" + "centurion-ag.go" + "drill-turret-ext-ag.go" + "mech-ag.go" + "port-turret-ag.go" + "ginsu-ag.go" + "drill-elevator-ag.go" + "drill-plat-falling-ag.go" + "drill-bridge-shot-ag.go" + "warp-gate-ag.go" + "drill-elevator-base-ag.go" + "drill-wall-ag.go" + "drill-metalhead-eggs-c-ag.go" + "drill-metalhead-eggs-b-ag.go" + "drill-metalhead-eggs-a-ag.go" + "drill-turret-int-ag.go" + "drill-vis.go" + )) diff --git a/goal_src/jak2/dgos/drillmtn.gd b/goal_src/jak2/dgos/drillmtn.gd index 436b3e8147..64fe67bd2a 100644 --- a/goal_src/jak2/dgos/drillmtn.gd +++ b/goal_src/jak2/dgos/drillmtn.gd @@ -1,34 +1,34 @@ ("DRILLMTN.DGO" - ("jak-mech+0-ag.go" "jak-mech+0") - ("grunt-mech-anims+0-ag.go" "grunt-mech-anims+0") - ("mech-part.o" "mech-part") - ("mech.o" "mech") - ("target-mech.o" "target-mech") - ("mech-states.o" "mech-states") - ("grunt-mech.o" "grunt-mech") - ("tpage-1877.go" "tpage-1877") - ("tpage-2535.go" "tpage-2535") - ("tpage-2624.go" "tpage-2624") - ("drill-top-break-ag.go" "drill-top-break") - ("drill-barons-ship-ag.go" "drill-barons-ship") - ("grunt-ag.go" "grunt") - ("drill-control-panel-ag.go" "drill-control-panel") - ("drill-crane-ag.go" "drill-crane") - ("crimson-guard-hover-ag.go" "crimson-guard-hover") - ("wasp-ag.go" "wasp") - ("drill-turret-ext-ag.go" "drill-turret-ext") - ("mech-ag.go" "mech") - ("drill-drill-ag.go" "drill-drill") - ("port-turret-ag.go" "port-turret") - ("drill-flip-step-ag.go" "drill-flip-step") - ("drill-lift-ag.go" "drill-lift") - ("drill-elevator-doors-ag.go" "drill-elevator-doors") - ("drill-wall-ag.go" "drill-wall") - ("drill-metalhead-eggs-c-ag.go" "drill-metalhead-eggs-c") - ("drill-metalhead-eggs-b-ag.go" "drill-metalhead-eggs-b") - ("drill-metalhead-eggs-a-ag.go" "drill-metalhead-eggs-a") - ("drill-switch-ag.go" "drill-switch") - ("drill-turret-int-ag.go" "drill-turret-int") - ("drill-moving-staircase-ag.go" "drill-moving-staircase") - ("drillmtn.go" "drillmtn") - ) + ("jak-mech+0-ag.go" + "grunt-mech-anims+0-ag.go" + "mech-part.o" + "mech.o" + "target-mech.o" + "mech-states.o" + "grunt-mech.o" + "tpage-1877.go" + "tpage-2535.go" + "tpage-2624.go" + "drill-top-break-ag.go" + "drill-barons-ship-ag.go" + "grunt-ag.go" + "drill-control-panel-ag.go" + "drill-crane-ag.go" + "crimson-guard-hover-ag.go" + "wasp-ag.go" + "drill-turret-ext-ag.go" + "mech-ag.go" + "drill-drill-ag.go" + "port-turret-ag.go" + "drill-flip-step-ag.go" + "drill-lift-ag.go" + "drill-elevator-doors-ag.go" + "drill-wall-ag.go" + "drill-metalhead-eggs-c-ag.go" + "drill-metalhead-eggs-b-ag.go" + "drill-metalhead-eggs-a-ag.go" + "drill-switch-ag.go" + "drill-turret-int-ag.go" + "drill-moving-staircase-ag.go" + "drillmtn.go" + )) diff --git a/goal_src/jak2/dgos/engine.gd b/goal_src/jak2/dgos/engine.gd index 48eaefc4c9..46317acaa9 100644 --- a/goal_src/jak2/dgos/engine.gd +++ b/goal_src/jak2/dgos/engine.gd @@ -1,374 +1,374 @@ ("ENGINE.CGO" - ("types-h.o" "types-h") - ("vu1-macros.o" "vu1-macros") - ("math.o" "math") - ("vector-h.o" "vector-h") - ("gravity-h.o" "gravity-h") - ("bounding-box-h.o" "bounding-box-h") - ("matrix-h.o" "matrix-h") - ("quaternion-h.o" "quaternion-h") - ("euler-h.o" "euler-h") - ("transform-h.o" "transform-h") - ("geometry-h.o" "geometry-h") - ("trigonometry-h.o" "trigonometry-h") - ("transformq-h.o" "transformq-h") - ("bounding-box.o" "bounding-box") - ("matrix.o" "matrix") - ("transform.o" "transform") - ("quaternion.o" "quaternion") - ("euler.o" "euler") - ("trigonometry.o" "trigonometry") - ("gsound-h.o" "gsound-h") - ("timer-h.o" "timer-h") - ("vif-h.o" "vif-h") - ("dma-h.o" "dma-h") - ("video-h.o" "video-h") - ("vu1-user-h.o" "vu1-user-h") - ("profile-h.o" "profile-h") - ("dma.o" "dma") - ("dma-buffer.o" "dma-buffer") - ("dma-bucket.o" "dma-bucket") - ("dma-disasm.o" "dma-disasm") - ("pad.o" "pad") - ("pckernel-h.o" "pckernel-h") ;; added - ("gs.o" "gs") - ("display-h.o" "display-h") - ("geometry.o" "geometry") - ("timer.o" "timer") - ("vector.o" "vector") - ("file-io.o" "file-io") - ("loader-h.o" "loader-h") - ("texture-h.o" "texture-h") - ("texture-anim-h.o" "texture-anim-h") - ("lights-h.o" "lights-h") - ("mood-h.o" "mood-h") - ("level-h.o" "level-h") - ("capture-h.o" "capture-h") - ("math-camera-h.o" "math-camera-h") - ("math-camera.o" "math-camera") - ("font-h.o" "font-h") - ("decomp-h.o" "decomp-h") - ("profile.o" "profile") - ("display.o" "display") - ("connect.o" "connect") - ("text-id-h.o" "text-id-h") - ("text-h.o" "text-h") - ("camera-defs-h.o" "camera-defs-h") - ("trail-h.o" "trail-h") - ("minimap-h.o" "minimap-h") - ("bigmap-h.o" "bigmap-h") - ("settings-h.o" "settings-h") - ("capture.o" "capture") - ("memory-usage-h.o" "memory-usage-h") - ("blit-displays-h.o" "blit-displays-h") - ("texture.o" "texture") - ("main-h.o" "main-h") - ("mspace-h.o" "mspace-h") - ("drawable-h.o" "drawable-h") - ("drawable-group-h.o" "drawable-group-h") - ("drawable-inline-array-h.o" "drawable-inline-array-h") - ("draw-node-h.o" "draw-node-h") - ("drawable-tree-h.o" "drawable-tree-h") - ("drawable-actor-h.o" "drawable-actor-h") - ("region-h.o" "region-h") - ("traffic-h.o" "traffic-h") - ("game-task-h.o" "game-task-h") - ("task-control-h.o" "task-control-h") - ("generic-h.o" "generic-h") - ("sky-h.o" "sky-h") - ("ocean-h.o" "ocean-h") - ("ocean-trans-tables.o" "ocean-trans-tables") - ("ocean-tables.o" "ocean-tables") - ("ocean-frames.o" "ocean-frames") - ("time-of-day-h.o" "time-of-day-h") - ("art-h.o" "art-h") - ("generic-vu1-h.o" "generic-vu1-h") - ("merc-h.o" "merc-h") - ("generic-merc-h.o" "generic-merc-h") - ("generic-tie-h.o" "generic-tie-h") - ("generic-work-h.o" "generic-work-h") - ("shadow-cpu-h.o" "shadow-cpu-h") - ("shadow-vu1-h.o" "shadow-vu1-h") - ("memcard-h.o" "memcard-h") - ("game-info-h.o" "game-info-h") - ("gui-h.o" "gui-h") - ("ambient-h.o" "ambient-h") - ("speech-h.o" "speech-h") - ("wind-h.o" "wind-h") - ("prototype-h.o" "prototype-h") - ("joint-h.o" "joint-h") - ("bones-h.o" "bones-h") - ("foreground-h.o" "foreground-h") - ("engines.o" "engines") - ("lightning-h.o" "lightning-h") - ("res-h.o" "res-h") - ("res.o" "res") - ("lights.o" "lights") - ("dynamics-h.o" "dynamics-h") - ("surface-h.o" "surface-h") - ("pat-h.o" "pat-h") - ("fact-h.o" "fact-h") - ("aligner-h.o" "aligner-h") - ("penetrate-h.o" "penetrate-h") - ("game-h.o" "game-h") - ("script-h.o" "script-h") - ("scene-h.o" "scene-h") - ("sync-info-h.o" "sync-info-h") - ("pov-camera-h.o" "pov-camera-h") - ("smush-control-h.o" "smush-control-h") - ("debug-h.o" "debug-h") - ("joint-mod-h.o" "joint-mod-h") - ("collide-func-h.o" "collide-func-h") - ("collide-mesh-h.o" "collide-mesh-h") - ("collide-shape-h.o" "collide-shape-h") - ("generic-obs-h.o" "generic-obs-h") - ("trajectory-h.o" "trajectory-h") - ("collide-target-h.o" "collide-target-h") - ("collide-touch-h.o" "collide-touch-h") - ("collide-edge-grab-h.o" "collide-edge-grab-h") - ("process-drawable-h.o" "process-drawable-h") - ("process-focusable.o" "process-focusable") - ("process-taskable-h.o" "process-taskable-h") - ("focus.o" "focus") - ("effect-control-h.o" "effect-control-h") - ("collide-frag-h.o" "collide-frag-h") - ("collide-hash-h.o" "collide-hash-h") - ("chain-physics-h.o" "chain-physics-h") - ("projectile-h.o" "projectile-h") - ("find-nearest-h.o" "find-nearest-h") - ("target-h.o" "target-h") - ("stats-h.o" "stats-h") - ("bsp-h.o" "bsp-h") - ("collide-cache-h.o" "collide-cache-h") - ("collide-h.o" "collide-h") - ("shrubbery-h.o" "shrubbery-h") - ("tie-h.o" "tie-h") - ("tfrag-h.o" "tfrag-h") - ("background-h.o" "background-h") - ("subdivide-h.o" "subdivide-h") - ("entity-h.o" "entity-h") - ("sprite-h.o" "sprite-h") - ("simple-sprite-h.o" "simple-sprite-h") - ("eye-h.o" "eye-h") - ("sparticle-launcher-h.o" "sparticle-launcher-h") - ("sparticle-h.o" "sparticle-h") - ("actor-link-h.o" "actor-link-h") - ("camera-h.o" "camera-h") - ("cam-debug-h.o" "cam-debug-h") - ("cam-interface-h.o" "cam-interface-h") - ("cam-update-h.o" "cam-update-h") - ("hud-h.o" "hud-h") - ("progress-h.o" "progress-h") - ("rpc-h.o" "rpc-h") - ("path-h.o" "path-h") - ("nav-mesh-h.o" "nav-mesh-h") - ("nav-control-h.o" "nav-control-h") - ("spatial-hash-h.o" "spatial-hash-h") - ("actor-hash-h.o" "actor-hash-h") - ("load-dgo.o" "load-dgo") - ("ramdisk.o" "ramdisk") - ("gsound.o" "gsound") - ("transformq.o" "transformq") - ("collide-func.o" "collide-func") - ("joint.o" "joint") - ("joint-mod.o" "joint-mod") - ("chain-physics.o" "chain-physics") - ("cylinder.o" "cylinder") - ("wind-work.o" "wind-work") - ("wind.o" "wind") - ("bsp.o" "bsp") - ("subdivide.o" "subdivide") - ("sprite.o" "sprite") - ("sprite-distort.o" "sprite-distort") - ("sprite-glow.o" "sprite-glow") - ("debug-sphere.o" "debug-sphere") - ("debug.o" "debug") - ("history.o" "history") - ("merc-vu1.o" "merc-vu1") - ("emerc-vu1.o" "emerc-vu1") - ("merc-blend-shape.o" "merc-blend-shape") - ("merc.o" "merc") - ("emerc.o" "emerc") - ("ripple.o" "ripple") - ("bones.o" "bones") - ("debug-foreground.o" "debug-foreground") - ("foreground.o" "foreground") - ("generic-vu0.o" "generic-vu0") - ("generic-vu1.o" "generic-vu1") - ("generic-effect.o" "generic-effect") - ("generic-merc.o" "generic-merc") - ("generic-tie.o" "generic-tie") - ("shadow-cpu.o" "shadow-cpu") - ("shadow-vu1.o" "shadow-vu1") - ("warp.o" "warp") - ("texture-anim.o" "texture-anim") - ("texture-anim-funcs.o" "texture-anim-funcs") - ("texture-anim-tables.o" "texture-anim-tables") - ("blit-displays.o" "blit-displays") - ("font-data.o" "font-data") - ("font.o" "font") - ("decomp.o" "decomp") - ("background.o" "background") - ("draw-node.o" "draw-node") - ("shrubbery.o" "shrubbery") - ("shrub-work.o" "shrub-work") - ("tfrag-near.o" "tfrag-near") - ("tfrag.o" "tfrag") - ("tfrag-methods.o" "tfrag-methods") - ("tfrag-work.o" "tfrag-work") - ("tie.o" "tie") - ("etie-vu1.o" "etie-vu1") - ("etie-near-vu1.o" "etie-near-vu1") - ("tie-near.o" "tie-near") - ("tie-work.o" "tie-work") - ("tie-methods.o" "tie-methods") - ("sync-info.o" "sync-info") - ("trajectory.o" "trajectory") - ("sparticle-launcher.o" "sparticle-launcher") - ("sparticle.o" "sparticle") - ("entity-table.o" "entity-table") - ("loader.o" "loader") - ("game-info.o" "game-info") - ("game-task.o" "game-task") - ("game-save.o" "game-save") - ("settings.o" "settings") - ("mood-tables.o" "mood-tables") - ("mood-tables2.o" "mood-tables2") - ("mood.o" "mood") - ("mood-funcs.o" "mood-funcs") - ("mood-funcs2.o" "mood-funcs2") - ("weather-part.o" "weather-part") - ("time-of-day.o" "time-of-day") - ("sky-data.o" "sky-data") - ("sky-tng.o" "sky-tng") - ("load-state.o" "load-state") - ("level-info.o" "level-info") - ("level.o" "level") - ("text.o" "text") - ("collide-hash.o" "collide-hash") - ("collide-probe.o" "collide-probe") - ("collide-frag.o" "collide-frag") - ("collide-mesh.o" "collide-mesh") - ("collide-touch.o" "collide-touch") - ("collide-edge-grab.o" "collide-edge-grab") - ("collide-shape.o" "collide-shape") - ("collide-shape-rider.o" "collide-shape-rider") - ("collide.o" "collide") - ;; ("collide-planes.o" "collide-planes") - ("spatial-hash.o" "spatial-hash") - ("actor-hash.o" "actor-hash") - ("merc-death.o" "merc-death") - ("water-flow.o" "water-flow") - ("water-h.o" "water-h") - ("camera.o" "camera") - ("cam-interface.o" "cam-interface") - ("cam-master.o" "cam-master") - ("cam-states.o" "cam-states") - ("cam-states-dbg.o" "cam-states-dbg") - ("cam-combiner.o" "cam-combiner") - ("cam-update.o" "cam-update") - ("vol-h.o" "vol-h") - ("cam-layout.o" "cam-layout") - ("cam-debug.o" "cam-debug") - ("cam-start.o" "cam-start") - ("process-drawable.o" "process-drawable") - ("ambient.o" "ambient") - ("speech.o" "speech") - ("region.o" "region") - ("fma-sphere.o" "fma-sphere") - ("script.o" "script") - ("generic-obs.o" "generic-obs") - ("lightning.o" "lightning") - ("carry-h.o" "carry-h") - ("pilot-h.o" "pilot-h") - ("gun-h.o" "gun-h") - ("board-h.o" "board-h") - ("darkjak-h.o" "darkjak-h") - ("target-util.o" "target-util") - ("target-part.o" "target-part") - ("gun-part.o" "gun-part") - ("collide-reaction-target.o" "collide-reaction-target") - ("logic-target.o" "logic-target") - ("sidekick.o" "sidekick") - ("effect-control.o" "effect-control") - ("voicebox.o" "voicebox") - ("collectables-part.o" "collectables-part") - ("debug-part.o" "debug-part") - ("find-nearest.o" "find-nearest") - ("task-arrow.o" "task-arrow") - ("projectile.o" "projectile") - ("target-handler.o" "target-handler") - ("target-anim.o" "target-anim") - ("target.o" "target") - ("target2.o" "target2") - ("target-swim.o" "target-swim") - ("target-carry.o" "target-carry") - ("target-darkjak.o" "target-darkjak") - ("target-death.o" "target-death") - ("target-gun.o" "target-gun") - ("gun-util.o" "gun-util") - ("gun-blue-shot.o" "gun-blue-shot") - ("gun-yellow-shot.o" "gun-yellow-shot") - ("gun-red-shot.o" "gun-red-shot") - ("gun-dark-shot.o" "gun-dark-shot") - ("gun-states.o" "gun-states") - ("board-util.o" "board-util") - ("target-board.o" "target-board") - ("board-part.o" "board-part") - ("board-states.o" "board-states") - ("mech-h.o" "mech-h") - ("menu.o" "menu") - ("drawable.o" "drawable") - ("drawable-group.o" "drawable-group") - ("drawable-inline-array.o" "drawable-inline-array") - ("drawable-tree.o" "drawable-tree") - ("prototype.o" "prototype") - ("main-collide.o" "main-collide") - ("video.o" "video") - ("pckernel.o" "pckernel") ;; added - ("main.o" "main") - ("collide-cache.o" "collide-cache") - ("collide-debug.o" "collide-debug") - ("relocate.o" "relocate") - ("memory-usage.o" "memory-usage") - ("entity.o" "entity") - ("path.o" "path") - ("vol.o" "vol") - ("nav-mesh.o" "nav-mesh") - ("nav-control.o" "nav-control") - ("aligner.o" "aligner") - ("water.o" "water") - ("collectables.o" "collectables") - ("task-control.o" "task-control") - ("scene.o" "scene") - ("pov-camera.o" "pov-camera") - ("powerups.o" "powerups") - ("crates.o" "crates") - ("hud.o" "hud") - ("hud-classes.o" "hud-classes") - ("progress-static.o" "progress-static") - ("progress.o" "progress") - ("progress-draw.o" "progress-draw") - ("ocean.o" "ocean") - ("ocean-vu0.o" "ocean-vu0") - ("ocean-texture.o" "ocean-texture") - ("ocean-mid.o" "ocean-mid") - ("ocean-transition.o" "ocean-transition") - ("ocean-near.o" "ocean-near") - ("minimap.o" "minimap") - ("bigmap-data.o" "bigmap-data") - ("bigmap.o" "bigmap") - ("eye.o" "eye") - ("glist-h.o" "glist-h") - ("glist.o" "glist") - ("anim-tester.o" "anim-tester") - ("viewer.o" "viewer") - ("part-tester.o" "part-tester") - ("editable-h.o" "editable-h") - ("editable.o" "editable") - ("editable-player.o" "editable-player") - ("mysql-nav-graph.o" "mysql-nav-graph") - ("nav-graph-editor.o" "nav-graph-editor") - ("sampler.o" "sampler") - ("default-menu.o" "default-menu") - ) + ("types-h.o" + "vu1-macros.o" + "math.o" + "vector-h.o" + "gravity-h.o" + "bounding-box-h.o" + "matrix-h.o" + "quaternion-h.o" + "euler-h.o" + "transform-h.o" + "geometry-h.o" + "trigonometry-h.o" + "transformq-h.o" + "bounding-box.o" + "matrix.o" + "transform.o" + "quaternion.o" + "euler.o" + "trigonometry.o" + "gsound-h.o" + "timer-h.o" + "vif-h.o" + "dma-h.o" + "video-h.o" + "vu1-user-h.o" + "profile-h.o" + "dma.o" + "dma-buffer.o" + "dma-bucket.o" + "dma-disasm.o" + "pad.o" + "pckernel-h.o" ;; added + "gs.o" + "display-h.o" + "geometry.o" + "timer.o" + "vector.o" + "file-io.o" + "loader-h.o" + "texture-h.o" + "texture-anim-h.o" + "lights-h.o" + "mood-h.o" + "level-h.o" + "capture-h.o" + "math-camera-h.o" + "math-camera.o" + "font-h.o" + "decomp-h.o" + "profile.o" + "display.o" + "connect.o" + "text-id-h.o" + "text-h.o" + "camera-defs-h.o" + "trail-h.o" + "minimap-h.o" + "bigmap-h.o" + "settings-h.o" + "capture.o" + "memory-usage-h.o" + "blit-displays-h.o" + "texture.o" + "main-h.o" + "mspace-h.o" + "drawable-h.o" + "drawable-group-h.o" + "drawable-inline-array-h.o" + "draw-node-h.o" + "drawable-tree-h.o" + "drawable-actor-h.o" + "region-h.o" + "traffic-h.o" + "game-task-h.o" + "task-control-h.o" + "generic-h.o" + "sky-h.o" + "ocean-h.o" + "ocean-trans-tables.o" + "ocean-tables.o" + "ocean-frames.o" + "time-of-day-h.o" + "art-h.o" + "generic-vu1-h.o" + "merc-h.o" + "generic-merc-h.o" + "generic-tie-h.o" + "generic-work-h.o" + "shadow-cpu-h.o" + "shadow-vu1-h.o" + "memcard-h.o" + "game-info-h.o" + "gui-h.o" + "ambient-h.o" + "speech-h.o" + "wind-h.o" + "prototype-h.o" + "joint-h.o" + "bones-h.o" + "foreground-h.o" + "engines.o" + "lightning-h.o" + "res-h.o" + "res.o" + "lights.o" + "dynamics-h.o" + "surface-h.o" + "pat-h.o" + "fact-h.o" + "aligner-h.o" + "penetrate-h.o" + "game-h.o" + "script-h.o" + "scene-h.o" + "sync-info-h.o" + "pov-camera-h.o" + "smush-control-h.o" + "debug-h.o" + "joint-mod-h.o" + "collide-func-h.o" + "collide-mesh-h.o" + "collide-shape-h.o" + "generic-obs-h.o" + "trajectory-h.o" + "collide-target-h.o" + "collide-touch-h.o" + "collide-edge-grab-h.o" + "process-drawable-h.o" + "process-focusable.o" + "process-taskable-h.o" + "focus.o" + "effect-control-h.o" + "collide-frag-h.o" + "collide-hash-h.o" + "chain-physics-h.o" + "projectile-h.o" + "find-nearest-h.o" + "target-h.o" + "stats-h.o" + "bsp-h.o" + "collide-cache-h.o" + "collide-h.o" + "shrubbery-h.o" + "tie-h.o" + "tfrag-h.o" + "background-h.o" + "subdivide-h.o" + "entity-h.o" + "sprite-h.o" + "simple-sprite-h.o" + "eye-h.o" + "sparticle-launcher-h.o" + "sparticle-h.o" + "actor-link-h.o" + "camera-h.o" + "cam-debug-h.o" + "cam-interface-h.o" + "cam-update-h.o" + "hud-h.o" + "progress-h.o" + "rpc-h.o" + "path-h.o" + "nav-mesh-h.o" + "nav-control-h.o" + "spatial-hash-h.o" + "actor-hash-h.o" + "load-dgo.o" + "ramdisk.o" + "gsound.o" + "transformq.o" + "collide-func.o" + "joint.o" + "joint-mod.o" + "chain-physics.o" + "cylinder.o" + "wind-work.o" + "wind.o" + "bsp.o" + "subdivide.o" + "sprite.o" + "sprite-distort.o" + "sprite-glow.o" + "debug-sphere.o" + "debug.o" + "history.o" + "merc-vu1.o" + "emerc-vu1.o" + "merc-blend-shape.o" + "merc.o" + "emerc.o" + "ripple.o" + "bones.o" + "debug-foreground.o" + "foreground.o" + "generic-vu0.o" + "generic-vu1.o" + "generic-effect.o" + "generic-merc.o" + "generic-tie.o" + "shadow-cpu.o" + "shadow-vu1.o" + "warp.o" + "texture-anim.o" + "texture-anim-funcs.o" + "texture-anim-tables.o" + "blit-displays.o" + "font-data.o" + "font.o" + "decomp.o" + "background.o" + "draw-node.o" + "shrubbery.o" + "shrub-work.o" + "tfrag-near.o" + "tfrag.o" + "tfrag-methods.o" + "tfrag-work.o" + "tie.o" + "etie-vu1.o" + "etie-near-vu1.o" + "tie-near.o" + "tie-work.o" + "tie-methods.o" + "sync-info.o" + "trajectory.o" + "sparticle-launcher.o" + "sparticle.o" + "entity-table.o" + "loader.o" + "game-info.o" + "game-task.o" + "game-save.o" + "settings.o" + "mood-tables.o" + "mood-tables2.o" + "mood.o" + "mood-funcs.o" + "mood-funcs2.o" + "weather-part.o" + "time-of-day.o" + "sky-data.o" + "sky-tng.o" + "load-state.o" + "level-info.o" + "level.o" + "text.o" + "collide-hash.o" + "collide-probe.o" + "collide-frag.o" + "collide-mesh.o" + "collide-touch.o" + "collide-edge-grab.o" + "collide-shape.o" + "collide-shape-rider.o" + "collide.o" + ;; "collide-planes.o" + "spatial-hash.o" + "actor-hash.o" + "merc-death.o" + "water-flow.o" + "water-h.o" + "camera.o" + "cam-interface.o" + "cam-master.o" + "cam-states.o" + "cam-states-dbg.o" + "cam-combiner.o" + "cam-update.o" + "vol-h.o" + "cam-layout.o" + "cam-debug.o" + "cam-start.o" + "process-drawable.o" + "ambient.o" + "speech.o" + "region.o" + "fma-sphere.o" + "script.o" + "generic-obs.o" + "lightning.o" + "carry-h.o" + "pilot-h.o" + "gun-h.o" + "board-h.o" + "darkjak-h.o" + "target-util.o" + "target-part.o" + "gun-part.o" + "collide-reaction-target.o" + "logic-target.o" + "sidekick.o" + "effect-control.o" + "voicebox.o" + "collectables-part.o" + "debug-part.o" + "find-nearest.o" + "task-arrow.o" + "projectile.o" + "target-handler.o" + "target-anim.o" + "target.o" + "target2.o" + "target-swim.o" + "target-carry.o" + "target-darkjak.o" + "target-death.o" + "target-gun.o" + "gun-util.o" + "gun-blue-shot.o" + "gun-yellow-shot.o" + "gun-red-shot.o" + "gun-dark-shot.o" + "gun-states.o" + "board-util.o" + "target-board.o" + "board-part.o" + "board-states.o" + "mech-h.o" + "menu.o" + "drawable.o" + "drawable-group.o" + "drawable-inline-array.o" + "drawable-tree.o" + "prototype.o" + "main-collide.o" + "video.o" + "pckernel.o" ;; added + "main.o" + "collide-cache.o" + "collide-debug.o" + "relocate.o" + "memory-usage.o" + "entity.o" + "path.o" + "vol.o" + "nav-mesh.o" + "nav-control.o" + "aligner.o" + "water.o" + "collectables.o" + "task-control.o" + "scene.o" + "pov-camera.o" + "powerups.o" + "crates.o" + "hud.o" + "hud-classes.o" + "progress-static.o" + "progress.o" + "progress-draw.o" + "ocean.o" + "ocean-vu0.o" + "ocean-texture.o" + "ocean-mid.o" + "ocean-transition.o" + "ocean-near.o" + "minimap.o" + "bigmap-data.o" + "bigmap.o" + "eye.o" + "glist-h.o" + "glist.o" + "anim-tester.o" + "viewer.o" + "part-tester.o" + "editable-h.o" + "editable.o" + "editable-player.o" + "mysql-nav-graph.o" + "nav-graph-editor.o" + "sampler.o" + "default-menu.o" + )) diff --git a/goal_src/jak2/dgos/fda.gd b/goal_src/jak2/dgos/fda.gd index 6250dfaaa5..483ee9cfbe 100644 --- a/goal_src/jak2/dgos/fda.gd +++ b/goal_src/jak2/dgos/fda.gd @@ -1,23 +1,23 @@ ("FDA.DGO" - ("jak-pole+0-ag.go" "jak-pole+0") - ("fordumpa-part.o" "fordumpa-part") - ("fordumpa-obs.o" "fordumpa-obs") - ("fordumpa-texture.o" "fordumpa-texture") - ("fort-robotank-turret.o" "fort-robotank-turret") - ("fort-robotank.o" "fort-robotank") - ("fort-turret.o" "fort-turret") - ("tpage-1589.go" "tpage-1589") - ("tpage-1588.go" "tpage-1588") - ("tpage-1590.go" "tpage-1590") - ("tpage-2490.go" "tpage-2490") - ("tpage-2909.go" "tpage-2909") - ("fort-fence-ag.go" "fort-fence") - ("fort-robotank-ag.go" "fort-robotank") - ("fort-turret-ag.go" "fort-turret") - ("fort-robotank-top-ag.go" "fort-robotank-top") - ("fort-elec-switch-ag.go" "fort-elec-switch") - ("fort-roboscreen-ag.go" "fort-roboscreen") - ("fort-entry-gate-ag.go" "fort-entry-gate") - ("fort-robotank-sight-ag.go" "fort-robotank-sight") - ("fordumpa-vis.go" "fordumpa-vis") - ) + ("jak-pole+0-ag.go" + "fordumpa-part.o" + "fordumpa-obs.o" + "fordumpa-texture.o" + "fort-robotank-turret.o" + "fort-robotank.o" + "fort-turret.o" + "tpage-1589.go" + "tpage-1588.go" + "tpage-1590.go" + "tpage-2490.go" + "tpage-2909.go" + "fort-fence-ag.go" + "fort-robotank-ag.go" + "fort-turret-ag.go" + "fort-robotank-top-ag.go" + "fort-elec-switch-ag.go" + "fort-roboscreen-ag.go" + "fort-entry-gate-ag.go" + "fort-robotank-sight-ag.go" + "fordumpa-vis.go" + )) diff --git a/goal_src/jak2/dgos/fdb.gd b/goal_src/jak2/dgos/fdb.gd index 00e4067e8b..45c5a7e8b6 100644 --- a/goal_src/jak2/dgos/fdb.gd +++ b/goal_src/jak2/dgos/fdb.gd @@ -1,20 +1,20 @@ ("FDB.DGO" - ("crimson-guard-level.o" "crimson-guard-level") - ("guard-conversation.o" "guard-conversation") - ("transport-level.o" "transport-level") - ("fordumpb-obs.o" "fordumpb-obs") - ("fordumpb-part.o" "fordumpb-part") - ("fortress-obs.o" "fortress-obs") - ("fort-floor-spike.o" "fort-floor-spike") - ("tpage-1592.go" "tpage-1592") - ("tpage-1621.go" "tpage-1621") - ("tpage-1593.go" "tpage-1593") - ("fort-plat-orbit-ag.go" "fort-plat-orbit") - ("crimson-guard-ag.go" "crimson-guard") - ("fort-floor-spike-c-ag.go" "fort-floor-spike-c") - ("fort-floor-spike-b-ag.go" "fort-floor-spike-b") - ("fort-trap-door-ag.go" "fort-trap-door") - ("fort-plat-shuttle-ag.go" "fort-plat-shuttle") - ("fort-conveyor-ag.go" "fort-conveyor") - ("fordumpb-vis.go" "fordumpb-vis") - ) + ("crimson-guard-level.o" + "guard-conversation.o" + "transport-level.o" + "fordumpb-obs.o" + "fordumpb-part.o" + "fortress-obs.o" + "fort-floor-spike.o" + "tpage-1592.go" + "tpage-1621.go" + "tpage-1593.go" + "fort-plat-orbit-ag.go" + "crimson-guard-ag.go" + "fort-floor-spike-c-ag.go" + "fort-floor-spike-b-ag.go" + "fort-trap-door-ag.go" + "fort-plat-shuttle-ag.go" + "fort-conveyor-ag.go" + "fordumpb-vis.go" + )) diff --git a/goal_src/jak2/dgos/fea.gd b/goal_src/jak2/dgos/fea.gd index 56f40c469f..697c71debd 100644 --- a/goal_src/jak2/dgos/fea.gd +++ b/goal_src/jak2/dgos/fea.gd @@ -1,14 +1,14 @@ ("FEA.DGO" - ("crimson-guard-level.o" "crimson-guard-level") - ("guard-conversation.o" "guard-conversation") - ("transport-level.o" "transport-level") - ("jak-pole+0-ag.go" "jak-pole+0") - ("forexita-part.o" "forexita-part") - ("forexita-obs.o" "forexita-obs") - ("tpage-1580.go" "tpage-1580") - ("tpage-1583.go" "tpage-1583") - ("tpage-1581.go" "tpage-1581") - ("crimson-guard-ag.go" "crimson-guard") - ("fort-lift-plat-ag.go" "fort-lift-plat") - ("forexita-vis.go" "forexita-vis") - ) + ("crimson-guard-level.o" + "guard-conversation.o" + "transport-level.o" + "jak-pole+0-ag.go" + "forexita-part.o" + "forexita-obs.o" + "tpage-1580.go" + "tpage-1583.go" + "tpage-1581.go" + "crimson-guard-ag.go" + "fort-lift-plat-ag.go" + "forexita-vis.go" + )) diff --git a/goal_src/jak2/dgos/feb.gd b/goal_src/jak2/dgos/feb.gd index 0265c20162..9b6d2f0fe9 100644 --- a/goal_src/jak2/dgos/feb.gd +++ b/goal_src/jak2/dgos/feb.gd @@ -1,15 +1,15 @@ ("FEB.DGO" - ("target-tube.o" "target-tube") - ("jak-tube+0-ag.go" "jak-tube+0") - ("fortress-obs.o" "fortress-obs") - ("forexitb-part.o" "forexitb-part") - ("tpage-1584.go" "tpage-1584") - ("tpage-1587.go" "tpage-1587") - ("tpage-1585.go" "tpage-1585") - ("tpage-1586.go" "tpage-1586") - ("tpage-1712.go" "tpage-1712") - ("water-anim-fortress-ag.go" "water-anim-fortress") - ("fort-trap-door-ag.go" "fort-trap-door") - ("fort-entry-gate-ag.go" "fort-entry-gate") - ("forexitb-vis.go" "forexitb-vis") - ) + ("target-tube.o" + "jak-tube+0-ag.go" + "fortress-obs.o" + "forexitb-part.o" + "tpage-1584.go" + "tpage-1587.go" + "tpage-1585.go" + "tpage-1586.go" + "tpage-1712.go" + "water-anim-fortress-ag.go" + "fort-trap-door-ag.go" + "fort-entry-gate-ag.go" + "forexitb-vis.go" + )) diff --git a/goal_src/jak2/dgos/fob.gd b/goal_src/jak2/dgos/fob.gd index a0ca4cddf6..dedda275e3 100644 --- a/goal_src/jak2/dgos/fob.gd +++ b/goal_src/jak2/dgos/fob.gd @@ -1,16 +1,16 @@ ("FOB.DGO" - ("youngsamos-forestb+0-ag.go" "youngsamos-forestb+0") - ("tpage-2280.go" "tpage-2280") - ("tpage-2574.go" "tpage-2574") - ("tpage-2281.go" "tpage-2281") - ("tpage-3262.go" "tpage-3262") - ("tpage-3417.go" "tpage-3417") - ("daxter-highres-ag.go" "daxter-highres") - ("youngsamos-highres-ag.go" "youngsamos-highres") - ("jak-highres-ag.go" "jak-highres") - ("crimson-guard-ag.go" "crimson-guard") - ("crimson-guard-hover-ag.go" "crimson-guard-hover") - ("transport-ag.go" "transport") - ("life-seed-ag.go" "life-seed") - ("forestb-vis.go" "forestb-vis") - ) + ("youngsamos-forestb+0-ag.go" + "tpage-2280.go" + "tpage-2574.go" + "tpage-2281.go" + "tpage-3262.go" + "tpage-3417.go" + "daxter-highres-ag.go" + "youngsamos-highres-ag.go" + "jak-highres-ag.go" + "crimson-guard-ag.go" + "crimson-guard-hover-ag.go" + "transport-ag.go" + "life-seed-ag.go" + "forestb-vis.go" + )) diff --git a/goal_src/jak2/dgos/for.gd b/goal_src/jak2/dgos/for.gd index 1e2782b56e..565e957373 100644 --- a/goal_src/jak2/dgos/for.gd +++ b/goal_src/jak2/dgos/for.gd @@ -1,42 +1,42 @@ ("FOR.DGO" - ("spyder.o" "spyder") - ("crimson-guard-level.o" "crimson-guard-level") - ("guard-conversation.o" "guard-conversation") - ("transport-level.o" "transport-level") - ("hover-formation-h.o" "hover-formation-h") - ("hover-nav-control-h.o" "hover-nav-control-h") - ("hover-enemy-h.o" "hover-enemy-h") - ("hover-nav-network.o" "hover-nav-network") - ("hover-nav-control.o" "hover-nav-control") - ("hover-enemy.o" "hover-enemy") - ("hover-enemy-battle.o" "hover-enemy-battle") - ("hover-formation.o" "hover-formation") - ("hover-nav-edit.o" "hover-nav-edit") - ("wasp-part.o" "wasp-part") - ("wasp.o" "wasp") - ("crimson-guard-hover.o" "crimson-guard-hover") - ("flamer.o" "flamer") - ("forest-part.o" "forest-part") - ("forest-obs.o" "forest-obs") - ("jak-pegasus+0-ag.go" "jak-pegasus+0") - ("pegasus.o" "pegasus") - ("wren.o" "wren") - ("fish.o" "fish") - ("predator-h.o" "predator-h") - ("predator-graph.o" "predator-graph") - ("predator.o" "predator") - ("forest-scenes.o" "forest-scenes") - ("tpage-1414.go" "tpage-1414") - ("tpage-1416.go" "tpage-1416") - ("tpage-1415.go" "tpage-1415") - ("tpage-1413.go" "tpage-1413") - ("tpage-2335.go" "tpage-2335") - ("tpage-1411.go" "tpage-1411") - ("tpage-2845.go" "tpage-2845") - ("pegasus-ag.go" "pegasus") - ("predator-ag.go" "predator") - ("spyder-ag.go" "spyder") - ("wren-ag.go" "wren") - ("minnow-ag.go" "minnow") - ("forest-vis.go" "forest-vis") - ) + ("spyder.o" + "crimson-guard-level.o" + "guard-conversation.o" + "transport-level.o" + "hover-formation-h.o" + "hover-nav-control-h.o" + "hover-enemy-h.o" + "hover-nav-network.o" + "hover-nav-control.o" + "hover-enemy.o" + "hover-enemy-battle.o" + "hover-formation.o" + "hover-nav-edit.o" + "wasp-part.o" + "wasp.o" + "crimson-guard-hover.o" + "flamer.o" + "forest-part.o" + "forest-obs.o" + "jak-pegasus+0-ag.go" + "pegasus.o" + "wren.o" + "fish.o" + "predator-h.o" + "predator-graph.o" + "predator.o" + "forest-scenes.o" + "tpage-1414.go" + "tpage-1416.go" + "tpage-1415.go" + "tpage-1413.go" + "tpage-2335.go" + "tpage-1411.go" + "tpage-2845.go" + "pegasus-ag.go" + "predator-ag.go" + "spyder-ag.go" + "wren-ag.go" + "minnow-ag.go" + "forest-vis.go" + )) diff --git a/goal_src/jak2/dgos/fordumpc.gd b/goal_src/jak2/dgos/fordumpc.gd index dc7c6e169a..0bfd2390d3 100644 --- a/goal_src/jak2/dgos/fordumpc.gd +++ b/goal_src/jak2/dgos/fordumpc.gd @@ -1,25 +1,25 @@ ("FORDUMPC.DGO" - ("fordumpa-texture.o" "fordumpa-texture") - ("fort-robotank-turret.o" "fort-robotank-turret") - ("fort-robotank.o" "fort-robotank") - ("fordumpc-part.o" "fordumpc-part") - ("fordumpc-obs.o" "fordumpc-obs") - ("fortress-scenes.o" "fortress-scenes") - ("tpage-1570.go" "tpage-1570") - ("tpage-1573.go" "tpage-1573") - ("tpage-1571.go" "tpage-1571") - ("tpage-2917.go" "tpage-2917") - ("tpage-2847.go" "tpage-2847") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("fort-robotank-ag.go" "fort-robotank") - ("fort-missile-target-ag.go" "fort-missile-target") - ("fort-robotank-top-ag.go" "fort-robotank-top") - ("fort-roboscreen-ag.go" "fort-roboscreen") - ("fort-missile-ag.go" "fort-missile") - ("fort-entry-gate-ag.go" "fort-entry-gate") - ("fort-robotank-sight-ag.go" "fort-robotank-sight") - ("fort-dump-bomb-a-ag.go" "fort-dump-bomb-a") - ("particleman-ag.go" "particleman") - ("fordumpc.go" "fordumpc") - ) + ("fordumpa-texture.o" + "fort-robotank-turret.o" + "fort-robotank.o" + "fordumpc-part.o" + "fordumpc-obs.o" + "fortress-scenes.o" + "tpage-1570.go" + "tpage-1573.go" + "tpage-1571.go" + "tpage-2917.go" + "tpage-2847.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "fort-robotank-ag.go" + "fort-missile-target-ag.go" + "fort-robotank-top-ag.go" + "fort-roboscreen-ag.go" + "fort-missile-ag.go" + "fort-entry-gate-ag.go" + "fort-robotank-sight-ag.go" + "fort-dump-bomb-a-ag.go" + "particleman-ag.go" + "fordumpc.go" + )) diff --git a/goal_src/jak2/dgos/fordumpd.gd b/goal_src/jak2/dgos/fordumpd.gd index cc638e8059..bbf3437381 100644 --- a/goal_src/jak2/dgos/fordumpd.gd +++ b/goal_src/jak2/dgos/fordumpd.gd @@ -1,8 +1,8 @@ ("FORDUMPD.DGO" - ("tpage-1574.go" "tpage-1574") - ("crimson-guard-highres-ag.go" "crimson-guard-highres") - ("crimson-guard-lowres-ag.go" "crimson-guard-lowres") - ("grunt-fma-ag.go" "grunt-fma") - ("palmpilot-ag.go" "palmpilot") - ("fordumpd.go" "fordumpd") - ) + ("tpage-1574.go" + "crimson-guard-highres-ag.go" + "crimson-guard-lowres-ag.go" + "grunt-fma-ag.go" + "palmpilot-ag.go" + "fordumpd.go" + )) diff --git a/goal_src/jak2/dgos/fra.gd b/goal_src/jak2/dgos/fra.gd index f54aa923fb..c73b3afa42 100644 --- a/goal_src/jak2/dgos/fra.gd +++ b/goal_src/jak2/dgos/fra.gd @@ -1,29 +1,29 @@ ("FRA.DGO" - ("hover-formation-h.o" "hover-formation-h") - ("hover-nav-control-h.o" "hover-nav-control-h") - ("hover-enemy-h.o" "hover-enemy-h") - ("hover-nav-network.o" "hover-nav-network") - ("hover-nav-control.o" "hover-nav-control") - ("hover-enemy.o" "hover-enemy") - ("hover-enemy-battle.o" "hover-enemy-battle") - ("hover-formation.o" "hover-formation") - ("hover-nav-edit.o" "hover-nav-edit") - ("wasp-part.o" "wasp-part") - ("wasp.o" "wasp") - ("crimson-guard-hover.o" "crimson-guard-hover") - ("flamer.o" "flamer") - ("crimson-guard-level.o" "crimson-guard-level") - ("guard-conversation.o" "guard-conversation") - ("transport-level.o" "transport-level") - ("forresca-part.o" "forresca-part") - ("forresca-obs.o" "forresca-obs") - ("tpage-3190.go" "tpage-3190") - ("tpage-3192.go" "tpage-3192") - ("tpage-3191.go" "tpage-3191") - ("crimson-guard-ag.go" "crimson-guard") - ("crimson-guard-hover-ag.go" "crimson-guard-hover") - ("fort-entry-gate-ag.go" "fort-entry-gate") - ("cty-guard-turret-button-ag.go" "cty-guard-turret-button") - ("fort-led-ag.go" "fort-led") - ("forresca-vis.go" "forresca-vis") - ) + ("hover-formation-h.o" + "hover-nav-control-h.o" + "hover-enemy-h.o" + "hover-nav-network.o" + "hover-nav-control.o" + "hover-enemy.o" + "hover-enemy-battle.o" + "hover-formation.o" + "hover-nav-edit.o" + "wasp-part.o" + "wasp.o" + "crimson-guard-hover.o" + "flamer.o" + "crimson-guard-level.o" + "guard-conversation.o" + "transport-level.o" + "forresca-part.o" + "forresca-obs.o" + "tpage-3190.go" + "tpage-3192.go" + "tpage-3191.go" + "crimson-guard-ag.go" + "crimson-guard-hover-ag.go" + "fort-entry-gate-ag.go" + "cty-guard-turret-button-ag.go" + "fort-led-ag.go" + "forresca-vis.go" + )) diff --git a/goal_src/jak2/dgos/frb.gd b/goal_src/jak2/dgos/frb.gd index 4f4ebd873c..562cf189a6 100644 --- a/goal_src/jak2/dgos/frb.gd +++ b/goal_src/jak2/dgos/frb.gd @@ -1,17 +1,17 @@ ("FRB.DGO" - ("fort-floor-spike.o" "fort-floor-spike") - ("forrescb-part.o" "forrescb-part") - ("forrescb-obs.o" "forrescb-obs") - ("fort-turret.o" "fort-turret") - ("spydroid.o" "spydroid") - ("tpage-3172.go" "tpage-3172") - ("tpage-3175.go" "tpage-3175") - ("tpage-3173.go" "tpage-3173") - ("tpage-3174.go" "tpage-3174") - ("spydroid-ag.go" "spydroid") - ("fort-turret-ag.go" "fort-turret") - ("fort-entry-gate-ag.go" "fort-entry-gate") - ("cty-guard-turret-button-ag.go" "cty-guard-turret-button") - ("fort-elec-belt-ag.go" "fort-elec-belt") - ("forrescb-vis.go" "forrescb-vis") - ) + ("fort-floor-spike.o" + "forrescb-part.o" + "forrescb-obs.o" + "fort-turret.o" + "spydroid.o" + "tpage-3172.go" + "tpage-3175.go" + "tpage-3173.go" + "tpage-3174.go" + "spydroid-ag.go" + "fort-turret-ag.go" + "fort-entry-gate-ag.go" + "cty-guard-turret-button-ag.go" + "fort-elec-belt-ag.go" + "forrescb-vis.go" + )) diff --git a/goal_src/jak2/dgos/game.gd b/goal_src/jak2/dgos/game.gd index b8b4b68450..43b23aad33 100644 --- a/goal_src/jak2/dgos/game.gd +++ b/goal_src/jak2/dgos/game.gd @@ -1,441 +1,441 @@ ("GAME.CGO" - ("types-h.o" "types-h") - ("vu1-macros.o" "vu1-macros") - ("math.o" "math") - ("vector-h.o" "vector-h") - ("gravity-h.o" "gravity-h") - ("bounding-box-h.o" "bounding-box-h") - ("matrix-h.o" "matrix-h") - ("quaternion-h.o" "quaternion-h") - ("euler-h.o" "euler-h") - ("transform-h.o" "transform-h") - ("geometry-h.o" "geometry-h") - ("trigonometry-h.o" "trigonometry-h") - ("transformq-h.o" "transformq-h") - ("bounding-box.o" "bounding-box") - ("matrix.o" "matrix") - ("transform.o" "transform") - ("quaternion.o" "quaternion") - ("euler.o" "euler") - ("trigonometry.o" "trigonometry") - ("gsound-h.o" "gsound-h") - ("timer-h.o" "timer-h") - ("vif-h.o" "vif-h") - ("dma-h.o" "dma-h") - ("video-h.o" "video-h") - ("vu1-user-h.o" "vu1-user-h") - ("profile-h.o" "profile-h") - ("dma.o" "dma") - ("dma-buffer.o" "dma-buffer") - ("dma-bucket.o" "dma-bucket") - ("dma-disasm.o" "dma-disasm") - ("pad.o" "pad") - ("pckernel-h.o" "pckernel-h") ;; added - ("gs.o" "gs") - ("display-h.o" "display-h") - ("geometry.o" "geometry") - ("timer.o" "timer") - ("vector.o" "vector") - ("file-io.o" "file-io") - ("loader-h.o" "loader-h") - ("texture-h.o" "texture-h") - ("texture-anim-h.o" "texture-anim-h") - ("lights-h.o" "lights-h") - ("mood-h.o" "mood-h") - ("level-h.o" "level-h") - ("capture-h.o" "capture-h") - ("math-camera-h.o" "math-camera-h") - ("math-camera.o" "math-camera") - ("font-h.o" "font-h") - ("decomp-h.o" "decomp-h") - ("profile.o" "profile") - ("display.o" "display") - ("connect.o" "connect") - ("text-id-h.o" "text-id-h") - ("text-h.o" "text-h") - ("camera-defs-h.o" "camera-defs-h") - ("trail-h.o" "trail-h") - ("minimap-h.o" "minimap-h") - ("bigmap-h.o" "bigmap-h") - ("settings-h.o" "settings-h") - ("capture.o" "capture") - ("memory-usage-h.o" "memory-usage-h") - ("blit-displays-h.o" "blit-displays-h") - ("texture.o" "texture") - ("main-h.o" "main-h") - ("mspace-h.o" "mspace-h") - ("drawable-h.o" "drawable-h") - ("drawable-group-h.o" "drawable-group-h") - ("drawable-inline-array-h.o" "drawable-inline-array-h") - ("draw-node-h.o" "draw-node-h") - ("drawable-tree-h.o" "drawable-tree-h") - ("drawable-actor-h.o" "drawable-actor-h") - ("region-h.o" "region-h") - ("traffic-h.o" "traffic-h") - ("game-task-h.o" "game-task-h") - ("task-control-h.o" "task-control-h") - ("generic-h.o" "generic-h") - ("sky-h.o" "sky-h") - ("ocean-h.o" "ocean-h") - ("ocean-trans-tables.o" "ocean-trans-tables") - ("ocean-tables.o" "ocean-tables") - ("ocean-frames.o" "ocean-frames") - ("time-of-day-h.o" "time-of-day-h") - ("art-h.o" "art-h") - ("generic-vu1-h.o" "generic-vu1-h") - ("merc-h.o" "merc-h") - ("generic-merc-h.o" "generic-merc-h") - ("generic-tie-h.o" "generic-tie-h") - ("generic-work-h.o" "generic-work-h") - ("shadow-cpu-h.o" "shadow-cpu-h") - ("shadow-vu1-h.o" "shadow-vu1-h") - ("memcard-h.o" "memcard-h") - ("game-info-h.o" "game-info-h") - ("gui-h.o" "gui-h") - ("ambient-h.o" "ambient-h") - ("speech-h.o" "speech-h") - ("wind-h.o" "wind-h") - ("prototype-h.o" "prototype-h") - ("joint-h.o" "joint-h") - ("bones-h.o" "bones-h") - ("foreground-h.o" "foreground-h") - ("engines.o" "engines") - ("lightning-h.o" "lightning-h") - ("res-h.o" "res-h") - ("res.o" "res") - ("lights.o" "lights") - ("dynamics-h.o" "dynamics-h") - ("surface-h.o" "surface-h") - ("pat-h.o" "pat-h") - ("fact-h.o" "fact-h") - ("aligner-h.o" "aligner-h") - ("penetrate-h.o" "penetrate-h") - ("game-h.o" "game-h") - ("script-h.o" "script-h") - ("scene-h.o" "scene-h") - ("sync-info-h.o" "sync-info-h") - ("pov-camera-h.o" "pov-camera-h") - ("smush-control-h.o" "smush-control-h") - ("debug-h.o" "debug-h") - ("joint-mod-h.o" "joint-mod-h") - ("collide-func-h.o" "collide-func-h") - ("collide-mesh-h.o" "collide-mesh-h") - ("collide-shape-h.o" "collide-shape-h") - ("generic-obs-h.o" "generic-obs-h") - ("trajectory-h.o" "trajectory-h") - ("collide-target-h.o" "collide-target-h") - ("collide-touch-h.o" "collide-touch-h") - ("collide-edge-grab-h.o" "collide-edge-grab-h") - ("process-drawable-h.o" "process-drawable-h") - ("process-focusable.o" "process-focusable") - ("process-taskable-h.o" "process-taskable-h") - ("focus.o" "focus") - ("effect-control-h.o" "effect-control-h") - ("collide-frag-h.o" "collide-frag-h") - ("collide-hash-h.o" "collide-hash-h") - ("chain-physics-h.o" "chain-physics-h") - ("projectile-h.o" "projectile-h") - ("find-nearest-h.o" "find-nearest-h") - ("target-h.o" "target-h") - ("stats-h.o" "stats-h") - ("bsp-h.o" "bsp-h") - ("collide-cache-h.o" "collide-cache-h") - ("collide-h.o" "collide-h") - ("shrubbery-h.o" "shrubbery-h") - ("tie-h.o" "tie-h") - ("tfrag-h.o" "tfrag-h") - ("background-h.o" "background-h") - ("subdivide-h.o" "subdivide-h") - ("entity-h.o" "entity-h") - ("sprite-h.o" "sprite-h") - ("simple-sprite-h.o" "simple-sprite-h") - ("eye-h.o" "eye-h") - ("sparticle-launcher-h.o" "sparticle-launcher-h") - ("sparticle-h.o" "sparticle-h") - ("actor-link-h.o" "actor-link-h") - ("camera-h.o" "camera-h") - ("cam-debug-h.o" "cam-debug-h") - ("cam-interface-h.o" "cam-interface-h") - ("cam-update-h.o" "cam-update-h") - ("hud-h.o" "hud-h") - ("progress-h.o" "progress-h") - ("rpc-h.o" "rpc-h") - ("path-h.o" "path-h") - ("nav-mesh-h.o" "nav-mesh-h") - ("nav-control-h.o" "nav-control-h") - ("spatial-hash-h.o" "spatial-hash-h") - ("actor-hash-h.o" "actor-hash-h") - ("load-dgo.o" "load-dgo") - ("ramdisk.o" "ramdisk") - ("gsound.o" "gsound") - ("transformq.o" "transformq") - ("collide-func.o" "collide-func") - ("joint.o" "joint") - ("joint-mod.o" "joint-mod") - ("chain-physics.o" "chain-physics") - ("cylinder.o" "cylinder") - ("wind-work.o" "wind-work") - ("wind.o" "wind") - ("bsp.o" "bsp") - ("subdivide.o" "subdivide") - ("sprite.o" "sprite") - ("sprite-distort.o" "sprite-distort") - ("sprite-glow.o" "sprite-glow") - ("debug-sphere.o" "debug-sphere") - ("debug.o" "debug") - ("history.o" "history") - ("merc-vu1.o" "merc-vu1") - ("emerc-vu1.o" "emerc-vu1") - ("merc-blend-shape.o" "merc-blend-shape") - ("merc.o" "merc") - ("emerc.o" "emerc") - ("ripple.o" "ripple") - ("bones.o" "bones") - ("debug-foreground.o" "debug-foreground") - ("foreground.o" "foreground") - ("generic-vu0.o" "generic-vu0") - ("generic-vu1.o" "generic-vu1") - ("generic-effect.o" "generic-effect") - ("generic-merc.o" "generic-merc") - ("generic-tie.o" "generic-tie") - ("shadow-cpu.o" "shadow-cpu") - ("shadow-vu1.o" "shadow-vu1") - ("warp.o" "warp") - ("texture-anim.o" "texture-anim") - ("texture-anim-funcs.o" "texture-anim-funcs") - ("texture-anim-tables.o" "texture-anim-tables") - ("blit-displays.o" "blit-displays") - ("font-data.o" "font-data") - ("font.o" "font") - ("decomp.o" "decomp") - ("background.o" "background") - ("draw-node.o" "draw-node") - ("shrubbery.o" "shrubbery") - ("shrub-work.o" "shrub-work") - ("tfrag-near.o" "tfrag-near") - ("tfrag.o" "tfrag") - ("tfrag-methods.o" "tfrag-methods") - ("tfrag-work.o" "tfrag-work") - ("tie.o" "tie") - ("etie-vu1.o" "etie-vu1") - ("etie-near-vu1.o" "etie-near-vu1") - ("tie-near.o" "tie-near") - ("tie-work.o" "tie-work") - ("tie-methods.o" "tie-methods") - ("sync-info.o" "sync-info") - ("trajectory.o" "trajectory") - ("sparticle-launcher.o" "sparticle-launcher") - ("sparticle.o" "sparticle") - ("entity-table.o" "entity-table") - ("loader.o" "loader") - ("game-info.o" "game-info") - ("game-task.o" "game-task") - ("game-save.o" "game-save") - ("settings.o" "settings") - ("pckernel.o" "pckernel") ;; added - ("mood-tables.o" "mood-tables") - ("mood-tables2.o" "mood-tables2") - ("mood.o" "mood") - ("mood-funcs.o" "mood-funcs") - ("mood-funcs2.o" "mood-funcs2") - ("weather-part.o" "weather-part") - ("time-of-day.o" "time-of-day") - ("sky-data.o" "sky-data") - ("sky-tng.o" "sky-tng") - ("load-state.o" "load-state") - ("level-info.o" "level-info") - ("level.o" "level") - ("text.o" "text") - ("collide-hash.o" "collide-hash") - ("collide-probe.o" "collide-probe") - ("collide-frag.o" "collide-frag") - ("collide-mesh.o" "collide-mesh") - ("collide-touch.o" "collide-touch") - ("collide-edge-grab.o" "collide-edge-grab") - ("collide-shape.o" "collide-shape") - ("collide-shape-rider.o" "collide-shape-rider") - ("collide.o" "collide") - ;; ("collide-planes.o" "collide-planes") - ("spatial-hash.o" "spatial-hash") - ("actor-hash.o" "actor-hash") - ("merc-death.o" "merc-death") - ("water-flow.o" "water-flow") - ("water-h.o" "water-h") - ("camera.o" "camera") - ("cam-interface.o" "cam-interface") - ("cam-master.o" "cam-master") - ("cam-states.o" "cam-states") - ("cam-states-dbg.o" "cam-states-dbg") - ("cam-combiner.o" "cam-combiner") - ("cam-update.o" "cam-update") - ("vol-h.o" "vol-h") - ("cam-layout.o" "cam-layout") - ("cam-debug.o" "cam-debug") - ("cam-start.o" "cam-start") - ("process-drawable.o" "process-drawable") - ("ambient.o" "ambient") - ("speech.o" "speech") - ("region.o" "region") - ("fma-sphere.o" "fma-sphere") - ("script.o" "script") - ("generic-obs.o" "generic-obs") - ("lightning.o" "lightning") - ("carry-h.o" "carry-h") - ("pilot-h.o" "pilot-h") - ("gun-h.o" "gun-h") - ("board-h.o" "board-h") - ("darkjak-h.o" "darkjak-h") - ("target-util.o" "target-util") - ("target-part.o" "target-part") - ("gun-part.o" "gun-part") - ("collide-reaction-target.o" "collide-reaction-target") - ("logic-target.o" "logic-target") - ("sidekick.o" "sidekick") - ("effect-control.o" "effect-control") - ("voicebox.o" "voicebox") - ("collectables-part.o" "collectables-part") - ("debug-part.o" "debug-part") - ("find-nearest.o" "find-nearest") - ("task-arrow.o" "task-arrow") - ("projectile.o" "projectile") - ("target-handler.o" "target-handler") - ("target-anim.o" "target-anim") - ("target.o" "target") - ("target2.o" "target2") - ("target-swim.o" "target-swim") - ("target-carry.o" "target-carry") - ("target-darkjak.o" "target-darkjak") - ("target-death.o" "target-death") - ("target-gun.o" "target-gun") - ("gun-util.o" "gun-util") - ("gun-blue-shot.o" "gun-blue-shot") - ("gun-yellow-shot.o" "gun-yellow-shot") - ("gun-red-shot.o" "gun-red-shot") - ("gun-dark-shot.o" "gun-dark-shot") - ("gun-states.o" "gun-states") - ("board-util.o" "board-util") - ("target-board.o" "target-board") - ("board-part.o" "board-part") - ("board-states.o" "board-states") - ("mech-h.o" "mech-h") - ("menu.o" "menu") - ("drawable.o" "drawable") - ("drawable-group.o" "drawable-group") - ("drawable-inline-array.o" "drawable-inline-array") - ("drawable-tree.o" "drawable-tree") - ("prototype.o" "prototype") - ("main-collide.o" "main-collide") - ("video.o" "video") - ("pckernel.o" "pckernel") ;; added - ("main.o" "main") - ("collide-cache.o" "collide-cache") - ("collide-debug.o" "collide-debug") - ("relocate.o" "relocate") - ("memory-usage.o" "memory-usage") - ("entity.o" "entity") - ("path.o" "path") - ("vol.o" "vol") - ("nav-mesh.o" "nav-mesh") - ("nav-control.o" "nav-control") - ("aligner.o" "aligner") - ("water.o" "water") - ("collectables.o" "collectables") - ("task-control.o" "task-control") - ("scene.o" "scene") - ("pov-camera.o" "pov-camera") - ("powerups.o" "powerups") - ("crates.o" "crates") - ("hud.o" "hud") - ("hud-classes.o" "hud-classes") - ("progress-static.o" "progress-static") - ("progress.o" "progress") - ("progress-draw.o" "progress-draw") - ("ocean.o" "ocean") - ("ocean-vu0.o" "ocean-vu0") - ("ocean-texture.o" "ocean-texture") - ("ocean-mid.o" "ocean-mid") - ("ocean-transition.o" "ocean-transition") - ("ocean-near.o" "ocean-near") - ("minimap.o" "minimap") - ("bigmap-data.o" "bigmap-data") - ("bigmap.o" "bigmap") - ("eye.o" "eye") - ("glist-h.o" "glist-h") - ("glist.o" "glist") - ("anim-tester.o" "anim-tester") - ("viewer.o" "viewer") - ("part-tester.o" "part-tester") - ("editable-h.o" "editable-h") - ("editable.o" "editable") - ("editable-player.o" "editable-player") - ("mysql-nav-graph.o" "mysql-nav-graph") - ("nav-graph-editor.o" "nav-graph-editor") - ("sampler.o" "sampler") - ("default-menu.o" "default-menu") - ("dir-tpages.go" "dir-tpages") - ("tpage-11.go" "tpage-11") - ("tpage-31.go" "tpage-31") - ("tpage-1804.go" "tpage-1804") - ("texture-upload.o" "texture-upload") - ("tpage-12.go" "tpage-12") - ("tpage-917.go" "tpage-917") - ("tpage-918.go" "tpage-918") - ("tpage-1106.go" "tpage-1106") - ("tpage-1141.go" "tpage-1141") - ("tpage-1658.go" "tpage-1658") - ("tpage-2841.go" "tpage-2841") - ("tpage-2932.go" "tpage-2932") - ("tpage-3076.go" "tpage-3076") - ("texture-finish.o" "texture-finish") - ("collectables-ag.go" "collectables") - ("ctywide-arrow-ag.go" "ctywide-arrow") - ("crate-ag.go" "crate") - ("talk-box-ag.go" "talk-box") - ("scenecamera-ag.go" "scenecamera") - ("eco-canister-ag.go" "eco-canister") - ("hud-ring-ag.go" "hud-ring") - ("jakb-ag.go" "jakb") - ("daxter-ag.go" "daxter") - ("board-ag.go" "board") - ("gun-ag.go" "gun") - ("jak-gun+0-ag.go" "jak-gun+0") - ("jak-board+0-ag.go" "jak-board+0") - ("jak-dark+0-ag.go" "jak-dark+0") - ("jak-swim+0-ag.go" "jak-swim+0") - ("blocking-plane-ag.go" "blocking-plane") - ("los-control-h.o" "los-control-h") - ("airlock.o" "airlock") - ("water-anim.o" "water-anim") - ("blocking-plane.o" "blocking-plane") - ("idle-control.o" "idle-control") - ("dark-eco-pool.o" "dark-eco-pool") - ("enemy-h.o" "enemy-h") - ("nav-enemy-h.o" "nav-enemy-h") - ("rigid-body-h.o" "rigid-body-h") - ("enemy.o" "enemy") - ("nav-enemy.o" "nav-enemy") - ("base-plat.o" "base-plat") - ("plat.o" "plat") - ("basebutton.o" "basebutton") - ("bouncer.o" "bouncer") - ("conveyor.o" "conveyor") - ("elevator.o" "elevator") - ("rigid-body.o" "rigid-body") - ("rigid-body-queue.o" "rigid-body-queue") - ("rigid-body-plat.o" "rigid-body-plat") - ("joint-exploder.o" "joint-exploder") - ("simple-focus.o" "simple-focus") - ("simple-nav-sphere.o" "simple-nav-sphere") - ("process-taskable.o" "process-taskable") - ("scene-actor.o" "scene-actor") - ("scene-looper.o" "scene-looper") - ("warp-gate.o" "warp-gate") - ("guard-projectile.o" "guard-projectile") - ("metalhead-projectile.o" "metalhead-projectile") - ("los-control.o" "los-control") - ("grunt.o" "grunt") - ("flitter.o" "flitter") - ("battle.o" "battle") - ("elec-gate.o" "elec-gate") - ("cty-guard-turret-button.o" "cty-guard-turret-button") - ) + ("types-h.o" + "vu1-macros.o" + "math.o" + "vector-h.o" + "gravity-h.o" + "bounding-box-h.o" + "matrix-h.o" + "quaternion-h.o" + "euler-h.o" + "transform-h.o" + "geometry-h.o" + "trigonometry-h.o" + "transformq-h.o" + "bounding-box.o" + "matrix.o" + "transform.o" + "quaternion.o" + "euler.o" + "trigonometry.o" + "gsound-h.o" + "timer-h.o" + "vif-h.o" + "dma-h.o" + "video-h.o" + "vu1-user-h.o" + "profile-h.o" + "dma.o" + "dma-buffer.o" + "dma-bucket.o" + "dma-disasm.o" + "pad.o" + "pckernel-h.o" ;; added + "gs.o" + "display-h.o" + "geometry.o" + "timer.o" + "vector.o" + "file-io.o" + "loader-h.o" + "texture-h.o" + "texture-anim-h.o" + "lights-h.o" + "mood-h.o" + "level-h.o" + "capture-h.o" + "math-camera-h.o" + "math-camera.o" + "font-h.o" + "decomp-h.o" + "profile.o" + "display.o" + "connect.o" + "text-id-h.o" + "text-h.o" + "camera-defs-h.o" + "trail-h.o" + "minimap-h.o" + "bigmap-h.o" + "settings-h.o" + "capture.o" + "memory-usage-h.o" + "blit-displays-h.o" + "texture.o" + "main-h.o" + "mspace-h.o" + "drawable-h.o" + "drawable-group-h.o" + "drawable-inline-array-h.o" + "draw-node-h.o" + "drawable-tree-h.o" + "drawable-actor-h.o" + "region-h.o" + "traffic-h.o" + "game-task-h.o" + "task-control-h.o" + "generic-h.o" + "sky-h.o" + "ocean-h.o" + "ocean-trans-tables.o" + "ocean-tables.o" + "ocean-frames.o" + "time-of-day-h.o" + "art-h.o" + "generic-vu1-h.o" + "merc-h.o" + "generic-merc-h.o" + "generic-tie-h.o" + "generic-work-h.o" + "shadow-cpu-h.o" + "shadow-vu1-h.o" + "memcard-h.o" + "game-info-h.o" + "gui-h.o" + "ambient-h.o" + "speech-h.o" + "wind-h.o" + "prototype-h.o" + "joint-h.o" + "bones-h.o" + "foreground-h.o" + "engines.o" + "lightning-h.o" + "res-h.o" + "res.o" + "lights.o" + "dynamics-h.o" + "surface-h.o" + "pat-h.o" + "fact-h.o" + "aligner-h.o" + "penetrate-h.o" + "game-h.o" + "script-h.o" + "scene-h.o" + "sync-info-h.o" + "pov-camera-h.o" + "smush-control-h.o" + "debug-h.o" + "joint-mod-h.o" + "collide-func-h.o" + "collide-mesh-h.o" + "collide-shape-h.o" + "generic-obs-h.o" + "trajectory-h.o" + "collide-target-h.o" + "collide-touch-h.o" + "collide-edge-grab-h.o" + "process-drawable-h.o" + "process-focusable.o" + "process-taskable-h.o" + "focus.o" + "effect-control-h.o" + "collide-frag-h.o" + "collide-hash-h.o" + "chain-physics-h.o" + "projectile-h.o" + "find-nearest-h.o" + "target-h.o" + "stats-h.o" + "bsp-h.o" + "collide-cache-h.o" + "collide-h.o" + "shrubbery-h.o" + "tie-h.o" + "tfrag-h.o" + "background-h.o" + "subdivide-h.o" + "entity-h.o" + "sprite-h.o" + "simple-sprite-h.o" + "eye-h.o" + "sparticle-launcher-h.o" + "sparticle-h.o" + "actor-link-h.o" + "camera-h.o" + "cam-debug-h.o" + "cam-interface-h.o" + "cam-update-h.o" + "hud-h.o" + "progress-h.o" + "rpc-h.o" + "path-h.o" + "nav-mesh-h.o" + "nav-control-h.o" + "spatial-hash-h.o" + "actor-hash-h.o" + "load-dgo.o" + "ramdisk.o" + "gsound.o" + "transformq.o" + "collide-func.o" + "joint.o" + "joint-mod.o" + "chain-physics.o" + "cylinder.o" + "wind-work.o" + "wind.o" + "bsp.o" + "subdivide.o" + "sprite.o" + "sprite-distort.o" + "sprite-glow.o" + "debug-sphere.o" + "debug.o" + "history.o" + "merc-vu1.o" + "emerc-vu1.o" + "merc-blend-shape.o" + "merc.o" + "emerc.o" + "ripple.o" + "bones.o" + "debug-foreground.o" + "foreground.o" + "generic-vu0.o" + "generic-vu1.o" + "generic-effect.o" + "generic-merc.o" + "generic-tie.o" + "shadow-cpu.o" + "shadow-vu1.o" + "warp.o" + "texture-anim.o" + "texture-anim-funcs.o" + "texture-anim-tables.o" + "blit-displays.o" + "font-data.o" + "font.o" + "decomp.o" + "background.o" + "draw-node.o" + "shrubbery.o" + "shrub-work.o" + "tfrag-near.o" + "tfrag.o" + "tfrag-methods.o" + "tfrag-work.o" + "tie.o" + "etie-vu1.o" + "etie-near-vu1.o" + "tie-near.o" + "tie-work.o" + "tie-methods.o" + "sync-info.o" + "trajectory.o" + "sparticle-launcher.o" + "sparticle.o" + "entity-table.o" + "loader.o" + "game-info.o" + "game-task.o" + "game-save.o" + "settings.o" + "pckernel.o" ;; added + "mood-tables.o" + "mood-tables2.o" + "mood.o" + "mood-funcs.o" + "mood-funcs2.o" + "weather-part.o" + "time-of-day.o" + "sky-data.o" + "sky-tng.o" + "load-state.o" + "level-info.o" + "level.o" + "text.o" + "collide-hash.o" + "collide-probe.o" + "collide-frag.o" + "collide-mesh.o" + "collide-touch.o" + "collide-edge-grab.o" + "collide-shape.o" + "collide-shape-rider.o" + "collide.o" + ;; "collide-planes.o" + "spatial-hash.o" + "actor-hash.o" + "merc-death.o" + "water-flow.o" + "water-h.o" + "camera.o" + "cam-interface.o" + "cam-master.o" + "cam-states.o" + "cam-states-dbg.o" + "cam-combiner.o" + "cam-update.o" + "vol-h.o" + "cam-layout.o" + "cam-debug.o" + "cam-start.o" + "process-drawable.o" + "ambient.o" + "speech.o" + "region.o" + "fma-sphere.o" + "script.o" + "generic-obs.o" + "lightning.o" + "carry-h.o" + "pilot-h.o" + "gun-h.o" + "board-h.o" + "darkjak-h.o" + "target-util.o" + "target-part.o" + "gun-part.o" + "collide-reaction-target.o" + "logic-target.o" + "sidekick.o" + "effect-control.o" + "voicebox.o" + "collectables-part.o" + "debug-part.o" + "find-nearest.o" + "task-arrow.o" + "projectile.o" + "target-handler.o" + "target-anim.o" + "target.o" + "target2.o" + "target-swim.o" + "target-carry.o" + "target-darkjak.o" + "target-death.o" + "target-gun.o" + "gun-util.o" + "gun-blue-shot.o" + "gun-yellow-shot.o" + "gun-red-shot.o" + "gun-dark-shot.o" + "gun-states.o" + "board-util.o" + "target-board.o" + "board-part.o" + "board-states.o" + "mech-h.o" + "menu.o" + "drawable.o" + "drawable-group.o" + "drawable-inline-array.o" + "drawable-tree.o" + "prototype.o" + "main-collide.o" + "video.o" + "pckernel.o" ;; added + "main.o" + "collide-cache.o" + "collide-debug.o" + "relocate.o" + "memory-usage.o" + "entity.o" + "path.o" + "vol.o" + "nav-mesh.o" + "nav-control.o" + "aligner.o" + "water.o" + "collectables.o" + "task-control.o" + "scene.o" + "pov-camera.o" + "powerups.o" + "crates.o" + "hud.o" + "hud-classes.o" + "progress-static.o" + "progress.o" + "progress-draw.o" + "ocean.o" + "ocean-vu0.o" + "ocean-texture.o" + "ocean-mid.o" + "ocean-transition.o" + "ocean-near.o" + "minimap.o" + "bigmap-data.o" + "bigmap.o" + "eye.o" + "glist-h.o" + "glist.o" + "anim-tester.o" + "viewer.o" + "part-tester.o" + "editable-h.o" + "editable.o" + "editable-player.o" + "mysql-nav-graph.o" + "nav-graph-editor.o" + "sampler.o" + "default-menu.o" + "dir-tpages.go" + "tpage-11.go" + "tpage-31.go" + "tpage-1804.go" + "texture-upload.o" + "tpage-12.go" + "tpage-917.go" + "tpage-918.go" + "tpage-1106.go" + "tpage-1141.go" + "tpage-1658.go" + "tpage-2841.go" + "tpage-2932.go" + "tpage-3076.go" + "texture-finish.o" + "collectables-ag.go" + "ctywide-arrow-ag.go" + "crate-ag.go" + "talk-box-ag.go" + "scenecamera-ag.go" + "eco-canister-ag.go" + "hud-ring-ag.go" + "jakb-ag.go" + "daxter-ag.go" + "board-ag.go" + "gun-ag.go" + "jak-gun+0-ag.go" + "jak-board+0-ag.go" + "jak-dark+0-ag.go" + "jak-swim+0-ag.go" + "blocking-plane-ag.go" + "los-control-h.o" + "airlock.o" + "water-anim.o" + "blocking-plane.o" + "idle-control.o" + "dark-eco-pool.o" + "enemy-h.o" + "nav-enemy-h.o" + "rigid-body-h.o" + "enemy.o" + "nav-enemy.o" + "base-plat.o" + "plat.o" + "basebutton.o" + "bouncer.o" + "conveyor.o" + "elevator.o" + "rigid-body.o" + "rigid-body-queue.o" + "rigid-body-plat.o" + "joint-exploder.o" + "simple-focus.o" + "simple-nav-sphere.o" + "process-taskable.o" + "scene-actor.o" + "scene-looper.o" + "warp-gate.o" + "guard-projectile.o" + "metalhead-projectile.o" + "los-control.o" + "grunt.o" + "flitter.o" + "battle.o" + "elec-gate.o" + "cty-guard-turret-button.o" + )) diff --git a/goal_src/jak2/dgos/garage.gd b/goal_src/jak2/dgos/garage.gd index 27b0513d0f..e350af92cb 100644 --- a/goal_src/jak2/dgos/garage.gd +++ b/goal_src/jak2/dgos/garage.gd @@ -1,20 +1,20 @@ ("GARAGE.DGO" - ("keira-garage+0-ag.go" "keira-garage+0") - ("tpage-1369.go" "tpage-1369") - ("tpage-1430.go" "tpage-1430") - ("tpage-1786.go" "tpage-1786") - ("tpage-1787.go" "tpage-1787") - ("tpage-3025.go" "tpage-3025") - ("keira-highres-ag.go" "keira-highres") - ("rift-rider-ag.go" "rift-rider") - ("gar-curtain-ag.go" "gar-curtain") - ("gar-trophy-ca-ag.go" "gar-trophy-ca") - ("gar-trophy-cb-ag.go" "gar-trophy-cb") - ("gar-trophy-cc-ag.go" "gar-trophy-cc") - ("garage-bikec-ag.go" "garage-bikec") - ("gar-weld-project-ag.go" "gar-weld-project") - ("garage-bikeb-ag.go" "garage-bikeb") - ("particleman-ag.go" "particleman") - ("spotlight-ag.go" "spotlight") - ("garage.go" "garage") - ) + ("keira-garage+0-ag.go" + "tpage-1369.go" + "tpage-1430.go" + "tpage-1786.go" + "tpage-1787.go" + "tpage-3025.go" + "keira-highres-ag.go" + "rift-rider-ag.go" + "gar-curtain-ag.go" + "gar-trophy-ca-ag.go" + "gar-trophy-cb-ag.go" + "gar-trophy-cc-ag.go" + "garage-bikec-ag.go" + "gar-weld-project-ag.go" + "garage-bikeb-ag.go" + "particleman-ag.go" + "spotlight-ag.go" + "garage.go" + )) diff --git a/goal_src/jak2/dgos/gga.gd b/goal_src/jak2/dgos/gga.gd index 8c1bd4142e..0b94a445e9 100644 --- a/goal_src/jak2/dgos/gga.gd +++ b/goal_src/jak2/dgos/gga.gd @@ -1,27 +1,27 @@ ("GGA.DGO" - ("gun-dummy.o" "gun-dummy") - ("gungame-data.o" "gungame-data") - ("gungame-obs.o" "gungame-obs") - ("gungame-part.o" "gungame-part") - ("tpage-1733.go" "tpage-1733") - ("tpage-1735.go" "tpage-1735") - ("tpage-1734.go" "tpage-1734") - ("tpage-2405.go" "tpage-2405") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("gun-dummy-yellow-gun-ag.go" "gun-dummy-yellow-gun") - ("gun-cit-d-ag.go" "gun-cit-d") - ("gun-cit-a-ag.go" "gun-cit-a") - ("gun-cit-b-ag.go" "gun-cit-b") - ("gun-dummy-gold-ag.go" "gun-dummy-gold") - ("gun-dummy-a-ag.go" "gun-dummy-a") - ("gun-dummy-c-ag.go" "gun-dummy-c") - ("gun-dummy-b-ag.go" "gun-dummy-b") - ("gun-cit-c-ag.go" "gun-cit-c") - ("gun-dummy-big-ag.go" "gun-dummy-big") - ("fort-entry-gate-ag.go" "fort-entry-gate") - ("hip-door-a-ag.go" "hip-door-a") - ("yellow-barrel-ag.go" "yellow-barrel") - ("dark-barrel-ag.go" "dark-barrel") - ("gungame-vis.go" "gungame-vis") - ) + ("gun-dummy.o" + "gungame-data.o" + "gungame-obs.o" + "gungame-part.o" + "tpage-1733.go" + "tpage-1735.go" + "tpage-1734.go" + "tpage-2405.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "gun-dummy-yellow-gun-ag.go" + "gun-cit-d-ag.go" + "gun-cit-a-ag.go" + "gun-cit-b-ag.go" + "gun-dummy-gold-ag.go" + "gun-dummy-a-ag.go" + "gun-dummy-c-ag.go" + "gun-dummy-b-ag.go" + "gun-cit-c-ag.go" + "gun-dummy-big-ag.go" + "fort-entry-gate-ag.go" + "hip-door-a-ag.go" + "yellow-barrel-ag.go" + "dark-barrel-ag.go" + "gungame-vis.go" + )) diff --git a/goal_src/jak2/dgos/halfpipe.gd b/goal_src/jak2/dgos/halfpipe.gd index 0ab3e4869b..f85ae5c155 100644 --- a/goal_src/jak2/dgos/halfpipe.gd +++ b/goal_src/jak2/dgos/halfpipe.gd @@ -1,8 +1,8 @@ ("HALFPIPE.DGO" - ("jak-pole+0-ag.go" "jak-pole+0") - ("tpage-43.go" "tpage-43") - ("tpage-623.go" "tpage-623") - ("tpage-42.go" "tpage-42") - ("grunt-ag.go" "grunt") - ("halfpipe.go" "halfpipe") - ) + ("jak-pole+0-ag.go" + "tpage-43.go" + "tpage-623.go" + "tpage-42.go" + "grunt-ag.go" + "halfpipe.go" + )) diff --git a/goal_src/jak2/dgos/hideout.gd b/goal_src/jak2/dgos/hideout.gd index 9ebb7a9e62..4a181591a8 100644 --- a/goal_src/jak2/dgos/hideout.gd +++ b/goal_src/jak2/dgos/hideout.gd @@ -1,18 +1,18 @@ ("HIDEOUT.DGO" - ("hideout-scenes.o" "hideout-scenes") - ("hideout-part.o" "hideout-part") - ("hideout-obs.o" "hideout-obs") - ("tpage-932.go" "tpage-932") - ("tpage-933.go" "tpage-933") - ("tpage-2404.go" "tpage-2404") - ("tpage-999.go" "tpage-999") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("hide-light-ag.go" "hide-light") - ("hide-bike-ag.go" "hide-bike") - ("hide-door-b-ag.go" "hide-door-b") - ("gun-barrel-ag.go" "gun-barrel") - ("hide-faucet-ag.go" "hide-faucet") - ("particleman-ag.go" "particleman") - ("hideout.go" "hideout") - ) + ("hideout-scenes.o" + "hideout-part.o" + "hideout-obs.o" + "tpage-932.go" + "tpage-933.go" + "tpage-2404.go" + "tpage-999.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "hide-light-ag.go" + "hide-bike-ag.go" + "hide-door-b-ag.go" + "gun-barrel-ag.go" + "hide-faucet-ag.go" + "particleman-ag.go" + "hideout.go" + )) diff --git a/goal_src/jak2/dgos/hiphog.gd b/goal_src/jak2/dgos/hiphog.gd index e90b7db8c0..175e66ec47 100644 --- a/goal_src/jak2/dgos/hiphog.gd +++ b/goal_src/jak2/dgos/hiphog.gd @@ -1,24 +1,24 @@ ("HIPHOG.DGO" - ("hiphog-obs.o" "hiphog-obs") - ("hiphog-part.o" "hiphog-part") - ("hiphog-scenes.o" "hiphog-scenes") - ("tpage-929.go" "tpage-929") - ("tpage-930.go" "tpage-930") - ("tpage-3042.go" "tpage-3042") - ("tpage-998.go" "tpage-998") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("hip-whack-a-metal-ag.go" "hip-whack-a-metal") - ("hip-trophy-g-ag.go" "hip-trophy-g") - ("hip-trophy-d-ag.go" "hip-trophy-d") - ("hip-trophy-c-ag.go" "hip-trophy-c") - ("hip-trophy-a-ag.go" "hip-trophy-a") - ("hip-trophy-f-ag.go" "hip-trophy-f") - ("hip-trophy-i-ag.go" "hip-trophy-i") - ("hip-trophy-m-ag.go" "hip-trophy-m") - ("hip-door-a-ag.go" "hip-door-a") - ("hip-trophy-n-ag.go" "hip-trophy-n") - ("hip-trophy-j-ag.go" "hip-trophy-j") - ("hip-mirror-ag.go" "hip-mirror") - ("hiphog.go" "hiphog") - ) + ("hiphog-obs.o" + "hiphog-part.o" + "hiphog-scenes.o" + "tpage-929.go" + "tpage-930.go" + "tpage-3042.go" + "tpage-998.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "hip-whack-a-metal-ag.go" + "hip-trophy-g-ag.go" + "hip-trophy-d-ag.go" + "hip-trophy-c-ag.go" + "hip-trophy-a-ag.go" + "hip-trophy-f-ag.go" + "hip-trophy-i-ag.go" + "hip-trophy-m-ag.go" + "hip-door-a-ag.go" + "hip-trophy-n-ag.go" + "hip-trophy-j-ag.go" + "hip-mirror-ag.go" + "hiphog.go" + )) diff --git a/goal_src/jak2/dgos/introcst.gd b/goal_src/jak2/dgos/introcst.gd index 65d51dfec8..14c53c4ba3 100644 --- a/goal_src/jak2/dgos/introcst.gd +++ b/goal_src/jak2/dgos/introcst.gd @@ -1,25 +1,25 @@ ("INTROCST.DGO" - ("intro-ocean.o" "intro-ocean") - ("intro-scenes.o" "intro-scenes") - ("intro-obs.o" "intro-obs") - ("vortex-data.o" "vortex-data") - ("vortex.o" "vortex") - ("tpage-2568.go" "tpage-2568") - ("tpage-2570.go" "tpage-2570") - ("tpage-3264.go" "tpage-3264") - ("daxter-highres-ag.go" "daxter-highres") - ("jakone-highres-ag.go" "jakone-highres") - ("errol-highres-ag.go" "errol-highres") - ("crimson-guard-lowres-ag.go" "crimson-guard-lowres") - ("time-map-ag.go" "time-map") - ("rift-rider-heart-of-mar-ag.go" "rift-rider-heart-of-mar") - ("rift-rider-dash-ag.go" "rift-rider-dash") - ("meteor-ag.go" "meteor") - ("rift-rider-break-b-ag.go" "rift-rider-break-b") - ("vortex-light-ag.go" "vortex-light") - ("rift-rider-chunk-a-ag.go" "rift-rider-chunk-a") - ("rift-rider-break-c-ag.go" "rift-rider-break-c") - ("particleman-ag.go" "particleman") - ("rift-rider-bar-ag.go" "rift-rider-bar") - ("introcst.go" "introcst") - ) + ("intro-ocean.o" + "intro-scenes.o" + "intro-obs.o" + "vortex-data.o" + "vortex.o" + "tpage-2568.go" + "tpage-2570.go" + "tpage-3264.go" + "daxter-highres-ag.go" + "jakone-highres-ag.go" + "errol-highres-ag.go" + "crimson-guard-lowres-ag.go" + "time-map-ag.go" + "rift-rider-heart-of-mar-ag.go" + "rift-rider-dash-ag.go" + "meteor-ag.go" + "rift-rider-break-b-ag.go" + "vortex-light-ag.go" + "rift-rider-chunk-a-ag.go" + "rift-rider-break-c-ag.go" + "particleman-ag.go" + "rift-rider-bar-ag.go" + "introcst.go" + )) diff --git a/goal_src/jak2/dgos/kernel.gd b/goal_src/jak2/dgos/kernel.gd index 6e26486478..426f4499b1 100644 --- a/goal_src/jak2/dgos/kernel.gd +++ b/goal_src/jak2/dgos/kernel.gd @@ -1,10 +1,10 @@ ("KERNEL.CGO" - ("gcommon.o" "gcommon") - ("gstring-h.o" "gstring-h") - ("gkernel-h.o" "gkernel-h") - ("gkernel.o" "gkernel") - ("pskernel.o" "pskernel") - ("gstring.o" "gstring") - ("dgo-h.o" "dgo-h") - ("gstate.o" "gstate") - ) + ("gcommon.o" + "gstring-h.o" + "gkernel-h.o" + "gkernel.o" + "pskernel.o" + "gstring.o" + "dgo-h.o" + "gstate.o" + )) diff --git a/goal_src/jak2/dgos/kiosk.gd b/goal_src/jak2/dgos/kiosk.gd index 7e4a51ea05..93a3e97d8f 100644 --- a/goal_src/jak2/dgos/kiosk.gd +++ b/goal_src/jak2/dgos/kiosk.gd @@ -1,15 +1,15 @@ ("KIOSK.DGO" - ("kiosk-part.o" "kiosk-part") - ("tpage-2192.go" "tpage-2192") - ("tpage-2212.go" "tpage-2212") - ("tpage-2225.go" "tpage-2225") - ("tpage-2911.go" "tpage-2911") - ("tpage-2334.go" "tpage-2334") - ("daxter-highres-ag.go" "daxter-highres") - ("brutter-highres-ag.go" "brutter-highres") - ("jak-highres-ag.go" "jak-highres") - ("kiosk-fish-sign-ag.go" "kiosk-fish-sign") - ("kiosk-banner-ag.go" "kiosk-banner") - ("particleman-ag.go" "particleman") - ("kiosk.go" "kiosk") - ) + ("kiosk-part.o" + "tpage-2192.go" + "tpage-2212.go" + "tpage-2225.go" + "tpage-2911.go" + "tpage-2334.go" + "daxter-highres-ag.go" + "brutter-highres-ag.go" + "jak-highres-ag.go" + "kiosk-fish-sign-ag.go" + "kiosk-banner-ag.go" + "particleman-ag.go" + "kiosk.go" + )) diff --git a/goal_src/jak2/dgos/lashgrd.gd b/goal_src/jak2/dgos/lashgrd.gd index 0ee0297086..d00579bac1 100644 --- a/goal_src/jak2/dgos/lashgrd.gd +++ b/goal_src/jak2/dgos/lashgrd.gd @@ -1,8 +1,8 @@ ("LASHGRD.DGO" - ("tpage-2707.go" "tpage-2707") - ("tpage-3265.go" "tpage-3265") - ("ashelin-highres-ag.go" "ashelin-highres") - ("crimson-guard-highres-ag.go" "crimson-guard-highres") - ("crimson-guard-lowres-ag.go" "crimson-guard-lowres") - ("lashgrd.go" "lashgrd") - ) + ("tpage-2707.go" + "tpage-3265.go" + "ashelin-highres-ag.go" + "crimson-guard-highres-ag.go" + "crimson-guard-lowres-ag.go" + "lashgrd.go" + )) diff --git a/goal_src/jak2/dgos/lashthrn.gd b/goal_src/jak2/dgos/lashthrn.gd index cae01a1004..be6ac5a6df 100644 --- a/goal_src/jak2/dgos/lashthrn.gd +++ b/goal_src/jak2/dgos/lashthrn.gd @@ -1,7 +1,7 @@ ("LASHTHRN.DGO" - ("tpage-2953.go" "tpage-2953") - ("tpage-3266.go" "tpage-3266") - ("ashelin-highres-ag.go" "ashelin-highres") - ("palmpilot-ag.go" "palmpilot") - ("lashthrn.go" "lashthrn") - ) + ("tpage-2953.go" + "tpage-3266.go" + "ashelin-highres-ag.go" + "palmpilot-ag.go" + "lashthrn.go" + )) diff --git a/goal_src/jak2/dgos/lbbush.gd b/goal_src/jak2/dgos/lbbush.gd index 69d68a4857..e6f5729b31 100644 --- a/goal_src/jak2/dgos/lbbush.gd +++ b/goal_src/jak2/dgos/lbbush.gd @@ -1,8 +1,8 @@ ("LBBUSH.DGO" - ("ctywide-bbush.o" "ctywide-bbush") - ("tpage-3336.go" "tpage-3336") - ("tpage-3465.go" "tpage-3465") - ("hovering-mine-ag.go" "hovering-mine") - ("homing-beacon-ag.go" "homing-beacon") - ("lbbush.go" "lbbush") - ) + ("ctywide-bbush.o" + "tpage-3336.go" + "tpage-3465.go" + "hovering-mine-ag.go" + "homing-beacon-ag.go" + "lbbush.go" + )) diff --git a/goal_src/jak2/dgos/lbombbot.gd b/goal_src/jak2/dgos/lbombbot.gd index 0962eca485..7ae00b0f47 100644 --- a/goal_src/jak2/dgos/lbombbot.gd +++ b/goal_src/jak2/dgos/lbombbot.gd @@ -1,8 +1,8 @@ ("LBOMBBOT.DGO" - ("bombbot-h.o" "bombbot-h") - ("bombbot-path.o" "bombbot-path") - ("bombbot.o" "bombbot") - ("tpage-2751.go" "tpage-2751") - ("bombbot-ag.go" "bombbot") - ("lbombbot.go" "lbombbot") - ) + ("bombbot-h.o" + "bombbot-path.o" + "bombbot.o" + "tpage-2751.go" + "bombbot-ag.go" + "lbombbot.go" + )) diff --git a/goal_src/jak2/dgos/lbrnermk.gd b/goal_src/jak2/dgos/lbrnermk.gd index 7064fc0f88..4bda04af90 100644 --- a/goal_src/jak2/dgos/lbrnermk.gd +++ b/goal_src/jak2/dgos/lbrnermk.gd @@ -1,10 +1,10 @@ ("LBRNERMK.DGO" - ("metalkor-texture.o" "metalkor-texture") - ("tpage-2558.go" "tpage-2558") - ("tpage-2801.go" "tpage-2801") - ("tpage-3267.go" "tpage-3267") - ("errol-highres-ag.go" "errol-highres") - ("baron-highres-ag.go" "baron-highres") - ("metalkor-head-ag.go" "metalkor-head") - ("lbrnermk.go" "lbrnermk") - ) + ("metalkor-texture.o" + "tpage-2558.go" + "tpage-2801.go" + "tpage-3267.go" + "errol-highres-ag.go" + "baron-highres-ag.go" + "metalkor-head-ag.go" + "lbrnermk.go" + )) diff --git a/goal_src/jak2/dgos/lcguard.gd b/goal_src/jak2/dgos/lcguard.gd index 461c7dfbdb..eb5bdf0c90 100644 --- a/goal_src/jak2/dgos/lcguard.gd +++ b/goal_src/jak2/dgos/lcguard.gd @@ -1,5 +1,5 @@ ("LCGUARD.DGO" - ("tpage-2691.go" "tpage-2691") - ("crimson-guard-highres-ag.go" "crimson-guard-highres") - ("lcguard.go" "lcguard") - ) + ("tpage-2691.go" + "crimson-guard-highres-ag.go" + "lcguard.go" + )) diff --git a/goal_src/jak2/dgos/lcitylow.gd b/goal_src/jak2/dgos/lcitylow.gd index 9d48ced9b3..12b6a9fd47 100644 --- a/goal_src/jak2/dgos/lcitylow.gd +++ b/goal_src/jak2/dgos/lcitylow.gd @@ -1,9 +1,9 @@ ("LCITYLOW.DGO" - ("tpage-2755.go" "tpage-2755") - ("tpage-2756.go" "tpage-2756") - ("tpage-3388.go" "tpage-3388") - ("barons-ship-lores-ag.go" "barons-ship-lores") - ("searchlight-ag.go" "searchlight") - ("pal-windmill-ag.go" "pal-windmill") - ("lcitylow.go" "lcitylow") - ) + ("tpage-2755.go" + "tpage-2756.go" + "tpage-3388.go" + "barons-ship-lores-ag.go" + "searchlight-ag.go" + "pal-windmill-ag.go" + "lcitylow.go" + )) diff --git a/goal_src/jak2/dgos/ldjakbrn.gd b/goal_src/jak2/dgos/ldjakbrn.gd index 689dd2e0ed..8f658dd836 100644 --- a/goal_src/jak2/dgos/ldjakbrn.gd +++ b/goal_src/jak2/dgos/ldjakbrn.gd @@ -1,10 +1,10 @@ ("LDJAKBRN.DGO" - ("tpage-2662.go" "tpage-2662") - ("tpage-2657.go" "tpage-2657") - ("tpage-3094.go" "tpage-3094") - ("jak-highres-prison-ag.go" "jak-highres-prison") - ("baron-highres-ag.go" "baron-highres") - ("prsn-daxter-plat-ag.go" "prsn-daxter-plat") - ("jak-clothes-ag.go" "jak-clothes") - ("ldjakbrn.go" "ldjakbrn") - ) + ("tpage-2662.go" + "tpage-2657.go" + "tpage-3094.go" + "jak-highres-prison-ag.go" + "baron-highres-ag.go" + "prsn-daxter-plat-ag.go" + "jak-clothes-ag.go" + "ldjakbrn.go" + )) diff --git a/goal_src/jak2/dgos/lerbrngd.gd b/goal_src/jak2/dgos/lerbrngd.gd index 87c36fd6b9..ce5b190baf 100644 --- a/goal_src/jak2/dgos/lerbrngd.gd +++ b/goal_src/jak2/dgos/lerbrngd.gd @@ -1,9 +1,9 @@ ("LERBRNGD.DGO" - ("tpage-2703.go" "tpage-2703") - ("tpage-3268.go" "tpage-3268") - ("samos-highres-ag.go" "samos-highres") - ("baron-highres-ag.go" "baron-highres") - ("crimson-guard-highres-ag.go" "crimson-guard-highres") - ("crimson-guard-lowres-ag.go" "crimson-guard-lowres") - ("lerbrngd.go" "lerbrngd") - ) + ("tpage-2703.go" + "tpage-3268.go" + "samos-highres-ag.go" + "baron-highres-ag.go" + "crimson-guard-highres-ag.go" + "crimson-guard-lowres-ag.go" + "lerbrngd.go" + )) diff --git a/goal_src/jak2/dgos/lerlchal.gd b/goal_src/jak2/dgos/lerlchal.gd index 62125cc837..2ae644b842 100644 --- a/goal_src/jak2/dgos/lerlchal.gd +++ b/goal_src/jak2/dgos/lerlchal.gd @@ -1,17 +1,17 @@ ("LERLCHAL.DGO" - ("race-h.o" "race-h") - ("race-mesh.o" "race-mesh") - ("race-part.o" "race-part") - ("race-obs.o" "race-obs") - ("vehicle-racer.o" "vehicle-racer") - ("race-info.o" "race-info") - ("race-manager.o" "race-manager") - ("race-hud.o" "race-hud") - ("pilot-recorder.o" "pilot-recorder") - ("errol-chal-part.o" "errol-chal-part") - ("errol-chal.o" "errol-chal") - ("tpage-3159.go" "tpage-3159") - ("tpage-3337.go" "tpage-3337") - ("errol-racer-ag.go" "errol-racer") - ("lerlchal.go" "lerlchal") - ) + ("race-h.o" + "race-mesh.o" + "race-part.o" + "race-obs.o" + "vehicle-racer.o" + "race-info.o" + "race-manager.o" + "race-hud.o" + "pilot-recorder.o" + "errol-chal-part.o" + "errol-chal.o" + "tpage-3159.go" + "tpage-3337.go" + "errol-racer-ag.go" + "lerlchal.go" + )) diff --git a/goal_src/jak2/dgos/lerltess.gd b/goal_src/jak2/dgos/lerltess.gd index dd8d08d7d3..bd67ab29db 100644 --- a/goal_src/jak2/dgos/lerltess.gd +++ b/goal_src/jak2/dgos/lerltess.gd @@ -1,9 +1,9 @@ ("LERLTESS.DGO" - ("tess-lhiphog+0-ag.go" "tess-lhiphog+0") - ("tpage-2949.go" "tpage-2949") - ("tpage-3269.go" "tpage-3269") - ("krew-highres-ag.go" "krew-highres") - ("errol-highres-ag.go" "errol-highres") - ("tess-highres-ag.go" "tess-highres") - ("lerltess.go" "lerltess") - ) + ("tess-lhiphog+0-ag.go" + "tpage-2949.go" + "tpage-3269.go" + "krew-highres-ag.go" + "errol-highres-ag.go" + "tess-highres-ag.go" + "lerltess.go" + )) diff --git a/goal_src/jak2/dgos/lerrol.gd b/goal_src/jak2/dgos/lerrol.gd index 2673de075b..4f9504aadd 100644 --- a/goal_src/jak2/dgos/lerrol.gd +++ b/goal_src/jak2/dgos/lerrol.gd @@ -1,5 +1,5 @@ ("LERROL.DGO" - ("tpage-3270.go" "tpage-3270") - ("errol-highres-ag.go" "errol-highres") - ("lerrol.go" "lerrol") - ) + ("tpage-3270.go" + "errol-highres-ag.go" + "lerrol.go" + )) diff --git a/goal_src/jak2/dgos/lgarcsta.gd b/goal_src/jak2/dgos/lgarcsta.gd index 9f1f15db0b..539d38c3cc 100644 --- a/goal_src/jak2/dgos/lgarcsta.gd +++ b/goal_src/jak2/dgos/lgarcsta.gd @@ -1,11 +1,11 @@ ("LGARCSTA.DGO" - ("tpage-2699.go" "tpage-2699") - ("tpage-3512.go" "tpage-3512") - ("tpage-3271.go" "tpage-3271") - ("krew-highres-ag.go" "krew-highres") - ("samos-highres-ag.go" "samos-highres") - ("tess-highres-ag.go" "tess-highres") - ("ashelin-highres-ag.go" "ashelin-highres") - ("gold-key-ag.go" "sew-gold-key") - ("lgarcsta.go" "lgarcsta") - ) + ("tpage-2699.go" + "tpage-3512.go" + "tpage-3271.go" + "krew-highres-ag.go" + "samos-highres-ag.go" + "tess-highres-ag.go" + "ashelin-highres-ag.go" + "gold-key-ag.go" + "lgarcsta.go" + )) diff --git a/goal_src/jak2/dgos/lguard.gd b/goal_src/jak2/dgos/lguard.gd index 49839efed0..f8f8fa74df 100644 --- a/goal_src/jak2/dgos/lguard.gd +++ b/goal_src/jak2/dgos/lguard.gd @@ -1,13 +1,13 @@ ("LGUARD.DGO" - ("tpage-1753.go" "tpage-1753") - ("tpage-2883.go" "tpage-2883") - ("tpage-3272.go" "tpage-3272") - ("krew-highres-ag.go" "krew-highres") - ("sig-highres-ag.go" "sig-highres") - ("crimson-guard-highres-ag.go" "crimson-guard-highres") - ("gun-upgrade-a-ag.go" "gun-upgrade-a") - ("palmpilot-ag.go" "palmpilot") - ("hip-mug-ag.go" "hip-mug") - ("computerpaper-ag.go" "computerpaper") - ("lguard.go" "lguard") - ) + ("tpage-1753.go" + "tpage-2883.go" + "tpage-3272.go" + "krew-highres-ag.go" + "sig-highres-ag.go" + "crimson-guard-highres-ag.go" + "gun-upgrade-a-ag.go" + "palmpilot-ag.go" + "hip-mug-ag.go" + "computerpaper-ag.go" + "lguard.go" + )) diff --git a/goal_src/jak2/dgos/lhelldog.gd b/goal_src/jak2/dgos/lhelldog.gd index 338b4b8713..63d0ce7c4b 100644 --- a/goal_src/jak2/dgos/lhelldog.gd +++ b/goal_src/jak2/dgos/lhelldog.gd @@ -1,7 +1,7 @@ ("LHELLDOG.DGO" - ("helldog.o" "helldog") - ("tpage-2324.go" "tpage-2324") - ("tpage-3273.go" "tpage-3273") - ("helldog-ag.go" "helldog") - ("lhelldog.go" "lhelldog") - ) + ("helldog.o" + "tpage-2324.go" + "tpage-3273.go" + "helldog-ag.go" + "lhelldog.go" + )) diff --git a/goal_src/jak2/dgos/lhipout.gd b/goal_src/jak2/dgos/lhipout.gd index c1ccb329f7..878fdab5c1 100644 --- a/goal_src/jak2/dgos/lhipout.gd +++ b/goal_src/jak2/dgos/lhipout.gd @@ -1,18 +1,18 @@ ("LHIPOUT.DGO" - ("tpage-3440.go" "tpage-3440") - ("tpage-3199.go" "tpage-3199") - ("tpage-3200.go" "tpage-3200") - ("tpage-3486.go" "tpage-3486") - ("tpage-3242.go" "tpage-3242") - ("tpage-3544.go" "tpage-3544") - ("pecker-highres-ag.go" "pecker-highres") - ("crocadog-highres-ag.go" "crocadog-highres") - ("sig-highres-ag.go" "sig-highres") - ("metalkor-chopped-ag.go" "metalkor-chopped") - ("gold-key-ag.go" "sew-gold-key") - ("kid-medallion-ag.go" "kid-medallion") - ("hip-bottle-c-ag.go" "hip-bottle-c") - ("hip-mug-ag.go" "hip-mug") - ("particleman-ag.go" "particleman") - ("lhipout.go" "lhipout") - ) + ("tpage-3440.go" + "tpage-3199.go" + "tpage-3200.go" + "tpage-3486.go" + "tpage-3242.go" + "tpage-3544.go" + "pecker-highres-ag.go" + "crocadog-highres-ag.go" + "sig-highres-ag.go" + "metalkor-chopped-ag.go" + "gold-key-ag.go" + "kid-medallion-ag.go" + "hip-bottle-c-ag.go" + "hip-mug-ag.go" + "particleman-ag.go" + "lhipout.go" + )) diff --git a/goal_src/jak2/dgos/lintcstb.gd b/goal_src/jak2/dgos/lintcstb.gd index 500563eb9e..2e32864a75 100644 --- a/goal_src/jak2/dgos/lintcstb.gd +++ b/goal_src/jak2/dgos/lintcstb.gd @@ -1,10 +1,10 @@ ("LINTCSTB.DGO" - ("tpage-2752.go" "tpage-2752") - ("tpage-2754.go" "tpage-2754") - ("tpage-3243.go" "tpage-3243") - ("keira-highres-ag.go" "keira-highres") - ("samos-highres-ag.go" "samos-highres") - ("rift-rider-break-ag.go" "rift-rider-break") - ("rift-rider-ag.go" "rift-rider") - ("lintcstb.go" "lintcstb") - ) + ("tpage-2752.go" + "tpage-2754.go" + "tpage-3243.go" + "keira-highres-ag.go" + "samos-highres-ag.go" + "rift-rider-break-ag.go" + "rift-rider-ag.go" + "lintcstb.go" + )) diff --git a/goal_src/jak2/dgos/ljakdax.gd b/goal_src/jak2/dgos/ljakdax.gd index d4ed1eb393..de5b4e4b60 100644 --- a/goal_src/jak2/dgos/ljakdax.gd +++ b/goal_src/jak2/dgos/ljakdax.gd @@ -1,6 +1,6 @@ ("LJAKDAX.DGO" - ("tpage-1879.go" "tpage-1879") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("ljakdax.go" "ljakdax") - ) + ("tpage-1879.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "ljakdax.go" + )) diff --git a/goal_src/jak2/dgos/ljkdxash.gd b/goal_src/jak2/dgos/ljkdxash.gd index 25a5d4d6d8..770d76b54b 100644 --- a/goal_src/jak2/dgos/ljkdxash.gd +++ b/goal_src/jak2/dgos/ljkdxash.gd @@ -1,8 +1,8 @@ ("LJKDXASH.DGO" - ("tpage-3188.go" "tpage-3188") - ("tpage-3244.go" "tpage-3244") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("ashelin-highres-ag.go" "ashelin-highres") - ("ljkdxash.go" "ljkdxash") - ) + ("tpage-3188.go" + "tpage-3244.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "ashelin-highres-ag.go" + "ljkdxash.go" + )) diff --git a/goal_src/jak2/dgos/lkeirift.gd b/goal_src/jak2/dgos/lkeirift.gd index bb82f1050c..81bd29a01a 100644 --- a/goal_src/jak2/dgos/lkeirift.gd +++ b/goal_src/jak2/dgos/lkeirift.gd @@ -1,8 +1,8 @@ ("LKEIRIFT.DGO" - ("keira-anim+0-ag.go" "keira-anim+0") - ("tpage-3023.go" "tpage-3023") - ("tpage-3024.go" "tpage-3024") - ("keira-highres-ag.go" "keira-highres") - ("rift-rider-ag.go" "rift-rider") - ("lkeirift.go" "lkeirift") - ) + ("keira-anim+0-ag.go" + "tpage-3023.go" + "tpage-3024.go" + "keira-highres-ag.go" + "rift-rider-ag.go" + "lkeirift.go" + )) diff --git a/goal_src/jak2/dgos/lkiddoge.gd b/goal_src/jak2/dgos/lkiddoge.gd index 5c28bd0efc..1a6c4bd7ec 100644 --- a/goal_src/jak2/dgos/lkiddoge.gd +++ b/goal_src/jak2/dgos/lkiddoge.gd @@ -1,24 +1,24 @@ ("LKIDDOGE.DGO" - ("ai-task-h.o" "ai-task-h") - ("bot-h.o" "bot-h") - ("bot.o" "bot") - ("bot-states.o" "bot-states") - ("hal-h.o" "hal-h") - ("hal-task.o" "hal-task") - ("hal.o" "hal") - ("kidesc-h.o" "kidesc-h") - ("crocesc-h.o" "crocesc-h") - ("hal4-course.o" "hal4-course") - ("kidesc-task.o" "kidesc-task") - ("kidesc.o" "kidesc") - ("kidesc-states.o" "kidesc-states") - ("crocesc-task.o" "crocesc-task") - ("crocesc.o" "crocesc") - ("crocesc-states.o" "crocesc-states") - ("kidesc4-course.o" "kidesc4-course") - ("crocesc4-course.o" "crocesc4-course") - ("tpage-2209.go" "tpage-2209") - ("crocadog-escort-ag.go" "crocadog-escort") - ("kid-escort-ag.go" "kid-escort") - ("lkiddoge.go" "lkiddoge") - ) + ("ai-task-h.o" + "bot-h.o" + "bot.o" + "bot-states.o" + "hal-h.o" + "hal-task.o" + "hal.o" + "kidesc-h.o" + "crocesc-h.o" + "hal4-course.o" + "kidesc-task.o" + "kidesc.o" + "kidesc-states.o" + "crocesc-task.o" + "crocesc.o" + "crocesc-states.o" + "kidesc4-course.o" + "crocesc4-course.o" + "tpage-2209.go" + "crocadog-escort-ag.go" + "kid-escort-ag.go" + "lkiddoge.go" + )) diff --git a/goal_src/jak2/dgos/lmeetbrt.gd b/goal_src/jak2/dgos/lmeetbrt.gd index 2a177747f1..ed5e57657e 100644 --- a/goal_src/jak2/dgos/lmeetbrt.gd +++ b/goal_src/jak2/dgos/lmeetbrt.gd @@ -1,7 +1,7 @@ ("LMEETBRT.DGO" - ("meet-brutter.o" "meet-brutter") - ("tpage-2438.go" "tpage-2438") - ("babak-ag.go" "babak") - ("paddy-wagon-ag.go" "paddy-wagon") - ("lmeetbrt.go" "lmeetbrt") - ) + ("meet-brutter.o" + "tpage-2438.go" + "babak-ag.go" + "paddy-wagon-ag.go" + "lmeetbrt.go" + )) diff --git a/goal_src/jak2/dgos/loutcstb.gd b/goal_src/jak2/dgos/loutcstb.gd index 8557ed5c98..916bc510dc 100644 --- a/goal_src/jak2/dgos/loutcstb.gd +++ b/goal_src/jak2/dgos/loutcstb.gd @@ -1,16 +1,16 @@ ("LOUTCSTB.DGO" - ("tpage-3186.go" "tpage-3186") - ("tpage-3185.go" "tpage-3185") - ("tpage-3187.go" "tpage-3187") - ("tpage-3245.go" "tpage-3245") - ("youngsamos-highres-ag.go" "youngsamos-highres") - ("brutter-highres-ag.go" "brutter-highres") - ("kid-highres-ag.go" "kid-highres") - ("rift-ring-ag.go" "rift-ring") - ("brutter-balloon-norift-ag.go" "brutter-balloon-norift") - ("metalkor-chopped-ag.go" "metalkor-chopped") - ("rift-rider-ag.go" "rift-rider") - ("precursor-stone-ag.go" "precursor-stone") - ("particleman-ag.go" "particleman") - ("loutcstb.go" "loutcstb") - ) + ("tpage-3186.go" + "tpage-3185.go" + "tpage-3187.go" + "tpage-3245.go" + "youngsamos-highres-ag.go" + "brutter-highres-ag.go" + "kid-highres-ag.go" + "rift-ring-ag.go" + "brutter-balloon-norift-ag.go" + "metalkor-chopped-ag.go" + "rift-rider-ag.go" + "precursor-stone-ag.go" + "particleman-ag.go" + "loutcstb.go" + )) diff --git a/goal_src/jak2/dgos/lpackage.gd b/goal_src/jak2/dgos/lpackage.gd index 4c5853faa9..020d02445c 100644 --- a/goal_src/jak2/dgos/lpackage.gd +++ b/goal_src/jak2/dgos/lpackage.gd @@ -1,6 +1,6 @@ ("LPACKAGE.DGO" - ("delivery-task.o" "delivery-task") - ("tpage-2459.go" "tpage-2459") - ("krew-package-ag.go" "krew-package") - ("lpackage.go" "lpackage") - ) + ("delivery-task.o" + "tpage-2459.go" + "krew-package-ag.go" + "lpackage.go" + )) diff --git a/goal_src/jak2/dgos/lportrun.gd b/goal_src/jak2/dgos/lportrun.gd index 9ef0da54d6..4b3ada846b 100644 --- a/goal_src/jak2/dgos/lportrun.gd +++ b/goal_src/jak2/dgos/lportrun.gd @@ -1,10 +1,10 @@ ("LPORTRUN.DGO" - ("portrun.o" "portrun") - ("tpage-2817.go" "tpage-2817") - ("tpage-2373.go" "tpage-2373") - ("ctyport-cargo-ag.go" "ctyport-cargo") - ("ctyport-spy-ag.go" "ctyport-spy") - ("mine-b-ag.go" "sew-mine-b") - ("ctyport-mine-ag.go" "ctyport-mine") - ("lportrun.go" "lportrun") - ) + ("portrun.o" + "tpage-2817.go" + "tpage-2373.go" + "ctyport-cargo-ag.go" + "ctyport-spy-ag.go" + "mine-b-ag.go" + "ctyport-mine-ag.go" + "lportrun.go" + )) diff --git a/goal_src/jak2/dgos/lpower.gd b/goal_src/jak2/dgos/lpower.gd index 07db142d7b..34113ffbff 100644 --- a/goal_src/jak2/dgos/lpower.gd +++ b/goal_src/jak2/dgos/lpower.gd @@ -1,6 +1,6 @@ ("LPOWER.DGO" - ("ctypower.o" "ctypower") - ("tpage-3348.go" "tpage-3348") - ("cty-guard-turret-button-ag.go" "cty-guard-turret-button") - ("lpower.go" "lpower") - ) + ("ctypower.o" + "tpage-3348.go" + "cty-guard-turret-button-ag.go" + "lpower.go" + )) diff --git a/goal_src/jak2/dgos/lprotect.gd b/goal_src/jak2/dgos/lprotect.gd index 5fe48e6baa..65f1339629 100644 --- a/goal_src/jak2/dgos/lprotect.gd +++ b/goal_src/jak2/dgos/lprotect.gd @@ -1,10 +1,10 @@ ("LPROTECT.DGO" - ("gun-buoy.o" "gun-buoy") - ("protect.o" "protect") - ("tpage-2869.go" "tpage-2869") - ("gun-buoy-ag.go" "gun-buoy") - ("transport-ag.go" "transport") - ("seal-of-mar-ag.go" "seal-of-mar") - ("seal-of-mar-top-ag.go" "seal-of-mar-top") - ("lprotect.go" "lprotect") - ) + ("gun-buoy.o" + "protect.o" + "tpage-2869.go" + "gun-buoy-ag.go" + "transport-ag.go" + "seal-of-mar-ag.go" + "seal-of-mar-top-ag.go" + "lprotect.go" + )) diff --git a/goal_src/jak2/dgos/lprsncst.gd b/goal_src/jak2/dgos/lprsncst.gd index 778179e935..24460bd1bf 100644 --- a/goal_src/jak2/dgos/lprsncst.gd +++ b/goal_src/jak2/dgos/lprsncst.gd @@ -1,9 +1,9 @@ ("LPRSNCST.DGO" - ("tpage-2658.go" "tpage-2658") - ("tpage-3246.go" "tpage-3246") - ("youngsamos-highres-ag.go" "youngsamos-highres") - ("jak-highres-ag.go" "jak-highres") - ("samos-highres-ag.go" "samos-highres") - ("tess-highres-ag.go" "tess-highres") - ("lprsncst.go" "lprsncst") - ) + ("tpage-2658.go" + "tpage-3246.go" + "youngsamos-highres-ag.go" + "jak-highres-ag.go" + "samos-highres-ag.go" + "tess-highres-ag.go" + "lprsncst.go" + )) diff --git a/goal_src/jak2/dgos/lprtrace.gd b/goal_src/jak2/dgos/lprtrace.gd index d18bf9dab0..cfcc0b1a4c 100644 --- a/goal_src/jak2/dgos/lprtrace.gd +++ b/goal_src/jak2/dgos/lprtrace.gd @@ -1,15 +1,15 @@ ("LPRTRACE.DGO" - ("race-h.o" "race-h") - ("race-mesh.o" "race-mesh") - ("race-part.o" "race-part") - ("race-obs.o" "race-obs") - ("vehicle-racer.o" "vehicle-racer") - ("race-info.o" "race-info") - ("race-manager.o" "race-manager") - ("race-hud.o" "race-hud") - ("pilot-recorder.o" "pilot-recorder") - ("errol-chal-part.o" "errol-chal-part") - ("errol-chal.o" "errol-chal") - ("tpage-3427.go" "tpage-3427") - ("lprtrace.go" "lprtrace") - ) + ("race-h.o" + "race-mesh.o" + "race-part.o" + "race-obs.o" + "vehicle-racer.o" + "race-info.o" + "race-manager.o" + "race-hud.o" + "pilot-recorder.o" + "errol-chal-part.o" + "errol-chal.o" + "tpage-3427.go" + "lprtrace.go" + )) diff --git a/goal_src/jak2/dgos/lracebb.gd b/goal_src/jak2/dgos/lracebb.gd index b28659af53..d76508b0a2 100644 --- a/goal_src/jak2/dgos/lracebb.gd +++ b/goal_src/jak2/dgos/lracebb.gd @@ -1,3 +1,3 @@ ("LRACEBB.DGO" - ("lracebb.go" "lracebb") - ) + ("lracebb.go" + )) diff --git a/goal_src/jak2/dgos/lracebf.gd b/goal_src/jak2/dgos/lracebf.gd index a4a308e09d..485065c546 100644 --- a/goal_src/jak2/dgos/lracebf.gd +++ b/goal_src/jak2/dgos/lracebf.gd @@ -1,3 +1,3 @@ ("LRACEBF.DGO" - ("lracebf.go" "lracebf") - ) + ("lracebf.go" + )) diff --git a/goal_src/jak2/dgos/lracecb.gd b/goal_src/jak2/dgos/lracecb.gd index 8395fa4f6e..37f5cabdbc 100644 --- a/goal_src/jak2/dgos/lracecb.gd +++ b/goal_src/jak2/dgos/lracecb.gd @@ -1,4 +1,4 @@ ("LRACECB.DGO" - ("tpage-3432.go" "tpage-3432") - ("lracecb.go" "lracecb") - ) + ("tpage-3432.go" + "lracecb.go" + )) diff --git a/goal_src/jak2/dgos/lracecf.gd b/goal_src/jak2/dgos/lracecf.gd index ff07750a7c..1480be85fc 100644 --- a/goal_src/jak2/dgos/lracecf.gd +++ b/goal_src/jak2/dgos/lracecf.gd @@ -1,4 +1,4 @@ ("LRACECF.DGO" - ("tpage-3430.go" "tpage-3430") - ("lracecf.go" "lracecf") - ) + ("tpage-3430.go" + "lracecf.go" + )) diff --git a/goal_src/jak2/dgos/lracedb.gd b/goal_src/jak2/dgos/lracedb.gd index ad62b07c90..6339c74a00 100644 --- a/goal_src/jak2/dgos/lracedb.gd +++ b/goal_src/jak2/dgos/lracedb.gd @@ -1,3 +1,3 @@ ("LRACEDB.DGO" - ("lracedb.go" "lracedb") - ) + ("lracedb.go" + )) diff --git a/goal_src/jak2/dgos/lracedf.gd b/goal_src/jak2/dgos/lracedf.gd index fb47304437..9ddc2a0628 100644 --- a/goal_src/jak2/dgos/lracedf.gd +++ b/goal_src/jak2/dgos/lracedf.gd @@ -1,3 +1,3 @@ ("LRACEDF.DGO" - ("lracedf.go" "lracedf") - ) + ("lracedf.go" + )) diff --git a/goal_src/jak2/dgos/lracelit.gd b/goal_src/jak2/dgos/lracelit.gd index e0f5381523..ce99a586db 100644 --- a/goal_src/jak2/dgos/lracelit.gd +++ b/goal_src/jak2/dgos/lracelit.gd @@ -1,8 +1,8 @@ ("LRACELIT.DGO" - ("tpage-3162.go" "tpage-3162") - ("tpage-3374.go" "tpage-3374") - ("stadium-racer-ag.go" "stadium-racer") - ("race-start-light-ag.go" "race-start-light") - ("race-start-light-banner-ag.go" "race-start-light-banner") - ("lracelit.go" "lracelit") - ) + ("tpage-3162.go" + "tpage-3374.go" + "stadium-racer-ag.go" + "race-start-light-ag.go" + "race-start-light-banner-ag.go" + "lracelit.go" + )) diff --git a/goal_src/jak2/dgos/lsack.gd b/goal_src/jak2/dgos/lsack.gd index 12dc10a95a..6684647db5 100644 --- a/goal_src/jak2/dgos/lsack.gd +++ b/goal_src/jak2/dgos/lsack.gd @@ -1,6 +1,6 @@ ("LSACK.DGO" - ("collection-task.o" "collection-task") - ("tpage-2605.go" "tpage-2605") - ("krew-moneybag-ag.go" "krew-moneybag") - ("lsack.go" "lsack") - ) + ("collection-task.o" + "tpage-2605.go" + "krew-moneybag-ag.go" + "lsack.go" + )) diff --git a/goal_src/jak2/dgos/lsamergd.gd b/goal_src/jak2/dgos/lsamergd.gd index 470cac540b..0fd7f4fee2 100644 --- a/goal_src/jak2/dgos/lsamergd.gd +++ b/goal_src/jak2/dgos/lsamergd.gd @@ -1,10 +1,10 @@ ("LSAMERGD.DGO" - ("samos-lsamergd+0-ag.go" "samos-lsamergd+0") - ("tpage-2701.go" "tpage-2701") - ("tpage-3248.go" "tpage-3248") - ("samos-highres-ag.go" "samos-highres") - ("errol-highres-ag.go" "errol-highres") - ("crimson-guard-highres-ag.go" "crimson-guard-highres") - ("crimson-guard-lowres-ag.go" "crimson-guard-lowres") - ("lsamergd.go" "lsamergd") - ) + ("samos-lsamergd+0-ag.go" + "tpage-2701.go" + "tpage-3248.go" + "samos-highres-ag.go" + "errol-highres-ag.go" + "crimson-guard-highres-ag.go" + "crimson-guard-lowres-ag.go" + "lsamergd.go" + )) diff --git a/goal_src/jak2/dgos/lshuttle.gd b/goal_src/jak2/dgos/lshuttle.gd index 52277d8cdc..64d40bd515 100644 --- a/goal_src/jak2/dgos/lshuttle.gd +++ b/goal_src/jak2/dgos/lshuttle.gd @@ -1,7 +1,7 @@ ("LSHUTTLE.DGO" - ("shuttle.o" "shuttle") - ("tpage-3214.go" "tpage-3214") - ("citizen-rebel-ag.go" "citizen-rebel") - ("krew-package-ag.go" "krew-package") - ("lshuttle.go" "lshuttle") - ) + ("shuttle.o" + "tpage-3214.go" + "citizen-rebel-ag.go" + "krew-package-ag.go" + "lshuttle.go" + )) diff --git a/goal_src/jak2/dgos/lsmysbrt.gd b/goal_src/jak2/dgos/lsmysbrt.gd index f623dbf57a..ab87ab5130 100644 --- a/goal_src/jak2/dgos/lsmysbrt.gd +++ b/goal_src/jak2/dgos/lsmysbrt.gd @@ -1,8 +1,8 @@ ("LSMYSBRT.DGO" - ("tpage-2705.go" "tpage-2705") - ("tpage-3249.go" "tpage-3249") - ("youngsamos-highres-ag.go" "youngsamos-highres") - ("brutter-highres-ag.go" "brutter-highres") - ("samos-highres-ag.go" "samos-highres") - ("lsmysbrt.go" "lsmysbrt") - ) + ("tpage-2705.go" + "tpage-3249.go" + "youngsamos-highres-ag.go" + "brutter-highres-ag.go" + "samos-highres-ag.go" + "lsmysbrt.go" + )) diff --git a/goal_src/jak2/dgos/ltentob.gd b/goal_src/jak2/dgos/ltentob.gd index 88f2e259e5..a962d10903 100644 --- a/goal_src/jak2/dgos/ltentob.gd +++ b/goal_src/jak2/dgos/ltentob.gd @@ -1,8 +1,8 @@ ("LTENTOB.DGO" - ("tpage-3073.go" "tpage-3073") - ("tpage-3112.go" "tpage-3112") - ("tpage-3250.go" "tpage-3250") - ("kor-highres-ag.go" "kor-highres") - ("seal-of-mar-ag.go" "seal-of-mar") - ("ltentob.go" "ltentob") - ) + ("tpage-3073.go" + "tpage-3112.go" + "tpage-3250.go" + "kor-highres-ag.go" + "seal-of-mar-ag.go" + "ltentob.go" + )) diff --git a/goal_src/jak2/dgos/ltentout.gd b/goal_src/jak2/dgos/ltentout.gd index 7f1c45af15..89efc72069 100644 --- a/goal_src/jak2/dgos/ltentout.gd +++ b/goal_src/jak2/dgos/ltentout.gd @@ -1,7 +1,7 @@ ("LTENTOUT.DGO" - ("youngsamos-onintent+0-ag.go" "youngsamos-onintent+0") - ("tpage-2618.go" "tpage-2618") - ("tpage-3251.go" "tpage-3251") - ("youngsamos-highres-ag.go" "youngsamos-highres") - ("ltentout.go" "ltentout") - ) + ("youngsamos-onintent+0-ag.go" + "tpage-2618.go" + "tpage-3251.go" + "youngsamos-highres-ag.go" + "ltentout.go" + )) diff --git a/goal_src/jak2/dgos/ltess.gd b/goal_src/jak2/dgos/ltess.gd index 2def252073..8aca585e78 100644 --- a/goal_src/jak2/dgos/ltess.gd +++ b/goal_src/jak2/dgos/ltess.gd @@ -1,13 +1,13 @@ ("LTESS.DGO" - ("tess-lhiphog+0-ag.go" "tess-lhiphog+0") - ("tpage-1862.go" "tpage-1862") - ("tpage-1756.go" "tpage-1756") - ("tpage-2881.go" "tpage-2881") - ("tpage-3241.go" "tpage-3241") - ("krew-highres-ag.go" "krew-highres") - ("sig-highres-ag.go" "sig-highres") - ("tess-highres-ag.go" "tess-highres") - ("hip-bottle-c-ag.go" "hip-bottle-c") - ("hip-bottle-b-ag.go" "hip-bottle-b") - ("ltess.go" "ltess") - ) + ("tess-lhiphog+0-ag.go" + "tpage-1862.go" + "tpage-1756.go" + "tpage-2881.go" + "tpage-3241.go" + "krew-highres-ag.go" + "sig-highres-ag.go" + "tess-highres-ag.go" + "hip-bottle-c-ag.go" + "hip-bottle-b-ag.go" + "ltess.go" + )) diff --git a/goal_src/jak2/dgos/lthrnout.gd b/goal_src/jak2/dgos/lthrnout.gd index 1f7792039d..3d7ec0daa9 100644 --- a/goal_src/jak2/dgos/lthrnout.gd +++ b/goal_src/jak2/dgos/lthrnout.gd @@ -1,8 +1,8 @@ ("LTHRNOUT.DGO" - ("tpage-3194.go" "tpage-3194") - ("tpage-3252.go" "tpage-3252") - ("torn-highres-ag.go" "torn-highres") - ("ashelin-highres-ag.go" "ashelin-highres") - ("palmpilot-ag.go" "palmpilot") - ("lthrnout.go" "lthrnout") - ) + ("tpage-3194.go" + "tpage-3252.go" + "torn-highres-ag.go" + "ashelin-highres-ag.go" + "palmpilot-ag.go" + "lthrnout.go" + )) diff --git a/goal_src/jak2/dgos/ltrnkrkd.gd b/goal_src/jak2/dgos/ltrnkrkd.gd index 490059589e..fa560315bb 100644 --- a/goal_src/jak2/dgos/ltrnkrkd.gd +++ b/goal_src/jak2/dgos/ltrnkrkd.gd @@ -1,9 +1,9 @@ ("LTRNKRKD.DGO" - ("kid-ltrnkrkd+0-ag.go" "kid-ltrnkrkd+0") - ("tpage-1773.go" "tpage-1773") - ("tpage-3253.go" "tpage-3253") - ("kor-highres-ag.go" "kor-highres") - ("torn-highres-ag.go" "torn-highres") - ("kid-highres-ag.go" "kid-highres") - ("ltrnkrkd.go" "ltrnkrkd") - ) + ("kid-ltrnkrkd+0-ag.go" + "tpage-1773.go" + "tpage-3253.go" + "kor-highres-ag.go" + "torn-highres-ag.go" + "kid-highres-ag.go" + "ltrnkrkd.go" + )) diff --git a/goal_src/jak2/dgos/ltrntess.gd b/goal_src/jak2/dgos/ltrntess.gd index 4572b0195d..daff5df0fd 100644 --- a/goal_src/jak2/dgos/ltrntess.gd +++ b/goal_src/jak2/dgos/ltrntess.gd @@ -1,11 +1,11 @@ ("LTRNTESS.DGO" - ("tess-ltrntess+0-ag.go" "tess-ltrntess+0") - ("tpage-1764.go" "tpage-1764") - ("tpage-3254.go" "tpage-3254") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("torn-highres-ag.go" "torn-highres") - ("tess-highres-ag.go" "tess-highres") - ("particleman-ag.go" "particleman") - ("ltrntess.go" "ltrntess") - ) + ("tess-ltrntess+0-ag.go" + "tpage-1764.go" + "tpage-3254.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "torn-highres-ag.go" + "tess-highres-ag.go" + "particleman-ag.go" + "ltrntess.go" + )) diff --git a/goal_src/jak2/dgos/ltrnysam.gd b/goal_src/jak2/dgos/ltrnysam.gd index e29c2dd906..edfa81e21b 100644 --- a/goal_src/jak2/dgos/ltrnysam.gd +++ b/goal_src/jak2/dgos/ltrnysam.gd @@ -1,8 +1,8 @@ ("LTRNYSAM.DGO" - ("youngsamos-ltrnysam+0-ag.go" "youngsamos-ltrnysam+0") - ("tpage-1774.go" "tpage-1774") - ("tpage-3255.go" "tpage-3255") - ("youngsamos-highres-ag.go" "youngsamos-highres") - ("torn-highres-ag.go" "torn-highres") - ("ltrnysam.go" "ltrnysam") - ) + ("youngsamos-ltrnysam+0-ag.go" + "tpage-1774.go" + "tpage-3255.go" + "youngsamos-highres-ag.go" + "torn-highres-ag.go" + "ltrnysam.go" + )) diff --git a/goal_src/jak2/dgos/lwhack.gd b/goal_src/jak2/dgos/lwhack.gd index 78354d16e7..c0c81b8269 100644 --- a/goal_src/jak2/dgos/lwhack.gd +++ b/goal_src/jak2/dgos/lwhack.gd @@ -1,14 +1,14 @@ ("LWHACK.DGO" - ("daxter-mole+0-ag.go" "daxter-mole+0") - ("tess-lwhack+0-ag.go" "tess-lwhack+0") - ("whack.o" "whack") - ("tpage-2889.go" "tpage-2889") - ("tpage-3256.go" "tpage-3256") - ("tess-highres-ag.go" "tess-highres") - ("time-map-ag.go" "time-map") - ("grunt-fma-ag.go" "grunt-fma") - ("hip-mole-ag.go" "hip-mole") - ("big-bopper-ag.go" "big-bopper") - ("particleman-ag.go" "particleman") - ("lwhack.go" "lwhack") - ) + ("daxter-mole+0-ag.go" + "tess-lwhack+0-ag.go" + "whack.o" + "tpage-2889.go" + "tpage-3256.go" + "tess-highres-ag.go" + "time-map-ag.go" + "grunt-fma-ag.go" + "hip-mole-ag.go" + "big-bopper-ag.go" + "particleman-ag.go" + "lwhack.go" + )) diff --git a/goal_src/jak2/dgos/lwidea.gd b/goal_src/jak2/dgos/lwidea.gd index 11f6250469..d994b8a6f5 100644 --- a/goal_src/jak2/dgos/lwidea.gd +++ b/goal_src/jak2/dgos/lwidea.gd @@ -1,18 +1,18 @@ ("LWIDEA.DGO" - ("tpage-2929.go" "tpage-2929") - ("tpage-2930.go" "tpage-2930") - ("citizen-fat-ag.go" "citizen-fat") - ("citizen-norm-ag.go" "citizen-norm") - ("crimson-guard-ag.go" "crimson-guard") - ("citizen-chick-ag.go" "citizen-chick") - ("hellcat-ag.go" "hellcat") - ("carc-ag.go" "carc") - ("cara-ag.go" "cara") - ("carb-ag.go" "carb") - ("citizen-norm-rider-ag.go" "citizen-norm-rider") - ("crimson-bike-ag.go" "crimson-bike") - ("bikec-ag.go" "bikec") - ("bikeb-ag.go" "bikeb") - ("bikea-ag.go" "bikea") - ("lwidea.go" "lwidea") - ) + ("tpage-2929.go" + "tpage-2930.go" + "citizen-fat-ag.go" + "citizen-norm-ag.go" + "crimson-guard-ag.go" + "citizen-chick-ag.go" + "hellcat-ag.go" + "carc-ag.go" + "cara-ag.go" + "carb-ag.go" + "citizen-norm-rider-ag.go" + "crimson-bike-ag.go" + "bikec-ag.go" + "bikeb-ag.go" + "bikea-ag.go" + "lwidea.go" + )) diff --git a/goal_src/jak2/dgos/lwideb.gd b/goal_src/jak2/dgos/lwideb.gd index 1db4314976..6c0cb82f58 100644 --- a/goal_src/jak2/dgos/lwideb.gd +++ b/goal_src/jak2/dgos/lwideb.gd @@ -1,13 +1,13 @@ ("LWIDEB.DGO" - ("tpage-2972.go" "tpage-2972") - ("grunt-ag.go" "grunt") - ("citizen-norm-ag.go" "citizen-norm") - ("crimson-guard-ag.go" "crimson-guard") - ("predator-ag.go" "predator") - ("flitter-ag.go" "flitter") - ("cara-ag.go" "cara") - ("citizen-norm-rider-ag.go" "citizen-norm-rider") - ("crimson-bike-ag.go" "crimson-bike") - ("bikea-ag.go" "bikea") - ("lwideb.go" "lwideb") - ) + ("tpage-2972.go" + "grunt-ag.go" + "citizen-norm-ag.go" + "crimson-guard-ag.go" + "predator-ag.go" + "flitter-ag.go" + "cara-ag.go" + "citizen-norm-rider-ag.go" + "crimson-bike-ag.go" + "bikea-ag.go" + "lwideb.go" + )) diff --git a/goal_src/jak2/dgos/lwidec.gd b/goal_src/jak2/dgos/lwidec.gd index 9b99535776..c08fe27b37 100644 --- a/goal_src/jak2/dgos/lwidec.gd +++ b/goal_src/jak2/dgos/lwidec.gd @@ -1,17 +1,17 @@ ("LWIDEC.DGO" - ("tpage-3039.go" "tpage-3039") - ("tpage-3041.go" "tpage-3041") - ("roboguard-ag.go" "roboguard") - ("citizen-norm-ag.go" "citizen-norm") - ("crimson-guard-ag.go" "crimson-guard") - ("citizen-chick-ag.go" "citizen-chick") - ("hellcat-ag.go" "hellcat") - ("carc-ag.go" "carc") - ("cara-ag.go" "cara") - ("carb-ag.go" "carb") - ("crimson-bike-ag.go" "crimson-bike") - ("bikec-ag.go" "bikec") - ("bikeb-ag.go" "bikeb") - ("bikea-ag.go" "bikea") - ("lwidec.go" "lwidec") - ) + ("tpage-3039.go" + "tpage-3041.go" + "roboguard-ag.go" + "citizen-norm-ag.go" + "crimson-guard-ag.go" + "citizen-chick-ag.go" + "hellcat-ag.go" + "carc-ag.go" + "cara-ag.go" + "carb-ag.go" + "crimson-bike-ag.go" + "bikec-ag.go" + "bikeb-ag.go" + "bikea-ag.go" + "lwidec.go" + )) diff --git a/goal_src/jak2/dgos/lwidesta.gd b/goal_src/jak2/dgos/lwidesta.gd index 60583e970b..068a806655 100644 --- a/goal_src/jak2/dgos/lwidesta.gd +++ b/goal_src/jak2/dgos/lwidesta.gd @@ -1,13 +1,13 @@ ("LWIDESTA.DGO" - ("tpage-2964.go" "tpage-2964") - ("tpage-3257.go" "tpage-3257") - ("errol-highres-ag.go" "errol-highres") - ("baron-highres-ag.go" "baron-highres") - ("crimson-guard-highres-ag.go" "crimson-guard-highres") - ("stdm-baron-box-ag.go" "stdm-baron-box") - ("crimson-guard-lowres-ag.go" "crimson-guard-lowres") - ("stdm-barrels-ag.go" "stdm-barrels") - ("palmpilot-ag.go" "palmpilot") - ("particleman-ag.go" "particleman") - ("lwidesta.go" "lwidesta") - ) + ("tpage-2964.go" + "tpage-3257.go" + "errol-highres-ag.go" + "baron-highres-ag.go" + "crimson-guard-highres-ag.go" + "stdm-baron-box-ag.go" + "crimson-guard-lowres-ag.go" + "stdm-barrels-ag.go" + "palmpilot-ag.go" + "particleman-ag.go" + "lwidesta.go" + )) diff --git a/goal_src/jak2/dgos/lysamsam.gd b/goal_src/jak2/dgos/lysamsam.gd index 0d22548dc6..fb86ab6bc6 100644 --- a/goal_src/jak2/dgos/lysamsam.gd +++ b/goal_src/jak2/dgos/lysamsam.gd @@ -1,7 +1,7 @@ ("LYSAMSAM.DGO" - ("youngsamos-lysamsam+0-ag.go" "youngsamos-lysamsam+0") - ("tpage-3260.go" "tpage-3260") - ("youngsamos-highres-ag.go" "youngsamos-highres") - ("samos-highres-ag.go" "samos-highres") - ("lysamsam.go" "lysamsam") - ) + ("youngsamos-lysamsam+0-ag.go" + "tpage-3260.go" + "youngsamos-highres-ag.go" + "samos-highres-ag.go" + "lysamsam.go" + )) diff --git a/goal_src/jak2/dgos/lyskdcd.gd b/goal_src/jak2/dgos/lyskdcd.gd index cff6f8e369..d6e0a475c9 100644 --- a/goal_src/jak2/dgos/lyskdcd.gd +++ b/goal_src/jak2/dgos/lyskdcd.gd @@ -1,13 +1,13 @@ ("LYSKDCD.DGO" - ("youngsamos-lyskdcd+0-ag.go" "youngsamos-lyskdcd+0") - ("kid-lyskdcd+0-ag.go" "kid-lyskdcd+0") - ("tpage-1772.go" "tpage-1772") - ("tpage-3261.go" "tpage-3261") - ("daxter-highres-ag.go" "daxter-highres") - ("youngsamos-highres-ag.go" "youngsamos-highres") - ("jak-highres-ag.go" "jak-highres") - ("crocadog-highres-ag.go" "crocadog-highres") - ("kid-highres-ag.go" "kid-highres") - ("particleman-ag.go" "particleman") - ("lyskdcd.go" "lyskdcd") - ) + ("youngsamos-lyskdcd+0-ag.go" + "kid-lyskdcd+0-ag.go" + "tpage-1772.go" + "tpage-3261.go" + "daxter-highres-ag.go" + "youngsamos-highres-ag.go" + "jak-highres-ag.go" + "crocadog-highres-ag.go" + "kid-highres-ag.go" + "particleman-ag.go" + "lyskdcd.go" + )) diff --git a/goal_src/jak2/dgos/mcn.gd b/goal_src/jak2/dgos/mcn.gd index a5ee42c8ee..43e8aa2939 100644 --- a/goal_src/jak2/dgos/mcn.gd +++ b/goal_src/jak2/dgos/mcn.gd @@ -1,22 +1,22 @@ ("MCN.DGO" - ("mincan-obs.o" "mincan-obs") - ("canyon-scenes.o" "canyon-scenes") - ("tpage-3341.go" "tpage-3341") - ("tpage-3343.go" "tpage-3343") - ("tpage-3342.go" "tpage-3342") - ("tpage-3344.go" "tpage-3344") - ("tpage-3471.go" "tpage-3471") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("ctypal-baron-statue-break-ag.go" "ctypal-baron-statue-break") - ("mincan-cogs-ag.go" "mincan-cogs") - ("ctypal-break-wall-ag.go" "ctypal-break-wall") - ("mincan-lighthouse-ag.go" "mincan-lighthouse") - ("water-anim-mincan-ag.go" "water-anim-mincan") - ("mincan-lens-ag.go" "mincan-lens") - ("shard-ag.go" "mtn-shard") - ("gear-device-gear-ag.go" "mtn-gear-device-gear") - ("mtn-lens-ag.go" "mtn-lens") - ("particleman-ag.go" "particleman") - ("mincan-vis.go" "mincan-vis") - ) + ("mincan-obs.o" + "canyon-scenes.o" + "tpage-3341.go" + "tpage-3343.go" + "tpage-3342.go" + "tpage-3344.go" + "tpage-3471.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "ctypal-baron-statue-break-ag.go" + "mincan-cogs-ag.go" + "ctypal-break-wall-ag.go" + "mincan-lighthouse-ag.go" + "water-anim-mincan-ag.go" + "mincan-lens-ag.go" + "shard-ag.go" + "gear-device-gear-ag.go" + "mtn-lens-ag.go" + "particleman-ag.go" + "mincan-vis.go" + )) diff --git a/goal_src/jak2/dgos/mtn.gd b/goal_src/jak2/dgos/mtn.gd index 0020c0e0a0..f27b2df685 100644 --- a/goal_src/jak2/dgos/mtn.gd +++ b/goal_src/jak2/dgos/mtn.gd @@ -1,35 +1,35 @@ ("MTN.DGO" - ("rhino.o" "rhino") - ("rhino-wall.o" "rhino-wall") - ("mountain-ocean.o" "mountain-ocean") - ("mountain-obs.o" "mountain-obs") - ("mountain-obs2.o" "mountain-obs2") - ("mountain-scenes.o" "mountain-scenes") - ("mountain-part.o" "mountain-part") - ("centurion.o" "centurion") - ("hopper.o" "hopper") - ("metalmonk.o" "metalmonk") - ("tpage-1254.go" "tpage-1254") - ("tpage-1256.go" "tpage-1256") - ("tpage-1255.go" "tpage-1255") - ("tpage-1253.go" "tpage-1253") - ("tpage-1257.go" "tpage-1257") - ("tpage-3470.go" "tpage-3470") - ("tpage-1275.go" "tpage-1275") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("plat-buried-ag.go" "mtn-plat-buried") - ("plat-return-ag.go" "mtn-plat-return") - ("water-anim-mountain-ag.go" "water-anim-mountain") - ("shard-ag.go" "mtn-shard") - ("mtn-gate-ag.go" "mtn-gate") - ("mtn-lens-base-ag.go" "mtn-lens-base") - ("warp-gate-ag.go" "warp-gate") - ("mtn-plat-long-ag.go" "mtn-plat-long") - ("iris-door-ag.go" "mtn-iris-door") - ("mtn-plat-elevator-ag.go" "mtn-plat-elevator") - ("mtn-plat-shoot-ag.go" "mtn-plat-shoot") - ("mtn-lens-floor-ag.go" "mtn-lens-floor") - ("mtn-plat-updown-ag.go" "mtn-plat-updown") - ("pal-windmill-ag.go" "pal-windmill") - ("mountain-vis.go" "mountain-vis") - ) + ("rhino.o" + "rhino-wall.o" + "mountain-ocean.o" + "mountain-obs.o" + "mountain-obs2.o" + "mountain-scenes.o" + "mountain-part.o" + "centurion.o" + "hopper.o" + "metalmonk.o" + "tpage-1254.go" + "tpage-1256.go" + "tpage-1255.go" + "tpage-1253.go" + "tpage-1257.go" + "tpage-3470.go" + "tpage-1275.go" + "com-airlock-outer-ag.go" + "plat-buried-ag.go" + "plat-return-ag.go" + "water-anim-mountain-ag.go" + "shard-ag.go" + "mtn-gate-ag.go" + "mtn-lens-base-ag.go" + "warp-gate-ag.go" + "mtn-plat-long-ag.go" + "iris-door-ag.go" + "mtn-plat-elevator-ag.go" + "mtn-plat-shoot-ag.go" + "mtn-lens-floor-ag.go" + "mtn-plat-updown-ag.go" + "pal-windmill-ag.go" + "mountain-vis.go" + )) diff --git a/goal_src/jak2/dgos/mtx.gd b/goal_src/jak2/dgos/mtx.gd index c06924346f..fcaa84243e 100644 --- a/goal_src/jak2/dgos/mtx.gd +++ b/goal_src/jak2/dgos/mtx.gd @@ -1,31 +1,31 @@ ("MTX.DGO" - ("tpage-1719.go" "tpage-1719") - ("tpage-1721.go" "tpage-1721") - ("tpage-1720.go" "tpage-1720") - ("tpage-1722.go" "tpage-1722") - ("tpage-3506.go" "tpage-3506") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("mtn-gear-device-ag.go" "mtn-gear-device") - ("mtn-step-plat-rocks-ag.go" "mtn-step-plat-rocks") - ("metalmonk-ag.go" "metalmonk") - ("centurion-ag.go" "centurion") - ("rhino-ag.go" "rhino") - ("mtn-plat-buried-rocks-ag.go" "mtn-plat-buried-rocks") - ("rhino-wall-ag.go" "rhino-wall") - ("hopper-ag.go" "hopper") - ("water-anim-mountain-dark-eco-ag.go" "water-anim-mountain-dark-eco") - ("mtn-aval-rocks-ag.go" "mtn-aval-rocks") - ("mtn-dice-ag.go" "mtn-dice") - ("plat-buried-ag.go" "mtn-plat-buried") - ("plat-return-ag.go" "mtn-plat-return") - ("iris-door-ag.go" "mtn-iris-door") - ("seal-of-mar-ag.go" "seal-of-mar") - ("mtn-dice-button-ag.go" "mtn-dice-button") - ("mtn-plat-eject-ag.go" "mtn-plat-eject") - ("mtn-button-ag.go" "mtn-button") - ("gear-device-gear-ag.go" "mtn-gear-device-gear") - ("mtn-lens-ag.go" "mtn-lens") - ("particleman-ag.go" "particleman") - ("mtnext-vis.go" "mtnext-vis") - ) + ("tpage-1719.go" + "tpage-1721.go" + "tpage-1720.go" + "tpage-1722.go" + "tpage-3506.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "mtn-gear-device-ag.go" + "mtn-step-plat-rocks-ag.go" + "metalmonk-ag.go" + "centurion-ag.go" + "rhino-ag.go" + "mtn-plat-buried-rocks-ag.go" + "rhino-wall-ag.go" + "hopper-ag.go" + "water-anim-mountain-dark-eco-ag.go" + "mtn-aval-rocks-ag.go" + "mtn-dice-ag.go" + "plat-buried-ag.go" + "plat-return-ag.go" + "iris-door-ag.go" + "seal-of-mar-ag.go" + "mtn-dice-button-ag.go" + "mtn-plat-eject-ag.go" + "mtn-button-ag.go" + "gear-device-gear-ag.go" + "mtn-lens-ag.go" + "particleman-ag.go" + "mtnext-vis.go" + )) diff --git a/goal_src/jak2/dgos/neb.gd b/goal_src/jak2/dgos/neb.gd index c0d3f7ce56..fa3596544b 100644 --- a/goal_src/jak2/dgos/neb.gd +++ b/goal_src/jak2/dgos/neb.gd @@ -1,58 +1,58 @@ ("NEB.DGO" - ("hover-formation-h.o" "hover-formation-h") - ("hover-nav-control-h.o" "hover-nav-control-h") - ("hover-enemy-h.o" "hover-enemy-h") - ("hover-nav-network.o" "hover-nav-network") - ("hover-nav-control.o" "hover-nav-control") - ("hover-enemy.o" "hover-enemy") - ("hover-enemy-battle.o" "hover-enemy-battle") - ("hover-formation.o" "hover-formation") - ("hover-nav-edit.o" "hover-nav-edit") - ("wasp-part.o" "wasp-part") - ("wasp.o" "wasp") - ("crimson-guard-hover.o" "crimson-guard-hover") - ("flamer.o" "flamer") - ("nest-texture.o" "nest-texture") - ("metalkor-part.o" "metalkor-part") - ("metalkor-setup.o" "metalkor-setup") - ("metalkor-states.o" "metalkor-states") - ("metalkor-extras.o" "metalkor-extras") - ("nestb-scenes.o" "nestb-scenes") - ("nestb-part.o" "nestb-part") - ("kid-nestb+0-ag.go" "kid-nestb+0") - ("tpage-2985.go" "tpage-2985") - ("tpage-2986.go" "tpage-2986") - ("tpage-3122.go" "tpage-3122") - ("tpage-3121.go" "tpage-3121") - ("tpage-2987.go" "tpage-2987") - ("tpage-3092.go" "tpage-3092") - ("tpage-3378.go" "tpage-3378") - ("metalkor-ag.go" "metalkor") - ("daxter-highres-ag.go" "daxter-highres") - ("metalkor-lowtorso-ag.go" "metalkor-lowtorso") - ("metalkor-highres-ag.go" "metalkor-highres") - ("darkjak-highres-ag.go" "darkjak-highres") - ("metalkor-legs-ag.go" "metalkor-legs") - ("metalkor-explode-ag.go" "metalkor-explode") - ("kid-highres-ag.go" "kid-highres") - ("nest-gun-parts-ag.go" "nest-gun-parts") - ("wasp-ag.go" "wasp") - ("kid-ag.go" "kid") - ("flitter-ag.go" "flitter") - ("nest-break-precipice-ag.go" "nest-break-precipice") - ("metalkor-bomb-ag.go" "metalkor-bomb") - ("metalkor-wings-ag.go" "metalkor-wings") - ("metalkor-egg-ag.go" "metalkor-egg") - ("rift-ring-in-game-ag.go" "rift-ring-in-game") - ("nest-unbroken-rocks-ag.go" "nest-unbroken-rocks") - ("metalkor-distort-ag.go" "metalkor-distort") - ("metalkor-rays-ag.go" "metalkor-rays") - ("nest-gun-elevator-ag.go" "nest-gun-elevator") - ("precursor-stone-ag.go" "precursor-stone") - ("palmpilot-ag.go" "palmpilot") - ("metalkor-fma-spinner-ag.go" "metalkor-fma-spinner") - ("nestb-tail-bound-ag.go" "nestb-tail-bound") - ("particleman-ag.go" "particleman") - ("rift-occlude-ag.go" "rift-occlude") - ("nestb-vis.go" "nestb-vis") - ) + ("hover-formation-h.o" + "hover-nav-control-h.o" + "hover-enemy-h.o" + "hover-nav-network.o" + "hover-nav-control.o" + "hover-enemy.o" + "hover-enemy-battle.o" + "hover-formation.o" + "hover-nav-edit.o" + "wasp-part.o" + "wasp.o" + "crimson-guard-hover.o" + "flamer.o" + "nest-texture.o" + "metalkor-part.o" + "metalkor-setup.o" + "metalkor-states.o" + "metalkor-extras.o" + "nestb-scenes.o" + "nestb-part.o" + "kid-nestb+0-ag.go" + "tpage-2985.go" + "tpage-2986.go" + "tpage-3122.go" + "tpage-3121.go" + "tpage-2987.go" + "tpage-3092.go" + "tpage-3378.go" + "metalkor-ag.go" + "daxter-highres-ag.go" + "metalkor-lowtorso-ag.go" + "metalkor-highres-ag.go" + "darkjak-highres-ag.go" + "metalkor-legs-ag.go" + "metalkor-explode-ag.go" + "kid-highres-ag.go" + "nest-gun-parts-ag.go" + "wasp-ag.go" + "kid-ag.go" + "flitter-ag.go" + "nest-break-precipice-ag.go" + "metalkor-bomb-ag.go" + "metalkor-wings-ag.go" + "metalkor-egg-ag.go" + "rift-ring-in-game-ag.go" + "nest-unbroken-rocks-ag.go" + "metalkor-distort-ag.go" + "metalkor-rays-ag.go" + "nest-gun-elevator-ag.go" + "precursor-stone-ag.go" + "palmpilot-ag.go" + "metalkor-fma-spinner-ag.go" + "nestb-tail-bound-ag.go" + "particleman-ag.go" + "rift-occlude-ag.go" + "nestb-vis.go" + )) diff --git a/goal_src/jak2/dgos/nes.gd b/goal_src/jak2/dgos/nes.gd index 358dc90d2d..45f4b2126f 100644 --- a/goal_src/jak2/dgos/nes.gd +++ b/goal_src/jak2/dgos/nes.gd @@ -1,26 +1,26 @@ ("NES.DGO" - ("gun-buoy.o" "gun-buoy") - ("nest-obs.o" "nest-obs") - ("mantis.o" "mantis") - ("mammoth.o" "mammoth") - ("flying-spider.o" "flying-spider") - ("nest-ocean.o" "nest-ocean") - ("nest-scenes.o" "nest-scenes") - ("nest-part.o" "nest-part") - ("tpage-2988.go" "tpage-2988") - ("tpage-2990.go" "tpage-2990") - ("tpage-2989.go" "tpage-2989") - ("tpage-2991.go" "tpage-2991") - ("tpage-3349.go" "tpage-3349") - ("mammoth-ag.go" "mammoth") - ("flying-spider-ag.go" "flying-spider") - ("mantis-ag.go" "mantis") - ("nest-break-rocks-ag.go" "nest-break-rocks") - ("water-anim-nest-dark-eco-ag.go" "water-anim-nest-dark-eco") - ("gun-buoy-ag.go" "gun-buoy") - ("transport-ag.go" "transport") - ("switch-ag.go" "cas-switch") - ("air-train-ag.go" "air-train") - ("piston-ag.go" "piston") - ("nest-vis.go" "nest-vis") - ) + ("gun-buoy.o" + "nest-obs.o" + "mantis.o" + "mammoth.o" + "flying-spider.o" + "nest-ocean.o" + "nest-scenes.o" + "nest-part.o" + "tpage-2988.go" + "tpage-2990.go" + "tpage-2989.go" + "tpage-2991.go" + "tpage-3349.go" + "mammoth-ag.go" + "flying-spider-ag.go" + "mantis-ag.go" + "nest-break-rocks-ag.go" + "water-anim-nest-dark-eco-ag.go" + "gun-buoy-ag.go" + "transport-ag.go" + "switch-ag.go" + "air-train-ag.go" + "piston-ag.go" + "nest-vis.go" + )) diff --git a/goal_src/jak2/dgos/nestt.gd b/goal_src/jak2/dgos/nestt.gd index cc41b28295..46076fbc6a 100644 --- a/goal_src/jak2/dgos/nestt.gd +++ b/goal_src/jak2/dgos/nestt.gd @@ -1,26 +1,26 @@ ("NESTT.DGO" - ("gun-buoy.o" "gun-buoy") - ("nest-obs.o" "nest-obs") - ("mantis.o" "mantis") - ("mammoth.o" "mammoth") - ("flying-spider.o" "flying-spider") - ("nest-ocean.o" "nest-ocean") - ("nest-scenes.o" "nest-scenes") - ("nest-part.o" "nest-part") - ("tpage-2988.go" "tpage-2988") - ("tpage-2990.go" "tpage-2990") - ("tpage-2989.go" "tpage-2989") - ("tpage-2991.go" "tpage-2991") - ("tpage-3349.go" "tpage-3349") - ("mammoth-ag.go" "mammoth") - ("flying-spider-ag.go" "flying-spider") - ("mantis-ag.go" "mantis") - ("nest-break-rocks-ag.go" "nest-break-rocks") - ("water-anim-nest-dark-eco-ag.go" "water-anim-nest-dark-eco") - ("gun-buoy-ag.go" "gun-buoy") - ("transport-ag.go" "transport") - ("switch-ag.go" "cas-switch") - ("air-train-ag.go" "air-train") - ("piston-ag.go" "piston") - ("nestt.go" "nestt") - ) + ("gun-buoy.o" + "nest-obs.o" + "mantis.o" + "mammoth.o" + "flying-spider.o" + "nest-ocean.o" + "nest-scenes.o" + "nest-part.o" + "tpage-2988.go" + "tpage-2990.go" + "tpage-2989.go" + "tpage-2991.go" + "tpage-3349.go" + "mammoth-ag.go" + "flying-spider-ag.go" + "mantis-ag.go" + "nest-break-rocks-ag.go" + "water-anim-nest-dark-eco-ag.go" + "gun-buoy-ag.go" + "transport-ag.go" + "switch-ag.go" + "air-train-ag.go" + "piston-ag.go" + "nestt.go" + )) diff --git a/goal_src/jak2/dgos/onintent.gd b/goal_src/jak2/dgos/onintent.gd index 437924acf3..b38a977d1d 100644 --- a/goal_src/jak2/dgos/onintent.gd +++ b/goal_src/jak2/dgos/onintent.gd @@ -1,19 +1,19 @@ ("ONINTENT.DGO" - ("onintent-part.o" "onintent-part") - ("onintent-scenes.o" "onintent-scenes") - ("onin-game.o" "onin-game") - ("onin-game+0-ag.go" "onin-game+0") - ("tpage-1031.go" "tpage-1031") - ("tpage-1183.go" "tpage-1183") - ("tpage-2676.go" "tpage-2676") - ("tpage-1035.go" "tpage-1035") - ("daxter-highres-ag.go" "daxter-highres") - ("pecker-highres-ag.go" "pecker-highres") - ("jak-highres-ag.go" "jak-highres") - ("onin-highres-ag.go" "onin-highres") - ("life-seed-ag.go" "life-seed") - ("onin-brain-ag.go" "onin-brain") - ("son-of-particleman-ag.go" "son-of-particleman") - ("particleman-ag.go" "particleman") - ("onintent.go" "onintent") - ) + ("onintent-part.o" + "onintent-scenes.o" + "onin-game.o" + "onin-game+0-ag.go" + "tpage-1031.go" + "tpage-1183.go" + "tpage-2676.go" + "tpage-1035.go" + "daxter-highres-ag.go" + "pecker-highres-ag.go" + "jak-highres-ag.go" + "onin-highres-ag.go" + "life-seed-ag.go" + "onin-brain-ag.go" + "son-of-particleman-ag.go" + "particleman-ag.go" + "onintent.go" + )) diff --git a/goal_src/jak2/dgos/oracle.gd b/goal_src/jak2/dgos/oracle.gd index b4c3eaf7e6..7590a59ad1 100644 --- a/goal_src/jak2/dgos/oracle.gd +++ b/goal_src/jak2/dgos/oracle.gd @@ -1,17 +1,17 @@ ("ORACLE.DGO" - ("oracle-texture.o" "oracle-texture") - ("oracle-part.o" "oracle-part") - ("oracle-scenes.o" "oracle-scenes") - ("oracle-training.o" "oracle-training") - ("tpage-2553.go" "tpage-2553") - ("tpage-2863.go" "tpage-2863") - ("tpage-2557.go" "tpage-2557") - ("daxter-highres-ag.go" "daxter-highres") - ("darkjak-highres-ag.go" "darkjak-highres") - ("oracle-roof-banner-b-ag.go" "oracle-roof-banner-b") - ("oracle-roof-banner-ag.go" "oracle-roof-banner") - ("door-ag.go" "oracle-door") - ("oracle-wall-banner-ag.go" "oracle-wall-banner") - ("particleman-ag.go" "particleman") - ("oracle.go" "oracle") - ) + ("oracle-texture.o" + "oracle-part.o" + "oracle-scenes.o" + "oracle-training.o" + "tpage-2553.go" + "tpage-2863.go" + "tpage-2557.go" + "daxter-highres-ag.go" + "darkjak-highres-ag.go" + "oracle-roof-banner-b-ag.go" + "oracle-roof-banner-ag.go" + "door-ag.go" + "oracle-wall-banner-ag.go" + "particleman-ag.go" + "oracle.go" + )) diff --git a/goal_src/jak2/dgos/outrocst.gd b/goal_src/jak2/dgos/outrocst.gd index b90648d8d6..092fc1da0a 100644 --- a/goal_src/jak2/dgos/outrocst.gd +++ b/goal_src/jak2/dgos/outrocst.gd @@ -1,23 +1,23 @@ ("OUTROCST.DGO" - ("0credits-tx.go" "0credits-tx") - ("1credits-tx.go" "1credits-tx") - ("2credits-tx.go" "2credits-tx") - ("3credits-tx.go" "3credits-tx") - ("4credits-tx.go" "4credits-tx") - ("5credits-tx.go" "5credits-tx") - ("6credits-tx.go" "6credits-tx") - ("7credits-tx.go" "7credits-tx") - ("credits.o" "credits") - ("outro-scenes.o" "outro-scenes") - ("tpage-3182.go" "tpage-3182") - ("tpage-3183.go" "tpage-3183") - ("tpage-3263.go" "tpage-3263") - ("tpage-3513.go" "tpage-3513") - ("keira-highres-ag.go" "keira-highres") - ("samos-highres-ag.go" "samos-highres") - ("tess-highres-ag.go" "tess-highres") - ("onin-highres-ag.go" "onin-highres") - ("rift-break-ring-ag.go" "rift-break-ring") - ("precursor-ag.go" "precursor") - ("outrocst.go" "outrocst") - ) + ("0credits-tx.go" + "1credits-tx.go" + "2credits-tx.go" + "3credits-tx.go" + "4credits-tx.go" + "5credits-tx.go" + "6credits-tx.go" + "7credits-tx.go" + "credits.o" + "outro-scenes.o" + "tpage-3182.go" + "tpage-3183.go" + "tpage-3263.go" + "tpage-3513.go" + "keira-highres-ag.go" + "samos-highres-ag.go" + "tess-highres-ag.go" + "onin-highres-ag.go" + "rift-break-ring-ag.go" + "precursor-ag.go" + "outrocst.go" + )) diff --git a/goal_src/jak2/dgos/pac.gd b/goal_src/jak2/dgos/pac.gd index 40a49d94c7..aab6acea7f 100644 --- a/goal_src/jak2/dgos/pac.gd +++ b/goal_src/jak2/dgos/pac.gd @@ -1,24 +1,24 @@ ("PAC.DGO" - ("jak-pole+0-ag.go" "jak-pole+0") - ("palcab-part.o" "palcab-part") - ("palcab-obs.o" "palcab-obs") - ("searchlight.o" "searchlight") - ("sew-gunturret.o" "sew-gunturret") - ("pal-obs.o" "pal-obs") - ("tpage-2354.go" "tpage-2354") - ("tpage-2357.go" "tpage-2357") - ("tpage-2355.go" "tpage-2355") - ("tpage-2356.go" "tpage-2356") - ("tpage-3371.go" "tpage-3371") - ("tpage-2619.go" "tpage-2619") - ("pal-gun-turret-ag.go" "pal-gun-turret") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("pal-electric-fan-ag.go" "pal-electric-fan") - ("pal-cable-nut-ag.go" "pal-cable-nut") - ("pal-flip-step-ag.go" "pal-flip-step") - ("pal-rot-gun-ag.go" "pal-rot-gun") - ("pal-falling-plat-ag.go" "pal-falling-plat") - ("searchlight-ag.go" "searchlight") - ("pal-windmill-ag.go" "pal-windmill") - ("palcab-vis.go" "palcab-vis") - ) + ("jak-pole+0-ag.go" + "palcab-part.o" + "palcab-obs.o" + "searchlight.o" + "sew-gunturret.o" + "pal-obs.o" + "tpage-2354.go" + "tpage-2357.go" + "tpage-2355.go" + "tpage-2356.go" + "tpage-3371.go" + "tpage-2619.go" + "pal-gun-turret-ag.go" + "com-airlock-outer-ag.go" + "pal-electric-fan-ag.go" + "pal-cable-nut-ag.go" + "pal-flip-step-ag.go" + "pal-rot-gun-ag.go" + "pal-falling-plat-ag.go" + "searchlight-ag.go" + "pal-windmill-ag.go" + "palcab-vis.go" + )) diff --git a/goal_src/jak2/dgos/pae.gd b/goal_src/jak2/dgos/pae.gd index 1993fcd2e7..692d40ef0f 100644 --- a/goal_src/jak2/dgos/pae.gd +++ b/goal_src/jak2/dgos/pae.gd @@ -1,24 +1,24 @@ ("PAE.DGO" - ("jak-pole+0-ag.go" "jak-pole+0") - ("crimson-guard-level.o" "crimson-guard-level") - ("guard-conversation.o" "guard-conversation") - ("transport-level.o" "transport-level") - ("sew-gunturret.o" "sew-gunturret") - ("palent-part.o" "palent-part") - ("pal-obs.o" "pal-obs") - ("tpage-3169.go" "tpage-3169") - ("tpage-3171.go" "tpage-3171") - ("tpage-3170.go" "tpage-3170") - ("tpage-3168.go" "tpage-3168") - ("crimson-guard-ag.go" "crimson-guard") - ("palent-turret-ag.go" "palent-turret") - ("pal-breakable-window-ag.go" "pal-breakable-window") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("pal-grind-ring-ag.go" "pal-grind-ring") - ("pal-grind-ring-center-ag.go" "pal-grind-ring-center") - ("pal-throne-door-ag.go" "pal-throne-door") - ("pal-falling-plat-ag.go" "pal-falling-plat") - ("pal-ent-door-ag.go" "pal-ent-door") - ("pal-ent-glass-ag.go" "pal-ent-glass") - ("palent-vis.go" "palent-vis") - ) + ("jak-pole+0-ag.go" + "crimson-guard-level.o" + "guard-conversation.o" + "transport-level.o" + "sew-gunturret.o" + "palent-part.o" + "pal-obs.o" + "tpage-3169.go" + "tpage-3171.go" + "tpage-3170.go" + "tpage-3168.go" + "crimson-guard-ag.go" + "palent-turret-ag.go" + "pal-breakable-window-ag.go" + "com-airlock-outer-ag.go" + "pal-grind-ring-ag.go" + "pal-grind-ring-center-ag.go" + "pal-throne-door-ag.go" + "pal-falling-plat-ag.go" + "pal-ent-door-ag.go" + "pal-ent-glass-ag.go" + "palent-vis.go" + )) diff --git a/goal_src/jak2/dgos/palboss.gd b/goal_src/jak2/dgos/palboss.gd index 68fa90c910..cc77d02e31 100644 --- a/goal_src/jak2/dgos/palboss.gd +++ b/goal_src/jak2/dgos/palboss.gd @@ -1,19 +1,19 @@ ("PALBOSS.DGO" - ("squid-part.o" "squid-part") - ("squid-setup.o" "squid-setup") - ("squid-extras.o" "squid-extras") - ("squid-states.o" "squid-states") - ("baron-squid+0-ag.go" "baron-squid+0") - ("tpage-2679.go" "tpage-2679") - ("tpage-2680.go" "tpage-2680") - ("tpage-2797.go" "tpage-2797") - ("tpage-3419.go" "tpage-3419") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("squid-ag.go" "squid") - ("squid-break-ag.go" "squid-break") - ("baron-highres-ag.go" "baron-highres") - ("baron-ag.go" "baron") - ("squid-collision-ag.go" "squid-collision") - ("palboss.go" "palboss") - ) + ("squid-part.o" + "squid-setup.o" + "squid-extras.o" + "squid-states.o" + "baron-squid+0-ag.go" + "tpage-2679.go" + "tpage-2680.go" + "tpage-2797.go" + "tpage-3419.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "squid-ag.go" + "squid-break-ag.go" + "baron-highres-ag.go" + "baron-ag.go" + "squid-collision-ag.go" + "palboss.go" + )) diff --git a/goal_src/jak2/dgos/palout.gd b/goal_src/jak2/dgos/palout.gd index 2c8973ccf6..e45100f6dc 100644 --- a/goal_src/jak2/dgos/palout.gd +++ b/goal_src/jak2/dgos/palout.gd @@ -1,6 +1,6 @@ ("PALOUT.DGO" - ("palace-ocean.o" "palace-ocean") - ("tpage-2572.go" "tpage-2572") - ("tpage-2573.go" "tpage-2573") - ("palout.go" "palout") - ) + ("palace-ocean.o" + "tpage-2572.go" + "tpage-2573.go" + "palout.go" + )) diff --git a/goal_src/jak2/dgos/par.gd b/goal_src/jak2/dgos/par.gd index f954bfda9b..4d433dcb0f 100644 --- a/goal_src/jak2/dgos/par.gd +++ b/goal_src/jak2/dgos/par.gd @@ -1,18 +1,18 @@ ("PAR.DGO" - ("palroof-part.o" "palroof-part") - ("palroof-obs.o" "palroof-obs") - ("palboss-texture.o" "palboss-texture") - ("palboss-part.o" "palboss-part") - ("palboss-scenes.o" "palboss-scenes") - ("tpage-2360.go" "tpage-2360") - ("tpage-2363.go" "tpage-2363") - ("tpage-2361.go" "tpage-2361") - ("tpage-2362.go" "tpage-2362") - ("tpage-2521.go" "tpage-2521") - ("tpage-2746.go" "tpage-2746") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("pal-prong-ag.go" "pal-prong") - ("pal-flip-step-ag.go" "pal-flip-step") - ("pal-lowrez-throne-ag.go" "pal-lowrez-throne") - ("palroof-vis.go" "palroof-vis") - ) + ("palroof-part.o" + "palroof-obs.o" + "palboss-texture.o" + "palboss-part.o" + "palboss-scenes.o" + "tpage-2360.go" + "tpage-2363.go" + "tpage-2361.go" + "tpage-2362.go" + "tpage-2521.go" + "tpage-2746.go" + "com-airlock-outer-ag.go" + "pal-prong-ag.go" + "pal-flip-step-ag.go" + "pal-lowrez-throne-ag.go" + "palroof-vis.go" + )) diff --git a/goal_src/jak2/dgos/pas.gd b/goal_src/jak2/dgos/pas.gd index b7bb7fdda5..87ab092b44 100644 --- a/goal_src/jak2/dgos/pas.gd +++ b/goal_src/jak2/dgos/pas.gd @@ -1,11 +1,11 @@ ("PAS.DGO" - ("com-elevator.o" "com-elevator") - ("palshaft-part.o" "palshaft-part") - ("tpage-2371.go" "tpage-2371") - ("tpage-2372.go" "tpage-2372") - ("tpage-2692.go" "tpage-2692") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("com-airlock-inner-ag.go" "com-airlock-inner") - ("com-elevator-ag.go" "com-elevator") - ("palshaft-vis.go" "palshaft-vis") - ) + ("com-elevator.o" + "palshaft-part.o" + "tpage-2371.go" + "tpage-2372.go" + "tpage-2692.go" + "com-airlock-outer-ag.go" + "com-airlock-inner-ag.go" + "com-elevator-ag.go" + "palshaft-vis.go" + )) diff --git a/goal_src/jak2/dgos/portwall.gd b/goal_src/jak2/dgos/portwall.gd index 64c44326d9..1212904ff9 100644 --- a/goal_src/jak2/dgos/portwall.gd +++ b/goal_src/jak2/dgos/portwall.gd @@ -1,6 +1,6 @@ ("PORTWALL.DGO" - ("tpage-3181.go" "tpage-3181") - ("tpage-3323.go" "tpage-3323") - ("mecha-daxter-ag.go" "mecha-daxter") - ("portwall.go" "portwall") - ) + ("tpage-3181.go" + "tpage-3323.go" + "mecha-daxter-ag.go" + "portwall.go" + )) diff --git a/goal_src/jak2/dgos/pri.gd b/goal_src/jak2/dgos/pri.gd index cf8a64268e..b8254fd05f 100644 --- a/goal_src/jak2/dgos/pri.gd +++ b/goal_src/jak2/dgos/pri.gd @@ -1,18 +1,18 @@ ("PRI.DGO" - ("intro-texture.o" "intro-texture") - ("prison-part.o" "prison-part") - ("prison-obs.o" "prison-obs") - ("tpage-1578.go" "tpage-1578") - ("tpage-1950.go" "tpage-1950") - ("tpage-1579.go" "tpage-1579") - ("tpage-2647.go" "tpage-2647") - ("daxter-highres-ag.go" "daxter-highres") - ("prsn-torture-ag.go" "prsn-torture") - ("prsn-chair-shackle-ag.go" "prsn-chair-shackle") - ("prsn-hang-cell-ag.go" "prsn-hang-cell") - ("warp-gate-b-ag.go" "warp-gate-b") - ("prsn-vent-fan-ag.go" "prsn-vent-fan") - ("fort-entry-gate-ag.go" "fort-entry-gate") - ("prsn-cell-door-ag.go" "prsn-cell-door") - ("prison-vis.go" "prison-vis") - ) + ("intro-texture.o" + "prison-part.o" + "prison-obs.o" + "tpage-1578.go" + "tpage-1950.go" + "tpage-1579.go" + "tpage-2647.go" + "daxter-highres-ag.go" + "prsn-torture-ag.go" + "prsn-chair-shackle-ag.go" + "prsn-hang-cell-ag.go" + "warp-gate-b-ag.go" + "prsn-vent-fan-ag.go" + "fort-entry-gate-ag.go" + "prsn-cell-door-ag.go" + "prison-vis.go" + )) diff --git a/goal_src/jak2/dgos/rui.gd b/goal_src/jak2/dgos/rui.gd index a5a3eb67fa..a06f84f72a 100644 --- a/goal_src/jak2/dgos/rui.gd +++ b/goal_src/jak2/dgos/rui.gd @@ -1,50 +1,50 @@ ("RUI.DGO" - ("jak-pole+0-ag.go" "jak-pole+0") - ("jak-mech+0-ag.go" "jak-mech+0") - ("grunt-mech-anims+0-ag.go" "grunt-mech-anims+0") - ("mech-part.o" "mech-part") - ("mech.o" "mech") - ("target-mech.o" "target-mech") - ("mech-states.o" "mech-states") - ("grunt-mech.o" "grunt-mech") - ("ruins-ocean.o" "ruins-ocean") - ("ruins-scenes.o" "ruins-scenes") - ("mechtest-obs.o" "mechtest-obs") - ("ruins-part.o" "ruins-part") - ("breakable-wall.o" "breakable-wall") - ("pillar-collapse.o" "pillar-collapse") - ("ruins-obs.o" "ruins-obs") - ("rapid-gunner.o" "rapid-gunner") - ("amphibian.o" "amphibian") - ("fodder.o" "fodder") - ("grenadier.o" "grenadier") - ("tpage-851.go" "tpage-851") - ("tpage-853.go" "tpage-853") - ("tpage-852.go" "tpage-852") - ("tpage-2205.go" "tpage-2205") - ("tpage-1000.go" "tpage-1000") - ("grunt-ag.go" "grunt") - ("ruins-breakable-wall-ag.go" "ruins-breakable-wall") - ("grenadier-ag.go" "grenadier") - ("amphibian-ag.go" "amphibian") - ("ruins-drop-plat-ag.go" "ruins-drop-plat") - ("rapid-gunner-ag.go" "rapid-gunner") - ("flitter-ag.go" "flitter") - ("ruins-pillar-collapse-ag.go" "ruins-pillar-collapse") - ("mech-ag.go" "mech") - ("fodder-ag.go" "fodder") - ("ruins-bridge-ag.go" "ruins-bridge") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("shield-gunner-ag.go" "shield-gunner") - ("precipice-b-ag.go" "precipice-b") - ("ruins-precipice-ag.go" "ruins-precipice") - ("precipice-a-ag.go" "precipice-a") - ("pushblock-ag.go" "pushblock") - ("throwblock-ag.go" "throwblock") - ("zipline-ag.go" "zipline") - ("flag-ag.go" "flag") - ("sinking-plat-ag.go" "sinking-plat") - ("awning-ag.go" "awning") - ("beam-ag.go" "beam") - ("ruins-vis.go" "ruins-vis") - ) + ("jak-pole+0-ag.go" + "jak-mech+0-ag.go" + "grunt-mech-anims+0-ag.go" + "mech-part.o" + "mech.o" + "target-mech.o" + "mech-states.o" + "grunt-mech.o" + "ruins-ocean.o" + "ruins-scenes.o" + "mechtest-obs.o" + "ruins-part.o" + "breakable-wall.o" + "pillar-collapse.o" + "ruins-obs.o" + "rapid-gunner.o" + "amphibian.o" + "fodder.o" + "grenadier.o" + "tpage-851.go" + "tpage-853.go" + "tpage-852.go" + "tpage-2205.go" + "tpage-1000.go" + "grunt-ag.go" + "ruins-breakable-wall-ag.go" + "grenadier-ag.go" + "amphibian-ag.go" + "ruins-drop-plat-ag.go" + "rapid-gunner-ag.go" + "flitter-ag.go" + "ruins-pillar-collapse-ag.go" + "mech-ag.go" + "fodder-ag.go" + "ruins-bridge-ag.go" + "com-airlock-outer-ag.go" + "shield-gunner-ag.go" + "precipice-b-ag.go" + "ruins-precipice-ag.go" + "precipice-a-ag.go" + "pushblock-ag.go" + "throwblock-ag.go" + "zipline-ag.go" + "flag-ag.go" + "sinking-plat-ag.go" + "awning-ag.go" + "beam-ag.go" + "ruins-vis.go" + )) diff --git a/goal_src/jak2/dgos/sag.gd b/goal_src/jak2/dgos/sag.gd index 08f2c0304b..a1cef36d32 100644 --- a/goal_src/jak2/dgos/sag.gd +++ b/goal_src/jak2/dgos/sag.gd @@ -1,18 +1,18 @@ ("SAG.DGO" - ("tpage-881.go" "tpage-881") - ("tpage-1131.go" "tpage-1131") - ("tpage-882.go" "tpage-882") - ("tpage-880.go" "tpage-880") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("torn-highres-ag.go" "torn-highres") - ("ruins-tower-a-ag.go" "ruins-tower-a") - ("ruins-tower-c-ag.go" "ruins-tower-c") - ("ruins-tower-e-ag.go" "ruins-tower-e") - ("ruins-tower-b-ag.go" "ruins-tower-b") - ("ruins-tower-f-ag.go" "ruins-tower-f") - ("ruins-tower-d-ag.go" "ruins-tower-d") - ("life-seed-ag.go" "life-seed") - ("ruins-tower-rp-ag.go" "ruins-tower-rp") - ("sagehut-vis.go" "sagehut-vis") - ) + ("tpage-881.go" + "tpage-1131.go" + "tpage-882.go" + "tpage-880.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "torn-highres-ag.go" + "ruins-tower-a-ag.go" + "ruins-tower-c-ag.go" + "ruins-tower-e-ag.go" + "ruins-tower-b-ag.go" + "ruins-tower-f-ag.go" + "ruins-tower-d-ag.go" + "life-seed-ag.go" + "ruins-tower-rp-ag.go" + "sagehut-vis.go" + )) diff --git a/goal_src/jak2/dgos/seb.gd b/goal_src/jak2/dgos/seb.gd index 2294f0d863..f9cc79fdab 100644 --- a/goal_src/jak2/dgos/seb.gd +++ b/goal_src/jak2/dgos/seb.gd @@ -1,45 +1,45 @@ ("SEB.DGO" - ("ai-task-h.o" "ai-task-h") - ("bot-h.o" "bot-h") - ("bot.o" "bot") - ("bot-states.o" "bot-states") - ("hal-h.o" "hal-h") - ("hal-task.o" "hal-task") - ("hal.o" "hal") - ("ruf-h.o" "ruf-h") - ("ruf-task.o" "ruf-task") - ("ruf.o" "ruf") - ("ruf-states.o" "ruf-states") - ("jinx-h.o" "jinx-h") - ("jinx-shot.o" "jinx-shot") - ("jinx-bomb.o" "jinx-bomb") - ("jinx.o" "jinx") - ("jinx-states.o" "jinx-states") - ("mog-h.o" "mog-h") - ("mog.o" "mog") - ("grim-h.o" "grim-h") - ("grim.o" "grim") - ("sewer-part.o" "sewer-part") - ("sewer-ocean.o" "sewer-ocean") - ("sewer-obs.o" "sewer-obs") - ("sewer-obs2.o" "sewer-obs2") - ("hosehead.o" "hosehead") - ("hosehead-fake.o" "hosehead-fake") - ("amphibian.o" "amphibian") - ("gator.o" "gator") - ("fodder.o" "fodder") - ("hal2-course.o" "hal2-course") - ("mog2-course.o" "mog2-course") - ("jinx2-course.o" "jinx2-course") - ("grim2-course.o" "grim2-course") - ("sewer-scenes.o" "sewer-scenes") - ("sew-gunturret.o" "sew-gunturret") - ("tpage-1133.go" "tpage-1133") - ("tpage-1135.go" "tpage-1135") - ("tpage-1134.go" "tpage-1134") - ("tpage-3383.go" "tpage-3383") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("com-airlock-inner-ag.go" "com-airlock-inner") - ("sew-elevator-ag.go" "sew-elevator") - ("sewerb-vis.go" "sewerb-vis") - ) + ("ai-task-h.o" + "bot-h.o" + "bot.o" + "bot-states.o" + "hal-h.o" + "hal-task.o" + "hal.o" + "ruf-h.o" + "ruf-task.o" + "ruf.o" + "ruf-states.o" + "jinx-h.o" + "jinx-shot.o" + "jinx-bomb.o" + "jinx.o" + "jinx-states.o" + "mog-h.o" + "mog.o" + "grim-h.o" + "grim.o" + "sewer-part.o" + "sewer-ocean.o" + "sewer-obs.o" + "sewer-obs2.o" + "hosehead.o" + "hosehead-fake.o" + "amphibian.o" + "gator.o" + "fodder.o" + "hal2-course.o" + "mog2-course.o" + "jinx2-course.o" + "grim2-course.o" + "sewer-scenes.o" + "sew-gunturret.o" + "tpage-1133.go" + "tpage-1135.go" + "tpage-1134.go" + "tpage-3383.go" + "com-airlock-outer-ag.go" + "com-airlock-inner-ag.go" + "sew-elevator-ag.go" + "sewerb-vis.go" + )) diff --git a/goal_src/jak2/dgos/sew.gd b/goal_src/jak2/dgos/sew.gd index 779259d3c2..cce6774857 100644 --- a/goal_src/jak2/dgos/sew.gd +++ b/goal_src/jak2/dgos/sew.gd @@ -1,27 +1,27 @@ ("SEW.DGO" - ("tpage-1059.go" "tpage-1059") - ("tpage-1060.go" "tpage-1060") - ("tpage-1066.go" "tpage-1066") - ("tpage-2270.go" "tpage-2270") - ("tpage-3479.go" "tpage-3479") - ("daxter-highres-ag.go" "daxter-highres") - ("grunt-ag.go" "grunt") - ("jak-highres-ag.go" "jak-highres") - ("amphibian-ag.go" "amphibian") - ("sew-catwalk-ag.go" "sew-catwalk") - ("sew-multi-blade-ag.go" "sew-multi-blade") - ("fodder-ag.go" "fodder") - ("sew-gunturret-ag.go" "sew-gunturret") - ("mar-statue-ag.go" "sew-mar-statue") - ("sew-twist-blade-ag.go" "sew-twist-blade") - ("sew-tri-blade-ag.go" "sew-tri-blade") - ("sew-single-blade-ag.go" "sew-single-blade") - ("mine-a-ag.go" "sew-mine-a") - ("sew-valve-ag.go" "sew-valve") - ("mine-b-ag.go" "sew-mine-b") - ("sew-arm-blade-ag.go" "sew-arm-blade") - ("gold-key-ag.go" "sew-gold-key") - ("light-switch-ag.go" "sew-light-switch") - ("grill-ag.go" "sew-grill") - ("sewer-vis.go" "sewer-vis") - ) + ("tpage-1059.go" + "tpage-1060.go" + "tpage-1066.go" + "tpage-2270.go" + "tpage-3479.go" + "daxter-highres-ag.go" + "grunt-ag.go" + "jak-highres-ag.go" + "amphibian-ag.go" + "sew-catwalk-ag.go" + "sew-multi-blade-ag.go" + "fodder-ag.go" + "sew-gunturret-ag.go" + "mar-statue-ag.go" + "sew-twist-blade-ag.go" + "sew-tri-blade-ag.go" + "sew-single-blade-ag.go" + "mine-a-ag.go" + "sew-valve-ag.go" + "mine-b-ag.go" + "sew-arm-blade-ag.go" + "gold-key-ag.go" + "light-switch-ag.go" + "grill-ag.go" + "sewer-vis.go" + )) diff --git a/goal_src/jak2/dgos/ska.gd b/goal_src/jak2/dgos/ska.gd index 1987722f0b..40f1eecc29 100644 --- a/goal_src/jak2/dgos/ska.gd +++ b/goal_src/jak2/dgos/ska.gd @@ -1,13 +1,13 @@ ("SKA.DGO" - ("skatea-part.o" "skatea-part") - ("skatea-obs.o" "skatea-obs") - ("tpage-2992.go" "tpage-2992") - ("tpage-3131.go" "tpage-3131") - ("tpage-2995.go" "tpage-2995") - ("tpage-3573.go" "tpage-3573") - ("skate-training-ramp-ag.go" "skate-training-ramp") - ("skatea-jump-pad-ag.go" "skatea-jump-pad") - ("skatea-floating-ring-ag.go" "skatea-floating-ring") - ("skate-gate-ag.go" "skate-gate") - ("skatea-vis.go" "skatea-vis") - ) + ("skatea-part.o" + "skatea-obs.o" + "tpage-2992.go" + "tpage-3131.go" + "tpage-2995.go" + "tpage-3573.go" + "skate-training-ramp-ag.go" + "skatea-jump-pad-ag.go" + "skatea-floating-ring-ag.go" + "skate-gate-ag.go" + "skatea-vis.go" + )) diff --git a/goal_src/jak2/dgos/sta.gd b/goal_src/jak2/dgos/sta.gd index 49e6e176e7..04c7f86273 100644 --- a/goal_src/jak2/dgos/sta.gd +++ b/goal_src/jak2/dgos/sta.gd @@ -1,18 +1,18 @@ ("STA.DGO" - ("hopper.o" "hopper") - ("stadiumb-texture.o" "stadiumb-texture") - ("stadium-part.o" "stadium-part") - ("stadiumb-part.o" "stadiumb-part") - ("stadium-obs.o" "stadium-obs") - ("stadium-scenes.o" "stadium-scenes") - ("tpage-2423.go" "tpage-2423") - ("tpage-2426.go" "tpage-2426") - ("tpage-2424.go" "tpage-2424") - ("tpage-2575.go" "tpage-2575") - ("tpage-1641.go" "tpage-1641") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("water-anim-stadium-ag.go" "water-anim-stadium") - ("gar-door-ag.go" "gar-door") - ("stadium-vis.go" "stadium-vis") - ) + ("hopper.o" + "stadiumb-texture.o" + "stadium-part.o" + "stadiumb-part.o" + "stadium-obs.o" + "stadium-scenes.o" + "tpage-2423.go" + "tpage-2426.go" + "tpage-2424.go" + "tpage-2575.go" + "tpage-1641.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "water-anim-stadium-ag.go" + "gar-door-ag.go" + "stadium-vis.go" + )) diff --git a/goal_src/jak2/dgos/stadblmp.gd b/goal_src/jak2/dgos/stadblmp.gd index 1177d2409b..94ce6603d1 100644 --- a/goal_src/jak2/dgos/stadblmp.gd +++ b/goal_src/jak2/dgos/stadblmp.gd @@ -1,20 +1,20 @@ ("STADBLMP.DGO" - ("tpage-2956.go" "tpage-2956") - ("tpage-2957.go" "tpage-2957") - ("tpage-2958.go" "tpage-2958") - ("tpage-3280.go" "tpage-3280") - ("tpage-3457.go" "tpage-3457") - ("tpage-3418.go" "tpage-3418") - ("youngsamos-highres-ag.go" "youngsamos-highres") - ("brutter-highres-ag.go" "brutter-highres") - ("grunt-ag.go" "grunt") - ("samos-highres-ag.go" "samos-highres") - ("samos-ag.go" "samos") - ("keira-ag.go" "keira") - ("brutter-balloon-ag.go" "brutter-balloon") - ("babak-ag.go" "babak") - ("flitter-ag.go" "flitter") - ("hopper-ag.go" "hopper") - ("brutter-low-ag.go" "brutter-low") - ("stadblmp.go" "stadblmp") - ) + ("tpage-2956.go" + "tpage-2957.go" + "tpage-2958.go" + "tpage-3280.go" + "tpage-3457.go" + "tpage-3418.go" + "youngsamos-highres-ag.go" + "brutter-highres-ag.go" + "grunt-ag.go" + "samos-highres-ag.go" + "samos-ag.go" + "keira-ag.go" + "brutter-balloon-ag.go" + "babak-ag.go" + "flitter-ag.go" + "hopper-ag.go" + "brutter-low-ag.go" + "stadblmp.go" + )) diff --git a/goal_src/jak2/dgos/stb.gd b/goal_src/jak2/dgos/stb.gd index 131124db1e..970d13f896 100644 --- a/goal_src/jak2/dgos/stb.gd +++ b/goal_src/jak2/dgos/stb.gd @@ -1,25 +1,25 @@ ("STB.DGO" - ("race-h.o" "race-h") - ("race-mesh.o" "race-mesh") - ("race-part.o" "race-part") - ("race-obs.o" "race-obs") - ("vehicle-racer.o" "vehicle-racer") - ("race-info.o" "race-info") - ("race-manager.o" "race-manager") - ("race-hud.o" "race-hud") - ("pilot-recorder.o" "pilot-recorder") - ("racebike.o" "racebike") - ("stadium-race-obs.o" "stadium-race-obs") - ("jak-pidax+0-ag.go" "jak-pidax+0") - ("tpage-3451.go" "tpage-3451") - ("tpage-3454.go" "tpage-3454") - ("tpage-3452.go" "tpage-3452") - ("tpage-3453.go" "tpage-3453") - ("tpage-3109.go" "tpage-3109") - ("race-bike-c-ag.go" "race-bike-c") - ("race-bike-b-ag.go" "race-bike-b") - ("race-bike-a-ag.go" "race-bike-a") - ("stdmb-race-hatch-ag.go" "stdmb-race-hatch") - ("stad-force-field-ag.go" "stad-force-field") - ("stadiumb-vis.go" "stadiumb-vis") - ) + ("race-h.o" + "race-mesh.o" + "race-part.o" + "race-obs.o" + "vehicle-racer.o" + "race-info.o" + "race-manager.o" + "race-hud.o" + "pilot-recorder.o" + "racebike.o" + "stadium-race-obs.o" + "jak-pidax+0-ag.go" + "tpage-3451.go" + "tpage-3454.go" + "tpage-3452.go" + "tpage-3453.go" + "tpage-3109.go" + "race-bike-c-ag.go" + "race-bike-b-ag.go" + "race-bike-a-ag.go" + "stdmb-race-hatch-ag.go" + "stad-force-field-ag.go" + "stadiumb-vis.go" + )) diff --git a/goal_src/jak2/dgos/stc.gd b/goal_src/jak2/dgos/stc.gd index 1b5750949f..28fd18737d 100644 --- a/goal_src/jak2/dgos/stc.gd +++ b/goal_src/jak2/dgos/stc.gd @@ -1,25 +1,25 @@ ("STC.DGO" - ("race-h.o" "race-h") - ("race-mesh.o" "race-mesh") - ("race-part.o" "race-part") - ("race-obs.o" "race-obs") - ("vehicle-racer.o" "vehicle-racer") - ("race-info.o" "race-info") - ("race-manager.o" "race-manager") - ("race-hud.o" "race-hud") - ("pilot-recorder.o" "pilot-recorder") - ("racebike.o" "racebike") - ("stadium-race-obs.o" "stadium-race-obs") - ("jak-pidax+0-ag.go" "jak-pidax+0") - ("tpage-3442.go" "tpage-3442") - ("tpage-3445.go" "tpage-3445") - ("tpage-3443.go" "tpage-3443") - ("tpage-3444.go" "tpage-3444") - ("tpage-3351.go" "tpage-3351") - ("race-bike-c-ag.go" "race-bike-c") - ("race-bike-b-ag.go" "race-bike-b") - ("race-bike-a-ag.go" "race-bike-a") - ("stdmb-race-hatch-ag.go" "stdmb-race-hatch") - ("stad-c-force-field-ag.go" "stad-c-force-field") - ("stadiumc-vis.go" "stadiumc-vis") - ) + ("race-h.o" + "race-mesh.o" + "race-part.o" + "race-obs.o" + "vehicle-racer.o" + "race-info.o" + "race-manager.o" + "race-hud.o" + "pilot-recorder.o" + "racebike.o" + "stadium-race-obs.o" + "jak-pidax+0-ag.go" + "tpage-3442.go" + "tpage-3445.go" + "tpage-3443.go" + "tpage-3444.go" + "tpage-3351.go" + "race-bike-c-ag.go" + "race-bike-b-ag.go" + "race-bike-a-ag.go" + "stdmb-race-hatch-ag.go" + "stad-c-force-field-ag.go" + "stadiumc-vis.go" + )) diff --git a/goal_src/jak2/dgos/std.gd b/goal_src/jak2/dgos/std.gd index 194ede7355..c400986687 100644 --- a/goal_src/jak2/dgos/std.gd +++ b/goal_src/jak2/dgos/std.gd @@ -1,25 +1,25 @@ ("STD.DGO" - ("race-h.o" "race-h") - ("race-mesh.o" "race-mesh") - ("race-part.o" "race-part") - ("race-obs.o" "race-obs") - ("vehicle-racer.o" "vehicle-racer") - ("race-info.o" "race-info") - ("race-manager.o" "race-manager") - ("race-hud.o" "race-hud") - ("pilot-recorder.o" "pilot-recorder") - ("racebike.o" "racebike") - ("stadium-race-obs.o" "stadium-race-obs") - ("jak-pidax+0-ag.go" "jak-pidax+0") - ("tpage-3447.go" "tpage-3447") - ("tpage-3450.go" "tpage-3450") - ("tpage-3448.go" "tpage-3448") - ("tpage-3449.go" "tpage-3449") - ("tpage-3352.go" "tpage-3352") - ("race-bike-c-ag.go" "race-bike-c") - ("race-bike-b-ag.go" "race-bike-b") - ("race-bike-a-ag.go" "race-bike-a") - ("stdmb-race-hatch-ag.go" "stdmb-race-hatch") - ("stad-d-force-field-ag.go" "stad-d-force-field") - ("stadiumd-vis.go" "stadiumd-vis") - ) + ("race-h.o" + "race-mesh.o" + "race-part.o" + "race-obs.o" + "vehicle-racer.o" + "race-info.o" + "race-manager.o" + "race-hud.o" + "pilot-recorder.o" + "racebike.o" + "stadium-race-obs.o" + "jak-pidax+0-ag.go" + "tpage-3447.go" + "tpage-3450.go" + "tpage-3448.go" + "tpage-3449.go" + "tpage-3352.go" + "race-bike-c-ag.go" + "race-bike-b-ag.go" + "race-bike-a-ag.go" + "stdmb-race-hatch-ag.go" + "stad-d-force-field-ag.go" + "stadiumd-vis.go" + )) diff --git a/goal_src/jak2/dgos/str.gd b/goal_src/jak2/dgos/str.gd index 1bff55de35..98fea3e2fa 100644 --- a/goal_src/jak2/dgos/str.gd +++ b/goal_src/jak2/dgos/str.gd @@ -1,52 +1,52 @@ ("STR.DGO" - ("hover-formation-h.o" "hover-formation-h") - ("hover-nav-control-h.o" "hover-nav-control-h") - ("hover-enemy-h.o" "hover-enemy-h") - ("hover-nav-network.o" "hover-nav-network") - ("hover-nav-control.o" "hover-nav-control") - ("hover-enemy.o" "hover-enemy") - ("hover-enemy-battle.o" "hover-enemy-battle") - ("hover-formation.o" "hover-formation") - ("hover-nav-edit.o" "hover-nav-edit") - ("wasp-part.o" "wasp-part") - ("wasp.o" "wasp") - ("crimson-guard-hover.o" "crimson-guard-hover") - ("flamer.o" "flamer") - ("strip-scenes.o" "strip-scenes") - ("strip-part.o" "strip-part") - ("strip-ocean.o" "strip-ocean") - ("strip-rescue.o" "strip-rescue") - ("strip-drop.o" "strip-drop") - ("strip-obs.o" "strip-obs") - ("chaincrate.o" "chaincrate") - ("tpage-787.go" "tpage-787") - ("tpage-789.go" "tpage-789") - ("tpage-788.go" "tpage-788") - ("tpage-786.go" "tpage-786") - ("tpage-1272.go" "tpage-1272") - ("tpage-2854.go" "tpage-2854") - ("grunt-ag.go" "grunt") - ("flitter-ag.go" "flitter") - ("flamer-ag.go" "flamer") - ("water-anim-strip-dark-eco-ag.go" "water-anim-strip-dark-eco") - ("cranecrate-ag.go" "cranecrate") - ("strip-game-crate-ag.go" "strip-game-crate") - ("drill-plat-ag.go" "drill-plat") - ("curtainsaw-ag.go" "curtainsaw") - ("fencespikes-ag.go" "fencespikes") - ("lgconveyor-ag.go" "lgconveyor") - ("pitspikes-ag.go" "pitspikes") - ("grunt-egg-b-ag.go" "grunt-egg-b") - ("warp-gate-ag.go" "warp-gate") - ("grunt-egg-a-ag.go" "grunt-egg-a") - ("grunt-egg-d-ag.go" "grunt-egg-d") - ("crane-ag.go" "crane") - ("strip-chain-crate-ag.go" "strip-chain-crate") - ("grunt-egg-c-ag.go" "grunt-egg-c") - ("cable-ag.go" "cable") - ("cntrlrm-door-ag.go" "cntrlrm-door") - ("plasmitebomb-ag.go" "plasmitebomb") - ("strip-conveyor-ag.go" "strip-conveyor") - ("cntrlrm-button-ag.go" "cntrlrm-button") - ("strip-vis.go" "strip-vis") - ) + ("hover-formation-h.o" + "hover-nav-control-h.o" + "hover-enemy-h.o" + "hover-nav-network.o" + "hover-nav-control.o" + "hover-enemy.o" + "hover-enemy-battle.o" + "hover-formation.o" + "hover-nav-edit.o" + "wasp-part.o" + "wasp.o" + "crimson-guard-hover.o" + "flamer.o" + "strip-scenes.o" + "strip-part.o" + "strip-ocean.o" + "strip-rescue.o" + "strip-drop.o" + "strip-obs.o" + "chaincrate.o" + "tpage-787.go" + "tpage-789.go" + "tpage-788.go" + "tpage-786.go" + "tpage-1272.go" + "tpage-2854.go" + "grunt-ag.go" + "flitter-ag.go" + "flamer-ag.go" + "water-anim-strip-dark-eco-ag.go" + "cranecrate-ag.go" + "strip-game-crate-ag.go" + "drill-plat-ag.go" + "curtainsaw-ag.go" + "fencespikes-ag.go" + "lgconveyor-ag.go" + "pitspikes-ag.go" + "grunt-egg-b-ag.go" + "warp-gate-ag.go" + "grunt-egg-a-ag.go" + "grunt-egg-d-ag.go" + "crane-ag.go" + "strip-chain-crate-ag.go" + "grunt-egg-c-ag.go" + "cable-ag.go" + "cntrlrm-door-ag.go" + "plasmitebomb-ag.go" + "strip-conveyor-ag.go" + "cntrlrm-button-ag.go" + "strip-vis.go" + )) diff --git a/goal_src/jak2/dgos/swb.gd b/goal_src/jak2/dgos/swb.gd index 4cbfd50c7f..212a0bc495 100644 --- a/goal_src/jak2/dgos/swb.gd +++ b/goal_src/jak2/dgos/swb.gd @@ -1,44 +1,44 @@ ("SWB.DGO" - ("ai-task-h.o" "ai-task-h") - ("bot-h.o" "bot-h") - ("bot.o" "bot") - ("bot-states.o" "bot-states") - ("hal-h.o" "hal-h") - ("hal-task.o" "hal-task") - ("hal.o" "hal") - ("ruf-h.o" "ruf-h") - ("ruf-task.o" "ruf-task") - ("ruf.o" "ruf") - ("ruf-states.o" "ruf-states") - ("jinx-h.o" "jinx-h") - ("jinx-shot.o" "jinx-shot") - ("jinx-bomb.o" "jinx-bomb") - ("jinx.o" "jinx") - ("jinx-states.o" "jinx-states") - ("mog-h.o" "mog-h") - ("mog.o" "mog") - ("grim-h.o" "grim-h") - ("grim.o" "grim") - ("sewer-part.o" "sewer-part") - ("sewer-ocean.o" "sewer-ocean") - ("sewer-obs.o" "sewer-obs") - ("sewer-obs2.o" "sewer-obs2") - ("hosehead.o" "hosehead") - ("hosehead-fake.o" "hosehead-fake") - ("amphibian.o" "amphibian") - ("gator.o" "gator") - ("fodder.o" "fodder") - ("hal2-course.o" "hal2-course") - ("mog2-course.o" "mog2-course") - ("jinx2-course.o" "jinx2-course") - ("grim2-course.o" "grim2-course") - ("sewer-scenes.o" "sewer-scenes") - ("sew-gunturret.o" "sew-gunturret") - ("tpage-1372.go" "tpage-1372") - ("tpage-1373.go" "tpage-1373") - ("tpage-1458.go" "tpage-1458") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("com-airlock-inner-ag.go" "com-airlock-inner") - ("sew-elevator-ag.go" "sew-elevator") - ("sewescb-vis.go" "sewescb-vis") - ) + ("ai-task-h.o" + "bot-h.o" + "bot.o" + "bot-states.o" + "hal-h.o" + "hal-task.o" + "hal.o" + "ruf-h.o" + "ruf-task.o" + "ruf.o" + "ruf-states.o" + "jinx-h.o" + "jinx-shot.o" + "jinx-bomb.o" + "jinx.o" + "jinx-states.o" + "mog-h.o" + "mog.o" + "grim-h.o" + "grim.o" + "sewer-part.o" + "sewer-ocean.o" + "sewer-obs.o" + "sewer-obs2.o" + "hosehead.o" + "hosehead-fake.o" + "amphibian.o" + "gator.o" + "fodder.o" + "hal2-course.o" + "mog2-course.o" + "jinx2-course.o" + "grim2-course.o" + "sewer-scenes.o" + "sew-gunturret.o" + "tpage-1372.go" + "tpage-1373.go" + "tpage-1458.go" + "com-airlock-outer-ag.go" + "com-airlock-inner-ag.go" + "sew-elevator-ag.go" + "sewescb-vis.go" + )) diff --git a/goal_src/jak2/dgos/swe.gd b/goal_src/jak2/dgos/swe.gd index 209714060f..c130e9cc70 100644 --- a/goal_src/jak2/dgos/swe.gd +++ b/goal_src/jak2/dgos/swe.gd @@ -1,26 +1,26 @@ ("SWE.DGO" - ("tpage-1370.go" "tpage-1370") - ("tpage-1387.go" "tpage-1387") - ("tpage-1371.go" "tpage-1371") - ("tpage-2293.go" "tpage-2293") - ("tpage-3478.go" "tpage-3478") - ("tpage-3415.go" "tpage-3415") - ("jinx-ag.go" "jinx") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("hosehead-ag.go" "hosehead") - ("sew-wall-ag.go" "sew-wall") - ("sew-mar-statue-explode-ag.go" "sew-mar-statue-explode") - ("sew-multi-blade-ag.go" "sew-multi-blade") - ("mar-statue-ag.go" "sew-mar-statue") - ("sew-twist-blade-ag.go" "sew-twist-blade") - ("heart-of-mar-ag.go" "heart-of-mar") - ("mine-a-ag.go" "sew-mine-a") - ("mine-b-ag.go" "sew-mine-b") - ("sew-arm-blade-ag.go" "sew-arm-blade") - ("light-switch-ag.go" "sew-light-switch") - ("jinx-bomb-ag.go" "jinx-bomb") - ("grill-ag.go" "sew-grill") - ("particleman-ag.go" "particleman") - ("sewesc-vis.go" "sewesc-vis") - ) + ("tpage-1370.go" + "tpage-1387.go" + "tpage-1371.go" + "tpage-2293.go" + "tpage-3478.go" + "tpage-3415.go" + "jinx-ag.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "hosehead-ag.go" + "sew-wall-ag.go" + "sew-mar-statue-explode-ag.go" + "sew-multi-blade-ag.go" + "mar-statue-ag.go" + "sew-twist-blade-ag.go" + "heart-of-mar-ag.go" + "mine-a-ag.go" + "mine-b-ag.go" + "sew-arm-blade-ag.go" + "light-switch-ag.go" + "jinx-bomb-ag.go" + "grill-ag.go" + "particleman-ag.go" + "sewesc-vis.go" + )) diff --git a/goal_src/jak2/dgos/tbo.gd b/goal_src/jak2/dgos/tbo.gd index 48a3614917..6073bfb1ce 100644 --- a/goal_src/jak2/dgos/tbo.gd +++ b/goal_src/jak2/dgos/tbo.gd @@ -1,21 +1,21 @@ ("TBO.DGO" - ("baron-widow+0-ag.go" "baron-widow+0") - ("tpage-1628.go" "tpage-1628") - ("tpage-1629.go" "tpage-1629") - ("tpage-2229.go" "tpage-2229") - ("tpage-2247.go" "tpage-2247") - ("tomb-boss-catwalk-ag.go" "tomb-boss-catwalk") - ("tomb-boss-bridge-ag.go" "tomb-boss-bridge") - ("widow-ag.go" "widow") - ("tomb-boss-pillar-ag.go" "tomb-boss-pillar") - ("spydroid-ag.go" "spydroid") - ("baron-pod-ag.go" "baron-pod") - ("tomb-boss-firepot-ag.go" "tomb-boss-firepot") - ("baron-ag.go" "baron") - ("tomb-boss-debris-ag.go" "tomb-boss-debris") - ("heart-mar-ag.go" "heart-mar") - ("widow-bomb-ag.go" "widow-bomb") - ("tomb-wing-door-ag.go" "tomb-wing-door") - ("particleman-ag.go" "particleman") - ("tombboss-vis.go" "tombboss-vis") - ) + ("baron-widow+0-ag.go" + "tpage-1628.go" + "tpage-1629.go" + "tpage-2229.go" + "tpage-2247.go" + "tomb-boss-catwalk-ag.go" + "tomb-boss-bridge-ag.go" + "widow-ag.go" + "tomb-boss-pillar-ag.go" + "spydroid-ag.go" + "baron-pod-ag.go" + "tomb-boss-firepot-ag.go" + "baron-ag.go" + "tomb-boss-debris-ag.go" + "heart-mar-ag.go" + "widow-bomb-ag.go" + "tomb-wing-door-ag.go" + "particleman-ag.go" + "tombboss-vis.go" + )) diff --git a/goal_src/jak2/dgos/thr.gd b/goal_src/jak2/dgos/thr.gd index f33d860400..a87a99bb9c 100644 --- a/goal_src/jak2/dgos/thr.gd +++ b/goal_src/jak2/dgos/thr.gd @@ -1,13 +1,13 @@ ("THR.DGO" - ("throne-part.o" "throne-part") - ("palace-scenes.o" "palace-scenes") - ("tpage-2731.go" "tpage-2731") - ("tpage-2733.go" "tpage-2733") - ("tpage-3372.go" "tpage-3372") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("throne-throne-ag.go" "throne-throne") - ("pal-throne-door-ag.go" "pal-throne-door") - ("particleman-ag.go" "particleman") - ("throne-vis.go" "throne-vis") - ) + ("throne-part.o" + "palace-scenes.o" + "tpage-2731.go" + "tpage-2733.go" + "tpage-3372.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "throne-throne-ag.go" + "pal-throne-door-ag.go" + "particleman-ag.go" + "throne-vis.go" + )) diff --git a/goal_src/jak2/dgos/title.gd b/goal_src/jak2/dgos/title.gd index 48c264aa06..d6e0f02b77 100644 --- a/goal_src/jak2/dgos/title.gd +++ b/goal_src/jak2/dgos/title.gd @@ -1,9 +1,9 @@ ("TITLE.DGO" - ("title-obs.o" "title-obs") - ("tpage-3091.go" "tpage-3091") - ("tpage-3090.go" "tpage-3090") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-logo-ag.go" "jak-logo") - ("jak-stand-ag.go" "jak-stand") - ("title.go" "title") - ) + ("title-obs.o" + "tpage-3091.go" + "tpage-3090.go" + "daxter-highres-ag.go" + "jak-logo-ag.go" + "jak-stand-ag.go" + "title.go" + )) diff --git a/goal_src/jak2/dgos/toa.gd b/goal_src/jak2/dgos/toa.gd index 7c2e1b4a89..20c80e7b2d 100644 --- a/goal_src/jak2/dgos/toa.gd +++ b/goal_src/jak2/dgos/toa.gd @@ -1,30 +1,30 @@ ("TOA.DGO" - ("tomb-part.o" "tomb-part") - ("tomb-obs.o" "tomb-obs") - ("tomb-water.o" "tomb-water") - ("tomb-beetle.o" "tomb-beetle") - ("spydroid.o" "spydroid") - ("widow-part.o" "widow-part") - ("widow-baron.o" "widow-baron") - ("widow-extras.o" "widow-extras") - ("widow-more-extras.o" "widow-more-extras") - ("widow.o" "widow") - ("widow2.o" "widow2") - ("monster-frog.o" "monster-frog") - ("tomb-scenes.o" "tomb-scenes") - ("tomb-baby-spider.o" "tomb-baby-spider") - ("tpage-1594.go" "tpage-1594") - ("tpage-1595.go" "tpage-1595") - ("tpage-1831.go" "tpage-1831") - ("tpage-1467.go" "tpage-1467") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("water-anim-tomb-ag.go" "water-anim-tomb") - ("monster-frog-ag.go" "monster-frog") - ("tomb-boss-door-ag.go" "tomb-boss-door") - ("tomb-mar-door-ag.go" "tomb-mar-door") - ("tomb-simon-button-ag.go" "tomb-simon-button") - ("tomb-wing-door-ag.go" "tomb-wing-door") - ("tomb-plat-return-ag.go" "tomb-plat-return") - ("tomba-vis.go" "tomba-vis") - ) + ("tomb-part.o" + "tomb-obs.o" + "tomb-water.o" + "tomb-beetle.o" + "spydroid.o" + "widow-part.o" + "widow-baron.o" + "widow-extras.o" + "widow-more-extras.o" + "widow.o" + "widow2.o" + "monster-frog.o" + "tomb-scenes.o" + "tomb-baby-spider.o" + "tpage-1594.go" + "tpage-1595.go" + "tpage-1831.go" + "tpage-1467.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "water-anim-tomb-ag.go" + "monster-frog-ag.go" + "tomb-boss-door-ag.go" + "tomb-mar-door-ag.go" + "tomb-simon-button-ag.go" + "tomb-wing-door-ag.go" + "tomb-plat-return-ag.go" + "tomba-vis.go" + )) diff --git a/goal_src/jak2/dgos/tob.gd b/goal_src/jak2/dgos/tob.gd index d53989b25c..8c42f8b173 100644 --- a/goal_src/jak2/dgos/tob.gd +++ b/goal_src/jak2/dgos/tob.gd @@ -1,15 +1,15 @@ ("TOB.DGO" - ("jak-pole+0-ag.go" "jak-pole+0") - ("tpage-1596.go" "tpage-1596") - ("tpage-1597.go" "tpage-1597") - ("tomb-stair-block-ag.go" "tomb-stair-block") - ("tomb-baby-spider-ag.go" "tomb-baby-spider") - ("water-anim-tomb-dark-eco-ag.go" "water-anim-tomb-dark-eco") - ("tomb-elevator-ag.go" "tomb-elevator") - ("tomb-plat-wall-ag.go" "tomb-plat-wall") - ("tomb-button-ag.go" "tomb-button") - ("tomb-stair-block-spikes-ag.go" "tomb-stair-block-spikes") - ("tomb-boulder-door-ag.go" "tomb-boulder-door") - ("tomb-move-swing-pole-ag.go" "tomb-move-swing-pole") - ("tombb-vis.go" "tombb-vis") - ) + ("jak-pole+0-ag.go" + "tpage-1596.go" + "tpage-1597.go" + "tomb-stair-block-ag.go" + "tomb-baby-spider-ag.go" + "water-anim-tomb-dark-eco-ag.go" + "tomb-elevator-ag.go" + "tomb-plat-wall-ag.go" + "tomb-button-ag.go" + "tomb-stair-block-spikes-ag.go" + "tomb-boulder-door-ag.go" + "tomb-move-swing-pole-ag.go" + "tombb-vis.go" + )) diff --git a/goal_src/jak2/dgos/toc.gd b/goal_src/jak2/dgos/toc.gd index 28ce437cc8..c00de0bff9 100644 --- a/goal_src/jak2/dgos/toc.gd +++ b/goal_src/jak2/dgos/toc.gd @@ -1,16 +1,16 @@ ("TOC.DGO" - ("tpage-1598.go" "tpage-1598") - ("tpage-1599.go" "tpage-1599") - ("tpage-1832.go" "tpage-1832") - ("water-anim-tomb-ag.go" "water-anim-tomb") - ("tomb-baby-spider-ag.go" "tomb-baby-spider") - ("tomb-beetle-ag.go" "tomb-beetle") - ("tomb-door-ag.go" "tomb-door") - ("tomb-vibe-ag.go" "tomb-vibe") - ("tomb-simon-button-ag.go" "tomb-simon-button") - ("tomb-plat-simon-ag.go" "tomb-plat-simon") - ("tomb-wing-door-ag.go" "tomb-wing-door") - ("tomb-button-ag.go" "tomb-button") - ("tomb-beetle-door-ag.go" "tomb-beetle-door") - ("tombc-vis.go" "tombc-vis") - ) + ("tpage-1598.go" + "tpage-1599.go" + "tpage-1832.go" + "water-anim-tomb-ag.go" + "tomb-baby-spider-ag.go" + "tomb-beetle-ag.go" + "tomb-door-ag.go" + "tomb-vibe-ag.go" + "tomb-simon-button-ag.go" + "tomb-plat-simon-ag.go" + "tomb-wing-door-ag.go" + "tomb-button-ag.go" + "tomb-beetle-door-ag.go" + "tombc-vis.go" + )) diff --git a/goal_src/jak2/dgos/tod.gd b/goal_src/jak2/dgos/tod.gd index 722e734d5a..2c9874e651 100644 --- a/goal_src/jak2/dgos/tod.gd +++ b/goal_src/jak2/dgos/tod.gd @@ -1,18 +1,18 @@ ("TOD.DGO" - ("com-elevator.o" "com-elevator") - ("youngsamos-tombd+0-ag.go" "youngsamos-tombd+0") - ("kid-tombd+0-ag.go" "kid-tombd+0") - ("tpage-1626.go" "tpage-1626") - ("tpage-1627.go" "tpage-1627") - ("tpage-3275.go" "tpage-3275") - ("daxter-highres-ag.go" "daxter-highres") - ("youngsamos-highres-ag.go" "youngsamos-highres") - ("jak-highres-ag.go" "jak-highres") - ("crocadog-highres-ag.go" "crocadog-highres") - ("kor-highres-ag.go" "kor-highres") - ("kid-highres-ag.go" "kid-highres") - ("com-airlock-outer-ag.go" "com-airlock-outer") - ("tomb-mar-door-ag.go" "tomb-mar-door") - ("com-elevator-ag.go" "com-elevator") - ("tombd-vis.go" "tombd-vis") - ) + ("com-elevator.o" + "youngsamos-tombd+0-ag.go" + "kid-tombd+0-ag.go" + "tpage-1626.go" + "tpage-1627.go" + "tpage-3275.go" + "daxter-highres-ag.go" + "youngsamos-highres-ag.go" + "jak-highres-ag.go" + "crocadog-highres-ag.go" + "kor-highres-ag.go" + "kid-highres-ag.go" + "com-airlock-outer-ag.go" + "tomb-mar-door-ag.go" + "com-elevator-ag.go" + "tombd-vis.go" + )) diff --git a/goal_src/jak2/dgos/toe.gd b/goal_src/jak2/dgos/toe.gd index 53d5ca014d..5c448e8a72 100644 --- a/goal_src/jak2/dgos/toe.gd +++ b/goal_src/jak2/dgos/toe.gd @@ -1,14 +1,14 @@ ("TOE.DGO" - ("target-indax.o" "target-indax") - ("jak-indax+0-ag.go" "jak-indax+0") - ("tomb-boulder.o" "tomb-boulder") - ("tpage-2374.go" "tpage-2374") - ("tpage-2375.go" "tpage-2375") - ("tpage-2376.go" "tpage-2376") - ("tomb-boulder-ag.go" "tomb-boulder") - ("tomb-baby-spider-ag.go" "tomb-baby-spider") - ("tomb-plat-pillar-ag.go" "tomb-plat-pillar") - ("spider-eyes-ag.go" "spider-eyes") - ("tomb-bounce-web-ag.go" "tomb-bounce-web") - ("tombe-vis.go" "tombe-vis") - ) + ("target-indax.o" + "jak-indax+0-ag.go" + "tomb-boulder.o" + "tpage-2374.go" + "tpage-2375.go" + "tpage-2376.go" + "tomb-boulder-ag.go" + "tomb-baby-spider-ag.go" + "tomb-plat-pillar-ag.go" + "spider-eyes-ag.go" + "tomb-bounce-web-ag.go" + "tombe-vis.go" + )) diff --git a/goal_src/jak2/dgos/tombext.gd b/goal_src/jak2/dgos/tombext.gd index 2b68fbc6c4..73b8bd8c07 100644 --- a/goal_src/jak2/dgos/tombext.gd +++ b/goal_src/jak2/dgos/tombext.gd @@ -1,7 +1,7 @@ ("TOMBEXT.DGO" - ("tpage-2525.go" "tpage-2525") - ("daxter-highres-ag.go" "daxter-highres") - ("tomb-boss-explode-ag.go" "tomb-boss-explode") - ("baron-highres-ag.go" "baron-highres") - ("tombext.go" "tombext") - ) + ("tpage-2525.go" + "daxter-highres-ag.go" + "tomb-boss-explode-ag.go" + "baron-highres-ag.go" + "tombext.go" + )) diff --git a/goal_src/jak2/dgos/unb.gd b/goal_src/jak2/dgos/unb.gd index e26860c9e5..ec27749318 100644 --- a/goal_src/jak2/dgos/unb.gd +++ b/goal_src/jak2/dgos/unb.gd @@ -1,93 +1,93 @@ ("UNB.DGO" - ("hover-formation-h.o" "hover-formation-h") - ("hover-nav-control-h.o" "hover-nav-control-h") - ("hover-enemy-h.o" "hover-enemy-h") - ("hover-nav-network.o" "hover-nav-network") - ("hover-nav-control.o" "hover-nav-control") - ("hover-enemy.o" "hover-enemy") - ("hover-enemy-battle.o" "hover-enemy-battle") - ("hover-formation.o" "hover-formation") - ("hover-nav-edit.o" "hover-nav-edit") - ("wasp-part.o" "wasp-part") - ("wasp.o" "wasp") - ("crimson-guard-hover.o" "crimson-guard-hover") - ("flamer.o" "flamer") - ("ai-task-h.o" "ai-task-h") - ("bot-h.o" "bot-h") - ("bot.o" "bot") - ("bot-states.o" "bot-states") - ("hal-h.o" "hal-h") - ("hal-task.o" "hal-task") - ("hal.o" "hal") - ("ruf-h.o" "ruf-h") - ("ruf-task.o" "ruf-task") - ("ruf.o" "ruf") - ("ruf-states.o" "ruf-states") - ("jinx-h.o" "jinx-h") - ("jinx-shot.o" "jinx-shot") - ("jinx-bomb.o" "jinx-bomb") - ("jinx.o" "jinx") - ("jinx-states.o" "jinx-states") - ("mog-h.o" "mog-h") - ("mog.o" "mog") - ("grim-h.o" "grim-h") - ("grim.o" "grim") - ("sig-h.o" "sig-h") - ("sig-task.o" "sig-task") - ("sig-shot.o" "sig-shot") - ("sig-plasma.o" "sig-plasma") - ("sig.o" "sig") - ("sig-states.o" "sig-states") - ("jak-mech+0-ag.go" "jak-mech+0") - ("grunt-mech-anims+0-ag.go" "grunt-mech-anims+0") - ("mech-part.o" "mech-part") - ("mech.o" "mech") - ("target-mech.o" "target-mech") - ("mech-states.o" "mech-states") - ("grunt-mech.o" "grunt-mech") - ("under-shoot-block.o" "under-shoot-block") - ("underb-master.o" "underb-master") - ("under-obs.o" "under-obs") - ("under-sig-obs.o" "under-sig-obs") - ("under-laser.o" "under-laser") - ("pipe-grunt.o" "pipe-grunt") - ("jellyfish.o" "jellyfish") - ("under-part.o" "under-part") - ("centipede.o" "centipede") - ("sig5-cent1-path0.o" "sig5-cent1-path0") - ("sig5-cent2-path0.o" "sig5-cent2-path0") - ("sig5-course.o" "sig5-course") - ("under-scenes.o" "under-scenes") - ("sig-recorder.o" "sig-recorder") - ("grenadier.o" "grenadier") - ("tpage-3051.go" "tpage-3051") - ("tpage-3053.go" "tpage-3053") - ("tpage-3054.go" "tpage-3054") - ("tpage-3413.go" "tpage-3413") - ("sig-ag.go" "sig") - ("grunt-ag.go" "grunt") - ("under-mine-ag.go" "under-mine") - ("jellyfish-ag.go" "jellyfish") - ("mech-ag.go" "mech") - ("under-shoot-block-ag.go" "under-shoot-block") - ("under-break-floor-ag.go" "under-break-floor") - ("centipede-ag.go" "centipede") - ("com-airlock-inner-ag.go" "com-airlock-inner") - ("under-int-door-ag.go" "under-int-door") - ("under-break-wall-b-ag.go" "under-break-wall-b") - ("under-break-wall-ag.go" "under-break-wall") - ("under-rise-plat-ag.go" "under-rise-plat") - ("under-lift-ag.go" "under-lift") - ("under-buoy-base-ag.go" "under-buoy-base") - ("under-buoy-chain-ag.go" "under-buoy-chain") - ("under-buoy-plat-ag.go" "under-buoy-plat") - ("water-anim-under-ag.go" "water-anim-under") - ("under-plat-shoot-ag.go" "under-plat-shoot") - ("under-plat-wall-ag.go" "under-plat-wall") - ("under-plat-long-ag.go" "under-plat-long") - ("hip-door-a-ag.go" "hip-door-a") - ("under-warp-ag.go" "under-warp") - ("under-laser-ag.go" "under-laser") - ("under-laser-shadow-ag.go" "under-laser-shadow") - ("underb-vis.go" "underb-vis") - ) + ("hover-formation-h.o" + "hover-nav-control-h.o" + "hover-enemy-h.o" + "hover-nav-network.o" + "hover-nav-control.o" + "hover-enemy.o" + "hover-enemy-battle.o" + "hover-formation.o" + "hover-nav-edit.o" + "wasp-part.o" + "wasp.o" + "crimson-guard-hover.o" + "flamer.o" + "ai-task-h.o" + "bot-h.o" + "bot.o" + "bot-states.o" + "hal-h.o" + "hal-task.o" + "hal.o" + "ruf-h.o" + "ruf-task.o" + "ruf.o" + "ruf-states.o" + "jinx-h.o" + "jinx-shot.o" + "jinx-bomb.o" + "jinx.o" + "jinx-states.o" + "mog-h.o" + "mog.o" + "grim-h.o" + "grim.o" + "sig-h.o" + "sig-task.o" + "sig-shot.o" + "sig-plasma.o" + "sig.o" + "sig-states.o" + "jak-mech+0-ag.go" + "grunt-mech-anims+0-ag.go" + "mech-part.o" + "mech.o" + "target-mech.o" + "mech-states.o" + "grunt-mech.o" + "under-shoot-block.o" + "underb-master.o" + "under-obs.o" + "under-sig-obs.o" + "under-laser.o" + "pipe-grunt.o" + "jellyfish.o" + "under-part.o" + "centipede.o" + "sig5-cent1-path0.o" + "sig5-cent2-path0.o" + "sig5-course.o" + "under-scenes.o" + "sig-recorder.o" + "grenadier.o" + "tpage-3051.go" + "tpage-3053.go" + "tpage-3054.go" + "tpage-3413.go" + "sig-ag.go" + "grunt-ag.go" + "under-mine-ag.go" + "jellyfish-ag.go" + "mech-ag.go" + "under-shoot-block-ag.go" + "under-break-floor-ag.go" + "centipede-ag.go" + "com-airlock-inner-ag.go" + "under-int-door-ag.go" + "under-break-wall-b-ag.go" + "under-break-wall-ag.go" + "under-rise-plat-ag.go" + "under-lift-ag.go" + "under-buoy-base-ag.go" + "under-buoy-chain-ag.go" + "under-buoy-plat-ag.go" + "water-anim-under-ag.go" + "under-plat-shoot-ag.go" + "under-plat-wall-ag.go" + "under-plat-long-ag.go" + "hip-door-a-ag.go" + "under-warp-ag.go" + "under-laser-ag.go" + "under-laser-shadow-ag.go" + "underb-vis.go" + )) diff --git a/goal_src/jak2/dgos/und.gd b/goal_src/jak2/dgos/und.gd index 8f49d4da78..e14c66e049 100644 --- a/goal_src/jak2/dgos/und.gd +++ b/goal_src/jak2/dgos/und.gd @@ -1,23 +1,23 @@ ("UND.DGO" - ("tpage-3045.go" "tpage-3045") - ("tpage-3048.go" "tpage-3048") - ("tpage-3049.go" "tpage-3049") - ("tpage-3047.go" "tpage-3047") - ("tpage-3276.go" "tpage-3276") - ("daxter-highres-ag.go" "daxter-highres") - ("jak-highres-ag.go" "jak-highres") - ("sig-highres-ag.go" "sig-highres") - ("centipede-fma-ag.go" "centipede-fma") - ("under-break-bridge-b-ag.go" "under-break-bridge-b") - ("under-break-bridge-ag.go" "under-break-bridge") - ("com-airlock-inner-ag.go" "com-airlock-inner") - ("under-break-door-ag.go" "under-break-door") - ("grunt-fma-ag.go" "grunt-fma") - ("under-break-ceiling-ag.go" "under-break-ceiling") - ("under-seaweed-c-ag.go" "under-seaweed-c") - ("under-seaweed-b-ag.go" "under-seaweed-b") - ("under-seaweed-d-ag.go" "under-seaweed-d") - ("under-seaweed-a-ag.go" "under-seaweed-a") - ("particleman-ag.go" "particleman") - ("under-vis.go" "under-vis") - ) + ("tpage-3045.go" + "tpage-3048.go" + "tpage-3049.go" + "tpage-3047.go" + "tpage-3276.go" + "daxter-highres-ag.go" + "jak-highres-ag.go" + "sig-highres-ag.go" + "centipede-fma-ag.go" + "under-break-bridge-b-ag.go" + "under-break-bridge-ag.go" + "com-airlock-inner-ag.go" + "under-break-door-ag.go" + "grunt-fma-ag.go" + "under-break-ceiling-ag.go" + "under-seaweed-c-ag.go" + "under-seaweed-b-ag.go" + "under-seaweed-d-ag.go" + "under-seaweed-a-ag.go" + "particleman-ag.go" + "under-vis.go" + )) diff --git a/goal_src/jak2/dgos/vi1.gd b/goal_src/jak2/dgos/vi1.gd index 8708b026d7..e35c6f4695 100644 --- a/goal_src/jak2/dgos/vi1.gd +++ b/goal_src/jak2/dgos/vi1.gd @@ -1,21 +1,21 @@ ("VI1.DGO" - ("tpage-3034.go" "tpage-3034") - ("tpage-3037.go" "tpage-3037") - ("tpage-3035.go" "tpage-3035") - ("tpage-3038.go" "tpage-3038") - ("tpage-3036.go" "tpage-3036") - ("tpage-2761.go" "tpage-2761") - ("tpage-3516.go" "tpage-3516") - ("daxter-highres-ag.go" "daxter-highres") - ("darkjak-highres-ag.go" "darkjak-highres") - ("metalkor-torso-ag.go" "metalkor-torso") - ("rift-ring-ag.go" "rift-ring") - ("vil-break-support-ag.go" "vil-break-support") - ("intro-flamer-ag.go" "intro-flamer") - ("rift-rider-donut-ag.go" "rift-rider-donut") - ("vil-windmill-sail-ag.go" "vil-windmill-sail") - ("vil-windspinner-ag.go" "vil-windspinner") - ("vil-sagesail-ag.go" "vil-sagesail") - ("particleman-ag.go" "particleman") - ("village1-vis.go" "village1-vis") - ) + ("tpage-3034.go" + "tpage-3037.go" + "tpage-3035.go" + "tpage-3038.go" + "tpage-3036.go" + "tpage-2761.go" + "tpage-3516.go" + "daxter-highres-ag.go" + "darkjak-highres-ag.go" + "metalkor-torso-ag.go" + "rift-ring-ag.go" + "vil-break-support-ag.go" + "intro-flamer-ag.go" + "rift-rider-donut-ag.go" + "vil-windmill-sail-ag.go" + "vil-windspinner-ag.go" + "vil-sagesail-ag.go" + "particleman-ag.go" + "village1-vis.go" + )) diff --git a/goal_src/jak2/dgos/vin.gd b/goal_src/jak2/dgos/vin.gd index b8bbec29b5..b8236892be 100644 --- a/goal_src/jak2/dgos/vin.gd +++ b/goal_src/jak2/dgos/vin.gd @@ -1,28 +1,28 @@ ("VIN.DGO" - ("vinroom-part.o" "vinroom-part") - ("vinroom-scenes.o" "vinroom-scenes") - ("vinroom-obs.o" "vinroom-obs") - ("kid-tombd+0-ag.go" "kid-tombd+0") - ("tpage-778.go" "tpage-778") - ("tpage-779.go" "tpage-779") - ("tpage-3278.go" "tpage-3278") - ("tpage-979.go" "tpage-979") - ("daxter-highres-ag.go" "daxter-highres") - ("vin-ag.go" "vin") - ("jak-highres-ag.go" "jak-highres") - ("crocadog-highres-ag.go" "crocadog-highres") - ("kor-highres-ag.go" "kor-highres") - ("kid-highres-ag.go" "kid-highres") - ("ecowell-a-ag.go" "ecowell-a") - ("ecowell-b-ag.go" "ecowell-b") - ("ecowell-c-ag.go" "ecowell-c") - ("ecowell-d-ag.go" "ecowell-d") - ("plasmitebox-ag.go" "plasmitebox") - ("warp-gate-ag.go" "warp-gate") - ("vin-door-ag.go" "vin-door") - ("vin-turbine-ag.go" "vin-turbine") - ("pow-mov-plat-ag.go" "pow-mov-plat") - ("palmpilot-ag.go" "palmpilot") - ("particleman-ag.go" "particleman") - ("vinroom-vis.go" "vinroom-vis") - ) + ("vinroom-part.o" + "vinroom-scenes.o" + "vinroom-obs.o" + "kid-tombd+0-ag.go" + "tpage-778.go" + "tpage-779.go" + "tpage-3278.go" + "tpage-979.go" + "daxter-highres-ag.go" + "vin-ag.go" + "jak-highres-ag.go" + "crocadog-highres-ag.go" + "kor-highres-ag.go" + "kid-highres-ag.go" + "ecowell-a-ag.go" + "ecowell-b-ag.go" + "ecowell-c-ag.go" + "ecowell-d-ag.go" + "plasmitebox-ag.go" + "warp-gate-ag.go" + "vin-door-ag.go" + "vin-turbine-ag.go" + "pow-mov-plat-ag.go" + "palmpilot-ag.go" + "particleman-ag.go" + "vinroom-vis.go" + )) diff --git a/goal_src/jak2/engine/camera/cam-debug-h.gc b/goal_src/jak2/engine/camera/cam-debug-h.gc index b9e19aee6f..644fc1d774 100644 --- a/goal_src/jak2/engine/camera/cam-debug-h.gc +++ b/goal_src/jak2/engine/camera/cam-debug-h.gc @@ -32,7 +32,7 @@ ;; DECOMP BEGINS (declare-file (debug)) -(when *debug-segment* + (define *redline-table* (the-as (pointer float) (malloc 'debug 1600))) (define *redline-index* 0) @@ -130,7 +130,5 @@ (define-perm *cam-layout* symbol #f) -) - diff --git a/goal_src/jak2/engine/camera/cam-debug.gc b/goal_src/jak2/engine/camera/cam-debug.gc index 67acf970a1..69133a24f2 100644 --- a/goal_src/jak2/engine/camera/cam-debug.gc +++ b/goal_src/jak2/engine/camera/cam-debug.gc @@ -17,7 +17,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (when (or (not *camera-old-cpu*) (zero? *camera-old-cpu*)) (set! *camera-old-cpu* 0) 0 @@ -1659,5 +1659,3 @@ (set! (-> *tfrag-work* max-fragment) (the-as uint 319)) (none) ) - -) diff --git a/goal_src/jak2/engine/camera/cam-layout.gc b/goal_src/jak2/engine/camera/cam-layout.gc index c160d853fb..151c6d872d 100644 --- a/goal_src/jak2/engine/camera/cam-layout.gc +++ b/goal_src/jak2/engine/camera/cam-layout.gc @@ -18,7 +18,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (define *camera-layout-blink* #f) (deftype cam-layout-bank (basic) @@ -3350,5 +3350,3 @@ (cam-layout-stop) (cam-layout-start) ) - -) diff --git a/goal_src/jak2/engine/collide/collide-debug.gc b/goal_src/jak2/engine/collide/collide-debug.gc index 24c7172641..acdbbc5f15 100644 --- a/goal_src/jak2/engine/collide/collide-debug.gc +++ b/goal_src/jak2/engine/collide/collide-debug.gc @@ -9,7 +9,6 @@ (declare-file (debug)) -(when *debug-segment* ;; definition for method 9 of type collide-cache ;; WARN: Return type mismatch int vs none. (defmethod debug-draw collide-cache ((obj collide-cache)) @@ -314,7 +313,5 @@ ) ) -) - diff --git a/goal_src/jak2/engine/debug/debug-part.gc b/goal_src/jak2/engine/debug/debug-part.gc index 7cefa680a5..fda6f9a62a 100644 --- a/goal_src/jak2/engine/debug/debug-part.gc +++ b/goal_src/jak2/engine/debug/debug-part.gc @@ -5,6 +5,9 @@ ;; name in dgo: debug-part ;; dgos: ENGINE, GAME +;; this file is debug only +(declare-file (debug)) + (deftype hud-money (hud) "Not actually defined in jak 2's code, but referenced." () @@ -16,7 +19,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (defpart 335 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x47 :page #xc)) (sp-flt spt-num 1.0) @@ -2040,5 +2043,3 @@ (sp-launcher-by-id spt-next-launcher 310) ) ) - -) diff --git a/goal_src/jak2/engine/debug/default-menu.gc b/goal_src/jak2/engine/debug/default-menu.gc index 24c2cc0ba1..6a1d91ad64 100644 --- a/goal_src/jak2/engine/debug/default-menu.gc +++ b/goal_src/jak2/engine/debug/default-menu.gc @@ -45,7 +45,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (define *debug-menu-context* (new 'debug 'debug-menu-context)) (define *dm-cam-mode-interpolation* 0) @@ -6121,5 +6121,3 @@ (debug-menus-handler *debug-menu-context*) (debug-menus-handler *popup-menu-context*) ) - -) diff --git a/goal_src/jak2/engine/debug/editable-h.gc b/goal_src/jak2/engine/debug/editable-h.gc index 51576ca619..9d6df2cfe1 100644 --- a/goal_src/jak2/engine/debug/editable-h.gc +++ b/goal_src/jak2/engine/debug/editable-h.gc @@ -126,7 +126,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (define *editable-temp-id* 0) (defun editable-command->string ((arg0 editable-command)) @@ -745,5 +745,3 @@ (define *editable* (the-as (pointer editable-player) #f)) 0 - -) diff --git a/goal_src/jak2/engine/debug/editable-player.gc b/goal_src/jak2/engine/debug/editable-player.gc index ced4110c28..546f785dd6 100644 --- a/goal_src/jak2/engine/debug/editable-player.gc +++ b/goal_src/jak2/engine/debug/editable-player.gc @@ -9,7 +9,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (defun cleanup-selection ((arg0 editable-array)) (let* ((v1-0 (-> arg0 length)) (a0-1 0) @@ -2597,5 +2597,3 @@ *debug-hook* ) ) - -) diff --git a/goal_src/jak2/engine/debug/editable.gc b/goal_src/jak2/engine/debug/editable.gc index f22af253e7..9dfc4392b0 100644 --- a/goal_src/jak2/engine/debug/editable.gc +++ b/goal_src/jak2/engine/debug/editable.gc @@ -9,7 +9,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (defmethod new editable-region ((allocation symbol) (type-to-make type)) (let ((gp-0 (object-new allocation type-to-make (the-as int (-> type-to-make size))))) (set! (-> gp-0 changed) #t) @@ -2050,5 +2050,3 @@ (set! *editable-entity-region* v0-84) ) ) - -) diff --git a/goal_src/jak2/engine/debug/history.gc b/goal_src/jak2/engine/debug/history.gc index e898561194..f2db1e377b 100644 --- a/goal_src/jak2/engine/debug/history.gc +++ b/goal_src/jak2/engine/debug/history.gc @@ -45,7 +45,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (defun history-channel->string ((arg0 history-channel)) (case arg0 (((history-channel friction)) @@ -560,5 +560,3 @@ For each entry: ) 0 - -) diff --git a/goal_src/jak2/engine/debug/memory-usage-h.gc b/goal_src/jak2/engine/debug/memory-usage-h.gc index 9a2539b1e0..9ee39079b2 100644 --- a/goal_src/jak2/engine/debug/memory-usage-h.gc +++ b/goal_src/jak2/engine/debug/memory-usage-h.gc @@ -103,7 +103,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (deftype memory-usage-info (structure) ((name string :offset-assert 0) (count int32 :offset-assert 4) @@ -138,7 +138,5 @@ (define *temp-mem-usage* (the-as memory-usage-block #f)) -) - diff --git a/goal_src/jak2/engine/debug/memory-usage.gc b/goal_src/jak2/engine/debug/memory-usage.gc index 63a6f493b2..dd315c514d 100644 --- a/goal_src/jak2/engine/debug/memory-usage.gc +++ b/goal_src/jak2/engine/debug/memory-usage.gc @@ -9,7 +9,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for method 3 of type memory-usage-block (defmethod inspect memory-usage-block ((obj memory-usage-block)) (format #t "-------------------------------------------------------------~%") @@ -572,5 +572,3 @@ in `mem-usage-block` as well as the total size in `mem-usage` ) 0 - -) diff --git a/goal_src/jak2/engine/debug/menu.gc b/goal_src/jak2/engine/debug/menu.gc index 6edb2e5519..07c95dd6da 100644 --- a/goal_src/jak2/engine/debug/menu.gc +++ b/goal_src/jak2/engine/debug/menu.gc @@ -9,7 +9,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (deftype debug-menu-context (basic) ((is-active symbol :offset-assert 4) (sel-length int32 :offset-assert 8) @@ -1716,7 +1716,5 @@ 0 -) - diff --git a/goal_src/jak2/engine/debug/nav/mysql-nav-graph.gc b/goal_src/jak2/engine/debug/nav/mysql-nav-graph.gc index d47dce2273..b879397a1f 100644 --- a/goal_src/jak2/engine/debug/nav/mysql-nav-graph.gc +++ b/goal_src/jak2/engine/debug/nav/mysql-nav-graph.gc @@ -82,7 +82,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (deftype mysql-nav-node (structure) ((mysql-save-flag mysql-save-flag :offset-assert 0) (runtime-id uint32 :offset-assert 4) @@ -1201,5 +1201,3 @@ returns `-1` if none is found" (none) ) - -) diff --git a/goal_src/jak2/engine/debug/part-tester.gc b/goal_src/jak2/engine/debug/part-tester.gc index 3ddae06d60..2fd2e5427d 100644 --- a/goal_src/jak2/engine/debug/part-tester.gc +++ b/goal_src/jak2/engine/debug/part-tester.gc @@ -11,7 +11,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (defpartgroup group-part-tester :id 127 :flags (unk-4 unk-6) @@ -120,5 +120,3 @@ ) (none) ) - -) diff --git a/goal_src/jak2/engine/debug/sampler.gc b/goal_src/jak2/engine/debug/sampler.gc index c6a063a793..8df1669afd 100644 --- a/goal_src/jak2/engine/debug/sampler.gc +++ b/goal_src/jak2/engine/debug/sampler.gc @@ -11,7 +11,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (define *sampler-mem* "A pointer to where the sampled data should be stored" (the-as pointer #f)) (define *sampler-compare* @@ -49,5 +49,3 @@ 0 (none) ) - -) diff --git a/goal_src/jak2/engine/dma/dma-disasm.gc b/goal_src/jak2/engine/dma/dma-disasm.gc index bed682ff74..0d535794b2 100644 --- a/goal_src/jak2/engine/dma/dma-disasm.gc +++ b/goal_src/jak2/engine/dma/dma-disasm.gc @@ -10,7 +10,6 @@ ;; Debug tool to print out a DMA list. (declare-file (debug)) -(when *debug-segment* (deftype vif-disasm-element (structure) ((mask uint32 :offset-assert 0) @@ -580,7 +579,5 @@ ) ) -) - diff --git a/goal_src/jak2/engine/gfx/mood/mood-tables2.gc b/goal_src/jak2/engine/gfx/mood/mood-tables2.gc index fec0fec3fa..bfd30a8eb6 100644 --- a/goal_src/jak2/engine/gfx/mood/mood-tables2.gc +++ b/goal_src/jak2/engine/gfx/mood/mood-tables2.gc @@ -11,7 +11,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (define *overide-mood-color-table* (new 'static 'mood-color-table :data (new 'static 'inline-array mood-color 8 (new 'static 'mood-color @@ -424,5 +424,3 @@ Apply said overrides to the [[*overide-table*]]" (format 0 " )~%") (none) ) - -) diff --git a/goal_src/jak2/engine/util/capture-h.gc b/goal_src/jak2/engine/util/capture-h.gc index 40f82002d6..8b54cdc1b7 100644 --- a/goal_src/jak2/engine/util/capture-h.gc +++ b/goal_src/jak2/engine/util/capture-h.gc @@ -8,7 +8,7 @@ ;; DECOMP BEGINS (declare-file (debug)) -(when *debug-segment* + ;; GS packet to download the framebuffer. (deftype gs-store-image-packet (structure) @@ -50,7 +50,5 @@ (set! (-> *screen-shot-work* hud-enable) #f) (define *image-name* (new 'global 'string 32 (the-as string #f))) -) - diff --git a/goal_src/jak2/engine/util/capture.gc b/goal_src/jak2/engine/util/capture.gc index 0ff5a614d6..68dd0ba92f 100644 --- a/goal_src/jak2/engine/util/capture.gc +++ b/goal_src/jak2/engine/util/capture.gc @@ -8,7 +8,7 @@ ;; DECOMP BEGINS (declare-file (debug)) -(when *debug-segment* + (defun gs-set-default-store-image ((arg0 gs-store-image-packet) (arg1 int) (arg2 int) (arg3 int) (arg4 int) (arg5 int) (arg6 int) (arg7 int)) @@ -58,7 +58,5 @@ 0 ) -) - diff --git a/goal_src/jak2/engine/util/glist-h.gc b/goal_src/jak2/engine/util/glist-h.gc index d40c0e2a1e..73ec91dae1 100644 --- a/goal_src/jak2/engine/util/glist-h.gc +++ b/goal_src/jak2/engine/util/glist-h.gc @@ -9,7 +9,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition of type glst-node (deftype glst-node (structure) ((next glst-node :offset-assert 0) @@ -141,7 +141,5 @@ ;; failed to figure out what this is: 0 -) - diff --git a/goal_src/jak2/engine/util/glist.gc b/goal_src/jak2/engine/util/glist.gc index 7b7743cae3..39a8924b95 100644 --- a/goal_src/jak2/engine/util/glist.gc +++ b/goal_src/jak2/engine/util/glist.gc @@ -9,7 +9,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for function glst-num-elements (defun glst-num-elements ((arg0 glst-list)) "Returns `numelem` from the provided [[glst-list]]" @@ -213,7 +213,5 @@ -1 ) -) - diff --git a/goal_src/jak2/levels/common/scene-looper.gc b/goal_src/jak2/levels/common/scene-looper.gc index 6f0b8f6c14..f069469167 100644 --- a/goal_src/jak2/levels/common/scene-looper.gc +++ b/goal_src/jak2/levels/common/scene-looper.gc @@ -9,7 +9,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + (deftype scene-looper (process) ((scene-name symbol :offset-assert 128) ) @@ -1067,5 +1067,3 @@ :save #t ) ) - -) diff --git a/goal_src/jak2/lib/project-lib.gp b/goal_src/jak2/lib/project-lib.gp index 6ac5b089a1..e16014b55f 100644 --- a/goal_src/jak2/lib/project-lib.gp +++ b/goal_src/jak2/lib/project-lib.gp @@ -154,7 +154,7 @@ (let ((dgo-data (car (read-data-file (string-append "goal_src/jak2/dgos/" dgo-file-name))))) ;; Get the name of the DGO (let ((dgo-name (car dgo-data)) - (files (cdr dgo-data)) + (files (cadr dgo-data)) (gsrc-seq-args '()) (textures '()) (gos '())) @@ -163,19 +163,18 @@ ;; Now we iterate through the list of files, skipping ones we've already processed ;; and creating steps for the ones that are new! (while (not (null? files)) - (let ((file-name (car (car files))) - (obj-name (car (cdr (car files))))) + (let ((file-name (car files))) ;; Check to see if we've already handled this file (when (not (car (hash-table-try-ref *file-entry-map* file-name))) ;; Depending on the type of file, generate the appropriate steps (cond ((string-ends-with? file-name ".o") ;; build up a list of all gsrc files needing to be compiled - (let ((gsrc-path (get-gsrc-path obj-name))) + (let ((gsrc-path (get-gsrc-path (symbol->string (first (string-split file-name ".")))))) (set! gsrc-seq-args (cons gsrc-path gsrc-seq-args)))) - ((string-starts-with? obj-name "tpage-") + ((string-starts-with? file-name "tpage-") ;; copy textures - (let ((tpage-id (car (cdr (string-split obj-name "-"))))) + (let ((tpage-id (second (string-split (symbol->string (first (string-split file-name "."))) "-")))) (set! textures (cons tpage-id textures)))) ((string-ends-with? file-name ".go") ;; copy art files diff --git a/goalc/compiler/Compiler.cpp b/goalc/compiler/Compiler.cpp index 7a6e29263b..265bbd7ff7 100644 --- a/goalc/compiler/Compiler.cpp +++ b/goalc/compiler/Compiler.cpp @@ -152,7 +152,23 @@ std::unique_ptr Compiler::compile_top_level_function(const std::str auto fe = std::make_unique(env, name, &m_goos.reader); fe->set_segment(TOP_LEVEL_SEGMENT); - auto result = compile_error_guard(code, fe.get()); + Val* result = nullptr; + try { + result = compile_error_guard(code, fe.get()); + } catch (DebugFileDeclareException& de) { + // (declare-file (debug)) will throw this exception. the reason for this is so that we can + // wrap the entire source code in a (when *debug-segment* ... ) and compile that version + // instead. therefore, it is recommended to put that declaration as early as possible so that + // the compiler doesn't waste much time. + // the actual source code is (top-level ...) right now though so we need some tricks. + code.as_pair()->cdr = PairObject::make_new( + PairObject::make_new(SymbolObject::make_new(m_goos.reader.symbolTable, "when"), + PairObject::make_new(SymbolObject::make_new(m_goos.reader.symbolTable, + "*debug-segment*"), + code.as_pair()->cdr)), + Object::make_empty_list()); + result = compile_error_guard(code, fe.get()); + } // only move to return register if we actually got a result if (!dynamic_cast(result)) { diff --git a/goalc/compiler/CompilerException.h b/goalc/compiler/CompilerException.h index ae2e02b2ca..a4fe953cf0 100644 --- a/goalc/compiler/CompilerException.h +++ b/goalc/compiler/CompilerException.h @@ -6,4 +6,9 @@ class CompilerException : public std::runtime_error { public: CompilerException(const std::string& err) : std::runtime_error(err) {} bool print_err_stack = true; -}; \ No newline at end of file +}; + +class DebugFileDeclareException : public std::exception { + public: + DebugFileDeclareException() : std::exception() {} +}; diff --git a/goalc/compiler/Env.h b/goalc/compiler/Env.h index 8c43fb44be..5a17cadce9 100644 --- a/goalc/compiler/Env.h +++ b/goalc/compiler/Env.h @@ -124,7 +124,9 @@ class FileEnv : public Env { } int default_segment() const { return m_default_segment; } + void set_nondebug_file() { m_default_segment = MAIN_SEGMENT; } void set_debug_file() { m_default_segment = DEBUG_SEGMENT; } + bool is_debug_file() const { return default_segment() == DEBUG_SEGMENT; } protected: std::string m_name; diff --git a/goalc/compiler/compilation/Function.cpp b/goalc/compiler/compilation/Function.cpp index 1c3f3e1dbf..42ca364ece 100644 --- a/goalc/compiler/compilation/Function.cpp +++ b/goalc/compiler/compilation/Function.cpp @@ -735,7 +735,10 @@ Val* Compiler::compile_declare_file(const goos::Object& /*form*/, if (!rrest->is_empty_list()) { throw_compiler_error(first, "Invalid debug declare"); } - env->file_env()->set_debug_file(); + if (!env->file_env()->is_debug_file()) { + env->file_env()->set_debug_file(); + throw DebugFileDeclareException(); + } } else { throw_compiler_error(first, "Unrecognized declare-file option {}.", first.print()); @@ -743,4 +746,4 @@ Val* Compiler::compile_declare_file(const goos::Object& /*form*/, }); return get_none(); -} \ No newline at end of file +} diff --git a/goalc/make/Tools.cpp b/goalc/make/Tools.cpp index 036cba0b05..3f4fa97af6 100644 --- a/goalc/make/Tools.cpp +++ b/goalc/make/Tools.cpp @@ -51,21 +51,28 @@ DgoDescription parse_desc_file(const std::string& filename, goos::Reader& reader DgoDescription desc; auto& first = dgo.as_pair()->car; desc.dgo_name = first.as_string()->data; - auto& dgo_rest = dgo.as_pair()->cdr; + auto& dgo_rest = dgo.as_pair()->cdr.as_pair()->car; for_each_in_list(dgo_rest, [&](const goos::Object& entry) { - goos::Arguments e_arg; - std::string err; - if (!goos::get_va(entry, &err, &e_arg)) { - throw std::runtime_error(fmt::format("Invalid DGO description: {}\n", err)); + if (!entry.is_string()) { + throw std::runtime_error(fmt::format("Invalid file name for DGO: {}\n", entry.print())); } - if (!goos::va_check(e_arg, {goos::ObjectType::STRING, goos::ObjectType::STRING}, {}, &err)) { - throw std::runtime_error(fmt::format("Invalid DGO description: {}\n", err)); - } DgoDescription::DgoEntry o; - o.file_name = e_arg.unnamed.at(0).as_string()->data; - o.name_in_dgo = e_arg.unnamed.at(1).as_string()->data; + const auto& file_name = entry.as_string()->data; + // automatically deduce dgo name + // (not really a fan of how this is written...) + if (file_name.length() > 2 && file_name.substr(file_name.length() - 2, 2) == ".o") { + // ends with .o so it's a code file + o.name_in_dgo = file_name.substr(0, file_name.length() - 2); + } else if (file_name.length() > 6 && file_name.substr(file_name.length() - 6, 6) == "-ag.go") { + // ends with -ag.go so it's an art group file + o.name_in_dgo = file_name.substr(0, file_name.length() - 6); + } else if (file_name.length() > 3 && file_name.substr(file_name.length() - 3, 3) == ".go") { + // ends with .go so it's a generic data file + o.name_in_dgo = file_name.substr(0, file_name.length() - 3); + } + o.file_name = file_name; desc.entries.push_back(o); }); return desc; diff --git a/test/decompiler/reference/jak1/engine/camera/cam-debug-h_REF.gc b/test/decompiler/reference/jak1/engine/camera/cam-debug-h_REF.gc index f231974472..159548b067 100644 --- a/test/decompiler/reference/jak1/engine/camera/cam-debug-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/camera/cam-debug-h_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for symbol *redline-table*, type (pointer float) (define *redline-table* (the-as (pointer float) (malloc 'debug 1600))) @@ -134,5 +134,3 @@ ;; failed to figure out what this is: 0 - -) diff --git a/test/decompiler/reference/jak1/engine/camera/cam-layout_REF.gc b/test/decompiler/reference/jak1/engine/camera/cam-layout_REF.gc index 08a6442c14..aa42dd20fb 100644 --- a/test/decompiler/reference/jak1/engine/camera/cam-layout_REF.gc +++ b/test/decompiler/reference/jak1/engine/camera/cam-layout_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for symbol *camera-layout-blink*, type symbol (define *camera-layout-blink* #f) @@ -3821,5 +3821,3 @@ (cam-layout-start) (none) ) - -) diff --git a/test/decompiler/reference/jak1/engine/debug/anim-tester_REF.gc b/test/decompiler/reference/jak1/engine/debug/anim-tester_REF.gc index b15c6da81e..20fa25c567 100644 --- a/test/decompiler/reference/jak1/engine/debug/anim-tester_REF.gc +++ b/test/decompiler/reference/jak1/engine/debug/anim-tester_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition of type list-control (deftype list-control (structure) ((listfunc (function int list-control symbol) :offset-assert 0) @@ -3072,5 +3072,3 @@ ) (none) ) - -) diff --git a/test/decompiler/reference/jak1/engine/debug/default-menu_REF.gc b/test/decompiler/reference/jak1/engine/debug/default-menu_REF.gc index 08cfe5ec17..c008ffd9ea 100644 --- a/test/decompiler/reference/jak1/engine/debug/default-menu_REF.gc +++ b/test/decompiler/reference/jak1/engine/debug/default-menu_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for symbol *debug-menu-context*, type debug-menu-context (define *debug-menu-context* (new 'debug 'debug-menu-context)) @@ -3998,5 +3998,3 @@ (debug-menus-handler *debug-menu-context*) (debug-menus-handler *popup-menu-context*) ) - -) diff --git a/test/decompiler/reference/jak1/engine/debug/memory-usage-h_REF.gc b/test/decompiler/reference/jak1/engine/debug/memory-usage-h_REF.gc index f114a1d288..04384a58c0 100644 --- a/test/decompiler/reference/jak1/engine/debug/memory-usage-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/debug/memory-usage-h_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition of type memory-usage-info (deftype memory-usage-info (structure) ((name string :offset-assert 0) @@ -60,5 +60,3 @@ ;; definition for symbol *temp-mem-usage*, type memory-usage-block (define *temp-mem-usage* (the-as memory-usage-block #f)) - -) diff --git a/test/decompiler/reference/jak1/engine/debug/memory-usage_REF.gc b/test/decompiler/reference/jak1/engine/debug/memory-usage_REF.gc index a98594a53b..be1d2893cc 100644 --- a/test/decompiler/reference/jak1/engine/debug/memory-usage_REF.gc +++ b/test/decompiler/reference/jak1/engine/debug/memory-usage_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for method 3 of type memory-usage-block ;; INFO: this function exists in multiple non-identical object files (defmethod inspect memory-usage-block ((obj memory-usage-block)) @@ -536,5 +536,3 @@ ;; failed to figure out what this is: 0 - -) diff --git a/test/decompiler/reference/jak1/engine/debug/menu_REF.gc b/test/decompiler/reference/jak1/engine/debug/menu_REF.gc index 0cd8d05780..12a9831dd5 100644 --- a/test/decompiler/reference/jak1/engine/debug/menu_REF.gc +++ b/test/decompiler/reference/jak1/engine/debug/menu_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition of type debug-menu-context (deftype debug-menu-context (basic) ((is-active symbol :offset-assert 4) @@ -621,7 +621,7 @@ ;; definition for function debug-menu-func-decode ;; INFO: Return type mismatch object vs function. -;; WARN: Failed load: (set! v1-1 (l.wu (+ a0-0 -4))) at op 5 +;; ERROR: Failed load: (set! v1-1 (l.wu (+ a0-0 -4))) at op 5 (defun debug-menu-func-decode ((arg0 object)) (let ((v1-1 (rtype-of arg0))) (the-as function (cond @@ -810,7 +810,7 @@ ;; definition for function debug-menu-find-from-template ;; INFO: Return type mismatch object vs debug-menu. -;; WARN: Failed load: (set! a0-2 (l.wu (+ s5-0 -4))) at op 19 +;; ERROR: Failed load: (set! a0-2 (l.wu (+ s5-0 -4))) at op 19 (defun debug-menu-find-from-template ((arg0 debug-menu-context) (arg1 pair)) (let ((s4-0 (the-as object (-> arg0 root-menu)))) (while (begin @@ -1703,5 +1703,3 @@ ;; failed to figure out what this is: 0 - -) diff --git a/test/decompiler/reference/jak1/engine/debug/part-tester_REF.gc b/test/decompiler/reference/jak1/engine/debug/part-tester_REF.gc index e3aad807c2..bac9c90ba6 100644 --- a/test/decompiler/reference/jak1/engine/debug/part-tester_REF.gc +++ b/test/decompiler/reference/jak1/engine/debug/part-tester_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; failed to figure out what this is: (defpartgroup group-part-tester :id 105 :bounds (static-bspherem 0 0 0 1) :parts ((sp-item 56) (sp-item 57))) @@ -120,5 +120,3 @@ ) (none) ) - -) diff --git a/test/decompiler/reference/jak1/engine/dma/dma-disasm_REF.gc b/test/decompiler/reference/jak1/engine/dma/dma-disasm_REF.gc index 591db4bb8c..4f91198a87 100644 --- a/test/decompiler/reference/jak1/engine/dma/dma-disasm_REF.gc +++ b/test/decompiler/reference/jak1/engine/dma/dma-disasm_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition of type vif-disasm-element (deftype vif-disasm-element (structure) ((mask uint32 :offset-assert 0) @@ -716,5 +716,3 @@ ) ) ) - -) diff --git a/test/decompiler/reference/jak1/engine/gfx/capture_REF.gc b/test/decompiler/reference/jak1/engine/gfx/capture_REF.gc index 554ae14116..1d1d501711 100644 --- a/test/decompiler/reference/jak1/engine/gfx/capture_REF.gc +++ b/test/decompiler/reference/jak1/engine/gfx/capture_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition of type gs-store-image-packet (deftype gs-store-image-packet (structure) ((vifcode vif-tag 4 :offset-assert 0) @@ -128,5 +128,3 @@ ) 0 ) - -) diff --git a/test/decompiler/reference/jak1/engine/util/glist-h_REF.gc b/test/decompiler/reference/jak1/engine/util/glist-h_REF.gc index 154a56bab6..b717c46465 100644 --- a/test/decompiler/reference/jak1/engine/util/glist-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/util/glist-h_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition of type glst-node (deftype glst-node (structure) ((next glst-node :offset-assert 0) @@ -118,8 +118,3 @@ ;; failed to figure out what this is: 0 - -) - - - diff --git a/test/decompiler/reference/jak1/engine/util/glist_REF.gc b/test/decompiler/reference/jak1/engine/util/glist_REF.gc index a12fa7b3e4..9380672706 100644 --- a/test/decompiler/reference/jak1/engine/util/glist_REF.gc +++ b/test/decompiler/reference/jak1/engine/util/glist_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for function glst-num-elements (defun glst-num-elements ((arg0 glst-list)) (-> arg0 numelem) @@ -239,5 +239,3 @@ ) -1 ) - -) diff --git a/test/decompiler/reference/jak2/engine/camera/cam-debug-h_REF.gc b/test/decompiler/reference/jak2/engine/camera/cam-debug-h_REF.gc index 7cfed9a907..1991625bb1 100644 --- a/test/decompiler/reference/jak2/engine/camera/cam-debug-h_REF.gc +++ b/test/decompiler/reference/jak2/engine/camera/cam-debug-h_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for symbol *redline-table*, type (pointer float) (define *redline-table* (the-as (pointer float) (malloc 'debug 1600))) @@ -134,5 +134,3 @@ ;; failed to figure out what this is: 0 - -) diff --git a/test/decompiler/reference/jak2/engine/camera/cam-debug_REF.gc b/test/decompiler/reference/jak2/engine/camera/cam-debug_REF.gc index 9defa928ab..bf4c5c60d6 100644 --- a/test/decompiler/reference/jak2/engine/camera/cam-debug_REF.gc +++ b/test/decompiler/reference/jak2/engine/camera/cam-debug_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; failed to figure out what this is: (when (or (not *camera-old-cpu*) (zero? *camera-old-cpu*)) (set! *camera-old-cpu* 0) @@ -200,8 +200,7 @@ ;; definition for function cam-line-dma ;; INFO: Used lq/sq -;; WARN: Failed store: (s.w! (+ a0-2 8) 0) at op 78 -;; WARN: Failed store: (s.w! (+ a0-2 12) 0) at op 79 +;; ERROR: Failed store: (s.w! (+ a0-2 8) 0) at op 78 (defun cam-line-dma () (with-dma-buffer-add-bucket ((v1-5 (-> *display* frames (-> *display* on-screen) debug-buf)) (bucket-id debug-no-zbuf1) @@ -1816,5 +1815,3 @@ (set! (-> *tfrag-work* max-fragment) (the-as uint 319)) (none) ) - -) diff --git a/test/decompiler/reference/jak2/engine/camera/cam-layout_REF.gc b/test/decompiler/reference/jak2/engine/camera/cam-layout_REF.gc index c4239861e1..acd573afac 100644 --- a/test/decompiler/reference/jak2/engine/camera/cam-layout_REF.gc +++ b/test/decompiler/reference/jak2/engine/camera/cam-layout_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for symbol *camera-layout-blink*, type symbol (define *camera-layout-blink* #f) @@ -296,8 +296,7 @@ ) ;; definition for function cam-layout-print -;; WARN: Failed store: (s.w! (+ v1-6 8) 0) at op 22 -;; WARN: Failed store: (s.w! (+ v1-6 12) 0) at op 23 +;; ERROR: Failed store: (s.w! (+ v1-6 8) 0) at op 22 (defun cam-layout-print ((arg0 int) (arg1 int) (arg2 string)) (with-dma-buffer-add-bucket ((s5-0 (-> *display* frames (-> *display* on-screen) debug-buf)) (bucket-id debug2) @@ -3642,5 +3641,3 @@ (cam-layout-stop) (cam-layout-start) ) - -) diff --git a/test/decompiler/reference/jak2/engine/collide/collide-debug_REF.gc b/test/decompiler/reference/jak2/engine/collide/collide-debug_REF.gc index da3b864fea..8691835478 100644 --- a/test/decompiler/reference/jak2/engine/collide/collide-debug_REF.gc +++ b/test/decompiler/reference/jak2/engine/collide/collide-debug_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for method 9 of type collide-cache ;; WARN: Return type mismatch int vs none. (defmethod debug-draw collide-cache ((obj collide-cache)) @@ -307,8 +307,3 @@ (none) ) ) - -) - - - diff --git a/test/decompiler/reference/jak2/engine/debug/debug-part_REF.gc b/test/decompiler/reference/jak2/engine/debug/debug-part_REF.gc index 7425bc8087..4ee42afa8c 100644 --- a/test/decompiler/reference/jak2/engine/debug/debug-part_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/debug-part_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; failed to figure out what this is: (defpart 335 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x47 :page #xc)) @@ -2144,8 +2144,3 @@ (sp-launcher-by-id spt-next-launcher 310) ) ) - -) - - - diff --git a/test/decompiler/reference/jak2/engine/debug/default-menu_REF.gc b/test/decompiler/reference/jak2/engine/debug/default-menu_REF.gc index b0a63af055..7487d96f7c 100644 --- a/test/decompiler/reference/jak2/engine/debug/default-menu_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/default-menu_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for symbol *debug-menu-context*, type debug-menu-context (define *debug-menu-context* (new 'debug 'debug-menu-context)) @@ -6198,5 +6198,3 @@ (debug-menus-handler *debug-menu-context*) (debug-menus-handler *popup-menu-context*) ) - -) diff --git a/test/decompiler/reference/jak2/engine/debug/editable-h_REF.gc b/test/decompiler/reference/jak2/engine/debug/editable-h_REF.gc index 66893570e4..e18f4194ab 100644 --- a/test/decompiler/reference/jak2/engine/debug/editable-h_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/editable-h_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for symbol *editable-temp-id*, type int (define *editable-temp-id* 0) @@ -1199,5 +1199,3 @@ ;; failed to figure out what this is: 0 - -) diff --git a/test/decompiler/reference/jak2/engine/debug/editable-player_REF.gc b/test/decompiler/reference/jak2/engine/debug/editable-player_REF.gc index 444c4d1020..3feaa20aa3 100644 --- a/test/decompiler/reference/jak2/engine/debug/editable-player_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/editable-player_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for function cleanup-selection ;; WARN: Return type mismatch int vs none. (defun cleanup-selection ((arg0 editable-array)) @@ -2622,5 +2622,3 @@ *debug-hook* ) ) - -) diff --git a/test/decompiler/reference/jak2/engine/debug/editable_REF.gc b/test/decompiler/reference/jak2/engine/debug/editable_REF.gc index 5f84d5218d..b9ebb9d824 100644 --- a/test/decompiler/reference/jak2/engine/debug/editable_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/editable_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for method 0 of type editable-region (defmethod new editable-region ((allocation symbol) (type-to-make type)) (let ((gp-0 (object-new allocation type-to-make (the-as int (-> type-to-make size))))) @@ -2196,5 +2196,3 @@ (set! *editable-entity-region* v0-84) ) ) - -) diff --git a/test/decompiler/reference/jak2/engine/debug/history_REF.gc b/test/decompiler/reference/jak2/engine/debug/history_REF.gc index f0d405d9be..b719c1c54e 100644 --- a/test/decompiler/reference/jak2/engine/debug/history_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/history_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for function history-channel->string (defun history-channel->string ((arg0 history-channel)) (case arg0 @@ -749,5 +749,3 @@ For each entry: ;; failed to figure out what this is: 0 - -) diff --git a/test/decompiler/reference/jak2/engine/debug/memory-usage-h_REF.gc b/test/decompiler/reference/jak2/engine/debug/memory-usage-h_REF.gc index 2cc67500ae..79bbf1fe48 100644 --- a/test/decompiler/reference/jak2/engine/debug/memory-usage-h_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/memory-usage-h_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition of type memory-usage-info (deftype memory-usage-info (structure) ((name string :offset-assert 0) @@ -48,6 +48,7 @@ ) ;; definition for method 3 of type memory-usage-block +;; INFO: this function exists in multiple non-identical object files (defmethod inspect memory-usage-block ((obj memory-usage-block)) (when (not obj) (set! obj obj) @@ -69,5 +70,3 @@ ;; definition for symbol *temp-mem-usage*, type memory-usage-block (define *temp-mem-usage* (the-as memory-usage-block #f)) - -) diff --git a/test/decompiler/reference/jak2/engine/debug/memory-usage_REF.gc b/test/decompiler/reference/jak2/engine/debug/memory-usage_REF.gc index 8f4f539ce2..b2df91267d 100644 --- a/test/decompiler/reference/jak2/engine/debug/memory-usage_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/memory-usage_REF.gc @@ -3,8 +3,9 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for method 3 of type memory-usage-block +;; INFO: this function exists in multiple non-identical object files (defmethod inspect memory-usage-block ((obj memory-usage-block)) (format #t "-------------------------------------------------------------~%") (format #t " # name count bytes used aligned bytes~%") @@ -574,5 +575,3 @@ in `mem-usage-block` as well as the total size in `mem-usage` ;; failed to figure out what this is: 0 - -) diff --git a/test/decompiler/reference/jak2/engine/debug/menu_REF.gc b/test/decompiler/reference/jak2/engine/debug/menu_REF.gc index 9742660b74..17d7cc1cd2 100644 --- a/test/decompiler/reference/jak2/engine/debug/menu_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/menu_REF.gc @@ -1,7 +1,10 @@ +;;-*-Lisp-*- (in-package goal) +;; this file is debug only (declare-file (debug)) -(when *debug-segment* + +;; definition of type debug-menu-context (deftype debug-menu-context (basic) ((is-active symbol :offset-assert 4) (sel-length int32 :offset-assert 8) @@ -21,6 +24,7 @@ ) ) +;; definition for method 3 of type debug-menu-context (defmethod inspect debug-menu-context ((obj debug-menu-context)) (when (not obj) (set! obj obj) @@ -40,6 +44,7 @@ obj ) +;; definition for method 0 of type debug-menu-context (defmethod new debug-menu-context ((allocation symbol) (type-to-make type)) (let ((gp-0 (object-new allocation type-to-make (the-as int (-> type-to-make size))))) (set! (-> gp-0 is-active) #f) @@ -64,6 +69,7 @@ ) ) +;; definition of type debug-menu-node (deftype debug-menu-node (basic) ((name string :offset-assert 4) (parent debug-menu :offset-assert 8) @@ -75,6 +81,7 @@ :flag-assert #x900000014 ) +;; definition for method 3 of type debug-menu-node (defmethod inspect debug-menu-node ((obj debug-menu-node)) (when (not obj) (set! obj obj) @@ -89,11 +96,13 @@ obj ) +;; definition for method 2 of type debug-menu-node (defmethod print debug-menu-node ((obj debug-menu-node)) (format #t "#<~A ~A @ #x~X>" (-> obj type) (-> obj name) obj) obj ) +;; definition of type debug-menu (deftype debug-menu (debug-menu-node) ((context debug-menu-context :offset-assert 20) (selected-item debug-menu-item :offset-assert 24) @@ -109,6 +118,7 @@ ) ) +;; definition for method 3 of type debug-menu (defmethod inspect debug-menu ((obj debug-menu)) (when (not obj) (set! obj obj) @@ -128,6 +138,7 @@ obj ) +;; definition for method 0 of type debug-menu (defmethod new debug-menu ((allocation symbol) (type-to-make type) (arg0 debug-menu-context) (arg1 string)) (let ((v0-0 (object-new allocation type-to-make (the-as int (-> type-to-make size))))) (set! (-> v0-0 context) arg0) @@ -139,6 +150,7 @@ ) ) +;; definition of type debug-menu-item (deftype debug-menu-item (debug-menu-node) ((id int32 :offset-assert 20) ) @@ -147,6 +159,7 @@ :flag-assert #x900000018 ) +;; definition for method 3 of type debug-menu-item (defmethod inspect debug-menu-item ((obj debug-menu-item)) (when (not obj) (set! obj obj) @@ -162,6 +175,7 @@ obj ) +;; definition of type debug-menu-item-submenu (deftype debug-menu-item-submenu (debug-menu-item) ((submenu debug-menu :offset-assert 24) ) @@ -173,6 +187,7 @@ ) ) +;; definition for method 3 of type debug-menu-item-submenu (defmethod inspect debug-menu-item-submenu ((obj debug-menu-item-submenu)) (when (not obj) (set! obj obj) @@ -189,6 +204,7 @@ obj ) +;; definition for method 0 of type debug-menu-item-submenu (defmethod new debug-menu-item-submenu ((allocation symbol) (type-to-make type) (arg0 string) (arg1 debug-menu)) (let ((v0-0 (object-new allocation type-to-make (the-as int (-> type-to-make size))))) (set! (-> v0-0 name) arg0) @@ -201,6 +217,7 @@ ) ) +;; definition of type debug-menu-item-function (deftype debug-menu-item-function (debug-menu-item) ((activate-func (function object object) :offset-assert 24) (hilite-timer int8 :offset-assert 28) @@ -213,6 +230,7 @@ ) ) +;; definition for method 3 of type debug-menu-item-function (defmethod inspect debug-menu-item-function ((obj debug-menu-item-function)) (when (not obj) (set! obj obj) @@ -230,6 +248,7 @@ obj ) +;; definition for method 0 of type debug-menu-item-function (defmethod new debug-menu-item-function ((allocation symbol) (type-to-make type) (arg0 string) (arg1 object) (arg2 (function object object))) (let ((v0-0 (object-new allocation type-to-make (the-as int (-> type-to-make size))))) (set! (-> v0-0 name) arg0) @@ -243,6 +262,7 @@ ) ) +;; definition of type debug-menu-item-flag (deftype debug-menu-item-flag (debug-menu-item) ((activate-func (function object debug-menu-msg object) :offset-assert 24) (is-on object :offset-assert 28) @@ -255,6 +275,7 @@ ) ) +;; definition for method 3 of type debug-menu-item-flag (defmethod inspect debug-menu-item-flag ((obj debug-menu-item-flag)) (when (not obj) (set! obj obj) @@ -272,6 +293,7 @@ obj ) +;; definition for method 0 of type debug-menu-item-flag (defmethod new debug-menu-item-flag ((allocation symbol) (type-to-make type) (arg0 string) @@ -290,6 +312,7 @@ ) ) +;; definition of type debug-menu-item-var (deftype debug-menu-item-var (debug-menu-item) ((display-str string :offset-assert 24) (grabbed-joypad-p symbol :offset-assert 28) @@ -326,6 +349,7 @@ ) ) +;; definition for method 3 of type debug-menu-item-var (defmethod inspect debug-menu-item-var ((obj debug-menu-item-var)) (when (not obj) (set! obj obj) @@ -367,6 +391,7 @@ obj ) +;; definition for function debug-menu-item-var-update-display-str (defun debug-menu-item-var-update-display-str ((arg0 debug-menu-item-var)) (cond ((-> arg0 float-p) @@ -405,6 +430,7 @@ arg0 ) +;; definition for function debug-menu-item-var-make-int (defun debug-menu-item-var-make-int ((arg0 debug-menu-item-var) (arg1 (function int debug-menu-msg int int int)) (arg2 int) @@ -442,6 +468,7 @@ arg0 ) +;; definition for function debug-menu-item-var-make-float (defun debug-menu-item-var-make-float ((arg0 debug-menu-item-var) (arg1 (function int debug-menu-msg float float float)) (arg2 float) @@ -471,6 +498,7 @@ arg0 ) +;; definition for method 0 of type debug-menu-item-var (defmethod new debug-menu-item-var ((allocation symbol) (type-to-make type) (arg0 string) (arg1 int) (arg2 int)) (let ((gp-0 (object-new allocation type-to-make (the-as int (-> type-to-make size))))) (let ((v1-2 (/ arg2 8))) @@ -499,6 +527,7 @@ ) ) +;; definition for function debug-menu-context-grab-joypad (defun debug-menu-context-grab-joypad ((arg0 debug-menu-context) (arg1 basic) (arg2 (function basic none))) (cond ((-> arg0 joypad-func) @@ -512,12 +541,14 @@ ) ) +;; definition for function debug-menu-context-release-joypad (defun debug-menu-context-release-joypad ((arg0 debug-menu-context)) (set! (-> arg0 joypad-func) #f) (set! (-> arg0 joypad-item) #f) #f ) +;; definition for function debug-menu-item-get-max-width (defun debug-menu-item-get-max-width ((arg0 debug-menu-item) (arg1 debug-menu)) (local-vars (v0-1 int)) 0 @@ -554,6 +585,7 @@ v0-1 ) +;; definition for function debug-menu-context-default-selection (defun debug-menu-context-default-selection ((arg0 debug-menu-context) (arg1 symbol)) (when (or (zero? (-> arg0 sel-length)) (not arg1)) (let ((s5-0 (-> arg0 root-menu))) @@ -575,6 +607,7 @@ arg0 ) +;; definition for function debug-menu-rebuild (defun debug-menu-rebuild ((arg0 debug-menu)) (let ((s4-0 0) (s5-0 0) @@ -599,6 +632,7 @@ arg0 ) +;; definition for function debug-menu-context-set-root-menu (defun debug-menu-context-set-root-menu ((arg0 debug-menu-context) (arg1 debug-menu)) (let ((s4-0 (-> arg0 is-active))) (if s4-0 @@ -613,6 +647,7 @@ arg0 ) +;; definition for function debug-menu-append-item (defun debug-menu-append-item ((arg0 debug-menu) (arg1 debug-menu-node)) (let* ((gp-0 (-> arg0 context)) (s4-0 (-> gp-0 is-active)) @@ -630,6 +665,7 @@ arg1 ) +;; definition for function debug-menu-remove-all-items (defun debug-menu-remove-all-items ((arg0 debug-menu)) (let* ((gp-0 (-> arg0 context)) (s4-0 (-> gp-0 is-active)) @@ -647,6 +683,9 @@ arg0 ) +;; definition for function debug-menu-func-decode +;; WARN: Return type mismatch object vs function. +;; WARN: Using new Jak 2 rtype-of (defun debug-menu-func-decode ((arg0 object)) (let ((v1-2 (rtype-of arg0))) (the-as function (cond @@ -664,6 +703,16 @@ ) ) +;; definition for function debug-menu-make-from-template +;; INFO: Used lq/sq +;; ERROR: Stack slot load at 96 mismatch: defined as size 4, got size 16 +;; ERROR: Stack slot load at 128 mismatch: defined as size 4, got size 16 +;; ERROR: Stack slot load at 96 mismatch: defined as size 4, got size 16 +;; ERROR: Stack slot load at 128 mismatch: defined as size 4, got size 16 +;; ERROR: Stack slot load at 96 mismatch: defined as size 4, got size 16 +;; ERROR: Stack slot load at 128 mismatch: defined as size 4, got size 16 +;; ERROR: Stack slot load at 96 mismatch: defined as size 4, got size 16 +;; ERROR: Stack slot load at 128 mismatch: defined as size 4, got size 16 (defun debug-menu-make-from-template ((arg0 debug-menu-context) (arg1 pair)) (local-vars (s4-0 debug-menu-node) @@ -839,6 +888,8 @@ s4-0 ) +;; definition for function debug-menu-find-from-template +;; WARN: Return type mismatch object vs debug-menu. (defun debug-menu-find-from-template ((arg0 debug-menu-context) (arg1 pair)) (let ((s5-0 (the-as object (-> arg0 root-menu)))) (while (begin (label cfg-12) (and s5-0 (type? s5-0 debug-menu) (not (null? arg1)))) @@ -868,6 +919,8 @@ ) ) +;; definition for function debug-menu-item-submenu-render +;; ERROR: Failed store: (s.w! (+ v1-9 8) 0) at op 42 (defun debug-menu-item-submenu-render ((arg0 debug-menu-item-submenu) (arg1 int) (arg2 int) (arg3 int) (arg4 symbol)) (let ((s5-0 (-> arg0 parent context font))) (let ((v1-2 s5-0) @@ -898,6 +951,8 @@ arg0 ) +;; definition for function debug-menu-item-function-render +;; ERROR: Failed store: (s.w! (+ v1-3 8) 0) at op 49 (defun debug-menu-item-function-render ((arg0 debug-menu-item-function) (arg1 int) (arg2 int) (arg3 int) (arg4 symbol)) (let ((v1-2 (-> arg0 parent context font))) (let ((a0-1 v1-2) @@ -933,6 +988,8 @@ arg0 ) +;; definition for function debug-menu-item-flag-render +;; ERROR: Failed store: (s.w! (+ v1-3 8) 0) at op 47 (defun debug-menu-item-flag-render ((arg0 debug-menu-item-flag) (arg1 int) (arg2 int) (arg3 int) (arg4 symbol)) (let ((v1-2 (-> arg0 parent context font))) (let ((a0-1 v1-2) @@ -968,6 +1025,8 @@ arg0 ) +;; definition for function debug-menu-item-var-render +;; ERROR: Failed store: (s.w! (+ v1-16 8) 0) at op 95 (defun debug-menu-item-var-render ((arg0 debug-menu-item-var) (arg1 int) (arg2 int) (arg3 int) (arg4 symbol)) (let ((s5-0 (-> arg0 parent context font))) (let ((v1-2 s5-0) @@ -1022,6 +1081,7 @@ arg0 ) +;; definition for function debug-menu-item-render (defun debug-menu-item-render ((arg0 debug-menu-item) (arg1 int) (arg2 int) (arg3 int) (arg4 symbol)) (when (> (-> arg0 refresh-delay) 0) (+! (-> arg0 refresh-ctr) -1) @@ -1050,6 +1110,9 @@ arg0 ) +;; definition for function debug-menu-render +;; INFO: Used lq/sq +;; ERROR: Failed store: (s.w! (+ v1-9 8) 0) at op 47 (defun debug-menu-render ((arg0 debug-menu) (arg1 int) (arg2 int) (arg3 debug-menu-node) (arg4 int)) (local-vars (sv-16 dma-buffer) (sv-32 pointer)) (let ((v1-0 0)) @@ -1121,6 +1184,7 @@ arg0 ) +;; definition for function debug-menu-context-render (defun debug-menu-context-render ((arg0 debug-menu-context)) (let ((s4-0 6)) (dotimes (s5-0 (-> arg0 sel-length)) @@ -1135,6 +1199,7 @@ arg0 ) +;; definition for function debug-menu-context-select-next-or-prev-item (defun debug-menu-context-select-next-or-prev-item ((arg0 debug-menu-context) (arg1 int)) (local-vars (v1-6 object)) (let ((s5-0 (-> arg0 sel-menu (+ (-> arg0 sel-length) -1)))) @@ -1179,6 +1244,7 @@ arg0 ) +;; definition for function debug-menu-context-select-new-item (defun debug-menu-context-select-new-item ((arg0 debug-menu-context) (arg1 int)) (let* ((a2-0 (-> arg0 sel-menu (+ (-> arg0 sel-length) -1))) (a1-1 (-> a2-0 selected-item)) @@ -1232,6 +1298,7 @@ arg0 ) +;; definition for function debug-menu-context-open-submenu (defun debug-menu-context-open-submenu ((arg0 debug-menu-context) (arg1 debug-menu)) (let ((v1-0 (-> arg0 sel-length))) (when (>= v1-0 8) @@ -1251,6 +1318,7 @@ (debug-menu-context-send-msg arg0 (debug-menu-msg activate) (debug-menu-dest current-selection)) ) +;; definition for function debug-menu-context-close-submenu (defun debug-menu-context-close-submenu ((arg0 debug-menu-context)) (debug-menu-context-send-msg arg0 (debug-menu-msg deactivate) (debug-menu-dest current-selection)) (if (< 1 (-> arg0 sel-length)) @@ -1259,6 +1327,7 @@ arg0 ) +;; definition for function debug-menu-item-submenu-msg (defun debug-menu-item-submenu-msg ((arg0 debug-menu-item-submenu) (arg1 debug-menu-msg)) (when (= arg1 (debug-menu-msg press)) (let ((a0-1 (-> arg0 parent context))) @@ -1268,6 +1337,7 @@ arg0 ) +;; definition for function debug-menu-item-function-msg (defun debug-menu-item-function-msg ((arg0 debug-menu-item-function) (arg1 debug-menu-msg)) (cond ((= arg1 (debug-menu-msg press)) @@ -1291,6 +1361,7 @@ arg0 ) +;; definition for function debug-menu-item-flag-msg (defun debug-menu-item-flag-msg ((arg0 debug-menu-item-flag) (arg1 debug-menu-msg)) (cond ((= arg1 (debug-menu-msg press)) @@ -1311,6 +1382,7 @@ arg0 ) +;; definition for function debug-menu-item-var-joypad-handler (defun debug-menu-item-var-joypad-handler ((arg0 debug-menu-item-var) (arg1 debug-menu-msg)) (cond ((not (cpad-hold? arg1 x)) @@ -1437,6 +1509,7 @@ arg0 ) +;; definition for function debug-menu-item-var-msg (defun debug-menu-item-var-msg ((arg0 debug-menu-item-var) (arg1 debug-menu-msg)) (cond ((= arg1 (debug-menu-msg deactivate)) @@ -1484,6 +1557,7 @@ arg0 ) +;; definition for function debug-menu-item-send-msg (defun debug-menu-item-send-msg ((arg0 debug-menu-item) (arg1 debug-menu-msg)) (cond ((= (-> arg0 type) debug-menu-item-submenu) @@ -1505,6 +1579,7 @@ arg0 ) +;; definition for function debug-menu-send-msg (defun debug-menu-send-msg ((arg0 debug-menu) (arg1 debug-menu-msg) (arg2 symbol)) (let* ((s3-0 (-> arg0 items)) (s2-0 (car s3-0)) @@ -1521,6 +1596,7 @@ arg0 ) +;; definition for function debug-menu-context-send-msg (defun debug-menu-context-send-msg ((arg0 debug-menu-context) (arg1 debug-menu-msg) (arg2 debug-menu-dest)) (cond ((= arg2 (debug-menu-dest root)) @@ -1562,6 +1638,7 @@ arg0 ) +;; definition for function debug-menu-context-activate-selection (defun debug-menu-context-activate-selection ((arg0 debug-menu-context)) (let ((a0-1 (-> arg0 sel-menu (+ (-> arg0 sel-length) -1) selected-item))) (debug-menu-item-send-msg a0-1 (debug-menu-msg press)) @@ -1569,6 +1646,7 @@ arg0 ) +;; definition for function debug-menus-default-joypad-func (defun debug-menus-default-joypad-func ((arg0 debug-menu-context)) (cond ((cpad-pressed? (-> arg0 joypad-number) square) @@ -1599,6 +1677,7 @@ arg0 ) +;; definition for function debug-menus-active (defun debug-menus-active ((arg0 debug-menu-context)) (when (not (-> arg0 is-hidden)) (cond @@ -1619,6 +1698,7 @@ arg0 ) +;; definition for function debug-menus-handler (defun debug-menus-handler ((arg0 debug-menu-context)) (if (-> arg0 is-active) (debug-menus-active arg0) @@ -1626,6 +1706,5 @@ arg0 ) +;; failed to figure out what this is: 0 - -) diff --git a/test/decompiler/reference/jak2/engine/debug/nav/mysql-nav-graph_REF.gc b/test/decompiler/reference/jak2/engine/debug/nav/mysql-nav-graph_REF.gc index 7280ec743b..4a9e132ff9 100644 --- a/test/decompiler/reference/jak2/engine/debug/nav/mysql-nav-graph_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/nav/mysql-nav-graph_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition of type mysql-nav-node (deftype mysql-nav-node (structure) ((mysql-save-flag mysql-save-flag :offset-assert 0) @@ -1369,5 +1369,3 @@ returns `-1` if none is found" (format #t "Done.~%") #t ) - -) diff --git a/test/decompiler/reference/jak2/engine/debug/part-tester_REF.gc b/test/decompiler/reference/jak2/engine/debug/part-tester_REF.gc index 820c22d882..a4056c3b3b 100644 --- a/test/decompiler/reference/jak2/engine/debug/part-tester_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/part-tester_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; failed to figure out what this is: (defpartgroup group-part-tester :id 127 @@ -135,5 +135,3 @@ ) (none) ) - -) diff --git a/test/decompiler/reference/jak2/engine/debug/sampler_REF.gc b/test/decompiler/reference/jak2/engine/debug/sampler_REF.gc index 1cf18d52ea..7fc346e6e1 100644 --- a/test/decompiler/reference/jak2/engine/debug/sampler_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/sampler_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for symbol *sampler-mem*, type pointer (define *sampler-mem* "A pointer to where the sampled data should be stored" (the-as pointer #f)) @@ -57,5 +57,3 @@ 0 (none) ) - -) diff --git a/test/decompiler/reference/jak2/engine/dma/dma-disasm_REF.gc b/test/decompiler/reference/jak2/engine/dma/dma-disasm_REF.gc index c467d2a0af..8d7704a579 100644 --- a/test/decompiler/reference/jak2/engine/dma/dma-disasm_REF.gc +++ b/test/decompiler/reference/jak2/engine/dma/dma-disasm_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition of type vif-disasm-element (deftype vif-disasm-element (structure) ((mask uint32 :offset-assert 0) @@ -724,5 +724,3 @@ ) ) ) - -) diff --git a/test/decompiler/reference/jak2/engine/gfx/mood/mood-tables2_REF.gc b/test/decompiler/reference/jak2/engine/gfx/mood/mood-tables2_REF.gc index 0376f9a85f..b9c1a41d57 100644 --- a/test/decompiler/reference/jak2/engine/gfx/mood/mood-tables2_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/mood/mood-tables2_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for symbol *overide-mood-color-table*, type mood-color-table (define *overide-mood-color-table* (new 'static 'mood-color-table :data (new 'static 'inline-array mood-color 8 @@ -424,5 +424,3 @@ Apply said overrides to the [[*overide-table*]]" (format 0 " )~%") (none) ) - -) diff --git a/test/decompiler/reference/jak2/engine/util/capture-h_REF.gc b/test/decompiler/reference/jak2/engine/util/capture-h_REF.gc index 8250a24f99..778fcf46c3 100644 --- a/test/decompiler/reference/jak2/engine/util/capture-h_REF.gc +++ b/test/decompiler/reference/jak2/engine/util/capture-h_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition of type gs-store-image-packet (deftype gs-store-image-packet (structure) ((vifcode vif-tag 4 :offset-assert 0) @@ -97,5 +97,3 @@ ;; failed to figure out what this is: 0 - -) diff --git a/test/decompiler/reference/jak2/engine/util/capture_REF.gc b/test/decompiler/reference/jak2/engine/util/capture_REF.gc index 98e6e739c1..105d7a4829 100644 --- a/test/decompiler/reference/jak2/engine/util/capture_REF.gc +++ b/test/decompiler/reference/jak2/engine/util/capture_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for function gs-set-default-store-image ;; INFO: Used lq/sq (defun gs-set-default-store-image ((arg0 gs-store-image-packet) (arg1 int) (arg2 int) (arg3 int) (arg4 int) (arg5 int) (arg6 int) (arg7 int)) @@ -53,5 +53,3 @@ ) 0 ) - -) diff --git a/test/decompiler/reference/jak2/engine/util/glist-h_REF.gc b/test/decompiler/reference/jak2/engine/util/glist-h_REF.gc index 45fe8d297a..59386953b7 100644 --- a/test/decompiler/reference/jak2/engine/util/glist-h_REF.gc +++ b/test/decompiler/reference/jak2/engine/util/glist-h_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition of type glst-node (deftype glst-node (structure) ((next glst-node :offset-assert 0) @@ -134,8 +134,3 @@ ;; failed to figure out what this is: 0 - -) - - - diff --git a/test/decompiler/reference/jak2/engine/util/glist_REF.gc b/test/decompiler/reference/jak2/engine/util/glist_REF.gc index b2952ca9a7..ec1170e726 100644 --- a/test/decompiler/reference/jak2/engine/util/glist_REF.gc +++ b/test/decompiler/reference/jak2/engine/util/glist_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition for function glst-num-elements (defun glst-num-elements ((arg0 glst-list)) "Returns `numelem` from the provided [[glst-list]]" @@ -206,5 +206,3 @@ ) -1 ) - -) diff --git a/test/decompiler/reference/jak2/levels/common/scene-looper_REF.gc b/test/decompiler/reference/jak2/levels/common/scene-looper_REF.gc index 1e3a11a83a..bc4780e61c 100644 --- a/test/decompiler/reference/jak2/levels/common/scene-looper_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/scene-looper_REF.gc @@ -3,7 +3,7 @@ ;; this file is debug only (declare-file (debug)) -(when *debug-segment* + ;; definition of type scene-looper (deftype scene-looper (process) ((scene-name symbol :offset-assert 128) @@ -1087,5 +1087,3 @@ :save #t ) ) - -)