fix merge conflict

2017-10-15 23:27:27 +02:00
parent 9d4acb9635 0d38d443b5
commit 003a8a501b
269 changed files with 36239 additions and 38308 deletions
--- a/src/coins.c
+++ b/src/coins.c
@@ -54,7 +54,7 @@ void SetCoins(u16 coinAmount)
 }

 /* Can't match it lol
-bool8 AddCoins(u16 toAdd)
+bool8 GiveCoins(u16 toAdd)
 {
    u16 newAmount;
    u16 ownedCoins = GetCoins();