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 /src/engine/text.c | |
| parent | 50dc4f429d4aa68e0365adc71d17e43a0dd7b843 (diff) | |
| parent | 97d2b14422fae0c8bc30440d136e86778a122964 (diff) | |
Merge pull request #427 from PikalaxALT/trade
decompile trade.s
Diffstat (limited to 'src/engine/text.c')
| -rw-r--r-- | src/engine/text.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/text.c b/src/engine/text.c index abde4484a..87903608f 100644 --- a/src/engine/text.c +++ b/src/engine/text.c @@ -1943,7 +1943,7 @@ void InitWindowFromConfig(struct Window *win, const struct WindowConfig *winConf void InitWindow(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top) { - struct WindowConfig *winConfig = win->config; + const struct WindowConfig *winConfig = win->config; win->textMode = winConfig->textMode; win->fontNum = winConfig->fontNum; win->language = GAME_LANGUAGE; @@ -2342,7 +2342,7 @@ u8 sub_8003490(struct Window *win, u8 c, u16 tileDataStartOffset, u8 left, u8 to void sub_80034D4(u8 *tileData, const u8 *text) { - sub_8004E3C((struct WindowConfig *)&gWindowConfig_81E6C74, tileData, text); + sub_8004E3C(&gWindowConfig_81E6C74, tileData, text); } u8 sub_80034EC(u8 *str) @@ -3645,7 +3645,7 @@ void sub_8004E28(struct Window *win, u8 *foreground, u8 *background, u8 *shadow) *shadow = win->shadowColor; } -void sub_8004E3C(struct WindowConfig *winConfig, u8 *tileData, const u8 *text) +void sub_8004E3C(const struct WindowConfig *winConfig, u8 *tileData, const u8 *text) { sTempWindow.config = winConfig; InitWindow(&sTempWindow, text, 0, 0, 0); @@ -3653,7 +3653,7 @@ void sub_8004E3C(struct WindowConfig *winConfig, u8 *tileData, const u8 *text) sub_8002F44(&sTempWindow); } -u8 GetStringWidthGivenWindowConfig(struct WindowConfig *winConfig, const u8 *s) +u8 GetStringWidthGivenWindowConfig(const struct WindowConfig *winConfig, const u8 *s) { sTempWindow.config = winConfig; InitWindow(&sTempWindow, s, 0, 0, 0); |