diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-28 17:54:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 17:54:25 -0400 |
| commit | 7ada56f0395ca6d4d6810c6f3762f8e03dc60cb7 (patch) | |
| tree | acdd4137cef25d027789bc67ab972d49aeb81b50 /data/maps | |
| parent | c6b27013cc42161636ae345c913a2bd26c5854fd (diff) | |
| parent | e06de33cbdab8ca853bcdd1b4c8909a61aabfcef (diff) | |
Merge pull request #1085 from GriffinRichards/doc-overworld
Document field effects / misc overworld
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/BirthIsland_Exterior/scripts.inc | 4 | ||||
| -rw-r--r-- | data/maps/TrainerHill_Entrance/scripts.inc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 6bc902426..5c06e6f3a 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -71,9 +71,9 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 8267FC1 setfieldeffectargument 0, LOCALID_DEOXYS_ROCK setfieldeffectargument 1, 58 setfieldeffectargument 2, 26 - dofieldeffect FLDEFF_65 + dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK playbgm MUS_RG_DEOEYE, 0 - waitfieldeffect FLDEFF_65 + waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK addobject LOCALID_DEOXYS applymovement LOCALID_DEOXYS, BirthIsland_Exterior_Movement_DeoxysApproach waitmovement 0 diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 9cf3be806..077709053 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -23,8 +23,8 @@ TrainerHill_Entrance_OnWarp: @ 82680CF TrainerHill_Entrance_OnResume: @ 82680D0 trainerhill_resumetimer setvar VAR_TEMP_0, 0 - trainerhill_clearresult - compare VAR_RESULT, 0 @ VAR_RESULT always 0 here + trainerhill_getusingereader + compare VAR_RESULT, FALSE @ VAR_RESULT always FALSE here goto_if_eq TrainerHill_Entrance_EventScript_TryFaceAttendant setobjectxy OBJ_EVENT_ID_PLAYER, 9, 6 applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant |