remove gd files, simplify fakeiso (#1053)

* remove gd files, simplify fakeiso

* fix bug in decompiler mistakenly marking functions as asm

decompiler/Function/Function.cpp

@@ -88,7 +88,8 @@ void Function::analyze_prologue(const LinkedObjectFile& file) {
 
       // storing s7 on the stack is done by interrupt handlers, which we probably don't want to
       // support
-      if (instr.kind == InstructionKind::SD && instr.get_src(0).get_reg() == make_gpr(Reg::S7)) {
+      if (instr.kind == InstructionKind::SD && instr.get_src(0).get_reg() == make_gpr(Reg::S7) &&
+          instr.get_src(2).get_reg() == make_gpr(Reg::SP)) {
         lg::warn(
             "Function {} was flagged as asm due to this instruction: {}. Consider flagging as asm "
             "in config!",

game/fake_iso.txt

@@ -1,80 +0,0 @@
-; Fake ISO file - used to map files in jak-project/ to files available for loading from OVERLORD.
-; Each entry should consist of an ISO name, followed by a file name
-; note that tweakval, vagdir, screen1 have dummy data for now.
-
-;; CGO Files
-KERNEL.CGO out/iso/KERNEL.CGO
-GAME.CGO out/iso/GAME.CGO
-TEST.CGO resources/TEST.CGO
-ART.CGO out/iso/ART.CGO
-
-;; Special Weird Files
-TWEAKVAL.MUS resources/TWEAKVAL.MUS
-VAGDIR.AYB resources/VAGDIR.AYB
-SCREEN1.USA resources/SCREEN1.USA
-SAVEGAME.ICO resources/SAVEGAME.ICO
-
-;; Text files
-0COMMON.TXT out/iso/0COMMON.TXT
-1COMMON.TXT out/iso/1COMMON.TXT
-2COMMON.TXT out/iso/2COMMON.TXT
-3COMMON.TXT out/iso/3COMMON.TXT
-4COMMON.TXT out/iso/4COMMON.TXT
-5COMMON.TXT out/iso/5COMMON.TXT
-0TEST.TXT out/iso/0TEST.TXT
-
-;; Level DGO
-VI1.DGO out/iso/VI1.DGO
-VI2.DGO out/iso/VI2.DGO
-VI3.DGO out/iso/VI3.DGO
-TRA.DGO out/iso/TRA.DGO
-MIS.DGO out/iso/MIS.DGO
-FIC.DGO out/iso/FIC.DGO
-ROL.DGO out/iso/ROL.DGO
-SUN.DGO out/iso/SUN.DGO
-SUB.DGO out/iso/SUB.DGO
-SWA.DGO out/iso/SWA.DGO
-OGR.DGO out/iso/OGR.DGO
-JUN.DGO out/iso/JUN.DGO
-JUB.DGO out/iso/JUB.DGO
-MAI.DGO out/iso/MAI.DGO
-SNO.DGO out/iso/SNO.DGO
-BEA.DGO out/iso/BEA.DGO
-LAV.DGO out/iso/LAV.DGO
-CIT.DGO out/iso/CIT.DGO
-FIN.DGO out/iso/FIN.DGO
-INT.DGO out/iso/INT.DGO
-
-;; Level VIS
-VI1.VIS out/iso/VI1.VIS
-VI2.VIS out/iso/VI2.VIS
-VI3.VIS out/iso/VI3.VIS
-TRA.VIS out/iso/TRA.VIS
-MIS.VIS out/iso/MIS.VIS
-FIC.VIS out/iso/FIC.VIS
-ROL.VIS out/iso/ROL.VIS
-SUN.VIS out/iso/SUN.VIS
-SUB.VIS out/iso/SUB.VIS
-SWA.VIS out/iso/SWA.VIS
-OGR.VIS out/iso/OGR.VIS
-JUN.VIS out/iso/JUN.VIS
-JUB.VIS out/iso/JUB.VIS
-MAI.VIS out/iso/MAI.VIS
-SNO.VIS out/iso/SNO.VIS
-BEA.VIS out/iso/BEA.VIS
-LAV.VIS out/iso/LAV.VIS
-CIT.VIS out/iso/CIT.VIS
-FIN.VIS out/iso/FIN.VIS
-INT.VIS out/iso/INT.VIS
-
-;; Streaming Animations
-FUCVICTO.STR out/iso/FUCVICTO.STR
-FUCV2.STR out/iso/FUCV2.STR
-FUCV3.STR out/iso/FUCV3.STR
-FUCV4.STR out/iso/FUCV4.STR
-FUCV5.STR out/iso/FUCV5.STR
-FUCV6.STR out/iso/FUCV6.STR
-FUCV7.STR out/iso/FUCV7.STR
-FUCV8.STR out/iso/FUCV8.STR
-FUCFV1.STR out/iso/FUCFV1.STR
-FUCRV1.STR out/iso/FUCRV1.STR

game/overlord/fake_iso.cpp

@@ -10,6 +10,7 @@
  */
 
 #include <cstring>
+#include <filesystem>
 #include "fake_iso.h"
 #include "game/sce/iop.h"
 #include "isocommon.h"
@@ -79,45 +80,16 @@ void fake_iso_init_globals() {
 int FS_Init(u8* buffer) {
   (void)buffer;
 
-  auto config_str = file_util::read_text_file(file_util::get_file_path({"game", "fake_iso.txt"}));
+  for (const auto& f : std::filesystem::directory_iterator(file_util::get_file_path({"out/iso"}))) {
-  const char* ptr = config_str.c_str();
+    if (f.is_regular_file()) {
-
+      assert(fake_iso_entry_count < MAX_ISO_FILES);
-  // loop over lines
+      FakeIsoEntry* e = &fake_iso_entries[fake_iso_entry_count];
-  while (*ptr) {
+      std::string file_name = f.path().filename().string();
-    // newlines
+      assert(file_name.length() < 16);  // should be 8.3.
-    while (*ptr && *ptr == '\n')
+      strcpy(e->iso_name, file_name.c_str());
-      ptr++;
+      strcpy(e->file_path, fmt::format("out/iso/{}", file_name).c_str());
-
+      fake_iso_entry_count++;
-    // comment line
-    if (*ptr == ';') {
-      while (*ptr && (*ptr != '\n')) {
-        ptr++;
-      }
-      continue;
     }
-
-    // entry line
-    assert(fake_iso_entry_count < MAX_ISO_FILES);
-    FakeIsoEntry* e = &fake_iso_entries[fake_iso_entry_count];
-    int i = 0;
-    while (*ptr && (*ptr != ' ') && i < 16) {
-      e->iso_name[i] = *ptr;
-      ptr++;
-      i++;
-    }
-
-    while (*ptr == ' ') {
-      ptr++;
-    }
-
-    i = 0;
-    while (*ptr && (*ptr != '\n') && (*ptr != ' ') && (*ptr != EOF) && i < 128) {
-      e->file_path[i] = *ptr;
-      ptr++;
-      i++;
-    }
-    e->file_path[i] = 0;
-    fake_iso_entry_count++;
   }
 
   for (u32 i = 0; i < fake_iso_entry_count; i++) {
@@ -161,7 +133,6 @@ FileRecord* FS_FindIN(const char* iso_name) {
     count++;
   }
   printf("[FAKEISO] failed to find %s\n", iso_name);
-  assert(false);
   return nullptr;
 }
 

goal_src/game.gp

@@ -5,6 +5,25 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; This file sets up the OpenGOAL build system for Jak 1.
+;; This file is treated as a GOOS program. There is a single special form `defstep` that
+;; allows you to define a build step.
+
+;; Then, you can use the `make` command to build a target. Like real make, it will only rebuild things if
+;; the inputs change.
+
+;; Each defstep takes the following arguments:
+;; in - an input file. The step automatically depends on this.
+;; tool - the tool (goalc, copy, dgo, group, tpage-dir)
+;; out - a list of outputs (unlike make, we support multiple outputs without hacks!)
+;; dep - a list of outputs from other rules that are required for this.
+
+;; Before the build order is determined, the tool gets to look at its input file and tell the build system
+;; about other deps. For example, in a "dgo" rule, you don't have to say that you depend on all of your input
+;; files, the DGO tool provides that information to the build system.
+
+;; It is an error to provide two steps to make the same file, even if they are identical.
+;; It is an error to not provide a step to make a required file.
+;; It is an error to have a circular dependency and this will crash the compiler due to stack overflow.
 
 ;;;;;;;;;;;;;;;;;;;;;;;
 ;; Build system macros
@@ -67,12 +86,16 @@
     )
   )
 
-(defmacro cgo (output-name desc-file-name)
+(define *all-cgos* '())
+(defun cgo (output-name desc-file-name)
   "Add a CGO with the given output name (in out/iso) and input name (in goal_src/dgos)"
-  `(defstep :in ,(string-append "goal_src/dgos/" desc-file-name)
+  (let ((out-name (string-append "out/iso/" output-name)))
-     :tool 'dgo
+    (defstep :in (string-append "goal_src/dgos/" desc-file-name)
-     :out '(,(string-append "out/iso/" output-name))
+      :tool 'dgo
-     )
+      :out `(,out-name)
+      )
+    (set! *all-cgos* (cons out-name *all-cgos*))
+    )
   )
 
 (defun tpage-name (id)
@@ -107,27 +130,31 @@
     )
   )
 
+(define *all-str* '())
 (defmacro copy-strs (&rest strs)
   `(begin ,@(apply (lambda (x) `(copy-str ,x)) strs)))
 
-(defmacro copy-str (name)
+(defun copy-str (name)
   (let* ((folder (get-environment-variable "OPENGOAL_DECOMP_DIR" :default ""))
-         (path (string-append "iso_data/" folder "STR/" name ".STR")))
+         (path (string-append "iso_data/" folder "STR/" name ".STR"))
-    `(defstep :in ,path
+         (out-file (string-append "out/iso/" name ".STR")))
-              :tool 'copy
+    (defstep :in path
-              :out '(,(string-append "out/iso/" name ".STR")))))
+             :tool 'copy
+             :out `(,out-file))
+    (set! *all-str* (cons out-file *all-str*))))
 
+(define *all-vis* '())
 (defmacro copy-vis-files (&rest files)
   `(begin ,@(apply (lambda (x) `(copy-vis-file ,x)) files)))
 
-(defmacro copy-vis-file (name)
+(defun copy-vis-file (name)
   (let* ((folder (get-environment-variable "OPENGOAL_DECOMP_DIR" :default ""))
-         (path (string-append "iso_data/" folder "VIS/" name ".VIS")))
+         (path (string-append "iso_data/" folder "VIS/" name ".VIS"))
-    `(defstep :in ,path
+         (out-name (string-append "out/iso/" name ".VIS")))
-              :tool 'copy
+    (defstep :in path
-              :out '(,(string-append "out/iso/" name ".VIS")))))
+             :tool 'copy
-
+             :out `(,out-name))
-
+    (set! *all-vis* (cons out-name *all-vis*))))
 
 
 (defmacro group (name &rest stuff)
@@ -137,6 +164,13 @@
      :dep '(,@stuff))
   )
 
+(defun group-list (name stuff)
+  (defstep :in ""
+     :tool 'group
+     :out `(,(string-append "GROUP:" name))
+     :dep stuff)
+  )
+
 ;;;;;;;;;;;;;;;;;;;;;;
 ;; CGO's
 ;;;;;;;;;;;;;;;;;;;;;;
@@ -184,6 +218,25 @@
   :out '("out/obj/game-cnt.go")
   )
 
+;; the TWEAKVAL file
+(defstep :in "iso_data/MUS/TWEAKVAL.MUS"
+  :tool 'copy
+  :out '("out/iso/TWEAKVAL.MUS"))
+
+;; the VAGDIR file
+(defstep :in "iso_data/VAG/VAGDIR.AYB"
+  :tool 'copy
+  :out '("out/iso/VAGDIR.AYB"))
+
+;; the save icon file
+(defstep :in "iso_data/DRIVERS/SAVEGAME.ICO"
+  :tool 'copy
+  :out '("out/iso/SAVEGAME.ICO"))
+
+;; the loading screen file
+(defstep :in "iso_data/DRIVERS/SCREEN1.USA"
+  :tool 'copy
+  :out '("out/iso/SCREEN1.USA"))
 
 ;;;;;;;;;;;;;;;;;;;;;
 ;; Textures (Common)
@@ -240,68 +293,6 @@
   )
 
 
-;;;;;;;;;;;;;;;;;;;;;
-;; ISO Group
-;;;;;;;;;;;;;;;;;;;;;
-;; the iso group is a group of files required to boot.
-
-(group "iso"
-       "out/iso/0COMMON.TXT"
-       "out/iso/KERNEL.CGO"
-       "out/iso/GAME.CGO"
-       ;; level dgo
-       "out/iso/VI1.DGO"
-       "out/iso/VI2.DGO"
-       "out/iso/VI3.DGO"
-       "out/iso/TRA.DGO"
-       "out/iso/INT.DGO"
-       "out/iso/MIS.DGO"
-       "out/iso/FIC.DGO"
-       "out/iso/ROL.DGO"
-       "out/iso/SUN.DGO"
-       "out/iso/SUB.DGO"
-       "out/iso/SWA.DGO"
-       "out/iso/OGR.DGO"
-       "out/iso/JUN.DGO"
-       "out/iso/JUB.DGO"
-       "out/iso/MAI.DGO"
-       "out/iso/SNO.DGO"
-       "out/iso/BEA.DGO"
-       "out/iso/LAV.DGO"
-       "out/iso/CIT.DGO"
-       "out/iso/FIN.DGO"
-       ;; level vis
-       "out/iso/VI1.VIS"
-       "out/iso/VI2.VIS"
-       "out/iso/VI3.VIS"
-       "out/iso/TRA.VIS"
-       "out/iso/INT.VIS"
-       "out/iso/MIS.VIS"
-       "out/iso/FIC.VIS"
-       "out/iso/ROL.VIS"
-       "out/iso/SUN.VIS"
-       "out/iso/SUB.VIS"
-       "out/iso/SWA.VIS"
-       "out/iso/OGR.VIS"
-       "out/iso/JUN.VIS"
-       "out/iso/JUB.VIS"
-       "out/iso/MAI.VIS"
-       "out/iso/SNO.VIS"
-       "out/iso/BEA.VIS"
-       "out/iso/LAV.VIS"
-       "out/iso/CIT.VIS"
-       "out/iso/FIN.VIS"
-       ;; streamed anims
-       "out/iso/FUCVICTO.STR"
-       "out/iso/FUCV2.STR"
-       "out/iso/FUCV3.STR"
-       "out/iso/FUCV4.STR"
-       "out/iso/FUCV5.STR"
-       "out/iso/FUCV6.STR"
-       "out/iso/FUCV7.STR"
-       "out/iso/FUCV8.STR"
-       )
-
 
 ;;;;;;;;;;;;;;;;;;;;;
 ;; engine Group
@@ -362,7 +353,7 @@
 (goal-src-sequence
   "levels/"
    :deps ;; no idea what these depend on, make it depend on the whole engine
-   ("out/obj/default-menu.o")
+   ("out/obj/ticky.o")
 
    "village_common/villagep-obs.gc"
    "village_common/oracle.gc"
@@ -400,7 +391,7 @@
 (goal-src-sequence
  "levels/"
  :deps ;; no idea what these depend on, make it depend on the whole engine
- ("out/obj/default-menu.o")
+ ("out/obj/ticky.o")
 
  "village1/farmer.gc"
  "village1/explorer.gc"
@@ -466,7 +457,7 @@
 (goal-src-sequence
  "levels/jungle/"
  :deps ;; no idea what these depend on, make it depend on the whole engine
- ("out/obj/default-menu.o")
+ ("out/obj/ticky.o")
 
  "jungle-elevator.gc"
  "bouncer.gc"
@@ -527,7 +518,7 @@
 (goal-src-sequence
  "levels/jungleb/"
  :deps ;; no idea what these depend on, make it depend on the whole engine
- ("out/obj/default-menu.o")
+ ("out/obj/ticky.o")
 
  "jungleb-obs.gc"
  "plat-flip.gc"
@@ -560,7 +551,7 @@
 (goal-src-sequence
  "levels/intro/"
  :deps ;; no idea what these depend on, make it depend on the whole engine
- ("out/obj/default-menu.o")
+ ("out/obj/ticky.o")
 
  "evilbro.gc"
  )
@@ -584,7 +575,7 @@
 
 (goal-src-sequence
   "levels/misty/"
-  :deps ("out/obj/default-menu.o")
+  :deps ("out/obj/evilbro.o")
   "mistycannon.gc"
   "babak-with-cannon.gc"
   "misty-obs.gc"
@@ -644,7 +635,7 @@
 
 (goal-src-sequence
   "levels/beach/"
-  :deps ("out/obj/default-menu.o")
+  :deps ("out/obj/ticky.o")
   "air-h.gc"
   "air.gc"
   "wobbler.gc"
@@ -705,7 +696,7 @@
 (goal-src-sequence
  "levels/firecanyon/"
  :deps ;; no idea what these depend on, make it depend on the whole engine
- ("out/obj/default-menu.o")
+ ("out/obj/ticky.o")
 
  "firecanyon-part.gc"
  "assistant-firecanyon.gc"
@@ -735,7 +726,7 @@
 ;; The code
 (goal-src-sequence
   "levels/training/"
-  :deps ("out/obj/default-menu.o") ;; makes us depend on the whole engine
+  :deps ("out/obj/ticky.o") ;; makes us depend on the whole engine
 
   "training-obs.gc"
   "training-part.gc"
@@ -762,7 +753,7 @@
 
 (goal-src-sequence
  "levels/village2/"
- :deps ("out/obj/default-menu.o")
+ :deps ("out/obj/ticky.o")
  "village2-part.gc"
  "village2-obs.gc"
  "village2-part2.gc"
@@ -818,7 +809,7 @@
 
 (goal-src-sequence
  "levels/rolling/"
- :deps ("out/obj/default-menu.o")
+ :deps ("out/obj/ticky.o")
  "rolling-obs.gc"
  "rolling-lightning-mole.gc"
  "rolling-robber.gc"
@@ -851,7 +842,7 @@
 
 (goal-src-sequence
   "levels/sunken/"
-  :deps ("out/obj/default-menu.o")
+  :deps ("out/obj/ticky.o")
   "sunken-part.gc"
   "sunken-part2.gc"
   "sunken-part3.gc"
@@ -942,7 +933,7 @@
 
 (goal-src-sequence
  "levels/swamp/"
- :deps ("out/obj/default-menu.o")
+ :deps ("out/obj/ticky.o")
  "swamp-obs.gc"
  "swamp-bat.gc"
  "swamp-rat.gc"
@@ -982,7 +973,7 @@
 
 (goal-src-sequence
  "levels/ogre/"
- :deps ("out/obj/default-menu.o")
+ :deps ("out/obj/ticky.o")
  "ogre-part.gc"
  "ogreboss.gc"
  "ogre-obs.gc"
@@ -1021,7 +1012,7 @@
 (goal-src-sequence
  "levels/"
  :deps ;; no idea what these depend on, make it depend on the whole engine
- ("out/obj/default-menu.o")
+ ("out/obj/ticky.o")
  "village3/village3-part.gc"
  "village3/village3-obs.gc"
  "village3/minecart.gc"
@@ -1067,7 +1058,7 @@
 (goal-src-sequence
  "levels/"
  :deps ;; no idea what these depend on, make it depend on the whole engine
- ("out/obj/default-menu.o"
+ ("out/obj/ticky.o"
   )
  "maincave/cavecrystal-light.gc"
  "darkcave/darkcave-obs.gc"
@@ -1114,7 +1105,7 @@
 
 (goal-src-sequence
  "levels/snow/"
- :deps ("out/obj/default-menu.o")
+ :deps ("out/obj/ticky.o")
  "target-snowball.gc"
  "target-ice.gc"
  "ice-cube.gc"
@@ -1168,7 +1159,7 @@
 
 (goal-src-sequence
   "levels/lavatube/"
-  :deps ("out/obj/default-menu.o")
+  :deps ("out/obj/ticky.o")
 
   "lavatube-obs.gc"
   "lavatube-energy.gc"
@@ -1208,7 +1199,7 @@
 
 (goal-src-sequence
   "levels/citadel/"
-  :deps ("out/obj/default-menu.o")
+  :deps ("out/obj/battlecontroller.o")
 
   "citadel-part.gc"
   "citadel-obs.gc"
@@ -1265,7 +1256,7 @@
 
 (goal-src-sequence
   "levels/finalboss/"
-  :deps ("out/obj/default-menu.o")
+  :deps ("out/obj/assistant-citadel.o")
 
   "robotboss-h.gc"
   "robotboss-part.gc"
@@ -1642,3 +1633,14 @@
  )
 
 
+;;;;;;;;;;;;;;;;;;;;;
+;; ISO Group
+;;;;;;;;;;;;;;;;;;;;;
+;; the iso group is a group of files built by the "(mi)" command.
+
+(group-list "iso"
+ `("out/iso/0COMMON.TXT"
+   ,@*all-cgos*
+   ,@*all-vis*
+   ,@*all-str*)
+ )

goal_src/levels/beach/barrel-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: barrel-ag.gd
-;; name in dgo: barrel
-;; dgos: BEA, VI2

goal_src/levels/beach/beach-vis.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: beach-vis.gd
-;; name in dgo: beach-vis
-;; dgos: BEA

goal_src/levels/beach/beachcam-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: beachcam-ag.gd
-;; name in dgo: beachcam
-;; dgos: BEA

goal_src/levels/beach/bird-lady-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: bird-lady-ag.gd
-;; name in dgo: bird-lady
-;; dgos: BEA

goal_src/levels/beach/bird-lady-beach-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: bird-lady-beach-ag.gd
-;; name in dgo: bird-lady-beach
-;; dgos: BEA

goal_src/levels/beach/bladeassm-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: bladeassm-ag.gd
-;; name in dgo: bladeassm
-;; dgos: BEA

goal_src/levels/beach/ecoventrock-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: ecoventrock-ag.gd
-;; name in dgo: ecoventrock
-;; dgos: BEA

goal_src/levels/beach/flutflut-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: flutflut-ag.gd
-;; name in dgo: flutflut
-;; dgos: BEA

goal_src/levels/beach/flutflutegg-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: flutflutegg-ag.gd
-;; name in dgo: flutflutegg
-;; dgos: BEA

goal_src/levels/beach/grottopole-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: grottopole-ag.gd
-;; name in dgo: grottopole
-;; dgos: BEA

goal_src/levels/beach/harvester-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: harvester-ag.gd
-;; name in dgo: harvester
-;; dgos: BEA

goal_src/levels/beach/kickrock-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: kickrock-ag.gd
-;; name in dgo: kickrock
-;; dgos: BEA

goal_src/levels/beach/lrocklrg-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: lrocklrg-ag.gd
-;; name in dgo: lrocklrg
-;; dgos: BEA

goal_src/levels/beach/lurkercrab-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: lurkercrab-ag.gd
-;; name in dgo: lurkercrab
-;; dgos: BEA

goal_src/levels/beach/lurkerpuppy-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: lurkerpuppy-ag.gd
-;; name in dgo: lurkerpuppy
-;; dgos: BEA

goal_src/levels/beach/lurkerworm-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: lurkerworm-ag.gd
-;; name in dgo: lurkerworm
-;; dgos: BEA

goal_src/levels/beach/mayor-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: mayor-ag.gd
-;; name in dgo: mayor
-;; dgos: BEA

goal_src/levels/beach/pelican-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: pelican-ag.gd
-;; name in dgo: pelican
-;; dgos: BEA

goal_src/levels/beach/sculptor-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: sculptor-ag.gd
-;; name in dgo: sculptor
-;; dgos: BEA

goal_src/levels/beach/sculptor-muse-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: sculptor-muse-ag.gd
-;; name in dgo: sculptor-muse
-;; dgos: BEA

goal_src/levels/beach/seagull-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: seagull-ag.gd
-;; name in dgo: seagull
-;; dgos: BEA

goal_src/levels/beach/tpage-212.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: tpage-212.gd
-;; name in dgo: tpage-212
-;; dgos: BEA

goal_src/levels/beach/tpage-213.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: tpage-213.gd
-;; name in dgo: tpage-213
-;; dgos: BEA

goal_src/levels/beach/tpage-214.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: tpage-214.gd
-;; name in dgo: tpage-214
-;; dgos: BEA

goal_src/levels/beach/tpage-215.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: tpage-215.gd
-;; name in dgo: tpage-215
-;; dgos: BEA

goal_src/levels/beach/windmill-one-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: windmill-one-ag.gd
-;; name in dgo: windmill-one
-;; dgos: BEA

goal_src/levels/cave_common/baby-spider-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: baby-spider-ag.gd
-;; name in dgo: baby-spider
-;; dgos: MAI, DAR, ROB

goal_src/levels/cave_common/caveelevator-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: caveelevator-ag.gd
-;; name in dgo: caveelevator
-;; dgos: DAR, ROB

goal_src/levels/cave_common/cavetrapdoor-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: cavetrapdoor-ag.gd
-;; name in dgo: cavetrapdoor
-;; dgos: MAI, DAR, ROB

goal_src/levels/cave_common/dark-crystal-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: dark-crystal-ag.gd
-;; name in dgo: dark-crystal
-;; dgos: DAR, MAI

goal_src/levels/cave_common/driller-lurker-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: driller-lurker-ag.gd
-;; name in dgo: driller-lurker
-;; dgos: MAI, ROB

goal_src/levels/cave_common/mother-spider-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: mother-spider-ag.gd
-;; name in dgo: mother-spider
-;; dgos: DAR, MAI

goal_src/levels/cave_common/spider-egg-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: spider-egg-ag.gd
-;; name in dgo: spider-egg
-;; dgos: DAR, MAI, ROB

goal_src/levels/cave_common/spiderwebs-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: spiderwebs-ag.gd
-;; name in dgo: spiderwebs
-;; dgos: MAI, ROB

goal_src/levels/citadel/assistant-lavatube-end-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: assistant-lavatube-end-ag.gd
-;; name in dgo: assistant-lavatube-end
-;; dgos: CIT

goal_src/levels/citadel/bluesage-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: bluesage-ag.gd
-;; name in dgo: bluesage
-;; dgos: CIT

goal_src/levels/citadel/citadel-vis.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citadel-vis.gd
-;; name in dgo: citadel-vis
-;; dgos: CIT

goal_src/levels/citadel/citadelcam-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citadelcam-ag.gd
-;; name in dgo: citadelcam
-;; dgos: CIT

goal_src/levels/citadel/citb-arm-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-arm-ag.gd
-;; name in dgo: citb-arm
-;; dgos: CIT

goal_src/levels/citadel/citb-arm-shoulder-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-arm-shoulder-ag.gd
-;; name in dgo: citb-arm-shoulder
-;; dgos: CIT

goal_src/levels/citadel/citb-bunny-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-bunny-ag.gd
-;; name in dgo: citb-bunny
-;; dgos: CIT

goal_src/levels/citadel/citb-button-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-button-ag.gd
-;; name in dgo: citb-button
-;; dgos: CIT

goal_src/levels/citadel/citb-chain-plat-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-chain-plat-ag.gd
-;; name in dgo: citb-chain-plat
-;; dgos: CIT

goal_src/levels/citadel/citb-chains-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-chains-ag.gd
-;; name in dgo: citb-chains
-;; dgos: CIT

goal_src/levels/citadel/citb-coil-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-coil-ag.gd
-;; name in dgo: citb-coil
-;; dgos: CIT

goal_src/levels/citadel/citb-disc-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-disc-ag.gd
-;; name in dgo: citb-disc
-;; dgos: CIT

goal_src/levels/citadel/citb-donut-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-donut-ag.gd
-;; name in dgo: citb-donut
-;; dgos: CIT

goal_src/levels/citadel/citb-drop-plat-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-drop-plat-ag.gd
-;; name in dgo: citb-drop-plat
-;; dgos: CIT

goal_src/levels/citadel/citb-exit-plat-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-exit-plat-ag.gd
-;; name in dgo: citb-exit-plat
-;; dgos: CIT

goal_src/levels/citadel/citb-firehose-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-firehose-ag.gd
-;; name in dgo: citb-firehose
-;; dgos: CIT

goal_src/levels/citadel/citb-generator-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-generator-ag.gd
-;; name in dgo: citb-generator
-;; dgos: CIT

goal_src/levels/citadel/citb-hose-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-hose-ag.gd
-;; name in dgo: citb-hose
-;; dgos: CIT

goal_src/levels/citadel/citb-iris-door-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-iris-door-ag.gd
-;; name in dgo: citb-iris-door
-;; dgos: CIT

goal_src/levels/citadel/citb-launcher-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-launcher-ag.gd
-;; name in dgo: citb-launcher
-;; dgos: CIT

goal_src/levels/citadel/citb-robotboss-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-robotboss-ag.gd
-;; name in dgo: citb-robotboss
-;; dgos: CIT

goal_src/levels/citadel/citb-rotatebox-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-rotatebox-ag.gd
-;; name in dgo: citb-rotatebox
-;; dgos: CIT

goal_src/levels/citadel/citb-sagecage-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-sagecage-ag.gd
-;; name in dgo: citb-sagecage
-;; dgos: CIT

goal_src/levels/citadel/citb-stopbox-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: citb-stopbox-ag.gd
-;; name in dgo: citb-stopbox
-;; dgos: CIT

goal_src/levels/citadel/evilbro-citadel-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: evilbro-citadel-ag.gd
-;; name in dgo: evilbro-citadel
-;; dgos: CIT

goal_src/levels/citadel/evilsis-citadel-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: evilsis-citadel-ag.gd
-;; name in dgo: evilsis-citadel
-;; dgos: CIT

goal_src/levels/citadel/plat-citb-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: plat-citb-ag.gd
-;; name in dgo: plat-citb
-;; dgos: CIT

goal_src/levels/citadel/plat-eco-citb-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: plat-eco-citb-ag.gd
-;; name in dgo: plat-eco-citb
-;; dgos: CIT

goal_src/levels/citadel/redsage-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: redsage-ag.gd
-;; name in dgo: redsage
-;; dgos: CIT

goal_src/levels/citadel/tpage-1414.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: tpage-1414.gd
-;; name in dgo: tpage-1414
-;; dgos: CIT

goal_src/levels/citadel/tpage-1415.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: tpage-1415.gd
-;; name in dgo: tpage-1415
-;; dgos: CIT

goal_src/levels/citadel/tpage-1416.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: tpage-1416.gd
-;; name in dgo: tpage-1416
-;; dgos: CIT

goal_src/levels/citadel/tpage-1417.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: tpage-1417.gd
-;; name in dgo: tpage-1417
-;; dgos: CIT

goal_src/levels/citadel/yellowsage-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: yellowsage-ag.gd
-;; name in dgo: yellowsage
-;; dgos: CIT

goal_src/levels/common/babak-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: babak-ag.gd
-;; name in dgo: babak
-;; dgos: BEA, CIT, JUN, FIC, MIS, ROB, ROL, SNO, SUB, SUN, SWA

goal_src/levels/common/buzzer-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: buzzer-ag.gd
-;; name in dgo: buzzer
-;; dgos: GAME, ART

goal_src/levels/common/crate-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: crate-ag.gd
-;; name in dgo: crate
-;; dgos: GAME, ART

goal_src/levels/common/deathcam-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: deathcam-ag.gd
-;; name in dgo: deathcam
-;; dgos: GAME, ART

goal_src/levels/common/dir-tpages.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: dir-tpages.gd
-;; name in dgo: dir-tpages
-;; dgos: GAME, ART

goal_src/levels/common/ecovalve-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: ecovalve-ag.gd
-;; name in dgo: ecovalve
-;; dgos: GAME, ART, BEA, CIT, FIN, JUB, JUN, FIC, OGR, LAV, MAI, ROB, ROL, SNO, SUB, SWA, TRA

goal_src/levels/common/eichar-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: eichar-ag.gd
-;; name in dgo: eichar
-;; dgos: GAME, ART

goal_src/levels/common/fuel-cell-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: fuel-cell-ag.gd
-;; name in dgo: fuel-cell
-;; dgos: GAME, ART

goal_src/levels/common/fuelcell-naked-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: fuelcell-naked-ag.gd
-;; name in dgo: fuelcell-naked
-;; dgos: GAME, ART

goal_src/levels/common/game-cnt.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: game-cnt.gd
-;; name in dgo: game-cnt
-;; dgos: GAME, ART

goal_src/levels/common/green-sagecage-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: green-sagecage-ag.gd
-;; name in dgo: green-sagecage
-;; dgos: CIT, FIN

goal_src/levels/common/money-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: money-ag.gd
-;; name in dgo: money
-;; dgos: GAME, ART

goal_src/levels/common/orb-cache-top-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: orb-cache-top-ag.gd
-;; name in dgo: orb-cache-top
-;; dgos: BEA, CIT, JUN, MIS, SNO, SUN, VI1, VI2

goal_src/levels/common/plat-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: plat-ag.gd
-;; name in dgo: plat
-;; dgos: MAI, ROB

goal_src/levels/common/plat-eco-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: plat-eco-ag.gd
-;; name in dgo: plat-eco
-;; dgos: JUN, MIS, ROB, TRA

goal_src/levels/common/sharkey-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: sharkey-ag.gd
-;; name in dgo: sharkey
-;; dgos: BEA, TRA, VI2, JUN, MIS, SWA, VI1

goal_src/levels/common/sidekick-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: sidekick-ag.gd
-;; name in dgo: sidekick
-;; dgos: GAME, ART

goal_src/levels/common/speaker-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: speaker-ag.gd
-;; name in dgo: speaker
-;; dgos: GAME, ART

goal_src/levels/common/tpage-1032.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: tpage-1032.gd
-;; name in dgo: tpage-1032
-;; dgos: GAME, ART

goal_src/levels/common/tpage-1278.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: tpage-1278.gd
-;; name in dgo: tpage-1278
-;; dgos: GAME, ART

goal_src/levels/common/tpage-1532.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: tpage-1532.gd
-;; name in dgo: tpage-1532
-;; dgos: GAME, ART

goal_src/levels/common/tpage-2.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: tpage-2.gd
-;; name in dgo: tpage-2
-;; dgos: GAME, ART

goal_src/levels/common/tpage-256.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: tpage-256.gd
-;; name in dgo: tpage-256
-;; dgos: GAME, ART

goal_src/levels/common/tpage-463.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: tpage-463.gd
-;; name in dgo: tpage-463
-;; dgos: GAME, ART

goal_src/levels/common/tpage-62.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: tpage-62.gd
-;; name in dgo: tpage-62
-;; dgos: GAME, ART

goal_src/levels/common/tpage-880.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: tpage-880.gd
-;; name in dgo: tpage-880
-;; dgos: GAME, ART

goal_src/levels/common/warpgate-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: warpgate-ag.gd
-;; name in dgo: warpgate
-;; dgos: CIT, TRA, VI1, VI2, VI3

goal_src/levels/darkcave/cavecrystal-ag.gd

@@ -1,6 +0,0 @@
-;;-*-Lisp-*-
-;; GOAL Data Description File
-
-;; name: cavecrystal-ag.gd
-;; name in dgo: cavecrystal
-;; dgos: DAR