summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--constants/event_flags.asm31
-rw-r--r--maps/NationalPark.asm52
-rw-r--r--maps/OlivineLighthouse2F.asm44
-rw-r--r--maps/Route26.asm60
-rw-r--r--maps/Route27.asm60
-rw-r--r--maps/Route30.asm58
-rw-r--r--maps/Route31.asm54
-rw-r--r--maps/Route32.asm106
-rw-r--r--maps/Route33.asm52
-rw-r--r--maps/Route34.asm106
-rw-r--r--maps/Route35.asm8
-rw-r--r--maps/Route36.asm4
-rw-r--r--maps/Route38.asm8
-rw-r--r--maps/Route39.asm4
-rw-r--r--maps/Route42.asm4
-rw-r--r--maps/Route43.asm8
-rw-r--r--maps/Route44.asm8
-rw-r--r--maps/Route45.asm8
-rw-r--r--maps/Route46.asm4
-rw-r--r--wram.asm54
20 files changed, 381 insertions, 352 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm
index 7417842f3..614e4ee1d 100644
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -127,12 +127,39 @@ EVENT_GOT_HP_UP_FROM_VERMILION_GUY EQU $0e2
EVENT_GOT_TM29_PSYCHIC EQU $0e3
EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE EQU $0f9
EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM EQU $0fb
+EVENT_JACK_ASKED_FOR_PHONE_NUMBER EQU $25f
EVENT_SHOWED_BEVERLY_MARILL EQU $261
+EVENT_HUEY_ASKED_FOR_PHONE_NUMBER EQU $263
+EVENT_GOT_PROTEIN_FROM_HUEY EQU $265
+EVENT_GOT_HP_UP_FROM_JOEY EQU $266
EVENT_GOT_CARBOS_FROM_VANCE EQU $267
EVENT_GOT_IRON_FROM_PARRY EQU $268
EVENT_GOT_CALCIUM_FROM_ERIN EQU $269
-EVENT_SHOWED_DEREK_PIKACHU EQU $28d
-EVENT_SHOWED_TIFFANY_CLEFAIRY EQU $293
+EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER EQU $26b
+EVENT_BETH_ASKED_FOR_PHONE_NUMBER EQU $26d
+EVENT_JOSE_ASKED_FOR_PHONE_NUMBER EQU $26f
+EVENT_REENA_ASKED_FOR_PHONE_NUMBER EQU $271
+EVENT_JOEY_ASKED_FOR_PHONE_NUMBER EQU $273
+EVENT_WADE_ASKED_FOR_PHONE_NUMBER EQU $275
+EVENT_RALPH_ASKED_FOR_PHONE_NUMBER EQU $277
+EVENT_LIZ_ASKED_FOR_PHONE_NUMBER EQU $279
+EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER EQU $27b
+EVENT_TODD_ASKED_FOR_PHONE_NUMBER EQU $27d
+EVENT_GINA_ASKED_FOR_PHONE_NUMBER EQU $27f
+EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER EQU $281
+EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER EQU $283
+EVENT_ALAN_ASKED_FOR_PHONE_NUMBER EQU $285
+EVENT_DANA_ASKED_FOR_PHONE_NUMBER EQU $289
+EVENT_CHAD_ASKED_FOR_PHONE_NUMBER EQU $28b
+EVENT_DEREK_ASKED_FOR_PHONE_NUMBER EQU $28d
+EVENT_TULLY_ASKED_FOR_PHONE_NUMBER EQU $28f
+EVENT_BRENT_ASKED_FOR_PHONE_NUMBER EQU $291
+EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER EQU $293
+EVENT_VANCE_ASKED_FOR_PHONE_NUMBER EQU $295
+EVENT_WILTON_ASKED_FOR_PHONE_NUMBER EQU $297
+EVENT_KENJI_ASKED_FOR_PHONE_NUMBER EQU $299
+EVENT_PARRY_ASKED_FOR_PHONE_NUMBER EQU $29b
+EVENT_ERIN_ASKED_FOR_PHONE_NUMBER EQU $29d
EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD EQU $29e
EVENT_SWITCH_1 EQU $2d3
EVENT_SWITCH_2 EQU $2d4
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index 2e4f493b7..8bf7b731b 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -82,11 +82,11 @@ SchoolboyJack1Script:
iftrue UnknownScript_0x5c088
checkcellnum $5
iftrue UnknownScript_0x5c108
- checkevent $025f
+ checkevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x5c071
writetext UnknownText_0x5c4f3
keeptextopen
- setevent $025f
+ setevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x5c0fc
jump UnknownScript_0x5c074
@@ -103,57 +103,57 @@ UnknownScript_0x5c074:
UnknownScript_0x5c088:
scall UnknownScript_0x5c114
winlosstext SchoolboyJack1BeatenText, $0000
- copybytetovar wd9f2
- if_equal $4, UnknownScript_0x5c0a7
- if_equal $3, UnknownScript_0x5c0ad
- if_equal $2, UnknownScript_0x5c0b3
- if_equal $1, UnknownScript_0x5c0b9
- if_equal $0, UnknownScript_0x5c0bf
-UnknownScript_0x5c0a7:
+ copybytetovar JackFightCount
+ if_equal 4, .Fight4
+ if_equal 3, .Fight3
+ if_equal 2, .Fight2
+ if_equal 1, .Fight1
+ if_equal 0, .LoadFight0
+.Fight4
checkevent EVENT_RESTORED_POWER_TO_KANTO
- iftrue UnknownScript_0x5c0f3
-UnknownScript_0x5c0ad:
+ iftrue .LoadFight4
+.Fight3
checkevent EVENT_BEAT_ELITE_FOUR
- iftrue UnknownScript_0x5c0e6
-UnknownScript_0x5c0b3:
+ iftrue .LoadFight3
+.Fight2
checkevent EVENT_CLEARED_RADIO_TOWER
- iftrue UnknownScript_0x5c0d9
-UnknownScript_0x5c0b9:
- checkflag $0047
- iftrue UnknownScript_0x5c0cc
-UnknownScript_0x5c0bf:
+ iftrue .LoadFight2
+.Fight1
+ checkflag ENGINE_FLYPOINT_OLIVINE
+ iftrue .LoadFight1
+.LoadFight0
loadtrainer SCHOOLBOY, JACK1
startbattle
returnafterbattle
- loadvar wd9f2, $1
+ loadvar JackFightCount, 1
clearflag ENGINE_JACK
end
-UnknownScript_0x5c0cc:
+.LoadFight1
loadtrainer SCHOOLBOY, JACK2
startbattle
returnafterbattle
- loadvar wd9f2, $2
+ loadvar JackFightCount, 2
clearflag ENGINE_JACK
end
-UnknownScript_0x5c0d9:
+.LoadFight2
loadtrainer SCHOOLBOY, JACK3
startbattle
returnafterbattle
- loadvar wd9f2, $3
+ loadvar JackFightCount, 3
clearflag ENGINE_JACK
end
-UnknownScript_0x5c0e6:
+.LoadFight3
loadtrainer SCHOOLBOY, JACK4
startbattle
returnafterbattle
- loadvar wd9f2, $4
+ loadvar JackFightCount, 4
clearflag ENGINE_JACK
end
-UnknownScript_0x5c0f3:
+.LoadFight4
loadtrainer SCHOOLBOY, JACK5
startbattle
returnafterbattle
diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm
index a10c9a7b6..987dcf5d2 100644
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -59,9 +59,9 @@ SailorHuey1Script:
iftrue UnknownScript_0x5afc7
checkcellnum $7
iftrue UnknownScript_0x5b05f
- checkevent $0263
+ checkevent EVENT_HUEY_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x5afb0
- setevent $0263
+ setevent EVENT_HUEY_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x5b053
jump UnknownScript_0x5afb3
@@ -78,57 +78,57 @@ UnknownScript_0x5afb3:
UnknownScript_0x5afc7:
scall UnknownScript_0x5b06b
winlosstext SailorHuey1BeatenText, $0000
- copybytetovar wd9f4
- if_equal $3, UnknownScript_0x5afe2
- if_equal $2, UnknownScript_0x5afe8
- if_equal $1, UnknownScript_0x5afee
- if_equal $0, UnknownScript_0x5aff4
-UnknownScript_0x5afe2:
+ copybytetovar HueyFightCount
+ if_equal 3, .Fight3
+ if_equal 2, .Fight2
+ if_equal 1, .Fight1
+ if_equal 0, .LoadFight0
+.Fight3
checkevent EVENT_RESTORED_POWER_TO_KANTO
- iftrue UnknownScript_0x5b01b
-UnknownScript_0x5afe8:
+ iftrue .LoadFight3
+.Fight2
checkevent EVENT_BEAT_ELITE_FOUR
- iftrue UnknownScript_0x5b00e
-UnknownScript_0x5afee:
+ iftrue .LoadFight2
+.Fight1
checkevent EVENT_CLEARED_RADIO_TOWER
- iftrue UnknownScript_0x5b001
-UnknownScript_0x5aff4:
+ iftrue .LoadFight1
+.LoadFight0
loadtrainer SAILOR, HUEY1
startbattle
returnafterbattle
- loadvar wd9f4, $1
+ loadvar HueyFightCount, 1
clearflag ENGINE_HUEY
end
-UnknownScript_0x5b001:
+.LoadFight1
loadtrainer SAILOR, HUEY2
startbattle
returnafterbattle
- loadvar wd9f4, $2
+ loadvar HueyFightCount, 2
clearflag ENGINE_HUEY
end
-UnknownScript_0x5b00e:
+.LoadFight2
loadtrainer SAILOR, HUEY3
startbattle
returnafterbattle
- loadvar wd9f4, $3
+ loadvar HueyFightCount, 3
clearflag ENGINE_HUEY
end
-UnknownScript_0x5b01b:
+.LoadFight3
loadtrainer SAILOR, HUEY4
startbattle
returnafterbattle
clearflag ENGINE_HUEY
checkevent EVENT_HUEY_PROTEIN
iftrue UnknownScript_0x5b03f
- checkevent $0265
+ checkevent EVENT_GOT_PROTEIN_FROM_HUEY
iftrue UnknownScript_0x5b03e
scall UnknownScript_0x5b076
verbosegiveitem PROTEIN, 1
iffalse UnknownScript_0x5b06f
- setevent $0265
+ setevent EVENT_GOT_PROTEIN_FROM_HUEY
jump UnknownScript_0x5b05f
UnknownScript_0x5b03e:
diff --git a/maps/Route26.asm b/maps/Route26.asm
index 1fee661b9..1fad5b7e2 100644
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -59,11 +59,11 @@ CooltrainermGaven3Script:
iftrue UnknownScript_0x1a4d79
checkcellnum $b
iftrue UnknownScript_0x1a4dcb
- checkevent $026b
+ checkevent EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x1a4d62
writetext UnknownText_0x1a4fe4
keeptextopen
- setevent $026b
+ setevent EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x1a4dbf
jump UnknownScript_0x1a4d65
@@ -80,33 +80,33 @@ UnknownScript_0x1a4d65:
UnknownScript_0x1a4d79:
scall UnknownScript_0x1a4dd7
winlosstext CooltrainermGaven3BeatenText, $0000
- copybytetovar wd9f5
- if_equal $2, UnknownScript_0x1a4d90
- if_equal $1, UnknownScript_0x1a4d96
- if_equal $0, UnknownScript_0x1a4d9c
-UnknownScript_0x1a4d90:
+ copybytetovar GavenFightCount
+ if_equal 2, .Fight2
+ if_equal 1, .Fight1
+ if_equal 0, .LoadFight0
+.Fight2
checkevent EVENT_RESTORED_POWER_TO_KANTO
- iftrue UnknownScript_0x1a4db6
-UnknownScript_0x1a4d96:
+ iftrue .LoadFight2
+.Fight1
checkevent EVENT_BEAT_ELITE_FOUR
- iftrue UnknownScript_0x1a4da9
-UnknownScript_0x1a4d9c:
+ iftrue .LoadFight1
+.LoadFight0
loadtrainer COOLTRAINERM, GAVEN3
startbattle
returnafterbattle
- loadvar wd9f5, $1
+ loadvar GavenFightCount, 1
clearflag ENGINE_GAVEN
end
-UnknownScript_0x1a4da9:
+.LoadFight1
loadtrainer COOLTRAINERM, GAVEN1
startbattle
returnafterbattle
- loadvar wd9f5, $2
+ loadvar GavenFightCount, 2
clearflag ENGINE_GAVEN
end
-UnknownScript_0x1a4db6:
+.LoadFight2
loadtrainer COOLTRAINERM, GAVEN2
startbattle
returnafterbattle
@@ -195,11 +195,11 @@ CooltrainerfBeth1Script:
iftrue UnknownScript_0x1a4e35
checkcellnum $c
iftrue UnknownScript_0x1a4e87
- checkevent $026d
+ checkevent EVENT_BETH_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x1a4e1e
writetext UnknownText_0x1a51d9
keeptextopen
- setevent $026d
+ setevent EVENT_BETH_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x1a4e7b
jump UnknownScript_0x1a4e21
@@ -216,33 +216,33 @@ UnknownScript_0x1a4e21:
UnknownScript_0x1a4e35:
scall UnknownScript_0x1a4e93
winlosstext CooltrainerfBeth1BeatenText, $0000
- copybytetovar wd9f6
- if_equal $2, UnknownScript_0x1a4e4c
- if_equal $1, UnknownScript_0x1a4e52
- if_equal $0, UnknownScript_0x1a4e58
-UnknownScript_0x1a4e4c:
+ copybytetovar BethFightCount
+ if_equal 2, .Fight2
+ if_equal 1, .Fight1
+ if_equal 0, .LoadFight0
+.Fight2
checkevent EVENT_RESTORED_POWER_TO_KANTO
- iftrue UnknownScript_0x1a4e72
-UnknownScript_0x1a4e52:
+ iftrue .LoadFight2
+.Fight1
checkevent EVENT_BEAT_ELITE_FOUR
- iftrue UnknownScript_0x1a4e65
-UnknownScript_0x1a4e58:
+ iftrue .LoadFight1
+.LoadFight0
loadtrainer COOLTRAINERF, BETH1
startbattle
returnafterbattle
- loadvar wd9f6, $1
+ loadvar BethFightCount, 1
clearflag ENGINE_BETH
end
-UnknownScript_0x1a4e65:
+.LoadFight1
loadtrainer COOLTRAINERF, BETH2
startbattle
returnafterbattle
- loadvar wd9f6, $2
+ loadvar BethFightCount, 2
clearflag ENGINE_BETH
end
-UnknownScript_0x1a4e72:
+.LoadFight2
loadtrainer COOLTRAINERF, BETH3
startbattle
returnafterbattle
diff --git a/maps/Route27.asm b/maps/Route27.asm
index d8d6fd2a0..f9e87f330 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -95,11 +95,11 @@ Bird_keeperJose2Script:
iftrue UnknownScript_0x1a0945
checkcellnum $d
iftrue UnknownScript_0x1a0963
- checkevent $026f
+ checkevent EVENT_JOSE_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x1a08e8
writetext UnknownText_0x1a0e42
keeptextopen
- setevent $026f
+ setevent EVENT_JOSE_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x1a0957
jump UnknownScript_0x1a08eb
@@ -116,33 +116,33 @@ UnknownScript_0x1a08eb:
UnknownScript_0x1a08ff:
scall UnknownScript_0x1a096f
winlosstext Bird_keeperJose2BeatenText, $0000
- copybytetovar wd9f7
- if_equal $2, UnknownScript_0x1a0916
- if_equal $1, UnknownScript_0x1a091c
- if_equal $0, UnknownScript_0x1a0922
-UnknownScript_0x1a0916:
+ copybytetovar JoseFightCount
+ if_equal 2, .Fight2
+ if_equal 1, .Fight1
+ if_equal 0, .LoadFight0
+.Fight2
checkevent EVENT_RESTORED_POWER_TO_KANTO
- iftrue UnknownScript_0x1a093c
-UnknownScript_0x1a091c:
+ iftrue .LoadFight2
+.Fight1
checkevent EVENT_BEAT_ELITE_FOUR
- iftrue UnknownScript_0x1a092f
-UnknownScript_0x1a0922:
+ iftrue .LoadFight1
+.LoadFight0
loadtrainer BIRD_KEEPER, JOSE2
startbattle
returnafterbattle
- loadvar wd9f7, $1
+ loadvar JoseFightCount, 1
clearflag ENGINE_JOSE
end
-UnknownScript_0x1a092f:
+.LoadFight1
loadtrainer BIRD_KEEPER, JOSE1
startbattle
returnafterbattle
- loadvar wd9f7, $2
+ loadvar JoseFightCount, 2
clearflag ENGINE_JOSE
end
-UnknownScript_0x1a093c:
+.LoadFight2
loadtrainer BIRD_KEEPER, JOSE3
startbattle
returnafterbattle
@@ -276,11 +276,11 @@ CooltrainerfReena1Script:
iftrue UnknownScript_0x1a09e9
checkcellnum $e
iftrue UnknownScript_0x1a0a3b
- checkevent $0271
+ checkevent EVENT_REENA_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x1a09d2
writetext UnknownText_0x1a0c35
keeptextopen
- setevent $0271
+ setevent EVENT_REENA_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x1a0a2f
jump UnknownScript_0x1a09d5
@@ -297,33 +297,33 @@ UnknownScript_0x1a09d5:
UnknownScript_0x1a09e9:
scall UnknownScript_0x1a0a47
winlosstext CooltrainerfReena1BeatenText, $0000
- copybytetovar wd9f8
- if_equal $2, UnknownScript_0x1a0a00
- if_equal $1, UnknownScript_0x1a0a06
- if_equal $0, UnknownScript_0x1a0a0c
-UnknownScript_0x1a0a00:
+ copybytetovar ReenaFightCount
+ if_equal 2, .Fight2
+ if_equal 1, .Fight1
+ if_equal 0, .LoadFight0
+.Fight2
checkevent EVENT_RESTORED_POWER_TO_KANTO
- iftrue UnknownScript_0x1a0a26
-UnknownScript_0x1a0a06:
+ iftrue .LoadFight2
+.Fight1
checkevent EVENT_BEAT_ELITE_FOUR
- iftrue UnknownScript_0x1a0a19
-UnknownScript_0x1a0a0c:
+ iftrue .LoadFight1
+.LoadFight0
loadtrainer COOLTRAINERF, REENA1
startbattle
returnafterbattle
- loadvar wd9f8, $1
+ loadvar ReenaFightCount, 1
clearflag ENGINE_REENA
end
-UnknownScript_0x1a0a19:
+.LoadFight1
loadtrainer COOLTRAINERF, REENA2
startbattle
returnafterbattle
- loadvar wd9f8, $2
+ loadvar ReenaFightCount, 2
clearflag ENGINE_REENA
end
-UnknownScript_0x1a0a26:
+.LoadFight2
loadtrainer COOLTRAINERF, REENA3
startbattle
returnafterbattle
diff --git a/maps/Route30.asm b/maps/Route30.asm
index c6b237a7b..58a530916 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -52,11 +52,11 @@ YoungsterJoey1Script:
iftrue UnknownScript_0x1a16e0
checkcellnum $f
iftrue UnknownScript_0x1a178f
- checkevent $0273
+ checkevent EVENT_JOEY_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x1a16c9
writetext UnknownText_0x1a18c2
keeptextopen
- setevent $0273
+ setevent EVENT_JOEY_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x1a1783
jump UnknownScript_0x1a16cc
@@ -73,69 +73,69 @@ UnknownScript_0x1a16cc:
UnknownScript_0x1a16e0:
scall UnknownScript_0x1a179b
winlosstext YoungsterJoey1BeatenText, $0000
- copybytetovar wd9f9
- if_equal $4, UnknownScript_0x1a16ff
- if_equal $3, UnknownScript_0x1a1705
- if_equal $2, UnknownScript_0x1a170b
- if_equal $1, UnknownScript_0x1a1711
- if_equal $0, UnknownScript_0x1a1717
-UnknownScript_0x1a16ff:
+ copybytetovar JoeyFightCount
+ if_equal 4, .Fight4
+ if_equal 3, .Fight3
+ if_equal 2, .Fight2
+ if_equal 1, .Fight1
+ if_equal 0, .LoadFight0
+.Fight4
checkevent EVENT_BEAT_ELITE_FOUR
- iftrue UnknownScript_0x1a174b
-UnknownScript_0x1a1705:
+ iftrue .LoadFight4
+.Fight3
checkevent EVENT_CLEARED_RADIO_TOWER
- iftrue UnknownScript_0x1a173e
-UnknownScript_0x1a170b:
- checkflag $0047
- iftrue UnknownScript_0x1a1731
-UnknownScript_0x1a1711:
- checkflag $0046
- iftrue UnknownScript_0x1a1724
-UnknownScript_0x1a1717:
+ iftrue .LoadFight3
+.Fight2
+ checkflag ENGINE_FLYPOINT_OLIVINE
+ iftrue .LoadFight2
+.Fight1
+ checkflag ENGINE_FLYPOINT_GOLDENROD
+ iftrue .LoadFight1
+.LoadFight0
loadtrainer YOUNGSTER, JOEY1
startbattle
returnafterbattle
- loadvar wd9f9, $1
+ loadvar JoeyFightCount, 1
clearflag ENGINE_JOEY
end
-UnknownScript_0x1a1724:
+.LoadFight1
loadtrainer YOUNGSTER, JOEY2
startbattle
returnafterbattle
- loadvar wd9f9, $2
+ loadvar JoeyFightCount, 2
clearflag ENGINE_JOEY
end
-UnknownScript_0x1a1731:
+.LoadFight2
loadtrainer YOUNGSTER, JOEY3
startbattle
returnafterbattle
- loadvar wd9f9, $3
+ loadvar JoeyFightCount, 3
clearflag ENGINE_JOEY
end
-UnknownScript_0x1a173e:
+.LoadFight3
loadtrainer YOUNGSTER, JOEY4
startbattle
returnafterbattle
- loadvar wd9f9, $4
+ loadvar JoeyFightCount, 4
clearflag ENGINE_JOEY
end
-UnknownScript_0x1a174b:
+.LoadFight4
loadtrainer YOUNGSTER, JOEY5
startbattle
returnafterbattle
clearflag ENGINE_JOEY
checkevent EVENT_JOEY_HP_UP
iftrue UnknownScript_0x1a176f
- checkevent $0266
+ checkevent EVENT_GOT_HP_UP_FROM_JOEY
iftrue UnknownScript_0x1a176e
scall UnknownScript_0x1a17a6
verbosegiveitem HP_UP, 1
iffalse UnknownScript_0x1a179f
- setevent $0266
+ setevent EVENT_GOT_HP_UP_FROM_JOEY
jump UnknownScript_0x1a178f
UnknownScript_0x1a176e:
diff --git a/maps/Route31.asm b/maps/Route31.asm
index ed48e431f..da91e4a56 100644
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -47,11 +47,11 @@ Bug_catcherWade1Script:
iftrue UnknownScript_0x1a5507
checkcellnum $10
iftrue UnknownScript_0x1a5558
- checkevent $0275
+ checkevent EVENT_WADE_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x1a547c
writetext UnknownText_0x1a5671
closetext
- setevent $0275
+ setevent EVENT_WADE_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x1a554c
jump UnknownScript_0x1a547f
@@ -68,57 +68,57 @@ UnknownScript_0x1a547f:
UnknownScript_0x1a5493:
scall UnknownScript_0x1a5564
winlosstext Bug_catcherWade1BeatenText, $0000
- copybytetovar wd9fa
- if_equal $4, UnknownScript_0x1a54b2
- if_equal $3, UnknownScript_0x1a54b8
- if_equal $2, UnknownScript_0x1a54be
- if_equal $1, UnknownScript_0x1a54c4
- if_equal $0, UnknownScript_0x1a54ca
-UnknownScript_0x1a54b2:
+ copybytetovar WadeFightCount
+ if_equal 4, .Fight4
+ if_equal 3, .Fight3
+ if_equal 2, .Fight2
+ if_equal 1, .Fight1
+ if_equal 0, .LoadFight0
+.Fight4
checkevent EVENT_BEAT_ELITE_FOUR
- iftrue UnknownScript_0x1a54fe
-UnknownScript_0x1a54b8:
+ iftrue .LoadFight4
+.Fight3
checkevent EVENT_CLEARED_RADIO_TOWER
- iftrue UnknownScript_0x1a54f1
-UnknownScript_0x1a54be:
- checkflag $0049
- iftrue UnknownScript_0x1a54e4
-UnknownScript_0x1a54c4:
- checkflag $0046
- iftrue UnknownScript_0x1a54d7
-UnknownScript_0x1a54ca:
+ iftrue .LoadFight3
+.Fight2
+ checkflag ENGINE_FLYPOINT_MAHOGANY
+ iftrue .LoadFight2
+.Fight1
+ checkflag ENGINE_FLYPOINT_GOLDENROD
+ iftrue .LoadFight1
+.LoadFight0
loadtrainer BUG_CATCHER, WADE1
startbattle
returnafterbattle
- loadvar wd9fa, $1
+ loadvar WadeFightCount, 1
clearflag ENGINE_WADE
end
-UnknownScript_0x1a54d7:
+.LoadFight1
loadtrainer BUG_CATCHER, WADE2
startbattle
returnafterbattle
- loadvar wd9fa, $2
+ loadvar WadeFightCount, 2
clearflag ENGINE_WADE
end
-UnknownScript_0x1a54e4:
+.LoadFight2
loadtrainer BUG_CATCHER, WADE3
startbattle
returnafterbattle
- loadvar wd9fa, $3
+ loadvar WadeFightCount, 3
clearflag ENGINE_WADE
end
-UnknownScript_0x1a54f1:
+.LoadFight3
loadtrainer BUG_CATCHER, WADE4
startbattle
returnafterbattle
- loadvar wd9fa, $4
+ loadvar WadeFightCount, 4
clearflag ENGINE_WADE
end
-UnknownScript_0x1a54fe:
+.LoadFight4
loadtrainer BUG_CATCHER, WADE5
startbattle
returnafterbattle
diff --git a/maps/Route32.asm b/maps/Route32.asm
index 47fe4844c..35a078148 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -215,11 +215,11 @@ FisherRalph1Script:
iftrue UnknownScript_0x1905f1
checkcellnum $11
iftrue UnknownScript_0x190603
- checkevent $0277
+ checkevent EVENT_RALPH_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x190566
writetext UnknownText_0x190bf8
keeptextopen
- setevent $0277
+ setevent EVENT_RALPH_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x1905f7
jump UnknownScript_0x190569
@@ -236,57 +236,57 @@ UnknownScript_0x190569:
UnknownScript_0x19057d:
scall UnknownScript_0x19060f
winlosstext FisherRalph1BeatenText, $0000
- copybytetovar wd9fb
- if_equal $4, UnknownScript_0x19059c
- if_equal $3, UnknownScript_0x1905a2
- if_equal $2, UnknownScript_0x1905a8
- if_equal $1, UnknownScript_0x1905ae
- if_equal $0, UnknownScript_0x1905b4
-UnknownScript_0x19059c:
+ copybytetovar RalphFightCount
+ if_equal 4, .Fight4
+ if_equal 3, .Fight3
+ if_equal 2, .Fight2
+ if_equal 1, .Fight1
+ if_equal 0, .LoadFight0
+.Fight4
checkevent EVENT_RESTORED_POWER_TO_KANTO
- iftrue UnknownScript_0x1905e8
-UnknownScript_0x1905a2:
+ iftrue .LoadFight4
+.Fight3
checkevent EVENT_BEAT_ELITE_FOUR
- iftrue UnknownScript_0x1905db
-UnknownScript_0x1905a8:
- checkflag $004a
- iftrue UnknownScript_0x1905ce
-UnknownScript_0x1905ae:
- checkflag $0048
- iftrue UnknownScript_0x1905c1
-UnknownScript_0x1905b4:
+ iftrue .LoadFight3
+.Fight2
+ checkflag ENGINE_FLYPOINT_LAKE_OF_RAGE
+ iftrue .LoadFight2
+.Fight1
+ checkflag ENGINE_FLYPOINT_ECRUTEAK
+ iftrue .LoadFight1
+.LoadFight0
loadtrainer FISHER, RALPH1
startbattle
returnafterbattle
- loadvar wd9fb, $1
+ loadvar RalphFightCount, 1
clearflag ENGINE_RALPH
end
-UnknownScript_0x1905c1:
+.LoadFight1
loadtrainer FISHER, RALPH2
startbattle
returnafterbattle
- loadvar wd9fb, $2
+ loadvar RalphFightCount, 2
clearflag ENGINE_RALPH
end
-UnknownScript_0x1905ce:
+.LoadFight2
loadtrainer FISHER, RALPH3
startbattle
returnafterbattle
- loadvar wd9fb, $3
+ loadvar RalphFightCount, 3
clearflag ENGINE_RALPH
end
-UnknownScript_0x1905db:
+.LoadFight3
loadtrainer FISHER, RALPH4
startbattle
returnafterbattle
- loadvar wd9fb, $4
+ loadvar RalphFightCount, 4
clearflag ENGINE_RALPH
end
-UnknownScript_0x1905e8:
+.LoadFight4
loadtrainer FISHER, RALPH5
startbattle
returnafterbattle
@@ -381,11 +381,11 @@ PicnickerLiz1Script:
iftrue UnknownScript_0x19066d
checkcellnum $12
iftrue UnknownScript_0x1906ed
- checkevent $0279
+ checkevent EVENT_LIZ_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x190656
writetext UnknownText_0x191060
keeptextopen
- setevent $0279
+ setevent EVENT_LIZ_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x1906e1
jump UnknownScript_0x190659
@@ -402,57 +402,57 @@ UnknownScript_0x190659:
UnknownScript_0x19066d:
scall UnknownScript_0x1906f9
winlosstext PicnickerLiz1BeatenText, $0000
- copybytetovar wd9fc
- if_equal $4, UnknownScript_0x19068c
- if_equal $3, UnknownScript_0x190692
- if_equal $2, UnknownScript_0x190698
- if_equal $1, UnknownScript_0x19069e
- if_equal $0, UnknownScript_0x1906a4
-UnknownScript_0x19068c:
+ copybytetovar LizFightCount
+ if_equal 4, .Fight4
+ if_equal 3, .Fight3
+ if_equal 2, .Fight2
+ if_equal 1, .Fight1
+ if_equal 0, .LoadFight0
+.Fight4
checkevent EVENT_BEAT_ELITE_FOUR
- iftrue UnknownScript_0x1906d8
-UnknownScript_0x190692:
+ iftrue .LoadFight4
+.Fight3
checkevent EVENT_CLEARED_RADIO_TOWER
- iftrue UnknownScript_0x1906cb
-UnknownScript_0x190698:
+ iftrue .LoadFight3
+.Fight2
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
- iftrue UnknownScript_0x1906be
-UnknownScript_0x19069e:
- checkflag $0048
- iftrue UnknownScript_0x1906b1
-UnknownScript_0x1906a4:
+ iftrue .LoadFight2
+.Fight1
+ checkflag ENGINE_FLYPOINT_ECRUTEAK
+ iftrue .LoadFight1
+.LoadFight0
loadtrainer PICNICKER, LIZ1
startbattle
returnafterbattle
- loadvar wd9fc, $1
+ loadvar LizFightCount, 1
clearflag ENGINE_LIZ
end
-UnknownScript_0x1906b1:
+.LoadFight1
loadtrainer PICNICKER, LIZ2
startbattle
returnafterbattle
- loadvar wd9fc, $2
+ loadvar LizFightCount, 2
clearflag ENGINE_LIZ
end
-UnknownScript_0x1906be:
+.LoadFight2
loadtrainer PICNICKER, LIZ3
startbattle
returnafterbattle
- loadvar wd9fc, $3
+ loadvar LizFightCount, 3
clearflag ENGINE_LIZ
end
-UnknownScript_0x1906cb:
+.LoadFight3
loadtrainer PICNICKER, LIZ4
startbattle
returnafterbattle
- loadvar wd9fc, $4
+ loadvar LizFightCount, 4
clearflag ENGINE_LIZ
end
-UnknownScript_0x1906d8:
+.LoadFight4
loadtrainer PICNICKER, LIZ5
startbattle
returnafterbattle
diff --git a/maps/Route33.asm b/maps/Route33.asm
index b32440a37..f583e2a21 100644
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -37,11 +37,11 @@ HikerAnthony2Script:
iftrue UnknownScript_0x1ac0c5
checkcellnum $13
iftrue UnknownScript_0x1ac0d7
- checkevent $027b
+ checkevent EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x1ac03a
writetext UnknownText_0x1ac153
keeptextopen
- setevent $027b
+ setevent EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x1ac0cb
jump UnknownScript_0x1ac03d
@@ -58,57 +58,57 @@ UnknownScript_0x1ac03d:
UnknownScript_0x1ac051:
scall UnknownScript_0x1ac0e3
winlosstext HikerAnthony2BeatenText, $0000
- copybytetovar wd9fd
- if_equal $4, UnknownScript_0x1ac070
- if_equal $3, UnknownScript_0x1ac076
- if_equal $2, UnknownScript_0x1ac07c
- if_equal $1, UnknownScript_0x1ac082
- if_equal $0, UnknownScript_0x1ac088
-UnknownScript_0x1ac070:
+ copybytetovar AnthonyFightCount
+ if_equal 4, .Fight4
+ if_equal 3, .Fight3
+ if_equal 2, .Fight2
+ if_equal 1, .Fight1
+ if_equal 0, .LoadFight0
+.Fight4
checkevent EVENT_RESTORED_POWER_TO_KANTO
- iftrue UnknownScript_0x1ac0bc
-UnknownScript_0x1ac076:
+ iftrue .LoadFight4
+.Fight3
checkevent EVENT_BEAT_ELITE_FOUR
- iftrue UnknownScript_0x1ac0af
-UnknownScript_0x1ac07c:
+ iftrue .LoadFight3
+.Fight2
checkevent EVENT_CLEARED_RADIO_TOWER
- iftrue UnknownScript_0x1ac0a2
-UnknownScript_0x1ac082:
- checkflag $0047
- iftrue UnknownScript_0x1ac095
-UnknownScript_0x1ac088:
+ iftrue .LoadFight2
+.Fight1
+ checkflag ENGINE_FLYPOINT_OLIVINE
+ iftrue .LoadFight1
+.LoadFight0
loadtrainer HIKER, ANTHONY2
startbattle
returnafterbattle
- loadvar wd9fd, $1
+ loadvar AnthonyFightCount, 1
clearflag ENGINE_ANTHONY
end
-UnknownScript_0x1ac095:
+.LoadFight1
loadtrainer HIKER, ANTHONY1
startbattle
returnafterbattle
- loadvar wd9fd, $2
+ loadvar AnthonyFightCount, 2
clearflag ENGINE_ANTHONY
end
-UnknownScript_0x1ac0a2:
+.LoadFight2
loadtrainer HIKER, ANTHONY3
startbattle
returnafterbattle
- loadvar wd9fd, $3
+ loadvar AnthonyFightCount, 3
clearflag ENGINE_ANTHONY
end
-UnknownScript_0x1ac0af:
+.LoadFight3
loadtrainer HIKER, ANTHONY4
startbattle
returnafterbattle
- loadvar wd9fd, $4
+ loadvar AnthonyFightCount, 4
clearflag ENGINE_ANTHONY
end
-UnknownScript_0x1ac0bc:
+.LoadFight4
loadtrainer HIKER, ANTHONY5
startbattle
returnafterbattle
diff --git a/maps/Route34.asm b/maps/Route34.asm
index 84298285e..6d2cf7823 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -104,11 +104,11 @@ CamperTodd1Script:
iftrue UnknownScript_0x78131
checkcellnum $14
iftrue UnknownScript_0x78143
- checkevent $027d
+ checkevent EVENT_TODD_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x780a6
writetext UnknownText_0x784f0
keeptextopen
- setevent $027d
+ setevent EVENT_TODD_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x78137
jump UnknownScript_0x780a9
@@ -125,57 +125,57 @@ UnknownScript_0x780a9:
UnknownScript_0x780bd:
scall UnknownScript_0x7814f
winlosstext CamperTodd1BeatenText, $0000
- copybytetovar wd9fe
- if_equal $4, UnknownScript_0x780dc
- if_equal $3, UnknownScript_0x780e2
- if_equal $2, UnknownScript_0x780e8
- if_equal $1, UnknownScript_0x780ee
- if_equal $0, UnknownScript_0x780f4
-UnknownScript_0x780dc:
+ copybytetovar ToddFightCount
+ if_equal 4, .Fight4
+ if_equal 3, .Fight3
+ if_equal 2, .Fight2
+ if_equal 1, .Fight1
+ if_equal 0, .LoadFight0
+.Fight4
checkevent EVENT_RESTORED_POWER_TO_KANTO
- iftrue UnknownScript_0x78128
-UnknownScript_0x780e2:
+ iftrue .LoadFight4
+.Fight3
checkevent EVENT_BEAT_ELITE_FOUR
- iftrue UnknownScript_0x7811b
-UnknownScript_0x780e8:
- checkflag $004b
- iftrue UnknownScript_0x7810e
-UnknownScript_0x780ee:
- checkflag $0045
- iftrue UnknownScript_0x78101
-UnknownScript_0x780f4:
+ iftrue .LoadFight3
+.Fight2
+ checkflag ENGINE_FLYPOINT_BLACKTHORN
+ iftrue .LoadFight2
+.Fight1
+ checkflag ENGINE_FLYPOINT_CIANWOOD
+ iftrue .LoadFight1
+.LoadFight0
loadtrainer CAMPER, TODD1
startbattle
returnafterbattle
- loadvar wd9fe, $1
+ loadvar ToddFightCount, 1
clearflag ENGINE_TODD
end
-UnknownScript_0x78101:
+.LoadFight1
loadtrainer CAMPER, TODD2
startbattle
returnafterbattle
- loadvar wd9fe, $2
+ loadvar ToddFightCount, 2
clearflag ENGINE_TODD
end
-UnknownScript_0x7810e:
+.LoadFight2
loadtrainer CAMPER, TODD3
startbattle
returnafterbattle
- loadvar wd9fe, $3
+ loadvar ToddFightCount, 3
clearflag ENGINE_TODD
end
-UnknownScript_0x7811b:
+.LoadFight3
loadtrainer CAMPER, TODD4
startbattle
returnafterbattle
- loadvar wd9fe, $4
+ loadvar ToddFightCount, 4
clearflag ENGINE_TODD
end
-UnknownScript_0x78128:
+.LoadFight4
loadtrainer CAMPER, TODD5
startbattle
returnafterbattle
@@ -245,11 +245,11 @@ PicnickerGina1Script:
iftrue UnknownScript_0x78213
checkcellnum $15
iftrue UnknownScript_0x78234
- checkevent $027f
+ checkevent EVENT_GINA_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x78188
writetext UnknownText_0x785b8
keeptextopen
- setevent $027f
+ setevent EVENT_GINA_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x78228
jump UnknownScript_0x7818b
@@ -266,57 +266,57 @@ UnknownScript_0x7818b:
UnknownScript_0x7819f:
scall UnknownScript_0x78240
winlosstext PicnickerGina1BeatenText, $0000
- copybytetovar wd9ff
- if_equal $4, UnknownScript_0x781be
- if_equal $3, UnknownScript_0x781c4
- if_equal $2, UnknownScript_0x781ca
- if_equal $1, UnknownScript_0x781d0
- if_equal $0, UnknownScript_0x781d6
-UnknownScript_0x781be:
+ copybytetovar GinaFightCount
+ if_equal 4, .Fight4
+ if_equal 3, .Fight3
+ if_equal 2, .Fight2
+ if_equal 1, .Fight1
+ if_equal 0, .LoadFight0
+.Fight4
checkevent EVENT_RESTORED_POWER_TO_KANTO
- iftrue UnknownScript_0x7820a
-UnknownScript_0x781c4:
+ iftrue .LoadFight4
+.Fight3
checkevent EVENT_BEAT_ELITE_FOUR
- iftrue UnknownScript_0x781fd
-UnknownScript_0x781ca:
+ iftrue .LoadFight3
+.Fight2
checkevent EVENT_CLEARED_RADIO_TOWER
- iftrue UnknownScript_0x781f0
-UnknownScript_0x781d0:
- checkflag $0049
- iftrue UnknownScript_0x781e3
-UnknownScript_0x781d6:
+ iftrue .LoadFight2
+.Fight1
+ checkflag ENGINE_FLYPOINT_MAHOGANY
+ iftrue .LoadFight1
+.LoadFight0
loadtrainer PICNICKER, GINA1
startbattle
returnafterbattle
- loadvar wd9ff, $1
+ loadvar GinaFightCount, 1
clearflag ENGINE_GINA
end
-UnknownScript_0x781e3:
+.LoadFight1
loadtrainer PICNICKER, GINA2
startbattle
returnafterbattle
- loadvar wd9ff, $2
+ loadvar GinaFightCount, 2
clearflag ENGINE_GINA
end
-UnknownScript_0x781f0:
+.LoadFight2
loadtrainer PICNICKER, GINA3
startbattle
returnafterbattle
- loadvar wd9ff, $3
+ loadvar GinaFightCount, 3
clearflag ENGINE_GINA
end
-UnknownScript_0x781fd:
+.LoadFight3
loadtrainer PICNICKER, GINA4
startbattle
returnafterbattle
- loadvar wd9ff, $4
+ loadvar GinaFightCount, 4
clearflag ENGINE_GINA
end
-UnknownScript_0x7820a:
+.LoadFight4
loadtrainer PICNICKER, GINA5
startbattle
returnafterbattle
diff --git a/maps/Route35.asm b/maps/Route35.asm
index 64ce5d411..b102d6260 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -57,11 +57,11 @@ JugglerIrwin1Script:
loadfont
checkcellnum $16
iftrue UnknownScript_0x19c90f
- checkevent $0281
+ checkevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x19c8ec
writetext UnknownText_0x19cd5a
keeptextopen
- setevent $0281
+ setevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x19c903
jump UnknownScript_0x19c8ef
@@ -240,11 +240,11 @@ Bug_catcherArnie1Script:
iftrue UnknownScript_0x19ca2f
checkcellnum $17
iftrue UnknownScript_0x19c90f
- checkevent $0283
+ checkevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x19c9a4
writetext UnknownText_0x19cdf6
keeptextopen
- setevent $0283
+ setevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x19c903
jump UnknownScript_0x19c9a7
diff --git a/maps/Route36.asm b/maps/Route36.asm
index 6ff6cc88f..e95331833 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -190,11 +190,11 @@ SchoolboyAlan1Script:
iftrue UnknownScript_0x1941b4
checkcellnum $18
iftrue UnknownScript_0x1941d5
- checkevent $0285
+ checkevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x194129
writetext UnknownText_0x1947aa
keeptextopen
- setevent $0285
+ setevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x1941c9
jump UnknownScript_0x19412c
diff --git a/maps/Route38.asm b/maps/Route38.asm
index 3e0fb47a6..5d7b1229f 100644
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -88,11 +88,11 @@ LassDana1Script:
iftrue UnknownScript_0x1a1df6
checkcellnum $1a
iftrue UnknownScript_0x1a1e17
- checkevent $0289
+ checkevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x1a1d6b
writetext UnknownText_0x1a20ec
keeptextopen
- setevent $0289
+ setevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x1a1e0b
jump UnknownScript_0x1a1d6e
@@ -240,11 +240,11 @@ SchoolboyChad1Script:
iftrue UnknownScript_0x1a1e75
checkcellnum $1b
iftrue UnknownScript_0x1a1ef5
- checkevent $028b
+ checkevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x1a1e5e
writetext UnknownText_0x1a200e
keeptextopen
- setevent $028b
+ setevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x1a1ee9
jump UnknownScript_0x1a1e61
diff --git a/maps/Route39.asm b/maps/Route39.asm
index b45c7d3cc..14716f87e 100644
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -42,11 +42,11 @@ PokefanmDerek1Script:
iftrue UnknownScript_0x1a5b6e
checkpoke PIKACHU
iffalse UnknownScript_0x1a5b5c
- checkevent EVENT_SHOWED_DEREK_PIKACHU
+ checkevent EVENT_DEREK_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x1a5b33
writetext UnknownText_0x1a5cf8
keeptextopen
- setevent EVENT_SHOWED_DEREK_PIKACHU
+ setevent EVENT_DEREK_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x1a5b62
jump UnknownScript_0x1a5b36
diff --git a/maps/Route42.asm b/maps/Route42.asm
index c8eea32f0..fd0d79198 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -56,11 +56,11 @@ FisherTully1Script:
iftrue UnknownScript_0x1a92dc
checkcellnum $1d
iftrue UnknownScript_0x1a92fd
- checkevent $028f
+ checkevent EVENT_TULLY_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x1a9268
writetext UnknownText_0x1a93ab
keeptextopen
- setevent $028f
+ setevent EVENT_TULLY_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x1a92f1
jump UnknownScript_0x1a926b
diff --git a/maps/Route43.asm b/maps/Route43.asm
index fc8dd1d27..1a1fe8f3b 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -100,11 +100,11 @@ PokemaniacBrent1Script:
iftrue UnknownScript_0x19d0cf
checkcellnum $1e
iftrue UnknownScript_0x19d138
- checkevent $0291
+ checkevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x19d0b8
writetext UnknownText_0x19d359
keeptextopen
- setevent $0291
+ setevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x19d12c
jump UnknownScript_0x19d0bb
@@ -279,11 +279,11 @@ PicnickerTiffany3Script:
iftrue UnknownScript_0x19d245
checkpoke CLEFAIRY
iffalse UnknownScript_0x19d233
- checkevent EVENT_SHOWED_TIFFANY_CLEFAIRY
+ checkevent EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x19d1aa
writetext UnknownText_0x19d618
keeptextopen
- setevent EVENT_SHOWED_TIFFANY_CLEFAIRY
+ setevent EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x19d239
jump UnknownScript_0x19d1ad
diff --git a/maps/Route44.asm b/maps/Route44.asm
index 4f6bba7dc..5394740a0 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -32,11 +32,11 @@ Bird_keeperVance1Script:
iftrue UnknownScript_0x19d86a
checkcellnum $20
iftrue UnknownScript_0x19d8eb
- checkevent $0295
+ checkevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x19d853
writetext UnknownText_0x19dbf3
keeptextopen
- setevent $0295
+ setevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x19d8df
jump UnknownScript_0x19d856
@@ -208,11 +208,11 @@ FisherWilton1Script:
iftrue UnknownScript_0x19d9b4
checkcellnum $21
iftrue UnknownScript_0x19d8eb
- checkevent $0297
+ checkevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x19d957
writetext UnknownText_0x19daa8
keeptextopen
- setevent $0297
+ setevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x19d8df
jump UnknownScript_0x19d95a
diff --git a/maps/Route45.asm b/maps/Route45.asm
index 83a81e0cf..40aecd320 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -30,12 +30,12 @@ BlackbeltKenji3Script:
loadfont
checkcellnum $22
iftrue UnknownScript_0x19e0e4
- checkevent $0299
+ checkevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x19e0cd
special Function11485
writetext UnknownText_0x19e5e2
closetext
- setevent $0299
+ setevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x19e11b
jump UnknownScript_0x19e0d0
@@ -206,11 +206,11 @@ HikerParry3Script:
iftrue UnknownScript_0x19e1b8
checkcellnum $23
iftrue UnknownScript_0x19e127
- checkevent $029b
+ checkevent EVENT_PARRY_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x19e1a1
writetext UnknownText_0x19e434
keeptextopen
- setevent $029b
+ setevent EVENT_PARRY_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x19e11b
jump UnknownScript_0x19e1a4
diff --git a/maps/Route46.asm b/maps/Route46.asm
index 7fb5938c0..6fe802683 100644
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -59,11 +59,11 @@ PicnickerErin1Script:
iftrue UnknownScript_0x1a96da
checkcellnum $24
iftrue UnknownScript_0x1a975b
- checkevent $029d
+ checkevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x1a96c3
writetext UnknownText_0x1a98c6
keeptextopen
- setevent $029d
+ setevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x1a974f
jump UnknownScript_0x1a96c6
diff --git a/wram.asm b/wram.asm
index aa7619348..4495ef9db 100644
--- a/wram.asm
+++ b/wram.asm
@@ -2216,35 +2216,37 @@ wMobileBattleRoomTrigger:: ds 1 ; d9c0
SECTION "Events", WRAMX, BANK [1]
-wd9f2:: ds 1
- ds 1
-wd9f4:: ds 1
-wd9f5:: ds 1
-wd9f6:: ds 1
-wd9f7:: ds 1
-wd9f8:: ds 1
-wd9f9:: ds 1
-wd9fa:: ds 1
-wd9fb:: ds 1
-wd9fc:: ds 1
-wd9fd:: ds 1
-wd9fe:: ds 1
-wd9ff:: ds 1
+JackFightCount:: ds 1
+ ds 1
+HueyFightCount:: ds 1
+GavenFightCount:: ds 1
+BethFightCount:: ds 1
+JoseFightCount:: ds 1
+ReenaFightCount:: ds 1
+JoeyFightCount:: ds 1
+WadeFightCount:: ds 1
+RalphFightCount:: ds 1
+LizFightCount:: ds 1
+AnthonyFightCount:: ds 1
+ToddFightCount:: ds 1
+GinaFightCount:: ds 1
wda00:: ds 1
-ArnieFightCount:: ds 1
-AlanFightCount:: ds 1
-DanaFightCount:: ds 1
-ChadFightCount:: ds 1
-wda05:: ds 1
-TullyFightCount:: ds 1
-BrentFightCount:: ds 1
+
+ArnieFightCount:: ds 1
+AlanFightCount:: ds 1
+DanaFightCount:: ds 1
+ChadFightCount:: ds 1
+ ds 1
+TullyFightCount:: ds 1
+BrentFightCount:: ds 1
TiffanyFightCount:: ds 1
-VanceFightCount:: ds 1
-WiltonFightCount:: ds 1
-wda0b:: ds 1
-ParryFightCount:: ds 1
-ErinFightCount:: ds 1
+VanceFightCount:: ds 1
+WiltonFightCount:: ds 1
+ ds 1
+ParryFightCount:: ds 1
+ErinFightCount:: ds 1
+
ds 100
EventFlags:: ; da72
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-04 09:56:42 +0000