diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-10-22 10:01:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-22 10:01:07 -0700 |
| commit | 3e5dd1d047bada52ab0dce2fe58b04e39bcaa1cc (patch) | |
| tree | 0e40067d711c783ef97667f4a8256f38ab0d4b0a /src/friend_area_action_menu_1.c | |
| parent | 3f7ee3a806d965fae70fd98f2cd1af13a2e4cf0b (diff) | |
Death by 74 files (#65)
* death by 74 files
* 20% reached
* doc move stuff in pokemon
* fix undef reference
* doc more and plumb a few more constanst for num party members and num moves
* that struct is def PokemonMove.. clean up all code with it
Diffstat (limited to 'src/friend_area_action_menu_1.c')
| -rw-r--r-- | src/friend_area_action_menu_1.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/src/friend_area_action_menu_1.c b/src/friend_area_action_menu_1.c index 98427f8..33cbded 100644 --- a/src/friend_area_action_menu_1.c +++ b/src/friend_area_action_menu_1.c @@ -30,7 +30,7 @@ extern u32 sub_801A6E8(u32); extern s32 sub_80144A4(s32 *); extern void sub_8027EB8(); -extern void sub_808D31C(struct unkSubStruct_203B2BC *); +extern void sub_808D31C(struct PokemonStruct *); void sub_8027AE4(void) { @@ -56,15 +56,15 @@ void sub_8027B28(void) switch(sub_801A6E8(1)) { case 3: - gUnknown_203B2BC->unkC = sub_801A8AC(); - gUnknown_203B2BC->unk10.itemIndex = gTeamInventory_203B460->teamItems[gUnknown_203B2BC->unkC].itemIndex; - gUnknown_203B2BC->unk10.numItems = gTeamInventory_203B460->teamItems[gUnknown_203B2BC->unkC].numItems; + gUnknown_203B2BC->itemIndex = sub_801A8AC(); + gUnknown_203B2BC->itemToGive.itemIndex = gTeamInventory_203B460->teamItems[gUnknown_203B2BC->itemIndex].itemIndex; + gUnknown_203B2BC->itemToGive.numItems = gTeamInventory_203B460->teamItems[gUnknown_203B2BC->itemIndex].numItems; SetFriendAreaActionMenuState(0xc); break; case 4: - gUnknown_203B2BC->unkC = sub_801A8AC(); - gUnknown_203B2BC->unk10.itemIndex = gTeamInventory_203B460->teamItems[gUnknown_203B2BC->unkC].itemIndex; - gUnknown_203B2BC->unk10.numItems = gTeamInventory_203B460->teamItems[gUnknown_203B2BC->unkC].numItems; + gUnknown_203B2BC->itemIndex = sub_801A8AC(); + gUnknown_203B2BC->itemToGive.itemIndex = gTeamInventory_203B460->teamItems[gUnknown_203B2BC->itemIndex].itemIndex; + gUnknown_203B2BC->itemToGive.numItems = gTeamInventory_203B460->teamItems[gUnknown_203B2BC->itemIndex].numItems; sub_8099690(0); SetFriendAreaActionMenuState(0xd); break; @@ -91,12 +91,12 @@ void sub_8027BD8(void) { case 10: PlaySound(0x14d); - ShiftItemsDownFrom(gUnknown_203B2BC->unkC); + ShiftItemsDownFrom(gUnknown_203B2BC->itemIndex); FillInventoryGaps(); if (gUnknown_203B2BC->unk14.itemFlags != 0) { sub_8091274(&gUnknown_203B2BC->unk14); } - GivePokemonItem(gUnknown_203B2BC->unk8,&gUnknown_203B2BC->unk10); + GivePokemonItem(gUnknown_203B2BC->targetPoke,&gUnknown_203B2BC->itemToGive); sub_801A928(); nullsub_104(); SetFriendAreaActionMenuState(2); @@ -113,11 +113,14 @@ void sub_8027BD8(void) void sub_8027C84() { - u32 temp = sub_801B410(); - if(temp <= 1) - return; - if(temp > 3) - return; - sub_801B450(); - SetFriendAreaActionMenuState(0xB); + switch(sub_801B410()) + { + case 2: + case 3: + sub_801B450(); + SetFriendAreaActionMenuState(0xB); + case 0: + case 1: + break; + } } |