summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/event_scripts.s4
-rw-r--r--data/maps/FallarborTown/map.json14
-rw-r--r--data/maps/FallarborTown/scripts.inc50
-rw-r--r--data/maps/RustboroCity_DevonCorp_3F/scripts.inc4
-rw-r--r--data/maps/RusturfTunnel/map.json4
-rw-r--r--data/maps/VerdanturfTown/map.json16
-rw-r--r--data/maps/VerdanturfTown/scripts.inc64
-rw-r--r--data/maps/VerdanturfTown_FriendshipRatersHouse/map.json4
-rw-r--r--data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc68
-rw-r--r--data/maps/VerdanturfTown_House/map.json4
-rw-r--r--data/maps/VerdanturfTown_House/scripts.inc12
-rw-r--r--data/maps/VerdanturfTown_WandasHouse/map.json14
-rw-r--r--data/maps/VerdanturfTown_WandasHouse/scripts.inc92
-rw-r--r--data/scripts/new_game.inc8
-rw-r--r--include/constants/flags.h8
15 files changed, 183 insertions, 183 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 5600b1793..03caecd62 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -850,8 +850,8 @@ EventScript_HideMrBriney:: @ 82721F8
RusturfTunnel_EventScript_SetRusturfTunnelOpen:: @ 8272216
removeobject 1
removeobject 10
- clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN
- clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN
+ clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND
+ clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA
setvar VAR_RUSTURF_TUNNEL_STATE, 6
setflag FLAG_RUSTURF_TUNNEL_OPENED
return
diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json
index 9f4acc988..b0475451a 100644
--- a/data/maps/FallarborTown/map.json
+++ b/data/maps/FallarborTown/map.json
@@ -35,7 +35,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FallarborTown_EventScript_1EB22B",
+ "script": "FallarborTown_EventScript_Girl",
"flag": "0"
},
{
@@ -48,7 +48,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FallarborTown_EventScript_1EB20C",
+ "script": "FallarborTown_EventScript_ExpertM",
"flag": "0"
},
{
@@ -61,7 +61,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FallarborTown_EventScript_1EB234",
+ "script": "FallarborTown_EventScript_Gentleman",
"flag": "0"
},
{
@@ -74,7 +74,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FallarborTown_EventScript_1EB23D",
+ "script": "FallarborTown_EventScript_Azurill",
"flag": "FLAG_HIDE_FALLARBOR_AZURILL"
}
],
@@ -139,7 +139,7 @@
"y": 8,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "FallarborTown_EventScript_1EB250"
+ "script": "FallarborTown_EventScript_BattleTentSign"
},
{
"type": "sign",
@@ -155,7 +155,7 @@
"y": 11,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "FallarborTown_EventScript_1EB259"
+ "script": "FallarborTown_EventScript_TownSign"
},
{
"type": "sign",
@@ -171,7 +171,7 @@
"y": 7,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "FallarborTown_EventScript_1EB262"
+ "script": "FallarborTown_EventScript_MoveTutorSign"
},
{
"type": "hidden_item",
diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc
index 15942007b..f5e09a026 100644
--- a/data/maps/FallarborTown/scripts.inc
+++ b/data/maps/FallarborTown/scripts.inc
@@ -8,70 +8,70 @@ FallarborTown_OnTransition: @ 81EB200
clearflag FLAG_CONTEST_SKETCH_CREATED
end
-FallarborTown_EventScript_1EB20C:: @ 81EB20C
+FallarborTown_EventScript_ExpertM:: @ 81EB20C
lock
faceplayer
- goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_1EB221
- msgbox FallarborTown_Text_1EB26B, MSGBOX_DEFAULT
+ goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_ExpertMNormal
+ msgbox FallarborTown_Text_ShadyCharactersCozmosHome, MSGBOX_DEFAULT
release
end
-FallarborTown_EventScript_1EB221:: @ 81EB221
- msgbox FallarborTown_Text_1EB2DE, MSGBOX_DEFAULT
+FallarborTown_EventScript_ExpertMNormal:: @ 81EB221
+ msgbox FallarborTown_Text_RegionKnownForMeteors, MSGBOX_DEFAULT
release
end
-FallarborTown_EventScript_1EB22B:: @ 81EB22B
- msgbox FallarborTown_Text_1EB35F, MSGBOX_NPC
+FallarborTown_EventScript_Girl:: @ 81EB22B
+ msgbox FallarborTown_Text_MyPreciousAzurill, MSGBOX_NPC
end
-FallarborTown_EventScript_1EB234:: @ 81EB234
- msgbox FallarborTown_Text_1EB3CA, MSGBOX_NPC
+FallarborTown_EventScript_Gentleman:: @ 81EB234
+ msgbox FallarborTown_Text_HaveYouChallengedFlannery, MSGBOX_NPC
end
-FallarborTown_EventScript_1EB23D:: @ 81EB23D
+FallarborTown_EventScript_Azurill:: @ 81EB23D
lock
faceplayer
waitse
playmoncry SPECIES_AZURILL, 0
- msgbox FallarborTown_Text_1EB3B5, MSGBOX_DEFAULT
+ msgbox FallarborTown_Text_Azurill, MSGBOX_DEFAULT
waitmoncry
release
end
-FallarborTown_EventScript_1EB250:: @ 81EB250
- msgbox FallarborTown_Text_1EB4C2, MSGBOX_SIGN
+FallarborTown_EventScript_BattleTentSign:: @ 81EB250
+ msgbox FallarborTown_Text_BattleTentSign, MSGBOX_SIGN
end
-FallarborTown_EventScript_1EB259:: @ 81EB259
- msgbox FallarborTown_Text_1EB4FE, MSGBOX_SIGN
+FallarborTown_EventScript_TownSign:: @ 81EB259
+ msgbox FallarborTown_Text_TownSign, MSGBOX_SIGN
end
-FallarborTown_EventScript_1EB262:: @ 81EB262
- msgbox FallarborTown_Text_1EB534, MSGBOX_SIGN
+FallarborTown_EventScript_MoveTutorSign:: @ 81EB262
+ msgbox FallarborTown_Text_MoveTutorSign, MSGBOX_SIGN
end
-FallarborTown_Text_1EB26B: @ 81EB26B
+FallarborTown_Text_ShadyCharactersCozmosHome: @ 81EB26B
.string "Something's happening,\n"
.string "and I don't like it!\p"
.string "I've seen shady characters wandering\n"
.string "in and out of PROF. COZMO's home…$"
-FallarborTown_Text_1EB2DE: @ 81EB2DE
+FallarborTown_Text_RegionKnownForMeteors: @ 81EB2DE
.string "This region's been known for meteors\n"
.string "since the olden days.\p"
.string "They say METEOR FALLS was gouged out\n"
.string "by a falling meteorite long ago.$"
-FallarborTown_Text_1EB35F: @ 81EB35F
+FallarborTown_Text_MyPreciousAzurill: @ 81EB35F
.string "See! Take a look!\n"
.string "This is my precious AZURILL!\p"
.string "It's slick and smooth and plushy, too!$"
-FallarborTown_Text_1EB3B5: @ 81EB3B5
+FallarborTown_Text_Azurill: @ 81EB3B5
.string "AZURILL: Rooreelooo.$"
-FallarborTown_Text_1EB3CA: @ 81EB3CA
+FallarborTown_Text_HaveYouChallengedFlannery: @ 81EB3CA
.string "Have you already challenged FLANNERY,\n"
.string "the LEADER of LAVARIDGE GYM?\p"
.string "The girl's grandfather was famous.\n"
@@ -81,15 +81,15 @@ FallarborTown_Text_1EB3CA: @ 81EB3CA
.string "become a great TRAINER in her own\l"
.string "right.$"
-FallarborTown_Text_1EB4C2: @ 81EB4C2
+FallarborTown_Text_BattleTentSign: @ 81EB4C2
.string "BATTLE TENT FALLARBOR SITE\n"
.string "“May the Greatest Teams Gather!”$"
-FallarborTown_Text_1EB4FE: @ 81EB4FE
+FallarborTown_Text_TownSign: @ 81EB4FE
.string "FALLARBOR TOWN\n"
.string "“A farm community with small gardens.”$"
-FallarborTown_Text_1EB534: @ 81EB534
+FallarborTown_Text_MoveTutorSign: @ 81EB534
.string "MOVE TUTOR'S HOUSE\n"
.string "“New moves taught to POKéMON.”$"
diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
index 27152e8d6..349ec616e 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
@@ -61,8 +61,8 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E
call Common_EventScript_OutOfCenterPartyHeal
msgbox RustboroCity_DevonCorp_3F_Text_MrStoneGoWithCautionAndCare, MSGBOX_DEFAULT
setflag FLAG_HIDE_ROUTE_116_TUNNELER
- clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN
- clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN
+ clearflag FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND
+ clearflag FLAG_HIDE_RUSTURF_TUNNEL_WANDA
clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
setvar VAR_BRINEY_LOCATION, 1
diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json
index f01096ad4..b682f84a2 100644
--- a/data/maps/RusturfTunnel/map.json
+++ b/data/maps/RusturfTunnel/map.json
@@ -25,7 +25,7 @@
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "RusturfTunnel_EventScript_WandasBoyfriend",
- "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN"
+ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND"
},
{
"graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
@@ -142,7 +142,7 @@
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "RusturfTunnel_EventScript_Wanda",
- "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN"
+ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_WANDA"
}
],
"warp_events": [
diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json
index 7aef48724..e3fa08b03 100644
--- a/data/maps/VerdanturfTown/map.json
+++ b/data/maps/VerdanturfTown/map.json
@@ -35,7 +35,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "VerdanturfTown_EventScript_1EB5A8",
+ "script": "VerdanturfTown_EventScript_Man",
"flag": "0"
},
{
@@ -48,7 +48,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "VerdanturfTown_EventScript_1EB575",
+ "script": "VerdanturfTown_EventScript_Twin",
"flag": "0"
},
{
@@ -61,7 +61,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "VerdanturfTown_EventScript_1EB5BA",
+ "script": "VerdanturfTown_EventScript_Boy",
"flag": "0"
},
{
@@ -74,7 +74,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "VerdanturfTown_EventScript_1EB5B1",
+ "script": "VerdanturfTown_EventScript_Camper",
"flag": "0"
}
],
@@ -145,7 +145,7 @@
"y": 6,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "VerdanturfTown_EventScript_1EB5D9"
+ "script": "VerdanturfTown_EventScript_TownSign"
},
{
"type": "sign",
@@ -161,7 +161,7 @@
"y": 14,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "VerdanturfTown_EventScript_1EB5E2"
+ "script": "VerdanturfTown_EventScript_WandasHouseSign"
},
{
"type": "sign",
@@ -185,7 +185,7 @@
"y": 8,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "VerdanturfTown_EventScript_1EB5EB"
+ "script": "VerdanturfTown_EventScript_BattleTentSign"
},
{
"type": "sign",
@@ -193,7 +193,7 @@
"y": 3,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "VerdanturfTown_EventScript_1EB5F4"
+ "script": "VerdanturfTown_EventScript_RusturfTunnelSign"
}
]
} \ No newline at end of file
diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc
index bd8328db8..a4eeb00d8 100644
--- a/data/maps/VerdanturfTown/scripts.inc
+++ b/data/maps/VerdanturfTown/scripts.inc
@@ -7,61 +7,61 @@ VerdanturfTown_OnTransition: @ 81EB56C
setvar VAR_LINK_CONTEST_ROOM_STATE, 0
end
-VerdanturfTown_EventScript_1EB575:: @ 81EB575
+VerdanturfTown_EventScript_Twin:: @ 81EB575
lock
faceplayer
- goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_1EB594
- msgbox VerdanturfTown_Text_1EB5FD, MSGBOX_DEFAULT
+ goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_TwinTunnelOpen
+ msgbox VerdanturfTown_Text_ManTryingToDigTunnel, MSGBOX_DEFAULT
applymovement 2, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-VerdanturfTown_EventScript_1EB594:: @ 81EB594
- msgbox VerdanturfTown_Text_1EB6E0, MSGBOX_DEFAULT
+VerdanturfTown_EventScript_TwinTunnelOpen:: @ 81EB594
+ msgbox VerdanturfTown_Text_ManDugTunnelForLove, MSGBOX_DEFAULT
applymovement 2, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-VerdanturfTown_EventScript_1EB5A8:: @ 81EB5A8
- msgbox VerdanturfTown_Text_1EB736, MSGBOX_NPC
+VerdanturfTown_EventScript_Man:: @ 81EB5A8
+ msgbox VerdanturfTown_Text_AirCleanHere, MSGBOX_NPC
end
-VerdanturfTown_EventScript_1EB5B1:: @ 81EB5B1
- msgbox VerdanturfTown_Text_1EB7E2, MSGBOX_NPC
+VerdanturfTown_EventScript_Camper:: @ 81EB5B1
+ msgbox VerdanturfTown_Text_MakeBattleTentDebut, MSGBOX_NPC
end
-VerdanturfTown_EventScript_1EB5BA:: @ 81EB5BA
+VerdanturfTown_EventScript_Boy:: @ 81EB5BA
lock
faceplayer
- goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_1EB5CF
- msgbox VerdanturfTown_Text_1EB854, MSGBOX_DEFAULT
+ goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_BoyTunnelOpen
+ msgbox VerdanturfTown_Text_GuyTryingToBustThroughCave, MSGBOX_DEFAULT
release
end
-VerdanturfTown_EventScript_1EB5CF:: @ 81EB5CF
- msgbox VerdanturfTown_Text_1EB935, MSGBOX_DEFAULT
+VerdanturfTown_EventScript_BoyTunnelOpen:: @ 81EB5CF
+ msgbox VerdanturfTown_Text_EasyToGetToRustboroNow, MSGBOX_DEFAULT
release
end
-VerdanturfTown_EventScript_1EB5D9:: @ 81EB5D9
- msgbox VerdanturfTown_Text_1EB9C4, MSGBOX_SIGN
+VerdanturfTown_EventScript_TownSign:: @ 81EB5D9
+ msgbox VerdanturfTown_Text_TownSign, MSGBOX_SIGN
end
-VerdanturfTown_EventScript_1EB5E2:: @ 81EB5E2
- msgbox VerdanturfTown_Text_1EBA11, MSGBOX_SIGN
+VerdanturfTown_EventScript_WandasHouseSign:: @ 81EB5E2
+ msgbox VerdanturfTown_Text_WandasHouse, MSGBOX_SIGN
end
-VerdanturfTown_EventScript_1EB5EB:: @ 81EB5EB
- msgbox VerdanturfTown_Text_1EBA1F, MSGBOX_SIGN
+VerdanturfTown_EventScript_BattleTentSign:: @ 81EB5EB
+ msgbox VerdanturfTown_Text_BattleTentSign, MSGBOX_SIGN
end
-VerdanturfTown_EventScript_1EB5F4:: @ 81EB5F4
- msgbox VerdanturfTown_Text_1EBA59, MSGBOX_SIGN
+VerdanturfTown_EventScript_RusturfTunnelSign:: @ 81EB5F4
+ msgbox VerdanturfTown_Text_RusturfTunnelSign, MSGBOX_SIGN
end
-VerdanturfTown_Text_1EB5FD: @ 81EB5FD
+VerdanturfTown_Text_ManTryingToDigTunnel: @ 81EB5FD
.string "My papa told me.\p"
.string "He says this tunnel is full of\n"
.string "timid POKéMON.\p"
@@ -72,25 +72,25 @@ VerdanturfTown_Text_1EB5FD: @ 81EB5FD
.string "But there's one man. He's trying to dig\n"
.string "the tunnel by himself!$"
-VerdanturfTown_Text_1EB6E0: @ 81EB6E0
+VerdanturfTown_Text_ManDugTunnelForLove: @ 81EB6E0
.string "There was a man who dug a tunnel for\n"
.string "a lady he loved.\p"
.string "I don't really get it, but hey!$"
-VerdanturfTown_Text_1EB736: @ 81EB736
+VerdanturfTown_Text_AirCleanHere: @ 81EB736
.string "The way the winds blow, volcanic ash\n"
.string "is never blown in this direction.\p"
.string "The air is clean and delicious here.\n"
.string "Living here should do wonders for even\l"
.string "frail and sickly people.$"
-VerdanturfTown_Text_1EB7E2: @ 81EB7E2
+VerdanturfTown_Text_MakeBattleTentDebut: @ 81EB7E2
.string "My POKéMON and I, we've been riding\n"
.string "a hot winning streak.\p"
.string "So I decided to make my BATTLE TENT\n"
.string "debut in this town.$"
-VerdanturfTown_Text_1EB854: @ 81EB854
+VerdanturfTown_Text_GuyTryingToBustThroughCave: @ 81EB854
.string "Did you see the cave next to the\n"
.string "POKéMON MART?\p"
.string "There's a guy in there who's trying to\n"
@@ -99,25 +99,25 @@ VerdanturfTown_Text_1EB854: @ 81EB854
.string "It'd be great if we could go through…\n"
.string "It'll make it easy to visit RUSTBORO.$"
-VerdanturfTown_Text_1EB935: @ 81EB935
+VerdanturfTown_Text_EasyToGetToRustboroNow: @ 81EB935
.string "That cave next to the POKéMON MART\n"
.string "is now a tunnel to the other side.\p"
.string "It's great--it's easy to go shop for\n"
.string "new DEVON products in RUSTBORO now.$"
-VerdanturfTown_Text_1EB9C4: @ 81EB9C4
+VerdanturfTown_Text_TownSign: @ 81EB9C4
.string "VERDANTURF TOWN\p"
.string "“The windswept highlands with the\n"
.string "sweet fragrance of grass.”$"
-VerdanturfTown_Text_1EBA11: @ 81EBA11
+VerdanturfTown_Text_WandasHouse: @ 81EBA11
.string "WANDA'S HOUSE$"
-VerdanturfTown_Text_1EBA1F: @ 81EBA1F
+VerdanturfTown_Text_BattleTentSign: @ 81EBA1F
.string "BATTLE TENT VERDANTURF SITE\n"
.string "“Feast Your Eyes on Battles!”$"
-VerdanturfTown_Text_1EBA59: @ 81EBA59
+VerdanturfTown_Text_RusturfTunnelSign: @ 81EBA59
.string "RUSTURF TUNNEL\n"
.string "“Linking RUSTBORO and VERDANTURF\p"
.string "“The tunnel project has been\n"
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json
index 955e00a83..fa620e682 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_203031",
+ "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_FriendshipRater",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA",
+ "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_Pikachu",
"flag": "0"
}
],
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
index 01b1e5030..993188cb2 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
@@ -1,104 +1,104 @@
VerdanturfTown_FriendshipRatersHouse_MapScripts:: @ 8203030
.byte 0
-VerdanturfTown_FriendshipRatersHouse_EventScript_203031:: @ 8203031
+VerdanturfTown_FriendshipRatersHouse_EventScript_FriendshipRater:: @ 8203031
lock
faceplayer
- msgbox VerdanturfTown_FriendshipRatersHouse_Text_2030ED, MSGBOX_DEFAULT
+ msgbox VerdanturfTown_FriendshipRatersHouse_Text_SeeHowMuchPokemonLikesYou, MSGBOX_DEFAULT
specialvar VAR_RESULT, GetLeadMonFriendshipScore
switch VAR_RESULT
- case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203094
- case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_20309E
- case 2, VerdanturfTown_FriendshipRatersHouse_EventScript_2030A8
- case 3, VerdanturfTown_FriendshipRatersHouse_EventScript_2030B2
- case 4, VerdanturfTown_FriendshipRatersHouse_EventScript_2030BC
- case 5, VerdanturfTown_FriendshipRatersHouse_EventScript_2030C6
- case 6, VerdanturfTown_FriendshipRatersHouse_EventScript_2030D0
+ case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_DetestsYou
+ case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryWary
+ case 2, VerdanturfTown_FriendshipRatersHouse_EventScript_NotUsedToYou
+ case 3, VerdanturfTown_FriendshipRatersHouse_EventScript_GettingUsedToYou
+ case 4, VerdanturfTown_FriendshipRatersHouse_EventScript_LikesYouQuiteALot
+ case 5, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryHappy
+ case 6, VerdanturfTown_FriendshipRatersHouse_EventScript_AdoresYou
release
end
-VerdanturfTown_FriendshipRatersHouse_EventScript_203094:: @ 8203094
- msgbox VerdanturfTown_FriendshipRatersHouse_Text_2032DF, MSGBOX_DEFAULT
+VerdanturfTown_FriendshipRatersHouse_EventScript_DetestsYou:: @ 8203094
+ msgbox VerdanturfTown_FriendshipRatersHouse_Text_DetestsYou, MSGBOX_DEFAULT
release
end
-VerdanturfTown_FriendshipRatersHouse_EventScript_20309E:: @ 820309E
- msgbox VerdanturfTown_FriendshipRatersHouse_Text_203288, MSGBOX_DEFAULT
+VerdanturfTown_FriendshipRatersHouse_EventScript_VeryWary:: @ 820309E
+ msgbox VerdanturfTown_FriendshipRatersHouse_Text_VeryWary, MSGBOX_DEFAULT
release
end
-VerdanturfTown_FriendshipRatersHouse_EventScript_2030A8:: @ 82030A8
- msgbox VerdanturfTown_FriendshipRatersHouse_Text_203249, MSGBOX_DEFAULT
+VerdanturfTown_FriendshipRatersHouse_EventScript_NotUsedToYou:: @ 82030A8
+ msgbox VerdanturfTown_FriendshipRatersHouse_Text_NotUsedToYou, MSGBOX_DEFAULT
release
end
-VerdanturfTown_FriendshipRatersHouse_EventScript_2030B2:: @ 82030B2
- msgbox VerdanturfTown_FriendshipRatersHouse_Text_203213, MSGBOX_DEFAULT
+VerdanturfTown_FriendshipRatersHouse_EventScript_GettingUsedToYou:: @ 82030B2
+ msgbox VerdanturfTown_FriendshipRatersHouse_Text_GettingUsedToYou, MSGBOX_DEFAULT
release
end
-VerdanturfTown_FriendshipRatersHouse_EventScript_2030BC:: @ 82030BC
- msgbox VerdanturfTown_FriendshipRatersHouse_Text_2031D1, MSGBOX_DEFAULT
+VerdanturfTown_FriendshipRatersHouse_EventScript_LikesYouQuiteALot:: @ 82030BC
+ msgbox VerdanturfTown_FriendshipRatersHouse_Text_LikesYouQuiteALot, MSGBOX_DEFAULT
release
end
-VerdanturfTown_FriendshipRatersHouse_EventScript_2030C6:: @ 82030C6
- msgbox VerdanturfTown_FriendshipRatersHouse_Text_203192, MSGBOX_DEFAULT
+VerdanturfTown_FriendshipRatersHouse_EventScript_VeryHappy:: @ 82030C6
+ msgbox VerdanturfTown_FriendshipRatersHouse_Text_VeryHappy, MSGBOX_DEFAULT
release
end
-VerdanturfTown_FriendshipRatersHouse_EventScript_2030D0:: @ 82030D0
- msgbox VerdanturfTown_FriendshipRatersHouse_Text_203141, MSGBOX_DEFAULT
+VerdanturfTown_FriendshipRatersHouse_EventScript_AdoresYou:: @ 82030D0
+ msgbox VerdanturfTown_FriendshipRatersHouse_Text_AdoresYou, MSGBOX_DEFAULT
release
end
-VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA:: @ 82030DA
+VerdanturfTown_FriendshipRatersHouse_EventScript_Pikachu:: @ 82030DA
lock
faceplayer
waitse
playmoncry SPECIES_PIKACHU, 0
- msgbox VerdanturfTown_FriendshipRatersHouse_Text_20334A, MSGBOX_DEFAULT
+ msgbox VerdanturfTown_FriendshipRatersHouse_Text_Pikachu, MSGBOX_DEFAULT
waitmoncry
release
end
-VerdanturfTown_FriendshipRatersHouse_Text_2030ED: @ 82030ED
+VerdanturfTown_FriendshipRatersHouse_Text_SeeHowMuchPokemonLikesYou: @ 82030ED
.string "Let me see your POKéMON.\n"
.string "I'll check to see how much it likes you.\p"
.string "Oh.\n"
.string "Your POKéMON…$"
-VerdanturfTown_FriendshipRatersHouse_Text_203141: @ 8203141
+VerdanturfTown_FriendshipRatersHouse_Text_AdoresYou: @ 8203141
.string "It adores you.\n"
.string "It can't possibly love you any more.\l"
.string "I even feel happy seeing it.$"
-VerdanturfTown_FriendshipRatersHouse_Text_203192: @ 8203192
+VerdanturfTown_FriendshipRatersHouse_Text_VeryHappy: @ 8203192
.string "It seems to be very happy.\n"
.string "It obviously likes you a whole lot.$"
-VerdanturfTown_FriendshipRatersHouse_Text_2031D1: @ 82031D1
+VerdanturfTown_FriendshipRatersHouse_Text_LikesYouQuiteALot: @ 82031D1
.string "It likes you quite a lot.\n"
.string "It seems to want to be babied a little.$"
-VerdanturfTown_FriendshipRatersHouse_Text_203213: @ 8203213
+VerdanturfTown_FriendshipRatersHouse_Text_GettingUsedToYou: @ 8203213
.string "It's getting used to you.\n"
.string "It seems to believe in you.$"
-VerdanturfTown_FriendshipRatersHouse_Text_203249: @ 8203249
+VerdanturfTown_FriendshipRatersHouse_Text_NotUsedToYou: @ 8203249
.string "It's not very used to you yet.\n"
.string "It neither loves nor hates you.$"
-VerdanturfTown_FriendshipRatersHouse_Text_203288: @ 8203288
+VerdanturfTown_FriendshipRatersHouse_Text_VeryWary: @ 8203288
.string "It's very wary.\n"
.string "It has scary viciousness in its eyes.\l"
.string "It doesn't like you much at all.$"
-VerdanturfTown_FriendshipRatersHouse_Text_2032DF: @ 82032DF
+VerdanturfTown_FriendshipRatersHouse_Text_DetestsYou: @ 82032DF
.string "This is a little hard for me to say…\p"
.string "Your POKéMON simply detests you.\n"
.string "Doesn't that make you uncomfortable?$"
-VerdanturfTown_FriendshipRatersHouse_Text_20334A: @ 820334A
+VerdanturfTown_FriendshipRatersHouse_Text_Pikachu: @ 820334A
.string "PIKACHU: Pika pika!$"
diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json
index 9a357b495..f50e62a4e 100644
--- a/data/maps/VerdanturfTown_House/map.json
+++ b/data/maps/VerdanturfTown_House/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "VerdanturfTown_House_EventScript_20335F",
+ "script": "VerdanturfTown_House_EventScript_Woman1",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "VerdanturfTown_House_EventScript_203368",
+ "script": "VerdanturfTown_House_EventScript_Woman2",
"flag": "0"
}
],
diff --git a/data/maps/VerdanturfTown_House/scripts.inc b/data/maps/VerdanturfTown_House/scripts.inc
index c6028c784..5f47e52fa 100644
--- a/data/maps/VerdanturfTown_House/scripts.inc
+++ b/data/maps/VerdanturfTown_House/scripts.inc
@@ -1,21 +1,21 @@
VerdanturfTown_House_MapScripts:: @ 820335E
.byte 0
-VerdanturfTown_House_EventScript_20335F:: @ 820335F
- msgbox VerdanturfTown_House_Text_203371, MSGBOX_NPC
+VerdanturfTown_House_EventScript_Woman1:: @ 820335F
+ msgbox VerdanturfTown_House_Text_TrainersGatherAtPokemonLeague, MSGBOX_NPC
end
-VerdanturfTown_House_EventScript_203368:: @ 8203368
- msgbox VerdanturfTown_House_Text_2033EE, MSGBOX_NPC
+VerdanturfTown_House_EventScript_Woman2:: @ 8203368
+ msgbox VerdanturfTown_House_Text_DefeatEliteFourInARow, MSGBOX_NPC
end
-VerdanturfTown_House_Text_203371: @ 8203371
+VerdanturfTown_House_Text_TrainersGatherAtPokemonLeague: @ 8203371
.string "Far away, deep in EVER GRANDE CITY,\n"
.string "is the POKéMON LEAGUE.\p"
.string "The TRAINERS who gather there are\n"
.string "all frighteningly well skilled.$"
-VerdanturfTown_House_Text_2033EE: @ 82033EE
+VerdanturfTown_House_Text_DefeatEliteFourInARow: @ 82033EE
.string "In the POKéMON LEAGUE, I think the\n"
.string "rules say that you have to battle the\l"
.string "ELITE FOUR all in a row.\p"
diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json
index 514b2581e..c09a61274 100644
--- a/data/maps/VerdanturfTown_WandasHouse/map.json
+++ b/data/maps/VerdanturfTown_WandasHouse/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "VerdanturfTown_WandasHouse_EventScript_2028BF",
+ "script": "VerdanturfTown_WandasHouse_EventScript_Wally",
"flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY"
},
{
@@ -37,8 +37,8 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "VerdanturfTown_WandasHouse_EventScript_202913",
- "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN"
+ "script": "VerdanturfTown_WandasHouse_EventScript_WandasBoyfriend",
+ "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND"
},
{
"graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "VerdanturfTown_WandasHouse_EventScript_2028E1",
+ "script": "VerdanturfTown_WandasHouse_EventScript_WallysUncle",
"flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "VerdanturfTown_WandasHouse_EventScript_20294E",
+ "script": "VerdanturfTown_WandasHouse_EventScript_WallysAunt",
"flag": "0"
},
{
@@ -76,8 +76,8 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "VerdanturfTown_WandasHouse_EventScript_20291C",
- "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN"
+ "script": "VerdanturfTown_WandasHouse_EventScript_Wanda",
+ "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA"
}
],
"warp_events": [
diff --git a/data/maps/VerdanturfTown_WandasHouse/scripts.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc
index c63aa3fa1..25d37a762 100644
--- a/data/maps/VerdanturfTown_WandasHouse/scripts.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc
@@ -1,88 +1,88 @@
VerdanturfTown_WandasHouse_MapScripts:: @ 82028BE
.byte 0
-VerdanturfTown_WandasHouse_EventScript_2028BF:: @ 82028BF
+VerdanturfTown_WandasHouse_EventScript_Wally:: @ 82028BF
lock
faceplayer
- goto_if_set FLAG_WALLY_SPEECH, VerdanturfTown_WandasHouse_EventScript_2028D7
- msgbox VerdanturfTown_WandasHouse_Text_202993, MSGBOX_DEFAULT
+ goto_if_set FLAG_WALLY_SPEECH, VerdanturfTown_WandasHouse_EventScript_WallyShortSpeech
+ msgbox VerdanturfTown_WandasHouse_Text_StrongerSpeech, MSGBOX_DEFAULT
setflag FLAG_WALLY_SPEECH
release
end
-VerdanturfTown_WandasHouse_EventScript_2028D7:: @ 82028D7
- msgbox VerdanturfTown_WandasHouse_Text_202ABE, MSGBOX_DEFAULT
+VerdanturfTown_WandasHouse_EventScript_WallyShortSpeech:: @ 82028D7
+ msgbox VerdanturfTown_WandasHouse_Text_StrongerSpeechShort, MSGBOX_DEFAULT
release
end
-VerdanturfTown_WandasHouse_EventScript_2028E1:: @ 82028E1
+VerdanturfTown_WandasHouse_EventScript_WallysUncle:: @ 82028E1
lock
faceplayer
- goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_202909
- goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_2028FF
- msgbox VerdanturfTown_WandasHouse_Text_202B37, MSGBOX_DEFAULT
+ goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_WallysUncleEverGrande
+ goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_WallysUncleSlippedOff
+ msgbox VerdanturfTown_WandasHouse_Text_WallysNextDoor, MSGBOX_DEFAULT
release
end
-VerdanturfTown_WandasHouse_EventScript_2028FF:: @ 82028FF
- msgbox VerdanturfTown_WandasHouse_Text_202C20, MSGBOX_DEFAULT
+VerdanturfTown_WandasHouse_EventScript_WallysUncleSlippedOff:: @ 82028FF
+ msgbox VerdanturfTown_WandasHouse_Text_WallySlippedOff, MSGBOX_DEFAULT
release
end
-VerdanturfTown_WandasHouse_EventScript_202909:: @ 8202909
- msgbox VerdanturfTown_WandasHouse_Text_202C4E, MSGBOX_DEFAULT
+VerdanturfTown_WandasHouse_EventScript_WallysUncleEverGrande:: @ 8202909
+ msgbox VerdanturfTown_WandasHouse_Text_WallyGoneThatFar, MSGBOX_DEFAULT
release
end
-VerdanturfTown_WandasHouse_EventScript_202913:: @ 8202913
- msgbox VerdanturfTown_WandasHouse_Text_202E00, MSGBOX_NPC
+VerdanturfTown_WandasHouse_EventScript_WandasBoyfriend:: @ 8202913
+ msgbox VerdanturfTown_WandasHouse_Text_CanSeeGirlfriendEveryDay, MSGBOX_NPC
end
-VerdanturfTown_WandasHouse_EventScript_20291C:: @ 820291C
+VerdanturfTown_WandasHouse_EventScript_Wanda:: @ 820291C
lock
faceplayer
- goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_202944
- goto_if_set FLAG_DEFEATED_WALLY_MAUVILLE, VerdanturfTown_WandasHouse_EventScript_20293A
- msgbox VerdanturfTown_WandasHouse_Text_202D91, MSGBOX_DEFAULT
+ goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_WandaDontWorry
+ goto_if_set FLAG_DEFEATED_WALLY_MAUVILLE, VerdanturfTown_WandasHouse_EventScript_MeetWanda
+ msgbox VerdanturfTown_WandasHouse_Text_DontWorryAboutWally, MSGBOX_DEFAULT
release
end
-VerdanturfTown_WandasHouse_EventScript_20293A:: @ 820293A
- msgbox VerdanturfTown_WandasHouse_Text_202CCF, MSGBOX_DEFAULT
+VerdanturfTown_WandasHouse_EventScript_MeetWanda:: @ 820293A
+ msgbox VerdanturfTown_WandasHouse_Text_MeetWanda, MSGBOX_DEFAULT
release
end
-VerdanturfTown_WandasHouse_EventScript_202944:: @ 8202944
- msgbox VerdanturfTown_WandasHouse_Text_202D91, MSGBOX_DEFAULT
+VerdanturfTown_WandasHouse_EventScript_WandaDontWorry:: @ 8202944
+ msgbox VerdanturfTown_WandasHouse_Text_DontWorryAboutWally, MSGBOX_DEFAULT
release
end
-VerdanturfTown_WandasHouse_EventScript_20294E:: @ 820294E
+VerdanturfTown_WandasHouse_EventScript_WallysAunt:: @ 820294E
lock
faceplayer
- goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_202989
- goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_20297F
- goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_WandasHouse_EventScript_202975
- msgbox VerdanturfTown_WandasHouse_Text_202E47, MSGBOX_DEFAULT
+ goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_WallysAuntEverGrande
+ goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_WallysAuntAnythingHappened
+ goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_WandasHouse_EventScript_WallysAuntTunnelOpen
+ msgbox VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendDriven, MSGBOX_DEFAULT
release
end
-VerdanturfTown_WandasHouse_EventScript_202975:: @ 8202975
- msgbox VerdanturfTown_WandasHouse_Text_202F19, MSGBOX_DEFAULT
+VerdanturfTown_WandasHouse_EventScript_WallysAuntTunnelOpen:: @ 8202975
+ msgbox VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendWasDigging, MSGBOX_DEFAULT
release
end
-VerdanturfTown_WandasHouse_EventScript_20297F:: @ 820297F
- msgbox VerdanturfTown_WandasHouse_Text_202F73, MSGBOX_DEFAULT
+VerdanturfTown_WandasHouse_EventScript_WallysAuntAnythingHappened:: @ 820297F
+ msgbox VerdanturfTown_WandasHouse_Text_IfAnythingHappenedToWally, MSGBOX_DEFAULT
release
end
-VerdanturfTown_WandasHouse_EventScript_202989:: @ 8202989
- msgbox VerdanturfTown_WandasHouse_Text_202FDB, MSGBOX_DEFAULT
+VerdanturfTown_WandasHouse_EventScript_WallysAuntEverGrande:: @ 8202989
+ msgbox VerdanturfTown_WandasHouse_Text_WallyWasInEverGrande, MSGBOX_DEFAULT
release
end
-VerdanturfTown_WandasHouse_Text_202993: @ 8202993
+VerdanturfTown_WandasHouse_Text_StrongerSpeech: @ 8202993
.string "WALLY: I lost to you, {PLAYER}, but I'm\n"
.string "not feeling down anymore.\p"
.string "Because I have a new purpose in life.\n"
@@ -94,13 +94,13 @@ VerdanturfTown_WandasHouse_Text_202993: @ 8202993
.string "When I do, I'm going to challenge you\n"
.string "to another battle.$"
-VerdanturfTown_WandasHouse_Text_202ABE: @ 8202ABE
+VerdanturfTown_WandasHouse_Text_StrongerSpeechShort: @ 8202ABE
.string "WALLY: Please watch me, {PLAYER}.\n"
.string "I'm going to get stronger than you.\p"
.string "When I do, I'm going to challenge you\n"
.string "to another battle.$"
-VerdanturfTown_WandasHouse_Text_202B37: @ 8202B37
+VerdanturfTown_WandasHouse_Text_WallysNextDoor: @ 8202B37
.string "UNCLE: Oh! {PLAYER}{KUN}!\n"
.string "WALLY's next door.\p"
.string "But, boy, there's something I have to\n"
@@ -111,18 +111,18 @@ VerdanturfTown_WandasHouse_Text_202B37: @ 8202B37
.string "It could be POKéMON that are giving\l"
.string "the boy hope.$"
-VerdanturfTown_WandasHouse_Text_202C20: @ 8202C20
+VerdanturfTown_WandasHouse_Text_WallySlippedOff: @ 8202C20
.string "WALLY's gone away…\n"
.string "He slipped off on his own…$"
-VerdanturfTown_WandasHouse_Text_202C4E: @ 8202C4E
+VerdanturfTown_WandasHouse_Text_WallyGoneThatFar: @ 8202C4E
.string "UNCLE: Is that right?\n"
.string "WALLY's gone away that far all by\l"
.string "himself…\p"
.string "Well, I have to give him credit--he is\n"
.string "my little brother's son.$"
-VerdanturfTown_WandasHouse_Text_202CCF: @ 8202CCF
+VerdanturfTown_WandasHouse_Text_MeetWanda: @ 8202CCF
.string "WANDA: You are?\n"
.string "Oh, right, I get it!\p"
.string "You're the {PLAYER} who WALLY was\n"
@@ -132,18 +132,18 @@ VerdanturfTown_WandasHouse_Text_202CCF: @ 8202CCF
.string "I think WALLY's become a lot more lively\n"
.string "and healthy since he came here.$"
-VerdanturfTown_WandasHouse_Text_202D91: @ 8202D91
+VerdanturfTown_WandasHouse_Text_DontWorryAboutWally: @ 8202D91
.string "WANDA: Don't worry about WALLY.\n"
.string "He'll be just fine.\p"
.string "I know my little cousin, and he has\n"
.string "POKéMON with him, too.$"
-VerdanturfTown_WandasHouse_Text_202E00: @ 8202E00
+VerdanturfTown_WandasHouse_Text_CanSeeGirlfriendEveryDay: @ 8202E00
.string "Thanks to you, I can see my girlfriend\n"
.string "every day.\l"
.string "Happy? You bet I am!$"
-VerdanturfTown_WandasHouse_Text_202E47: @ 8202E47
+VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendDriven: @ 8202E47
.string "My daughter's boyfriend is a very\n"
.string "driven and passionate sort of person.\p"
.string "He's been digging a tunnel nonstop\n"
@@ -151,17 +151,17 @@ VerdanturfTown_WandasHouse_Text_202E47: @ 8202E47
.string "My daughter's a little concerned,\n"
.string "so she goes out to the tunnel a lot.$"
-VerdanturfTown_WandasHouse_Text_202F19: @ 8202F19
+VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendWasDigging: @ 8202F19
.string "It's amazing. My daughter's boyfriend\n"
.string "was digging the tunnel by hand!\p"
.string "It's so incredible!$"
-VerdanturfTown_WandasHouse_Text_202F73: @ 8202F73
+VerdanturfTown_WandasHouse_Text_IfAnythingHappenedToWally: @ 8202F73
.string "If anything were to happen to WALLY,\n"
.string "I would never be able to look his\l"
.string "parents in PETALBURG in the eye…$"
-VerdanturfTown_WandasHouse_Text_202FDB: @ 8202FDB
+VerdanturfTown_WandasHouse_Text_WallyWasInEverGrande: @ 8202FDB
.string "WALLY was in EVER GRANDE?\p"
.string "His parents in PETALBURG would be\n"
.string "astonished to hear that!$"
diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc
index cba1c68ba..b1ecae203 100644
--- a/data/scripts/new_game.inc
+++ b/data/scripts/new_game.inc
@@ -138,9 +138,9 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER
setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
- setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN
+ setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND
setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE
- setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN
+ setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA
setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
setflag FLAG_HIDE_PETALBURG_GYM_WALLY
@@ -170,8 +170,8 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_ROUTE_116_MR_BRINEY
setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO
setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT
- setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN
- setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN
+ setflag FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND
+ setflag FLAG_HIDE_RUSTURF_TUNNEL_WANDA
setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE
setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1
setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 0ab22c1ef..4722593a9 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -847,8 +847,8 @@
#define FLAG_HIDE_MAUVILLE_CITY_WALLY 0x324
#define FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE 0x325
#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY 0x326
-#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN 0x327
-#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN 0x328
+#define FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND 0x327
+#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND 0x328
#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE 0x329
#define FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT 0x32A
#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL 0x32B
@@ -1023,8 +1023,8 @@
#define FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE 0x3D4
#define FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_VISIBLE 0x3D5
#define FLAG_HIDE_ROUTE_120_KECLEON_1 0x3D6
-#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN 0x3D7
-#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN 0x3D8
+#define FLAG_HIDE_RUSTURF_TUNNEL_WANDA 0x3D7
+#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA 0x3D8
#define FLAG_HIDE_ROUTE_120_KECLEON_2 0x3D9
#define FLAG_HIDE_ROUTE_120_KECLEON_3 0x3DA
#define FLAG_HIDE_ROUTE_120_KECLEON_4 0x3DB
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 06:44:24 +0000