summaryrefslogtreecommitdiff
path: root/engine/menu
diff options
context:
space:
mode:
authoreinstein95 <einstein95@users.noreply.github.com>2017-01-10 19:22:29 +1300
committereinstein95 <einstein95@users.noreply.github.com>2017-01-10 19:22:29 +1300
commitd5dd5b2dd18815a9897aadc50dd7d5dbd431d572 (patch)
treeb7e20cbfcc938aff7c14af7992cfa42304d96bec /engine/menu
parent653072192ccd9759ff44d8c86f8dc10a19756208 (diff)
44 to go
Diffstat (limited to 'engine/menu')
-rw-r--r--engine/menu/bills_pc.asm16
-rwxr-xr-xengine/menu/players_pc.asm4
-rwxr-xr-xengine/menu/start_sub_menus.asm4
-rwxr-xr-xengine/menu/status_screen.asm12
4 files changed, 18 insertions, 18 deletions
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