Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj

2020-01-13 20:41:57 -05:00
parent 655910a16f 736f3bbbe0
commit e92cc7752b
118 changed files with 605 additions and 638 deletions
--- a/include/coins.h
+++ b/include/coins.h
@@ -6,7 +6,7 @@ void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y);
 void HideCoinsWindow(void);
 u16 GetCoins(void);
 void SetCoins(u16 coinAmount);
-bool8 GiveCoins(u16 toAdd);
-bool8 TakeCoins(u16 toSub);
+bool8 AddCoins(u16 toAdd);
+bool8 RemoveCoins(u16 toSub);

 #endif // GUARD_COINS_H