diff options
author | garakmon <thomastaps194@comcast.net> | 2018-07-07 21:29:11 -0400 |
---|---|---|
committer | garakmon <thomastaps194@comcast.net> | 2018-07-07 21:29:11 -0400 |
commit | 864a69f9bf050eaaa062c8346cd6a5032e617139 (patch) | |
tree | bd8b133710c813b11becf602067495526c849b6a /include/strings.h | |
parent | 47bcba3e1b5140cef7f04edcda3759818408726a (diff) |
merge conflicts are soooooooooo fun
Diffstat (limited to 'include/strings.h')
-rw-r--r-- | include/strings.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/strings.h b/include/strings.h index 0232b03f4..2ce8ac977 100644 --- a/include/strings.h +++ b/include/strings.h @@ -171,7 +171,8 @@ extern const u8 gOtherText_OneDash[]; extern const u8 gOtherText_TwoDashes[]; extern const u8 gOtherText_ThreeDashes2[]; extern const u8 gOtherText_MaleSymbol2[]; -extern const u8 gOtherText_FemaleSymbolAndLv[]; +extern const u8 gOtherText_FemaleSymbol2[]; +extern const u8 gOtherText_Lv[]; extern const u8 gOtherText_TallPlusAndRightArrow[]; extern const u8 gMenuText_GoBackToPrev[]; extern const u8 gOtherText_WhatWillYouDo[]; |