summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/cable_club.h2
-rw-r--r--include/field_control_avatar.h1
-rw-r--r--include/field_screen.h1
-rw-r--r--include/librfu.h15
-rw-r--r--include/link.h2
-rw-r--r--include/link_rfu.h32
-rw-r--r--include/party_menu.h3
-rw-r--r--include/trade.h4
-rw-r--r--include/trainer_card.h4
9 files changed, 56 insertions, 8 deletions
diff --git a/include/cable_club.h b/include/cable_club.h
index 44831235c..734a4f070 100644
--- a/include/cable_club.h
+++ b/include/cable_club.h
@@ -9,5 +9,7 @@
void sub_80B37D4(TaskFunc taskFunc);
u8 sub_80B3050(void);
+void sub_80B360C(void);
+bool32 sub_80B2AF4(u16 *arg0, u16 *arg1);
#endif //GUARD_CABLE_CLUB_H
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h
index 3c4ad030f..0ff1834ca 100644
--- a/include/field_control_avatar.h
+++ b/include/field_control_avatar.h
@@ -37,5 +37,6 @@ bool8 sub_8068894(void);
bool8 sub_8068A64(struct MapPosition *, u16);
u8 sub_8068F18(void);
bool8 dive_warp(struct MapPosition *position, u16 b);
+void sub_809D2BC(void);
#endif // GUARD_FIELDCONTROLAVATAR_H
diff --git a/include/field_screen.h b/include/field_screen.h
index d9a2bb5fa..268b9312e 100644
--- a/include/field_screen.h
+++ b/include/field_screen.h
@@ -14,5 +14,6 @@ void UpdateWeatherPerDay(u16 days);
void sub_80AC3D0(void);
void sub_80AC3E4(void);
void PreservePaletteInWeather(u8);
+void sub_80AF128(void);
#endif //GUARD_FIELD_SCREEN_H
diff --git a/include/librfu.h b/include/librfu.h
index aae7df4e9..9d131f027 100644
--- a/include/librfu.h
+++ b/include/librfu.h
@@ -47,7 +47,7 @@ enum
RFU_UNK3A,
RFU_UNK3B,
RFU_UNK3C,
- RFU_STOP_MODE, //3D
+ RFU_STOP_MODE, // 3D
};
struct RfuPacket8
@@ -67,7 +67,7 @@ union RfuPacket
struct RfuPacket8 rfuPacket8;
};
-struct __attribute__((packed)) UnkLinkRfuStruct_02022B14
+struct UnkLinkRfuStruct_02022B14Substruct
{
u16 unk_00_0:4;
u16 unk_00_4:1;
@@ -79,9 +79,14 @@ struct __attribute__((packed)) UnkLinkRfuStruct_02022B14
u16 unk_01_2:4;
u16 unk_01_6:2;
u8 playerTrainerId[2];
+};
+
+struct __attribute__((packed)) UnkLinkRfuStruct_02022B14
+{
+ struct UnkLinkRfuStruct_02022B14Substruct unk_00;
u8 unk_04[4];
- u16 unk_08_0:10;
- u16 unk_09_2:6;
+ u16 species:10;
+ u16 type:6;
u8 unk_0a_0:7;
u8 unk_0a_7:1;
u8 playerGender:1;
@@ -200,8 +205,6 @@ extern struct RfuUnk1* gUnknown_03007870[4];
extern void* sub_82E53F4;
extern void rfu_STC_clearAPIVariables(void);
-struct UnkLinkRfuStruct_02022B14;
-
void STWI_init_all(struct RfuIntrStruct *interruptStruct, IntrFunc *interrupt, bool8 copyInterruptToRam);
void rfu_REQ_stopMode(void);
void rfu_waitREQComplete(void);
diff --git a/include/link.h b/include/link.h
index afc5008e6..b1b5a6d04 100644
--- a/include/link.h
+++ b/include/link.h
@@ -122,7 +122,7 @@ struct LinkPlayer
/* 0x08 */ u8 name[11];
/* 0x13 */ u8 gender;
/* 0x14 */ u32 linkType;
- /* 0x18 */ u16 lp_field_18; // battle bank in battles
+ /* 0x18 */ u16 id; // battler id in battles
/* 0x1A */ u16 language;
};
diff --git a/include/link_rfu.h b/include/link_rfu.h
index ca39c2fb2..c3ca75604 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -232,5 +232,37 @@ void sub_8011068(u8 a0);
void sub_8011170(u32 a0);
void sub_8011A64(u8 a0, u16 a1);
u8 sub_801048C(bool32 a0);
+void sub_800DF90(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2);
+void sub_8010F84(u8 a0, u32 a1, u32 a2);
+void sub_8011C10(u32 a0);
+bool32 sub_8012240(void);
+void sub_800EF38(void);
+bool32 sub_80105EC(void);
+bool32 sub_801064C(u16 a0, const u8 *a1);
+void sub_8010688(u8 a0, u16 a1, const u8 *a2);
+u32 sub_8010714(u16 a0, const u8 *a1);
+void sub_8011DC0(const u8 *a0, u16 a1);
+bool8 sub_800EF1C(void);
+bool32 sub_800EF58(bool32 a0);
+void sub_800E084(void);
+void sub_801103C(void);
+void sub_8011C5C(void);
+void sub_80106D4(void);
+void sub_800E3A8(void);
+void sub_800ED10(void);
+void sub_800ED28(void);
+void sub_8011090(u8 a0, u32 a1, u32 a2);
+void sub_8011FC8(u8 *a0, u16 a1);
+void sub_8010FA0(bool32 a0, bool32 a1);
+void sub_8010F60(void);
+void sub_8010FCC(u32 a0, u32 a1, u32 a2);
+void sub_8011C84(void);
+void sub_8012188(const u8 *a0, struct UnkLinkRfuStruct_02022B14 *arg1, u8 arg2);
+bool32 sub_8011B90(void);
+void sub_800FE50(u16 *a0);
+bool32 sub_800E540(u16 id, u8 *name);
+void sub_8011DE0(u32 arg0);
+u8 sub_801100C(int a0);
+void sub_800EF7C(void);
#endif //GUARD_LINK_RFU_H
diff --git a/include/party_menu.h b/include/party_menu.h
index fd52f8d4d..6e1344213 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -50,6 +50,9 @@ void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func);
void sub_81B1B5C(void *a, u8 b);
u8 sub_81B1BD4();
void sub_81B8448();
+void sub_81B8518(u8 unused);
+u8 sub_81B1360(void);
+void sub_81B8904(u8 arg0, void (*callback)(void));
void OpenPartyMenuInBattle(u8 caseId);
#endif // GUARD_PARTY_MENU_H
diff --git a/include/trade.h b/include/trade.h
index 15438ff3f..af4da0015 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -7,6 +7,8 @@
// Exported ROM declarations
-int sub_807A728(void);
+s32 sub_807A728(void);
+void sub_80773AC(void);
+void sub_807AE50(void);
#endif //GUARD_TRADE_H
diff --git a/include/trainer_card.h b/include/trainer_card.h
index 5cb93dba0..af603444f 100644
--- a/include/trainer_card.h
+++ b/include/trainer_card.h
@@ -32,4 +32,8 @@ struct TrainerCard
extern struct TrainerCard gTrainerCards[4];
+void sub_80C3120(struct TrainerCard *arg0, u16 *arg1, u8 gameVersion);
+void sub_80C4E74(u8 arg0, void (*callback)(void));
+void sub_80C30A4(u16 *arg0);
+
#endif // GUARD_TRAINER_CARD_H