Merge branch 'master' into cable_car

1 files changed, 2 insertions, 5 deletions

diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c
index 207fa5f77..ffa4cbd08 100644
--- a/src/engine/trainer_card.c
+++ b/src/engine/trainer_card.c
@@ -287,10 +287,7 @@ void sub_8093324(void)
 
     if (ewram0_2.var_1)
     {
-        struct TrainerCard(*trainerCards)[4] = &gTrainerCards;
-        s16 var = task->data[TD_1];
-        struct TrainerCard *dest = &(*trainerCards)[var];
-        memcpy(&ewram0_2.var_64, dest, sizeof(struct TrainerCard));
+        ewram0_2.var_64 = gTrainerCards[task->data[TD_1]];
     }
     else
     {
@@ -324,7 +321,7 @@ void sub_8093390(struct TrainerCard *trainerCard)
     trainerCard->firstHallOfFameC = playTime & 0xFF;
 
     trainerCard->hasPokedex = FlagGet(FLAG_SYS_POKEDEX_GET);
-    trainerCard->var_3 = sub_8090FC0();
+    trainerCard->var_3 = CompletedHoennPokedex();
     trainerCard->pokedexSeen = GetPokedexSeenCount();
 
     trainerCard->trainerId = (gSaveBlock2.playerTrainerId[1] << 8) | gSaveBlock2.playerTrainerId[0];