summaryrefslogtreecommitdiff
path: root/maps/CeruleanMart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CeruleanMart.asm')
-rw-r--r--maps/CeruleanMart.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm
index b2674dd46..b9d2226ff 100644
--- a/maps/CeruleanMart.asm
+++ b/maps/CeruleanMart.asm
@@ -51,8 +51,8 @@ CeruleanMart_MapEventHeader:
.Warps:
db 2
- warp_def $7, $2, 6, CERULEAN_CITY
- warp_def $7, $3, 6, CERULEAN_CITY
+ warp_def 2, 7, 6, CERULEAN_CITY
+ warp_def 3, 7, 6, CERULEAN_CITY
.CoordEvents:
db 0
@@ -62,6 +62,6 @@ CeruleanMart_MapEventHeader:
.ObjectEvents:
db 3
- object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1
- object_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1
- object_event SPRITE_COOLTRAINER_F, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1
+ object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1
+ object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1
+ object_event 7, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1