Rename the concept of Coins to Chips (#7)

This commit is contained in:
xCrystal
2023-09-02 18:23:25 +02:00
parent ea31d254fb
commit 98fa7a9538
29 changed files with 225 additions and 225 deletions

View File

@@ -225,9 +225,9 @@ Sfx_Unknown66:
channel_count 1 channel_count 1
channel 5, Sfx_Unknown66_Ch5 channel 5, Sfx_Unknown66_Ch5
Sfx_GetCoinFromSlots: Sfx_GetChipFromSlots:
channel_count 1 channel_count 1
channel 5, Sfx_GetCoinFromSlots_Ch5 channel 5, Sfx_GetChipFromSlots_Ch5
Sfx_PayDay: Sfx_PayDay:
channel_count 2 channel_count 2
@@ -4936,7 +4936,7 @@ Sfx_Unknown66_Ch5:
square_note 8, 15, 1, 1792 square_note 8, 15, 1, 1792
sound_ret sound_ret
Sfx_GetCoinFromSlots_Ch5: Sfx_GetChipFromSlots_Ch5:
duty_cycle 2 duty_cycle 2
square_note 2, 15, 1, 1792 square_note 2, 15, 1, 1792
square_note 8, 8, 1, 2016 square_note 8, 8, 1, 2016

View File

@@ -104,7 +104,7 @@ SFX:
dba Sfx_Burn dba Sfx_Burn
dba Sfx_TitleScreenEntrance dba Sfx_TitleScreenEntrance
dba Sfx_Unknown66 dba Sfx_Unknown66
dba Sfx_GetCoinFromSlots dba Sfx_GetChipFromSlots
dba Sfx_PayDay dba Sfx_PayDay
dba Sfx_Metronome dba Sfx_Metronome
dba Sfx_Call dba Sfx_Call

View File

@@ -59,7 +59,7 @@
const X_DEFEND ; 33 const X_DEFEND ; 33
const X_SPEED ; 34 const X_SPEED ; 34
const X_SPECIAL ; 35 const X_SPECIAL ; 35
const COIN_CASE ; 36 const CHIP_CASE ; 36
const ITEMFINDER ; 37 const ITEMFINDER ; 37
const POKE_FLUTE ; 38 const POKE_FLUTE ; 38
const EXP_SHARE ; 39 const EXP_SHARE ; 39

View File

@@ -38,7 +38,7 @@ DEF MAX_DAYS EQU 36 * 7 ; 252
DEF START_MONEY EQU 3000 DEF START_MONEY EQU 3000
DEF MOM_MONEY EQU 2300 DEF MOM_MONEY EQU 2300
DEF MAX_MONEY EQU 999999 DEF MAX_MONEY EQU 999999
DEF MAX_COINS EQU 9999 DEF MAX_CHIPS EQU 9999
; link record ; link record
DEF MAX_LINK_RECORD EQU 9999 DEF MAX_LINK_RECORD EQU 9999

View File

@@ -16,7 +16,7 @@ DEF STRING_BUFFER_LENGTH EQU 19
const YOUR_MONEY ; 0 const YOUR_MONEY ; 0
const MOMS_MONEY ; 1 const MOMS_MONEY ; 1
; checkmoney/checkcoins return values ; checkmoney/checkchips return values
const_def const_def
const HAVE_MORE ; 0 const HAVE_MORE ; 0
const HAVE_AMOUNT ; 1 const HAVE_AMOUNT ; 1

View File

@@ -103,7 +103,7 @@
const SFX_BURN ; 64 const SFX_BURN ; 64
const SFX_TITLE_SCREEN_ENTRANCE ; 65 const SFX_TITLE_SCREEN_ENTRANCE ; 65
const SFX_UNKNOWN_66 ; 66 const SFX_UNKNOWN_66 ; 66
const SFX_GET_COIN_FROM_SLOTS ; 67 const SFX_GET_CHIP_FROM_SLOTS ; 67
const SFX_PAY_DAY ; 68 const SFX_PAY_DAY ; 68
const SFX_METRONOME ; 69 const SFX_METRONOME ; 69
const SFX_CALL ; 6a const SFX_CALL ; 6a

View File

@@ -84,8 +84,8 @@ SpecialsPointers::
add_special ReturnShuckie add_special ReturnShuckie
add_special BillsGrandfather add_special BillsGrandfather
add_special CheckPokerus add_special CheckPokerus
add_special DisplayCoinCaseBalance add_special DisplayChipCaseBalance
add_special DisplayMoneyAndCoinBalance add_special DisplayMoneyAndChipBalance
add_special PlaceMoneyTopRight add_special PlaceMoneyTopRight
add_special CheckForLuckyNumberWinners add_special CheckForLuckyNumberWinners
add_special CheckLuckyNumberShowFlag add_special CheckLuckyNumberShowFlag

View File

@@ -114,7 +114,7 @@ ItemAttributes:
item_attribute 350, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE item_attribute 350, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; X_SPECIAL ; X_SPECIAL
item_attribute 350, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE item_attribute 350, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; COIN_CASE ; CHIP_CASE
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
; ITEMFINDER ; ITEMFINDER
item_attribute 0, HELD_NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE item_attribute 0, HELD_NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE

View File

@@ -54,7 +54,7 @@ ItemDescriptions:
dw XDefendDesc dw XDefendDesc
dw XSpeedDesc dw XSpeedDesc
dw XSpecialDesc dw XSpecialDesc
dw CoinCaseDesc dw ChipCaseDesc
dw ItemfinderDesc dw ItemfinderDesc
dw TeruSama5Desc dw TeruSama5Desc
dw ExpShareDesc dw ExpShareDesc
@@ -467,9 +467,9 @@ XSpecialDesc:
db "Raises SPECIAL" db "Raises SPECIAL"
next "ATTACK. (1 BTL)@" next "ATTACK. (1 BTL)@"
CoinCaseDesc: ChipCaseDesc:
db "Holds up to 9,999" db "Holds up to 9,999"
next "game coins.@" next "game chips.@"
ItemfinderDesc: ItemfinderDesc:
db "Checks for unseen" db "Checks for unseen"

View File

@@ -53,7 +53,7 @@ ItemNames::
li "X DEFEND" li "X DEFEND"
li "X SPEED" li "X SPEED"
li "X SPECIAL" li "X SPECIAL"
li "COIN CASE" li "CHIP CASE"
li "ITEMFINDER" li "ITEMFINDER"
li "TERU-SAMA" li "TERU-SAMA"
li "EXP.SHARE" li "EXP.SHARE"

View File

@@ -845,8 +845,8 @@ WasDisabledText:
cont "DISABLED!" cont "DISABLED!"
prompt prompt
CoinsScatteredText: ChipsScatteredText:
text "Coins scattered" text "Chips scattered"
line "everywhere!" line "everywhere!"
prompt prompt

View File

@@ -1351,13 +1351,13 @@ _ReceiveItemText::
text_end ; unreferenced text_end ; unreferenced
_NoCoinsText:: _NoChipsText::
text "You have no coins." text "You have no chips."
prompt prompt
_NoCoinCaseText:: _NoChipCaseText::
text "You don't have a" text "You don't have a"
line "COIN CASE." line "CHIP CASE."
prompt prompt
_NPCTradeCableText:: _NPCTradeCableText::

View File

@@ -576,23 +576,23 @@ _MartBoughtText::
text "(S)." text "(S)."
done done
_SlotsBetHowManyCoinsText:: _SlotsBetHowManyChipsText::
text "Bet how many" text "Bet how many"
line "coins?" line "chips?"
done done
_SlotsStartText:: _SlotsStartText::
text "Start!" text "Start!"
done done
_SlotsNotEnoughCoinsText:: _SlotsNotEnoughChipsText::
text "Not enough" text "Not enough"
line "coins." line "chips."
prompt prompt
_SlotsRanOutOfCoinsText:: _SlotsRanOutOfChipsText::
text "Darn… Ran out of" text "Darn… Ran out of"
line "coins…" line "chips…"
done done
_SlotsPlayAgainText:: _SlotsPlayAgainText::
@@ -603,7 +603,7 @@ _SlotsLinedUpText::
text "lined up!" text "lined up!"
line "Won @" line "Won @"
text_ram wStringBuffer2 text_ram wStringBuffer2
text " coins!" text " chips!"
done done
_SlotsDarnText:: _SlotsDarnText::
@@ -760,13 +760,13 @@ _MoveCantForgetHMText::
line "forgotten now." line "forgotten now."
prompt prompt
_CardFlipPlayWithThreeCoinsText:: _CardFlipPlayWithThreeChipsText::
text "Play with three" text "Play with three"
line "coins?" line "chips?"
done done
_CardFlipNotEnoughCoinsText:: _CardFlipNotEnoughChipsText::
text "Not enough coins…" text "Not enough chips…"
prompt prompt
_CardFlipChooseACardText:: _CardFlipChooseACardText::
@@ -1047,10 +1047,10 @@ _BlueCardBalanceText::
text " points." text " points."
done done
_CoinCaseCountText:: _ChipCaseCountText::
text "Coins:" text "Chips:"
line "@" line "@"
text_decimal wCoins, 2, 4 text_decimal wChips, 2, 4
text_end text_end
text_end ; unreferenced text_end ; unreferenced

View File

@@ -298,51 +298,51 @@ GymStatue_WinningTrainersText:
line "<PLAYER>" line "<PLAYER>"
done done
CoinVendor_WelcomeText: ChipVendor_WelcomeText:
text "Welcome to the" text "Welcome to the"
line "GAME CORNER." line "GAME CORNER."
done done
CoinVendor_NoCoinCaseText: ChipVendor_NoChipCaseText:
text "Do you need game" text "Do you need game"
line "coins?" line "chips?"
para "Oh, you don't have" para "Oh, you don't have"
line "a COIN CASE for" line "a CHIP CASE for"
cont "your coins." cont "your chips."
done done
CoinVendor_IntroText: ChipVendor_IntroText:
text "Do you need some" text "Do you need some"
line "game coins?" line "game chips?"
para "It costs ¥1000 for" para "It costs ¥1000 for"
line "50 coins. Do you" line "50 chips. Do you"
cont "want some?" cont "want some?"
done done
CoinVendor_Buy50CoinsText: ChipVendor_Buy50ChipsText:
text "Thank you!" text "Thank you!"
line "Here are 50 coins." line "Here are 50 chips."
done done
CoinVendor_Buy500CoinsText: ChipVendor_Buy500ChipsText:
text "Thank you! Here" text "Thank you! Here"
line "are 500 coins." line "are 500 chips."
done done
CoinVendor_NotEnoughMoneyText: ChipVendor_NotEnoughMoneyText:
text "You don't have" text "You don't have"
line "enough money." line "enough money."
done done
CoinVendor_CoinCaseFullText: ChipVendor_ChipCaseFullText:
text "Whoops! Your COIN" text "Whoops! Your CHIP"
line "CASE is full." line "CASE is full."
done done
CoinVendor_CancelText: ChipVendor_CancelText:
text "No coins for you?" text "No chips for you?"
line "Come again!" line "Come again!"
done done

View File

@@ -2055,7 +2055,7 @@ Most of the NPCs in [maps/NationalParkBugContest.asm](https://github.com/pret/po
and $7 and $7
- ret z - ret z
+ ret nz + ret nz
ld de, SFX_GET_COIN_FROM_SLOTS ld de, SFX_GET_CHIP_FROM_SLOTS
call PlaySFX call PlaySFX
ret ret
``` ```

View File

@@ -132,13 +132,13 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
## `$24`: <code>checkmoney <i>account</i>, <i>value</i></code> ## `$24`: <code>checkmoney <i>account</i>, <i>value</i></code>
## `$25`: <code>givecoins <i>value</i></code> ## `$25`: <code>givechips <i>value</i></code>
## `$26`: <code>takecoins <i>value</i></code> ## `$26`: <code>takechips <i>value</i></code>
## `$27`: <code>checkcoins <i>value</i></code> ## `$27`: <code>checkchips <i>value</i></code>
## `$28`: <code>addcellnum <i>contact_id</i></code> ## `$28`: <code>addcellnum <i>contact_id</i></code>
@@ -209,9 +209,9 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
<code>GetStringBuffer(<i>string_buffer</i>) = PrintNum(GetMoneyAccount(<i>account</i>))</code> <code>GetStringBuffer(<i>string_buffer</i>) = PrintNum(GetMoneyAccount(<i>account</i>))</code>
## `$3E`: <code>getcoins <i>string_buffer</i></code> ## `$3E`: <code>getchips <i>string_buffer</i></code>
<code>GetStringBuffer(<i>string_buffer</i>) = PrintNum([wCoins])</code> <code>GetStringBuffer(<i>string_buffer</i>) = PrintNum([wChips])</code>
## `$3F`: <code>getnum <i>string_buffer</i></code> ## `$3F`: <code>getnum <i>string_buffer</i></code>

View File

@@ -20,5 +20,5 @@ BattleCommand_PayDay:
jr nz, .done jr nz, .done
inc [hl] inc [hl]
.done .done
ld hl, CoinsScatteredText ld hl, ChipsScatteredText
jp StdBattleTextbox jp StdBattleTextbox

View File

@@ -162,15 +162,15 @@ AddFunds:
pop hl pop hl
ret ret
GiveCoins:: GiveChips::
ld a, 2 ld a, 2
ld de, wCoins ld de, wChips
call AddFunds call AddFunds
ld a, 2 ld a, 2
ld bc, .maxcoins ld bc, .maxchips
call CompareFunds call CompareFunds
jr c, .not_maxed jr c, .not_maxed
ld hl, .maxcoins ld hl, .maxchips
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a
inc de inc de
@@ -183,15 +183,15 @@ GiveCoins::
and a and a
ret ret
.maxcoins .maxchips
bigdw MAX_COINS bigdw MAX_CHIPS
TakeCoins:: TakeChips::
ld a, 2 ld a, 2
ld de, wCoins ld de, wChips
call SubtractFunds call SubtractFunds
jr nc, .okay jr nc, .okay
; leave with 0 coins ; leave with 0 chips
xor a xor a
ld [de], a ld [de], a
inc de inc de
@@ -203,7 +203,7 @@ TakeCoins::
and a and a
ret ret
CheckCoins:: CheckChips::
ld a, 2 ld a, 2
ld de, wCoins ld de, wChips
jp CompareFunds jp CompareFunds

View File

@@ -143,7 +143,7 @@ UnownPuzzle:
ret ret
SlotMachine: SlotMachine:
call CheckCoinsAndCoinCase call CheckChipsAndChipCase
ret c ret c
ld a, BANK(_SlotMachine) ld a, BANK(_SlotMachine)
ld hl, _SlotMachine ld hl, _SlotMachine
@@ -151,7 +151,7 @@ SlotMachine:
ret ret
CardFlip: CardFlip:
call CheckCoinsAndCoinCase call CheckChipsAndChipCase
ret c ret c
ld a, BANK(_CardFlip) ld a, BANK(_CardFlip)
ld hl, _CardFlip ld hl, _CardFlip
@@ -159,7 +159,7 @@ CardFlip:
ret ret
UnusedMemoryGame: UnusedMemoryGame:
call CheckCoinsAndCoinCase call CheckChipsAndChipCase
ret c ret c
ld a, BANK(_MemoryGame) ld a, BANK(_MemoryGame)
ld hl, _MemoryGame ld hl, _MemoryGame
@@ -180,37 +180,37 @@ StartGameCornerGame:
call ExitAllMenus call ExitAllMenus
ret ret
CheckCoinsAndCoinCase: CheckChipsAndChipCase:
ld hl, wCoins ld hl, wChips
ld a, [hli] ld a, [hli]
or [hl] or [hl]
jr z, .no_coins jr z, .no_chips
ld a, COIN_CASE ld a, CHIP_CASE
ld [wCurItem], a ld [wCurItem], a
ld hl, wNumItems ld hl, wNumItems
call CheckItem call CheckItem
jr nc, .no_coin_case jr nc, .no_chip_case
and a and a
ret ret
.no_coins .no_chips
ld hl, .NoCoinsText ld hl, .NoChipsText
jr .print jr .print
.no_coin_case .no_chip_case
ld hl, .NoCoinCaseText ld hl, .NoChipCaseText
.print .print
call PrintText2bpp call PrintText2bpp
scf scf
ret ret
.NoCoinsText: .NoChipsText:
text_far _NoCoinsText text_far _NoChipsText
text_end text_end
.NoCoinCaseText: .NoChipCaseText:
text_far _NoCoinCaseText text_far _NoChipCaseText
text_end text_end
ClearBGPalettesBufferScreen: ClearBGPalettesBufferScreen:

View File

@@ -54,7 +54,7 @@ StdScripts::
add_stdscript ReceiveItemScript add_stdscript ReceiveItemScript
add_stdscript ReceiveTogepiEggScript add_stdscript ReceiveTogepiEggScript
add_stdscript PCScript add_stdscript PCScript
add_stdscript GameCornerCoinVendorScript add_stdscript GameCornerChipVendorScript
add_stdscript HappinessCheckScript add_stdscript HappinessCheckScript
PokecenterNurseScript: PokecenterNurseScript:
@@ -763,23 +763,23 @@ ReceiveTogepiEggScript:
waitsfx waitsfx
end end
GameCornerCoinVendorScript: GameCornerChipVendorScript:
faceplayer faceplayer
opentext opentext
farwritetext CoinVendor_WelcomeText farwritetext ChipVendor_WelcomeText
promptbutton promptbutton
checkitem COIN_CASE checkitem CHIP_CASE
iftrue CoinVendor_IntroScript iftrue ChipVendor_IntroScript
farwritetext CoinVendor_NoCoinCaseText farwritetext ChipVendor_NoChipCaseText
waitbutton waitbutton
closetext closetext
end end
CoinVendor_IntroScript: ChipVendor_IntroScript:
farwritetext CoinVendor_IntroText farwritetext ChipVendor_IntroText
.loop .loop
special DisplayMoneyAndCoinBalance special DisplayMoneyAndChipBalance
loadmenu .MenuHeader loadmenu .MenuHeader
verticalmenu verticalmenu
closewindow closewindow
@@ -788,45 +788,45 @@ CoinVendor_IntroScript:
sjump .Cancel sjump .Cancel
.Buy50: .Buy50:
checkcoins MAX_COINS - 50 checkchips MAX_CHIPS - 50
ifequal HAVE_MORE, .CoinCaseFull ifequal HAVE_MORE, .ChipCaseFull
checkmoney YOUR_MONEY, 1000 checkmoney YOUR_MONEY, 1000
ifequal HAVE_LESS, .NotEnoughMoney ifequal HAVE_LESS, .NotEnoughMoney
givecoins 50 givechips 50
takemoney YOUR_MONEY, 1000 takemoney YOUR_MONEY, 1000
waitsfx waitsfx
playsound SFX_TRANSACTION playsound SFX_TRANSACTION
farwritetext CoinVendor_Buy50CoinsText farwritetext ChipVendor_Buy50ChipsText
waitbutton waitbutton
sjump .loop sjump .loop
.Buy500: .Buy500:
checkcoins MAX_COINS - 500 checkchips MAX_CHIPS - 500
ifequal HAVE_MORE, .CoinCaseFull ifequal HAVE_MORE, .ChipCaseFull
checkmoney YOUR_MONEY, 10000 checkmoney YOUR_MONEY, 10000
ifequal HAVE_LESS, .NotEnoughMoney ifequal HAVE_LESS, .NotEnoughMoney
givecoins 500 givechips 500
takemoney YOUR_MONEY, 10000 takemoney YOUR_MONEY, 10000
waitsfx waitsfx
playsound SFX_TRANSACTION playsound SFX_TRANSACTION
farwritetext CoinVendor_Buy500CoinsText farwritetext ChipVendor_Buy500ChipsText
waitbutton waitbutton
sjump .loop sjump .loop
.NotEnoughMoney: .NotEnoughMoney:
farwritetext CoinVendor_NotEnoughMoneyText farwritetext ChipVendor_NotEnoughMoneyText
waitbutton waitbutton
closetext closetext
end end
.CoinCaseFull: .ChipCaseFull:
farwritetext CoinVendor_CoinCaseFullText farwritetext ChipVendor_ChipCaseFullText
waitbutton waitbutton
closetext closetext
end end
.Cancel: .Cancel:
farwritetext CoinVendor_CancelText farwritetext ChipVendor_CancelText
waitbutton waitbutton
closetext closetext
end end

Some files were not shown because too many files have changed in this diff Show More