summaryrefslogtreecommitdiff
path: root/maps/BlackthornMart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/BlackthornMart.asm')
-rw-r--r--maps/BlackthornMart.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm
index ac350c45d..d6bf89c2c 100644
--- a/maps/BlackthornMart.asm
+++ b/maps/BlackthornMart.asm
@@ -52,8 +52,8 @@ BlackthornMart_MapEventHeader:
.Warps:
db 2
- warp_def $7, $2, 4, BLACKTHORN_CITY
- warp_def $7, $3, 4, BLACKTHORN_CITY
+ warp_def 2, 7, 4, BLACKTHORN_CITY
+ warp_def 3, 7, 4, BLACKTHORN_CITY
.CoordEvents:
db 0
@@ -63,6 +63,6 @@ BlackthornMart_MapEventHeader:
.ObjectEvents:
db 3
- object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1
- object_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1
- object_event SPRITE_BLACK_BELT, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1
+ object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1
+ object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1
+ object_event 5, 2, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1