From dd7e19107879f74d8f962a6a47d619470eaefbcd Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 16 Jul 2017 20:03:00 +0200 Subject: Battle4.C Changed labels: sub_801A02C = ItemBattleEffects sub_8015150 = GetBattleBank gUnknown_02024BEA = gRandomMove BattleBufferB = gBattleBufferB sub_8090D90 = GetNationalPokedexFlag sub_80151D4 = PressurePPLose ai_rate_move = AI_TypeCalc sub_801B928 = IsPokeDisobedient sub_801E3B4 = BankGetTurnOrder sub_801E3EC = SetMoveEffect sub_814A7FC = DestroyMenuCursor sub_8010B88 = SwitchInClearStructs sub_80325B8 = BattleMusicStop sub_8017718 = CantUseMove sub_8028350 = IsTwoTurnsMove b_feature_update_destiny_bond = DestinyBondFlagUpdate sub_801C108 = JumpIfMoveAffectedByProtect move_weather_interaction = AttacksThisTurn sub_8025E20 = ChangeStatBuffs sub_8020B54 = MoveValuesCleanUp --- 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 6e32de6dd..cf413644b 100644 --- a/include/text.h +++ b/include/text.h @@ -6,6 +6,7 @@ #define CHAR_QUESTION_MARK 0xAC #define CHAR_PERIOD 0xAD #define CHAR_HYPHEN 0xAE +#define CHAR_ELLIPSIS 0xB0 #define CHAR_MALE 0xB5 #define CHAR_FEMALE 0xB6 #define CHAR_COMMA 0xB8 -- cgit v1.2.3 From ded9b4a8d0a59dab3882ab3fe43817bc38bca834 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 24 Aug 2017 19:13:29 -0500 Subject: more labeling --- 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 99987d2c3..022c65fb9 100644 --- a/include/text.h +++ b/include/text.h @@ -2,6 +2,7 @@ #define GUARD_TEXT_H #define CHAR_SPACE 0x00 +#define CHAR_SONG_WORD_SEPARATOR 0x37 // separates words in the bard song. Not sure if it's used for anything else #define CHAR_0 0xA1 #define CHAR_QUESTION_MARK 0xAC #define CHAR_PERIOD 0xAD -- cgit v1.2.3 From 28836dd9b7f1f38ba1d065e2c336d32628fb7cca Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 25 Aug 2017 00:14:33 -0400 Subject: decompile up to sub_80B3EFC --- include/text.h | 58 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'include/text.h') diff --git a/include/text.h b/include/text.h index 99987d2c3..9a70dec11 100644 --- a/include/text.h +++ b/include/text.h @@ -97,35 +97,35 @@ struct WindowConfig struct Window { - u8 textMode; - u8 fontNum; - u8 language; - u8 foregroundColor; - u8 backgroundColor; - u8 shadowColor; - u8 paletteNum; - u8 tilemapLeft; - u8 tilemapTop; - u8 width; - u8 height; - u8 win_field_B; - u8 win_field_C; - u8 delayCounter; - u8 spacing; - u8 win_field_F; - u8 cursorX; - u8 cursorY; - u8 left; - u16 top; - u16 state; - u16 downArrowCounter; - u16 tileDataStartOffset; - u16 tileDataOffset; - u16 textIndex; - const u8 *text; - u8 *tileData; - u16 *tilemap; - struct WindowConfig *config; + /*0x00*/ u8 textMode; + /*0x01*/ u8 fontNum; + /*0x02*/ u8 language; + /*0x03*/ u8 foregroundColor; + /*0x04*/ u8 backgroundColor; + /*0x05*/ u8 shadowColor; + /*0x06*/ u8 paletteNum; + /*0x07*/ u8 tilemapLeft; + /*0x08*/ u8 tilemapTop; + /*0x09*/ u8 width; + /*0x0A*/ u8 height; + /*0x0B*/ u8 win_field_B; + /*0x0C*/ u8 win_field_C; + /*0x0D*/ u8 delayCounter; + /*0x0E*/ u8 spacing; + /*0x0F*/ u8 win_field_F; + /*0x10*/ u8 cursorX; + /*0x11*/ u8 cursorY; + /*0x12*/ u8 left; + /*0x14*/ u16 top; // padded to 0x14 + /*0x16*/ u16 state; + /*0x18*/ u16 downArrowCounter; + /*0x1A*/ u16 tileDataStartOffset; + /*0x1C*/ u16 tileDataOffset; + /*0x1E*/ u16 textIndex; + /*0x20*/ const u8 *text; + /*0x24*/ u8 *tileData; + /*0x28*/ u16 *tilemap; + /*0x2C*/ struct WindowConfig *config; }; extern vu16 *const gBGControlRegs[]; -- cgit v1.2.3 From af86929d787ca449ab86b3bd8674cbd5c44fb7ea Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 2 Sep 2017 10:18:29 -0400 Subject: sub_8048D44 --- 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 9a70dec11..d0c9f0d9d 100644 --- a/include/text.h +++ b/include/text.h @@ -202,6 +202,7 @@ extern u8 gStringVar1[]; extern u8 gStringVar2[]; extern u8 gStringVar3[]; extern u8 gStringVar4[]; +extern u8 gTileBuffer[]; void LoadFontDefaultPalette(const struct WindowConfig *winConfig); void SetUpWindowConfig(const struct WindowConfig *winConfig); -- cgit v1.2.3 From 01b88dba1f0a7f28c8d047e711affeaa14c257d4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 2 Sep 2017 18:35:33 -0400 Subject: sub_804A2B4; change `struct Window->config` to const --- include/text.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/text.h') diff --git a/include/text.h b/include/text.h index d0c9f0d9d..6b2efc7ae 100644 --- a/include/text.h +++ b/include/text.h @@ -125,7 +125,7 @@ struct Window /*0x20*/ const u8 *text; /*0x24*/ u8 *tileData; /*0x28*/ u16 *tilemap; - /*0x2C*/ struct WindowConfig *config; + /*0x2C*/ const struct WindowConfig *config; }; extern vu16 *const gBGControlRegs[]; @@ -246,7 +246,7 @@ u8 sub_8004DB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 l u8 sub_8004E24(struct Window *win); void sub_8004E28(struct Window *win, u8 *foreground, u8 *background, u8 *shadow); void sub_8004E3C(struct WindowConfig *winConfig, u8 *tileData, const u8 *text); -u8 GetStringWidthGivenWindowConfig(struct WindowConfig *winConfig, const u8 *s); +u8 GetStringWidthGivenWindowConfig(const struct WindowConfig *winConfig, const u8 *s); void ConvertInternationalString(u8 *s, u8 language); void StripExtCtrlCodes(u8 *str); s32 StringCompareWithoutExtCtrlCodes(const u8 *str1, const u8 *str2); -- cgit v1.2.3 From ef786e5c3067498a0628b58e914c8ce83c39b44b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 4 Sep 2017 22:56:08 -0400 Subject: sub_804AFB8 --- 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 6b2efc7ae..b93653bc2 100644 --- a/include/text.h +++ b/include/text.h @@ -245,7 +245,7 @@ u8 sub_8004D38(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 l u8 sub_8004DB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top, u16 a6); u8 sub_8004E24(struct Window *win); void sub_8004E28(struct Window *win, u8 *foreground, u8 *background, u8 *shadow); -void sub_8004E3C(struct WindowConfig *winConfig, u8 *tileData, const u8 *text); +void sub_8004E3C(const struct WindowConfig *winConfig, u8 *tileData, const u8 *text); u8 GetStringWidthGivenWindowConfig(const struct WindowConfig *winConfig, const u8 *s); void ConvertInternationalString(u8 *s, u8 language); void StripExtCtrlCodes(u8 *str); -- cgit v1.2.3