diff options
| -rw-r--r-- | engine/subtract_paid_money.asm | 2 | ||||
| -rw-r--r-- | home.asm | 6 | ||||
| -rw-r--r-- | text.asm | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engine/subtract_paid_money.asm b/engine/subtract_paid_money.asm index a6a6ec2e..2f4c2243 100644 --- a/engine/subtract_paid_money.asm +++ b/engine/subtract_paid_money.asm @@ -1,5 +1,5 @@ ; subtracts the amount the player paid from their money -; sets carry flag if there is enough money and unsets carry flag if not +; OUTPUT: carry = 0(success) or 1(fail because there is not enough money) SubtractAmountPaidFromMoney_: ld de, wPlayerMoney ld hl, hMoney ; total price of items @@ -333,10 +333,10 @@ GetCryData:: call BankswitchBack ; Cry headers have 3 channels, - ; and start from index $14, + ; and start from index CRY_SFX_START, ; so add 3 times the cry id. ld a, b - ld c, $14 + ld c, CRY_SFX_START rlca ; * 2 add b add c @@ -1307,7 +1307,7 @@ CountSetBits:: ret ; subtracts the amount the player paid from their money -; sets carry flag if there is enough money and unsets carry flag if not +; OUTPUT: carry = 0(success) or 1(fail because there is not enough money) SubtractAmountPaidFromMoney:: jpba SubtractAmountPaidFromMoney_ @@ -255,7 +255,7 @@ _TradeWentToText:: TX_RAM wcf4b text " went" line "to @" - TX_RAM wGrassRate + TX_RAM wLinkEnemyTrainerName text "." done @@ -267,7 +267,7 @@ _TradeForText:: done _TradeSendsText:: - TX_RAM wGrassRate + TX_RAM wLinkEnemyTrainerName text " sends" line "@" TX_RAM wcd6d @@ -275,7 +275,7 @@ _TradeSendsText:: done _TradeWavesFarewellText:: - TX_RAM wGrassRate + TX_RAM wLinkEnemyTrainerName text " waves" line "farewell as" done @@ -294,7 +294,7 @@ _TradeTakeCareText:: done _TradeWillTradeText:: - TX_RAM wGrassRate + TX_RAM wLinkEnemyTrainerName text " will" line "trade @" TX_RAM wcd6d |