diff --git a/arm9/src/coins.c b/arm9/src/coins.c index 7c5aeb558..d8842a590 100644 --- a/arm9/src/coins.c +++ b/arm9/src/coins.c @@ -1,42 +1,41 @@ #include "global.h" #include "coins.h" -void InitCoins(u16 * coins) -{ +void InitCoins(u16 *coins) { *coins = 0; } -void SetCoins(u16 * coins, u16 value) -{ +void SetCoins(u16 *coins, u16 value) { GF_ASSERT(value <= MAX_COINS); *coins = value; } -u16 CheckCoins(u16 * coins) -{ +u16 CheckCoins(u16 *coins) { return *coins; } -BOOL GiveCoins(u16 * coins, u16 amount) -{ - if (*coins >= MAX_COINS) +BOOL GiveCoins(u16 * coins, u16 amount) { + if (*coins >= MAX_COINS) { return FALSE; + } + *coins += amount; - if (*coins > MAX_COINS) + if (*coins > MAX_COINS) { *coins = MAX_COINS; + } + return TRUE; } -BOOL CanGiveCoins(u16 * coins, u16 amount) -{ - +BOOL CanGiveCoins(u16 *coins, u16 amount) { return (u32)(amount + *coins) <= MAX_COINS; } -BOOL TakeCoins(u16 * coins, u16 amount) -{ - if (*coins < amount) +BOOL TakeCoins(u16 *coins, u16 amount) { + if (*coins < amount) { return FALSE; + } + *coins -= amount; return TRUE; } diff --git a/include/coins.h b/include/coins.h index f68d44a05..2e5ea6513 100644 --- a/include/coins.h +++ b/include/coins.h @@ -3,11 +3,11 @@ #define MAX_COINS 50000 -void InitCoins(u16 * coins); -void SetCoins(u16 * coins, u16 value); -u16 CheckCoins(u16 * coins); -BOOL GiveCoins(u16 * coins, u16 amount); -BOOL CanGiveCoins(u16 * coins, u16 amount); -BOOL TakeCoins(u16 * coins, u16 amount); +void InitCoins(u16 *coins); +void SetCoins(u16 *coins, u16 value); +u16 CheckCoins(u16 *coins); +BOOL GiveCoins(u16 *coins, u16 amount); +BOOL CanGiveCoins(u16 *coins, u16 amount); +BOOL TakeCoins(u16 *coins, u16 amount); #endif //POKEDIAMOND_COINS_H