diff options
| -rwxr-xr-x | engine/battle/end_of_battle.asm | 7 | ||||
| -rwxr-xr-x | engine/clear_save.asm | 4 | ||||
| -rwxr-xr-x | engine/items/items.asm | 8 | ||||
| -rw-r--r-- | engine/menu/bills_pc.asm | 16 | ||||
| -rwxr-xr-x | engine/menu/players_pc.asm | 4 | ||||
| -rwxr-xr-x | engine/menu/start_sub_menus.asm | 4 | ||||
| -rwxr-xr-x | engine/menu/status_screen.asm | 12 | ||||
| -rw-r--r-- | home.asm | 4 | ||||
| -rw-r--r-- | home/text.asm | 4 |
9 files changed, 32 insertions, 31 deletions
diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index f3720944..190992dc 100755 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -14,12 +14,13 @@ EndOfBattle: ld a, [wBattleResult] cp 1 ld de, YouWinText - jr c, .placeWinOrLoseString + jr c, .unk ld de, YouLoseText - jr z, .placeWinOrLoseString + jr z, .unk ld de, DrawText - coord hl, 6, 8 + coord hl, 4, 8 jr .placeWinOrLoseString +.unk coord hl, 6, 8 .placeWinOrLoseString call PlaceString diff --git a/engine/clear_save.asm b/engine/clear_save.asm index b47cd6c4..c37ee4a7 100755 --- a/engine/clear_save.asm +++ b/engine/clear_save.asm @@ -5,8 +5,8 @@ DoClearSaveDialogue: call LoadTextBoxTilePatterns ld hl, ClearSaveDataText call PrintText - coord hl, 14, 7 - lb bc, 8, 15 + coord hl, 13, 7 + lb bc, 8, 14 ld a, NO_YES_MENU ld [wTwoOptionMenuID], a ld a, TWO_OPTION_MENU diff --git a/engine/items/items.asm b/engine/items/items.asm index 96636392..07c20534 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -2221,8 +2221,8 @@ ItemUseTMHM: call PrintText ld hl,TeachMachineMoveText call PrintText - coord hl, 14, 7 - lb bc, 8, 15 + coord hl, 13, 7 + lb bc, 8, 14 ld a,TWO_OPTION_MENU ld [wTextBoxID],a call DisplayTextBoxID ; yes/no menu @@ -2607,8 +2607,8 @@ TossItem_: call CopyStringToCF50 ; copy name to wcf50 ld hl,IsItOKToTossItemText call PrintText - coord hl, 14, 7 - lb bc, 8, 15 + coord hl, 13, 7 + lb bc, 8, 14 ld a,TWO_OPTION_MENU ld [wTextBoxID],a call DisplayTextBoxID ; yes/no menu diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 5884d4b8..50db8d92 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -146,9 +146,9 @@ BillsPCMenu: ld [wPlayerMonNumber], a ld hl, WhatText call PrintText - coord hl, 11, 14 + coord hl, 9, 14 ld b, 2 - ld c, 7 + ld c, 9 call TextBoxBorder ld a, [wCurrentBoxNum] and $7f @@ -164,7 +164,7 @@ BillsPCMenu: add "1" .next Coorda 18, 16 - coord hl, 12, 16 + coord hl, 10, 16 ld de, BoxNoPCText call PlaceString ld a, 1 @@ -385,9 +385,9 @@ HMMoveArray: db -1 DisplayDepositWithdrawMenu: - coord hl, 9, 10 + coord hl, 8, 10 ld b, 6 - ld c, 9 + ld c, 10 call TextBoxBorder ld a, [wParentMenuItem] and a ; was the Deposit or Withdraw item selected in the parent menu? @@ -395,15 +395,15 @@ DisplayDepositWithdrawMenu: jr nz, .next ld de, WithdrawPCText .next - coord hl, 11, 12 + coord hl, 10, 12 call PlaceString - coord hl, 11, 14 + coord hl, 10, 14 ld de, StatsCancelPCText call PlaceString ld hl, wTopMenuItemY ld a, 12 ld [hli], a ; wTopMenuItemY - ld a, 10 + ld a, 9 ld [hli], a ; wTopMenuItemX xor a ld [hli], a ; wCurrentMenuItem diff --git a/engine/menu/players_pc.asm b/engine/menu/players_pc.asm index b2a5d496..c5acfec7 100755 --- a/engine/menu/players_pc.asm +++ b/engine/menu/players_pc.asm @@ -23,8 +23,8 @@ PlayerPCMenu: set 5, [hl] call LoadScreenTilesFromBuffer2 coord hl, 0, 0 - ld b, $8 - ld c, $e + ld b, 8 + ld c, 15 call TextBoxBorder call UpdateSprites coord hl, 2, 2 diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index fdef19dc..998d6458 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,13 + ld a,14 ld [hli],a ; top menu item X xor a ld [hli],a ; current menu item ID @@ -598,7 +598,7 @@ DrawTrainerInfo: call PlaceString coord hl, 8, 4 ld de,wPlayerMoney - ld c,$c3 + ld c,$e3 call PrintBCDNumber coord hl, 9, 6 ld de,wPlayTimeHours ; hours diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index bc87f7fe..2db9a908 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -328,8 +328,8 @@ StatusScreen2: ld b, a ; Number of moves ? coord hl, 11, 10 ld de, SCREEN_WIDTH * 2 - ld a, $8F ; special P tile id - call StatusScreen_PrintPP ; Print "PP" + ld a, $80 ; special P tile id + call StatusScreen_PrintAP ; Print "AP" ld a, b and a jr z, .InitPP @@ -480,12 +480,12 @@ StatusScreen_PrintPP: jr nz, StatusScreen_PrintPP ret -func_6cd5: ; 12cd5 (4:6cd5) - ld a, $80 +StatusScreen_PrintAP: ; 12cd5 (4:6cd5) + ld a, "A" ld [hli],a - ld a, $8F + ld a, "P" ldd [hl], a add hl, de dec c - jr nz, func_6cd5 + jr nz, StatusScreen_PrintAP ret
\ No newline at end of file @@ -1671,7 +1671,7 @@ DisplayChooseQuantityMenu:: ld de,SpacesBetweenQuantityAndPriceText call PlaceString ld de,hMoney ; total price - ld c,$83 + ld c,$A3 call PrintBCDNumber coord hl, 9, 10 .printQuantity @@ -1796,7 +1796,7 @@ PrintListMenuEntries:: pop hl ld bc, SCREEN_WIDTH + 5 ; 1 row down and 5 columns right add hl,bc - ld c,$83 ; no leading zeroes, right-aligned, print currency symbol, 3 bytes + ld c,$A3 ; no leading zeroes, right-aligned, print currency symbol, 3 bytes call PrintBCDNumber .skipPrintingItemPrice ld a,[wListMenuID] diff --git a/home/text.asm b/home/text.asm index 17ab0e82..a78e88f8 100644 --- a/home/text.asm +++ b/home/text.asm @@ -199,11 +199,11 @@ MonsterNameCharsCommon:: .Enemy ; print “Enemy ” - ld de,wEnemyMonNick + ld de,Char5AText call PlaceString ld h,b ld l,c - ld de,Char5AText + ld de,wEnemyMonNick FinishDTE:: call PlaceString |