summaryrefslogtreecommitdiff
path: root/data/maps/FieryPath
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/FieryPath')
-rw-r--r--data/maps/FieryPath/map.json16
-rw-r--r--data/maps/FieryPath/scripts.inc4
2 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json
index 61324a8ff..70d1a2cfd 100644
--- a/data/maps/FieryPath/map.json
+++ b/data/maps/FieryPath/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FieryPath_EventScript_29119E",
+ "script": "FieryPath_EventScript_ItemTM06",
"flag": "FLAG_ITEM_FIERY_PATH_TM06"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FieryPath_EventScript_2908BA",
+ "script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_11"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FieryPath_EventScript_2908BA",
+ "script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_12"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FieryPath_EventScript_2908BA",
+ "script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_13"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FieryPath_EventScript_2908BA",
+ "script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_14"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FieryPath_EventScript_2908BA",
+ "script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_15"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FieryPath_EventScript_2908BA",
+ "script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_16"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FieryPath_EventScript_291191",
+ "script": "FieryPath_EventScript_ItemFireStone",
"flag": "FLAG_ITEM_FIERY_PATH_FIRE_STONE"
}
],
diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc
index ddba0dc0b..0aa5769a0 100644
--- a/data/maps/FieryPath/scripts.inc
+++ b/data/maps/FieryPath/scripts.inc
@@ -1,8 +1,8 @@
FieryPath_MapScripts:: @ 8230F24
- map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_MapScript1_230F2A
+ map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_OnTransition
.byte 0
-FieryPath_MapScript1_230F2A: @ 8230F2A
+FieryPath_OnTransition: @ 8230F2A
call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_230F37
setflag FLAG_LANDMARK_FIERY_PATH
end