From 20efe6984eb9ff9ac11dbb1c5d519c5134e7af60 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sat, 17 Dec 2016 13:43:44 +0100 Subject: Rename `charset` and use macro for build language --- include/text.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/text.h') diff --git a/include/text.h b/include/text.h index 2c66f30dc..7dbbcb844 100644 --- a/include/text.h +++ b/include/text.h @@ -36,7 +36,7 @@ struct Window { u8 textMode; u8 fontNum; - u8 charset; + u8 language; u8 foregroundColor; u8 backgroundColor; u8 shadowColor; -- cgit v1.2.3 From 19f0d5a5cfc018932fac50eb7cf430297bd3f2da Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Tue, 3 Jan 2017 21:07:08 -0800 Subject: make PokemonSummaryScreen_PrintTrainerMemo match --- include/text.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/text.h') diff --git a/include/text.h b/include/text.h index 7dbbcb844..99d346a23 100644 --- a/include/text.h +++ b/include/text.h @@ -8,6 +8,7 @@ #define CHAR_COLON 0xF0 #define EXT_CTRL_CODE_BEGIN 0xFC // extended control code #define PLACEHOLDER_BEGIN 0xFD // string placeholder +#define CHAR_NEWLINE 0xFE #define EOS 0xFF // end of string struct WindowConfig -- cgit v1.2.3 From 648c6c7093f5173694562929f615380f297ad306 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 13:41:12 +0100 Subject: Move `gStringVar` declarations to text.h --- include/text.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/text.h') diff --git a/include/text.h b/include/text.h index 99d346a23..c629fd6d9 100644 --- a/include/text.h +++ b/include/text.h @@ -134,6 +134,11 @@ extern const struct WindowConfig gWindowConfig_81E725C; extern const struct WindowConfig gWindowConfig_81E7278; extern const struct WindowConfig gWindowConfig_81E7294; +extern u8 gStringVar1[]; +extern u8 gStringVar2[]; +extern u8 gStringVar3[]; +extern u8 gStringVar4[]; + void LoadFontDefaultPalette(const struct WindowConfig *winConfig); void SetUpWindowConfig(const struct WindowConfig *winConfig); u16 InitWindowTileData(struct Window *win, u16 startOffset); -- cgit v1.2.3 From 46cf490edd4fd5971d3a3511516beb0910e33c32 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 14:54:35 +0100 Subject: Declare gBGTilemapBuffers in header --- include/text.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/text.h') diff --git a/include/text.h b/include/text.h index c629fd6d9..4f52e3cdd 100644 --- a/include/text.h +++ b/include/text.h @@ -134,6 +134,8 @@ extern const struct WindowConfig gWindowConfig_81E725C; extern const struct WindowConfig gWindowConfig_81E7278; extern const struct WindowConfig gWindowConfig_81E7294; +extern u16 gBGTilemapBuffers[4][0x400]; + extern u8 gStringVar1[]; extern u8 gStringVar2[]; extern u8 gStringVar3[]; -- cgit v1.2.3 From e75c3262f37483d3503126bebf8bf8b7b662d345 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Mon, 8 May 2017 18:52:58 -0500 Subject: Decompile battle interface (#281) * start decompiling * more decompilation * sub_8044804 refuses to match. moving on... * decompile sub_80451A0 * more decompilation * finish decompiling * clean up a bit * remove trailing whitespace and change tabs to spaces --- include/text.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/text.h') diff --git a/include/text.h b/include/text.h index 4f52e3cdd..f01af1547 100644 --- a/include/text.h +++ b/include/text.h @@ -4,7 +4,10 @@ #define CHAR_SPACE 0x00 #define CHAR_QUESTION_MARK 0xAC #define CHAR_HYPHEN 0xAE +#define CHAR_MALE 0xB5 +#define CHAR_FEMALE 0xB6 #define CHAR_CURRENCY 0xB7 +#define CHAR_SLASH 0xBA #define CHAR_COLON 0xF0 #define EXT_CTRL_CODE_BEGIN 0xFC // extended control code #define PLACEHOLDER_BEGIN 0xFD // string placeholder @@ -155,7 +158,7 @@ u8 sub_8002F44(struct Window *win); u8 sub_8003418(struct Window *win); u8 sub_8003460(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top); u8 sub_8003490(struct Window *win, u8 c, u16 tileDataStartOffset, u8 left, u8 top); -void sub_80034D4(u8 *tileData, u8 *text); +void sub_80034D4(u8 *tileData, const u8 *text); u8 sub_80034EC(u8 *str); u8 *sub_8003504(u8 *dest, s32 value, u8 alignAmount, u8 alignType); u8 *sub_8003558(u8 *dest, const u8 *src, u8 alignAmount, u8 alignType); -- cgit v1.2.3 From ca7e24fa7be6f5d9244667f1fa7c9ad21a16056a Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 9 May 2017 03:02:23 +0200 Subject: Fix battle_interface for German --- include/text.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/text.h') 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 -- cgit v1.2.3 From 00fa1e2efdd2b140451472e5fa09e401f2698cba Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 12 Jun 2017 15:55:22 -0500 Subject: decompile unref_sub_80913A4 (English) --- include/text.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/text.h') diff --git a/include/text.h b/include/text.h index ba4ccb4b2..10fc07044 100644 --- a/include/text.h +++ b/include/text.h @@ -2,6 +2,7 @@ #define GUARD_TEXT_H #define CHAR_SPACE 0x00 +#define CHAR_0 0xA1 #define CHAR_QUESTION_MARK 0xAC #define CHAR_PERIOD 0xAD #define CHAR_HYPHEN 0xAE -- cgit v1.2.3 From 86a26c9282f03c751fc67e7da6e0d4014f69a688 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 15 Jun 2017 01:26:40 -0500 Subject: finish converting pokedex data to C --- include/text.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'include/text.h') diff --git a/include/text.h b/include/text.h index 10fc07044..6e32de6dd 100644 --- a/include/text.h +++ b/include/text.h @@ -11,6 +11,58 @@ #define CHAR_COMMA 0xB8 #define CHAR_CURRENCY 0xB7 #define CHAR_SLASH 0xBA +#define CHAR_A 0xBB +#define CHAR_B 0xBC +#define CHAR_C 0xBD +#define CHAR_D 0xBE +#define CHAR_E 0xBF +#define CHAR_F 0xC0 +#define CHAR_G 0xC1 +#define CHAR_H 0xC2 +#define CHAR_I 0xC3 +#define CHAR_J 0xC4 +#define CHAR_K 0xC5 +#define CHAR_L 0xC6 +#define CHAR_M 0xC7 +#define CHAR_N 0xC8 +#define CHAR_O 0xC9 +#define CHAR_P 0xCA +#define CHAR_Q 0xCB +#define CHAR_R 0xCC +#define CHAR_S 0xCD +#define CHAR_T 0xCE +#define CHAR_U 0xCF +#define CHAR_V 0xD0 +#define CHAR_W 0xD1 +#define CHAR_X 0xD2 +#define CHAR_Y 0xD3 +#define CHAR_Z 0xD4 +#define CHAR_a 0xD5 +#define CHAR_b 0xD6 +#define CHAR_c 0xD7 +#define CHAR_d 0xD8 +#define CHAR_e 0xD9 +#define CHAR_f 0xDA +#define CHAR_g 0xDB +#define CHAR_h 0xDC +#define CHAR_i 0xDD +#define CHAR_j 0xDE +#define CHAR_k 0xDF +#define CHAR_l 0xE0 +#define CHAR_m 0xE1 +#define CHAR_n 0xE2 +#define CHAR_o 0xE3 +#define CHAR_p 0xE4 +#define CHAR_q 0xE5 +#define CHAR_r 0xE6 +#define CHAR_s 0xE7 +#define CHAR_t 0xE8 +#define CHAR_u 0xE9 +#define CHAR_v 0xEA +#define CHAR_w 0xEB +#define CHAR_x 0xEC +#define CHAR_y 0xED +#define CHAR_z 0xEE #define CHAR_COLON 0xF0 #define EXT_CTRL_CODE_BEGIN 0xFC // extended control code #define PLACEHOLDER_BEGIN 0xFD // string placeholder -- cgit v1.2.3