summaryrefslogtreecommitdiff
path: root/engine/menu
diff options
context:
space:
mode:
authoreinstein95 <einstein95@users.noreply.github.com>2016-10-07 17:21:39 +1300
committereinstein95 <einstein95@users.noreply.github.com>2016-10-07 17:21:39 +1300
commit3604420d3deb41ed7a468319f6e5fdf460eb18df (patch)
treef33c0082a977d2279e77455db5e5daae4490bad9 /engine/menu
parent903b5c4610d49b84495ba69d2f7beed1fbc25cef (diff)
Gettin closer
Diffstat (limited to 'engine/menu')
-rw-r--r--engine/menu/bills_pc.asm12
-rwxr-xr-xengine/menu/diploma.asm2
-rwxr-xr-xengine/menu/pokedex.asm8
-rwxr-xr-xengine/menu/prize_menu.asm2
4 files changed, 12 insertions, 12 deletions
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
index 8b3313b6..bb47e3bd 100644
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -39,11 +39,11 @@ DisplayPCMainMenu::
.next2
call PlaceString
coord hl, 2, 4
- ld de, wPlayerName
+ ld de, PlayersPCText
call PlaceString
ld l, c
ld h, b
- ld de, PlayersPCText
+ ld de, wPlayerName
call PlaceString
CheckEvent EVENT_GOT_POKEDEX
jr z, .noOaksPC2
@@ -121,7 +121,7 @@ BillsPCMenu:
call LoadScreenTilesFromBuffer2DisableBGTransfer
coord hl, 0, 0
ld b, 10
- ld c, 12
+ ld c, 14
call TextBoxBorder
coord hl, 2, 2
ld de, BillsPCMenuText
@@ -146,9 +146,9 @@ BillsPCMenu:
ld [wPlayerMonNumber], a
ld hl, WhatText
call PrintText
- coord hl, 9, 14
+ coord hl, 11, 14
ld b, 2
- ld c, 9
+ ld c, 7
call TextBoxBorder
ld a, [wCurrentBoxNum]
and $7f
@@ -164,7 +164,7 @@ BillsPCMenu:
add "1"
.next
Coorda 18, 16
- coord hl, 10, 16
+ coord hl, 12, 16
ld de, BoxNoPCText
call PlaceString
ld a, 1
diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm
index 4fc02ff8..107fe17d 100755
--- a/engine/menu/diploma.asm
+++ b/engine/menu/diploma.asm
@@ -91,7 +91,7 @@ DiplomaTextPointersAndCoords:
dw DiplomaCongrats
dwCoord 2, 6
dw DiplomaGameFreak
- dwCoord 9, 16
+ dwCoord 9, 15
DiplomaText:
db $70,"Diplôme",$70,"@"
diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm
index 546203f6..e3f9f1dd 100755
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -516,8 +516,8 @@ ShowPokedexDataInternal:
inc de ; de = address of feet (height)
ld a,[de] ; reads feet, but a is overwritten without being used
push af
- coord hl, 12, 6
- lb bc, 1, 2
+ coord hl, 13, 6
+ lb bc, 1, 3
call PrintNumber ; print feet (height)
ld hl, $C426
pop af
@@ -545,8 +545,8 @@ ShowPokedexDataInternal:
ld a,[de] ; a = lower byte of weight
ld [hl],a ; store lower byte of weight in [hDexWeight + 1]
ld de,hDexWeight
- coord hl, 11, 8
- lb bc, 2, 5 ; 2 bytes, 5 digits
+ coord hl, 12, 8
+ lb bc, 2, 4 ; 2 bytes, 4 digits
call PrintNumber ; print weight
coord hl, 14, 8
ld a,[hDexWeight + 1]
diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm
index 4fbb739f..e2535261 100755
--- a/engine/menu/prize_menu.asm
+++ b/engine/menu/prize_menu.asm
@@ -153,7 +153,7 @@ PrintPrizePrice:
ld c, 7
call TextBoxBorder
call UpdateSprites
- coord hl, 12, 0
+ coord hl, 13, 0
ld de, .CoinString
call PlaceString
coord hl, 13, 1