Almost done

23 files changed, 183 insertions, 183 deletions

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 6d758dd1..a80da1af 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2967,7 +2967,7 @@ PrintMenuItem:
 	call PlaceString
 	coord hl, 7, 11
 	ld [hl], "/"
-	coord hl, 5, 9
+	coord hl, 4, 9
 	ld [hl], "/"
 	coord hl, 5, 11
 	ld de, wcd6d
@@ -6907,19 +6907,15 @@ InitWildBattle:
 	ld [hli], a   ; write front sprite pointer
 	ld [hl], b
 	ld hl, wEnemyMonNick  ; set name to "GHOST"
-	ld a, "S"
-	ld [hli], a
-	ld a, "P"
+	ld a, "G"
 	ld [hli], a
 	ld a, "E"
 	ld [hli], a
-	ld a, "C"
-	ld [hli], a
-	ld a, "T"
+	ld a, "I"
 	ld [hli], a
-	ld a, "R"
+	ld a, "S"
 	ld [hli], a
-	ld a, "E"
+	ld a, "T"
 	ld [hli], a
 	ld [hl], "@"
 	ld a, [wcf91]
@@ -7963,12 +7959,12 @@ PrintStatText:
 	jp CopyData
 
 StatsTextStrings:
-	db "FOR@"
-	db "DEF@"
-	db "VIT@"
-	db "SPE@"
-	db "PRE@"
-	db "ESQ@"
+	db "ANGR@"
+	db "VERT@"
+	db "INIT@"
+	db "SPEZ@"
+	db "GENA@"
+	db "FLU@"
 
 StatModifierRatios:
 ; first byte is numerator, second byte is denominator
diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm
index 92a1bcda..f3720944 100755
--- a/engine/battle/end_of_battle.asm
+++ b/engine/battle/end_of_battle.asm
@@ -12,14 +12,16 @@ EndOfBattle:
 	call ClearScreen
 	callab DisplayLinkBattleVersusTextBox
 	ld a, [wBattleResult]
-	cp $1
+	cp 1
 	ld de, YouWinText
 	jr c, .placeWinOrLoseString
 	ld de, YouLoseText
 	jr z, .placeWinOrLoseString
 	ld de, DrawText
-.placeWinOrLoseString
 	coord hl, 6, 8
+	jr .placeWinOrLoseString
+	coord hl, 6, 8
+.placeWinOrLoseString
 	call PlaceString
 	ld c, 200
 	call DelayFrames
@@ -75,13 +77,13 @@ EndOfBattle:
 	ret
 
 YouWinText:
-	db "  GAGNE@"
+	db "GEWONNEN@"
 
 YouLoseText:
-	db "  PERDU@"
+	db "VERLOREN@"
 
 DrawText:
-	db "MATCH NUL@"
+	db "UNENTSCHIEDEN@"
 
 PickUpPayDayMoneyText:
 	TX_FAR _PickUpPayDayMoneyText
diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm
index d58b6c22..9e5f89cb 100644
--- a/engine/battle/link_battle_versus_text.asm
+++ b/engine/battle/link_battle_versus_text.asm
@@ -12,7 +12,7 @@ DisplayLinkBattleVersusTextBox:
 	ld de, wLinkEnemyTrainerName
 	call PlaceString
 ; place bold "VS" tiles between the names
-	coord hl, 7, 8
+	coord hl, 9, 8
 	ld a, "V"
 	ldi [hl], a
 	ld [hl], "S"
diff --git a/engine/battle/save_trainer_name.asm b/engine/battle/save_trainer_name.asm
index 45b35a76..50f8f052 100644
--- a/engine/battle/save_trainer_name.asm
+++ b/engine/battle/save_trainer_name.asm
@@ -69,44 +69,44 @@ TrainerNamePointers:
 	dw wTrainerName
 
 YoungsterName:
-	db "GAMIN@"
+	db "TEENAGER@"
 BugCatcherName:
-	db "SCOUT@"
+	db "KÄFERSAMMLER@"
 LassName:
-	db "FILLETTE@"
+	db "GÖRE@"
 JrTrainerMName:
-	db "DRESSEUR JR♂@"
+	db "PFADFINDER@"
 JrTrainerFName:
-	db "DRESSEUR JR♀@"
+	db "PFADFINDERIN@"
 PokemaniacName:
 	db "#MANIAC@"
 SuperNerdName:
-	db "INTELLO@"
+	db "STREBER@"
 BurglarName:
-	db "PILLARD@"
+	db "DIEB@"
 EngineerName:
-	db "MECANO@"
+	db "MECHANIKER@"
 JugglerXName:
 	db "JONGLEUR@"
 SwimmerName:
-	db "NAGEUR@"
+	db "SCHWIMMER@"
 BeautyName:
-	db "CANON@"
+	db "SCHÖNHEIT@"
 RockerName:
 	db "ROCKER@"
 JugglerName:
 	db "JONGLEUR@"
 BlackbeltName:
-	db "KARATEKA@"
+	db "SCHWARZGURT@"
 ProfOakName:
-	db "PROF.CHEN@"
+	db "PROF.EICH@"
 ChiefName:
 	db "CHIEF@"
 ScientistName:
-	db "SCIENTIFIQUE@"
+	db "FORSCHER@"
 RocketName:
 	db "ROCKET@"
 CooltrainerMName:
-	db "TOPDRESSEUR♂@"
+	db "TRAINER@"
 CooltrainerFName:
-	db "TOPDRESSEUR♀@"
+	db "TRAINERIN@"
diff --git a/engine/cable_club.asm b/engine/cable_club.asm
index 47b260f0..a42916cb 100755
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -290,7 +290,7 @@ CableClub_DoBattleOrTradeAgain:
 	jr CallCurrentTradeCenterFunction
 
 PleaseWaitString:
-	db "ATTENDEZ SVP@"
+	db "BITTE WARTEN!@"
 
 CallCurrentTradeCenterFunction:
 	ld hl, TradeCenterPointerTable
@@ -533,7 +533,7 @@ TradeCenter_SelectMon:
 	ld [wTradeCenterPointerTableIndex], a
 	jp CallCurrentTradeCenterFunction
 .statsTrade
-	db "STATS     ECHANGE@"
+	db "STATUS    TAUSCH@"
 .selectedCancelMenuItem
 	ld a, [wCurrentMenuItem]
 	ld b, a
@@ -609,7 +609,7 @@ TradeCenter_DrawCancelBox:
 	jp PlaceString
 
 CancelTextString:
-	db "ANNULER@"
+	db "ABBRECHEN@"
 
 TradeCenter_PlaceSelectedEnemyMonMenuCursor:
 	ld a, [wSerialSyncAndExchangeNybbleReceiveData]
@@ -876,11 +876,11 @@ WillBeTradedText:
 	db "@"
 
 TradeCompleted:
-	db "ECHANGE TERMINE!@"
+	db "TAUSCH VOLLZOGEN!@"
 
 TradeCanceled:
-	db   "Dommage! L'échange"
-	next "est annulé!@"
+	db "Schade! Der tausch"
+	next "wurde abgebrochen!@"
 
 TradeCenterPointerTable:
 	dw TradeCenter_SelectMon
diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm
index dbbb5513..f7c45222 100755
--- a/engine/hidden_object_functions17.asm
+++ b/engine/hidden_object_functions17.asm
@@ -111,7 +111,7 @@ LinkCableHelp:
 	set 6, [hl]
 	coord hl, 0, 0
 	ld b, 8
-	ld c, 13
+	ld c, 14
 	call TextBoxBorder
 	coord hl, 2, 2
 	ld de, HowToLinkText
@@ -151,10 +151,10 @@ LinkCableHelpText2:
 	db "@"
 
 HowToLinkText:
-	db   "CABLE LINK"
-	next "COLISEE"
-	next "CENTRE TROC"
-	next "NE PLUS LIRE@"
+	db   "LINK-INFO"
+	next "KOLOSSEUM"
+	next "HANDELSCENTER"
+	next "VERLASSEN@"
 
 LinkCableInfoTexts:
 	dw LinkCableInfoText1
@@ -268,14 +268,14 @@ ViridianSchoolBlackboardText2:
 	db "@"
 
 StatusAilmentText1:
-	db   " SOM"
-	next " PSN"
+	db   " SLF"
+	next " GIF"
 	next " PAR@"
 
 StatusAilmentText2:
-	db   " BRU"
-	next " GEL"
-	next " RET@"
+	db   " BRT"
+	next " GFR"
+	next " ZUR.@"
 
 ViridianBlackboardStatusPointers:
 	dw ViridianBlackboardSleepText
diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm
index 2f9a6aa5..39d72e2e 100755
--- a/engine/hidden_object_functions7.asm
+++ b/engine/hidden_object_functions7.asm
@@ -445,11 +445,11 @@ BillsHousePokemonListText1:
 	db "@"
 
 BillsMonListText:
-	db   "EVOLI"
-	next "PYROLI"
-	next "VOLTALI"
-	next "AQUALI"
-	next "RETOUR@"
+	db "EVOLI"
+	next "FLAMARA"
+	next "BLITZA"
+	next "AQUANA"
+	next "ZURÜCK@"
 
 BillsHousePokemonListText2:
 	TX_FAR _BillsHousePokemonListText2
diff --git a/engine/items/items.asm b/engine/items/items.asm
index 159f3a45..96636392 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -825,8 +825,8 @@ ItemUseMedicine:
 	ld [wActionResultOrTookBattleTurn],a ; item use failed
 	jp PrintText
 .emptyPartyText
-	text "Vous n'avez pas"
-	line "de #MON!"
+	text "Du besitzt noch"
+	line "keine #MON!"
 	prompt
 .notUsingSoftboiled
 	call DisplayPartyMenu
@@ -1425,11 +1425,11 @@ VitaminNoEffectText:
 	db "@"
 
 VitaminText:
-	db "VIE@"
-	db "FOR@"
-	db "DEF@"
-	db "VIT@"
-	db "SPE@"
+	db "GESU@"
+	db "ANGR@"
+	db "VERT@"
+	db "INIT@"
+	db "SPEZ@"
 
 ItemUseBait:
 	ld hl,ThrewBaitText
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
index 1bae3b51..5884d4b8 100644
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -85,12 +85,12 @@ DisplayPCMainMenu::
 	ld [H_AUTOBGTRANSFERENABLED], a
 	ret
 
-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@"
+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
@@ -339,15 +339,15 @@ DisplayMonListMenu:
 	ret
 
 BillsPCMenuText:
-	db   "RETIRER ", $4a
-	next "STOCKER ",  $4a
-	next "RELACHER ",  $4a
-	next "CHANGER BOITE"
-	next "SALUT!"
+	db   "<pkmn> MITNEHMEN"
+	next "<pkmn> ABLEGEN"
+	next "<pkmn> FREILASSEN"
+	next "BOX WECHSELN"
+	next "TSCHÜSS!"
 	db "@"
 
 BoxNoPCText:
-	db "BOITE@"
+	db "BOX Nr.@"
 
 KnowsHMMove::
 ; returns whether mon with party index [wWhichPokemon] knows an HM move
@@ -451,11 +451,11 @@ DisplayDepositWithdrawMenu:
 	call LoadGBPal
 	jr .loop
 
-DepositPCText:  db "STOCKER@"
-WithdrawPCText: db "RETIRER@"
+DepositPCText:  db "ABLEGEN@"
+WithdrawPCText: db "MITNEHMEN@"
 StatsCancelPCText:
-	db   "STATS"
-	next "RETOUR@"
+	db   "STATUS"
+	next "ZURÜCK@"
 
 SwitchOnText:
 	TX_FAR _SwitchOnText
diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm
index a1f73f7c..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
diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm
index b2209130..8ca8e1e3 100755
--- a/engine/menu/league_pc.asm
+++ b/engine/menu/league_pc.asm
@@ -106,7 +106,7 @@ LeaguePCShowMon:
 	coord hl, 1, 15
 	ld de, HallOfFameNoText
 	call PlaceString
-	coord hl, 15, 15
+	coord hl, 16, 15
 	ld de, wHoFTeamNo
 	lb bc, 1, 3
 	call PrintNumber
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index 75a00486..ab32d5fd 100755
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -329,16 +329,16 @@ SpecialEnterMap:
 	jp EnterMap
 
 ContinueText:
-	db "CONTINUER", $4e
+	db "WEITER", $4e
 
 NewGameText:
-	db   "NOUVEAU JEU"
-	next "OPTIONS@"
+	db   "NEUES SPIEL"
+	next "OPTIONEN@"
 
 CableClubOptionsText:
-	db   "CENTRE TROC"
-	next "COLISEE"
-	next "RETOUR@"
+	db   "HANDELSCENTER"
+	next "KOLOSSEUM"
+	next "ZURÜCK@"
 
 DisplayContinueGameInfo:
 	xor a
@@ -421,10 +421,10 @@ PrintPlayTime:
 	jp PrintNumber
 
 SaveScreenInfoText:
-	db   "JOUEUR"
-	next "BADGES        "
-	next "#DEX       "
-	next "TEMPS@"
+	db   "SPIELER"
+	next "ORDEN          "
+	next "#DEX        "
+	next "ZEIT@"
 
 DisplayOptionMenu:
 	coord hl, 0, 0
@@ -579,19 +579,19 @@ DisplayOptionMenu:
 	jp .eraseOldMenuCursor
 
 TextSpeedOptionText:
-	db   "VIT. TEXTE"
+	db   "TEXT-TEMPO"
 	next " 3     2      1   @"
 
 BattleAnimationOptionText:
-	db   "ANIMATION COMBAT"
-	next " OUI      NON@"
+	db   "KAMPFANIMATION"
+	next " AN       AUS@"
 
 BattleStyleOptionText:
-	db   "STYLE COMBAT"
-	next " CHOIX    DEFINI@"
+	db   "KAMPFSTIL"
+	next " WECHSEL  FOLGEND@"
 
 OptionMenuCancelText:
-	db "RETOUR@"
+	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 7835be97..e79a6668 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -369,10 +369,10 @@ PrintAlphabet:
 	jp Delay3
 
 LowerCaseAlphabet:
-	db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥MAJUSCULES@"
+	db "abcdefghijklmnopqrstuvwxyz äöü:×()",$e1,$e2,"-?!♂♀/⠄,¥GROSSBUCHSTABEN@"
 
 UpperCaseAlphabet:
-	db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥minuscules@"
+	db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ÄÖÜ:;[]",$e1,$e2,"-?!♂♀/⠄,¥kleinbuchstaben@"
 
 PrintNicknameAndUnderscores:
 	call CalcStringLength
@@ -475,10 +475,10 @@ PrintNamingText:
 	ld a, [wNamingScreenType]
 	ld de, YourTextString
 	and a
-	jr z, .placeString
+	jr z, .notNickname
 	ld de, RivalsTextString
 	dec a
-	jr z, .placeString
+	jr z, .notNickname
 	ld a, [wcf91]
 	ld [wMonPartySpriteSpecies], a
 	push af
@@ -488,21 +488,25 @@ PrintNamingText:
 	call GetMonName
 	coord hl, 4, 1
 	call PlaceString
-	ld hl, $C3DD
-	ld de, $69F2
+	coord hl, 1, 3
+	ld de, NicknameTextString
 	jr .placeString
-
+.notNickname
+	call PlaceString
+	ld l, c
+	ld h, b
+	ld de, NameTextString
 .placeString
 	jp PlaceString
 
 YourTextString:
-	db "VOTRE NOM?@"
+	db "DEIN @"
 
 RivalsTextString:
-	db "NOM DU RIVAL?@"
+	db "GEGNER-@"
 
 NameTextString:
-	db "NOM?@"
+	db "NAME?@"
 
 NicknameTextString:
-	db "SURNOM?@"
+	db "ALIAS?@"
diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm
index e799feec..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 "APTE@"
+	db "OK@"
 .notAbleToLearnMoveText
-	db "PAS APTE@"
+	db "NEIN@"
 .evolutionStoneMenu
 	push hl
 	ld hl,EvosMovesPointerTable
@@ -184,9 +184,9 @@ RedrawPartyMenu_:
 	pop hl
 	jr .printLevel
 .ableToEvolveText
-	db "APTE@"
+	db "OK@"
 .notAbleToEvolveText
-	db "PAS APTE@"
+	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 a9f067ff..b2a5d496 100755
--- a/engine/menu/players_pc.asm
+++ b/engine/menu/players_pc.asm
@@ -241,10 +241,10 @@ PlayerPCToss:
 	jp .loop
 
 PlayersPCMenuEntries:
-	db   "RETIRER OBJET"
-	next "STOCKER OBJET"
-	next "JETER OBJET"
-	next "DECONNEXION@"
+	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 e3f9f1dd..9e13b869 100755
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -360,19 +360,19 @@ DrawPokedexVerticalLine:
 	ret
 
 PokedexSeenText:
-	db "VUS@"
+	db "GES@"
 
 PokedexOwnText:
-	db "PRIS@"
+	db "BES@"
 
 PokedexContentsText:
-	db "SOMMAIRE@"
+	db "INHALT@"
 
 PokedexMenuItemsText:
-	db   "INFO"
-	next "CRI"
-	next "ZONE"
-	next "RET@"
+	db   "DATA"
+	next "RUF"
+	next "GEB."
+	next "ZUR.@"
 
 ; tests if a pokemon's bit is set in the seen or owned pokemon bit fields
 ; INPUT:
@@ -591,8 +591,8 @@ ShowPokedexDataInternal:
 	ret
 
 HeightWeightText:
-	db   "TAI  ???",$60
-	next "PDS  ???",$61,$62,"@"
+	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 e2535261..5cfdbc87 100755
--- a/engine/menu/prize_menu.asm
+++ b/engine/menu/prize_menu.asm
@@ -166,7 +166,7 @@ PrintPrizePrice:
 	ret
 
 .CoinString:
-	db "JETONS@"
+	db "MÜNZEN@"
 
 .SixSpacesString:
 	db "      @"
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm
index 7384797a..fdef19dc 100755
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -600,7 +600,6 @@ DrawTrainerInfo:
 	ld de,wPlayerMoney
 	ld c,$c3
 	call PrintBCDNumber
-	ld [hl],$f0
 	coord hl, 9, 6
 	ld de,wPlayTimeHours ; hours
 	lb bc, LEFT_ALIGN | 1, 3
@@ -616,13 +615,13 @@ TrainerInfo_FarCopyData:
 	jp FarCopyData2
 
 TrainerInfo_NameMoneyTimeText:
-	db   "NOM/"
-	next "ARG./"
-	next "TEMPS/@"
+	db   "NAME/"
+	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 d688a195..bc87f7fe 100755
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -205,20 +205,20 @@ 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   "DO/"
+	db   "OT/"
 	next "@"
 
 StatusText:
-	db "STATUT/@"
+	db "STATUS/@"
 
 OKText:
 	db "OK@"
@@ -289,10 +289,10 @@ PrintStat:
 	ret
 
 StatsText:
-	db   "FOR"
-	next "DEF"
-	next "VIT"
-	next "SPE@"
+	db   "ANGR"
+	next "VERT"
+	next "INIT"
+	next "SPEZ@"
 
 StatusScreen2:
 	ld a, [hTilesetType]
@@ -463,8 +463,8 @@ CalcExpToLevelUp:
 	ret
 
 StatusScreenExpText:
-	db   "PTS EXP."
-	next "PROCH.NIV.@"
+	db   "EP-PUNKTE"
+	next "LEVEL UP@"
 
 StatusScreen_ClearName:
 	ld bc, 10
diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm
index 462d26b5..ffb06477 100755
--- a/engine/oak_speech2.asm
+++ b/engine/oak_speech2.asm
@@ -185,37 +185,37 @@ DisplayIntroNameTextBox:
 	jp HandleMenuInput
 
 .namestring
-	db "─NOM@"
+	db "NAME@"
 
 IF DEF(_RED)
 DefaultNamesPlayer:
-	db   "NOM:"
-	next "RED"
-	next "SACHA"
-	next "PAUL"
+	db   "NAME"
+	next "ROT"
+	next "ASH"
+	next "JACK"
 	db   "@"
 
 DefaultNamesRival:
-	db   "NOM:"
-	next "BLUE"
-	next "REGIS"
-	next "JEAN"
+	db   "NAME"
+	next "BLAU"
+	next "GARY"
+	next "JOHN"
 	db   "@"
 ENDC
 
 IF DEF(_BLUE)
 DefaultNamesPlayer:
-	db   "NOM:"
-	next "BLUE"
-	next "REGIS"
-	next "JEAN"
+	db   "NAME"
+	next "BLAU"
+	next "GARY"
+	next "JOHN"
 	db   "@"
 
 DefaultNamesRival:
-	db   "NOM:"
-	next "RED"
-	next "SACHA"
-	next "PAUL"
+	db   "NAME"
+	next "ROT"
+	next "ASH"
+	next "JACK"
 	db   "@"
 ENDC
 
@@ -245,27 +245,27 @@ GetDefaultName:
 
 IF DEF(_RED)
 DefaultNamesPlayerList:
-	db "NOM:@"
-	db "RED@"
-	db "SACHA@"
-	db "PAUL@"
+	db "NAME@"
+	db "ROT@"
+	db "ASH@"
+	db "JACK@"
 DefaultNamesRivalList:
-	db "NOM:@"
-	db "BLUE@"
-	db "REGIS@"
-	db "JEAN@"
+	db "NAME@"
+	db "BLAU@"
+	db "GARY@"
+	db "JOHN@"
 ENDC
 IF DEF(_BLUE)
 DefaultNamesPlayerList:
-	db "NOM:@"
-	db "BLUE@"
-	db "REGIS@"
-	db "JEAN@"
+	db "NAME@"
+	db "BLAU@"
+	db "GARY@"
+	db "JOHN@"
 DefaultNamesRivalList:
-	db "NOM:@"
-	db "RED@"
-	db "SACHA@"
-	db "PAUL@"
+	db "NAME@"
+	db "ROT@"
+	db "ASH@"
+	db "JACK@"
 ENDC
 
 TextTerminator_6b20:
diff --git a/engine/save.asm b/engine/save.asm
index 78527c65..d6ea8c7d 100755
--- a/engine/save.asm
+++ b/engine/save.asm
@@ -441,14 +441,14 @@ DisplayChangeBoxMenu:
 	call TextBoxBorder
 	ld hl, ChooseABoxText
 	call PrintText
-	coord hl, 9, 0
+	coord hl, 11, 0
 	ld b, 12
 	ld c, 7
 	call TextBoxBorder
 	ld hl, hFlags_0xFFF6
 	set 2, [hl]
 	ld de, BoxNames
-	coord hl, 11, 1
+	coord hl, 13, 1
 	call PlaceString
 	ld hl, hFlags_0xFFF6
 	res 2, [hl]
@@ -457,7 +457,7 @@ DisplayChangeBoxMenu:
 	cp 9
 	jr c, .singleDigitBoxNum
 	sub 9
-	coord hl, 6, 2
+	coord hl, 8, 2
 	ld [hl], "1"
 	add "0"
 	jr .next
diff --git a/engine/town_map.asm b/engine/town_map.asm
index 177664da..63825c0e 100755
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -118,9 +118,8 @@ LoadTownMap_Nest:
 	push hl
 	call DisplayWildLocations
 	call GetMonName
-	coord hl, 8, 0
+	coord hl, 1, 0
 	call PlaceString
-;	coord hl, 1, 0
 	ld h, b
 	ld l, c
 	ld de, MonsNestText
diff --git a/engine/trade2.asm b/engine/trade2.asm
index 7797ccdf..bd03715e 100755
--- a/engine/trade2.asm
+++ b/engine/trade2.asm
@@ -44,5 +44,5 @@ Trade_PrintEnemyMonInfoText:
 
 Trade_MonInfoText:
 	db "──№⠄",$4E
-	next "DO/"
-	next "№",$73,"⠄@"
+	next "OT/"
+	next "″№⠄@"