summaryrefslogtreecommitdiff
path: root/engine/menu/text_box.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/menu/text_box.asm')
-rw-r--r--engine/menu/text_box.asm137
1 files changed, 55 insertions, 82 deletions
diff --git a/engine/menu/text_box.asm b/engine/menu/text_box.asm
index 12067dd4..6a4050bc 100644
--- a/engine/menu/text_box.asm
+++ b/engine/menu/text_box.asm
@@ -162,7 +162,7 @@ TextBoxCoordTable:
TextBoxTextAndCoordTable:
db JP_MOCHIMONO_MENU_TEMPLATE
db 0,0,14,17 ; text box coordinates
- dw JapaneseMochimonoText
+ dw BuySellQuitText ; JapaneseMochimonoText
db 3,0 ; text coordinates
db USE_TOSS_MENU_TEMPLATE
@@ -172,18 +172,18 @@ TextBoxTextAndCoordTable:
db JP_SAVE_MESSAGE_MENU_TEMPLATE
db 0,0,7,5 ; text box coordinates
- dw JapaneseSaveMessageText
+ dw BuySellQuitText ; JapaneseSaveMessageText
db 2,2 ; text coordinates
db JP_SPEED_OPTIONS_MENU_TEMPLATE
db 0,6,5,10 ; text box coordinates
- dw JapaneseSpeedOptionsText
+ dw BuySellQuitText ; JapaneseSpeedOptionsText
db 2,7 ; text coordinates
db BATTLE_MENU_TEMPLATE
- db 8,12,19,17 ; text box coordinates
+ db 6,12,19,17 ; text box coordinates
dw BattleMenuText
- db 10,14 ; text coordinates
+ db 8,14 ; text coordinates
db SAFARI_BATTLE_MENU_TEMPLATE
db 0,12,19,17 ; text box coordinates
@@ -197,7 +197,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
@@ -207,64 +207,40 @@ TextBoxTextAndCoordTable:
db JP_AH_MENU_TEMPLATE
db 7,6,11,10 ; text box coordinates
- dw JapaneseAhText
+ dw BuySellQuitText ; JapaneseAhText
db 8,8 ; text coordinates
db JP_POKEDEX_MENU_TEMPLATE
db 11,8,19,17 ; text box coordinates
- dw JapanesePokedexMenu
+ dw BuySellQuitText ; JapanesePokedexMenu
db 12,10 ; text coordinates
; note that there is no terminator
BuySellQuitText:
- db "BUY"
- next "SELL"
- next "QUIT@@"
+ db "@KAUF"
+ next "VERKAUF"
+ next "TSCHÜSS!@"
UseTossText:
- db "USE"
- next "TOSS@"
-
-JapaneseSaveMessageText:
- db "きろく"
- next "メッセージ@"
-
-JapaneseSpeedOptionsText:
- db "はやい"
- next "おそい@"
+ db "OK"
+ next "MÜLL@"
MoneyText:
- db "MONEY@"
-
-JapaneseMochimonoText:
- db "もちもの@"
-
-JapaneseMainMenuText:
- db "つづきから"
- next "さいしょから@"
+ db "GELD@"
BattleMenuText:
- db "FIGHT ",$E1,$E2
- next "ITEM RUN@"
+ db "KMPF ",$E1,$E2
+ next "ITEM FLUCHT@"
SafariZoneBattleMenuText:
- db "BALL× BAIT"
- next "THROW ROCK RUN@"
+ db "BALL× KÖDER"
+ next "STEIN FLUCHT@"
SwitchStatsCancelText:
- db "SWITCH"
- next "STATS"
- next "CANCEL@"
-
-JapaneseAhText:
- db "アッ!@"
-
-JapanesePokedexMenu:
- db "データをみる"
- next "なきごえ"
- next "ぶんぷをみる"
- next "キャンセル@"
+ db "TAUSCH"
+ next "STATUS"
+ next "ZURÜCK@"
DisplayMoneyBox:
ld hl, wd730
@@ -278,15 +254,12 @@ DisplayMoneyBox:
call ClearScreenArea
coord hl, 12, 1
ld de, wPlayerMoney
- ld c, $a3
+ ld c, "d"
call PrintBCDNumber
ld hl, wd730
res 6, [hl]
ret
-CurrencyString:
- db " ¥@"
-
DoBuySellQuitMenu:
ld a, [wd730]
set 6, a ; no printing delay
@@ -481,7 +454,7 @@ DisplayTwoOptionMenu:
TwoOptionMenu_SaveScreenTiles:
ld de, wBuffer
- lb bc, 5, 6
+ lb bc, 5, 7
.loop
ld a, [hli]
ld [de], a
@@ -489,17 +462,17 @@ TwoOptionMenu_SaveScreenTiles:
dec c
jr nz, .loop
push bc
- ld bc, SCREEN_WIDTH - 6
+ ld bc, SCREEN_WIDTH - 7
add hl, bc
pop bc
- ld c, $6
+ ld c, $7
dec b
jr nz, .loop
ret
TwoOptionMenu_RestoreScreenTiles:
ld de, wBuffer
- lb bc, 5, 6
+ lb bc, 5, 7
.loop
ld a, [de]
inc de
@@ -507,10 +480,10 @@ TwoOptionMenu_RestoreScreenTiles:
dec c
jr nz, .loop
push bc
- ld bc, SCREEN_WIDTH - 6
+ ld bc, SCREEN_WIDTH - 7
add hl, bc
pop bc
- ld c, 6
+ ld c, 7
dec b
jr nz, .loop
call UpdateSprites
@@ -522,7 +495,7 @@ TwoOptionMenu_RestoreScreenTiles:
; 02: byte put blank line before first menu item
; 03: word text pointer
TwoOptionMenuStrings:
- db 4,3,0
+ db 5,3,0
dw .YesNoMenu
db 6,3,0
dw .NorthWestMenu
@@ -536,15 +509,9 @@ TwoOptionMenuStrings:
dw .TradeCancelMenu
db 7,4,1
dw .HealCancelMenu
- db 4,3,0
+ db 5,3,0
dw .NoYesMenu
-.NoYesMenu
- db "NO"
- next "YES@"
-.YesNoMenu
- db "YES"
- next "NO@"
.NorthWestMenu
db "NORTH"
next "WEST@"
@@ -554,12 +521,18 @@ TwoOptionMenuStrings:
.NorthEastMenu
db "NORTH"
next "EAST@"
+.NoYesMenu
+ db "NEIN"
+ next "JA@"
+.YesNoMenu
+ db "JA"
+ next "NEIN@"
.TradeCancelMenu
- db "TRADE"
- next "CANCEL@"
+ db "TAUSCH"
+ next "ZURÜCK@"
.HealCancelMenu
- db "HEAL"
- next "CANCEL@"
+ db "HEILEN"
+ next "ZURÜCK@"
DisplayFieldMoveMonMenu:
xor a
@@ -682,20 +655,20 @@ DisplayFieldMoveMonMenu:
jp PlaceString
FieldMoveNames:
- db "CUT@"
- db "FLY@"
+ db "ZERSCHNEIDER@"
+ db "FLIEGEN@"
db "@"
- db "SURF@"
- db "STRENGTH@"
- db "FLASH@"
- db "DIG@"
+ db "SURFER@"
+ db "STÄRKE@"
+ db "BLITZ@"
+ db "SCHAUFLER@"
db "TELEPORT@"
- db "SOFTBOILED@"
+ db "WEICHEI@"
PokemonMenuEntries:
- db "STATS"
- next "SWITCH"
- next "CANCEL@"
+ db "STATUS"
+ next "TAUSCH"
+ next "ZURÜCK@"
GetMonFieldMoves:
ld a, [wWhichPokemon]
@@ -755,13 +728,13 @@ GetMonFieldMoves:
; Leftmost tile = -1 + tile column in which the first letter of the move's name should be displayed
; "SOFTBOILED" is $08 because it has 4 more letters than "SURF", for example, whose value is $0C
FieldMoveDisplayData:
- db CUT, $01, $0C
- db FLY, $02, $0C
+ db CUT, $01, $06
+ db FLY, $02, $0B
db $B4, $03, $0C ; unused field move
db SURF, $04, $0C
- db STRENGTH, $05, $0A
+ db STRENGTH, $05, $0C
db FLASH, $06, $0C
- db DIG, $07, $0C
+ db DIG, $07, $09
db TELEPORT, $08, $0A
- db SOFTBOILED, $09, $08
+ db SOFTBOILED, $09, $0B
db $ff ; list terminator