summaryrefslogtreecommitdiff
path: root/maps/Route44.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route44.asm')
-rw-r--r--maps/Route44.asm19
1 files changed, 9 insertions, 10 deletions
diff --git a/maps/Route44.asm b/maps/Route44.asm
index 4f9261a59..6ab469c04 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -11,7 +11,7 @@ const_value set 2
const ROUTE44_POKE_BALL2
const ROUTE44_POKE_BALL3
-Route44_MapScriptHeader:
+Route44_MapScripts:
.SceneScripts:
db 0
@@ -41,9 +41,9 @@ UnknownScript_0x19d853:
scall UnknownScript_0x19d8e3
UnknownScript_0x19d856:
askforphonenumber PHONE_BIRDKEEPER_VANCE
- if_equal $1, UnknownScript_0x19d8f3
- if_equal $2, UnknownScript_0x19d8ef
- trainertotext BIRD_KEEPER, VANCE1, $0
+ if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d8f3
+ if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d8ef
+ trainertotext BIRD_KEEPER, VANCE1, MEM_BUFFER_0
scall UnknownScript_0x19d8e7
jump UnknownScript_0x19d8eb
@@ -185,9 +185,9 @@ UnknownScript_0x19d957:
scall UnknownScript_0x19d8e3
UnknownScript_0x19d95a:
askforphonenumber PHONE_FISHER_WILTON
- if_equal $1, UnknownScript_0x19d8f3
- if_equal $2, UnknownScript_0x19d8ef
- trainertotext FISHER, WILTON1, $0
+ if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d8f3
+ if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d8ef
+ trainertotext FISHER, WILTON1, MEM_BUFFER_0
scall UnknownScript_0x19d8e7
jump UnknownScript_0x19d8eb
@@ -318,8 +318,7 @@ Route44MaxRepel:
itemball MAX_REPEL
Route44HiddenElixer:
- dwb EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER
-
+ hiddenitem EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER
FisherWilton1SeenText:
text "Aack! You made me"
@@ -507,7 +506,7 @@ Route44Sign2Text:
line "BLACKTHORN CITY"
done
-Route44_MapEventHeader:
+Route44_MapEvents:
; filler
db 0, 0