summaryrefslogtreecommitdiff
path: root/maps/SaffronMart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/SaffronMart.asm')
-rw-r--r--maps/SaffronMart.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm
index c1ce96b4f..34f936298 100644
--- a/maps/SaffronMart.asm
+++ b/maps/SaffronMart.asm
@@ -43,8 +43,8 @@ SaffronMart_MapEventHeader:
.Warps:
db 2
- warp_def $7, $2, 3, SAFFRON_CITY
- warp_def $7, $3, 3, SAFFRON_CITY
+ warp_def 2, 7, 3, SAFFRON_CITY
+ warp_def 3, 7, 3, SAFFRON_CITY
.CoordEvents:
db 0
@@ -54,6 +54,6 @@ SaffronMart_MapEventHeader:
.ObjectEvents:
db 3
- object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1
- object_event SPRITE_COOLTRAINER_M, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1
- object_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1
+ object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1
+ object_event 7, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1
+ object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1