diff --git a/tools/MapEdit/MapEdit.exe b/tools/MapEdit/MapEdit.exe
index ae2bfcd2a..5c0000197 100644
Binary files a/tools/MapEdit/MapEdit.exe and b/tools/MapEdit/MapEdit.exe differ
diff --git a/tools/MapEdit/MapEdit.ini b/tools/MapEdit/MapEdit.ini
index 2c1f10a0e..dfe701d9d 100644
--- a/tools/MapEdit/MapEdit.ini
+++ b/tools/MapEdit/MapEdit.ini
@@ -10,3 +10,5 @@ Iconz=Iconz.bmp
 ActorScript=Actor.ini
 ItemScript=Item.ini
 PlatformScript=Platform.ini
+TriggerScript=Trigger.ini
+FXScript=FX.ini
diff --git a/tools/MapEdit/actor.ini b/tools/MapEdit/actor.ini
index f377814bb..f164d8c1d 100644
--- a/tools/MapEdit/actor.ini
+++ b/tools/MapEdit/actor.ini
@@ -3,7 +3,7 @@
 ################################################
 # [Name]
 # Gfx=Sprite filename
-# WayPoints=0/1
+# WayPoints=maximum waypoints
 # Speed=0-10
 # TurnRate=0-4095
 # Collision=0/1
@@ -99,7 +99,7 @@ Player=1
 
 [SmallJellyfish-Level1]
 Gfx=..\..\graphics\characters\Jellyfish1\render\psx\JellyFish1_Swim1.bmp
-WayPoints=1
+WayPoints=16
 Speed=3
 TurnRate=128
 Collision=1
@@ -108,7 +108,7 @@ AttackStrength=20
 
 #[SmallJellyfish-Level2]
 #Gfx=..\..\graphics\characters\Jellyfish2\render\psx\Jellyfish2.bmp
-#WayPoints=1
+#WayPoints=16
 #Speed=3
 #TurnRate=128
 #Collision=1
@@ -119,7 +119,7 @@ AttackStrength=20
 
 #[Motherjellyfish]
 #Gfx=..\..\graphics\characters\
-#WayPoints=1
+#WayPoints=16
 #Speed=3
 #TurnRate=256
 #Collision=0
@@ -128,7 +128,7 @@ AttackStrength=20
 
 [Anenome-Level1]
 Gfx=..\..\graphics\characters\AnenomeLvl1\render\psx\AnenomeLvl1_Fire0001.bmp
-WayPoints=1
+WayPoints=16
 Speed=0
 TurnRate=128
 Collision=0
@@ -137,7 +137,7 @@ AttackStrength=20
 
 [SpikeyAnenome]
 Gfx=..\..\graphics\characters\SpikeyAnenome\render\psx\spikeyanenome_body0001.bmp
-WayPoints=1
+WayPoints=16
 Speed=5
 TurnRate=0
 Collision=0
@@ -146,7 +146,7 @@ AttackStrength=20
 
 [Anenome-Level3]
 Gfx=..\..\graphics\characters\AnenomeLvl3\Render\PSX\AnenomeLvl3_Fire0001.bmp
-WayPoints=1
+WayPoints=16
 Speed=0
 TurnRate=128
 Collision=0
@@ -155,7 +155,7 @@ AttackStrength=20
 
 [BabyOctopus]
 Gfx=..\..\graphics\characters\babyoctopus\render\psx\Babyoctopus_Idle0001.bmp
-WayPoints=1
+WayPoints=16
 Speed=2
 TurnRate=512
 Collision=0
@@ -164,7 +164,7 @@ AttackStrength=20
 
 [Ballblob]
 Gfx=..\..\graphics\characters\ballblob\render\psx\BallBlob_Bounce0001.bmp
-WayPoints=1
+WayPoints=16
 Speed=3
 TurnRate=0
 Collision=1
@@ -173,7 +173,7 @@ AttackStrength=20
 
 #[Boogermonster]
 #Gfx=..\..\graphics\characters\
-#WayPoints=1
+#WayPoints=16
 #Speed=0
 #TurnRate=128
 #Collision=1
@@ -182,7 +182,7 @@ AttackStrength=20
 
 [Caterpillar]
 Gfx=..\..\graphics\characters\caterpillar\render\psx\caterpillar_crawl0000.bmp
-WayPoints=1
+WayPoints=16
 Speed=1
 TurnRate=0
 Collision=0
@@ -191,7 +191,7 @@ AttackStrength=20
 
 #[Clam-Level1]
 #Gfx=..\..\graphics\characters\
-#WayPoints=1
+#WayPoints=16
 #Speed=0
 #TurnRate=0
 #Collision=1
@@ -200,7 +200,7 @@ AttackStrength=20
 
 #[Clam-Level2]
 #Gfx=..\..\graphics\characters\
-#WayPoints=1
+#WayPoints=16
 #Speed=0
 #TurnRate=0
 #Collision=1
@@ -209,7 +209,7 @@ AttackStrength=20
 
 [Eyeball]
 Gfx=..\..\graphics\characters\eyeball\render\psx\EyeBall_Roll0000.bmp
-WayPoints=1
+WayPoints=16
 Speed=0
 TurnRate=128
 Collision=0
@@ -218,7 +218,7 @@ AttackStrength=20
 
 [Flamingskull]
 Gfx=..\..\graphics\characters\flamingskull\render\psx\FlamingSkull_Move0001.bmp
-WayPoints=1
+WayPoints=16
 Speed=3
 TurnRate=128
 Collision=0
@@ -227,7 +227,7 @@ AttackStrength=20
 
 [FlyingDutchman]
 Gfx=..\..\graphics\characters\flyingdutchman\render\psx\flyingdutchman_idlebreathe0000.bmp
-WayPoints=1
+WayPoints=16
 Speed=3
 TurnRate=2048
 Collision=0
@@ -236,7 +236,7 @@ AttackStrength=0
 
 [Ghost]
 Gfx=..\..\graphics\characters\ghost\render\psx\Ghost_Idle0001.bmp
-WayPoints=1
+WayPoints=16
 Speed=2
 TurnRate=128
 Collision=0
@@ -245,7 +245,7 @@ AttackStrength=20
 
 #[GiantWorm]
 #Gfx=..\..\graphics\characters\
-#WayPoints=1
+#WayPoints=16
 #Speed=3
 #TurnRate=128
 #Collision=0
@@ -254,7 +254,7 @@ AttackStrength=20
 
 [HermitCrab]
 Gfx=..\..\graphics\characters\hermitcrab\render\psx\hermitcrab_idle0001.bmp
-WayPoints=1
+WayPoints=16
 Speed=2
 TurnRate=0
 Collision=0
@@ -264,7 +264,7 @@ AttackStrength=20
 
 [IronDogFish]
 Gfx=..\..\graphics\characters\irondogfish\render\psx\irondogfish_idle0000.bmp
-WayPoints=1
+WayPoints=16
 Speed=3
 TurnRate=2048
 Collision=0
@@ -273,7 +273,7 @@ AttackStrength=0
 
 [PuffaFish]
 Gfx=..\..\graphics\characters\puffafish\render\psx\PuffaFish_PuffUpIdle0001.bmp
-WayPoints=1
+WayPoints=16
 Speed=2
 TurnRate=128
 Collision=0
@@ -282,7 +282,7 @@ AttackStrength=20
 
 #[SeaSnake]
 #Gfx=..\..\graphics\characters\
-#WayPoints=1
+#WayPoints=16
 #Speed=3
 #TurnRate=256
 #Collision=0
@@ -291,7 +291,7 @@ AttackStrength=20
 
 [Sharkman]
 Gfx=..\..\graphics\characters\sharkman\render\psx\SharkMan_Idle1_0001.bmp
-WayPoints=1
+WayPoints=16
 Speed=3
 TurnRate=0
 Collision=0
@@ -300,7 +300,7 @@ AttackStrength=20
 
 #[SharkSub]
 #Gfx=..\..\graphics\characters\
-#WayPoints=1
+#WayPoints=16
 #Speed=3
 #TurnRate=2048
 #Collision=0
@@ -309,7 +309,7 @@ AttackStrength=20
 
 [Skeletalfish]
 Gfx=..\..\graphics\characters\Skeletalfish\render\psx\skeletalfish_idle0000.bmp
-WayPoints=1
+WayPoints=16
 Speed=3
 TurnRate=2048
 Collision=0
@@ -318,7 +318,7 @@ AttackStrength=20
 
 [SpiderCrab]
 Gfx=..\..\graphics\characters\spidercrab\render\psx\SpiderCrab_Idle0001.bmp
-WayPoints=1
+WayPoints=16
 Speed=3
 TurnRate=0
 Collision=1
@@ -328,7 +328,7 @@ AttackStrength=20
 
 [Squiddart]
 Gfx=..\..\graphics\characters\squiddart\render\psx\SquidDart_Swim0001.bmp
-WayPoints=1
+WayPoints=16
 Speed=5
 TurnRate=256
 Collision=0
@@ -337,7 +337,7 @@ AttackStrength=20
 
 [Stomper]
 Gfx=..\..\graphics\characters\stomper\render\psx\Stomper_Crush0001.bmp
-WayPoints=1
+WayPoints=16
 Speed=5
 TurnRate=0
 Collision=0
@@ -346,7 +346,7 @@ AttackStrength=20
 
 [DustDevil]
 Gfx=..\..\graphics\characters\DustDevil\render\psx\dustdevil_twist0001.bmp
-WayPoints=1
+WayPoints=16
 Speed=5
 TurnRate=0
 Collision=0
diff --git a/tools/MapEdit/fx.ini b/tools/MapEdit/fx.ini
index 4ed5f8867..a850c1fc5 100644
--- a/tools/MapEdit/fx.ini
+++ b/tools/MapEdit/fx.ini
@@ -1,15 +1,12 @@
-# Platform Script
+# FX Script
 #
 ################################################
 # [Name]
-# Gfx=Sprite filename
 ################################################
 
-# Gfx
 [Ch1L1_Plat1]
-Gfx=..\..\Graphics\levels\Chapter01\Level01\Tiles\anemone_3d.gin
 
 [Ch1L1_Plat2]
-Gfx=..\..\Graphics\levels\Chapter01\Level01\Tiles\anemone_3d.gin
+
 
 
diff --git a/tools/MapEdit/platform.ini b/tools/MapEdit/platform.ini
index 4908b8619..4ed5f8867 100644
--- a/tools/MapEdit/platform.ini
+++ b/tools/MapEdit/platform.ini
@@ -1,346 +1,15 @@
-# Character Script
+# Platform Script
 #
 ################################################
 # [Name]
 # Gfx=Sprite filename
-# WayPoints=0/1
-# Speed=0-10
-# TurnRate=0-4095
-# Collision=0/1
-# Health=0-255
-# Player=0/1        # Player Flag
 ################################################
 
-################################################
-# Player
-################################################
-[SpongeBob]
-Gfx=..\..\graphics\spongebob.bmp
-Player=1
+# Gfx
+[Ch1L1_Plat1]
+Gfx=..\..\Graphics\levels\Chapter01\Level01\Tiles\anemone_3d.gin
 
-################################################
-# Friends
-################################################
-[BarnacleBoy]
-Gfx=..\..\graphics\barnicleboy.bmp
-WayPoints=0
-Speed=0
-TurnRate=0
-Collision=0
-Health=0
-AttackStrength=0
+[Ch1L1_Plat2]
+Gfx=..\..\Graphics\levels\Chapter01\Level01\Tiles\anemone_3d.gin
 
-[Gary]
-Gfx=..\..\graphics\gary.bmp
-WayPoints=0
-Speed=3
-TurnRate=0
-Collision=0
-Health=0
-AttackStrength=0
-
-[Krusty]
-Gfx=..\..\graphics\Krusty.bmp
-WayPoints=0
-Speed=0
-TurnRate=0
-Collision=0
-Health=0
-AttackStrength=0
-
-[MermaidMan]
-Gfx=..\..\graphics\MermaidMan.bmp
-WayPoints=0
-Speed=0
-TurnRate=0
-Collision=0
-Health=0
-AttackStrength=0
-
-[Patrick]
-Gfx=..\..\graphics\Patrick.bmp
-WayPoints=0
-Speed=0
-TurnRate=0
-Collision=0
-Health=0
-AttackStrength=0
-
-[Sandy]
-Gfx=..\..\graphics\Sandy.bmp
-WayPoints=0
-Speed=0
-TurnRate=0
-Collision=0
-Health=0
-AttackStrength=0
-
-[Squidward]
-Gfx=..\..\graphics\Squidward.bmp
-WayPoints=0
-Speed=0
-TurnRate=0
-Collision=0
-Health=0
-AttackStrength=0
-
-[Plankton]
-Gfx=..\..\graphics\plankton.bmp
-WayPoints=0
-Speed=0
-TurnRate=0
-Collision=0
-Health=0
-AttackStrength=0
-
-################################################
-# Enemies
-################################################
-
-[SmallJellyfish-Level1]
-Gfx=..\..\graphics\JellyFish1.bmp
-WayPoints=1
-Speed=3
-TurnRate=128
-Collision=1
-Health=16
-AttackStrength=20
-
-[SmallJellyfish-Level2]
-Gfx=..\..\graphics\JellyFish2.bmp
-WayPoints=1
-Speed=3
-TurnRate=128
-Collision=1
-Health=16
-AttackStrength=40
-
-# [Largejellyfish] - This is a platform
-
-[Motherjellyfish]
-Gfx=..\..\graphics\MotherJellyFish.bmp
-WayPoints=1
-Speed=3
-TurnRate=256
-Collision=0
-Health=256
-AttackStrength=1234
-
-[Anenome-Level1]
-Gfx=..\..\graphics\Anenome1.bmp
-WayPoints=1
-Speed=0
-TurnRate=128
-Collision=0
-Health=16
-AttackStrength=20
-
-[Anenome-Level2]
-Gfx=..\..\graphics\Anenome2.bmp
-WayPoints=1
-Speed=0
-TurnRate=128
-Collision=0
-Health=32
-AttackStrength=20
-
-[Anenome-Level3]
-Gfx=..\..\graphics\Anenome3.bmp
-WayPoints=1
-Speed=0
-TurnRate=128
-Collision=0
-Health=48
-AttackStrength=20
-
-[BabyOctopus]
-Gfx=..\..\graphics\Babyoctopus.bmp
-WayPoints=1
-Speed=2
-TurnRate=512
-Collision=0
-Health=1
-AttackStrength=20
-
-[Ballblob]
-Gfx=..\..\graphics\BallBlob.bmp
-WayPoints=1
-Speed=3
-TurnRate=0
-Collision=1
-Health=0
-AttackStrength=20
-
-[Boogermonster]
-Gfx=..\..\graphics\Boogermonster.bmp
-WayPoints=1
-Speed=0
-TurnRate=128
-Collision=1
-Health=0
-AttackStrength=20
-
-[Caterpillar]
-Gfx=..\..\graphics\Caterpillar.bmp
-WayPoints=1
-Speed=1
-TurnRate=0
-Collision=0
-Health=48
-AttackStrength=20
-
-[Clam-Level1]
-Gfx=..\..\graphics\clam1.bmp
-WayPoints=1
-Speed=0
-TurnRate=0
-Collision=1
-Health=0
-AttackStrength=20
-
-[Clam-Level2]
-Gfx=..\..\graphics\clam2.bmp
-WayPoints=1
-Speed=0
-TurnRate=0
-Collision=1
-Health=0
-AttackStrength=20
-
-[Eyeball]
-Gfx=..\..\graphics\Eyeball.bmp
-WayPoints=1
-Speed=0
-TurnRate=128
-Collision=0
-Health=32
-AttackStrength=20
-
-[Flamingskull]
-Gfx=..\..\graphics\Flamingskull.bmp
-WayPoints=1
-Speed=3
-TurnRate=128
-Collision=0
-Health=16
-AttackStrength=20
-
-[FlyingDutchman]
-Gfx=..\..\graphics\FlyingDutchman.bmp
-WayPoints=1
-Speed=3
-TurnRate=2048
-Collision=0
-Health=256
-AttackStrength=0
-
-[Ghost]
-Gfx=..\..\graphics\Ghost.bmp
-WayPoints=1
-Speed=2
-TurnRate=128
-Collision=0
-Health=0
-AttackStrength=20
-
-[GiantWorm]
-Gfx=..\..\graphics\GiantWorm.bmp
-WayPoints=1
-Speed=3
-TurnRate=128
-Collision=0
-Health=256
-AttackStrength=0
-
-[HermitCrab]
-Gfx=..\..\graphics\HermitCrab.bmp
-WayPoints=1
-Speed=2
-TurnRate=0
-Collision=0
-Health=0
-AttackStrength=20
-# 20 for snap, 40 for roll...ARGH
-
-[IronDogFish]
-Gfx=..\..\graphics\IronDogFish.bmp
-WayPoints=1
-Speed=3
-TurnRate=2048
-Collision=0
-Health=256
-AttackStrength=0
-
-[PuffaFish]
-Gfx=..\..\graphics\PuffaFish.bmp
-WayPoints=1
-Speed=2
-TurnRate=128
-Collision=0
-Health=64
-AttackStrength=20
-
-[SeaSnake]
-Gfx=..\..\graphics\SeaSnake.bmp
-WayPoints=1
-Speed=3
-TurnRate=256
-Collision=0
-Health=56
-AttackStrength=20
-
-[Sharkman]
-Gfx=..\..\graphics\Sharkman.bmp
-WayPoints=1
-Speed=3
-TurnRate=0
-Collision=0
-Health=16
-AttackStrength=20
-
-[SharkSub]
-Gfx=..\..\graphics\SharkSub.bmp
-WayPoints=1
-Speed=3
-TurnRate=2048
-Collision=0
-Health=256
-AttackStrength=0
-
-[Skeletalfish]
-Gfx=..\..\graphics\Skeletalfish.bmp
-WayPoints=1
-Speed=3
-TurnRate=2048
-Collision=0
-Health=0
-AttackStrength=20
-
-[SpiderCrab]
-Gfx=..\..\graphics\SpiderCrab.bmp
-WayPoints=1
-Speed=3
-TurnRate=0
-Collision=1
-Health=2
-# 1st shot stuns, if shot again is killed
-AttackStrength=20
-
-[Squiddart]
-Gfx=..\..\graphics\Squiddart.bmp
-WayPoints=1
-Speed=5
-TurnRate=256
-Collision=0
-Health=16
-AttackStrength=20
-
-[Stomper]
-Gfx=..\..\graphics\Stomper.bmp
-WayPoints=1
-Speed=5
-TurnRate=0
-Collision=0
-Health=0
-AttackStrength=20