diff options
Diffstat (limited to 'maps/SaffronMart.asm')
| -rw-r--r-- | maps/SaffronMart.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index ed13ef074..c1ce96b4f 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -4,7 +4,7 @@ const_value set 2 const SAFFRONMART_COOLTRAINER_F SaffronMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -16,19 +16,19 @@ ClerkScript_0x18a3bf: closetext end -CooltrainerMScript_0x18a3c6: - jumptextfaceplayer UnknownText_0x18a3cc +SaffronMartCooltrainerMScript: + jumptextfaceplayer SaffronMartCooltrainerMText -CooltrainerFScript_0x18a3c9: - jumptextfaceplayer UnknownText_0x18a3f3 +SaffronMartCooltrainerFScript: + jumptextfaceplayer SaffronMartCooltrainerFText -UnknownText_0x18a3cc: +SaffronMartCooltrainerMText: text "There's a big" line "RADIO TOWER in" cont "LAVENDER." done -UnknownText_0x18a3f3: +SaffronMartCooltrainerFText: text "I want to become" line "stronger, but I'm" cont "not good yet…" @@ -46,14 +46,14 @@ SaffronMart_MapEventHeader: warp_def $7, $2, 3, SAFFRON_CITY warp_def $7, $3, 3, SAFFRON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1 - person_event SPRITE_COOLTRAINER_M, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x18a3c6, -1 - person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x18a3c9, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1 + object_event SPRITE_COOLTRAINER_M, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1 + object_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1 |