summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-02-10 00:50:46 -0500
committerPhlosioneer <mattmdrr2@gmail.com>2019-02-10 00:50:46 -0500
commit3fd878483f38145cb4311d377f99545f25af52a8 (patch)
treedc3c048165478b004cec736eb3a1ba91984ae4d5 /include
parent6f1d2b870c1426e7f405f3b3bc4ff2b9edb380e1 (diff)
Start renaming symbols
I finally figured out what the code is trying to do. I have a foothold; the rest should follow.
Diffstat (limited to 'include')
-rw-r--r--include/cable_club.h2
-rw-r--r--include/global.h4
-rw-r--r--include/overworld.h2
-rw-r--r--include/trainer_card.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/include/cable_club.h b/include/cable_club.h
index 60d56460d..c2849ca3e 100644
--- a/include/cable_club.h
+++ b/include/cable_club.h
@@ -15,6 +15,6 @@ void sub_80B360C(void);
bool32 sub_80B2AF4(u16 *arg0, u16 *arg1);
void sub_80B3AF8(u8 taskId);
void task00_08081A90(u8 taskId);
-bool32 sub_80B39D4(u8 linkPlayerIndex);
+bool32 GetLinkTrainerCardColor(u8 linkPlayerIndex);
#endif //GUARD_CABLE_CLUB_H
diff --git a/include/global.h b/include/global.h
index 14a6387cd..64d039c6f 100644
--- a/include/global.h
+++ b/include/global.h
@@ -907,12 +907,12 @@ struct MapPosition
s8 height;
};
-struct UnkStruct_8054FF8
+struct TradeRoomTrainer
{
u8 a;
u8 b;
u8 c;
- u8 d;
+ u8 facing;
struct MapPosition sub;
u16 field_C;
};
diff --git a/include/overworld.h b/include/overworld.h
index 79cbf1da3..1a8702d71 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -25,7 +25,7 @@ extern u16 *gBGTilemapBuffers3;
extern u16 gUnknown_03005DA8;
extern void (*gFieldCallback)(void);
extern bool8 (*gFieldCallback2)(void);
-extern u8 gUnknown_03005DB4;
+extern u8 gLinkGuestPlayerId;
extern u8 gFieldLinkPlayerCount;
// Exported ROM declarations
diff --git a/include/trainer_card.h b/include/trainer_card.h
index 1cadbd8fc..173d23baa 100644
--- a/include/trainer_card.h
+++ b/include/trainer_card.h
@@ -43,7 +43,7 @@ struct TrainerCard
extern struct TrainerCard gTrainerCards[4];
u32 CountPlayerTrainerStars(void);
-u8 sub_80C4904(u8 cardId);
+u8 GetTrainerCardStars(u8 cardId);
void CopyTrainerCardData(struct TrainerCard *dst, u16 *src, u8 gameVersion);
void ShowPlayerTrainerCard(void (*callback)(void));
void ShowTrainerCardInLink(u8 arg0, void (*callback)(void));