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.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.c')
| -rw-r--r-- | src/friend_area_action_menu.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/friend_area_action_menu.c b/src/friend_area_action_menu.c index 3ffed40..3cd9c84 100644 --- a/src/friend_area_action_menu.c +++ b/src/friend_area_action_menu.c @@ -4,6 +4,7 @@ #include "input.h" #include "menu.h" #include "item.h" +#include "pokemon.h" #include "team_inventory.h" #include "friend_area_action_menu.h" @@ -34,7 +35,7 @@ extern void sub_801A8D0(u32); extern void sub_801A9E0(); extern void sub_801F1B0(u32, u32); extern void sub_801B3C0(struct ItemSlot *); -extern void sub_809401C(u32 *, u32 *); +extern void sub_809401C(u32 *, struct PokemonMove *); extern void sub_801EE10(u32, s16, u32 *, u32, u32, u32); extern void sub_8012CAC(struct UnkTextStruct2 *, struct MenuItem *); @@ -167,7 +168,7 @@ void sub_802719C(void) void sub_8027274(void) { - struct ItemSlot auStack12; + struct ItemSlot slot; switch(gUnknown_203B2BC->state) { case 0: @@ -185,10 +186,10 @@ void sub_8027274(void) sub_8012D60(&gUnknown_203B2BC->unk7C,gUnknown_203B2BC->menuItems,0,&gUnknown_203B2BC->unk16C,gUnknown_203B2BC->unk70,2); break; case 4: - sub_8024458(gUnknown_203B2BC->unk8,2); + sub_8024458(gUnknown_203B2BC->targetPoke,2); break; case 5: - sub_801BEEC(gUnknown_203B2BC->unk8); + sub_801BEEC(gUnknown_203B2BC->targetPoke); break; case 10: sub_801A5D8(1,0,0,10); @@ -201,12 +202,12 @@ void sub_8027274(void) sub_8012D60(&gUnknown_203B2BC->unk7C,gUnknown_203B2BC->menuItems,0,&gUnknown_203B2BC->unk16C,gUnknown_203B2BC->unk74,2); break; case 0xd: - HeldItemToSlot(&auStack12,&gUnknown_203B2BC->unk10); - sub_801B3C0(&auStack12); + HeldItemToSlot(&slot, &gUnknown_203B2BC->itemToGive); + sub_801B3C0(&slot); break; case 0xe: - sub_809401C(&gUnknown_203B2BC->unk28,&gUnknown_203B2BC->unk18->unk2C); - sub_801EE10(3,gUnknown_203B2BC->unk8,&gUnknown_203B2BC->unk28,0,0,0); + sub_809401C(&gUnknown_203B2BC->unk28,gUnknown_203B2BC->unk18->moves); + sub_801EE10(3,gUnknown_203B2BC->targetPoke,&gUnknown_203B2BC->unk28,0,0,0); break; case 0xf: sub_801F1B0(1,0); |