summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2020-03-19 08:45:32 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2020-03-19 08:45:32 -0400
commite078e4b315532c5a309425df6bf450abbf7bba04 (patch)
tree1db50ab37e88520834c1497a56c17f6fff58d869 /data
parent15a3adefa01b0bff99cd13442026551ce7ef1ac2 (diff)
Some documentation of field_control_avatar and related routines
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s4
-rw-r--r--data/maps/PalletTown/scripts.inc2
-rw-r--r--data/scripts/flavor_text.inc16
-rw-r--r--data/specials.inc4
-rw-r--r--data/text/flavor_text.inc8
5 files changed, 17 insertions, 17 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 43a56496e..b165ae6b9 100644
--- a/data/maps/PalletTown/scripts.inc
+++ b/data/maps/PalletTown/scripts.inc
@@ -450,7 +450,7 @@ PalletTown_EventScript_SignLadyShowSign:: @ 8165894
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/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/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$"