summaryrefslogtreecommitdiff
path: root/maps/OlivineMart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/OlivineMart.asm')
-rw-r--r--maps/OlivineMart.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm
index db193c7e4..b486e0867 100644
--- a/maps/OlivineMart.asm
+++ b/maps/OlivineMart.asm
@@ -51,8 +51,8 @@ OlivineMart_MapEventHeader:
.Warps:
db 2
- warp_def $7, $2, 8, OLIVINE_CITY
- warp_def $7, $3, 8, OLIVINE_CITY
+ warp_def 2, 7, 8, OLIVINE_CITY
+ warp_def 3, 7, 8, OLIVINE_CITY
.CoordEvents:
db 0
@@ -62,6 +62,6 @@ OlivineMart_MapEventHeader:
.ObjectEvents:
db 3
- object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1
- object_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1
- object_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1
+ object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1
+ object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1
+ object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1