summaryrefslogtreecommitdiff
path: root/maps/IlexForestAzaleaGate.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/IlexForestAzaleaGate.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/IlexForestAzaleaGate.asm')
-rw-r--r--maps/IlexForestAzaleaGate.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm
index 76a2925de..0bb508be3 100644
--- a/maps/IlexForestAzaleaGate.asm
+++ b/maps/IlexForestAzaleaGate.asm
@@ -36,10 +36,10 @@ IlexForestAzaleaGate_MapEventHeader:
.Warps:
db 4
- warp_def $4, $0, 2, ILEX_FOREST
- warp_def $5, $0, 3, ILEX_FOREST
- warp_def $4, $9, 7, AZALEA_TOWN
- warp_def $5, $9, 8, AZALEA_TOWN
+ warp_def 0, 4, 2, ILEX_FOREST
+ warp_def 0, 5, 3, ILEX_FOREST
+ warp_def 9, 4, 7, AZALEA_TOWN
+ warp_def 9, 5, 8, AZALEA_TOWN
.CoordEvents:
db 0
@@ -49,5 +49,5 @@ IlexForestAzaleaGate_MapEventHeader:
.ObjectEvents:
db 2
- object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1
- object_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1
+ object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1
+ object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1