diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
| commit | b22d3a821d8656d9fb88000ce02e5b885a59e1c3 (patch) | |
| tree | 7d4054b0df9f5746b3e31623868bf7d604ae7328 /include/strings.h | |
| parent | 8626240b54d87449e5db70345840ccf20717d8c7 (diff) | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into modern_gcc
Diffstat (limited to 'include/strings.h')
| -rw-r--r-- | include/strings.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/strings.h b/include/strings.h index 6979f6757..57db7d509 100644 --- a/include/strings.h +++ b/include/strings.h @@ -169,7 +169,7 @@ extern const u8 gText_WithdrawItem[]; extern const u8 gText_Withdraw[]; extern const u8 gText_ReturnToPC[]; -extern const u8 gUnknown_8416425[]; +extern const u8 gText_OakForbidsUseOfItemHere[]; extern const u8 gUnknown_8416451[]; extern const u8 gUnknown_8416537[]; extern const u8 gUnknown_841658C[]; @@ -838,7 +838,7 @@ extern const u8 gText_SixIsland[]; extern const u8 gText_SevenIsland[]; // trade -extern const u8 gUnknown_841E0A5[]; +extern const u8 gText_IsThisTradeOkay[]; extern const u8 gText_XWillBeSentToY[]; extern const u8 gText_ByeByeVar1[]; extern const u8 gText_XSentOverY[]; @@ -861,7 +861,7 @@ extern const u8 gUnknown_841E1C5[]; extern const u8 gText_PkmnCantBeTradedNow[]; extern const u8 gText_EggCantBeTradedNow[]; extern const u8 gText_OtherTrainersPkmnCantBeTraded[]; -extern const u8 gUnknown_841E09F[]; +extern const u8 gText_4Qmark[]; extern const u8 gEasyChatGroupName_Pokemon[]; extern const u8 gEasyChatGroupName_Trainer[]; |