summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreinstein95 <einstein95@users.noreply.github.com>2017-04-17 02:48:18 +1200
committereinstein95 <einstein95@users.noreply.github.com>2017-04-17 02:48:18 +1200
commite25a6c2e23f45c2763631f8c9a9ac56e5d0d2879 (patch)
tree28817608f4f1241fe200cd2b87e303608703168c
parentce685ac9638b0c6d42168d7c8d37a237b1ce49be (diff)
5 more
-rwxr-xr-xengine/learn_move.asm8
-rwxr-xr-xengine/menu/main_menu.asm18
-rwxr-xr-xengine/menu/naming_screen.asm4
-rw-r--r--engine/menu/text_box.asm4
-rwxr-xr-xengine/overworld/pokemart.asm8
5 files changed, 21 insertions, 21 deletions
diff --git a/engine/learn_move.asm b/engine/learn_move.asm
index ba73d4c0..1eda3a60 100755
--- a/engine/learn_move.asm
+++ b/engine/learn_move.asm
@@ -76,8 +76,8 @@ DontAbandonLearning:
AbandonLearning:
ld hl, AbandonLearningText
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
@@ -99,8 +99,8 @@ TryingToLearn:
push hl
ld hl, TryingToLearnText
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/main_menu.asm b/engine/menu/main_menu.asm
index ab32d5fd..079a64c6 100755
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -240,11 +240,11 @@ LinkMenu:
ld c, d
.updateCursorPosition
ld a, b
- Coorda 6, 7
+ Coorda 5, 7
ld a, c
- Coorda 6, 9
+ Coorda 5, 9
ld a, d
- Coorda 6, 11
+ Coorda 5, 11
ld c, 40
call DelayFrames
call LoadScreenTilesFromBuffer1
@@ -343,11 +343,11 @@ CableClubOptionsText:
DisplayContinueGameInfo:
xor a
ld [H_AUTOBGTRANSFERENABLED], a
- coord hl, 4, 7
+ coord hl, 3, 7
ld b, 8
- ld c, 14
+ ld c, 15
call TextBoxBorder
- coord hl, 5, 9
+ coord hl, 4, 9
ld de, SaveScreenInfoText
call PlaceString
coord hl, 12, 9
@@ -367,13 +367,13 @@ DisplayContinueGameInfo:
PrintSaveScreenText:
xor a
ld [H_AUTOBGTRANSFERENABLED], a
- coord hl, 4, 0
+ coord hl, 3, 0
ld b, $8
- ld c, $e
+ ld c, $f
call TextBoxBorder
call LoadTextBoxTilePatterns
call UpdateSprites
- coord hl, 5, 2
+ coord hl, 4, 2
ld de, SaveScreenInfoText
call PlaceString
coord hl, 12, 2
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm
index e79a6668..34abac05 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -13,8 +13,8 @@ AskName:
call GetMonName
ld hl, DoYouWantToNicknameText
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
diff --git a/engine/menu/text_box.asm b/engine/menu/text_box.asm
index 1a9a027d..6a4050bc 100644
--- a/engine/menu/text_box.asm
+++ b/engine/menu/text_box.asm
@@ -166,9 +166,9 @@ TextBoxTextAndCoordTable:
db 3,0 ; text coordinates
db USE_TOSS_MENU_TEMPLATE
- db 12,10,19,14 ; text box coordinates
+ db 13,10,19,14 ; text box coordinates
dw UseTossText
- db 14,11 ; text coordinates
+ db 15,11 ; text coordinates
db JP_SAVE_MESSAGE_MENU_TEMPLATE
db 0,0,7,5 ; text box coordinates
diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm
index 606e0581..a8f3fae6 100755
--- a/engine/overworld/pokemart.asm
+++ b/engine/overworld/pokemart.asm
@@ -84,8 +84,8 @@ DisplayPokemartDialogue_:
ld hl,PokemartTellSellPriceText
lb bc, 14, 1 ; location that PrintText always prints to, this is useless
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
@@ -162,8 +162,8 @@ DisplayPokemartDialogue_:
call CopyStringToCF50 ; copy name to wcf50
ld hl,PokemartTellBuyPriceText
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