From 0ecc36c83a6bf3ecfee45e9f62afc3ebfb97b024 Mon Sep 17 00:00:00 2001 From: Narishma-gb <194818981+Narishma-gb@users.noreply.github.com> Date: Wed, 9 Apr 2025 05:17:32 +0200 Subject: Use constants in `PrintBCDNumber` calls (#503) --- engine/events/prize_menu.asm | 11 ++++------- engine/menus/start_sub_menus.asm | 2 +- engine/menus/text_box.asm | 2 +- engine/movie/hall_of_fame.asm | 2 +- engine/slots/slot_machine.asm | 2 +- 5 files changed, 8 insertions(+), 11 deletions(-) (limited to 'engine') diff --git a/engine/events/prize_menu.asm b/engine/events/prize_menu.asm index f2b24a3f..0e78653b 100644 --- a/engine/events/prize_menu.asm +++ b/engine/events/prize_menu.asm @@ -126,18 +126,15 @@ GetPrizeMenuId: ; put prices on the right side of the textbox ld de, wPrize1Price hlcoord 13, 5 -; reg. c: -; [low nybble] number of bytes -; [bits 765 = %100] space-padding (not zero-padding) - ld c, (1 << 7) | 2 + ld c, 2 | LEADING_ZEROES call PrintBCDNumber ld de, wPrize2Price hlcoord 13, 7 - ld c, (1 << 7) | 2 + ld c, 2 | LEADING_ZEROES call PrintBCDNumber ld de, wPrize3Price hlcoord 13, 9 - ld c, (1 << 7) | 2 + ld c, 2 | LEADING_ZEROES jp PrintBCDNumber INCLUDE "data/events/prizes.asm" @@ -156,7 +153,7 @@ PrintPrizePrice: call PlaceString hlcoord 13, 1 ld de, wPlayerCoins - ld c, %10000010 + ld c, 2 | LEADING_ZEROES call PrintBCDNumber ret diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm index 7b0455d0..a45dfc79 100644 --- a/engine/menus/start_sub_menus.asm +++ b/engine/menus/start_sub_menus.asm @@ -552,7 +552,7 @@ DrawTrainerInfo: call PlaceString hlcoord 8, 4 ld de, wPlayerMoney - ld c, $e3 + ld c, 3 | LEADING_ZEROES | LEFT_ALIGN | MONEY_SIGN call PrintBCDNumber hlcoord 9, 6 ld de, wPlayTimeHours ; hours diff --git a/engine/menus/text_box.asm b/engine/menus/text_box.asm index 1c078693..c21f8e6f 100644 --- a/engine/menus/text_box.asm +++ b/engine/menus/text_box.asm @@ -139,7 +139,7 @@ DisplayMoneyBox: call ClearScreenArea hlcoord 12, 1 ld de, wPlayerMoney - ld c, $a3 + ld c, 3 | LEADING_ZEROES | MONEY_SIGN call PrintBCDNumber ld hl, wStatusFlags5 res BIT_NO_TEXT_DELAY, [hl] diff --git a/engine/movie/hall_of_fame.asm b/engine/movie/hall_of_fame.asm index aebe65f0..231f3369 100644 --- a/engine/movie/hall_of_fame.asm +++ b/engine/movie/hall_of_fame.asm @@ -237,7 +237,7 @@ HoFDisplayPlayerStats: call PlaceString hlcoord 4, 10 ld de, wPlayerMoney - ld c, $a3 + ld c, 3 | LEADING_ZEROES | MONEY_SIGN call PrintBCDNumber ld hl, DexSeenOwnedText call HoFPrintTextAndDelay diff --git a/engine/slots/slot_machine.asm b/engine/slots/slot_machine.asm index 48cf27de..ac6e642f 100644 --- a/engine/slots/slot_machine.asm +++ b/engine/slots/slot_machine.asm @@ -645,7 +645,7 @@ SlotMachine_SubtractBetFromPlayerCoins: SlotMachine_PrintCreditCoins: hlcoord 5, 1 ld de, wPlayerCoins - ld c, $2 + ld c, 2 jp PrintBCDNumber SlotMachine_PrintPayoutCoins: -- cgit v1.3.1-sl0p