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

include/battle_records.h

@@ -2,5 +2,6 @@
 #define GUARD_BATTLE_RECORDS_H
 
 void ClearPlayerLinkBattleRecords(void);
+void TryRecordLinkBattleOutcome(s32 battlerId);
 
 #endif // GUARD_BATTLE_RECORDS_H

include/cable_club.h

@@ -9,7 +9,7 @@
 
 // Exported ROM declarations
 void sub_8081A90(u8 taskId);
-u8 sub_8081150(void);
-void sub_8081668(void);
+u8 CreateTask_ReestablishLinkInCableClubRoom(void);
+void CB2_ReturnFromCableClubBattle(void);
 
 #endif //GUARD_CABLE_CLUB_H

include/event_scripts.h

@@ -1204,4 +1204,10 @@ extern const u8 EventScript_BagItemCanBeRegistered[];
 // fldeff_cut
 extern const u8 EventScript_FldEffCut[];
 
+// cable_club
+extern const u8 CableClub_Text_WhenAllPlayersReadyAConfirmBCancel[];
+extern const u8 CableClub_Text_AwaitingLinkupBCancel[];
+extern const u8 CableClub_Text_StartLinkWithXPlayersAConfirmBCancel[];
+extern const u8 CableClub_Text_PleaseWaitBCancel[];
+
 #endif //GUARD_EVENT_SCRIPTS_H

include/field_message_box.h

@@ -8,5 +8,6 @@ bool8 sub_8098238(const u8 *message);
 bool8 ShowFieldAutoScrollMessage(const u8 *message);
 void HideFieldMessageBox(void);
 bool8 IsFieldMessageBoxHidden(void);
+bool8 textbox_any_visible(void);
 
 #endif // GUARD_FIELD_MESSAGE_BOX_H

include/link.h

@@ -77,6 +77,10 @@
 #define LINKTYPE_BATTLE_TOWER_50     0x2266
 #define LINKTYPE_BATTLE_TOWER_OPEN   0x2277
 #define LINKTYPE_BATTLE_TOWER        0x2288
+#define LINKTYPE_0x3311              0x3311
+#define LINKTYPE_0x3322              0x3322
+#define LINKTYPE_0x4411              0x4411
+#define LINKTYPE_0x6601              0x6601
 
 #define MASTER_HANDSHAKE 0x8FFF
 #define SLAVE_HANDSHAKE  0xB9A0
@@ -199,6 +203,7 @@ extern u16 word_3002910[];
 extern bool8 gReceivedRemoteLinkPlayers;
 extern bool8 gLinkVSyncDisabled;
 extern u8 gWirelessCommType;
+extern struct LinkPlayer gLocalLinkPlayer;
 
 extern u8 gShouldAdvanceLinkState;
 extern u16 gLinkPartnersHeldKeys[6];
@@ -272,12 +277,17 @@ void ClearLinkCallback_2(void);
 void LinkRfu_SetRfuFuncToSend6600(void);
 void IntlConvertLinkPlayerName(struct LinkPlayer * linkPlayer);
 bool8 IsWirelessAdapterConnected(void);
-bool8 sub_800A474(u8 a0);
+bool8 sub_800A474(u8 blockRequestType);
 void LinkVSync(void);
 bool8 HandleLinkConnection(void);
 void PrepareLocalLinkPlayerBlock(void);
 void LinkPlayerFromBlock(u32 who);
 void SetLinkErrorFromRfu(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 unk_06);
 u8 sub_800A8D4(void);
+void sub_800AA24(void);
+void sub_800A900(u8 a0);
+u8 sub_800A8A4(void);
+void sub_800A9A4(void);
+void SetLocalLinkPlayerId(u8 playerId);
 
 #endif // GUARD_LINK_H

include/overworld.h

@@ -183,6 +183,12 @@ bool32 sub_8058274(void);
 u8 GetCurrentMapBattleScene(void);
 void Overworld_ResetStateAfterFly(void);
 bool8 sub_8055B38(u16 metatileBehavior);
+void sub_8055DB8(void);
+void sub_8057F5C(void);
+void sub_8057F34(void);
+u32 sub_8057EC0(void);
+void sub_8057F70(void);
+void sub_8057F48(void);
 
 extern u16 gHeldKeyCodeToSend;
 

include/quest_log.h

@@ -52,5 +52,6 @@ void sub_8112F18(u8 windowId);
 bool8 sub_8111C2C(void);
 void sub_81128BC(u8 a0);
 void sub_811278C(u8, u8);
+void Special_UpdateTrainerFansAfterLinkBattle(void);
 
 #endif //GUARD_QUEST_LOG_H

include/strings.h

@@ -1141,4 +1141,11 @@ extern const u8 gText_BestScore2[];
 extern const u8 gText_ExcellentsInARow[];
 extern const u8 gText_PkmnJumpRecords[];
 
+// cable_club
+extern const u8 gUnknown_841DF82[];
+extern const u8 gUnknown_841DF8B[];
+extern const u8 gUnknown_841DF92[];
+extern const u8 gUnknown_841DF99[];
+extern const u8 gUnknown_841DFA0[];
+
 #endif //GUARD_STRINGS_H

include/trainer_card.h

@@ -1,7 +1,7 @@
 #ifndef GUARD_TRAINER_CARD_H
 #define GUARD_TRAINER_CARD_H
 
-struct TrainerCard
+struct TrainerCardRSE
 {
     /*0x00*/ u8 gender;
     /*0x01*/ u8 stars;
@@ -25,6 +25,11 @@ struct TrainerCard
     /*0x24*/ u32 money;
     /*0x28*/ u16 var_28[4];
     /*0x30*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+};
+
+struct TrainerCard
+{
+    /*0x00*/ struct TrainerCardRSE rse;
     /*0x38*/ u8 version;
     /*0x3A*/ u16 var_3A;
     /*0x3C*/ u32 berryCrushPoints;

include/union_room.h

@@ -163,5 +163,6 @@ extern u16 gUnionRoomOfferedSpecies;
 extern u8 gUnionRoomRequestedMonType;
 
 void StartUnionRoomBattle(u16 battleFlags);
+u8 UnionRoom_CreateTask_CallCB2ReturnFromLinkTrade(void);
 
 #endif //GUARD_UNION_ROOM_H