diff options
| author | Evan <eroelke@gmail.com> | 2019-11-21 09:31:40 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-21 09:31:40 -0700 |
| commit | 407d22af8e685076bc92f837266786dfe78e7123 (patch) | |
| tree | 11a039ad7737c105d4b81ae653ba899d342b6e57 /include/strings.h | |
| parent | e6bc189a033bb2019233dc99f2c1114053c7650d (diff) | |
| parent | 1234d0252cbe2b0001784b10b75f0d339824632d (diff) | |
fix PR merge conflicts
Diffstat (limited to 'include/strings.h')
| -rw-r--r-- | include/strings.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/strings.h b/include/strings.h index bef3ed7cb..7750b271c 100644 --- a/include/strings.h +++ b/include/strings.h @@ -688,7 +688,7 @@ extern const u8 gText_XWillBeSentToY[]; extern const u8 gText_ByeByeVar1[]; extern const u8 gText_XSentOverY[]; extern const u8 gText_TakeGoodCareOfX[]; -extern const u8 gUnknown_841E325[]; +extern const u8 gText_CommunicationStandby5[]; extern const u8 gTradeText_Cancel[]; extern const u8 gTradeText_ChooseAPokemon[]; extern const u8 gTradeText_Summary[]; @@ -788,4 +788,10 @@ extern const u8 gText_FrameType[]; extern const u8 gTextJP_Type[]; extern const u8 gText_PickSwitchCancel[]; +// evolution_scene +extern const u8 gText_PkmnIsEvolving[]; +extern const u8 gText_CongratsPkmnEvolved[]; +extern const u8 gText_EllipsisQuestionMark[]; +extern const u8 gText_PkmnStoppedEvolving[]; + #endif //GUARD_STRINGS_H |