diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/event_scripts.s | 2 | ||||
| -rw-r--r-- | data/specials.inc | 2 | ||||
| -rw-r--r-- | data/strings.s | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 89099c58f..c07f400a1 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -13968,7 +13968,7 @@ EventScript_1C4F26:: @ 81C4F26 end EventScript_1C4F30:: @ 81C4F30 - special sub_812781C + special ChooseMonForMoveTutor waitstate lock faceplayer diff --git a/data/specials.inc b/data/specials.inc index 148da72dc..74ba0c849 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -405,7 +405,7 @@ gSpecials:: @ 815FD60 def_special get_unknown_box_id def_special Special_OpenMuseumFossilPic def_special Special_CloseMuseumFossilPic - def_special sub_812781C + def_special ChooseMonForMoveTutor def_special ChooseMonForWirelessMinigame def_special SetBattledTrainerFlag def_special sub_812B35C diff --git a/data/strings.s b/data/strings.s index 35548d0dc..628bbda28 100644 --- a/data/strings.s +++ b/data/strings.s @@ -859,27 +859,27 @@ gUnknown_84169F8:: @ 84169F8 .string "This can't be used on\n" .string "that POKéMON.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416A1E:: @ 8416A1E +gText_PkmnCantSwitchOut:: @ 8416A1E .string "{STR_VAR_1} can't be switched\n" .string "out!{PAUSE_UNTIL_PRESS}$" -gUnknown_8416A3A:: @ 8416A3A +gText_PkmnAlreadyInBattle:: @ 8416A3A .string "{STR_VAR_1} is already\n" .string "in battle!{PAUSE_UNTIL_PRESS}$" -gUnknown_8416A55:: @ 8416A55 +gText_PkmnAlreadySelected:: @ 8416A55 .string "{STR_VAR_1} has already been\n" .string "selected.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416A75:: @ 8416A75 +gText_PkmnHasNoEnergy:: @ 8416A75 .string "{STR_VAR_1} has no energy\n" .string "left to battle!{PAUSE_UNTIL_PRESS}$" -gUnknown_8416A98:: @ 8416A98 +gText_CantSwitchWithAlly:: @ 8416A98 .string "You can't switch {STR_VAR_1}'s\n" .string "POKéMON with one of yours!{PAUSE_UNTIL_PRESS}$" -gUnknown_8416ACB:: @ 8416ACB +gText_EggCantBattle:: @ 8416ACB .string "An EGG can't battle!{PAUSE_UNTIL_PRESS}$" gText_CantUseUntilNewBadge:: @ 8416AE2 @@ -908,7 +908,7 @@ gText_MailMessageWillBeLost:: @ 8416BC3 .string "If the MAIL is removed, the\n" .string "message will be lost. Okay?$" -gUnknown_8416BFB:: @ 8416BFB +gText_RemoveMailBeforeItem:: @ 8416BFB .string "MAIL must be removed before\n" .string "holding an item.{PAUSE_UNTIL_PRESS}$" |