diff options
Diffstat (limited to 'maps/VermilionMart.asm')
| -rw-r--r-- | maps/VermilionMart.asm | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index b72ea6aec..16a20d380 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const VERMILIONMART_CLERK const VERMILIONMART_SUPER_NERD const VERMILIONMART_BUENA VermilionMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x191f7e: opentext @@ -37,22 +35,17 @@ VermilionMartBuenaText: done VermilionMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 5, VERMILION_CITY - warp_def 3, 7, 5, VERMILION_CITY + db 2 ; warp events + warp_event 2, 7, VERMILION_CITY, 5 + warp_event 3, 7, VERMILION_CITY, 5 -.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_0x191f7e, -1 - object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1 - object_event 8, 6, SPRITE_BUENA, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1 + db 3 ; object events + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1 + object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1 + object_event 8, 6, SPRITE_BUENA, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1 |