Merge branch 'master' into pokemon

include/overworld.h

@@ -78,7 +78,8 @@ void c2_load_new_map(void);
 void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused);
 void mapldr_default(void);
 
-u32 GetGameStat(u8);
+u32 GetGameStat(u8 statId);
+u32 SetGameStat(u8 statId, u32 value);
 
 void CB2_ContinueSavedGame(void);
 void sub_8055D5C(struct WarpData *);

include/strings.h

@@ -196,4 +196,11 @@ extern const u8 gUnknown_841B684[];
 extern const u8 gUnknown_841B68F[];
 extern const u8 gUnknown_841B698[];
 
+// battle_records
+extern const u8 gString_BattleRecords_PlayersBattleResults[];
+extern const u8 gString_BattleRecords_TotalRecord[];
+extern const u8 gString_BattleRecords_ColumnHeaders[];
+extern const u8 gString_BattleRecords_7Dashes[];
+extern const u8 gString_BattleRecords_4Dashes[];
+
 #endif //GUARD_STRINGS_H

include/trainer_card.h

@@ -0,0 +1,43 @@
+#ifndef GUARD_TRAINER_CARD_H
+#define GUARD_TRAINER_CARD_H
+
+struct TrainerCard
+{
+    /*0x00*/ u8 gender;
+    /*0x01*/ u8 stars;
+    /*0x02*/ bool8 hasPokedex;
+    /*0x03*/ bool8 caughtAllHoenn;
+    /*0x04*/ bool8 hasAllPaintings;
+    /*0x06*/ u16 hofDebutHours;
+    /*0x08*/ u16 hofDebutMinutes;
+    /*0x0A*/ u16 hofDebutSeconds;
+    /*0x0C*/ u16 caughtMonsCount;
+    /*0x0E*/ u16 trainerId;
+    /*0x10*/ u16 playTimeHours;
+    /*0x12*/ u16 playTimeMinutes;
+    /*0x14*/ u16 linkBattleWins;
+    /*0x16*/ u16 linkBattleLosses;
+    /*0x18*/ u16 battleTowerWins;
+    /*0x1A*/ u16 battleTowerStraightWins;
+    /*0x1C*/ u16 contestsWithFriends;
+    /*0x1E*/ u16 pokeblocksWithFriends;
+    /*0x20*/ u16 pokemonTrades;
+    /*0x24*/ u32 money;
+    /*0x28*/ u16 var_28[4];
+    /*0x30*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+    /*0x38*/ u8 version;
+    /*0x3A*/ u16 var_3A;
+    /*0x3C*/ u32 berryCrushPoints;
+    /*0x40*/ u32 unionRoomNum;
+    /*0x44*/ u8 filler44[0x8];
+    /*0x4C*/ u8 var_4C;
+    /*0x4D*/ u8 var_4D;
+    /*0x4E*/ u8 var_4E;
+    /*0x4F*/ u8 var_4F;
+    /*0x50*/ u8 var_50[0x4];
+    /*0x54*/ u16 monSpecies[PARTY_SIZE];
+};
+
+extern struct TrainerCard gTrainerCards[4];
+
+#endif //GUARD_TRAINER_CARD_H

include/trainer_tower.h

@@ -0,0 +1,6 @@
+#ifndef GUARD_TRAINER_TOWER_H
+#define GUARD_TRAINER_TOWER_H
+
+void PrintTrainerTowerRecords(void);
+
+#endif //GUARD_TRAINER_TOWER_H