diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-08 22:01:23 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-08 22:01:23 -0500 |
| commit | 4a9e02772870528cc3b9653eb4028b236f3c3aa8 (patch) | |
| tree | 6c70c6b230acc0d26527174e66ff5a3eb8752e57 | |
| parent | 42aaa52c94aa59cb62f2f598af5dd25ae9d8537e (diff) | |
get rid of TextStruct
| -rw-r--r-- | include/global.h | 5 | ||||
| -rwxr-xr-x | include/strings.h | 2 | ||||
| -rw-r--r-- | src/item_menu.c | 2 | ||||
| -rw-r--r-- | src/strings.c | 4 |
4 files changed, 4 insertions, 9 deletions
diff --git a/include/global.h b/include/global.h index 0f5bcde6d..4d20ea4fc 100644 --- a/include/global.h +++ b/include/global.h @@ -115,11 +115,6 @@ enum BAG_KEYITEMS }; -struct TextStruct -{ - const u8 *text; -}; - struct Coords16 { s16 x; diff --git a/include/strings.h b/include/strings.h index 89a78e478..fe9cfc6ba 100755 --- a/include/strings.h +++ b/include/strings.h @@ -188,7 +188,7 @@ extern const u8 OtherText_TheField[]; extern const u8 OtherText_TheField2[]; extern const u8 OtherText_ThePC[]; -extern const struct TextStruct gUnknown_0840E740[]; +extern const u8 *const gUnknown_0840E740[7]; extern const u8 gOtherText_ReturnTo[]; extern const u8 gOtherText_WhatWillYouDo2[]; diff --git a/src/item_menu.c b/src/item_menu.c index 3e7a4629f..b8d9f788a 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -1305,7 +1305,7 @@ void ItemListMenu_InitDescription(s16 itemId) if (gUnknown_03005D10[gUnknown_02038559].unk1 + gUnknown_03005D10[gUnknown_02038559].unk0 == gUnknown_03005D10[gUnknown_02038559].unk2) { r5 = sub_8072A18(gOtherText_ReturnTo, 4, 0x68, 0x68, 1); - r5 += sub_8072A18(gUnknown_0840E740[gUnknown_03000701].text, 4, 0x78, 0x68, 1); + r5 += sub_8072A18(gUnknown_0840E740[gUnknown_03000701], 4, 0x78, 0x68, 1); } else { diff --git a/src/strings.c b/src/strings.c index cc0641dce..6c605b075 100644 --- a/src/strings.c +++ b/src/strings.c @@ -197,7 +197,7 @@ const u8 OtherText_TheField[] = _("the field."); const u8 OtherText_TheField2[] = _("the field."); const u8 OtherText_ThePC[] = _("the PC."); -const struct TextStruct gUnknown_0840E740[7] = +const u8 *const gUnknown_0840E740[7] = { OtherText_TheField3, OtherText_TheBattle, @@ -1120,7 +1120,7 @@ const u8 OtherText_TheField[] = _("zum Hauptmenü."); const u8 OtherText_TheField2[] = _("zum Hauptmenü."); const u8 OtherText_ThePC[] = _("zum PC."); -const struct TextStruct gUnknown_0840E740[7] = +const u8 *const gUnknown_0840E740[7] = { OtherText_TheField3, OtherText_TheBattle, |