diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
| commit | 5a2d676e71b720e752ca8a624a5795b3b1d7eb6c (patch) | |
| tree | 6ef755064008dfae8ce2942dc2762670cdabe815 /data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json | |
| parent | 5007d279fea5326b41b877703c74fcaa56223364 (diff) | |
| parent | 22931846d680de2bc585093678db3f5721aab891 (diff) | |
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json')
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json index ac9230c53..4f6bd9a7c 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908", + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_Attendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB", + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_HintGiver", "flag": "0" } ], @@ -50,7 +50,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E" + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_LeftRoomWarp" }, { "type": "trigger", @@ -59,7 +59,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59" + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_CenterRoomWarp" }, { "type": "trigger", @@ -68,7 +68,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64" + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_RightRoomWarp" }, { "type": "trigger", @@ -77,7 +77,7 @@ "elevation": 0, "var": "VAR_TEMP_3", "var_value": "1", - "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack" }, { "type": "trigger", @@ -86,7 +86,7 @@ "elevation": 0, "var": "VAR_TEMP_3", "var_value": "1", - "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack" }, { "type": "trigger", @@ -95,7 +95,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_SetEnteredRoom" }, { "type": "trigger", @@ -104,7 +104,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_SetEnteredRoom" }, { "type": "trigger", @@ -113,7 +113,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_SetEnteredRoom" }, { "type": "trigger", @@ -122,7 +122,7 @@ "elevation": 0, "var": "VAR_TEMP_3", "var_value": "1", - "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack" } ], "bg_events": [] |
