Merge remote-tracking branch 'upstream/master' into use_pokeblock

# Conflicts:
#	include/menu_specialized.h

11 files changed, 55 insertions, 55 deletions

diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc
index 5c1af6700..b502da8ec 100644
--- a/data/maps/BattleFrontier_OutsideEast/scripts.inc
+++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc
@@ -121,7 +121,7 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
 	playse 269
 	applymovement 14, BattleFrontier_OutsideEast_Movement_242D69
 	waitmovement 0
-	msgbox gUnknown_082731BD, MSGBOX_DEFAULT
+	msgbox gText_Sudowoodo_Attacked, MSGBOX_DEFAULT
 	closemessage
 	waitse
 	playmoncry SPECIES_SUDOWOODO, 2
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
index f1c974dd9..4e292a1f9 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
@@ -151,7 +151,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
 	giveitem VAR_TEMP_0, 1
 	bufferitemname 1, VAR_TEMP_0
 	bufferstdstring 2, 14
-	msgbox gUnknown_08272A9A, MSGBOX_DEFAULT
+	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
 	random 64
 	compare VAR_RESULT, 0
 	goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_220436
@@ -163,7 +163,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
 	giveitem VAR_TEMP_0, 1
 	bufferitemname 1, VAR_TEMP_0
 	bufferstdstring 2, 14
-	msgbox gUnknown_08272A9A, MSGBOX_DEFAULT
+	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
 	random 64
 	compare VAR_RESULT, 0
 	goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_220436
@@ -175,7 +175,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
 	giveitem VAR_TEMP_0, 1
 	bufferitemname 1, VAR_TEMP_0
 	bufferstdstring 2, 14
-	msgbox gUnknown_08272A9A, MSGBOX_DEFAULT
+	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_220436
 	end
 
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
index b553cf65b..a49c51499 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
@@ -257,7 +257,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626
 	setvar VAR_0x8004, 1
 	special DoPCTurnOnEffect
 	playse SE_PC_ON
-	msgbox gUnknown_08272D87, MSGBOX_DEFAULT
+	msgbox gText_PlayerHouseBootPC, MSGBOX_DEFAULT
 	special BedroomPC
 	waitstate
 	releaseall
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
index 49a9523e0..76bf7d6a8 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
@@ -315,7 +315,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576
 	setvar VAR_0x8004, 2
 	special DoPCTurnOnEffect
 	playse SE_PC_ON
-	msgbox gUnknown_08272D87, MSGBOX_DEFAULT
+	msgbox gText_PlayerHouseBootPC, MSGBOX_DEFAULT
 	special BedroomPC
 	waitstate
 	releaseall
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index c02381982..a3ad4dff7 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -347,7 +347,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1
 	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
 	removeobject 4
-	msgbox gUnknown_08273374, MSGBOX_YESNO
+	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
 	call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
@@ -358,7 +358,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC
 	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
 	removeobject 4
-	msgbox gUnknown_08273374, MSGBOX_YESNO
+	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2
 	call LittlerootTown_ProfessorBirchsLab_EventScript_273797
@@ -392,7 +392,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142
 	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
 	removeobject 5
-	msgbox gUnknown_08273374, MSGBOX_YESNO
+	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
 	call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
@@ -403,7 +403,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D
 	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
 	removeobject 5
-	msgbox gUnknown_08273374, MSGBOX_YESNO
+	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193
 	call LittlerootTown_ProfessorBirchsLab_EventScript_273797
@@ -437,7 +437,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3
 	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
 	removeobject 6
-	msgbox gUnknown_08273374, MSGBOX_YESNO
+	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
 	call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
@@ -448,7 +448,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E
 	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
 	removeobject 6
-	msgbox gUnknown_08273374, MSGBOX_YESNO
+	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234
 	call LittlerootTown_ProfessorBirchsLab_EventScript_273797
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
index 15b94133d..b3a704443 100644
--- a/data/maps/MossdeepCity_StevensHouse/scripts.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -95,7 +95,7 @@ MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865
 
 MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895
 	call MossdeepCity_StevensHouse_EventScript_2228EB
-	msgbox gUnknown_08273374, MSGBOX_YESNO
+	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_StevensHouse_EventScript_222901
 	call MossdeepCity_StevensHouse_EventScript_27378B
@@ -105,7 +105,7 @@ MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895
 
 MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD
 	call MossdeepCity_StevensHouse_EventScript_2228EB
-	msgbox gUnknown_08273374, MSGBOX_YESNO
+	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_StevensHouse_EventScript_2228E0
 	call MossdeepCity_StevensHouse_EventScript_273797
diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc
index 7902cb95d..3ce8cfd5e 100644
--- a/data/maps/Route110_TrickHouseEnd/scripts.inc
+++ b/data/maps/Route110_TrickHouseEnd/scripts.inc
@@ -45,7 +45,7 @@ Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17
 	faceplayer
 	msgbox Route110_TrickHouseEnd_Text_26B08D, MSGBOX_DEFAULT
 	setvar VAR_TEMP_2, 1
-	switch VAR_0x4044
+	switch VAR_TRICK_HOUSE_LEVEL
 	case 0, Route110_TrickHouseEnd_EventScript_26AD84
 	case 1, Route110_TrickHouseEnd_EventScript_26ADC0
 	case 2, Route110_TrickHouseEnd_EventScript_26ADFC
@@ -196,7 +196,7 @@ Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF
 	applymovement 1, Route110_TrickHouseEnd_Movement_269E3F
 	waitmovement 0
 	removeobject 1
-	addvar VAR_0x4044, 1
+	addvar VAR_TRICK_HOUSE_LEVEL, 1
 	return
 
 Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF
diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc
index a83d50dc3..e1439d8d4 100644
--- a/data/maps/Route110_TrickHouseEntrance/scripts.inc
+++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc
@@ -27,7 +27,7 @@ Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60
 
 Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7
 	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
-	compare VAR_0x4044, 8
+	compare VAR_TRICK_HOUSE_LEVEL, 8
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_269AED
 	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2
 	end
@@ -44,21 +44,21 @@ Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3
 
 Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03
 	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
-	compare VAR_0x4044, 1
+	compare VAR_TRICK_HOUSE_LEVEL, 1
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269B61
-	compare VAR_0x4044, 2
+	compare VAR_TRICK_HOUSE_LEVEL, 2
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269B6B
-	compare VAR_0x4044, 3
+	compare VAR_TRICK_HOUSE_LEVEL, 3
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269B75
-	compare VAR_0x4044, 4
+	compare VAR_TRICK_HOUSE_LEVEL, 4
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269B7F
-	compare VAR_0x4044, 5
+	compare VAR_TRICK_HOUSE_LEVEL, 5
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269B89
-	compare VAR_0x4044, 6
+	compare VAR_TRICK_HOUSE_LEVEL, 6
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269B93
-	compare VAR_0x4044, 7
+	compare VAR_TRICK_HOUSE_LEVEL, 7
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269B9D
-	compare VAR_0x4044, 8
+	compare VAR_TRICK_HOUSE_LEVEL, 8
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269BA7
 	return
 
@@ -139,7 +139,7 @@ Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15
 Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26
 	addobject 1
 	hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	switch VAR_0x4044
+	switch VAR_TRICK_HOUSE_LEVEL
 	case 0, Route110_TrickHouseEntrance_EventScript_269C8C
 	case 1, Route110_TrickHouseEntrance_EventScript_269C94
 	case 2, Route110_TrickHouseEntrance_EventScript_269C9C
@@ -205,7 +205,7 @@ Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE
 Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8
 	lockall
 	delay 20
-	compare VAR_0x4044, 0
+	compare VAR_TRICK_HOUSE_LEVEL, 0
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269E48
 	msgbox Route110_TrickHouseEntrance_Text_26A78C, MSGBOX_DEFAULT
 	closemessage
@@ -240,21 +240,21 @@ Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48
 	waitmovement 0
-	compare VAR_0x4044, 0
+	compare VAR_TRICK_HOUSE_LEVEL, 0
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269DEE
-	compare VAR_0x4044, 1
+	compare VAR_TRICK_HOUSE_LEVEL, 1
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269DF7
-	compare VAR_0x4044, 2
+	compare VAR_TRICK_HOUSE_LEVEL, 2
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269E00
-	compare VAR_0x4044, 3
+	compare VAR_TRICK_HOUSE_LEVEL, 3
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269E09
-	compare VAR_0x4044, 4
+	compare VAR_TRICK_HOUSE_LEVEL, 4
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269E12
-	compare VAR_0x4044, 5
+	compare VAR_TRICK_HOUSE_LEVEL, 5
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269E1B
-	compare VAR_0x4044, 6
+	compare VAR_TRICK_HOUSE_LEVEL, 6
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269E24
-	compare VAR_0x4044, 7
+	compare VAR_TRICK_HOUSE_LEVEL, 7
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269E2D
 	closemessage
 	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
@@ -343,19 +343,19 @@ Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT
-	compare VAR_0x4044, 1
+	compare VAR_TRICK_HOUSE_LEVEL, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_269EEF
-	compare VAR_0x4044, 2
+	compare VAR_TRICK_HOUSE_LEVEL, 2
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_269F1B
-	compare VAR_0x4044, 3
+	compare VAR_TRICK_HOUSE_LEVEL, 3
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_269F47
-	compare VAR_0x4044, 4
+	compare VAR_TRICK_HOUSE_LEVEL, 4
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_269F73
-	compare VAR_0x4044, 5
+	compare VAR_TRICK_HOUSE_LEVEL, 5
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_269F9F
-	compare VAR_0x4044, 6
+	compare VAR_TRICK_HOUSE_LEVEL, 6
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_269FCB
-	compare VAR_0x4044, 7
+	compare VAR_TRICK_HOUSE_LEVEL, 7
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_269FF7
 	end
 
@@ -510,7 +510,7 @@ Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_26A1A7
 	waitmovement 0
-	switch VAR_0x4044
+	switch VAR_TRICK_HOUSE_LEVEL
 	case 0, Route110_TrickHouseEntrance_EventScript_26A1A9
 	case 1, Route110_TrickHouseEntrance_EventScript_26A1B4
 	case 2, Route110_TrickHouseEntrance_EventScript_26A1BF
@@ -579,7 +579,7 @@ Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B
-	compare VAR_0x4044, 8
+	compare VAR_TRICK_HOUSE_LEVEL, 8
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A220
 	msgbox Route110_TrickHouseEntrance_Text_26A878, MSGBOX_DEFAULT
 	releaseall
@@ -592,7 +592,7 @@ Route110_TrickHouseEntrance_EventScript_26A220:: @ 826A220
 
 Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A
 	lockall
-	switch VAR_0x4044
+	switch VAR_TRICK_HOUSE_LEVEL
 	case 0, Route110_TrickHouseEntrance_EventScript_26A289
 	case 1, Route110_TrickHouseEntrance_EventScript_26A2B2
 	case 2, Route110_TrickHouseEntrance_EventScript_26A2DB
@@ -727,11 +727,11 @@ Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8
 	lockall
 	msgbox Route110_TrickHouseEntrance_Text_26A474, MSGBOX_DEFAULT
 	releaseall
-	compare VAR_0x4044, 0
+	compare VAR_TRICK_HOUSE_LEVEL, 0
 	call_if_eq Route110_TrickHouseEntrance_EventScript_26A429
-	compare VAR_0x4044, 1
+	compare VAR_TRICK_HOUSE_LEVEL, 1
 	call_if_eq Route110_TrickHouseEntrance_EventScript_26A439
-	compare VAR_0x4044, 2
+	compare VAR_TRICK_HOUSE_LEVEL, 2
 	call_if_eq Route110_TrickHouseEntrance_EventScript_26A449
 	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
 	end
diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
index fa2664d68..e41960fde 100644
--- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
@@ -94,7 +94,7 @@ Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D
 
 Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085
 	call Route119_WeatherInstitute_2F_EventScript_2700DB
-	msgbox gUnknown_08273374, MSGBOX_YESNO
+	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700EA
 	call Route119_WeatherInstitute_2F_EventScript_27378B
@@ -104,7 +104,7 @@ Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085
 
 Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD
 	call Route119_WeatherInstitute_2F_EventScript_2700DB
-	msgbox gUnknown_08273374, MSGBOX_YESNO
+	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700D0
 	call Route119_WeatherInstitute_2F_EventScript_273797
diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
index 5c6138c6c..fab587fb7 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
@@ -167,7 +167,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E
 
 RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E
 	call RustboroCity_DevonCorp_2F_EventScript_211AC4
-	msgbox gUnknown_08273374, MSGBOX_YESNO
+	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AD7
 	call RustboroCity_DevonCorp_2F_EventScript_27378B
@@ -177,7 +177,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E
 
 RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96
 	call RustboroCity_DevonCorp_2F_EventScript_211AC4
-	msgbox gUnknown_08273374, MSGBOX_YESNO
+	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AB9
 	call RustboroCity_DevonCorp_2F_EventScript_273797
@@ -216,7 +216,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1
 
 RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11
 	call RustboroCity_DevonCorp_2F_EventScript_211B67
-	msgbox gUnknown_08273374, MSGBOX_YESNO
+	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B7A
 	call RustboroCity_DevonCorp_2F_EventScript_27378B
@@ -226,7 +226,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11
 
 RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39
 	call RustboroCity_DevonCorp_2F_EventScript_211B67
-	msgbox gUnknown_08273374, MSGBOX_YESNO
+	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B5C
 	call RustboroCity_DevonCorp_2F_EventScript_273797
diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc
index d08b0b554..dccdac1b4 100644
--- a/data/maps/SkyPillar_Top/scripts.inc
+++ b/data/maps/SkyPillar_Top/scripts.inc
@@ -87,7 +87,7 @@ SkyPillar_Top_EventScript_239785:: @ 8239785
 	removeobject VAR_LAST_TALKED
 	fadescreenswapbuffers 0
 	bufferspeciesname 0, VAR_0x8004
-	msgbox gUnknown_08273204, MSGBOX_DEFAULT
+	msgbox gText_LegendaryFlewAway, MSGBOX_DEFAULT
 	releaseall
 	end