Merge branch 'master' into slot_machine

4 files changed, 9 insertions, 9 deletions

diff --git a/src/engine/record_mixing.c b/src/engine/record_mixing.c
index 997a257f5..c8e2e34d5 100644
--- a/src/engine/record_mixing.c
+++ b/src/engine/record_mixing.c
@@ -36,7 +36,7 @@ static u8 gUnknown_0300071C[4];
 
 void *recordMixingSecretBases = &gSaveBlock1.secretBases;
 void *recordMixingTvShows = &gSaveBlock1.tvShows;
-void *gUnknown_083D0274 = &gSaveBlock1.unknown_2ABC;
+void *gUnknown_083D0274 = &gSaveBlock1.pokeNews;
 void *gUnknown_083D0278 = &gSaveBlock1.mauvilleMan;
 void *recordMixingEasyChatPairs = &gSaveBlock1.easyChatPairs;
 struct RecordMixingDayCareMail *gUnknown_083D0280 = &gUnknown_02038738;
diff --git a/src/engine/sprite.c b/src/engine/sprite.c
index c1bb36917..cf35e12a3 100644
--- a/src/engine/sprite.c
+++ b/src/engine/sprite.c
@@ -598,7 +598,7 @@ static u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x,
     return index;
 }
 
-u8 CreateSpriteAndAnimate(struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority)
+u8 CreateSpriteAndAnimate(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority)
 {
     u8 i;
 
diff --git a/src/engine/trade.c b/src/engine/trade.c
index 0567b4d2f..0bc589ff4 100644
--- a/src/engine/trade.c
+++ b/src/engine/trade.c
@@ -5391,7 +5391,7 @@ static void sub_804D80C(struct Sprite *sprite)
     }
 }
 
-u16 sub_804D89C(void)
+u16 GetInGameTradeSpeciesInfo(void)
 {
     const struct InGameTrade *inGameTrade = &gIngameTrades[gSpecialVar_0x8004];
     StringCopy(gStringVar1, gSpeciesNames[inGameTrade->playerSpecies]);
@@ -5408,7 +5408,7 @@ static void sub_804D8E4(void)
     StringCopy(gStringVar2, gSpeciesNames[inGameTrade->species]);
 }
 
-static void sub_804D948(u8 whichPlayerMon, u8 whichInGameTrade)
+static void _CreateInGameTradePokemon(u8 whichPlayerMon, u8 whichInGameTrade)
 {
     const struct InGameTrade *inGameTrade = &gIngameTrades[whichInGameTrade];
     u8 level = GetMonData(&gPlayerParty[whichPlayerMon], MON_DATA_LEVEL);
@@ -5478,16 +5478,16 @@ static void sub_804DAD4(struct MailStruct *mail, const struct InGameTrade *trade
     mail->itemId = trade->heldItem;
 }
 
-u16 sub_804DB2C(void)
+u16 GetTradeSpecies(void)
 {
     if (GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_IS_EGG))
         return SPECIES_NONE;
     return GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_SPECIES);
 }
 
-void sub_804DB68(void)
+void CreateInGameTradePokemon(void)
 {
-    sub_804D948(gSpecialVar_0x8005, gSpecialVar_0x8004);
+    _CreateInGameTradePokemon(gSpecialVar_0x8005, gSpecialVar_0x8004);
 }
 
 #ifdef NONMATCHING
@@ -5670,7 +5670,7 @@ static void sub_804E144(void)
     UpdatePaletteFade();
 }
 
-void sub_804E174(void)
+void DoInGameTradeScene(void)
 {
     ScriptContext2_Enable();
     CreateTask(sub_804E1A0, 10);
diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c
index dcd1197cb..ffa4cbd08 100644
--- a/src/engine/trainer_card.c
+++ b/src/engine/trainer_card.c
@@ -321,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];