diff options
Diffstat (limited to 'maps/BlackthornMart.asm')
| -rw-r--r-- | maps/BlackthornMart.asm | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index 4b4b74324..c7a61af05 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const BLACKTHORNMART_CLERK const BLACKTHORNMART_COOLTRAINER_M const BLACKTHORNMART_BLACK_BELT BlackthornMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks BlackthornMartClerkScript: opentext @@ -47,22 +45,17 @@ BlackthornMartBlackBeltText: done BlackthornMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 4, BLACKTHORN_CITY - warp_def 3, 7, 4, BLACKTHORN_CITY + db 2 ; warp events + warp_event 2, 7, BLACKTHORN_CITY, 4 + warp_event 3, 7, BLACKTHORN_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, BlackthornMartClerkScript, -1 - object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1 - object_event 5, 2, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1 + db 3 ; object events + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1 + object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1 + object_event 5, 2, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1 |