summaryrefslogtreecommitdiff
path: root/maps/CeladonDeptStore3F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CeladonDeptStore3F.asm')
-rw-r--r--maps/CeladonDeptStore3F.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm
index 38510ec1a..cf941d4c8 100644
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -100,22 +100,22 @@ CeladonDeptStore3F_MapEventHeader:
.Warps:
db 3
- warp_def $0, $c, 1, CELADON_DEPT_STORE_2F
- warp_def $0, $f, 2, CELADON_DEPT_STORE_4F
- warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
+ warp_def 12, 0, 1, CELADON_DEPT_STORE_2F
+ warp_def 15, 0, 2, CELADON_DEPT_STORE_4F
+ warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
.CoordEvents:
db 0
.BGEvents:
db 2
- bg_event 0, 14, BGEVENT_READ, CeladonDeptStore3FDirectory
- bg_event 0, 3, BGEVENT_READ, CeladonDeptStore3FElevatorButton
+ bg_event 14, 0, BGEVENT_READ, CeladonDeptStore3FDirectory
+ bg_event 3, 0, BGEVENT_READ, CeladonDeptStore3FElevatorButton
.ObjectEvents:
db 5
- object_event SPRITE_CLERK, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1
- object_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1
- object_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1
- object_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1
- object_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1
+ object_event 7, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1
+ object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1
+ object_event 9, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1
+ object_event 10, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1
+ object_event 13, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1