diff options
| author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2017-05-09 03:02:23 +0200 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-05-08 18:13:08 -0700 |
| commit | ca7e24fa7be6f5d9244667f1fa7c9ad21a16056a (patch) | |
| tree | 7cd3bd3233655348d2c60cbc73b654a2c62c7269 | |
| parent | fdab157386bdd1ce02f660f0ece0c55d2218f6fc (diff) | |
Fix battle_interface for German
| -rw-r--r-- | include/text.h | 2 | ||||
| -rw-r--r-- | src/battle_interface.c | 8 | ||||
| -rw-r--r-- | src/field_specials.c | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/include/text.h b/include/text.h index f01af1547..ba4ccb4b2 100644 --- a/include/text.h +++ b/include/text.h @@ -3,9 +3,11 @@ #define CHAR_SPACE 0x00 #define CHAR_QUESTION_MARK 0xAC +#define CHAR_PERIOD 0xAD #define CHAR_HYPHEN 0xAE #define CHAR_MALE 0xB5 #define CHAR_FEMALE 0xB6 +#define CHAR_COMMA 0xB8 #define CHAR_CURRENCY 0xB7 #define CHAR_SLASH 0xBA #define CHAR_COLON 0xF0 diff --git a/src/battle_interface.c b/src/battle_interface.c index 0c7097312..d097598b5 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -677,6 +677,12 @@ void sub_8043F44(u8 a) sub_8043E50(gUnknown_03004340[a], x, y); } +#if ENGLISH +#define CHAR_LV_SEPARATOR CHAR_COLON +#elif GERMAN +#define CHAR_LV_SEPARATOR CHAR_PERIOD +#endif + static void sub_8043FC0(u8 a, u8 b) { u8 str[30]; @@ -715,7 +721,7 @@ static void sub_8043FC0(u8 a, u8 b) *(ptr++) = EXT_CTRL_CODE_BEGIN; *(ptr++) = 0x14; *(ptr++) = 4; - *(ptr++) = CHAR_COLON; + *(ptr++) = CHAR_LV_SEPARATOR; *(ptr++) = EXT_CTRL_CODE_BEGIN; *(ptr++) = 0x14; *(ptr++) = 0; diff --git a/src/field_specials.c b/src/field_specials.c index 00bdaeb43..9f5a314e2 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -12,9 +12,6 @@ #include "text.h" #include "wallclock.h" -#define CHAR_PERIOD 0xAD -#define CHAR_COMMA 0xB8 - #if ENGLISH #define CHAR_DECIMAL_SEPARATOR CHAR_PERIOD #elif GERMAN |