summaryrefslogtreecommitdiff
path: root/maps/Route43MahoganyGate.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/Route43MahoganyGate.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/Route43MahoganyGate.asm')
-rw-r--r--maps/Route43MahoganyGate.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm
index e4b6396c1..5cbd1d617 100644
--- a/maps/Route43MahoganyGate.asm
+++ b/maps/Route43MahoganyGate.asm
@@ -44,10 +44,10 @@ Route43MahoganyGate_MapEventHeader:
.Warps:
db 4
- warp_def $0, $4, 1, ROUTE_43
- warp_def $0, $5, 2, ROUTE_43
- warp_def $7, $4, 5, MAHOGANY_TOWN
- warp_def $7, $5, 5, MAHOGANY_TOWN
+ warp_def 4, 0, 1, ROUTE_43
+ warp_def 5, 0, 2, ROUTE_43
+ warp_def 4, 7, 5, MAHOGANY_TOWN
+ warp_def 5, 7, 5, MAHOGANY_TOWN
.CoordEvents:
db 0
@@ -57,4 +57,4 @@ Route43MahoganyGate_MapEventHeader:
.ObjectEvents:
db 1
- object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x19ab0b, -1
+ object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x19ab0b, -1