diff options
| author | Fontbane <fontbane@gmail.com> | 2019-04-04 23:26:53 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-04-06 12:48:50 -0500 |
| commit | 4a09a5da330cfb855989ed5390efaef219d73ecc (patch) | |
| tree | 79e0d681267098117292c32853696dbfbeb3ed33 /data/maps/Route120 | |
| parent | 621e5d22639a3228c4522de342afd8010ab71689 (diff) | |
Doc field move scripts completely, use fldeff constants for dofieldeffect
Fix labels
Fix labels again
Delete extra boulder scripts
Now it should build fine
Diffstat (limited to 'data/maps/Route120')
| -rw-r--r-- | data/maps/Route120/map.json | 6 | ||||
| -rw-r--r-- | data/maps/Route120/scripts.inc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index 1bdbd0bca..fccf5c88e 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -295,7 +295,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_11" }, { @@ -438,7 +438,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" }, { @@ -451,7 +451,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 40c9ee09a..b484b064d 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -245,10 +245,10 @@ Route120_EventScript_1F572C:: @ 81F572C waitmovement 0 delay 50 setfieldeffectargument 0, 1 - dofieldeffect 30 + dofieldeffect FLDEFF_NPCFLY_OUT delay 15 removeobject 31 - waitfieldeffect 30 + waitfieldeffect FLDEFF_NPCFLY_OUT setmetatile 13, 15, 663, 0 setmetatile 12, 16, 671, 0 setmetatile 12, 17, 161, 0 |