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

@@ -160,24 +160,24 @@ _ResetWRAM:
ld [wChips], a
ld [wChips + 1], a
if START_MONEY >= $10000
ld a, HIGH(START_MONEY >> 8)
if START_COINS >= $10000
ld a, HIGH(START_COINS >> 8)
endc
ld [wMoney], a
ld a, HIGH(START_MONEY) ; mid
ld [wMoney + 1], a
ld a, LOW(START_MONEY)
ld [wMoney + 2], a
ld [wCoins], a
ld a, HIGH(START_COINS) ; mid
ld [wCoins + 1], a
ld a, LOW(START_COINS)
ld [wCoins + 2], a
xor a
ld [wWhichMomItem], a
ld hl, wMomItemTriggerBalance
ld [hl], HIGH(MOM_MONEY >> 8)
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)
call InitializeNPCNames

View File

@@ -27,38 +27,38 @@ PlaceMenuItemQuantity:
.done
ret
PlaceMoneyTopRight:
ld hl, MoneyTopRightMenuHeader
PlaceCoinsTopRight:
ld hl, CoinsTopRightMenuHeader
call CopyMenuHeader
jr PlaceMoneyTextbox
jr PlaceCoinsTextbox
PlaceMoneyBottomLeft:
ld hl, MoneyBottomLeftMenuHeader
PlaceCoinsBottomLeft:
ld hl, CoinsBottomLeftMenuHeader
call CopyMenuHeader
jr PlaceMoneyTextbox
jr PlaceCoinsTextbox
PlaceMoneyAtTopLeftOfTextbox:
ld hl, MoneyTopRightMenuHeader
PlaceCoinsAtTopLeftOfTextbox:
ld hl, CoinsTopRightMenuHeader
lb de, 0, 11
call OffsetMenuHeader
PlaceMoneyTextbox:
PlaceCoinsTextbox:
call MenuBox
call MenuBoxCoord2Tile
ld de, SCREEN_WIDTH + 1
add hl, de
ld de, wMoney
lb bc, PRINTNUM_MONEY | 3, 6
ld de, wCoins
lb bc, PRINTNUM_COINS | 3, 6
call PrintNum
ret
MoneyTopRightMenuHeader:
CoinsTopRightMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 11, 0, SCREEN_WIDTH - 1, 2
dw NULL
db 1 ; default option
MoneyBottomLeftMenuHeader:
CoinsBottomLeftMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 11, 8, 13
dw NULL
@@ -74,7 +74,7 @@ DisplayChipCaseBalance:
ld de, ChipString
call PlaceString
hlcoord 17, 1
ld de, ShowMoney_TerminatorString
ld de, ShowCoins_TerminatorString
call PlaceString
ld de, wChips
lb bc, 2, 4
@@ -82,17 +82,17 @@ DisplayChipCaseBalance:
call PrintNum
ret
DisplayMoneyAndChipBalance:
DisplayCoinsAndChipBalance:
hlcoord 5, 0
ld b, 3
ld c, 13
call Textbox1bpp
hlcoord 6, 1
ld de, MoneyString
ld de, CoinsString
call PlaceString
hlcoord 12, 1
ld de, wMoney
lb bc, PRINTNUM_MONEY | 3, 6
ld de, wCoins
lb bc, PRINTNUM_COINS | 3, 6
call PrintNum
hlcoord 6, 3
ld de, ChipString
@@ -103,11 +103,11 @@ DisplayMoneyAndChipBalance:
call PrintNum
ret
MoneyString:
db "MONEY@"
CoinsString:
db "COINS@"
ChipString:
db "CHIP@"
ShowMoney_TerminatorString:
ShowCoins_TerminatorString:
db "@"
StartMenu_PrintSafariGameStatus: ; unreferenced

View File

@@ -228,7 +228,7 @@ TrainerCard_PrintTopHalfOfCard:
ld d, 5
call TrainerCard_InitBorder
hlcoord 2, 2
ld de, .Name_Money
ld de, .Name_Coins
call PlaceString
hlcoord 2, 4
ld de, .ID_No
@@ -241,8 +241,8 @@ TrainerCard_PrintTopHalfOfCard:
lb bc, PRINTNUM_LEADINGZEROS | 2, 5
call PrintNum
hlcoord 7, 6
ld de, wMoney
lb bc, PRINTNUM_MONEY | 3, 6
ld de, wCoins
lb bc, PRINTNUM_COINS | 3, 6
call PrintNum
hlcoord 1, 3
ld de, .HorizontalDivider
@@ -254,10 +254,10 @@ TrainerCard_PrintTopHalfOfCard:
predef PlaceGraphic
ret
.Name_Money:
.Name_Coins:
db "NAME/"
next ""
next "MONEY@"
next "COINS@"
.ID_No:
db $27, $28, -1 ; ID NO