Merge branch 'master' of github.com:pret/pokefirered into trade

2019-10-27 20:52:55 -04:00
parent b8fec3d9f6 922411abeb
commit 47534a1471
1365 changed files with 99717 additions and 70397 deletions
@@ -85,5 +85,7 @@ void sub_8126EDC(void);
 void sub_812256C(u8 *partyCount, u8 *icons, u8 side);
 void PartyMenuInit_FromPlayerPc(void);
 void CB2_PartyMenuFromStartMenu(void);
+void sub_8128198(void);
+void sub_8127FF4(u8 slot, u8 slot2);

 #endif // GUARD_PARTY_MENU_H