Merge branch 'master' into event_object_movement

1 files changed, 33 insertions, 28 deletions

diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json
index 556aa49da..8fa55df36 100644
--- a/data/maps/TwoIsland/map.json
+++ b/data/maps/TwoIsland/map.json
@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_TWO_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
-  "map_type": "MAP_TYPE_1",
-  "unknown_18": 1,
-  "unknown_19": 6,
-  "elevator_flag": 0,
-  "battle_scene": "BATTLE_SCENE_0",
+  "map_type": "MAP_TYPE_TOWN",
+  "allow_cycling": true,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": [
     {
       "map": "MAP_TWO_ISLAND_CAPE_BRINK",
@@ -20,7 +22,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 28,
       "y": 4,
       "elevation": 3,
@@ -29,11 +31,11 @@
       "movement_range_y": 2,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_EventScript_16760F",
+      "script": "TwoIsland_EventScript_Clerk",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 31,
       "y": 6,
       "elevation": 3,
@@ -42,11 +44,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_EventScript_167755",
+      "script": "TwoIsland_EventScript_Woman",
       "flag": "FLAG_HIDE_TWO_ISLAND_WOMAN"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+      "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 30,
       "y": 11,
       "elevation": 3,
@@ -55,11 +57,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_EventScript_16775E",
+      "script": "TwoIsland_EventScript_Beauty",
       "flag": "FLAG_HIDE_TWO_ISLAND_BEAUTY"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 26,
       "y": 5,
       "elevation": 3,
@@ -68,11 +70,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_EventScript_16774C",
+      "script": "TwoIsland_EventScript_Sailor",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+      "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 27,
       "y": 6,
       "elevation": 3,
@@ -81,11 +83,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_EventScript_167777",
+      "script": "TwoIsland_EventScript_SuperNerd",
       "flag": "FLAG_HIDE_TWO_ISLAND_SUPER_NERD"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 30,
       "y": 16,
       "elevation": 3,
@@ -94,11 +96,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 39,
       "y": 16,
       "elevation": 3,
@@ -111,7 +113,7 @@
       "flag": "FLAG_HIDE_TWO_ISLAND_REVIVE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
       "x": 37,
       "y": 12,
       "elevation": 3,
@@ -120,11 +122,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_EventScript_167789",
+      "script": "TwoIsland_EventScript_LittleBoy",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 24,
       "y": 12,
       "elevation": 3,
@@ -133,7 +135,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_EventScript_167780",
+      "script": "TwoIsland_EventScript_Boy",
       "flag": "0"
     }
   ],
@@ -170,25 +172,28 @@
   "coord_events": [],
   "bg_events": [
     {
-      "type": "bg_event_type_0",
+      "type": "sign",
       "x": 29,
       "y": 8,
       "elevation": 0,
-      "script": "TwoIsland_EventScript_167792"
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "TwoIsland_EventScript_IslandSign"
     },
     {
-      "type": "bg_event_type_0",
+      "type": "sign",
       "x": 40,
       "y": 10,
       "elevation": 0,
-      "script": "TwoIsland_EventScript_16779B"
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "TwoIsland_EventScript_JoyfulGameCornerSign"
     },
     {
-      "type": "bg_event_type_0",
+      "type": "sign",
       "x": 8,
       "y": 3,
       "elevation": 0,
-      "script": "TwoIsland_EventScript_1677A4"
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "TwoIsland_EventScript_FastCurrentSign"
     }
   ]
 }