diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-12-02 14:56:56 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-02 14:56:56 -0800 |
| commit | 14d9b188cd8f16b4403280ae24fc7b8c059d0fc1 (patch) | |
| tree | df08926aef4bfc16f0b3f1ed16b1bc656d908e70 /src/main_menu.c | |
| parent | 506587c676fb18a289d19561ca0de67004c7656e (diff) | |
| parent | 4d2d30beb113f5f987c73cdf1b818e0079222093 (diff) | |
Merge pull request #116 from marijnvdwerf/clean/warnings-0
Fix various warnings
Diffstat (limited to 'src/main_menu.c')
| -rw-r--r-- | src/main_menu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main_menu.c b/src/main_menu.c index 02aabbb64..274386b03 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -57,9 +57,9 @@ extern const struct SpritePalette gMonPaletteTable[]; extern struct SpriteTemplate gUnknown_02024E8C; extern void * const gUnknown_081FAF4C[]; extern u16 gUnknown_081E795C[]; -extern u8 * const gUnknown_081E79B0[][2]; -extern u8 * const gMalePresetNames[][2]; -extern u8 * const gFemalePresetNames[][2]; +extern const struct MenuAction gUnknown_081E79B0[]; +extern const struct MenuAction gMalePresetNames[]; +extern const struct MenuAction gFemalePresetNames[]; extern const u8 gUnknown_081E764C[]; extern const u8 gUnknown_081E768C[]; @@ -1645,9 +1645,9 @@ static void SetPresetPlayerName(u8 index) u8 *name; if (gSaveBlock2.playerGender == MALE) - name = gMalePresetNames[index][0]; + name = gMalePresetNames[index].text; else - name = gFemalePresetNames[index][0]; + name = gFemalePresetNames[index].text; for (i = 0; i < 7; i++) gSaveBlock2.playerName[i] = name[i]; |