diff options
| author | Evan <eroelke@gmail.com> | 2019-12-04 21:35:31 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-12-04 21:35:31 -0700 |
| commit | 9f2a53eec3a34f6f675ac41e4b17bb8011025f4f (patch) | |
| tree | 08d7f406ee1add06123f3ea846416aebbc6b9b99 /include/strings.h | |
| parent | c8b22e2680d64f3a52e8f9ba8ccc81de9480ad5f (diff) | |
| parent | 67f48e5f28b1773d3570630540a082e99f7cab4e (diff) | |
fix merge conflicts
Diffstat (limited to 'include/strings.h')
| -rw-r--r-- | include/strings.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/strings.h b/include/strings.h index e55cb02f5..d71d94d48 100644 --- a/include/strings.h +++ b/include/strings.h @@ -97,6 +97,7 @@ extern const u8 gOtherText_Toss[]; extern const u8 gOtherText_Give[]; extern const u8 gOtherText_Exit[]; extern const u8 gText_ThreeHyphens[]; +extern const u8 gText_SevenHyphens[]; extern const u8 gOtherText_UnkF9_08_Clear_01[]; extern const u8 gText_TimesStrVar1[]; extern const u8 gText_IsSelected[]; @@ -928,4 +929,18 @@ extern const u8 gText_CongratsPkmnEvolved[]; extern const u8 gText_EllipsisQuestionMark[]; extern const u8 gText_PkmnStoppedEvolving[]; +// shop +extern const u8 gText_ShopBuy[]; +extern const u8 gText_ShopSell[]; +extern const u8 gText_ShopQuit[]; +extern const u8 gText_CanIHelpWithAnythingElse[]; +extern const u8 gText_QuitShopping[]; +extern const u8 gText_PokedollarVar1[]; +extern const u8 gText_YouDontHaveMoney[]; +extern const u8 gText_Var1CertainlyHowMany[]; +extern const u8 gText_InBagVar1[]; +extern const u8 gText_Var1AndYouWantedVar2[]; +extern const u8 gText_HereYouGoThankYou[]; +extern const u8 gText_NoMoreRoomForThis[]; + #endif //GUARD_STRINGS_H |