diff options
author | Marcus Huderle <huderlem@gmail.com> | 2019-04-02 18:29:51 -0500 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2019-04-02 18:29:51 -0500 |
commit | 181baf9fe561e893023f71a5793a8b1ac6d644d6 (patch) | |
tree | 8ac4906fc6f70fb000fc3fbcd73a325dc6114d20 /src/international_string_util.c | |
parent | 1241700b204b9f450221299c6e837c0f522f60b2 (diff) | |
parent | d8c9f1b30fb92289e7aa4d44dfcf1b2120bea8d6 (diff) |
Merge remote-tracking branch 'upstream/master' into misc_docs
# Conflicts:
# src/field_weather_effect.c
Diffstat (limited to 'src/international_string_util.c')
-rw-r--r-- | src/international_string_util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/international_string_util.c b/src/international_string_util.c index a7c42c39e..dfeda49e3 100644 --- a/src/international_string_util.c +++ b/src/international_string_util.c @@ -62,7 +62,7 @@ int sub_81DB3D8(const struct MenuAction *str, const u8* arg1, int arg2) return convert_pixel_width_to_tile_width(var); } -int sub_81DB41C(const struct ListMenuTemplate *listMenu) +int Intl_GetListMenuWidth(const struct ListMenuTemplate *listMenu) { int i, maxWidth, finalWidth; const struct ListMenuItem *items = listMenu->items; |