summaryrefslogtreecommitdiff
path: root/maps/CianwoodPokecenter1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CianwoodPokecenter1F.asm')
-rw-r--r--maps/CianwoodPokecenter1F.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm
index ab39de7ca..3bf9a1b3a 100644
--- a/maps/CianwoodPokecenter1F.asm
+++ b/maps/CianwoodPokecenter1F.asm
@@ -137,9 +137,9 @@ CianwoodPokecenter1F_MapEventHeader:
.Warps:
db 3
- warp_def $7, $3, 3, CIANWOOD_CITY
- warp_def $7, $4, 3, CIANWOOD_CITY
- warp_def $7, $0, 1, POKECENTER_2F
+ warp_def 3, 7, 3, CIANWOOD_CITY
+ warp_def 4, 7, 3, CIANWOOD_CITY
+ warp_def 0, 7, 1, POKECENTER_2F
.CoordEvents:
db 0
@@ -149,7 +149,7 @@ CianwoodPokecenter1F_MapEventHeader:
.ObjectEvents:
db 4
- object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1
- object_event SPRITE_LASS, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1
- object_event SPRITE_GYM_GUY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1
- object_event SPRITE_SUPER_NERD, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1
+ object_event 1, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1
+ object_event 5, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1
+ object_event 8, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1