summaryrefslogtreecommitdiff
path: root/maps/GoldenrodDeptStore1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/GoldenrodDeptStore1F.asm')
-rw-r--r--maps/GoldenrodDeptStore1F.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm
index 9fd609dee..27bf60e58 100644
--- a/maps/GoldenrodDeptStore1F.asm
+++ b/maps/GoldenrodDeptStore1F.asm
@@ -84,22 +84,22 @@ GoldenrodDeptStore1F_MapEventHeader:
.Warps:
db 4
- warp_def $7, $7, 9, GOLDENROD_CITY
- warp_def $7, $8, 9, GOLDENROD_CITY
- warp_def $0, $f, 2, GOLDENROD_DEPT_STORE_2F
- warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR
+ warp_def 7, 7, 9, GOLDENROD_CITY
+ warp_def 8, 7, 9, GOLDENROD_CITY
+ warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_2F
+ warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
.CoordEvents:
db 0
.BGEvents:
db 2
- bg_event 0, 14, BGEVENT_READ, GoldenrodDeptStore1FDirectory
- bg_event 0, 3, BGEVENT_READ, GoldenrodDeptStore1FElevatorButton
+ bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore1FDirectory
+ bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore1FElevatorButton
.ObjectEvents:
db 4
- object_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1
- object_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1
- object_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1
- object_event SPRITE_GENTLEMAN, 5, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FGentlemanScript, -1
+ object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1
+ object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1
+ object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1
+ object_event 11, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FGentlemanScript, -1