diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
| commit | c94e5e9ab0b2b65c8c6275f84043807b2743d6f2 (patch) | |
| tree | b188427bb1942695f32e14ee3fe137855d638c8c /include/strings.h | |
| parent | 0643255c85d0ebd5212e731c9fad3b43d0d99a10 (diff) | |
| parent | ed16a7409ae9c808a110975dec1930f9f949a6d6 (diff) | |
Merge remote-tracking branch 'upstream/master' into port_matchings
Diffstat (limited to 'include/strings.h')
| -rw-r--r-- | include/strings.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/strings.h b/include/strings.h index 28dcec66b..b4783c3c4 100644 --- a/include/strings.h +++ b/include/strings.h @@ -338,12 +338,12 @@ extern const u8 gText_SwitchedPkmnItem[]; extern const u8 gText_BagFullCouldNotRemoveItem[]; extern const u8 gText_PkmnCantParticipate[]; extern const u8 gText_CancelParticipation[]; -extern const u8 gUnknown_8417494[]; +extern const u8 gText_OakThisIsListOfPokemon[]; extern const u8 gMenuText_Confirm[]; extern const u8 gText_MaleSymbol[]; extern const u8 gText_FemaleSymbol[]; extern const u8 gText_Slash[]; -extern const u8 gUnknown_8417457[]; +extern const u8 gText_OakImportantToGetToKnowPokemonThroughly[]; extern const u8 gText_PkmnNotHolding[]; extern const u8 gText_PCMailboxFull[]; extern const u8 gText_MailSentToPC[]; |