Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest

2020-08-16 05:59:10 -04:00
parent 2749948eeb 25f45ffa84
commit 65bd2faf94
511 changed files with 17469 additions and 16800 deletions
@@ -30,12 +30,12 @@ void AlertTVThatPlayerPlayedSlotMachine(u16 nCoinsSpent);
 void AlertTVThatPlayerPlayedRoulette(u16 nCoinsSpent);
 void AlertTVOfNewCoinTotal(u16 nCoinsPaidOut);
 void TryPutSecretBaseSecretsOnAir(void);
-void sub_80EDB44(void);
+void TryPutTodaysRivalTrainerOnAir(void);
 void sub_80EDC60(const u16 *words);
 void sub_80EDA80(void);
 void ReceivePokeNewsData(void *src, u32 size, u8 masterIdx);
 void sub_80F0BB8(void);
-void sub_80ED950(bool8 flag);
+void RecordFishingAttemptForTV(bool8 caughtFish);
 void IncrementDailySlotsUses(void);
 void IncrementDailyRouletteUses(void);
 void IncrementDailyWildBattles(void);