diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-12 01:39:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-12 01:39:28 -0400 |
| commit | a274cc6a76a59768bcfaef345d55a39f6c1ddbac (patch) | |
| tree | e6977a9d8066e946148b8d1dfcf95e721b59e54f /src/player_pc.c | |
| parent | 810ca5f8ff79aeec6ffe8e982f4786aade616b4d (diff) | |
| parent | 876a89eba4903e5ef1ccad22b1ee52023fb24513 (diff) | |
Merge branch 'master' into flatten_sprite_pos
Diffstat (limited to 'src/player_pc.c')
| -rw-r--r-- | src/player_pc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/player_pc.c b/src/player_pc.c index a81fbc537..f44a111b3 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -119,7 +119,7 @@ static void sub_816C060(u16 itemId); static void sub_816BEF0(s32 id); static void sub_816B4DC(u8 taskId); static void ItemStorage_MoveCursor(s32 id, bool8 b, struct ListMenu * thisMenu); -static void fish4_goto_x5_or_x6(u8 windowId, s32 id, u8 yOffset); +static void fish4_goto_x5_or_x6(u8 windowId, u32 id, u8 yOffset); // EWRAM static EWRAM_DATA const u8 *gPcItemMenuOptionOrder = NULL; @@ -943,7 +943,7 @@ static void ItemStorage_MoveCursor(s32 id, bool8 b, struct ListMenu *thisMenu) if (gUnknown_0203BCC4->unk666 == 0xFF) { sub_816C0C8(); - if (id != -2) + if (id != LIST_CANCEL) sub_816C060(gSaveBlock1Ptr->pcItems[id].itemId); else sub_816C060(ITEMPC_GO_BACK_TO_PREV); @@ -951,9 +951,9 @@ static void ItemStorage_MoveCursor(s32 id, bool8 b, struct ListMenu *thisMenu) } } -static void fish4_goto_x5_or_x6(u8 windowId, s32 id, u8 yOffset) +static void fish4_goto_x5_or_x6(u8 windowId, u32 id, u8 yOffset) { - if (id != -2) + if (id != LIST_CANCEL) { if (gUnknown_0203BCC4->unk666 != 0xFF) { |