diff options
Diffstat (limited to 'maps/ViridianMart.asm')
| -rw-r--r-- | maps/ViridianMart.asm | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 275b57e2d..29c73dbaf 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const VIRIDIANMART_CLERK const VIRIDIANMART_LASS const VIRIDIANMART_COOLTRAINER_M ViridianMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x9b5e7: opentext @@ -37,22 +35,17 @@ ViridianMartCooltrainerMText: done ViridianMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 4, VIRIDIAN_CITY - warp_def 3, 7, 4, VIRIDIAN_CITY + db 2 ; warp events + warp_event 2, 7, VIRIDIAN_CITY, 4 + warp_event 3, 7, VIRIDIAN_CITY, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1 - object_event 7, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1 - object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1 + db 3 ; object events + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1 + object_event 7, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1 + object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1 |