diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-10-17 20:03:31 -0400 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-10-17 20:03:31 -0400 |
| commit | 2c6d634acdf7bd22fb7e5c4933ff2e13712d2ec3 (patch) | |
| tree | 9d51a6c1c07da6946022fe5867e34300bd71493d /data/maps/SSTidalCorridor | |
| parent | 65a0c48eec7d2184478841d232d1fb3c3350fa37 (diff) | |
| parent | f67bbbdaaa905833f1c2a315624128aafef9a4cb (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'data/maps/SSTidalCorridor')
| -rw-r--r-- | data/maps/SSTidalCorridor/events.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc index 8494f36e5..6ed455cad 100644 --- a/data/maps/SSTidalCorridor/events.inc +++ b/data/maps/SSTidalCorridor/events.inc @@ -1,7 +1,7 @@ SSTidalCorridor_EventObjects: @ 853A158 object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950 + object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950 object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950 object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 810 |