diff options
| author | huderlem <huderlem@gmail.com> | 2019-10-19 08:05:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-19 08:05:11 -0500 |
| commit | cb9f89925f35e2b0e7f13644a8bda90cd6c387bf (patch) | |
| tree | 22242b9f9d9a22096de6d5a0e7190b7b07a23a68 /data/event_scripts.s | |
| parent | 8b1df92aca6c9d0eb3bcd932be7795eda879c2a0 (diff) | |
| parent | b4a9298205ee9355fadd4455a9b8f692dcd3e787 (diff) | |
Merge pull request #841 from GriffinRichards/document-gyms2
Document Petalburg, Fortree, Mossdeep, and Sootopolis Gyms
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index a8ab73968..62489d1fb 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -15,6 +15,7 @@ #include "constants/field_effects.h" #include "constants/field_poison.h" #include "constants/field_specials.h" +#include "constants/field_tasks.h" #include "constants/flags.h" #include "constants/game_stat.h" #include "constants/item.h" @@ -1250,12 +1251,12 @@ EventScript_RegionMap:: @ 827208F end Common_EventScript_PlayBrineysBoatMusic:: @ 82720A0 - setflag FLAG_SPECIAL_FLAG_0x4001 + setflag FLAG_DONT_TRANSITION_MUSIC playbgm MUS_M_BOAT, 0 return Common_EventScript_StopBrineysBoatMusic:: @ 82720A8 - clearflag FLAG_SPECIAL_FLAG_0x4001 + clearflag FLAG_DONT_TRANSITION_MUSIC fadedefaultbgm return @@ -1277,7 +1278,7 @@ Movement_FerryDepart: @ 82721F0 walk_right step_end -PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8 +EventScript_HideMrBriney:: @ 82721F8 setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN setflag FLAG_HIDE_ROUTE_108_MR_BRINEY |