diff options
Diffstat (limited to 'maps/GoldenrodDeptStore2F.asm')
| -rw-r--r-- | maps/GoldenrodDeptStore2F.asm | 51 |
1 files changed, 22 insertions, 29 deletions
diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index bfe6a398f..f28ffc240 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODDEPTSTORE2F_CLERK1 const GOLDENRODDEPTSTORE2F_CLERK2 const GOLDENRODDEPTSTORE2F_YOUNGSTER @@ -6,11 +6,9 @@ const_value set 2 const GOLDENRODDEPTSTORE2F_GENTLEMAN GoldenrodDeptStore2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x55b5d: faceplayer @@ -101,27 +99,22 @@ GoldenrodDeptStore2FDirectoryText: done GoldenrodDeptStore2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_3F - warp_def 15, 0, 3, GOLDENROD_DEPT_STORE_1F - warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore2FDirectory - bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton - -.ObjectEvents: - db 5 - object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1 - object_event 13, 6, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1 - object_event 9, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1 - object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FCooltrainerFScript, -1 - object_event 2, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FGentlemanScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 12, 0, GOLDENROD_DEPT_STORE_3F, 1 + warp_event 15, 0, GOLDENROD_DEPT_STORE_1F, 3 + warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore2FDirectory + bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton + + db 5 ; object events + object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1 + object_event 13, 6, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1 + object_event 9, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1 + object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FCooltrainerFScript, -1 + object_event 2, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FGentlemanScript, -1 |