From 3b6200be952df223a9026ef065df0c4938034c2d Mon Sep 17 00:00:00 2001
From: water111 <48171810+water111@users.noreply.github.com>
Date: Mon, 30 May 2022 15:21:41 -0400
Subject: [PATCH] [game] fix ambients stopping and swamp blimp tethers (#1389)

---
 decompiler/config/all-types.gc                               | 2 +-
 goal_src/kernel/gkernel.gc                                   | 2 +-
 goal_src/levels/village2/swamp-blimp.gc                      | 2 +-
 test/decompiler/reference/levels/village2/swamp-blimp_REF.gc | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/decompiler/config/all-types.gc b/decompiler/config/all-types.gc
index e2dceecc91..d7e0b09432 100644
--- a/decompiler/config/all-types.gc
+++ b/decompiler/config/all-types.gc
@@ -29692,7 +29692,7 @@
 ;; - Functions
 
 (define-extern swamp-rope-init-by-other (function vector entity-actor none :behavior swamp-rope))
-(define-extern swamp-blimp-setup (function none :behavior swamp-blimp))
+(define-extern swamp-blimp-setup (function int :behavior swamp-blimp))
 (define-extern tetherrock-get-info (function entity tetherrock-info))
 (define-extern swamp-rope-post (function none :behavior swamp-rope))
 (define-extern swamp-rope-break-code (function quaternion :behavior swamp-rope))
diff --git a/goal_src/kernel/gkernel.gc b/goal_src/kernel/gkernel.gc
index 59a04aeaea..9f80ead185 100644
--- a/goal_src/kernel/gkernel.gc
+++ b/goal_src/kernel/gkernel.gc
@@ -2382,7 +2382,7 @@
 ;; The defstate macro isn't defined yet, so we do it manually.
 (define dead-state
         (the (state process) (new 'static 'state
-                                  :name #f
+                                  :name 'dead-state
                                   :next #f
                                   :exit #f
                                   :code #f
diff --git a/goal_src/levels/village2/swamp-blimp.gc b/goal_src/levels/village2/swamp-blimp.gc
index dbf06b991a..ed5a5493d0 100644
--- a/goal_src/levels/village2/swamp-blimp.gc
+++ b/goal_src/levels/village2/swamp-blimp.gc
@@ -1630,8 +1630,8 @@
           (vector-normalize! (the-as vector (-> self gondola-tilt-oscillator)) 1.0)
           )
         )
+      gp-0
       )
-    (none)
     )
   )
 
diff --git a/test/decompiler/reference/levels/village2/swamp-blimp_REF.gc b/test/decompiler/reference/levels/village2/swamp-blimp_REF.gc
index fca18c9bca..bca3b3deaa 100644
--- a/test/decompiler/reference/levels/village2/swamp-blimp_REF.gc
+++ b/test/decompiler/reference/levels/village2/swamp-blimp_REF.gc
@@ -1744,7 +1744,6 @@
   )
 
 ;; definition for function swamp-blimp-setup
-;; INFO: Return type mismatch int vs none.
 (defbehavior swamp-blimp-setup swamp-blimp ()
   (rlet ((vf0 :class vf))
     (init-vf0-vector)
@@ -1824,8 +1823,8 @@
           (vector-normalize! (the-as vector (-> self gondola-tilt-oscillator)) 1.0)
           )
         )
+      gp-0
       )
-    (none)
     )
   )