diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-09-01 13:31:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 13:31:39 -0400 |
| commit | 83806d0f95f9298bfa6d8775f5ea79a8204cc910 (patch) | |
| tree | 1af34f57c2a11723c5a99a5638a7c6ae0376721a /include | |
| parent | 4ac1b3fec52d4f09dd3b4d36c2d6d941b4e89343 (diff) | |
| parent | 26ac9c5faf74fe9ea3a14f5c87ede78d077db118 (diff) | |
Merge pull request #353 from PokeCodec/MatchFirered
Match (Most of) Firered
Diffstat (limited to 'include')
| -rw-r--r-- | include/list_menu.h | 4 | ||||
| -rw-r--r-- | include/quest_log.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/list_menu.h b/include/list_menu.h index 237805f38..24c614e39 100644 --- a/include/list_menu.h +++ b/include/list_menu.h @@ -23,7 +23,7 @@ enum struct ListMenuItem { const u8 *label; - s32 index; + u32 index; }; struct ListMenu; @@ -72,7 +72,7 @@ struct ListMenuWindowRect extern struct ListMenuTemplate gMultiuseListMenuTemplate; -s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum); +u32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum); u8 ListMenuInit(const struct ListMenuTemplate *listMenuTemplate, u16 cursorPos, u16 itemsAbove); u8 ListMenuInitInRect(const struct ListMenuTemplate *listMenuTemplate, const struct ListMenuWindowRect *rect, u16 cursorPos, u16 itemsAbove); s32 ListMenu_ProcessInput(u8 listTaskId); diff --git a/include/quest_log.h b/include/quest_log.h index adf43de95..9c50f5f6e 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -25,7 +25,7 @@ struct UnkStruct_203B044 extern u8 gQuestLogState; extern u8 gQuestLogPlaybackState; -extern const u16 gUnknown_84566A8[]; +extern const u8 gUnknown_84566A8[]; extern struct FieldInput gQuestLogFieldInput; extern struct UnkStruct_203B044 gUnknown_203B044; extern u16 *gUnknown_203AE04; |