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/money.h | |
parent | 9d4acb9635b3b74d5ae4edee70d673f49c0aab74 (diff) | |
parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) |
fix merge conflict
Diffstat (limited to 'include/money.h')
-rw-r--r-- | include/money.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/money.h b/include/money.h index 22a3657f6..5c7c1c984 100644 --- a/include/money.h +++ b/include/money.h @@ -5,7 +5,7 @@ u32 GetMoney(u32* moneyPtr); void SetMoney(u32* moneyPtr, u32 newValue); bool8 IsEnoughMoney(u32* moneyPtr, u32 cost); void AddMoney(u32* moneyPtr, u32 toAdd); -void SubtractMoney(u32* moneyPtr, u32 toSub); +void RemoveMoney(u32* moneyPtr, u32 toSub); bool8 IsEnoughForCostInVar0x8005(void); void SubtractMoneyFromVar0x8005(void); void PrintMoneyAmountInMoneyBox(u8 windowId, int amount, u8 speed); |