summaryrefslogtreecommitdiff
path: root/maps/OlivineCafe.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/OlivineCafe.asm')
-rw-r--r--maps/OlivineCafe.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm
index fef87b535..1aea5f518 100644
--- a/maps/OlivineCafe.asm
+++ b/maps/OlivineCafe.asm
@@ -84,8 +84,8 @@ OlivineCafe_MapEventHeader:
.Warps:
db 2
- warp_def $7, $2, 7, OLIVINE_CITY
- warp_def $7, $3, 7, OLIVINE_CITY
+ warp_def 2, 7, 7, OLIVINE_CITY
+ warp_def 3, 7, 7, OLIVINE_CITY
.CoordEvents:
db 0
@@ -95,6 +95,6 @@ OlivineCafe_MapEventHeader:
.ObjectEvents:
db 3
- object_event SPRITE_SAILOR, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1
- object_event SPRITE_FISHING_GURU, 3, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1
- object_event SPRITE_SAILOR, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1
+ object_event 4, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1
+ object_event 7, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1
+ object_event 6, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1