summaryrefslogtreecommitdiff
path: root/src/international_string_util.c
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-10-23 13:33:32 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-10-23 13:33:32 +0200
commit7d1373e3fa239d74d69b5b3a7cb78b2272a6f54d (patch)
treebab4346193d7e3f2e99139f7c4371a825d94589a /src/international_string_util.c
parent918625196ed5e91999f1a244a8881fb9f8069c64 (diff)
parent88230e8d16dad1b08027a8c933d2d9a6ce689bd0 (diff)
Merge branch 'master' into decompile_battle_controllers
Diffstat (limited to 'src/international_string_util.c')
-rw-r--r--src/international_string_util.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/international_string_util.c b/src/international_string_util.c
index c77b4f8ff..81985d614 100644
--- a/src/international_string_util.c
+++ b/src/international_string_util.c
@@ -28,13 +28,13 @@ s32 GetStringWidthDifference(s32 fontId, const u8 *str, s32 totalWidth, s32 lett
return 0;
}
-s32 GetMaxWidthInMenuTable(const u8 **str, s32 arg1)
+s32 GetMaxWidthInMenuTable(const struct MenuAction *str, s32 arg1)
{
s32 i, var;
for (var = 0, i = 0; i < arg1; i++)
{
- s32 stringWidth = GetStringWidth(1, str[i * 2], 0);
+ s32 stringWidth = GetStringWidth(1, str[i].text, 0);
if (stringWidth > var)
var = stringWidth;
}
@@ -42,13 +42,13 @@ s32 GetMaxWidthInMenuTable(const u8 **str, s32 arg1)
return convert_pixel_width_to_tile_width(var);
}
-s32 sub_81DB3D8(const u8 **str, u8* arg1, s32 arg2)
+s32 sub_81DB3D8(const struct MenuAction *str, u8* arg1, s32 arg2)
{
s32 i, var;
for (var = 0, i = 0; i < arg2; i++)
{
- s32 stringWidth = GetStringWidth(1, str[arg1[i] * 2], 0);
+ s32 stringWidth = GetStringWidth(1, str[arg1[i]].text, 0);
if (stringWidth > var)
var = stringWidth;
}