diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-28 22:17:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-28 22:17:13 -0500 |
| commit | b97a1acf3d676ca1c776e37ff4cfa48164ffc92b (patch) | |
| tree | 59b5db70690a9f9041e4964adae1722b4d178a1b /maps/VermilionPort.asm | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
| parent | b9a68fec2589eb6969be63e6ed1eb3fca312c307 (diff) | |
Merge pull request #445 from roukaour/master
Rename Pokémon animation files; consistent (x, y) coords; document design flaws
Diffstat (limited to 'maps/VermilionPort.asm')
| -rw-r--r-- | maps/VermilionPort.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 011f1560e..8d7af46a8 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -305,19 +305,19 @@ VermilionPort_MapEventHeader: .Warps: db 2 - warp_def $5, $9, 5, VERMILION_PORT_PASSAGE - warp_def $11, $7, 1, FAST_SHIP_1F + warp_def 9, 5, 5, VERMILION_PORT_PASSAGE + warp_def 7, 17, 1, FAST_SHIP_1F .CoordEvents: db 1 - coord_event 0, $b, $7, UnknownScript_0x74e20 + coord_event 7, 11, 0, UnknownScript_0x74e20 .BGEvents: db 1 - bg_event 13, 16, BGEVENT_ITEM, VermilionPortHiddenIron + bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron .ObjectEvents: db 3 - object_event SPRITE_SAILOR, 17, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY - object_event SPRITE_SAILOR, 11, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1 - object_event SPRITE_SUPER_NERD, 11, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1 + object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY + object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1 + object_event 11, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1 |