diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-10-11 17:49:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-11 17:49:45 -0700 |
| commit | 7d657ef56716fd01bacf4a47df50ad0ec3d03b10 (patch) | |
| tree | 0d002848b17576e0398b381b68c6e58c6ea183de /src/battle/battle_2.c | |
| parent | 3e03d362fae398fa56c4a6e45d7b999772d0803f (diff) | |
| parent | 3a5020764fe3f26e8003487eff5d25b425a277a7 (diff) | |
Merge pull request #435 from huderlem/party_menu
Decompile party_menu
Diffstat (limited to 'src/battle/battle_2.c')
| -rw-r--r-- | src/battle/battle_2.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 770aa1209..a447cf498 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -53,20 +53,6 @@ struct UnknownStruct8 u8 unk1A; }; -struct UnknownPokemonStruct2 -{ - /*0x00*/ u16 species; - /*0x02*/ u16 heldItem; - /*0x04*/ u8 nickname[11]; - /*0x0F*/ u8 level; - /*0x10*/ u16 hp; - /*0x12*/ u16 maxhp; - /*0x14*/ u32 status; - /*0x18*/ u32 personality; - /*0x1C*/ u8 gender; - /*0x1D*/ u8 language; -}; - struct UnknownStruct12 { u32 unk0; @@ -612,7 +598,7 @@ void sub_800F104(void) *pSavedCallback = gMain.savedCallback; *pSavedBattleTypeFlags = gBattleTypeFlags; gMain.savedCallback = sub_800F104; - OpenPartyMenu(5, 0); + OpenPartyMenu(PARTY_MENU_TYPE_LINK_MULTI_BATTLE, 0); } break; case 2: |