Rename the concept of Money to Coins (#7)

This commit is contained in:
xCrystal
2023-09-02 23:16:35 +02:00
parent 5d95ff952a
commit eb728d5151
35 changed files with 372 additions and 370 deletions

View File

@@ -1,12 +1,12 @@
GiveMoney::
GiveCoins::
ld a, 3
call AddMoney
ld bc, MaxMoney
call AddCoins
ld bc, MaxCoins
ld a, 3
call CompareMoney
call CompareCoins
jr z, .not_maxed_out
jr c, .not_maxed_out
ld hl, MaxMoney
ld hl, MaxCoins
ld a, [hli]
ld [de], a
inc de
@@ -22,14 +22,14 @@ GiveMoney::
and a
ret
MaxMoney:
dt MAX_MONEY
MaxCoins:
dt MAX_COINS
TakeMoney::
TakeCoins::
ld a, 3
call SubtractMoney
call SubtractCoins
jr nc, .okay
; leave with 0 money
; leave with 0 coins
xor a
ld [de], a
inc de
@@ -43,7 +43,7 @@ TakeMoney::
and a
ret
CompareMoney::
CompareCoins::
ld a, 3
CompareFunds:
; a: number of bytes
@@ -91,7 +91,7 @@ CompareFunds:
pop hl
ret
SubtractMoney:
SubtractCoins:
ld a, 3
SubtractFunds:
; a: number of bytes
@@ -126,7 +126,7 @@ SubtractFunds:
pop hl
ret
AddMoney:
AddCoins:
ld a, 3
AddFunds:
; a: number of bytes

View File

@@ -17,7 +17,7 @@
const DAYCARETEXT_GOT_BACK
const DAYCARETEXT_TOO_SOON
const DAYCARETEXT_PARTY_FULL
const DAYCARETEXT_NOT_ENOUGH_MONEY
const DAYCARETEXT_NOT_ENOUGH_COINS
const DAYCARETEXT_OH_FINE
const DAYCARETEXT_COME_AGAIN
@@ -45,7 +45,7 @@ DayCareMan:
call DayCare_AskWithdrawBreedMon
jr c, .print_text
farcall RetrieveMonFromDayCareMan
call DayCare_GetBackMonForMoney
call DayCare_GetBackMonForCoins
ld hl, wDayCareMan
res DAYCAREMAN_HAS_MON_F, [hl]
res DAYCAREMAN_MONS_COMPATIBLE_F, [hl]
@@ -83,7 +83,7 @@ DayCareLady:
call DayCare_AskWithdrawBreedMon
jr c, .print_text
farcall RetrieveMonFromDayCareLady
call DayCare_GetBackMonForMoney
call DayCare_GetBackMonForCoins
ld hl, wDayCareLady
res DAYCARELADY_HAS_MON_F, [hl]
ld hl, wDayCareMan
@@ -187,7 +187,7 @@ DayCare_AskWithdrawBreedMon:
call PrintDayCareText
call YesNoBox
jr c, .refused
jr .check_money
jr .check_coins
.grew_at_least_one_level
ld a, DAYCARETEXT_GENIUSES
@@ -199,11 +199,11 @@ DayCare_AskWithdrawBreedMon:
call YesNoBox
jr c, .refused
.check_money
ld de, wMoney
.check_coins
ld de, wCoins
ld bc, wStringBuffer2 + 2
farcall CompareMoney
jr c, .not_enough_money
farcall CompareCoins
jr c, .not_enough_coins
ld a, [wPartyCount]
cp PARTY_LENGTH
jr nc, .party_full
@@ -215,8 +215,8 @@ DayCare_AskWithdrawBreedMon:
scf
ret
.not_enough_money
ld a, DAYCARETEXT_NOT_ENOUGH_MONEY
.not_enough_coins
ld a, DAYCARETEXT_NOT_ENOUGH_COINS
scf
ret
@@ -225,10 +225,10 @@ DayCare_AskWithdrawBreedMon:
scf
ret
DayCare_GetBackMonForMoney:
DayCare_GetBackMonForCoins:
ld bc, wStringBuffer2 + 2
ld de, wMoney
farcall TakeMoney
ld de, wCoins
farcall TakeCoins
ld a, DAYCARETEXT_WITHDRAW
call PrintDayCareText
ld a, [wCurPartySpecies]
@@ -290,7 +290,7 @@ PrintDayCareText:
dw .GotBackMonText ; 0e
dw .BackAlreadyText ; 0f
dw .HaveNoRoomText ; 10
dw .NotEnoughMoneyText ; 11
dw .NotEnoughCoinsText ; 11
dw .OhFineThenText ; 12
dw .ComeAgainText ; 13
@@ -362,8 +362,8 @@ PrintDayCareText:
text_far _HaveNoRoomText
text_end
.NotEnoughMoneyText:
text_far _NotEnoughMoneyText
.NotEnoughCoinsText:
text_far _NotEnoughCoinsText
text_end
.OhFineThenText:

View File

@@ -23,24 +23,24 @@ BankOfMom:
.dw
dw .CheckIfBankInitialized
dw .InitializeBank
dw .IsThisAboutYourMoney
dw .IsThisAboutYourCoins
dw .AccessBankOfMom
dw .StoreMoney
dw .TakeMoney
dw .StopOrStartSavingMoney
dw .StoreCoins
dw .TakeCoins
dw .StopOrStartSavingCoins
dw .JustDoWhatYouCan
dw .AskDST
.CheckIfBankInitialized:
ld a, [wMomSavingMoney]
ld a, [wMomSavingCoins]
bit MOM_ACTIVE_F, a
jr nz, .savingmoneyalready
jr nz, .savingcoinsalready
set MOM_ACTIVE_F, a
ld [wMomSavingMoney], a
ld [wMomSavingCoins], a
ld a, $1
jr .done_0
.savingmoneyalready
.savingcoinsalready
ld a, $2
.done_0
@@ -51,25 +51,25 @@ BankOfMom:
ld hl, MomLeavingText1
call PrintText1bpp
call YesNoBox
jr c, .DontSaveMoney
jr c, .DontSaveCoins
ld hl, MomLeavingText2
call PrintText1bpp
ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_MONEY_F)
ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_COINS_F)
jr .done_1
.DontSaveMoney:
.DontSaveCoins:
ld a, 1 << MOM_ACTIVE_F
.done_1
ld [wMomSavingMoney], a
ld [wMomSavingCoins], a
ld hl, MomLeavingText3
call PrintText1bpp
ld a, $8
ld [wJumptableIndex], a
ret
.IsThisAboutYourMoney:
ld hl, MomIsThisAboutYourMoneyText
.IsThisAboutYourCoins:
ld hl, MomIsThisAboutYourCoinsText
call PrintText1bpp
call YesNoBox
jr c, .nope
@@ -119,8 +119,8 @@ BankOfMom:
ld [wJumptableIndex], a
ret
.StoreMoney:
ld hl, MomStoreMoneyText
.StoreCoins:
ld hl, MomStoreCoinsText
call PrintText1bpp
xor a
ld hl, wStringBuffer2
@@ -141,29 +141,29 @@ BankOfMom:
inc hl
or [hl]
jr z, .CancelDeposit
ld de, wMoney
ld de, wCoins
ld bc, wStringBuffer2
farcall CompareMoney
farcall CompareCoins
jr c, .InsufficientFundsInWallet
ld hl, wStringBuffer2
ld de, wStringBuffer2 + 3
ld bc, 3
call CopyBytes
ld bc, wMomsMoney
ld bc, wMomsCoins
ld de, wStringBuffer2
farcall GiveMoney
farcall GiveCoins
jr c, .NotEnoughRoomInBank
ld bc, wStringBuffer2 + 3
ld de, wMoney
farcall TakeMoney
ld de, wCoins
farcall TakeCoins
ld hl, wStringBuffer2
ld de, wMomsMoney
ld de, wMomsCoins
ld bc, 3
call CopyBytes
ld de, SFX_TRANSACTION
call PlaySFX
call WaitSFX
ld hl, MomStoredMoneyText
ld hl, MomStoredCoinsText
call PrintText1bpp
ld a, $8
jr .done_4
@@ -185,8 +185,8 @@ BankOfMom:
ld [wJumptableIndex], a
ret
.TakeMoney:
ld hl, MomTakeMoneyText
.TakeCoins:
ld hl, MomTakeCoinsText
call PrintText1bpp
xor a
ld hl, wStringBuffer2
@@ -211,25 +211,25 @@ BankOfMom:
ld de, wStringBuffer2 + 3
ld bc, 3
call CopyBytes
ld de, wMomsMoney
ld de, wMomsCoins
ld bc, wStringBuffer2
farcall CompareMoney
farcall CompareCoins
jr c, .InsufficientFundsInBank
ld bc, wMoney
ld bc, wCoins
ld de, wStringBuffer2
farcall GiveMoney
farcall GiveCoins
jr c, .NotEnoughRoomInWallet
ld bc, wStringBuffer2 + 3
ld de, wMomsMoney
farcall TakeMoney
ld de, wMomsCoins
farcall TakeCoins
ld hl, wStringBuffer2
ld de, wMoney
ld de, wCoins
ld bc, 3
call CopyBytes
ld de, SFX_TRANSACTION
call PlaySFX
call WaitSFX
ld hl, MomTakenMoneyText
ld hl, MomTakenCoinsText
call PrintText1bpp
ld a, $8
jr .done_5
@@ -251,22 +251,22 @@ BankOfMom:
ld [wJumptableIndex], a
ret
.StopOrStartSavingMoney:
ld hl, MomSaveMoneyText
.StopOrStartSavingCoins:
ld hl, MomSaveCoinsText
call PrintText1bpp
call YesNoBox
jr c, .StopSavingMoney
ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_MONEY_F)
ld [wMomSavingMoney], a
ld hl, MomStartSavingMoneyText
jr c, .StopSavingCoins
ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_COINS_F)
ld [wMomSavingCoins], a
ld hl, MomStartSavingCoinsText
call PrintText1bpp
ld a, $8
ld [wJumptableIndex], a
ret
.StopSavingMoney:
.StopSavingCoins:
ld a, 1 << MOM_ACTIVE_F
ld [wMomSavingMoney], a
ld [wMomSavingCoins], a
ld a, $7
ld [wJumptableIndex], a
ret
@@ -297,22 +297,22 @@ Mom_ContinueMenuSetup:
ld de, Mom_SavedString
call PlaceString
hlcoord 12, 2
ld de, wMomsMoney
lb bc, PRINTNUM_MONEY | 3, 6
ld de, wMomsCoins
lb bc, PRINTNUM_COINS | 3, 6
call PrintNum
hlcoord 1, 4
ld de, Mom_HeldString
call PlaceString
hlcoord 12, 4
ld de, wMoney
lb bc, PRINTNUM_MONEY | 3, 6
ld de, wCoins
lb bc, PRINTNUM_COINS | 3, 6
call PrintNum
hlcoord 1, 6
pop de
call PlaceString
hlcoord 12, 6
ld de, wStringBuffer2
lb bc, PRINTNUM_MONEY | PRINTNUM_LEADINGZEROS | 3, 6
lb bc, PRINTNUM_COINS | PRINTNUM_LEADINGZEROS | 3, 6
call PrintNum
call UpdateSprites
call CopyTilemapAtOnce
@@ -342,7 +342,7 @@ Mom_WithdrawDepositMenuJoypad:
call ByteFill
hlcoord 12, 6
ld de, wStringBuffer2
lb bc, PRINTNUM_MONEY | PRINTNUM_LEADINGZEROS | 3, 6
lb bc, PRINTNUM_COINS | PRINTNUM_LEADINGZEROS | 3, 6
call PrintNum
ldh a, [hVBlankCounter]
and $10
@@ -405,7 +405,7 @@ Mom_WithdrawDepositMenuJoypad:
ld c, l
ld b, h
ld de, wStringBuffer2
farcall GiveMoney
farcall GiveCoins
ret
.decrementdigit
@@ -414,7 +414,7 @@ Mom_WithdrawDepositMenuJoypad:
ld c, l
ld b, h
ld de, wStringBuffer2
farcall TakeMoney
farcall TakeCoins
ret
.getdigitquantity
@@ -462,24 +462,24 @@ MomLeavingText3:
text_far _MomLeavingText3
text_end
MomIsThisAboutYourMoneyText:
text_far _MomIsThisAboutYourMoneyText
MomIsThisAboutYourCoinsText:
text_far _MomIsThisAboutYourCoinsText
text_end
MomBankWhatDoYouWantToDoText:
text_far _MomBankWhatDoYouWantToDoText
text_end
MomStoreMoneyText:
text_far _MomStoreMoneyText
MomStoreCoinsText:
text_far _MomStoreCoinsText
text_end
MomTakeMoneyText:
text_far _MomTakeMoneyText
MomTakeCoinsText:
text_far _MomTakeCoinsText
text_end
MomSaveMoneyText:
text_far _MomSaveMoneyText
MomSaveCoinsText:
text_far _MomSaveCoinsText
text_end
MomHaventSavedThatMuchText:
@@ -498,16 +498,16 @@ MomNotEnoughRoomInBankText:
text_far _MomNotEnoughRoomInBankText
text_end
MomStartSavingMoneyText:
text_far _MomStartSavingMoneyText
MomStartSavingCoinsText:
text_far _MomStartSavingCoinsText
text_end
MomStoredMoneyText:
text_far _MomStoredMoneyText
MomStoredCoinsText:
text_far _MomStoredCoinsText
text_end
MomTakenMoneyText:
text_far _MomTakenMoneyText
MomTakenCoinsText:
text_far _MomTakenCoinsText
text_end
MomJustDoWhatYouCanText:

View File

@@ -61,37 +61,37 @@ CheckBalance_MomItem2:
jr nc, .nope
call GetItemFromMom
ld a, [hli]
ldh [hMoneyTemp], a
ldh [hCoinsTemp], a
ld a, [hli]
ldh [hMoneyTemp + 1], a
ldh [hCoinsTemp + 1], a
ld a, [hli]
ldh [hMoneyTemp + 2], a
ld de, wMomsMoney
ld bc, hMoneyTemp
farcall CompareMoney
jr nc, .have_enough_money
ldh [hCoinsTemp + 2], a
ld de, wMomsCoins
ld bc, hCoinsTemp
farcall CompareCoins
jr nc, .have_enough_coins
.nope
jr .check_have_2300
.have_enough_money
.have_enough_coins
scf
ret
.check_have_2300
ld hl, hMoneyTemp
ld [hl], HIGH(MOM_MONEY >> 8)
ld hl, hCoinsTemp
ld [hl], HIGH(MOM_COINS >> 8)
inc hl
ld [hl], HIGH(MOM_MONEY) ; mid
ld [hl], HIGH(MOM_COINS) ; mid
inc hl
ld [hl], LOW(MOM_MONEY)
ld [hl], LOW(MOM_COINS)
.loop
ld de, wMomItemTriggerBalance
ld bc, wMomsMoney
farcall CompareMoney
ld bc, wMomsCoins
farcall CompareCoins
jr z, .exact
jr nc, .less_than
call .AddMoney
call .AddCoins
jr .loop
.less_than
@@ -99,7 +99,7 @@ CheckBalance_MomItem2:
ret
.exact
call .AddMoney
call .AddCoins
ld a, NUM_MOM_ITEMS_1
call RandomRange
inc a
@@ -107,10 +107,10 @@ CheckBalance_MomItem2:
scf
ret
.AddMoney:
.AddCoins:
ld de, wMomItemTriggerBalance
ld bc, hMoneyTemp
farcall AddMoney
ld bc, hCoinsTemp
farcall AddCoins
ret
MomBuysItem_DeductFunds:
@@ -118,14 +118,14 @@ MomBuysItem_DeductFunds:
ld de, 3 ; cost
add hl, de
ld a, [hli]
ldh [hMoneyTemp], a
ldh [hCoinsTemp], a
ld a, [hli]
ldh [hMoneyTemp + 1], a
ldh [hCoinsTemp + 1], a
ld a, [hli]
ldh [hMoneyTemp + 2], a
ld de, wMomsMoney
ld bc, hMoneyTemp
farcall TakeMoney
ldh [hCoinsTemp + 2], a
ld de, wMomsCoins
ld bc, hCoinsTemp
farcall TakeCoins
ret
Mom_GiveItemOrDoll:
@@ -165,14 +165,14 @@ Mom_GetScriptPointer:
.ItemScript:
writetext MomHiHowAreYouText
writetext MomFoundAnItemText
writetext MomBoughtWithYourMoneyText
writetext MomBoughtWithYourCoinsText
writetext MomItsInPCText
end
.DollScript:
writetext MomHiHowAreYouText
writetext MomFoundADollText
writetext MomBoughtWithYourMoneyText
writetext MomBoughtWithYourCoinsText
writetext MomItsInYourRoomText
end
@@ -212,8 +212,8 @@ MomFoundAnItemText:
text_far _MomFoundAnItemText
text_end
MomBoughtWithYourMoneyText:
text_far _MomBoughtWithYourMoneyText
MomBoughtWithYourCoinsText:
text_far _MomBoughtWithYourCoinsText
text_end
MomItsInPCText:

View File

@@ -779,7 +779,7 @@ ChipVendor_IntroScript:
farwritetext ChipVendor_IntroText
.loop
special DisplayMoneyAndChipBalance
special DisplayCoinsAndChipBalance
loadmenu .MenuHeader
verticalmenu
closewindow
@@ -790,10 +790,10 @@ ChipVendor_IntroScript:
.Buy50:
checkchips MAX_CHIPS - 50
ifequal HAVE_MORE, .ChipCaseFull
checkmoney YOUR_MONEY, 1000
ifequal HAVE_LESS, .NotEnoughMoney
checkcoins YOUR_COINS, 1000
ifequal HAVE_LESS, .NotEnoughCoins
givechips 50
takemoney YOUR_MONEY, 1000
takecoins YOUR_COINS, 1000
waitsfx
playsound SFX_TRANSACTION
farwritetext ChipVendor_Buy50ChipsText
@@ -803,18 +803,18 @@ ChipVendor_IntroScript:
.Buy500:
checkchips MAX_CHIPS - 500
ifequal HAVE_MORE, .ChipCaseFull
checkmoney YOUR_MONEY, 10000
ifequal HAVE_LESS, .NotEnoughMoney
checkcoins YOUR_COINS, 10000
ifequal HAVE_LESS, .NotEnoughCoins
givechips 500
takemoney YOUR_MONEY, 10000
takecoins YOUR_COINS, 10000
waitsfx
playsound SFX_TRANSACTION
farwritetext ChipVendor_Buy500ChipsText
waitbutton
sjump .loop
.NotEnoughMoney:
farwritetext ChipVendor_NotEnoughMoneyText
.NotEnoughCoins:
farwritetext ChipVendor_NotEnoughCoinsText
waitbutton
closetext
end

View File

@@ -14,7 +14,7 @@ Script_Whiteout:
special HealParty
checkflag ENGINE_BUG_CONTEST_TIMER
iftrue .bug_contest
callasm HalveMoney
callasm HalveCoins
callasm GetWhiteoutSpawn
farscall Script_AbortBugContest
special WarpToSpawnPoint
@@ -42,9 +42,9 @@ BattleBGMap:
call SetPalettes
ret
HalveMoney:
; Halve the player's money.
ld hl, wMoney
HalveCoins:
; Halve the player's coins.
ld hl, wCoins
ld a, [hl]
srl a
ld [hli], a