diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-10-01 21:38:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-01 21:38:28 -0700 |
| commit | 3776a9fb4f0531535b0b5879dab7b3b6bd231736 (patch) | |
| tree | 8361facfccf7a68ff6b13c6a7b22771a4cf9d585 /include/text.h | |
| parent | 50dc4f429d4aa68e0365adc71d17e43a0dd7b843 (diff) | |
| parent | 97d2b14422fae0c8bc30440d136e86778a122964 (diff) | |
Merge pull request #427 from PikalaxALT/trade
decompile trade.s
Diffstat (limited to 'include/text.h')
| -rw-r--r-- | include/text.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/text.h b/include/text.h index 7125bc803..ebc4ebe7e 100644 --- a/include/text.h +++ b/include/text.h @@ -126,7 +126,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[]; @@ -203,6 +203,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); @@ -245,8 +246,8 @@ 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); -u8 GetStringWidthGivenWindowConfig(struct WindowConfig *winConfig, const u8 *s); +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); s32 StringCompareWithoutExtCtrlCodes(const u8 *str1, const u8 *str2); |