summaryrefslogtreecommitdiff
path: root/maps/CeladonDeptStore4F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CeladonDeptStore4F.asm')
-rw-r--r--maps/CeladonDeptStore4F.asm47
1 files changed, 20 insertions, 27 deletions
diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm
index e3869c990..f619e49d8 100644
--- a/maps/CeladonDeptStore4F.asm
+++ b/maps/CeladonDeptStore4F.asm
@@ -1,14 +1,12 @@
-const_value set 2
+ const_def 2 ; object constants
const CELADONDEPTSTORE4F_CLERK
const CELADONDEPTSTORE4F_SUPER_NERD
const CELADONDEPTSTORE4F_YOUNGSTER
CeladonDeptStore4F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ClerkScript_0x70f0d:
faceplayer
@@ -51,25 +49,20 @@ CeladonDeptStore4FDirectoryText:
done
CeladonDeptStore4F_MapEvents:
- ; filler
- db 0, 0
-
-.Warps:
- db 3
- warp_def 12, 0, 1, CELADON_DEPT_STORE_5F
- warp_def 15, 0, 2, CELADON_DEPT_STORE_3F
- warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
-
-.CoordEvents:
- db 0
-
-.BGEvents:
- db 2
- bg_event 14, 0, BGEVENT_READ, CeladonDeptStore4FDirectory
- bg_event 3, 0, BGEVENT_READ, CeladonDeptStore4FElevatorButton
-
-.ObjectEvents:
- db 3
- object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1
- object_event 7, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1
- object_event 8, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1
+ db 0, 0 ; filler
+
+ db 3 ; warp events
+ warp_event 12, 0, CELADON_DEPT_STORE_5F, 1
+ warp_event 15, 0, CELADON_DEPT_STORE_3F, 2
+ warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
+
+ db 0 ; coord events
+
+ db 2 ; bg events
+ bg_event 14, 0, BGEVENT_READ, CeladonDeptStore4FDirectory
+ bg_event 3, 0, BGEVENT_READ, CeladonDeptStore4FElevatorButton
+
+ db 3 ; object events
+ object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1
+ object_event 7, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1
+ object_event 8, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1