diff options
Diffstat (limited to 'engine/menus')
| -rwxr-xr-x | engine/menus/naming_screen.asm | 13 | ||||
| -rwxr-xr-x | engine/menus/players_pc.asm | 4 | ||||
| -rwxr-xr-x | engine/menus/start_sub_menus.asm | 11 | ||||
| -rw-r--r-- | engine/menus/text_box.asm | 5 |
4 files changed, 20 insertions, 13 deletions
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index d40b73d7..181978fc 100755 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -324,12 +324,15 @@ DisplayNamingScreen: jp EraseMenuCursor LoadEDTile: - ld de, ED_Tile - ld hl, vFont tile $70 - ld bc, (ED_TileEnd - ED_Tile) / $8 + call DisableLCD + ld de, vFont + $700 + ld hl, ED_Tile + ld bc, (ED_TileEnd - ED_Tile) ; to fix the graphical bug on poor emulators - ;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile) / $8 - jp CopyVideoDataDouble + ;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile) + ld a, $01 + call FarCopyDataDouble + jp EnableLCD ED_Tile: INCBIN "gfx/font/ED.1bpp" diff --git a/engine/menus/players_pc.asm b/engine/menus/players_pc.asm index 75c0b335..e896cfae 100755 --- a/engine/menus/players_pc.asm +++ b/engine/menus/players_pc.asm @@ -1,6 +1,4 @@ PlayerPC:: - ld hl, wd730 - set 6, [hl] ld a, ITEM_NAME ld [wNameListType], a call SaveScreenTilesToBuffer1 @@ -17,6 +15,8 @@ PlayerPC:: call PrintText PlayerPCMenu: + ld hl, wd730 + set 6, [hl] ld a, [wParentMenuItem] ld [wCurrentMenuItem], a ld hl, wFlags_0xcd60 diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm index 6a98a10c..ac3b218f 100755 --- a/engine/menus/start_sub_menus.asm +++ b/engine/menus/start_sub_menus.asm @@ -552,8 +552,9 @@ DrawTrainerInfo: call PlaceString hlcoord 8, 4 ld de, wPlayerMoney - ld c, $e3 + ld c, $c3 call PrintBCDNumber + ld [hl], $f0 hlcoord 9, 6 ld de, wPlayTimeHours ; hours lb bc, LEFT_ALIGN | 1, 3 @@ -569,13 +570,13 @@ TrainerInfo_FarCopyData: jp FarCopyData2 TrainerInfo_NameMoneyTimeText: - db "NAME/" - next "MONEY/" - next "TIME/@" + db "NOM./" + next "DIN./" + next "TIEMPO/@" ; $76 is a circle tile TrainerInfo_BadgesText: - db $76,"BADGES",$76,"@" + db $76,"MEDALLAS",$76,"@" ; draws a text box on the trainer info screen ; height is always 6 diff --git a/engine/menus/text_box.asm b/engine/menus/text_box.asm index f61db9ae..6579e656 100644 --- a/engine/menus/text_box.asm +++ b/engine/menus/text_box.asm @@ -138,8 +138,11 @@ DisplayMoneyBox: ld c, 6 call ClearScreenArea hlcoord 12, 1 + ld de, CurrencyString + call PlaceString + hlcoord 12, 1 ld de, wPlayerMoney - ld c, $a3 + ld c, "D" call PrintBCDNumber ld hl, wd730 res 6, [hl] |