diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-10-19 14:24:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-19 14:24:34 -0500 |
| commit | bf8fa23462990b36ff40ac4a863380a9d979bfdd (patch) | |
| tree | 51f3a9e269bf974880dbae6ba5cbb1fd7949db0b /data/maps/RustboroCity_DevonCorp_3F | |
| parent | 95d8815721321f08714b97c59a97de3a59f1e0c7 (diff) | |
| parent | 113a8d1efd45ed387a0ede7b7aa8744b622c662f (diff) | |
Merge pull request #365 from garakmon/event-flags
[WIP] Event flags
Diffstat (limited to 'data/maps/RustboroCity_DevonCorp_3F')
| -rw-r--r-- | data/maps/RustboroCity_DevonCorp_3F/events.inc | 2 | ||||
| -rw-r--r-- | data/maps/RustboroCity_DevonCorp_3F/scripts.inc | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc index 164391cf6..df8ba0293 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc @@ -1,6 +1,6 @@ RustboroCity_DevonCorp_3F_EventObjects: @ 85304BC object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949 + object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 RustboroCity_DevonCorp_3F_MapWarps: @ 8530504 diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index ffc2614cb..e3ecb3db0 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -55,18 +55,18 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E waitfanfare setflag FLAG_SYS_POKENAV_GET setflag FLAG_0x0BC - setflag FLAG_0x3E7 + setflag FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT msgbox RustboroCity_DevonCorp_3F_Text_212837, 4 closemessage call RustboroCity_DevonCorp_3F_EventScript_272083 msgbox RustboroCity_DevonCorp_3F_Text_2129D2, 4 - setflag FLAG_0x37E - clearflag FLAG_0x327 - clearflag FLAG_0x3D7 - clearflag FLAG_0x2E3 - clearflag FLAG_0x371 + setflag FLAG_HIDE_ROUTE_116_TUNNELER + clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN + clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN + clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO setvar VAR_0x4096, 1 - clearflag FLAG_0x32E + clearflag FLAG_HIDE_RUSBORO_CITY_RIVAL setvar VAR_0x408F, 1 setvar VAR_0x405A, 6 releaseall |