diff options
Diffstat (limited to 'maps/LavenderMart.asm')
| -rw-r--r-- | maps/LavenderMart.asm | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index f55db399b..cd97dd8e8 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const LAVENDERMART_CLERK const LAVENDERMART_POKEFAN_M const LAVENDERMART_ROCKER LavenderMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x7eb1c: opentext @@ -48,22 +46,17 @@ LavenderMartRockerText: done LavenderMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 5, LAVENDER_TOWN - warp_def 3, 7, 5, LAVENDER_TOWN + db 2 ; warp events + warp_event 2, 7, LAVENDER_TOWN, 5 + warp_event 3, 7, LAVENDER_TOWN, 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_0x7eb1c, -1 - object_event 6, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1 - object_event 9, 2, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1 + db 3 ; object events + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1 + object_event 6, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1 + object_event 9, 2, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1 |