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 | |
| parent | 95d8815721321f08714b97c59a97de3a59f1e0c7 (diff) | |
| parent | 113a8d1efd45ed387a0ede7b7aa8744b622c662f (diff) | |
Merge pull request #365 from garakmon/event-flags
[WIP] Event flags
Diffstat (limited to 'data/maps/RustboroCity')
| -rw-r--r-- | data/maps/RustboroCity/events.inc | 10 | ||||
| -rw-r--r-- | data/maps/RustboroCity/scripts.inc | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc index 2f14304ba..48d125d0f 100644 --- a/data/maps/RustboroCity/events.inc +++ b/data/maps/RustboroCity/events.inc @@ -7,13 +7,13 @@ RustboroCity_EventObjects: @ 85267E0 object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 26, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0893, 0 object_event 7, EVENT_OBJ_GFX_LITTLE_BOY, 0, 24, 51, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0 object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 25, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, 732 - object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 731 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 + object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT object_event 11, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 13, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E087E, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, FLAG_ITEM_RUSTBORO_CITY_X_DEFEND object_event 13, EVENT_OBJ_GFX_MAN_4, 0, 19, 27, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E094E, 0 - object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, 814 - object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 844 + object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, FLAG_HIDE_RUSBORO_CITY_RIVAL + object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_SCIENTIST object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, RustboroCity_EventScript_1E1236, 0 RustboroCity_MapWarps: @ 8526960 diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index f4c8d5434..e79c8ef45 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -98,7 +98,7 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD waitmovement 0 playse SE_KAIDAN removeobject 15 - setflag FLAG_0x34C + setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST setvar VAR_0x405A, 7 clearflag FLAG_SPECIAL_FLAG_0x4000 releaseall @@ -303,16 +303,16 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD fadedefaultbgm removeobject 9 setobjectxyperm 9, 30, 10 - clearflag FLAG_0x2DC + clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 setflag FLAG_0x08E setvar VAR_0x405A, 2 setvar VAR_RUSTURF_TUNNEL_STATE, 2 setvar VAR_0x406F, 1 - clearflag FLAG_0x37B - clearflag FLAG_0x370 - clearflag FLAG_0x36E - setflag FLAG_0x2E3 - setflag FLAG_0x371 + clearflag FLAG_HIDE_ROUTE_116_MR_BRINEY + clearflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO + clearflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT + setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO releaseall end @@ -599,7 +599,7 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B msgbox RustboroCity_Text_1E1A21, 4 closemessage setflag FLAG_0x090 - setflag FLAG_0x2DC + setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 setvar VAR_0x405A, 5 delay 30 warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 |