Merge remote-tracking branch 'upstream' into tustin2121-patch-5

2 files changed, 35 insertions, 35 deletions

diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json
index 863319184..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"
     }
   ],
@@ -104,14 +104,14 @@
       "x": 6,
       "y": 17,
       "elevation": 0,
-      "dest_map": "MAP_FALLARBOR_TOWN_HOUSE1",
+      "dest_map": "MAP_FALLARBOR_TOWN_COZMOS_HOUSE",
       "dest_warp_id": 0
     },
     {
       "x": 1,
       "y": 6,
       "elevation": 0,
-      "dest_map": "MAP_FALLARBOR_TOWN_HOUSE2",
+      "dest_map": "MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE",
       "dest_warp_id": 0
     }
   ],
@@ -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..a94c81ae9 100644
--- a/data/maps/FallarborTown/scripts.inc
+++ b/data/maps/FallarborTown/scripts.inc
@@ -4,74 +4,74 @@ FallarborTown_MapScripts:: @ 81EB1FA
 
 FallarborTown_OnTransition: @ 81EB200
 	setflag FLAG_VISITED_FALLARBOR_TOWN
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
+	setvar VAR_CONTEST_HALL_STATE, 0
 	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.”$"