Merge branch 'master' of https://scm.sourceforge.jp/gitroot/h58pcdgame/GameScriptCore...

Conflicts:
	www/stage/onieasy.js

diff --cc www/stage/onieasy.js
index 7863d59,a947da1..9cb0e32
--- 1/www/stage/onieasy.js
--- 2/www/stage/onieasy.js
+++ b/www/stage/onieasy.js
@@@ -179,13 -179,9 +179,15 @@@ var barn = new BlockClass(stage, ["barn
        barn.collisionMargin.right = 30;
        stage.addStageObject(barn);
        
 -      var warpRight = new WarpItemClass(stage, [false, undefined, undefined, 32, 480, false]);
 -      warpRight.origin.x = 6368;
 -      warpRight.origin.y = 0;
 +      var warpLeft = new WarpItemClass(stage, ["mitukaru", 60, 0, 32, 480, false]);
 +      warpLeft.origin.x = -32;
 +      warpLeft.origin.y = 0;
++
 +      var warpRight = new WarpItemClass(stage, [false, 0, 0, 32, 480, false]);
 +      warpRight.origin.x = 6336;
 +      warpRight.origin.y = 196;
++
 +      stage.addStageObject(warpLeft);
        stage.addStageObject(warpRight);