diff --git a/charmap.asm b/charmap.asm index e7d99e763..8101e54eb 100644 --- a/charmap.asm +++ b/charmap.asm @@ -127,7 +127,7 @@ charmap "'v", $c6 charmap "′", $c7 charmap "″", $c8 - charmap "¥", $c9 + charmap "", $c9 charmap "'", $d0 charmap "", $d1 charmap "", $d2 diff --git a/data/text/battle.asm b/data/text/battle.asm index a1d165590..48fd9da04 100644 --- a/data/text/battle.asm +++ b/data/text/battle.asm @@ -2,7 +2,7 @@ BattleText:: ; used only for BANK(BattleText) BattleText_PlayerPickedUpPayDayMoney: text " picked up" - line "¥@" + line "@" text_decimal wPayDayMoney, 3, 6 text "!" prompt @@ -167,7 +167,7 @@ BattleText_EnemyMonFainted: prompt GotMoneyForWinningText: - text " got ¥@" + text " got @" text_decimal wBattleReward, 3, 6 text_start line "for winning!" @@ -184,7 +184,7 @@ TiedAgainstText: prompt SentSomeToMomText: - text " got ¥@" + text " got @" text_decimal wBattleReward, 3, 6 text_start line "for winning!" diff --git a/data/text/common_1.asm b/data/text/common_1.asm index fb60867a1..834e9aecd 100644 --- a/data/text/common_1.asm +++ b/data/text/common_1.asm @@ -1769,7 +1769,7 @@ _YourMonHasGrownText:: para "If you want your" line "#MON back, it" - cont "will cost ¥@" + cont "will cost @" text_decimal wStringBuffer2 + 2, 3, 4 text "." done @@ -1796,7 +1796,7 @@ _BackAlreadyText:: para "If you want your" line "#MON back, it" - cont "will cost ¥100." + cont "will cost 100." done _HaveNoRoomText:: diff --git a/data/text/common_3.asm b/data/text/common_3.asm index 329a933bb..da01d8ff4 100644 --- a/data/text/common_3.asm +++ b/data/text/common_3.asm @@ -379,7 +379,7 @@ _MartFinalPriceText:: text " @" text_ram wStringBuffer2 text "(S)" - line "will be ¥@" + line "will be @" text_decimal hMoneyTemp, 3, 6 text "." done @@ -408,7 +408,7 @@ _HerbalLadyFinalPriceText:: text " @" text_ram wStringBuffer2 text "(S)" - line "will be ¥@" + line "will be @" text_decimal hMoneyTemp, 3, 6 text "." done @@ -447,7 +447,7 @@ _BargainShopIntroText:: _BargainShopFinalPriceText:: text_ram wStringBuffer2 text " costs" - line "¥@" + line "@" text_decimal hMoneyTemp, 3, 6 text ". Want it?" done @@ -491,7 +491,7 @@ _PharmacyFinalPriceText:: text " @" text_ram wStringBuffer2 text "(S)" - line "will cost ¥@" + line "will cost @" text_decimal hMoneyTemp, 3, 6 text "." done @@ -526,7 +526,7 @@ _MartSellHowManyText:: _MartSellPriceText:: text "I can pay you" - line "¥@" + line "@" text_decimal hMoneyTemp, 3, 6 text "." @@ -568,7 +568,7 @@ _MartAskMoreText:: done _MartBoughtText:: - text "Got ¥@" + text "Got @" text_decimal hMoneyTemp, 3, 6 text " for" line "@" diff --git a/data/text/mail_input_chars.asm b/data/text/mail_input_chars.asm index db5737baa..71b0933c7 100644 --- a/data/text/mail_input_chars.asm +++ b/data/text/mail_input_chars.asm @@ -5,7 +5,7 @@ MailEntry_Uppercase: db "K L M N O P Q R S T" db "U V W X Y Z , ? !" db "1 2 3 4 5 6 7 8 9 0" - db " é ♂ ♀ ¥ … ×" + db " é ♂ ♀ … ×" db "lower DEL END " MailEntry_Lowercase: diff --git a/data/text/std_text.asm b/data/text/std_text.asm index d35039d39..64d4e7d42 100644 --- a/data/text/std_text.asm +++ b/data/text/std_text.asm @@ -316,7 +316,7 @@ ChipVendor_IntroText: text "Do you need some" line "game chips?" - para "It costs ¥1000 for" + para "It costs 1000 for" line "50 chips. Do you" cont "want some?" done diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index efd99e195..12dd351ff 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -840,8 +840,8 @@ ChipVendor_IntroScript: .MenuData: db STATICMENU_CURSOR ; flags db 3 ; items - db " 50 : ¥1000@" - db "500 : ¥10000@" + db " 50 : 1000@" + db "500 : 10000@" db "CANCEL@" HappinessCheckScript: diff --git a/engine/math/print_num.asm b/engine/math/print_num.asm index b0f132ba3..103541d17 100644 --- a/engine/math/print_num.asm +++ b/engine/math/print_num.asm @@ -19,7 +19,7 @@ _PrintNum:: jr z, .main .moneyflag ; 101xxxxx or 011xxxxx - ld a, "¥" + ld a, "" ld [hli], a res 5, b ; 100xxxxx or 010xxxxx @@ -155,7 +155,7 @@ _PrintNum:: jr .money_leading_zero .money - call .PrintYen + call .PrintCoin push af ld a, "0" add c @@ -170,7 +170,7 @@ _PrintNum:: .money_leading_zero call .AdvancePointer - call .PrintYen + call .PrintCoin ld a, "0" add b ld [hli], a @@ -179,14 +179,14 @@ _PrintNum:: pop bc ret -.PrintYen: +.PrintCoin: push af ldh a, [hPrintNumBuffer + 0] and a jr nz, .stop bit 5, d jr z, .stop - ld a, "¥" + ld a, "" ld [hli], a res 5, d @@ -264,7 +264,7 @@ _PrintNum:: jr nz, .done bit 5, d jr z, .done - ld a, "¥" + ld a, "" ld [hli], a res 5, d .done diff --git a/gfx/font/font.png b/gfx/font/font.png index 15e89e2f3..181ad38ae 100755 Binary files a/gfx/font/font.png and b/gfx/font/font.png differ diff --git a/gfx/font/font_inversed.png b/gfx/font/font_inversed.png index ae1ee40f2..0835d89e0 100755 Binary files a/gfx/font/font_inversed.png and b/gfx/font/font_inversed.png differ diff --git a/gfx/font/overworld.png b/gfx/font/overworld.png index 92b60bff0..c23e65e2b 100755 Binary files a/gfx/font/overworld.png and b/gfx/font/overworld.png differ diff --git a/home/print_bcd.asm b/home/print_bcd.asm index 4182eadfc..9eeeb6476 100644 --- a/home/print_bcd.asm +++ b/home/print_bcd.asm @@ -20,7 +20,7 @@ PrintBCDNumber:: jr z, .loop bit PRINTNUM_LEADINGZEROS_F, b jr nz, .loop ; skip currency symbol - ld [hl], "¥" + ld [hl], "" inc hl .loop ld a, [de] @@ -41,7 +41,7 @@ PrintBCDNumber:: .skipLeftAlignmentAdjustment bit PRINTNUM_MONEY_F, b jr z, .skipCurrencySymbol - ld [hl], "¥" ; currency symbol + ld [hl], "" ; currency symbol inc hl .skipCurrencySymbol ld [hl], "0" @@ -60,7 +60,7 @@ PrintBCDDigit:: ; if bit 7 is set, then no numbers have been printed yet bit PRINTNUM_MONEY_F, b jr z, .skipCurrencySymbol - ld [hl], "¥" + ld [hl], "" inc hl res PRINTNUM_MONEY_F, b .skipCurrencySymbol