summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/global.h26
-rw-r--r--include/link.h1
2 files changed, 2 insertions, 25 deletions
diff --git a/include/global.h b/include/global.h
index 4b23fded7..dcd20981e 100644
--- a/include/global.h
+++ b/include/global.h
@@ -740,7 +740,7 @@ struct BattleTowerTrainer
/*0x0C*/
struct {
u16 easyChat[6];
- } greeting;
+ } greeting[6];
};
struct BattleTowerRecord // record mixing
@@ -757,28 +757,6 @@ struct BattleTowerRecord // record mixing
/*0xA0*/u32 checksum;
};
-#if 0
-struct BattleTowerEReaderTrainer
-{
- /*0x00*/u8 unk0;
- /*0x01*/u8 trainerClass;
- /*0x02*/u16 winStreak;
- /*0x04*/u8 name[8];
- /*0x0C*/u8 trainerId[4];
- /*0x10*/struct {
- u16 easyChat[6];
- } greeting;
- /*0x1C*/struct {
- u16 easyChat[6];
- } farewellPlayerLost;
- /*0x28*/struct {
- u16 easyChat[6];
- } farewellPlayerWon;
- /*0x34*/struct UnknownPokemonStruct party[3];
- /*0xB8*/u32 checksum;
-};
-#endif
-
struct BattleTowerEReaderTrainer
{
/*0x00*/ u8 unk0;
@@ -867,8 +845,6 @@ struct HallOfFame
u8 filler[0x1F00];
};
-extern struct HallOfFame gHallOfFame;
extern struct SaveBlock2 gSaveBlock2;
-extern u8 ewram[];
#endif // GUARD_GLOBAL_H
diff --git a/include/link.h b/include/link.h
index d8c6690ea..f9f2b6d0e 100644
--- a/include/link.h
+++ b/include/link.h
@@ -148,6 +148,7 @@ extern bool8 gReceivedRemoteLinkPlayers;
extern bool8 gLinkOpen;
extern bool8 gLinkPlayerPending[MAX_LINK_PLAYERS];
void (*gLinkCallback)(void);
+extern u8 gUnknown_Debug_30030E0;
void Task_DestroySelf(u8);
void sub_8007270(u8);