Merge remote-tracking branch 'origin/master' into waric

Conflicts:
	world/map/db/mob_db.txt

3 files changed, 8 insertions, 4 deletions

diff --git a/world/map/npc/012-1/_mobs.txt b/world/map/npc/012-1/_mobs.txt
index 1dc257ba..45eb58b9 100644
--- a/world/map/npc/012-1/_mobs.txt
+++ b/world/map/npc/012-1/_mobs.txt
@@ -14,7 +14,8 @@
 012-1.gat,0,0,0,0|monster|Butterfly|1055,20,30,20,Mob012-1::On1055
 
 
-012-1.gat,0,0,0|script|Mob012-1|-1,{
+012-1.gat,0,0,0|script|Mob012-1|-1,
+{
 On1014:
     set @mobID, 1014;
     callfunc "MobPoints";
diff --git a/world/map/npc/012-1/amrak.txt b/world/map/npc/012-1/amrak.txt
index 2a527eb0..74e6cd88 100644
--- a/world/map/npc/012-1/amrak.txt
+++ b/world/map/npc/012-1/amrak.txt
@@ -1,6 +1,7 @@
 //
 
-012-1.gat,137,104,0|script|Amrak|103,{
+012-1.gat,137,104,0|script|Amrak|103,
+{
     mes "[Amrak]";
     mes "\"I'm studying this waterfall. The water seems to flow from it like magic.\"";
     next;
diff --git a/world/map/npc/012-1/injured-mouboo.txt b/world/map/npc/012-1/injured-mouboo.txt
index 57117d17..91042c13 100644
--- a/world/map/npc/012-1/injured-mouboo.txt
+++ b/world/map/npc/012-1/injured-mouboo.txt
@@ -1,6 +1,7 @@
 // The following auxiliary function is used both by appropriate magic and within the regular script:
 
-function|script|QuestMoubooHeal|{
+function|script|QuestMoubooHeal|,
+{
     set @Q_MASK, NIBBLE_2_MASK;
     set @Q_SHIFT, NIBBLE_2_SHIFT;
 
@@ -42,7 +43,8 @@ S_update_var:
     return;
 }
 
-012-1.gat,57,153,0|script|Mouboo|171,{
+012-1.gat,57,153,0|script|Mouboo|171,
+{
     set @Q_MASK, NIBBLE_2_MASK;
     set @Q_SHIFT, NIBBLE_2_SHIFT;