summaryrefslogtreecommitdiff
path: root/maps/AzaleaMart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/AzaleaMart.asm')
-rw-r--r--maps/AzaleaMart.asm28
1 files changed, 14 insertions, 14 deletions
diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm
index ed88a0fd1..01abee35a 100644
--- a/maps/AzaleaMart.asm
+++ b/maps/AzaleaMart.asm
@@ -4,25 +4,25 @@ const_value set 2
const AZALEAMART_BUG_CATCHER
AzaleaMart_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 0
.MapCallbacks:
db 0
-ClerkScript_0x18e040:
+AzaleaMartClerkScript:
opentext
pokemart MARTTYPE_STANDARD, MART_AZALEA
closetext
end
-CooltrainerMScript_0x18e047:
- jumptextfaceplayer UnknownText_0x18e04d
+AzaleaMartCooltrainerMScript:
+ jumptextfaceplayer AzaleaMartCooltrainerMText
-BugCatcherScript_0x18e04a:
- jumptextfaceplayer UnknownText_0x18e0b6
+AzaleaMartBugCatcherScript:
+ jumptextfaceplayer AzaleaMartBugCatcherText
-UnknownText_0x18e04d:
+AzaleaMartCooltrainerMText:
text "There's no GREAT"
line "BALL here. #"
@@ -34,7 +34,7 @@ UnknownText_0x18e04d:
cont "his custom BALLS."
done
-UnknownText_0x18e0b6:
+AzaleaMartBugCatcherText:
text "A GREAT BALL is"
line "better for catch-"
cont "ing #MON than a"
@@ -54,14 +54,14 @@ AzaleaMart_MapEventHeader:
warp_def $7, $2, 3, AZALEA_TOWN
warp_def $7, $3, 3, AZALEA_TOWN
-.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_0x18e040, -1
- person_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x18e047, -1
- person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x18e04a, -1
+ object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1
+ object_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1
+ object_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1