summaryrefslogtreecommitdiff
path: root/maps/VermilionPortPassage.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-12-28 22:17:13 -0500
committerGitHub <noreply@github.com>2017-12-28 22:17:13 -0500
commitb97a1acf3d676ca1c776e37ff4cfa48164ffc92b (patch)
tree59b5db70690a9f9041e4964adae1722b4d178a1b /maps/VermilionPortPassage.asm
parent82a05a1752b476caab8951fe03f539dcc1a63669 (diff)
parentb9a68fec2589eb6969be63e6ed1eb3fca312c307 (diff)
Merge pull request #445 from roukaour/master
Rename Pokémon animation files; consistent (x, y) coords; document design flaws
Diffstat (limited to 'maps/VermilionPortPassage.asm')
-rw-r--r--maps/VermilionPortPassage.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm
index 1b6aa8ac1..e728d387a 100644
--- a/maps/VermilionPortPassage.asm
+++ b/maps/VermilionPortPassage.asm
@@ -24,11 +24,11 @@ VermilionPortPassage_MapEventHeader:
.Warps:
db 5
- warp_def $0, $f, 8, VERMILION_CITY
- warp_def $0, $10, 9, VERMILION_CITY
- warp_def $4, $f, 4, VERMILION_PORT_PASSAGE
- warp_def $2, $3, 3, VERMILION_PORT_PASSAGE
- warp_def $e, $3, 1, VERMILION_PORT
+ warp_def 15, 0, 8, VERMILION_CITY
+ warp_def 16, 0, 9, VERMILION_CITY
+ warp_def 15, 4, 4, VERMILION_PORT_PASSAGE
+ warp_def 3, 2, 3, VERMILION_PORT_PASSAGE
+ warp_def 3, 14, 1, VERMILION_PORT
.CoordEvents:
db 0
@@ -38,4 +38,4 @@ VermilionPortPassage_MapEventHeader:
.ObjectEvents:
db 1
- object_event SPRITE_TEACHER, 1, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1
+ object_event 17, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1