diff options
| author | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
| commit | b18ec47b1393d562655e50d30acb3de191423581 (patch) | |
| tree | 7959a1477120baf656599794b423aa8cc11ea0c0 /include/strings.h | |
| parent | 359d345913d7f5ed36c34ede5476fff946318ffd (diff) | |
| parent | 2d284654440cb77365639bf107c31b44326362e3 (diff) | |
fix conflicts
Diffstat (limited to 'include/strings.h')
| -rw-r--r-- | include/strings.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/include/strings.h b/include/strings.h index 89149a8eb..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[]; @@ -780,11 +780,18 @@ extern const u8 gText_BattleStyleShift[]; extern const u8 gText_BattleStyleSet[]; extern const u8 gText_SoundMono[]; extern const u8 gText_SoundStereo[]; -extern const u8 gText_ButtonTypeNormal[]; +extern const u8 gText_ButtonTypeHelp[]; extern const u8 gText_ButtonTypeLR[]; extern const u8 gText_ButtonTypeLEqualsA[]; -extern const u8 gText_MenuOptionOption[]; +extern const u8 gText_MenuOption[]; 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 |