summaryrefslogtreecommitdiff
path: root/maps/CinnabarPokecenter1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CinnabarPokecenter1F.asm')
-rw-r--r--maps/CinnabarPokecenter1F.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm
index a079b8df0..e74bd85ab 100644
--- a/maps/CinnabarPokecenter1F.asm
+++ b/maps/CinnabarPokecenter1F.asm
@@ -40,9 +40,9 @@ CinnabarPokecenter1F_MapEventHeader:
.Warps:
db 3
- warp_def $7, $3, 1, CINNABAR_ISLAND
- warp_def $7, $4, 1, CINNABAR_ISLAND
- warp_def $7, $0, 1, POKECENTER_2F
+ warp_def 3, 7, 1, CINNABAR_ISLAND
+ warp_def 4, 7, 1, CINNABAR_ISLAND
+ warp_def 0, 7, 1, POKECENTER_2F
.CoordEvents:
db 0
@@ -52,6 +52,6 @@ CinnabarPokecenter1F_MapEventHeader:
.ObjectEvents:
db 3
- object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1
- object_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1
- object_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1
+ object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1
+ object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1