Merge branch 'marijnvdwerf-trainer-card'

5 files changed, 128 insertions, 9 deletions

diff --git a/include/asm.inc.h b/include/asm.inc.h
index 567c8708e..d15a8bc9b 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -20,7 +20,7 @@ void current_map_music_set__default_for_battle(u16);
 
 // asm/rom_8040EB4.o
 void StoreWordInTwoHalfwords(u16 *, u32);
-void LoadWordFromTwoHalfwords(u16 *, u32);
+void LoadWordFromTwoHalfwords(u16 *, u32 *);
 
 // asm/daycare.o
 u8 daycare_count_pokemon(u8 *);
@@ -244,10 +244,6 @@ void sub_8089668(void);
 void sub_8089944(int i, int i1, int i2, int i3, int i4, int i5, int i6);
 void sub_8089A70(void);
 
-// asm/trainer_card.o
-void sub_8093110(void (*)(void));
-void sub_8093130(u8, void (*)(void));
-
 // asm/rom_8094928.o
 void sub_80961D8(void);
 u8 pokemon_ailments_get_primary(u32);
@@ -317,6 +313,7 @@ void sub_80C4940(void);
 void sub_80C4980(u8);
 
 // asm/script_pokemon_util_80C4BF0.o
+u8 sub_80C4D50(void);
 void ShowContestWinner(void);
 void HealPlayerParty();
 u8 ScriptGiveMon(u16, u8, u16, u32, u32, u8);
diff --git a/include/global.h b/include/global.h
index 79204e082..3ee1610e6 100644
--- a/include/global.h
+++ b/include/global.h
@@ -228,7 +228,9 @@ struct SaveBlock1
     /*0x2B04*/ u16 outbreakPokemonMoves[4];
     /*0x2B0C*/ u8 unk2B0C;
     /*0x2B0D*/ u8 outbreakPokemonProbability;
-    /*0x2B0E*/ u8 filler_2B0E[0x2C6];
+    /*0x2B0E*/ u8 filler_2B0E[0xE];
+	/*0x2B1C*/ u16 unk2B1C[4];
+	/*0x2B24*/ u8 filler_2B24[0x2B0];
     /*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff
     /*0x2DFC*/ u8 filler_2DFC[0x100];
     /*0x2EFC*/ struct SB1_2EFC_Struct sb1_2EFC_struct[5];
@@ -270,6 +272,14 @@ struct Pokedex
     /*0x44*/ u8 seen[52];
 };
 
+struct SaveBlock2_Sub
+{
+	/*0x0000, 0x00A8*/ u8 filler_000[0x4C8];
+	/*0x04C8, 0x0570*/ u16 var_4C8;
+	/*0x04CA, 0x0572*/ u16 var_4CA;
+	/*0x04CC, 0x0574*/ u8 filler_4CC[0x31C];
+};
+
 struct SaveBlock2
 {
     /*0x00*/ u8 playerName[8];
@@ -291,7 +301,7 @@ struct SaveBlock2
     /*0x90*/ u8 filler_90[0x8];
     /*0x98*/ struct Time localTimeOffset;
     /*0xA0*/ struct Time lastBerryTreeUpdate;
-    /*0xA8*/ u8 filler_A8[0x7E8];
+    /*0xA8*/ struct SaveBlock2_Sub filler_A8;
 };
 
 struct UnkStruct_8054FF8_Substruct
diff --git a/include/pokedex.h b/include/pokedex.h
index af0ed7102..1ac4e8c33 100644
--- a/include/pokedex.h
+++ b/include/pokedex.h
@@ -138,7 +138,7 @@ u8 *GetPokemonCategory(u16);
 bool8 sub_8090D90(u16, u8);
 u16 GetNationalPokedexCount(u8);
 u16 GetHoennPokedexCount(u8);
-
+bool8 sub_8090FC0(void);
 u16 sub_8090FF4(void);
 void sub_8091060(u16);
 void sub_8091154(u16 order, int i, int i1);
diff --git a/include/rom4.h b/include/rom4.h
index 98ec02b5f..afa489770 100644
--- a/include/rom4.h
+++ b/include/rom4.h
@@ -9,6 +9,13 @@ struct UnkPlayerStruct
 	u8 player_field_1;
 };
 
+struct LinkPlayerMapObject {
+	u8 active;
+	u8 linkPlayerId;
+	u8 mapObjId;
+	u8 mode;
+};
+
 // sub_8052F5C
 // flag_var_implications_of_teleport_
 // new_game
@@ -17,7 +24,7 @@ void sub_8053050(void);
 // sub_805308C
 void sub_80530AC(void);
 void sav12_xor_increment(u8 index);
-u32 sub_8053108(u8);
+u32 sub_8053108(u8 index);
 // sav12_xor_set
 // sub_8053154
 // sub_8053198
diff --git a/include/trainer_card.h b/include/trainer_card.h
new file mode 100644
index 000000000..aca964151
--- /dev/null
+++ b/include/trainer_card.h
@@ -0,0 +1,105 @@
+#ifndef GUARD_TRAINER_CARD_H
+#define GUARD_TRAINER_CARD_H
+
+struct TrainerCard {
+	/*0x00*/ u8 gender;
+	/*0x01*/ u8 var_1;
+	/*0x02*/ bool8 hasPokedex;
+	/*0x03*/ bool8 var_3;
+	/*0x04*/ bool8 var_4;
+	/*0x05*/ u8 var_5;
+	/*0x06*/ u16 firstHallOfFameA;
+	/*0x08*/ u16 firstHallOfFameB;
+	/*0x0A*/ u16 firstHallOfFameC;
+	/*0x0C*/ u16 pokedexSeen;
+	/*0x0E*/ u16 trainerId;
+	/*0x10*/ u16 playTimeHours;
+	/*0x12*/ u16 playTimeMinutes;
+	/*0x14*/ u16 linkBattleWins;
+	/*0x16*/ u16 linkBattleLosses;
+	/*0x18*/ u16 var_18;
+	/*0x1A*/ u16 var_1A;
+	/*0x1C*/ u16 contestsWithFriends;
+	/*0x1E*/ u16 pokeblocksWithFriends;
+	/*0x20*/ u16 pokemonTrades;
+	/*0x22*/ u16 var_22;
+	/*0x24*/ u32 money;
+	/*0x28*/ u16 var_28[4];
+	/*0x30*/ u8 playerName[8];
+};
+
+void sub_8093110(void (*)(void));
+void sub_8093130(u8, void (*)(void));
+void sub_8093324(void);
+void sub_8093390(struct TrainerCard *);
+u8 sub_80934C4(u8 id);
+void sub_8093598(void);
+void sub_80935EC(void);
+void sub_8093610(void);
+void sub_8093688(void);
+// sub_80936D4
+void sub_80937A4(void);
+void sub_80937BC(void);
+void sub_80937D8(void);
+void sub_80937F0(void);
+void nullsub_15(void);
+void sub_8093800(void);
+// sub_809380C
+// sub_809382C
+// sub_8093864
+// sub_80938A8
+// sub_80938CC
+// sub_8093918
+// sub_8093938
+// sub_8093954
+// sub_8093980
+// sub_80939A4
+// sub_80939C0
+// sub_80939DC
+// sub_8093A28
+// sub_8093A48
+// sub_8093A68
+// sub_8093AA0
+// sub_8093AF0
+// sub_8093C0C
+// sub_8093C38
+// sub_8093D50
+// sub_8093D7C
+// sub_8093DAC
+// sub_8093DC8
+// sub_8093DEC
+// sub_8093E04
+// sub_8093E28
+// sub_8093EA0
+// sub_8093EF8
+// sub_8093F14
+// sub_8093F48
+// sub_8093F64
+// sub_8093F80
+// sub_8093FD0
+// sub_8094038
+// sub_80940E4
+// sub_8094110
+// sub_8094140
+// sub_8094188
+// sub_80941D8
+// sub_8094200
+// sub_8094218
+// sub_8094250
+// sub_809429C
+// sub_80942F8
+// sub_8094334
+// sub_8094354
+// sub_80943C4
+// sub_80943E4
+// sub_8094428
+// sub_8094448
+// sub_8094498
+// sub_80944B8
+// sub_80944E8
+// sub_8094508
+// sub_8094538
+// sub_8094558
+// unref_sub_8094588
+
+#endif // GUARD_TRAINER_CARD_H