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

@@ -20,8 +20,8 @@ EngineFlags:
engine_flag wDayCareMan, DAYCAREMAN_HAS_MON_F
engine_flag wDayCareLady, DAYCARELADY_HAS_MON_F
engine_flag wMomSavingMoney, MOM_SAVING_SOME_MONEY_F
engine_flag wMomSavingMoney, MOM_ACTIVE_F
engine_flag wMomSavingCoins, MOM_SAVING_SOME_COINS_F
engine_flag wMomSavingCoins, MOM_ACTIVE_F
engine_flag wStatusFlags, STATUSFLAGS_POKEDEX_F
engine_flag wStatusFlags, STATUSFLAGS_UNOWN_DEX_F

View File

@@ -85,8 +85,8 @@ SpecialsPointers::
add_special BillsGrandfather
add_special CheckPokerus
add_special DisplayChipCaseBalance
add_special DisplayMoneyAndChipBalance
add_special PlaceMoneyTopRight
add_special DisplayCoinsAndChipBalance
add_special PlaceCoinsTopRight
add_special CheckForLuckyNumberWinners
add_special CheckLuckyNumberShowFlag
add_special ResetLuckyNumberShowFlag

View File

@@ -1,5 +1,5 @@
MACRO momitem
; money to trigger, cost, kind, item
; coins to trigger, cost, kind, item
dt \1
dt \2
db \3, \4

View File

@@ -1,9 +1,9 @@
BattleText:: ; used only for BANK(BattleText)
BattleText_PlayerPickedUpPayDayMoney:
BattleText_PlayerPickedUpPayDayCoins:
text "<PLAYER> picked up"
line "<COIN>@"
text_decimal wPayDayMoney, 3, 6
text_decimal wPayDayCoins, 3, 6
text "!"
prompt
@@ -166,7 +166,7 @@ BattleText_EnemyMonFainted:
line "fainted!"
prompt
GotMoneyForWinningText:
GotCoinsForWinningText:
text "<PLAYER> got <COIN>@"
text_decimal wBattleReward, 3, 6
text_start

View File

@@ -359,9 +359,9 @@ _MomFoundAnItemText::
line "item shopping, so"
prompt
_MomBoughtWithYourMoneyText::
_MomBoughtWithYourCoinsText::
text "I bought it with"
line "your money. Sorry!"
line "your coins. Sorry!"
prompt
_MomItsInPCText::
@@ -1553,18 +1553,19 @@ _MomLeavingText1::
line "for you?"
para "I know! I'll save"
line "money for you."
line "coins for you."
para "On a long journey,"
line "money's important."
line "coins are"
cont "important."
para "Do you want me to"
line "save your money?"
line "save your coins?"
done
_MomLeavingText2::
text "OK, I'll take care"
line "of your money."
line "of your coins."
para "<……><……><……>"
prompt
@@ -1579,7 +1580,7 @@ _MomLeavingText3::
para "Now, go on!"
done
_MomIsThisAboutYourMoneyText::
_MomIsThisAboutYourCoinsText::
text "Hi! Welcome home!"
line "You're trying very"
cont "hard, I see."
@@ -1588,7 +1589,7 @@ _MomIsThisAboutYourMoneyText::
line "room tidy."
para "Or is this about"
line "your money?"
line "your coins?"
done
_MomBankWhatDoYouWantToDoText::
@@ -1596,19 +1597,19 @@ _MomBankWhatDoYouWantToDoText::
line "to do?"
done
_MomStoreMoneyText::
_MomStoreCoinsText::
text "How much do you"
line "want to save?"
done
_MomTakeMoneyText::
_MomTakeCoinsText::
text "How much do you"
line "want to take?"
done
_MomSaveMoneyText::
_MomSaveCoinsText::
text "Do you want to"
line "save some money?"
line "save some coins?"
done
_MomHaventSavedThatMuchText::
@@ -1631,20 +1632,21 @@ _MomNotEnoughRoomInBankText::
line "that much."
prompt
_MomStartSavingMoneyText::
_MomStartSavingCoinsText::
text "OK, I'll save your"
line "money. Trust me!"
line "coins. Trust me!"
para "<PLAYER>, stick"
line "with it!"
done
_MomStoredMoneyText::
text "Your money's safe"
line "here! Get going!"
_MomStoredCoinsText::
text "Your coins are"
line "safe here! Get"
cont "going!"
done
_MomTakenMoneyText::
_MomTakenCoinsText::
text "<PLAYER>, don't"
line "give up!"
done
@@ -1804,9 +1806,9 @@ _HaveNoRoomText::
line "for it."
prompt
_NotEnoughMoneyText::
_NotEnoughCoinsText::
text "You don't have"
line "enough money."
line "enough coins."
prompt
_OhFineThenText::

View File

@@ -380,7 +380,7 @@ _MartFinalPriceText::
text_ram wStringBuffer2
text "(S)"
line "will be <COIN>@"
text_decimal hMoneyTemp, 3, 6
text_decimal hCoinsTemp, 3, 6
text "."
done
@@ -409,7 +409,7 @@ _HerbalLadyFinalPriceText::
text_ram wStringBuffer2
text "(S)"
line "will be <COIN>@"
text_decimal hMoneyTemp, 3, 6
text_decimal hCoinsTemp, 3, 6
text "."
done
@@ -423,9 +423,9 @@ _HerbalLadyPackFullText::
line "full, dear."
done
_HerbalLadyNoMoneyText::
_HerbalLadyNoCoinsText::
text "Hehehe… You don't"
line "have the money."
line "have the coins."
done
_HerbalLadyComeAgainText::
@@ -448,7 +448,7 @@ _BargainShopFinalPriceText::
text_ram wStringBuffer2
text " costs"
line "<COIN>@"
text_decimal hMoneyTemp, 3, 6
text_decimal hCoinsTemp, 3, 6
text ". Want it?"
done
@@ -492,7 +492,7 @@ _PharmacyFinalPriceText::
text_ram wStringBuffer2
text "(S)"
line "will cost <COIN>@"
text_decimal hMoneyTemp, 3, 6
text_decimal hCoinsTemp, 3, 6
text "."
done
@@ -505,9 +505,9 @@ _PharmacyPackFullText::
line "more space."
done
_PharmacyNoMoneyText::
_PharmacyNoCoinsText::
text "Huh? That's not"
line "enough money."
line "enough coins."
done
_PharmacyComeAgainText::
@@ -527,7 +527,7 @@ _MartSellHowManyText::
_MartSellPriceText::
text "I can pay you"
line "<COIN>@"
text_decimal hMoneyTemp, 3, 6
text_decimal hCoinsTemp, 3, 6
text "."
para "Is that OK?"
@@ -543,9 +543,9 @@ _MartThanksText::
line "Thank you!"
done
_MartNoMoneyText::
_MartNoCoinsText::
text "You don't have"
line "enough money."
line "enough coins."
done
_MartPackFullText::
@@ -569,7 +569,7 @@ _MartAskMoreText::
_MartBoughtText::
text "Got <COIN>@"
text_decimal hMoneyTemp, 3, 6
text_decimal hCoinsTemp, 3, 6
text " for"
line "@"
text_ram wStringBuffer2

View File

@@ -331,9 +331,9 @@ ChipVendor_Buy500ChipsText:
line "are 500 chips."
done
ChipVendor_NotEnoughMoneyText:
ChipVendor_NotEnoughCoinsText:
text "You don't have"
line "enough money."
line "enough coins."
done
ChipVendor_ChipCaseFullText: