diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-19 11:00:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-19 11:00:32 -0400 |
| commit | 33b65b547000387fcdce9fe497da9b217544ece6 (patch) | |
| tree | 0c1754c67d188776ee1942fcca503ad8e1e19f05 /data/scripts | |
| parent | 715c2ff3ad3a7842a97a2b221f4c02135a813139 (diff) | |
| parent | a8403c07790b1031c96ff35a1701e1684919ed95 (diff) | |
Merge pull request #307 from PikalaxALT/field_control_avatar
Field control avatar
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/flavor_text.inc | 16 | ||||
| -rw-r--r-- | data/scripts/obtain_item.inc | 2 | ||||
| -rw-r--r-- | data/scripts/test.inc | 2 |
3 files changed, 10 insertions, 10 deletions
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 |