summaryrefslogtreecommitdiff
path: root/engine/menu
diff options
context:
space:
mode:
Diffstat (limited to 'engine/menu')
-rw-r--r--engine/menu/bills_pc.asm48
-rwxr-xr-xengine/menu/diploma.asm15
-rw-r--r--engine/menu/draw_start_menu.asm12
-rwxr-xr-xengine/menu/league_pc.asm4
-rwxr-xr-xengine/menu/main_menu.asm34
-rwxr-xr-xengine/menu/naming_screen.asm56
-rwxr-xr-xengine/menu/party_menu.asm8
-rwxr-xr-xengine/menu/players_pc.asm12
-rwxr-xr-xengine/menu/pokedex.asm49
-rwxr-xr-xengine/menu/prize_menu.asm4
-rwxr-xr-xengine/menu/start_sub_menus.asm13
-rwxr-xr-xengine/menu/status_screen.asm30
-rw-r--r--engine/menu/text_box.asm113
-rwxr-xr-xengine/menu/vending_machine.asm14
14 files changed, 199 insertions, 213 deletions
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
index 85a546e1..1bae3b51 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 "PC DE ???@"
+BillsPCText: db "PC DE LEO@"
+PlayersPCText: db "PC DE @"
+OaksPCText: db "PC DE CHEN@"
+PKMNLeaguePCText: db "LIGUE ", $4a, "@"
+LogOffPCText: db "DECONNEXION@"
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
@@ -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
@@ -339,15 +339,15 @@ DisplayMonListMenu:
ret
BillsPCMenuText:
- db "WITHDRAW ", $4a
- next "DEPOSIT ", $4a
- next "RELEASE ", $4a
- next "CHANGE BOX"
- next "SEE YA!"
+ db "RETIRER ", $4a
+ next "STOCKER ", $4a
+ next "RELACHER ", $4a
+ next "CHANGER BOITE"
+ next "SALUT!"
db "@"
BoxNoPCText:
- db "BOX No.@"
+ db "BOITE@"
KnowsHMMove::
; returns whether mon with party index [wWhichPokemon] knows an HM move
@@ -451,11 +451,11 @@ DisplayDepositWithdrawMenu:
call LoadGBPal
jr .loop
-DepositPCText: db "DEPOSIT@"
-WithdrawPCText: db "WITHDRAW@"
+DepositPCText: db "STOCKER@"
+WithdrawPCText: db "RETIRER@"
StatsCancelPCText:
db "STATS"
- next "CANCEL@"
+ next "RETOUR@"
SwitchOnText:
TX_FAR _SwitchOnText
diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm
index 09ba123e..107fe17d 100755
--- a/engine/menu/diploma.asm
+++ b/engine/menu/diploma.asm
@@ -91,23 +91,22 @@ DiplomaTextPointersAndCoords:
dw DiplomaCongrats
dwCoord 2, 6
dw DiplomaGameFreak
- dwCoord 9, 16
+ dwCoord 9, 15
DiplomaText:
- db $70,"Diploma",$70,"@"
+ db $70,"Diplôme",$70,"@"
DiplomaPlayer:
- db "Player@"
+ db "Joueur@"
DiplomaEmptyText:
db "@"
DiplomaCongrats:
- db "Congrats! This"
- next "diploma certifies"
- next "that you have"
- next "completed your"
- next "#DEX.@"
+ db "Fabuleux! Ce"
+ next "diplôme certifie"
+ next "la perfection de"
+ next "votre PokéDex@"
DiplomaGameFreak:
db "GAME FREAK@"
diff --git a/engine/menu/draw_start_menu.asm b/engine/menu/draw_start_menu.asm
index 83a81aac..914284c4 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@"
+ db "OBJET@"
StartMenuSaveText:
- db "SAVE@"
+ db "SAUVER@"
StartMenuResetText:
- db "RESET@"
+ db "QUITTER@"
StartMenuExitText:
- db "EXIT@"
+ db "RETOUR@"
StartMenuOptionText:
db "OPTION@"
diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm
index 170c0ef3..eb561caf 100755
--- a/engine/menu/league_pc.asm
+++ b/engine/menu/league_pc.asm
@@ -106,14 +106,14 @@ LeaguePCShowMon:
coord hl, 1, 15
ld de, HallOfFameNoText
call PlaceString
- coord hl, 16, 15
+ coord hl, 15, 15
ld de, wHoFTeamNo
lb bc, 1, 3
call PrintNumber
jpba HoFDisplayMonInfo
HallOfFameNoText:
- db "HALL OF FAME No @"
+ db " CELEBRITE No. @"
AccessedHoFPCText:
TX_FAR _AccessedHoFPCText
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index cd4198b6..75a00486 100755
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -329,16 +329,16 @@ SpecialEnterMap:
jp EnterMap
ContinueText:
- db "CONTINUE", $4e
+ db "CONTINUER", $4e
NewGameText:
- db "NEW GAME"
- next "OPTION@"
+ db "NOUVEAU JEU"
+ next "OPTIONS@"
CableClubOptionsText:
- db "TRADE CENTER"
- next "COLOSSEUM"
- next "CANCEL@"
+ db "CENTRE TROC"
+ next "COLISEE"
+ next "RETOUR@"
DisplayContinueGameInfo:
xor a
@@ -421,10 +421,10 @@ PrintPlayTime:
jp PrintNumber
SaveScreenInfoText:
- db "PLAYER"
- next "BADGES "
- next "#DEX "
- next "TIME@"
+ db "JOUEUR"
+ next "BADGES "
+ next "#DEX "
+ next "TEMPS@"
DisplayOptionMenu:
coord hl, 0, 0
@@ -579,19 +579,19 @@ DisplayOptionMenu:
jp .eraseOldMenuCursor
TextSpeedOptionText:
- db "TEXT SPEED"
- next " FAST MEDIUM SLOW@"
+ db "VIT. TEXTE"
+ next " 3 2 1 @"
BattleAnimationOptionText:
- db "BATTLE ANIMATION"
- next " ON OFF@"
+ db "ANIMATION COMBAT"
+ next " OUI NON@"
BattleStyleOptionText:
- db "BATTLE STYLE"
- next " SHIFT SET@"
+ db "STYLE COMBAT"
+ next " CHOIX DEFINI@"
OptionMenuCancelText:
- db "CANCEL@"
+ db "RETOUR@"
; 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..58bfc0d7 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -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,"-?!♂♀/⠄,¥MAJUSCULES@"
UpperCaseAlphabet:
- db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥lower case@"
+ db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥minuscules@"
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]
@@ -472,10 +475,10 @@ PrintNamingText:
ld a, [wNamingScreenType]
ld de, YourTextString
and a
- jr z, .notNickname
+ jr z, .placeString
ld de, RivalsTextString
dec a
- jr z, .notNickname
+ jr z, .placeString
ld a, [wcf91]
ld [wMonPartySpriteSpecies], a
push af
@@ -485,28 +488,21 @@ 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
+ ld hl, $C3DD
+ ld de, $69F2
jr .placeString
-.notNickname
- call PlaceString
- ld l, c
- ld h, b
- ld de, NameTextString
+
.placeString
jp PlaceString
YourTextString:
- db "YOUR @"
+ db "VOTRE NOM?@"
RivalsTextString:
- db "RIVAL's @"
+ db "NOM DU RIVAL?@"
NameTextString:
- db "NAME?@"
+ db "NOM?@"
NicknameTextString:
- db "NICKNAME?@"
+ db "SURNOM?@"
diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm
index a35524ed..e799feec 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 "APTE@"
.notAbleToLearnMoveText
- db "NOT ABLE@"
+ db "PAS APTE@"
.evolutionStoneMenu
push hl
ld hl,EvosMovesPointerTable
@@ -184,9 +184,9 @@ RedrawPartyMenu_:
pop hl
jr .printLevel
.ableToEvolveText
- db "ABLE@"
+ db "APTE@"
.notAbleToEvolveText
- db "NOT ABLE@"
+ db "PAS APTE@"
.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..a9f067ff 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,6 +15,8 @@ PlayerPC:
call PrintText
PlayerPCMenu:
+ ld hl, wd730
+ set 6, [hl]
ld a, [wParentMenuItem]
ld [wCurrentMenuItem], a
ld hl, wFlags_0xcd60
@@ -241,10 +241,10 @@ PlayerPCToss:
jp .loop
PlayersPCMenuEntries:
- db "WITHDRAW ITEM"
- next "DEPOSIT ITEM"
- next "TOSS ITEM"
- next "LOG OFF@"
+ db "RETIRER OBJET"
+ next "STOCKER OBJET"
+ next "JETER OBJET"
+ next "DECONNEXION@"
TurnedOnPC2Text:
TX_FAR _TurnedOnPC2Text
diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm
index bf8afaa9..2b66cda1 100755
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -360,19 +360,19 @@ DrawPokedexVerticalLine:
ret
PokedexSeenText:
- db "SEEN@"
+ db "VUS@"
PokedexOwnText:
- db "OWN@"
+ db "PRIS@"
PokedexContentsText:
- db "CONTENTS@"
+ db "SOMMAIRE@"
PokedexMenuItemsText:
- db "DATA"
- next "CRY"
- next "AREA"
- next "QUIT@"
+ db "INFO"
+ next "CRI"
+ next "ZONE"
+ next "RET@"
; 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 "TAI ???",$60
+ next "PDS ???",$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..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
@@ -166,7 +166,7 @@ PrintPrizePrice:
ret
.CoinString:
- db "COIN@"
+ db "JETONS@"
.SixSpacesString:
db " @"
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm
index 8c10266b..0acff19e 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,14
+ ld a,13
ld [hli],a ; top menu item X
xor a
ld [hli],a ; current menu item ID
@@ -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
@@ -598,8 +598,9 @@ DrawTrainerInfo:
call PlaceString
coord hl, 8, 4
ld de,wPlayerMoney
- ld c,$e3
+ ld c,$c3
call PrintBCDNumber
+ ld [hl],$f0
coord hl, 9, 6
ld de,wPlayTimeHours ; hours
lb bc, LEFT_ALIGN | 1, 3
@@ -615,9 +616,9 @@ TrainerInfo_FarCopyData:
jp FarCopyData2
TrainerInfo_NameMoneyTimeText:
- db "NAME/"
- next "MONEY/"
- next "TIME/@"
+ db "NOM/"
+ next "ARG./"
+ next "TEMPS/@"
; $76 is a circle tile
TrainerInfo_BadgesText:
diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm
index ef94f13c..d688a195 100755
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -211,14 +211,14 @@ Type2Text:
db "TYPE2/", $4e
IDNoText:
- db $73, "№/", $4e
+ db "№",$73,"/", $4e
OTText:
- db "OT/"
+ db "DO/"
next "@"
StatusText:
- db "STATUS/@"
+ db "STATUT/@"
OKText:
db "OK@"
@@ -289,10 +289,10 @@ PrintStat:
ret
StatsText:
- db "ATTACK"
- next "DEFENSE"
- next "SPEED"
- next "SPECIAL@"
+ db "FOR"
+ next "DEF"
+ next "VIT"
+ next "SPE@"
StatusScreen2:
ld a, [hTilesetType]
@@ -328,7 +328,7 @@ StatusScreen2:
ld b, a ; Number of moves ?
coord hl, 11, 10
ld de, SCREEN_WIDTH * 2
- ld a, $72 ; special P tile id
+ ld a, $8F ; special P tile id
call StatusScreen_PrintPP ; Print "PP"
ld a, b
and a
@@ -463,8 +463,8 @@ CalcExpToLevelUp:
ret
StatusScreenExpText:
- db "EXP POINTS"
- next "LEVEL UP@"
+ db "PTS EXP."
+ next "PROCH.NIV.@"
StatusScreen_ClearName:
ld bc, 10
@@ -479,3 +479,13 @@ StatusScreen_PrintPP:
dec c
jr nz, StatusScreen_PrintPP
ret
+
+func_6cd5: ; 12cd5 (4:6cd5)
+ ld a, $80
+ ld [hli],a
+ ld a, $8F
+ ldd [hl], a
+ add hl, de
+ dec c
+ jr nz, func_6cd5
+ ret \ No newline at end of file
diff --git a/engine/menu/text_box.asm b/engine/menu/text_box.asm
index 90c35d25..18e8860e 100644
--- a/engine/menu/text_box.asm
+++ b/engine/menu/text_box.asm
@@ -162,28 +162,28 @@ 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
- db 13,10,19,14 ; text box coordinates
+ db 12,10,19,14 ; text box coordinates
dw UseTossText
- db 15,11 ; text coordinates
+ db 14,11 ; text coordinates
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 "@ACHETER"
+ next "VENDRE"
+ next "SALUT!@"
UseTossText:
- db "USE"
- next "TOSS@"
-
-JapaneseSaveMessageText:
- db "きろく"
- next "メッセージ@"
-
-JapaneseSpeedOptionsText:
- db "はやい"
- next "おそい@"
+ db "UTIL."
+ next "JETER@"
MoneyText:
- db "MONEY@"
-
-JapaneseMochimonoText:
- db "もちもの@"
-
-JapaneseMainMenuText:
- db "つづきから"
- next "さいしょから@"
+ db "ARG.@"
BattleMenuText:
- db "FIGHT ",$E1,$E2
- next "ITEM RUN@"
+ db "ATTAQ ",$E1,$E2
+ next "OBJET FUITE@"
SafariZoneBattleMenuText:
- db "BALL× BAIT"
- next "THROW ROCK RUN@"
+ db "BALL× APPAT"
+ next "CAILLOU FUITE@"
SwitchStatsCancelText:
- db "SWITCH"
+ db "ORDRE"
next "STATS"
- next "CANCEL@"
-
-JapaneseAhText:
- db "アッ!@"
-
-JapanesePokedexMenu:
- db "データをみる"
- next "なきごえ"
- next "ぶんぷをみる"
- next "キャンセル@"
+ next "RETOUR@"
DisplayMoneyBox:
ld hl, wd730
@@ -277,8 +253,11 @@ DisplayMoneyBox:
ld c, 6
call ClearScreenArea
coord hl, 12, 1
+ ld de, CurrencyString
+ call PlaceString
+ coord hl, 12, 1
ld de, wPlayerMoney
- ld c, $a3
+ ld c, "D"
call PrintBCDNumber
ld hl, wd730
res 6, [hl]
@@ -532,19 +511,13 @@ TwoOptionMenuStrings:
dw .YesNoMenu
db 6,3,0
dw .NorthEastMenu
- db 7,3,0
+ db 8,3,0
dw .TradeCancelMenu
db 7,4,1
dw .HealCancelMenu
db 4,3,0
dw .NoYesMenu
-.NoYesMenu
- db "NO"
- next "YES@"
-.YesNoMenu
- db "YES"
- next "NO@"
.NorthWestMenu
db "NORTH"
next "WEST@"
@@ -554,12 +527,18 @@ TwoOptionMenuStrings:
.NorthEastMenu
db "NORTH"
next "EAST@"
+.NoYesMenu
+ db "NON"
+ next "OUI@"
+.YesNoMenu
+ db "OUI"
+ next "NON@"
.TradeCancelMenu
- db "TRADE"
- next "CANCEL@"
+ db "ECHANGE"
+ next "RETOUR@"
.HealCancelMenu
- db "HEAL"
- next "CANCEL@"
+ db "SOIN"
+ next "RETOUR@"
DisplayFieldMoveMonMenu:
xor a
@@ -682,20 +661,20 @@ DisplayFieldMoveMonMenu:
jp PlaceString
FieldMoveNames:
- db "CUT@"
- db "FLY@"
+ db "COUPE@"
+ db "VOL@"
db "@"
db "SURF@"
- db "STRENGTH@"
+ db "FORCE@"
db "FLASH@"
- db "DIG@"
+ db "TUNNEL@"
db "TELEPORT@"
- db "SOFTBOILED@"
+ db "E-COQUE@"
PokemonMenuEntries:
db "STATS"
- next "SWITCH"
- next "CANCEL@"
+ next "ORDRE"
+ next "RETOUR@"
GetMonFieldMoves:
ld a, [wWhichPokemon]
@@ -759,9 +738,9 @@ FieldMoveDisplayData:
db FLY, $02, $0C
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 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..dc6267c4 100755
--- a/engine/menu/vending_machine.asm
+++ b/engine/menu/vending_machine.asm
@@ -85,15 +85,15 @@ VendingMachineText1:
db "@"
DrinkText:
- db "FRESH WATER"
- next "SODA POP"
- next "LEMONADE"
- next "CANCEL@"
+ db "EAU FRAICHE"
+ next "SODA COOL"
+ next "LIMONADE"
+ next "RETOUR@"
DrinkPriceText:
- db "¥200"
- next "¥300"
- next "¥350"
+ db "200¥"
+ next "300¥"
+ next "350¥"
next "@"
VendingMachineText4:
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 02:36:49 +0000