Merge pull request #307 from PikalaxALT/field_control_avatar

Field control avatar

8 files changed, 22 insertions, 22 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index 0940cf955..a4dbd9854 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1161,8 +1161,8 @@ EventScript_GetElevatorFloor:: @ 81A7AB9
 
 	.include "data/scripts/aide.inc"
 
-gUnknown_81A7ADB:: @ 81A7ADB
-	special sub_80CADC4
+EventScript_CancelMessageBox:: @ 81A7ADB
+	special DoPicboxCancel
 	release
 	end
 
diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc
index eb8904713..b165ae6b9 100644
--- a/data/maps/PalletTown/scripts.inc
+++ b/data/maps/PalletTown/scripts.inc
@@ -18,7 +18,7 @@ PalletTown_OnTransition:: @ 8165465
 	end
 
 PalletTown_EventScript_TryReadySignLady:: @ 8165488
-	goto_if_unset FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_Return
+	goto_if_unset FLAG_OPENED_START_MENU, EventScript_Return
 	compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
 	goto_if_ge EventScript_Return
 	setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
@@ -447,10 +447,10 @@ PalletTown_EventScript_SignLadyShowSign:: @ 8165894
 	closemessage
 	delay 20
 	textcolor 3
-	setflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN
+	setflag FLAG_OPENED_START_MENU
 	setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
 	setvar SIGN_LADY_READY, FALSE
-	special sub_80699E0
+	special SetWalkingIntoSignVars
 	special sub_80699BC
 	signmsg
 	msgbox PalletTown_Text_PressStartToOpenMenuCopy
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
index 395d4d385..461318e35 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -1274,7 +1274,7 @@ PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter:: @ 8169D2F
 	playfanfare MUS_FAN5
 	waitfanfare
 	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
-	call_if_set FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, PalletTown_ProfessorOaksLab_EventScript_ReadyEndSignLadyScene
+	call_if_set FLAG_OPENED_START_MENU, PalletTown_ProfessorOaksLab_EventScript_ReadyEndSignLadyScene
 	release
 	end
 
diff --git a/data/scripts/flavor_text.inc b/data/scripts/flavor_text.inc
index 7ea879b04..29ea87a46 100644
--- a/data/scripts/flavor_text.inc
+++ b/data/scripts/flavor_text.inc
@@ -96,18 +96,18 @@ gUnknown_81A76D5:: @ 81A76D5
 	msgbox gUnknown_81C124B, MSGBOX_SIGN
 	end
 
-gUnknown_81A76DE:: @ 81A76DE
-	msgbox gUnknown_81C0ECB, MSGBOX_SIGN
+EventScript_PokemartSign:: @ 81A76DE
+	msgbox Text_PokemartSign, MSGBOX_SIGN
 	end
 
-gUnknown_81A76E7:: @ 81A76E7
-	msgbox gUnknown_81C0EF7, MSGBOX_SIGN
+EventScript_PokecenterSign:: @ 81A76E7
+	msgbox Text_PokecenterSign, MSGBOX_SIGN
 	end
 
-gUnknown_81A76F0:: @ 81A76F0
-	msgbox gUnknown_81C0F19, MSGBOX_SIGN
+EventScript_Indigo_UltimateGoal:: @ 81A76F0
+	msgbox Text_Indigo_UltimateGoal, MSGBOX_SIGN
 	end
 
-gUnknown_81A76F9:: @ 81A76F9
-	msgbox gUnknown_81C0F59, MSGBOX_SIGN
+EventScript_Indigo_HighestAuthority:: @ 81A76F9
+	msgbox Text_Indigo_HighestAuthority, MSGBOX_SIGN
 	end
diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc
index 961be1971..e89aabfba 100644
--- a/data/scripts/obtain_item.inc
+++ b/data/scripts/obtain_item.inc
@@ -158,7 +158,7 @@ EventScript_NoRoomToPickUpItem:: @ 81A682D
 	setvar VAR_RESULT, FALSE
 	return
 
-EventScript_FoundHiddenItem:: @ 81A6843
+EventScript_HiddenItemScript:: @ 81A6843
 	lockall
 	textcolor 3
 	waitse
diff --git a/data/scripts/test.inc b/data/scripts/test.inc
index bd0497209..f909dae57 100644
--- a/data/scripts/test.inc
+++ b/data/scripts/test.inc
@@ -2,7 +2,7 @@ Test_EventScript_NPC:: @ 81C5552
 	msgbox Test_Text_WelcomeToWorldOfPokemon, MSGBOX_NPC
 	end
 
-Test_EventScript_Sign:: @ 81C555B
+EventScript_TestSignpostMsg:: @ 81C555B
 	msgbox Test_Text_ThisIsASignpost, MSGBOX_SIGN
 	end
 
diff --git a/data/specials.inc b/data/specials.inc
index dbe9deebc..ab7309c32 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -354,7 +354,7 @@ gSpecials:: @ 815FD60
 	def_special ForcePlayerOntoBike
 	def_special ListMenu
 	def_special ReturnToListMenu
-	def_special sub_80CADC4
+	def_special DoPicboxCancel
 	def_special SetVermilionTrashCans
 	def_special sub_805D1A8
 	def_special SampleResortGorgeousMonAndReward
@@ -376,7 +376,7 @@ gSpecials:: @ 815FD60
 	def_special UnionRoomSpecial
 	def_special ShowWirelessCommunicationScreen
 	def_special EnableNationalPokedex
-	def_special sub_80699E0
+	def_special SetWalkingIntoSignVars
 	def_special sub_80699BC
 	def_special sub_810C3A4
 	def_special SetFlavorTextFlagFromSpecialVars
diff --git a/data/text/flavor_text.inc b/data/text/flavor_text.inc
index a3e46e8d8..993da0ecb 100644
--- a/data/text/flavor_text.inc
+++ b/data/text/flavor_text.inc
@@ -30,20 +30,20 @@ gUnknown_81C0E73:: @ 81C0E73
 gUnknown_81C0EAC:: @ 81C0EAC
 	.string "There's a pile of snacks here.$"
 
-gUnknown_81C0ECB:: @ 81C0ECB
+Text_PokemartSign:: @ 81C0ECB
 	.string "All your item needs fulfilled!\n"
 	.string "POKéMON MART$"
 
-gUnknown_81C0EF7:: @ 81C0EF7
+Text_PokecenterSign:: @ 81C0EF7
 	.string "Heal Your POKéMON!\n"
 	.string "POKéMON CENTER$"
 
-gUnknown_81C0F19:: @ 81C0F19
+Text_Indigo_UltimateGoal:: @ 81C0F19
 	.string "INDIGO PLATEAU\p"
 	.string "The ultimate goal of TRAINERS!\n"
 	.string "POKéMON LEAGUE HQ$"
 
-gUnknown_81C0F59:: @ 81C0F59
+Text_Indigo_HighestAuthority:: @ 81C0F59
 	.string "INDIGO PLATEAU\p"
 	.string "The highest POKéMON authority!\n"
 	.string "POKéMON LEAGUE HQ$"