diff options
Diffstat (limited to 'maps/SaffronMart.asm')
| -rw-r--r-- | maps/SaffronMart.asm | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index d7619320c..b86655188 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const SAFFRONMART_CLERK const SAFFRONMART_COOLTRAINER_M const SAFFRONMART_COOLTRAINER_F SaffronMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x18a3bf: opentext @@ -38,22 +36,17 @@ SaffronMartCooltrainerFText: done SaffronMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, SAFFRON_CITY - warp_def 3, 7, 3, SAFFRON_CITY + db 2 ; warp events + warp_event 2, 7, SAFFRON_CITY, 3 + warp_event 3, 7, SAFFRON_CITY, 3 -.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_0x18a3bf, -1 - object_event 7, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1 - object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1 + db 3 ; object events + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1 + object_event 7, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1 + object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1 |