Merge branch 'master' into doc-pblock

2020-08-12 19:49:55 -04:00
parent f6efbe38bf b3c4cd8a32
commit ade49de329
61 changed files with 3737 additions and 4290 deletions
--- a/src/menu_specialized.c
+++ b/src/menu_specialized.c
@@ -956,7 +956,7 @@ static u8 *GetConditionMenuMonString(u8 *dst, u16 boxId, u16 monId)
        *(str++) = TEXT_COLOR_TRANSPARENT;
        *(str++) = TEXT_COLOR_LIGHT_BLUE;
        *(str++) = CHAR_SLASH;
-        *(str++) = CHAR_SPECIAL_F9;
+        *(str++) = CHAR_EXTRA_SYMBOL;
        *(str++) = CHAR_LV_2;
        str = ConvertIntToDecimalStringN(str, level, STR_CONV_MODE_LEFT_ALIGN, 3);
        *(str++) = CHAR_SPACE;