8 files changed, 24 insertions, 16 deletions
diff --git a/res/maps/map1.tmx b/res/maps/map1.tmx
index 8afb909..e1a9049 100644
--- a/res/maps/map1.tmx
+++ b/res/maps/map1.tmx

@@ -781,7 +781,7 @@
  </object>
  <object id="8" name="moveToRight" type="trigger" x="761" y="359.667" width="18" height="60.3333">
   <properties>
-    <property name="script" value="map1_off_right"/>
+    <property name="script" value="off_right"/>
   </properties>
  </object>
  <object id="9" name="fromRight" type="warp" x="748.667" y="382.667">
diff --git a/res/maps/map2.tmx b/res/maps/map2.tmx
index c1d2f2d..43fa850 100644
--- a/res/maps/map2.tmx
+++ b/res/maps/map2.tmx

@@ -642,7 +642,7 @@
  </object>
  <object id="2" name="moveToLeft" type="trigger" x="-20.3333" y="304" width="22.6667" height="91.6667">
   <properties>
-    <property name="script" value="map2_off_left"/>
+    <property name="script" value="off_left"/>
   </properties>
  </object>
 </objectgroup>
diff --git a/res/scripts/common.lua b/res/scripts/common.lua
index 2023e63..3c412c6 100644
--- a/res/scripts/common.lua
+++ b/res/scripts/common.lua

@@ -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)
diff --git a/res/scripts/default.lua b/res/scripts/global.lua
index b8f7768..48084c8 100644
--- a/res/scripts/default.lua
+++ b/res/scripts/global.lua

@@ -1,4 +1,6 @@
-function default()
+global = {}
+function global.no_problem_here()
  StartCutscene()
  DisplayMessage("* No problem here.", "", SpeakerType.NONE)
  HideCutsceneBars()
diff --git a/res/scripts/script0001.lua b/res/scripts/map1.lua
index bf6a0c2..7d6014a 100644
--- a/res/scripts/script0001.lua
+++ b/res/scripts/map1.lua

@@ -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
diff --git a/res/scripts/map1_off_right.lua b/res/scripts/map1_off_right.lua
deleted file mode 100644
index 7dd0113..0000000
--- a/res/scripts/map1_off_right.lua
+++ /dev/null

@@ -1,3 +0,0 @@
-function map1_off_right()
-  ChangeMap("map2", "fromLeft")
-end
diff --git a/res/scripts/map2_off_left.lua b/res/scripts/map2.lua
index d4d9ce4..1f14b31 100644
--- a/res/scripts/map2_off_left.lua
+++ b/res/scripts/map2.lua

@@ -1,3 +1,5 @@
-function map2_off_left()
+map2 = {}
+function map2.off_left()
  ChangeMap("map1", "fromRight")
 end
diff --git a/res/scripts/test_trigger.lua b/res/scripts/test_trigger.lua
deleted file mode 100644
index 4d9d06c..0000000
--- a/res/scripts/test_trigger.lua
+++ /dev/null

@@ -1,7 +0,0 @@
-function test_trigger()
-  StartCutscene()
-  PlaySound("boney_growl.wav")
-  DisplayMessage("* Hi! Welcome to the funky zone.", "", SpeakerType.NONE)
-  WaitForEndOfMessage()
-  HideCutsceneBars()
-end