summaryrefslogtreecommitdiff
path: root/maps/GoldenrodDeptStore4F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/GoldenrodDeptStore4F.asm')
-rw-r--r--maps/GoldenrodDeptStore4F.asm51
1 files changed, 22 insertions, 29 deletions
diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm
index 03882b8f2..2b77d5ae1 100644
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -1,15 +1,13 @@
-const_value set 2
+ const_def 2 ; object constants
const GOLDENRODDEPTSTORE4F_CLERK
const GOLDENRODDEPTSTORE4F_COOLTRAINER_M
const GOLDENRODDEPTSTORE4F_BUG_CATCHER
const GOLDENRODDEPTSTORE4F_GAMEBOY_KID
GoldenrodDeptStore4F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ClerkScript_0x55ee9:
faceplayer
@@ -30,7 +28,7 @@ GameboyKidScript_0x55ef7:
writetext UnknownText_0x55f74
waitbutton
closetext
- spriteface GOLDENRODDEPTSTORE4F_GAMEBOY_KID, DOWN
+ turnobject GOLDENRODDEPTSTORE4F_GAMEBOY_KID, DOWN
end
GoldenrodDeptStore4FDirectory:
@@ -78,26 +76,21 @@ GoldenrodDeptStore4FDirectoryText:
done
GoldenrodDeptStore4F_MapEvents:
- ; filler
- db 0, 0
-
-.Warps:
- db 3
- warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_5F
- warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_3F
- warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
-
-.CoordEvents:
- db 0
-
-.BGEvents:
- db 2
- bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore4FDirectory
- bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton
-
-.ObjectEvents:
- db 4
- object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1
- object_event 11, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1
- object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1
- object_event 5, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x55ef7, -1
+ db 0, 0 ; filler
+
+ db 3 ; warp events
+ warp_event 12, 0, GOLDENROD_DEPT_STORE_5F, 1
+ warp_event 15, 0, GOLDENROD_DEPT_STORE_3F, 2
+ warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
+
+ db 0 ; coord events
+
+ db 2 ; bg events
+ bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore4FDirectory
+ bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton
+
+ db 4 ; object events
+ object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1
+ object_event 11, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1
+ object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1
+ object_event 5, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x55ef7, -1