diff options
| author | garak <garakmon@gmail.com> | 2018-10-19 13:04:47 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-10-19 13:04:47 -0400 |
| commit | 1441ee6bc3731387f7a3cb31f0058d81a38a8db5 (patch) | |
| tree | 9f2b2684474a32eb8b435240311e5df9f11a8631 /data/maps/Route101 | |
| parent | cb5981cdf26f7681f1d67ac3c63e1605b4311c8a (diff) | |
finish event object flags
Diffstat (limited to 'data/maps/Route101')
| -rw-r--r-- | data/maps/Route101/events.inc | 10 | ||||
| -rw-r--r-- | data/maps/Route101/scripts.inc | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc index fd80b11b0..77ee2848f 100644 --- a/data/maps/Route101/events.inc +++ b/data/maps/Route101/events.inc @@ -1,10 +1,10 @@ Route101_EventObjects: @ 8527E98 object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_0x2D0 - object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBE16, FLAG_0x2BC - object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_0x2EE - object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_272141, FLAG_0x381 - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_1EBE04, FLAG_0x3DF + object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE + object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBE16, FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG + object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_ZIGZAGOON + object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_272141, FLAG_HIDE_ROUTE_101_BIRCH + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_1EBE04, FLAG_HIDE_ROUTE_101_BOY Route101_MapCoordEvents: @ 8527F28 coord_event 10, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 295d051c1..7cc7d522f 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -231,9 +231,9 @@ Route101_EventScript_1EBE16:: @ 81EBE16 waitmovement 0 msgbox Route101_Text_1EBF12, 4 special HealPlayerParty - setflag FLAG_0x2D0 + setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - setflag FLAG_0x2BC + setflag FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG setvar VAR_0x4084, 2 setvar VAR_0x4060, 3 clearflag FLAG_SPECIAL_FLAG_0x4000 |