6 files changed, 22 insertions, 14 deletions

@@ -112,7 +112,7 @@ function ChangeMap(map, warp)
 
   playerSprite.controllable = false
   FadeToBlack(150)
-  loadMap("../res/maps/" .. map .. ".tmx", warp, direction)
+  loadMap(map, warp, direction)
 
   local newPlayerId = getPlayerSprite()
   local newPlayerSprite = getSprite(newPlayerId)
@@ -1,4 +1,6 @@
-function default()
+global = {}
+
+function global.no_problem_here()
   StartCutscene()
   DisplayMessage("* No problem here.", "", SpeakerType.NONE)
   HideCutsceneBars()
@@ -1,4 +1,6 @@
-function script0001()
+map1 = {}
+
+function map1.script0001()
   StartCutscene()
   SetAnimation("boney", "barking")
   local barkingNoise = LoopSound("barking_at_hallucination.wav")
@@ -22,3 +24,15 @@ function script0001()
   SetAnimation("flint", "still")
   HideCutsceneBars()
 end
+
+function map1.off_right()
+  ChangeMap("map2", "fromLeft")
+end
+
+function map1.test_trigger()
+  StartCutscene()
+  PlaySound("boney_growl.wav")
+  DisplayMessage("* Hi! Welcome to the funky zone.", "", SpeakerType.NONE)
+  WaitForEndOfMessage()
+  HideCutsceneBars()
+end
@@ -1,3 +0,0 @@
-function map1_off_right()
-  ChangeMap("map2", "fromLeft")
-end
@@ -1,3 +1,5 @@
-function map2_off_left()
+map2 = {}
+
+function map2.off_left()
   ChangeMap("map1", "fromRight")
 end
@@ -1,7 +0,0 @@
-function test_trigger()
-  StartCutscene()
-  PlaySound("boney_growl.wav")
-  DisplayMessage("* Hi! Welcome to the funky zone.", "", SpeakerType.NONE)
-  WaitForEndOfMessage()
-  HideCutsceneBars()
-end