diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-15 23:27:27 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-15 23:27:27 +0200 |
commit | 003a8a501b7ee0a4f8bf8bb803cf7e077d52d068 (patch) | |
tree | 2ebb9f702f863ab0cfb78a996aeeac331428ba7b /include/coins.h | |
parent | 9d4acb9635b3b74d5ae4edee70d673f49c0aab74 (diff) | |
parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) |
fix merge conflict
Diffstat (limited to 'include/coins.h')
-rw-r--r-- | include/coins.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/coins.h b/include/coins.h index 43434b227..996519605 100644 --- 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 AddCoins(u16 toAdd); -bool8 SubtractCoins(u16 toSub); +bool8 GiveCoins(u16 toAdd); +bool8 TakeCoins(u16 toSub); #endif // GUARD_COINS_H |