summaryrefslogtreecommitdiff
path: root/engine/menu
diff options
context:
space:
mode:
Diffstat (limited to 'engine/menu')
-rw-r--r--engine/menu/bills_pc.asm54
-rwxr-xr-xengine/menu/diploma.asm33
-rw-r--r--engine/menu/draw_start_menu.asm8
-rwxr-xr-xengine/menu/league_pc.asm2
-rwxr-xr-xengine/menu/main_menu.asm60
-rwxr-xr-xengine/menu/naming_screen.asm44
-rwxr-xr-xengine/menu/party_menu.asm8
-rwxr-xr-xengine/menu/players_pc.asm16
-rwxr-xr-xengine/menu/pokedex.asm47
-rwxr-xr-xengine/menu/prize_menu.asm4
-rwxr-xr-xengine/menu/start_sub_menus.asm8
-rwxr-xr-xengine/menu/status_screen.asm30
-rw-r--r--engine/menu/text_box.asm137
-rwxr-xr-xengine/menu/vending_machine.asm8
14 files changed, 221 insertions, 238 deletions
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
index 85a546e1..50db8d92 100644
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -12,17 +12,17 @@ DisplayPCMainMenu::
jr nz, .leaguePCAvailable
coord hl, 0, 0
ld b, 8
- ld c, 14
+ ld c, 15
jr .next
.noOaksPC
coord hl, 0, 0
ld b, 6
- ld c, 14
+ ld c, 15
jr .next
.leaguePCAvailable
coord hl, 0, 0
ld b, 10
- ld c, 14
+ ld c, 15
.next
call TextBoxBorder
call UpdateSprites
@@ -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
@@ -85,12 +85,12 @@ DisplayPCMainMenu::
ld [H_AUTOBGTRANSFERENABLED], a
ret
-SomeonesPCText: db "SOMEONE's PC@"
-BillsPCText: db "BILL's PC@"
-PlayersPCText: db "'s PC@"
-OaksPCText: db "PROF.OAK's PC@"
-PKMNLeaguePCText: db $4a, "LEAGUE@"
-LogOffPCText: db "LOG OFF@"
+SomeonesPCText: db "JEMANDES PC@"
+BillsPCText: db "BILLS PC@"
+PlayersPCText: db "PC VON @"
+OaksPCText: db "EICHS PC@"
+PKMNLeaguePCText: db "<pkmn>-LIGA@"
+LogOffPCText: db "AUSLOGGEN@"
BillsPC_::
ld hl, wd730
@@ -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
@@ -339,15 +339,15 @@ DisplayMonListMenu:
ret
BillsPCMenuText:
- db "WITHDRAW ", $4a
- next "DEPOSIT ", $4a
- next "RELEASE ", $4a
- next "CHANGE BOX"
- next "SEE YA!"
+ db "<pkmn> MITNEHMEN"
+ next "<pkmn> ABLEGEN"
+ next "<pkmn> FREILASSEN"
+ next "BOX WECHSELN"
+ next "TSCHÜSS!"
db "@"
BoxNoPCText:
- db "BOX No.@"
+ db "BOX Nr.@"
KnowsHMMove::
; returns whether mon with party index [wWhichPokemon] knows an HM move
@@ -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
@@ -451,11 +451,11 @@ DisplayDepositWithdrawMenu:
call LoadGBPal
jr .loop
-DepositPCText: db "DEPOSIT@"
-WithdrawPCText: db "WITHDRAW@"
+DepositPCText: db "ABLEGEN@"
+WithdrawPCText: db "MITNEHMEN@"
StatsCancelPCText:
- db "STATS"
- next "CANCEL@"
+ db "STATUS"
+ next "ZURÜCK@"
SwitchOnText:
TX_FAR _SwitchOnText
diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm
index 09ba123e..9f559b8a 100755
--- a/engine/menu/diploma.asm
+++ b/engine/menu/diploma.asm
@@ -33,7 +33,7 @@ DisplayDiploma:
pop bc
dec c
jr nz, .asm_56715
- coord hl, 10, 4
+ coord hl, 9, 6
ld de, wPlayerName
call PlaceString
callba DrawPlayerCharacter
@@ -83,31 +83,30 @@ UnusedPlayerNameLengthFunc:
DiplomaTextPointersAndCoords:
dw DiplomaText
- dwCoord 5, 2
- dw DiplomaPlayer
- dwCoord 3, 4
- dw DiplomaEmptyText
- dwCoord 15, 4
- dw DiplomaCongrats
+ dwCoord 6, 2
+ dw DiplomaPlayer1
+ dwCoord 2, 4
+ dw DiplomaPlayer2
dwCoord 2, 6
+ dw DiplomaCongrats
+ dwCoord 2, 8
dw DiplomaGameFreak
dwCoord 9, 16
DiplomaText:
- db $70,"Diploma",$70,"@"
+ db $70,"Diplom",$70,"@"
-DiplomaPlayer:
- db "Player@"
+DiplomaPlayer1:
+ db "Herzlichen Glück-@"
-DiplomaEmptyText:
- db "@"
+DiplomaPlayer2:
+ db "wunsch !@"
DiplomaCongrats:
- db "Congrats! This"
- next "diploma certifies"
- next "that you have"
- next "completed your"
- next "#DEX.@"
+ db "Du hast es ge-"
+ next "schafft, den"
+ next "#DEX zu"
+ next "vervollständigen@"
DiplomaGameFreak:
db "GAME FREAK@"
diff --git a/engine/menu/draw_start_menu.asm b/engine/menu/draw_start_menu.asm
index 83a81aac..5e10b972 100644
--- a/engine/menu/draw_start_menu.asm
+++ b/engine/menu/draw_start_menu.asm
@@ -60,22 +60,22 @@ DrawStartMenu:
ret
StartMenuPokedexText:
- db "POKéDEX@"
+ db "#DEX@"
StartMenuPokemonText:
- db "POKéMON@"
+ db "#MON@"
StartMenuItemText:
db "ITEM@"
StartMenuSaveText:
- db "SAVE@"
+ db "SICHERN@"
StartMenuResetText:
db "RESET@"
StartMenuExitText:
- db "EXIT@"
+ db "ZURÜCK@"
StartMenuOptionText:
db "OPTION@"
diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm
index 170c0ef3..8ca8e1e3 100755
--- a/engine/menu/league_pc.asm
+++ b/engine/menu/league_pc.asm
@@ -113,7 +113,7 @@ LeaguePCShowMon:
jpba HoFDisplayMonInfo
HallOfFameNoText:
- db "HALL OF FAME No @"
+ db "RUHMESHALLE Nr.@"
AccessedHoFPCText:
TX_FAR _AccessedHoFPCText
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index cd4198b6..2da68a3b 100755
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -141,12 +141,12 @@ LinkMenu:
call SaveScreenTilesToBuffer1
ld hl, WhereWouldYouLikeText
call PrintText
- coord hl, 5, 5
+ coord hl, 4, 5
ld b, $6
- ld c, $d
+ ld c, $e
call TextBoxBorder
call UpdateSprites
- coord hl, 7, 7
+ coord hl, 6, 7
ld de, CableClubOptionsText
call PlaceString
xor a
@@ -155,7 +155,7 @@ LinkMenu:
ld hl, wTopMenuItemY
ld a, $7
ld [hli], a
- ld a, $6
+ ld a, $5
ld [hli], a
xor a
ld [hli], a
@@ -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
@@ -329,25 +329,25 @@ SpecialEnterMap:
jp EnterMap
ContinueText:
- db "CONTINUE", $4e
+ db "WEITER", $4e
NewGameText:
- db "NEW GAME"
- next "OPTION@"
+ db "NEUES SPIEL"
+ next "OPTIONEN@"
CableClubOptionsText:
- db "TRADE CENTER"
- next "COLOSSEUM"
- next "CANCEL@"
+ db "HANDELSCENTER"
+ next "KOLOSSEUM"
+ next "ZURÜCK@"
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
@@ -421,10 +421,10 @@ PrintPlayTime:
jp PrintNumber
SaveScreenInfoText:
- db "PLAYER"
- next "BADGES "
- next "#DEX "
- next "TIME@"
+ db "SPIELER"
+ next "ORDEN "
+ next "#DEX "
+ next "ZEIT@"
DisplayOptionMenu:
coord hl, 0, 0
@@ -579,19 +579,19 @@ DisplayOptionMenu:
jp .eraseOldMenuCursor
TextSpeedOptionText:
- db "TEXT SPEED"
- next " FAST MEDIUM SLOW@"
+ db "TEXT-TEMPO"
+ next " 3 2 1 @"
BattleAnimationOptionText:
- db "BATTLE ANIMATION"
- next " ON OFF@"
+ db "KAMPFANIMATION"
+ next " AN AUS@"
BattleStyleOptionText:
- db "BATTLE STYLE"
- next " SHIFT SET@"
+ db "KAMPFSTIL"
+ next " WECHSEL FOLGEND@"
OptionMenuCancelText:
- db "CANCEL@"
+ db "ZURÜCK@"
; sets the options variable according to the current placement of the menu cursors in the options menu
SetOptionsFromCursorPositions:
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm
index 64065c4d..a3c2c72a 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
@@ -39,7 +39,7 @@ AskName:
pop hl
pop af
ld [wUpdateSpritesEnabled], a
- ld a, [wcf4b]
+ ld a, [wcf50]
cp "@"
ret nz
.declinedNickname
@@ -63,7 +63,7 @@ DisplayNameRaterScreen:
call GBPalWhiteOutWithDelay3
call RestoreScreenTilesAndReloadTilePatterns
call LoadGBPal
- ld a, [wcf4b]
+ ld a, [wcf50]
cp "@"
jr z, .playerCancelled
ld hl, wPartyMonNicks
@@ -109,7 +109,7 @@ DisplayNamingScreen:
ld a, 7
ld [wMaxMenuItem], a
ld a, "@"
- ld [wcf4b], a
+ ld [wcf50], a
xor a
ld hl, wNamingScreenSubmitName
ld [hli], a
@@ -157,7 +157,7 @@ DisplayNamingScreen:
.submitNickname
pop de
- ld hl, wcf4b
+ ld hl, wcf50
ld bc, NAME_LENGTH
call CopyData
call GBPalWhiteOutWithDelay3
@@ -324,12 +324,15 @@ DisplayNamingScreen:
jp EraseMenuCursor
LoadEDTile:
- ld de, ED_Tile
- ld hl, vFont + $700
- ld bc, (ED_TileEnd - ED_Tile) / $8
+ call DisableLCD
+ ld de, vFont + $700
+ ld hl, ED_Tile
+ ld bc, (ED_TileEnd - ED_Tile)
; to fix the graphical bug on poor emulators
- ;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile) / $8
- jp CopyVideoDataDouble
+ ;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile)
+ ld a,$01
+ call FarCopyDataDouble
+ jp EnableLCD
ED_Tile:
INCBIN "gfx/ED_tile.1bpp"
@@ -366,10 +369,10 @@ PrintAlphabet:
jp Delay3
LowerCaseAlphabet:
- db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥UPPER CASE@"
+ db "abcdefghijklmnopqrstuvwxyz äöü:×()",$e1,$e2,"-?!♂♀/⠄,¥GROSSBUCHSTABEN@"
UpperCaseAlphabet:
- db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥lower case@"
+ db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ÄÖÜ:;[]",$e1,$e2,"-?!♂♀/⠄,¥kleinbuchstaben@"
PrintNicknameAndUnderscores:
call CalcStringLength
@@ -379,7 +382,7 @@ PrintNicknameAndUnderscores:
lb bc, 1, 10
call ClearScreenArea
coord hl, 10, 2
- ld de, wcf4b
+ ld de, wcf50
call PlaceString
coord hl, 10, 3
ld a, [wNamingScreenType]
@@ -455,9 +458,9 @@ Handakutens:
db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ"
db $ff
-; calculates the length of the string at wcf4b and stores it in c
+; calculates the length of the string at wcf50 and stores it in c
CalcStringLength:
- ld hl, wcf4b
+ ld hl, wcf50
ld c, $0
.loop
ld a, [hl]
@@ -485,9 +488,6 @@ PrintNamingText:
call GetMonName
coord hl, 4, 1
call PlaceString
- ld hl, $1
- add hl, bc
- ld [hl], $c9
coord hl, 1, 3
ld de, NicknameTextString
jr .placeString
@@ -500,13 +500,13 @@ PrintNamingText:
jp PlaceString
YourTextString:
- db "YOUR @"
+ db "DEIN @"
RivalsTextString:
- db "RIVAL's @"
+ db "GEGNER-@"
NameTextString:
db "NAME?@"
NicknameTextString:
- db "NICKNAME?@"
+ db "ALIAS?@"
diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm
index a35524ed..ff302968 100755
--- a/engine/menu/party_menu.asm
+++ b/engine/menu/party_menu.asm
@@ -127,9 +127,9 @@ RedrawPartyMenu_:
inc c
jp .loop
.ableToLearnMoveText
- db "ABLE@"
+ db "OK@"
.notAbleToLearnMoveText
- db "NOT ABLE@"
+ db "NEIN@"
.evolutionStoneMenu
push hl
ld hl,EvosMovesPointerTable
@@ -184,9 +184,9 @@ RedrawPartyMenu_:
pop hl
jr .printLevel
.ableToEvolveText
- db "ABLE@"
+ db "OK@"
.notAbleToEvolveText
- db "NOT ABLE@"
+ db "NEIN@"
.afterDrawingMonEntries
ld b, SET_PAL_PARTY_MENU
call RunPaletteCommand
diff --git a/engine/menu/players_pc.asm b/engine/menu/players_pc.asm
index bc2be4ef..c5acfec7 100755
--- a/engine/menu/players_pc.asm
+++ b/engine/menu/players_pc.asm
@@ -1,6 +1,4 @@
PlayerPC:
- ld hl, wd730
- set 6, [hl]
ld a, ITEM_NAME
ld [wNameListType], a
call SaveScreenTilesToBuffer1
@@ -17,14 +15,16 @@ PlayerPC:
call PrintText
PlayerPCMenu:
+ ld hl, wd730
+ set 6, [hl]
ld a, [wParentMenuItem]
ld [wCurrentMenuItem], a
ld hl, wFlags_0xcd60
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
@@ -241,10 +241,10 @@ PlayerPCToss:
jp .loop
PlayersPCMenuEntries:
- db "WITHDRAW ITEM"
- next "DEPOSIT ITEM"
- next "TOSS ITEM"
- next "LOG OFF@"
+ db "ITEM AUFNEHMEN"
+ next "ITEM ABLEGEN"
+ next "ITEM WEGWERFEN"
+ next "AUSLOGGEN@"
TurnedOnPC2Text:
TX_FAR _TurnedOnPC2Text
diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm
index bf8afaa9..ea28c133 100755
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -360,19 +360,19 @@ DrawPokedexVerticalLine:
ret
PokedexSeenText:
- db "SEEN@"
+ db "GES@"
PokedexOwnText:
- db "OWN@"
+ db "BES@"
PokedexContentsText:
- db "CONTENTS@"
+ db "INHALT@"
PokedexMenuItemsText:
db "DATA"
- next "CRY"
- next "AREA"
- next "QUIT@"
+ next "RUF"
+ next "GEB."
+ next "ZUR.@"
; tests if a pokemon's bit is set in the seen or owned pokemon bit fields
; INPUT:
@@ -515,22 +515,23 @@ ShowPokedexDataInternal:
jp z,.waitForButtonPress ; if the pokemon has not been owned, don't print the height, weight, or description
inc de ; de = address of feet (height)
ld a,[de] ; reads feet, but a is overwritten without being used
- coord hl, 12, 6
- lb bc, 1, 2
+ push af
+ coord hl, 13, 6
+ lb bc, 1, 3
call PrintNumber ; print feet (height)
- ld a,$60 ; feet symbol tile (one tick)
- ld [hl],a
- inc de
- inc de ; de = address of inches (height)
- coord hl, 15, 6
- lb bc, LEADING_ZEROES | 1, 2
- call PrintNumber ; print inches (height)
- ld a,$61 ; inches symbol tile (two ticks)
- ld [hl],a
-; now print the weight (note that weight is stored in tenths of pounds internally)
+ ld hl, $C426
+ pop af
+ cp $a
+ jr nc, .func_43d7
+ ld [hl], $F6
+.func_43d7
+ inc hl
+ ld a, [hli]
+ ldd [hl], a
+ ld [hl], $F2
inc de
inc de
- inc de ; de = address of upper byte of weight
+ inc de ; de = address of inches (height)
push de
; put weight in big-endian order at hDexWeight
ld hl,hDexWeight
@@ -544,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]
@@ -590,8 +591,8 @@ ShowPokedexDataInternal:
ret
HeightWeightText:
- db "HT ?",$60,"??",$61
- next "WT ???lb@"
+ db "GR. ???",$60
+ next "GEW ???",$61,$62,"@"
; XXX does anything point to this?
PokeText:
diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm
index f6ca013b..5cfdbc87 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
@@ -166,7 +166,7 @@ PrintPrizePrice:
ret
.CoinString:
- db "COIN@"
+ db "MÜNZEN@"
.SixSpacesString:
db " @"
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm
index 251d7ae4..998d6458 100755
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -367,7 +367,7 @@ StartMenu_Item:
ld a,[wcf91]
ld [wd11e],a
call GetItemName
- call CopyStringToCF4B ; copy name to wcf4b
+ call CopyStringToCF50 ; copy name to wcf50
ld a,[wcf91]
cp a,BICYCLE
jr nz,.notBicycle2
@@ -616,12 +616,12 @@ TrainerInfo_FarCopyData:
TrainerInfo_NameMoneyTimeText:
db "NAME/"
- next "MONEY/"
- next "TIME/@"
+ next "GELD/"
+ next "ZEIT/@"
; $76 is a circle tile
TrainerInfo_BadgesText:
- db $76,"BADGES",$76,"@"
+ db $76,"ORDEN",$76,"@"
; draws a text box on the trainer info screen
; height is always 6
diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm
index ef94f13c..2db9a908 100755
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -205,13 +205,13 @@ NamePointers2:
dw wDayCareMonName
Type1Text:
- db "TYPE1/", $4e
+ db "TYP1/", $4e
Type2Text:
- db "TYPE2/", $4e
+ db "TYP2/", $4e
IDNoText:
- db $73, "№/", $4e
+ db "″№/", $4e
OTText:
db "OT/"
@@ -289,10 +289,10 @@ PrintStat:
ret
StatsText:
- db "ATTACK"
- next "DEFENSE"
- next "SPEED"
- next "SPECIAL@"
+ db "ANGR"
+ next "VERT"
+ next "INIT"
+ next "SPEZ@"
StatusScreen2:
ld a, [hTilesetType]
@@ -328,8 +328,8 @@ StatusScreen2:
ld b, a ; Number of moves ?
coord hl, 11, 10
ld de, SCREEN_WIDTH * 2
- ld a, $72 ; 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
@@ -463,7 +463,7 @@ CalcExpToLevelUp:
ret
StatusScreenExpText:
- db "EXP POINTS"
+ db "EP-PUNKTE"
next "LEVEL UP@"
StatusScreen_ClearName:
@@ -479,3 +479,13 @@ StatusScreen_PrintPP:
dec c
jr nz, StatusScreen_PrintPP
ret
+
+StatusScreen_PrintAP: ; 12cd5 (4:6cd5)
+ ld a, "A"
+ ld [hli],a
+ ld a, "P"
+ ldd [hl], a
+ add hl, de
+ dec c
+ jr nz, StatusScreen_PrintAP
+ ret \ No newline at end of file
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
diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm
index aab4adf4..08f44694 100755
--- a/engine/menu/vending_machine.asm
+++ b/engine/menu/vending_machine.asm
@@ -85,10 +85,10 @@ VendingMachineText1:
db "@"
DrinkText:
- db "FRESH WATER"
- next "SODA POP"
- next "LEMONADE"
- next "CANCEL@"
+ db "TAFELWASSER"
+ next "SPRUDEL"
+ next "LIMONADE"
+ next "ZURÜCK@"
DrinkPriceText:
db "¥200"
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 04:39:58 +0000