diff options
| -rw-r--r-- | engine/menu/bills_pc.asm | 6 | ||||
| -rwxr-xr-x | engine/menu/party_menu.asm | 8 | ||||
| -rwxr-xr-x | engine/menu/players_pc.asm | 4 | ||||
| -rwxr-xr-x | engine/menu/start_sub_menus.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/status_screen.asm | 8 | ||||
| -rwxr-xr-x | main.asm | 9 |
6 files changed, 18 insertions, 19 deletions
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index bb47e3bd..1bae3b51 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -12,17 +12,17 @@ DisplayPCMainMenu:: jr nz, .leaguePCAvailable coord hl, 0, 0 ld b, 8 - ld c, 14 + ld c, 15 jr .next .noOaksPC coord hl, 0, 0 ld b, 6 - ld c, 14 + ld c, 15 jr .next .leaguePCAvailable coord hl, 0, 0 ld b, 10 - ld c, 14 + ld c, 15 .next call TextBoxBorder call UpdateSprites diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index a35524ed..e799feec 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -127,9 +127,9 @@ RedrawPartyMenu_: inc c jp .loop .ableToLearnMoveText - db "ABLE@" + db "APTE@" .notAbleToLearnMoveText - db "NOT ABLE@" + db "PAS APTE@" .evolutionStoneMenu push hl ld hl,EvosMovesPointerTable @@ -184,9 +184,9 @@ RedrawPartyMenu_: pop hl jr .printLevel .ableToEvolveText - db "ABLE@" + db "APTE@" .notAbleToEvolveText - db "NOT ABLE@" + db "PAS APTE@" .afterDrawingMonEntries ld b, SET_PAL_PARTY_MENU call RunPaletteCommand diff --git a/engine/menu/players_pc.asm b/engine/menu/players_pc.asm index fc1e2bef..a9f067ff 100755 --- a/engine/menu/players_pc.asm +++ b/engine/menu/players_pc.asm @@ -13,10 +13,10 @@ PlayerPC: call PlaySound ld hl, TurnedOnPC2Text call PrintText - ld hl, wd730 - set 6, [hl] PlayerPCMenu: + ld hl, wd730 + set 6, [hl] ld a, [wParentMenuItem] ld [wCurrentMenuItem], a ld hl, wFlags_0xcd60 diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index dd7f8083..7384797a 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -347,7 +347,7 @@ StartMenu_Item: ld hl,wTopMenuItemY ld a,11 ld [hli],a ; top menu item Y - ld a,14 + ld a,13 ld [hli],a ; top menu item X xor a ld [hli],a ; current menu item ID diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index c07dcf64..d688a195 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -211,14 +211,14 @@ Type2Text: db "TYPE2/", $4e IDNoText: - db $73, "№/", $4e + db "№",$73,"/", $4e OTText: - db "OT/" + db "DO/" next "@" StatusText: - db "STATUS/@" + db "STATUT/@" OKText: db "OK@" @@ -328,7 +328,7 @@ StatusScreen2: ld b, a ; Number of moves ? coord hl, 11, 10 ld de, SCREEN_WIDTH * 2 - ld a, $72 ; special P tile id + ld a, $8F ; special P tile id call StatusScreen_PrintPP ; Print "PP" ld a, b and a @@ -1359,7 +1359,7 @@ TextBoxTextAndCoordTable: db BUY_SELL_QUIT_MENU_TEMPLATE db 0,0,10,6 ; text box coordinates - dw BuySellQuitText + dw BuySellQuitText + 1 db 2,1 ; text coordinates db MONEY_BOX_TEMPLATE @@ -1415,9 +1415,9 @@ DisplayMoneyBox: ld c, 6 call ClearScreenArea coord hl, 12, 1 - ld de, wPlayerMoney + ld de, $754a call PlaceString - ld hl, wd730 + ld hl, $c3c0 ld de, wPlayerMoney ld c, $83 call PrintBCDNumber @@ -4774,8 +4774,7 @@ Unk9Graphic: INCBIN "gfx/unk_9.2bpp" Unk9GraphicEnd: TextBoxGraphics: INCBIN "gfx/text_box.2bpp" TextBoxGraphicsEnd: -PokedexTileGraphics: INCBIN "gfx/pokedex.2bpp",$10,$110 - db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +PokedexTileGraphics: INCBIN "gfx/pokedex.2bpp",$10,$120 PokedexTileGraphicsEnd: WorldMapTileGraphics: INCBIN "gfx/town_map.2bpp" WorldMapTileGraphicsEnd: |