diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-10-21 00:20:09 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-10-21 00:20:09 +0100 |
| commit | 3d8874d9190f8904e5fc45439aa54fdf325fad48 (patch) | |
| tree | caa1f1f0a2f86094cbaa36b77a69a1547bd4b105 /data/maps/BattleFrontier_ReceptionGate | |
| parent | 7a072d4527387cf21a019142caf67ce516be861d (diff) | |
| parent | 2a3ba78831f2dca1ff0d3fe3f03844a993597b28 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
Diffstat (limited to 'data/maps/BattleFrontier_ReceptionGate')
| -rw-r--r-- | data/maps/BattleFrontier_ReceptionGate/events.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/BattleFrontier_ReceptionGate/events.inc b/data/maps/BattleFrontier_ReceptionGate/events.inc index c29718501..551cb802f 100644 --- a/data/maps/BattleFrontier_ReceptionGate/events.inc +++ b/data/maps/BattleFrontier_ReceptionGate/events.inc @@ -2,7 +2,7 @@ BattleFrontier_ReceptionGate_EventObjects: @ 853D420 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0 object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0 - object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 836 + object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0 BattleFrontier_ReceptionGate_MapWarps: @ 853D498 |