From f71b489ad8c194a392ca79b07261816b61cb55e2 Mon Sep 17 00:00:00 2001
From: Logan <log.butt@gmail.com>
Date: Mon, 30 May 2016 00:47:55 +1200
Subject: Initial decompilation of FR Red

---
 engine/battle/core.asm                    | 31 ++++++++++--------
 engine/battle/end_of_battle.asm           |  6 ++--
 engine/battle/link_battle_versus_text.asm | 14 +++++++--
 engine/battle/save_trainer_name.asm       | 36 ++++++++++-----------
 engine/cable_club.asm                     | 12 +++----
 engine/evolve_trade.asm                   | 17 +++++-----
 engine/hidden_object_functions7.asm       | 10 +++---
 engine/items/items.asm                    | 14 ++++-----
 engine/menu/bills_pc.asm                  | 30 +++++++++---------
 engine/menu/main_menu.asm                 | 36 ++++++++++-----------
 engine/menu/naming_screen.asm             | 52 ++++++++++++++-----------------
 engine/menu/players_pc.asm                | 14 ++++-----
 engine/menu/pokedex.asm                   | 49 ++++++++++++++++++-----------
 engine/menu/start_sub_menus.asm           | 11 ++++---
 engine/menu/status_screen.asm             | 22 +++++++++----
 engine/oak_speech2.asm                    | 36 ++++++++++-----------
 engine/overworld/movement.asm             | 17 ++++++++--
 engine/titlescreen.asm                    | 10 +++---
 18 files changed, 231 insertions(+), 186 deletions(-)

(limited to 'engine')

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index fce78717..9f553075 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2131,7 +2131,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3)
 	ld a, $2 ; select the "ITEM" menu
 	jp .upperLeftMenuItemWasNotSelected
 .oldManName
-	db "OLD MAN@"
+	db "VIEILLARD@"
 .handleBattleMenuInput
 	ld a, [wBattleAndStartSavedMenuItem]
 	ld [wCurrentMenuItem], a
@@ -2762,7 +2762,8 @@ MoveDisabledText: ; 3d3b3 (f:53b3)
 	db "@"
 
 WhichTechniqueString: ; 3d3b8 (f:53b8)
-	db "WHICH TECHNIQUE?@"
+	db "Quelle technique?"
+	next "                 @"
 
 CursorUp: ; 3d3c9 (f:53c9)
 	ld a, [wCurrentMenuItem]
@@ -2982,7 +2983,7 @@ PrintMenuItem: ; 3d4b6 (f:54b6)
 	jp Delay3
 
 DisabledText: ; 3d555 (f:5555)
-	db "disabled!@"
+	db "NON DISP.@"
 
 TypeText: ; 3d55f (f:555f)
 	db "TYPE@"
@@ -6904,16 +6905,20 @@ InitWildBattle: ; 3ef8b (f:6f8b)
 	ld [hli], a   ; write front sprite pointer
 	ld [hl], b
 	ld hl, wEnemyMonNick  ; set name to "GHOST"
-	ld a, "G"
+	ld a, "S"
 	ld [hli], a
-	ld a, "H"
+	ld a, "P"
 	ld [hli], a
-	ld a, "O"
+	ld a, "E"
 	ld [hli], a
-	ld a, "S"
+	ld a, "C"
 	ld [hli], a
 	ld a, "T"
 	ld [hli], a
+	ld a, "R"
+	ld [hli], a
+	ld a, "E"
+	ld [hli], a
 	ld [hl], "@"
 	ld a, [wcf91]
 	push af
@@ -7955,12 +7960,12 @@ PrintStatText: ; 3f688 (f:7688)
 	jp CopyData
 
 StatsTextStrings: ; 3f69f (f:769f)
-	db "ATTACK@"
-	db "DEFENSE@"
-	db "SPEED@"
-	db "SPECIAL@"
-	db "ACCURACY@"
-	db "EVADE@"
+	db "FOR@"
+	db "DEF@"
+	db "VIT@"
+	db "SPE@"
+	db "PRE@"
+	db "ESQ@"
 
 StatModifierRatios: ; 3f6cb (f:76cb)
 ; 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 34bc3119..4ea434b6 100755
--- a/engine/battle/end_of_battle.asm
+++ b/engine/battle/end_of_battle.asm
@@ -75,13 +75,13 @@ EndOfBattle: ; 137aa (4:77aa)
 	ret
 
 YouWinText: ; 13853 (4:7853)
-	db "YOU WIN@"
+	db "  GAGNE@"
 
 YouLoseText: ; 1385b (4:785b)
-	db "YOU LOSE@"
+	db "  PERDU@"
 
 DrawText: ; 13864 (4:7864)
-	db "  DRAW@"
+	db "MATCH NUL@"
 
 PickUpPayDayMoneyText: ; 1386b (4:786b)
 	TX_FAR _PickUpPayDayMoneyText
diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm
index dfb2fe35..558ec623 100644
--- a/engine/battle/link_battle_versus_text.asm
+++ b/engine/battle/link_battle_versus_text.asm
@@ -13,9 +13,17 @@ DisplayLinkBattleVersusTextBox: ; 372d6 (d:72d6)
 	call PlaceString
 ; place bold "VS" tiles between the names
 	coord hl, 9, 8
-	ld a, $69
-	ld [hli], a
-	ld [hl], $6a
+	ld a, "C"
+	ld [hl], a
+	ld a, "O"
+	ld [hl], a
+	ld a, "N"
+	ld [hl], a
+	ld a, "T"
+	ld [hl], a
+	ld a, "R"
+	ld [hl], a
+	ld [hl], "E"
 	xor a
 	ld [wUpdateSpritesEnabled], a
 	callab SetupPlayerAndEnemyPokeballs
diff --git a/engine/battle/save_trainer_name.asm b/engine/battle/save_trainer_name.asm
index ceba63bd..b5c999e2 100644
--- a/engine/battle/save_trainer_name.asm
+++ b/engine/battle/save_trainer_name.asm
@@ -69,44 +69,44 @@ TrainerNamePointers: ; 27e64 (9:7e64)
 	dw wTrainerName
 
 YoungsterName: ; 27ec2 (9:7ec2)
-	db "YOUNGSTER@"
+	db "GAMIN@"
 BugCatcherName: ; 27ecc (9:7ecc)
-	db "BUG CATCHER@"
+	db "SCOUT@"
 LassName: ; 27ed8 (9:7ed8)
-	db "LASS@"
+	db "FILLETTE@"
 JrTrainerMName: ; 27edd (9:7edd)
-	db "JR.TRAINER♂@"
+	db "DRESSEUR JR♂@"
 JrTrainerFName: ; 27ee9 (9:7ee9)
-	db "JR.TRAINER♀@"
+	db "DRESSEUR JR♀@"
 PokemaniacName: ; 27ef5 (9:7ef5)
-	db "POKéMANIAC@"
+	db "#MANIAC@"
 SuperNerdName: ; 27f00 (9:7f00)
-	db "SUPER NERD@"
+	db "INTELLO@"
 BurglarName: ; 27f0b (9:7f0b)
-	db "BURGLAR@"
+	db "PILLARD@"
 EngineerName: ; 27f13 (9:7f13)
-	db "ENGINEER@"
+	db "MECANO@"
 JugglerXName: ; 27f1c (9:7f1c)
-	db "JUGGLER@"
+	db "JONGLEUR@"
 SwimmerName: ; 27f24 (9:7f24)
-	db "SWIMMER@"
+	db "NAGEUR@"
 BeautyName: ; 27f2c (9:7f2c)
-	db "BEAUTY@"
+	db "CANON@"
 RockerName: ; 27f33 (9:7f33)
 	db "ROCKER@"
 JugglerName: ; 27f3a (9:7f3a)
-	db "JUGGLER@"
+	db "JONGLEUR@"
 BlackbeltName: ; 27f42 (9:7f42)
-	db "BLACKBELT@"
+	db "KARATEKA@"
 ProfOakName: ; 27f4c (9:7f4c)
-	db "PROF.OAK@"
+	db "PROF.CHEN@"
 ChiefName: ; 27f55 (9:7f55)
 	db "CHIEF@"
 ScientistName: ; 27f5b (9:7f5b)
-	db "SCIENTIST@"
+	db "SCIENTIFIQUE@"
 RocketName: ; 27f65 (9:7f65)
 	db "ROCKET@"
 CooltrainerMName: ; 27f6c (9:7f6c)
-	db "COOLTRAINER♂@"
+	db "TOPDRESSEUR♂@"
 CooltrainerFName: ; 27f79 (9:7f79)
-	db "COOLTRAINER♀@"
+	db "TOPDRESSEUR♀@"
diff --git a/engine/cable_club.asm b/engine/cable_club.asm
index f2f881d8..7521f7d1 100755
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -290,7 +290,7 @@ CableClub_DoBattleOrTradeAgain: ; 5345
 	jr CallCurrentTradeCenterFunction
 
 PleaseWaitString: ; 550f (1:550f)
-	db "PLEASE WAIT!@"
+	db "ATTENDEZ SVP@"
 
 CallCurrentTradeCenterFunction:
 	ld hl, TradeCenterPointerTable
@@ -533,7 +533,7 @@ TradeCenter_SelectMon:
 	ld [wTradeCenterPointerTableIndex], a
 	jp CallCurrentTradeCenterFunction
 .statsTrade
-	db "STATS     TRADE@"
+	db "STATS     ECHANGE@"
 .selectedCancelMenuItem
 	ld a, [wCurrentMenuItem]
 	ld b, a
@@ -609,7 +609,7 @@ TradeCenter_DrawCancelBox:
 	jp PlaceString
 
 CancelTextString:
-	db "CANCEL@"
+	db "ANNULER@"
 
 TradeCenter_PlaceSelectedEnemyMonMenuCursor:
 	ld a, [wSerialSyncAndExchangeNybbleReceiveData]
@@ -876,11 +876,11 @@ WillBeTradedText: ; 5a24 (1:5a24)
 	db "@"
 
 TradeCompleted:
-	db "Trade completed!@"
+	db "ECHANGE TERMINE!@"
 
 TradeCanceled:
-	db   "Too bad! The trade"
-	next "was canceled!@"
+	db   "Dommage! L'échange"
+	next "est annulé!@"
 
 TradeCenterPointerTable: ; 5a5b (1:5a5b)
 	dw TradeCenter_SelectMon
diff --git a/engine/evolve_trade.asm b/engine/evolve_trade.asm
index 81e41166..4924de1b 100755
--- a/engine/evolve_trade.asm
+++ b/engine/evolve_trade.asm
@@ -17,18 +17,19 @@ EvolveTradeMon: ; 17d7d (5:7d7d)
 
 ; This was fixed in Yellow.
 
-	ld a, [wInGameTradeReceiveMonName]
+	;ld a, [wInGameTradeReceiveMonName]
 
 	; GRAVELER
-	cp "G"
-	jr z, .ok
+	;cp "G"
+	;jr z, .ok
 
 	; "SPECTRE" (HAUNTER)
-	cp "S"
-	ret nz
-	ld a, [wInGameTradeReceiveMonName + 1]
-	cp "P"
-	ret nz
+	;cp "S"
+	;ret nz
+	;ld a, [wInGameTradeReceiveMonName + 1]
+	;cp "P"
+	;ret nz
+	ret
 
 .ok
 	ld a, [wPartyCount]
diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm
index 7ab0637b..24425685 100755
--- a/engine/hidden_object_functions7.asm
+++ b/engine/hidden_object_functions7.asm
@@ -445,11 +445,11 @@ BillsHousePokemonListText1: ; 1ec7f (7:6c7f)
 	db "@"
 
 BillsMonListText: ; 1ec84 (7:6c84)
-	db   "EEVEE"
-	next "FLAREON"
-	next "JOLTEON"
-	next "VAPOREON"
-	next "CANCEL@"
+	db   "EVOLI"
+	next "PYROLI"
+	next "VOLTALI"
+	next "AQUALI"
+	next "RETOUR@"
 
 BillsHousePokemonListText2: ; 1ecaa (7:6caa)
 	TX_FAR _BillsHousePokemonListText2
diff --git a/engine/items/items.asm b/engine/items/items.asm
index 1dd0a6f7..4d8ac893 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -823,8 +823,8 @@ ItemUseMedicine: ; dabb (3:5abb)
 	ld [wActionResultOrTookBattleTurn],a ; item use failed
 	jp PrintText
 .emptyPartyText
-	text "You don't have"
-	line "any #MON!"
+	text "Vous n'avez pas"
+	line "de #MON!"
 	prompt
 .notUsingSoftboiled
 	call DisplayPartyMenu
@@ -1423,11 +1423,11 @@ VitaminNoEffectText: ; df29 (3:5f29)
 	db "@"
 
 VitaminText: ; df2e (3:5f2e)
-	db "HEALTH@"
-	db "ATTACK@"
-	db "DEFENSE@"
-	db "SPEED@"
-	db "SPECIAL@"
+	db "VIE@"
+	db "FOR@"
+	db "DEF@"
+	db "VIT@"
+	db "SPE@"
 
 ItemUseBait: ; df52 (3:5f52)
 	ld hl,ThrewBaitText
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
index 0be2e6b0..09dc73fe 100644
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -85,12 +85,12 @@ DisplayPCMainMenu:: ; 213c8 (8:53c8)
 	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_:: ; 0x214c2
 	ld hl, wd730
@@ -339,15 +339,15 @@ DisplayMonListMenu: ; 216be (8:56be)
 	ret
 
 BillsPCMenuText: ; 216e1 (8:56e1)
-	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: ; 21713 (8:5713)
-	db "BOX No.@"
+	db "BOITE@"
 
 KnowsHMMove:: ; 2171b (8:571b)
 ; returns whether mon with party index [wWhichPokemon] knows an HM move
@@ -451,11 +451,11 @@ DisplayDepositWithdrawMenu: ; 2174b (8:574b)
 	call LoadGBPal
 	jr .loop
 
-DepositPCText:  db "DEPOSIT@"
-WithdrawPCText: db "WITHDRAW@"
+DepositPCText:  db "STOCKER@"
+WithdrawPCText: db "RETIRER@"
 StatsCancelPCText:
 	db   "STATS"
-	next "CANCEL@"
+	next "RETOUR@"
 
 SwitchOnText: ; 0x217e9
 	TX_FAR _SwitchOnText
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index 75458c5e..bdfec5d7 100755
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -329,16 +329,16 @@ SpecialEnterMap: ; 5d5f (1:5d5f)
 	jp EnterMap
 
 ContinueText: ; 5d7e (1:5d7e)
-	db "CONTINUE", $4e
+	db "CONTINUER", $4e
 
 NewGameText: ; 5d87 (1:5d87)
-	db "NEW GAME", $4e
-	db "OPTION@"
+	db "NOUVEAU JEU", $4e
+	db "OPTIONS@"
 
 CableClubOptionsText: ; 5d97 (1:5d97)
-	db "TRADE CENTER", $4e
-	db "COLOSSEUM",    $4e
-	db "CANCEL@"
+	db "CENTRE TROC", $4e
+	db "COLISEE",    $4e
+	db "RETOUR@"
 
 DisplayContinueGameInfo: ; 5db5 (1:5db5)
 	xor a
@@ -421,10 +421,10 @@ PrintPlayTime: ; 5e55 (1:5e55)
 	jp PrintNumber
 
 SaveScreenInfoText: ; 5e6a (1:5e6a)
-	db   "PLAYER"
-	next "BADGES    "
-	next "#DEX    "
-	next "TIME@"
+	db   "JOUEUR"
+	next "BADGES        "
+	next "#DEX       "
+	next "TEMPS@"
 
 DisplayOptionMenu: ; 5e8a (1:5e8a)
 	coord hl, 0, 0
@@ -578,20 +578,20 @@ DisplayOptionMenu: ; 5e8a (1:5e8a)
 	ld [wOptionsTextSpeedCursorX],a ; text speed cursor X coordinate
 	jp .eraseOldMenuCursor
 
-TextSpeedOptionText: ; 5fc0 (1:5fc0)
-	db   "TEXT SPEED"
-	next " FAST  MEDIUM SLOW@"
+TextSpeedOptionText: ; 6058 (1:6058)
+	db   "VIT. TEXTE"
+	next " 3     2      1   @"
 
 BattleAnimationOptionText: ; 5fde (1:5fde)
-	db   "BATTLE ANIMATION"
-	next " ON       OFF@"
+	db   "ANIMATION COMBAT"
+	next " OUI      NON@"
 
 BattleStyleOptionText: ; 5ffd (1:5ffd)
-	db   "BATTLE STYLE"
-	next " SHIFT    SET@"
+	db   "STYLE COMBAT"
+	next " CHOIX    DEFINI@"
 
 OptionMenuCancelText: ; 6018 (1:6018)
-	db "CANCEL@"
+	db "RETOUR@"
 
 ; sets the options variable according to the current placement of the menu cursors in the options menu
 SetOptionsFromCursorPositions: ; 601f (1:601f)
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm
index 41f63095..3e0e49c5 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -323,13 +323,16 @@ DisplayNamingScreen: ; 6596 (1:6596)
 	ld [wTopMenuItemX], a
 	jp EraseMenuCursor
 
-LoadEDTile: ; 675b (1:675b)
-	ld de, ED_Tile
-	ld hl, vFont + $700
-	ld bc, (ED_TileEnd - ED_Tile) / $8
+LoadEDTile: ; 67f6 (1:67f6)
+	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: ; 6767 (1:6767)
 	INCBIN "gfx/ED_tile.1bpp"
@@ -365,13 +368,13 @@ PrintAlphabet: ; 676f (1:676f)
 	ld [H_AUTOBGTRANSFERENABLED], a
 	jp Delay3
 
-LowerCaseAlphabet: ; 679e (1:679e)
-	db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥UPPER CASE@"
+LowerCaseAlphabet: ; 6841 (1:6841)
+	db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥MAJUSCULES@"
 
-UpperCaseAlphabet: ; 67d6 (1:67d6)
-	db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥lower case@"
+UpperCaseAlphabet: ; 6879 (1:6879)
+	db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥minuscules@"
 
-PrintNicknameAndUnderscores: ; 680e (1:680e)
+PrintNicknameAndUnderscores: ; 68b1 (1:68b1)
 	call CalcStringLength
 	ld a, c
 	ld [wNamingScreenNameLength], a
@@ -467,15 +470,15 @@ CalcStringLength: ; 68eb (1:68eb)
 	inc c
 	jr .loop
 
-PrintNamingText: ; 68f8 (1:68f8)
+PrintNamingText: ; 699b (1:699b)
 	coord hl, 0, 1
 	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: ; 68f8 (1:68f8)
 	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: ; 693f (1:693f)
-	db "YOUR @"
+	db "VOTRE NOM?@"
 
 RivalsTextString: ; 6945 (1:6945)
-	db "RIVAL's @"
+	db "NOM DU RIVAL?@"
 
 NameTextString: ; 694d (1:694d)
-	db "NAME?@"
+	db "NOM?@"
 
 NicknameTextString: ; 6953 (1:6953)
-	db "NICKNAME?@"
+	db "SURNOM?@"
diff --git a/engine/menu/players_pc.asm b/engine/menu/players_pc.asm
index 00889e93..a9d61a74 100755
--- a/engine/menu/players_pc.asm
+++ b/engine/menu/players_pc.asm
@@ -1,6 +1,4 @@
 PlayerPC: ; 78e6 (1:78e6)
-	ld hl, wd730
-	set 6, [hl]
 	ld a, ITEM_NAME
 	ld [wNameListType], a
 	call SaveScreenTilesToBuffer1
@@ -15,6 +13,8 @@ PlayerPC: ; 78e6 (1:78e6)
 	call PlaySound
 	ld hl, TurnedOnPC2Text
 	call PrintText
+	ld hl, wd730
+	set 6, [hl]
 
 PlayerPCMenu: ; 790c (1:790c)
 	ld a, [wParentMenuItem]
@@ -240,11 +240,11 @@ PlayerPCToss: ; 7a8f (1:7a8f)
 	call TossItem ; disallows tossing key items
 	jp .loop
 
-PlayersPCMenuEntries: ; 7af5 (1:7af5)
-	db   "WITHDRAW ITEM"
-	next "DEPOSIT ITEM"
-	next "TOSS ITEM"
-	next "LOG OFF@"
+PlayersPCMenuEntries: ; 7b5f (1:7b5f)
+	db   "RETIRER OBJET"
+	next "STOCKER OBJET"
+	next "JETER OBJET"
+	next "DECONNEXION@"
 
 TurnedOnPC2Text: ; 7b22 (1:7b22)
 	TX_FAR _TurnedOnPC2Text
diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm
index 3898ef43..adf0eb62 100755
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -355,19 +355,19 @@ DrawPokedexVerticalLine: ; 4028e (10:428e)
 	ret
 
 PokedexSeenText: ; 4029d (10:429d)
-	db "SEEN@"
+	db "VUS@"
 
 PokedexOwnText: ; 402a2 (10:42a2)
-	db "OWN@"
+	db "PRIS@"
 
 PokedexContentsText: ; 402a6 (10:42a6)
-	db "CONTENTS@"
+	db "SOMMAIRE@"
 
 PokedexMenuItemsText: ; 402af (10:42af)
-	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:
@@ -493,23 +493,34 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
 	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
+	push af
 	coord hl, 12, 6
 	lb bc, 1, 2
 	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
+;	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)
+;	inc de
+;	inc de
+;	inc de ; de = address of upper byte of weight
+;	push de
 ; put weight in big-endian order at hDexWeight
 	ld hl,hDexWeight
 	ld a,[hl] ; save existing value of [hDexWeight]
@@ -568,7 +579,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
 	ret
 
 HeightWeightText: ; 40448 (10:4448)
-	db "HT  ?",$60,"??",$61,$4E,"WT   ???lb@"
+	db   "TAI  ???",$60,$4e,"PDS  ???",$61,$62,"@"
 
 ; XXX does anything point to this?
 PokeText: ; 4045d (10:445d)
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm
index 34c21da0..12b1441f 100755
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -598,8 +598,9 @@ DrawTrainerInfo: ; 1349a (4:749a)
 	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
@@ -614,10 +615,10 @@ TrainerInfo_FarCopyData: ; 1357f (4:757f)
 	ld a,BANK(TrainerInfoTextBoxTileGraphics)
 	jp FarCopyData2
 
-TrainerInfo_NameMoneyTimeText: ; 13584 (4:7584)
-	db   "NAME/"
-	next "MONEY/"
-	next "TIME/@"
+TrainerInfo_NameMoneyTimeText: ; 13584 (4:7594)
+	db   "NOM/"
+	next "ARG./"
+	next "TEMPS/@"
 
 ; $76 is a circle tile
 TrainerInfo_BadgesText: ; 13597 (4:7597)
diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm
index d07cc026..c529b9e5 100755
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -288,10 +288,10 @@ PrintStat
 	ret
 
 StatsText: ; 12b3a (4:6b3a)
-	db   "ATTACK"
-	next "DEFENSE"
-	next "SPEED"
-	next "SPECIAL@"
+	db   "FOR"
+	next "DEF"
+	next "VIT"
+	next "SPE@"
 
 StatusScreen2: ; 12b57 (4:6b57)
 	ld a, [hTilesetType]
@@ -462,8 +462,8 @@ CalcExpToLevelUp: ; 12c86 (4:6c86)
 	ret
 
 StatusScreenExpText: ; 12caf (4:6caf)
-	db   "EXP POINTS"
-	next "LEVEL UP@"
+	db   "PTS EXP."
+	next "PROCH.NIV.@"
 
 StatusScreen_ClearName: ; 12cc3 (4:6cc3)
 	ld bc, 10
@@ -478,3 +478,13 @@ StatusScreen_PrintPP: ; 12ccb (4:6ccb)
 	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/oak_speech2.asm b/engine/oak_speech2.asm
index 61775531..f90d8ed4 100755
--- a/engine/oak_speech2.asm
+++ b/engine/oak_speech2.asm
@@ -184,38 +184,38 @@ DisplayIntroNameTextBox: ; 6a6c (1:6a6c)
 	ld [wMaxMenuItem], a
 	jp HandleMenuInput
 
-.namestring ; 6aa3 (1:6aa3)
-	db "NAME@"
+.namestring ; 6b40 (1:6b40)
+	db "─NOM@"
 
 IF DEF(_RED)
 DefaultNamesPlayer: ; 6aa8 (1:6aa8)
-	db   "NEW NAME"
+	db   "NOM:"
 	next "RED"
-	next "ASH"
-	next "JACK"
+	next "SACHA"
+	next "PAUL"
 	db   "@"
 
 DefaultNamesRival: ; 6abe (1:6abe)
-	db   "NEW NAME"
+	db   "NOM:"
 	next "BLUE"
-	next "GARY"
-	next "JOHN"
+	next "REGIS"
+	next "JEAN"
 	db   "@"
 ENDC
 
 IF DEF(_BLUE)
 DefaultNamesPlayer: ; 6aa8 (1:6aa8)
-	db   "NEW NAME"
+	db   "NOM:"
 	next "BLUE"
-	next "GARY"
-	next "JOHN"
+	next "REGIS"
+	next "JEAN"
 	db   "@"
 
 DefaultNamesRival: ; 6abe (1:6abe)
-	db   "NEW NAME"
+	db   "NOM:"
 	next "RED"
-	next "ASH"
-	next "JACK"
+	next "SACHA"
+	next "PAUL"
 	db   "@"
 ENDC
 
@@ -245,15 +245,15 @@ GetDefaultName: ; 6ad6 (1:6ad6)
 
 IF DEF(_RED)
 DefaultNamesPlayerList: ; 6af2 (1:6af2)
-	db "NEW NAME@RED@ASH@JACK@"
+	db "NOM:@RED@SACHA@PAUL@"
 DefaultNamesRivalList: ; 6b08 (1:6b08)
-	db "NEW NAME@BLUE@GARY@JOHN@"
+	db "NOM:@BLUE@REGIS@JEAN@"
 ENDC
 IF DEF(_BLUE)
 DefaultNamesPlayerList: ; 6af2 (1:6af2)
-	db "NEW NAME@BLUE@GARY@JOHN@"
+	db "NOM:@BLUE@REGIS@JEAN@"
 DefaultNamesRivalList: ; 6b08 (1:6b08)
-	db "NEW NAME@RED@ASH@JACK@"
+	db "NOM:@RED@SACHA@PAUL@"
 ENDC
 
 TextTerminator_6b20: ; 6b20 (1:6b20)
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index c89406d1..05c73213 100644
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -445,6 +445,7 @@ InitializeSpriteStatus: ; 50ad (1:50ad)
 	ld a, $8
 	ld [hli], a   ; $c2x2: set Y displacement to 8
 	ld [hl], a    ; $c2x3: set X displacement to 8
+	call InitializeSpriteScreenPosition ; could have done fallthrough here
 	ret
 
 ; calculates the spprite's scrren position form its map position and the player position
@@ -457,7 +458,7 @@ InitializeSpriteScreenPosition: ; 50bd (1:50bd)
 	ld b, a
 	ld a, [hl]      ; c2x4 (Y position + 4)
 	sub b           ; relative to player position
-	swap a          ; * 16
+	call Func_515D
 	sub $4          ; - 4
 	dec h
 	ld [hli], a     ; c1x4 (screen Y position)
@@ -466,11 +467,23 @@ InitializeSpriteScreenPosition: ; 50bd (1:50bd)
 	ld b, a
 	ld a, [hli]     ; c2x6 (X position + 4)
 	sub b           ; relative to player position
-	swap a          ; * 16
+	call Func_515D
 	dec h
 	ld [hl], a      ; c1x6 (screen X position)
 	ret
 
+Func_515D: ; 515D (1:515D)
+	jr nc, .asm_5166
+	cpl
+	inc a
+	swap a
+	cpl
+	inc a
+	ret
+.asm_5166
+	swap a
+	ret
+
 ; tests if sprite is off screen or otherwise unable to do anything
 CheckSpriteAvailability: ; 50dc (1:50dc)
 	predef IsObjectHidden
diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm
index cbe19d6d..704388fa 100755
--- a/engine/titlescreen.asm
+++ b/engine/titlescreen.asm
@@ -111,7 +111,7 @@ DisplayTitleScreen: ; 42dd (1:42dd)
 	jr .next
 
 .tileScreenCopyrightTiles ; 437f (1:437f)
-	db $41,$42,$43,$42,$44,$42,$45,$46,$47,$48,$49,$4A,$4B,$4C,$4D,$4E ; ©'95.'96.'98 GAME FREAK inc.
+	db $41,$42,$43,$44,$42,$43,$4f,$46,$47,$48,$49,$4A,$4B,$4C,$4D,$4E ; ©1995-1999 GAME FREAK inc.
 
 .next
 	call SaveScreenTilesToBuffer2
@@ -377,9 +377,9 @@ LoadCopyrightTiles: ; 4541 (1:4541)
 	jp PlaceString
 
 CopyrightTextString: ; 4556 (1:4556)
-	db   $60,$61,$62,$61,$63,$61,$64,$7F,$65,$66,$67,$68,$69,$6A             ; ©'95.'96.'98 Nintendo
-	next $60,$61,$62,$61,$63,$61,$64,$7F,$6B,$6C,$6D,$6E,$6F,$70,$71,$72     ; ©'95.'96.'98 Creatures inc.
-	next $60,$61,$62,$61,$63,$61,$64,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B ; ©'95.'96.'98 GAME FREAK inc.
+	db   $60,$61,$62,$63,$61,$62,$7C,$7F,$65,$66,$67,$68,$69,$6A             ; ©1995-1999 Nintendo
+	next $60,$61,$62,$63,$61,$62,$7C,$7F,$6B,$6C,$6D,$6E,$6F,$70,$71,$72     ; ©1995-1999 Creatures inc.
+	next $60,$61,$62,$63,$61,$62,$7C,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B ; ©1995-1999 GAME FREAK inc.
 	db   "@"
 
 INCLUDE "data/title_mons.asm"
@@ -393,7 +393,7 @@ PrintGameVersionOnTitleScreen: ; 4598 (1:4598)
 ; these point to special tiles specifically loaded for that purpose and are not usual text
 VersionOnTitleScreenText: ; 45a1 (1:45a1)
 IF DEF(_RED)
-	db $60,$61,$7F,$65,$66,$67,$68,$69,"@" ; "Red Version"
+	db $60,$61,$62,$63,$64,$65,$66,$67,$68,$69,"@" ; "Version Rouge"
 ENDC
 IF DEF(_BLUE)
 	db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Blue Version"
-- 
cgit v1.2.3


From 492c0961713e18f0828bc2f88bfc8cfff2b0b8ab Mon Sep 17 00:00:00 2001
From: Logan <log.butt@gmail.com>
Date: Mon, 30 May 2016 00:54:10 +1200
Subject: Merge branch 'master' of https://github.com/einstein95/pokered

---
 engine/oak_speech2.asm        | 20 ++++++++++++++++----
 engine/overworld/doors.asm    | 39 +++++++++++++--------------------------
 engine/overworld/movement.asm |  6 +++---
 3 files changed, 32 insertions(+), 33 deletions(-)

(limited to 'engine')

diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm
index f90d8ed4..88670a16 100755
--- a/engine/oak_speech2.asm
+++ b/engine/oak_speech2.asm
@@ -245,15 +245,27 @@ GetDefaultName: ; 6ad6 (1:6ad6)
 
 IF DEF(_RED)
 DefaultNamesPlayerList: ; 6af2 (1:6af2)
-	db "NOM:@RED@SACHA@PAUL@"
+	db "NOM:@"
+	db "RED@"
+	db "SACHA@"
+	db "PAUL@"
 DefaultNamesRivalList: ; 6b08 (1:6b08)
-	db "NOM:@BLUE@REGIS@JEAN@"
+	db "NOM:@"
+	db "BLUE@"
+	db "REGIS@"
+	db "JEAN@"
 ENDC
 IF DEF(_BLUE)
 DefaultNamesPlayerList: ; 6af2 (1:6af2)
-	db "NOM:@BLUE@REGIS@JEAN@"
+	db "NOM:@"
+	db "BLUE@"
+	db "REGIS@"
+	db "JEAN@"
 DefaultNamesRivalList: ; 6b08 (1:6b08)
-	db "NOM:@RED@SACHA@PAUL@"
+	db "NOM:@"
+	db "RED@"
+	db "SACHA@"
+	db "PAUL@"
 ENDC
 
 TextTerminator_6b20: ; 6b20 (1:6b20)
diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm
index 6b0c0464..3145c3c6 100755
--- a/engine/overworld/doors.asm
+++ b/engine/overworld/doors.asm
@@ -26,32 +26,19 @@ IsPlayerStandingOnDoorTile: ; 1a609 (6:6609)
 	ret
 
 DoorTileIDPointers: ; 1a62c (6:662c)
-	db OVERWORLD
-	dw OverworldDoorTileIDs
-	db FOREST
-	dw ForestDoorTileIDs
-	db MART
-	dw MartDoorTileIDs
-	db HOUSE
-	dw HouseDoorTileIDs
-	db FOREST_GATE
-	dw TilesetMuseumDoorTileIDs
-	db MUSEUM
-	dw TilesetMuseumDoorTileIDs
-	db GATE
-	dw TilesetMuseumDoorTileIDs
-	db SHIP
-	dw ShipDoorTileIDs
-	db LOBBY
-	dw LobbyDoorTileIDs
-	db MANSION
-	dw MansionDoorTileIDs
-	db LAB
-	dw LabDoorTileIDs
-	db FACILITY
-	dw FacilityDoorTileIDs
-	db PLATEAU
-	dw PlateauDoorTileIDs
+	dbw OVERWORLD,   OverworldDoorTileIDs
+	dbw FOREST,      ForestDoorTileIDs
+	dbw MART,        MartDoorTileIDs
+	dbw HOUSE,       HouseDoorTileIDs
+	dbw FOREST_GATE, TilesetMuseumDoorTileIDs
+	dbw MUSEUM,      TilesetMuseumDoorTileIDs
+	dbw GATE,        TilesetMuseumDoorTileIDs
+	dbw SHIP,        ShipDoorTileIDs
+	dbw LOBBY,       LobbyDoorTileIDs
+	dbw MANSION,     MansionDoorTileIDs
+	dbw LAB,         LabDoorTileIDs
+	dbw FACILITY,    FacilityDoorTileIDs
+	dbw PLATEAU,     PlateauDoorTileIDs
 	db $ff
 
 OverworldDoorTileIDs: ; 1a654 (6:6654)
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index 05c73213..7f92a243 100644
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -95,7 +95,7 @@ UpdatePlayerSprite: ; 4e31 (1:4e31)
 	jr nz, .next2
 	ld a, $80
 .next2
-	ld [wSpriteStateData2 + $07], a
+	ld [wSpriteStateData2 + 7], a
 	ret
 
 UnusedReadSpriteDataFunction: ; 4ec7 (1:4ec7)
@@ -169,7 +169,7 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1)
 	call LoadDEPlusA ; a = [wNPCMovementDirections + movement byte 1]
 	cp $e0
 	jp z, ChangeFacingDirection
-	cp $ff
+	cp STAY
 	jr nz, .next
 ; reached end of wNPCMovementDirections list
 	ld [hl], a ; store $ff in movement byte 1, disabling scripted movement
@@ -180,7 +180,7 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1)
 	ld [wWastedByteCD3A], a
 	ret
 .next
-	cp $fe
+	cp WALK
 	jr nz, .determineDirection
 ; current NPC movement data is $fe. this seems buggy
 	ld [hl], $1     ; set movement byte 1 to $1
-- 
cgit v1.2.3


From dfa7040a4b75284069a62590b747101448e7c3be Mon Sep 17 00:00:00 2001
From: Logan <log.butt@gmail.com>
Date: Wed, 1 Jun 2016 19:00:41 +1200
Subject: More disasm

---
 engine/HoF_room_pc.asm               |   4 +-
 engine/hall_of_fame.asm              |   9 +-
 engine/hidden_object_functions17.asm |  16 +-
 engine/menu/diploma.asm              |  13 +-
 engine/menu/prize_menu.asm           |   2 +-
 engine/oak_speech2.asm.orig          | 296 +++++++++++++++++++++++++++++++++++
 engine/save.asm                      |  28 ++--
 engine/town_map.asm                  |   7 +-
 8 files changed, 335 insertions(+), 40 deletions(-)
 create mode 100755 engine/oak_speech2.asm.orig

(limited to 'engine')

diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm
index e00fc57d..4fe7f4cb 100755
--- a/engine/HoF_room_pc.asm
+++ b/engine/HoF_room_pc.asm
@@ -258,8 +258,8 @@ Credits: ; 7418e (1d:418e)
 
 TheEndTextString: ; 74229 (1d:4229)
 ; "T H E  E N D"
-	db $60," ",$62," ",$64,"  ",$64," ",$66," ",$68,"@"
-	db $61," ",$63," ",$65,"  ",$65," ",$67," ",$69,"@"
+	db $60," ",$62,$64," ",$66,"@"
+	db $61," ",$63,$65," ",$67,"@"
 
 INCLUDE "data/credits_order.asm"
 
diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm
index 4225c5a1..256932cd 100755
--- a/engine/hall_of_fame.asm
+++ b/engine/hall_of_fame.asm
@@ -92,7 +92,7 @@ AnimateHallOfFame: ; 701a0 (1c:41a0)
 	ret
 
 HallOfFameText: ; 7026b (1c:426b)
-	db "HALL OF FAME@"
+	db "CELEBRITE@"
 
 HoFShowMonOrPlayer: ; 70278 (1c:4278)
 	call ClearScreen
@@ -178,7 +178,7 @@ HoFDisplayMonInfo: ; 702f0 (1c:42f0)
 	jp PlayCry
 
 HoFMonInfoText: ; 70329 (1c:4329)
-	db   "LEVEL/"
+	db   "NIVEAU/"
 	next "TYPE1/"
 	next "TYPE2/@"
 
@@ -239,6 +239,7 @@ HoFDisplayPlayerStats: ; 70377 (1c:4377)
 	ld de, wPlayerMoney
 	ld c, $a3
 	call PrintBCDNumber
+	ld [hl], $F0
 	ld hl, DexSeenOwnedText
 	call HoFPrintTextAndDelay
 	ld hl, DexRatingText
@@ -251,10 +252,10 @@ HoFPrintTextAndDelay: ; 703e2 (1c:43e2)
 	jp DelayFrames
 
 HoFPlayTimeText: ; 703ea (1c:43ea)
-	db "PLAY TIME@"
+	db "DUREE JEU@"
 
 HoFMoneyText: ; 703f4 (1c:43f4)
-	db "MONEY@"
+	db "ARGENT@"
 
 DexSeenOwnedText: ; 703fa (1c:43fa)
 	TX_FAR _DexSeenOwnedText
diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm
index ffcc33c3..42fbc85d 100755
--- a/engine/hidden_object_functions17.asm
+++ b/engine/hidden_object_functions17.asm
@@ -151,10 +151,10 @@ LinkCableHelpText2: ; 5dca3 (17:5ca3)
 	db "@"
 
 HowToLinkText: ; 5dca8 (17:5ca8)
-	db   "HOW TO LINK"
-	next "COLOSSEUM"
-	next "TRADE CENTER"
-	next "STOP READING@"
+	db   "CABLE LINK"
+	next "COLISEE"
+	next "CENTRE TROC"
+	next "NE PLUS LIRE@"
 
 LinkCableInfoTexts: ; 5dcd8 (17:5cd8)
 	dw LinkCableInfoText1
@@ -268,14 +268,14 @@ ViridianSchoolBlackboardText2: ; 5dda7 (17:5da7)
 	db "@"
 
 StatusAilmentText1: ; 5ddac (17:5dac)
-	db   " SLP"
+	db   " SOM"
 	next " PSN"
 	next " PAR@"
 
 StatusAilmentText2: ; 5ddbb (17:5dbb)
-	db   " BRN"
-	next " FRZ"
-	next " QUIT@@"
+	db   " BRU"
+	next " GEL"
+	next " RET@"
 
 ViridianBlackboardStatusPointers: ; 5ddcc (17:5ddc)
 	dw ViridianBlackboardSleepText
diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm
index 630c6c23..e18f7d55 100755
--- a/engine/menu/diploma.asm
+++ b/engine/menu/diploma.asm
@@ -94,20 +94,19 @@ DiplomaTextPointersAndCoords: ; 56784 (15:6784)
 	dwCoord 9, 16
 
 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/prize_menu.asm b/engine/menu/prize_menu.asm
index 434a1943..3bc64701 100755
--- a/engine/menu/prize_menu.asm
+++ b/engine/menu/prize_menu.asm
@@ -166,7 +166,7 @@ PrintPrizePrice: ; 5287a (14:687a)
 	ret
 
 .CoinText
-	db "COIN@"
+	db "JETONS@"
 
 .SixSpacesText
 	db "      @"
diff --git a/engine/oak_speech2.asm.orig b/engine/oak_speech2.asm.orig
new file mode 100755
index 00000000..986a6535
--- /dev/null
+++ b/engine/oak_speech2.asm.orig
@@ -0,0 +1,296 @@
+ChoosePlayerName: ; 695d (1:695d)
+	call OakSpeechSlidePicRight
+	ld de, DefaultNamesPlayer
+	call DisplayIntroNameTextBox
+	ld a, [wCurrentMenuItem]
+	and a
+	jr z, .customName
+	ld hl, DefaultNamesPlayerList
+	call GetDefaultName
+	ld de, wPlayerName
+	call OakSpeechSlidePicLeft
+	jr .done
+.customName
+	ld hl, wPlayerName
+	xor a ; NAME_PLAYER_SCREEN
+	ld [wNamingScreenType], a
+	call DisplayNamingScreen
+	ld a, [wcf4b]
+	cp "@"
+	jr z, .customName
+	call ClearScreen
+	call Delay3
+	ld de, RedPicFront
+	ld b, BANK(RedPicFront)
+	call IntroDisplayPicCenteredOrUpperRight
+.done
+	ld hl, YourNameIsText
+	jp PrintText
+
+YourNameIsText: ; 699f (1:699f)
+	TX_FAR _YourNameIsText
+	db "@"
+
+ChooseRivalName: ; 69a4 (1:69a4)
+	call OakSpeechSlidePicRight
+	ld de, DefaultNamesRival
+	call DisplayIntroNameTextBox
+	ld a, [wCurrentMenuItem]
+	and a
+	jr z, .customName
+	ld hl, DefaultNamesRivalList
+	call GetDefaultName
+	ld de, wRivalName
+	call OakSpeechSlidePicLeft
+	jr .done
+.customName
+	ld hl, wRivalName
+	ld a, NAME_RIVAL_SCREEN
+	ld [wNamingScreenType], a
+	call DisplayNamingScreen
+	ld a, [wcf4b]
+	cp "@"
+	jr z, .customName
+	call ClearScreen
+	call Delay3
+	ld de, Rival1Pic
+	ld b, $13
+	call IntroDisplayPicCenteredOrUpperRight
+.done
+	ld hl, HisNameIsText
+	jp PrintText
+
+HisNameIsText: ; 69e7 (1:69e7)
+	TX_FAR _HisNameIsText
+	db "@"
+
+OakSpeechSlidePicLeft: ; 69ec (1:69ec)
+	push de
+	coord hl, 0, 0
+	lb bc, 12, 11
+	call ClearScreenArea ; clear the name list text box
+	ld c, 10
+	call DelayFrames
+	pop de
+	ld hl, wcd6d
+	ld bc, NAME_LENGTH
+	call CopyData
+	call Delay3
+	coord hl, 12, 4
+	lb de, 6, 6 * SCREEN_WIDTH + 5
+	ld a, $ff
+	jr OakSpeechSlidePicCommon
+
+OakSpeechSlidePicRight: ; 6a12 (1:6a12)
+	coord hl, 5, 4
+	lb de, 6, 6 * SCREEN_WIDTH + 5
+	xor a
+
+OakSpeechSlidePicCommon: ; 6a19 (1:6a19)
+	push hl
+	push de
+	push bc
+	ld [hSlideDirection], a
+	ld a, d
+	ld [hSlideAmount], a
+	ld a, e
+	ld [hSlidingRegionSize], a
+	ld c, a
+	ld a, [hSlideDirection]
+	and a
+	jr nz, .next
+; If sliding right, point hl to the end of the pic's tiles.
+	ld d, 0
+	add hl, de
+.next
+	ld d, h
+	ld e, l
+.loop
+	xor a
+	ld [H_AUTOBGTRANSFERENABLED], a
+	ld a, [hSlideDirection]
+	and a
+	jr nz, .slideLeft
+; sliding right
+	ld a, [hli]
+	ld [hld], a
+	dec hl
+	jr .next2
+.slideLeft
+	ld a, [hld]
+	ld [hli], a
+	inc hl
+.next2
+	dec c
+	jr nz, .loop
+	ld a, [hSlideDirection]
+	and a
+	jr z, .next3
+; If sliding left, we need to zero the last tile in the pic (there is no need
+; to take a corresponding action when sliding right because hl initially points
+; to a 0 tile in that case).
+	xor a
+	dec hl
+	ld [hl], a
+.next3
+	ld a, 1
+	ld [H_AUTOBGTRANSFERENABLED], a
+	call Delay3
+	ld a, [hSlidingRegionSize]
+	ld c, a
+	ld h, d
+	ld l, e
+	ld a, [hSlideDirection]
+	and a
+	jr nz, .slideLeft2
+	inc hl
+	jr .next4
+.slideLeft2
+	dec hl
+.next4
+	ld d, h
+	ld e, l
+	ld a, [hSlideAmount]
+	dec a
+	ld [hSlideAmount], a
+	jr nz, .loop
+	pop bc
+	pop de
+	pop hl
+	ret
+
+DisplayIntroNameTextBox: ; 6a6c (1:6a6c)
+	push de
+	coord hl, 0, 0
+	ld b, $a
+	ld c, $9
+	call TextBoxBorder
+	coord hl, 3, 0
+	ld de, .namestring
+	call PlaceString
+	pop de
+	coord hl, 2, 2
+	call PlaceString
+	call UpdateSprites
+	xor a
+	ld [wCurrentMenuItem], a
+	ld [wLastMenuItem], a
+	inc a
+	ld [wTopMenuItemX], a
+	ld [wMenuWatchedKeys], a ; A_BUTTON
+	inc a
+	ld [wTopMenuItemY], a
+	inc a
+	ld [wMaxMenuItem], a
+	jp HandleMenuInput
+
+.namestring ; 6b40 (1:6b40)
+	db "─NOM@"
+
+IF DEF(_RED)
+DefaultNamesPlayer: ; 6aa8 (1:6aa8)
+	db   "NOM:"
+	next "RED"
+	next "SACHA"
+	next "PAUL"
+	db   "@"
+
+DefaultNamesRival: ; 6abe (1:6abe)
+	db   "NOM:"
+	next "BLUE"
+	next "REGIS"
+	next "JEAN"
+	db   "@"
+ENDC
+
+IF DEF(_BLUE)
+DefaultNamesPlayer: ; 6aa8 (1:6aa8)
+	db   "NOM:"
+	next "BLUE"
+	next "REGIS"
+	next "JEAN"
+	db   "@"
+
+DefaultNamesRival: ; 6abe (1:6abe)
+	db   "NOM:"
+	next "RED"
+	next "SACHA"
+	next "PAUL"
+	db   "@"
+ENDC
+
+GetDefaultName: ; 6ad6 (1:6ad6)
+; a = name index
+; hl = name list
+	ld b, a
+	ld c, 0
+.loop
+	ld d, h
+	ld e, l
+.innerLoop
+	ld a, [hli]
+	cp "@"
+	jr nz, .innerLoop
+	ld a, b
+	cp c
+	jr z, .foundName
+	inc c
+	jr .loop
+.foundName
+	ld h, d
+	ld l, e
+	ld de, wcd6d
+	ld bc, $14
+	jp CopyData
+
+IF DEF(_RED)
+DefaultNamesPlayerList: ; 6af2 (1:6af2)
+<<<<<<< HEAD
+	db "NOM:@"
+	db "RED@"
+	db "SACHA@"
+	db "PAUL@"
+DefaultNamesRivalList: ; 6b08 (1:6b08)
+	db "NOM:@"
+	db "BLUE@"
+	db "REGIS@"
+	db "JEAN@"
+ENDC
+IF DEF(_BLUE)
+DefaultNamesPlayerList: ; 6af2 (1:6af2)
+	db "NOM:@"
+	db "BLUE@"
+	db "REGIS@"
+	db "JEAN@"
+DefaultNamesRivalList: ; 6b08 (1:6b08)
+	db "NOM:@"
+	db "RED@"
+	db "SACHA@"
+	db "PAUL@"
+=======
+	db "NEW NAME@"
+	db "RED@"
+	db "ASH@"
+	db "JACK@"
+DefaultNamesRivalList: ; 6b08 (1:6b08)
+	db "NEW NAME@"
+	db "BLUE@"
+	db "GARY@"
+	db "JOHN@"
+ENDC
+IF DEF(_BLUE)
+DefaultNamesPlayerList: ; 6af2 (1:6af2)
+	db "NEW NAME@"
+	db "BLUE@"
+	db "GARY@"
+	db "JOHN@"
+DefaultNamesRivalList: ; 6b08 (1:6b08)
+	db "NEW NAME@"
+	db "RED@"
+	db "ASH@"
+	db "JACK@"
+>>>>>>> b8dfee511453d322051f21bddc74c79307f23007
+ENDC
+
+TextTerminator_6b20: ; 6b20 (1:6b20)
+	db "@"
diff --git a/engine/save.asm b/engine/save.asm
index e47be58a..fad87c1f 100755
--- a/engine/save.asm
+++ b/engine/save.asm
@@ -171,7 +171,7 @@ SaveSAV: ; 7370a (1c:770a)
 	jp DelayFrames
 
 NowSavingString:
-	db "Now saving...@"
+	db "Sauvegarde...@"
 
 SaveSAVConfirm: ; 73768 (1c:7768)
 	call PrintText
@@ -494,21 +494,21 @@ ChooseABoxText: ; 739d4 (1c:79d4)
 	db "@"
 
 BoxNames: ; 739d9 (1c:79d9)
-	db   "BOX 1"
-	next "BOX 2"
-	next "BOX 3"
-	next "BOX 4"
-	next "BOX 5"
-	next "BOX 6"
-	next "BOX 7"
-	next "BOX 8"
-	next "BOX 9"
-	next "BOX10"
-	next "BOX11"
-	next "BOX12@"
+	db   "BOITE 1"
+	next "BOITE 2"
+	next "BOITE 3"
+	next "BOITE 4"
+	next "BOITE 5"
+	next "BOITE 6"
+	next "BOITE 7"
+	next "BOITE 8"
+	next "BOITE 9"
+	next "BOITE10"
+	next "BOITE11"
+	next "BOITE12@"
 
 BoxNoText: ; 73a21 (1c:7a21)
-	db "BOX No.@"
+	db "BOITE@"
 
 EmptyAllSRAMBoxes: ; 73a29 (1c:7a29)
 ; marks all boxes in SRAM as empty (initialisation for the first time the
diff --git a/engine/town_map.asm b/engine/town_map.asm
index 727197de..9fb5665f 100755
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -120,8 +120,7 @@ LoadTownMap_Nest: ; 70f60 (1c:4f60)
 	call GetMonName
 	coord hl, 1, 0
 	call PlaceString
-	ld h, b
-	ld l, c
+	ld hl, $C381
 	ld de, MonsNestText
 	call PlaceString
 	call WaitForTextScrollButtonPress
@@ -132,7 +131,7 @@ LoadTownMap_Nest: ; 70f60 (1c:4f60)
 	ret
 
 MonsNestText: ; 70f89 (1c:4f89)
-	db "'s NEST@"
+	db "NID DE @"
 
 LoadTownMap_Fly: ; 70f90 (1c:4f90)
 	call ClearSprites
@@ -415,7 +414,7 @@ DisplayWildLocations: ; 711ef (1c:51ef)
 	jp CopyData
 
 AreaUnknownText: ; 7124a (1c:524a)
-	db " AREA UNKNOWN@"
+	db " ZONE INCONNUE@"
 
 TownMapCoordsToOAMCoords: ; 71258 (1c:5258)
 ; in: lower nybble of a = x, upper nybble of a = y
-- 
cgit v1.2.3


From 3f6d7088b9a96efec8a53b77ff54b7c82db00c4f Mon Sep 17 00:00:00 2001
From: Logan <log.butt@gmail.com>
Date: Wed, 1 Jun 2016 19:01:39 +1200
Subject: Whoops

---
 engine/oak_speech2.asm.orig | 296 --------------------------------------------
 1 file changed, 296 deletions(-)
 delete mode 100755 engine/oak_speech2.asm.orig

(limited to 'engine')

diff --git a/engine/oak_speech2.asm.orig b/engine/oak_speech2.asm.orig
deleted file mode 100755
index 986a6535..00000000
--- a/engine/oak_speech2.asm.orig
+++ /dev/null
@@ -1,296 +0,0 @@
-ChoosePlayerName: ; 695d (1:695d)
-	call OakSpeechSlidePicRight
-	ld de, DefaultNamesPlayer
-	call DisplayIntroNameTextBox
-	ld a, [wCurrentMenuItem]
-	and a
-	jr z, .customName
-	ld hl, DefaultNamesPlayerList
-	call GetDefaultName
-	ld de, wPlayerName
-	call OakSpeechSlidePicLeft
-	jr .done
-.customName
-	ld hl, wPlayerName
-	xor a ; NAME_PLAYER_SCREEN
-	ld [wNamingScreenType], a
-	call DisplayNamingScreen
-	ld a, [wcf4b]
-	cp "@"
-	jr z, .customName
-	call ClearScreen
-	call Delay3
-	ld de, RedPicFront
-	ld b, BANK(RedPicFront)
-	call IntroDisplayPicCenteredOrUpperRight
-.done
-	ld hl, YourNameIsText
-	jp PrintText
-
-YourNameIsText: ; 699f (1:699f)
-	TX_FAR _YourNameIsText
-	db "@"
-
-ChooseRivalName: ; 69a4 (1:69a4)
-	call OakSpeechSlidePicRight
-	ld de, DefaultNamesRival
-	call DisplayIntroNameTextBox
-	ld a, [wCurrentMenuItem]
-	and a
-	jr z, .customName
-	ld hl, DefaultNamesRivalList
-	call GetDefaultName
-	ld de, wRivalName
-	call OakSpeechSlidePicLeft
-	jr .done
-.customName
-	ld hl, wRivalName
-	ld a, NAME_RIVAL_SCREEN
-	ld [wNamingScreenType], a
-	call DisplayNamingScreen
-	ld a, [wcf4b]
-	cp "@"
-	jr z, .customName
-	call ClearScreen
-	call Delay3
-	ld de, Rival1Pic
-	ld b, $13
-	call IntroDisplayPicCenteredOrUpperRight
-.done
-	ld hl, HisNameIsText
-	jp PrintText
-
-HisNameIsText: ; 69e7 (1:69e7)
-	TX_FAR _HisNameIsText
-	db "@"
-
-OakSpeechSlidePicLeft: ; 69ec (1:69ec)
-	push de
-	coord hl, 0, 0
-	lb bc, 12, 11
-	call ClearScreenArea ; clear the name list text box
-	ld c, 10
-	call DelayFrames
-	pop de
-	ld hl, wcd6d
-	ld bc, NAME_LENGTH
-	call CopyData
-	call Delay3
-	coord hl, 12, 4
-	lb de, 6, 6 * SCREEN_WIDTH + 5
-	ld a, $ff
-	jr OakSpeechSlidePicCommon
-
-OakSpeechSlidePicRight: ; 6a12 (1:6a12)
-	coord hl, 5, 4
-	lb de, 6, 6 * SCREEN_WIDTH + 5
-	xor a
-
-OakSpeechSlidePicCommon: ; 6a19 (1:6a19)
-	push hl
-	push de
-	push bc
-	ld [hSlideDirection], a
-	ld a, d
-	ld [hSlideAmount], a
-	ld a, e
-	ld [hSlidingRegionSize], a
-	ld c, a
-	ld a, [hSlideDirection]
-	and a
-	jr nz, .next
-; If sliding right, point hl to the end of the pic's tiles.
-	ld d, 0
-	add hl, de
-.next
-	ld d, h
-	ld e, l
-.loop
-	xor a
-	ld [H_AUTOBGTRANSFERENABLED], a
-	ld a, [hSlideDirection]
-	and a
-	jr nz, .slideLeft
-; sliding right
-	ld a, [hli]
-	ld [hld], a
-	dec hl
-	jr .next2
-.slideLeft
-	ld a, [hld]
-	ld [hli], a
-	inc hl
-.next2
-	dec c
-	jr nz, .loop
-	ld a, [hSlideDirection]
-	and a
-	jr z, .next3
-; If sliding left, we need to zero the last tile in the pic (there is no need
-; to take a corresponding action when sliding right because hl initially points
-; to a 0 tile in that case).
-	xor a
-	dec hl
-	ld [hl], a
-.next3
-	ld a, 1
-	ld [H_AUTOBGTRANSFERENABLED], a
-	call Delay3
-	ld a, [hSlidingRegionSize]
-	ld c, a
-	ld h, d
-	ld l, e
-	ld a, [hSlideDirection]
-	and a
-	jr nz, .slideLeft2
-	inc hl
-	jr .next4
-.slideLeft2
-	dec hl
-.next4
-	ld d, h
-	ld e, l
-	ld a, [hSlideAmount]
-	dec a
-	ld [hSlideAmount], a
-	jr nz, .loop
-	pop bc
-	pop de
-	pop hl
-	ret
-
-DisplayIntroNameTextBox: ; 6a6c (1:6a6c)
-	push de
-	coord hl, 0, 0
-	ld b, $a
-	ld c, $9
-	call TextBoxBorder
-	coord hl, 3, 0
-	ld de, .namestring
-	call PlaceString
-	pop de
-	coord hl, 2, 2
-	call PlaceString
-	call UpdateSprites
-	xor a
-	ld [wCurrentMenuItem], a
-	ld [wLastMenuItem], a
-	inc a
-	ld [wTopMenuItemX], a
-	ld [wMenuWatchedKeys], a ; A_BUTTON
-	inc a
-	ld [wTopMenuItemY], a
-	inc a
-	ld [wMaxMenuItem], a
-	jp HandleMenuInput
-
-.namestring ; 6b40 (1:6b40)
-	db "─NOM@"
-
-IF DEF(_RED)
-DefaultNamesPlayer: ; 6aa8 (1:6aa8)
-	db   "NOM:"
-	next "RED"
-	next "SACHA"
-	next "PAUL"
-	db   "@"
-
-DefaultNamesRival: ; 6abe (1:6abe)
-	db   "NOM:"
-	next "BLUE"
-	next "REGIS"
-	next "JEAN"
-	db   "@"
-ENDC
-
-IF DEF(_BLUE)
-DefaultNamesPlayer: ; 6aa8 (1:6aa8)
-	db   "NOM:"
-	next "BLUE"
-	next "REGIS"
-	next "JEAN"
-	db   "@"
-
-DefaultNamesRival: ; 6abe (1:6abe)
-	db   "NOM:"
-	next "RED"
-	next "SACHA"
-	next "PAUL"
-	db   "@"
-ENDC
-
-GetDefaultName: ; 6ad6 (1:6ad6)
-; a = name index
-; hl = name list
-	ld b, a
-	ld c, 0
-.loop
-	ld d, h
-	ld e, l
-.innerLoop
-	ld a, [hli]
-	cp "@"
-	jr nz, .innerLoop
-	ld a, b
-	cp c
-	jr z, .foundName
-	inc c
-	jr .loop
-.foundName
-	ld h, d
-	ld l, e
-	ld de, wcd6d
-	ld bc, $14
-	jp CopyData
-
-IF DEF(_RED)
-DefaultNamesPlayerList: ; 6af2 (1:6af2)
-<<<<<<< HEAD
-	db "NOM:@"
-	db "RED@"
-	db "SACHA@"
-	db "PAUL@"
-DefaultNamesRivalList: ; 6b08 (1:6b08)
-	db "NOM:@"
-	db "BLUE@"
-	db "REGIS@"
-	db "JEAN@"
-ENDC
-IF DEF(_BLUE)
-DefaultNamesPlayerList: ; 6af2 (1:6af2)
-	db "NOM:@"
-	db "BLUE@"
-	db "REGIS@"
-	db "JEAN@"
-DefaultNamesRivalList: ; 6b08 (1:6b08)
-	db "NOM:@"
-	db "RED@"
-	db "SACHA@"
-	db "PAUL@"
-=======
-	db "NEW NAME@"
-	db "RED@"
-	db "ASH@"
-	db "JACK@"
-DefaultNamesRivalList: ; 6b08 (1:6b08)
-	db "NEW NAME@"
-	db "BLUE@"
-	db "GARY@"
-	db "JOHN@"
-ENDC
-IF DEF(_BLUE)
-DefaultNamesPlayerList: ; 6af2 (1:6af2)
-	db "NEW NAME@"
-	db "BLUE@"
-	db "GARY@"
-	db "JOHN@"
-DefaultNamesRivalList: ; 6b08 (1:6b08)
-	db "NEW NAME@"
-	db "RED@"
-	db "ASH@"
-	db "JACK@"
->>>>>>> b8dfee511453d322051f21bddc74c79307f23007
-ENDC
-
-TextTerminator_6b20: ; 6b20 (1:6b20)
-	db "@"
-- 
cgit v1.2.3


From 67c22ca572e7976ccb6b1811602e956dbe0221ff Mon Sep 17 00:00:00 2001
From: Logan <log.butt@gmail.com>
Date: Fri, 3 Jun 2016 22:40:28 +1200
Subject: More text, filled out charmap.asm

---
 engine/menu/league_pc.asm       |  2 +-
 engine/menu/vending_machine.asm | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'engine')

diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm
index 7c31d346..2c88e137 100755
--- a/engine/menu/league_pc.asm
+++ b/engine/menu/league_pc.asm
@@ -113,7 +113,7 @@ LeaguePCShowMon: ; 76610 (1d:6610)
 	jpba HoFDisplayMonInfo
 
 HallOfFameNoText: ; 76670 (1d:6670)
-	db "HALL OF FAME No   @"
+	db " CELEBRITE No.    @"
 
 AccessedHoFPCText: ; 76683 (1d:6683)
 	TX_FAR _AccessedHoFPCText
diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm
index 8460889f..9a17705f 100755
--- a/engine/menu/vending_machine.asm
+++ b/engine/menu/vending_machine.asm
@@ -85,15 +85,16 @@ VendingMachineText1: ; 74f99 (1d:4f99)
 	db "@"
 
 DrinkText: ; 74f9e (1d:4f9e)
-	db   "FRESH WATER"
-	next "SODA POP"
-	next "LEMONADE"
-	next "CANCEL@"
+	db   "EAU FRAICHE"
+	next "SODA COOL"
+	next "LIMONADE"
+	next "RETOUR@"
 
 DrinkPriceText: ; 74fc3 (1d:4fc3)
-	db   "¥200"
-	next "¥300"
-	next "¥350",$4E,"@"
+	db   "200¥"
+	next "300¥"
+	next "350¥"
+	next "@"
 
 VendingMachineText4: ; 74fd3 (1d:4fd3)
 	TX_FAR _VendingMachineText4
-- 
cgit v1.2.3


From 1c637b6aeae0c007647cfe1c3648f82eeda9617e Mon Sep 17 00:00:00 2001
From: Logan <log.butt@gmail.com>
Date: Sat, 4 Jun 2016 16:41:50 +1200
Subject: Weeeee

---
 engine/battle/core.asm            | 16 ++++++++--------
 engine/evos_moves.asm             |  6 +++---
 engine/give_pokemon.asm           |  2 +-
 engine/items/items.asm            | 16 ++++++++--------
 engine/menu/naming_screen.asm     | 14 +++++++-------
 engine/menu/start_sub_menus.asm   |  2 +-
 engine/oak_speech2.asm            |  4 ++--
 engine/overworld/cinnabar_lab.asm |  2 +-
 engine/overworld/pokemart.asm     |  2 +-
 engine/slot_machine.asm           |  2 +-
 engine/trade.asm                  |  2 +-
 engine/trade2.asm                 |  2 +-
 12 files changed, 35 insertions(+), 35 deletions(-)

(limited to 'engine')

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 9f553075..8c3a9c8f 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2324,7 +2324,7 @@ UseBagItem:
 	ld a, [wcf91]
 	ld [wd11e], a
 	call GetItemName
-	call CopyStringToCF4B ; copy name
+	call CopyStringToCF50 ; copy name
 	xor a
 	ld [wPseudoItemID], a
 	call UseItem
@@ -3629,7 +3629,7 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854)
 	ld a, RAGE
 	ld [wd11e], a
 	call GetMoveName
-	call CopyStringToCF4B
+	call CopyStringToCF50
 	xor a
 	ld [wPlayerMoveEffect], a
 	ld hl, PlayerCanExecuteMove
@@ -3831,7 +3831,7 @@ PrintMoveName: ; 3db48 (f:5b48)
 	ret
 
 _PrintMoveName: ; 3db4c (f:5b4c)
-	TX_FAR _CF4BText
+	TX_FAR _CF50Text
 	TX_ASM
 	ld hl, ExclamationPointPointerTable
 	ld a, [wd11e] ; exclamation point num
@@ -5214,7 +5214,7 @@ ReloadMoveData: ; 3e329 (f:6329)
 	call IncrementMovePP
 ; the follow two function calls are used to reload the move name
 	call GetMoveName
-	call CopyStringToCF4B
+	call CopyStringToCF50
 	ld a,$01
 	and a
 	ret
@@ -5715,7 +5715,7 @@ EnemyCanExecuteChargingMove: ; 3e70b (f:670b)
 	ld [wNameListType], a
 	call GetName
 	ld de, wcd6d
-	call CopyStringToCF4B
+	call CopyStringToCF50
 EnemyCanExecuteMove: ; 3e72b (f:672b)
 	xor a
 	ld [wMonIsDisobedient], a
@@ -6152,7 +6152,7 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f)
 	ld a, RAGE
 	ld [wd11e], a
 	call GetMoveName
-	call CopyStringToCF4B
+	call CopyStringToCF50
 	xor a
 	ld [wEnemyMoveEffect], a
 	ld hl, EnemyCanExecuteMove
@@ -6194,7 +6194,7 @@ GetCurrentMove: ; 3eabe (f:6abe)
 	ld [wNameListType], a
 	call GetName
 	ld de, wcd6d
-	jp CopyStringToCF4B
+	jp CopyStringToCF50
 
 LoadEnemyMonData: ; 3eb01 (f:6b01)
 	ld a, [wLinkState]
@@ -7955,7 +7955,7 @@ PrintStatText: ; 3f688 (f:7688)
 	jr z, .asm_3f68d
 	jr .asm_3f690
 .asm_3f696
-	ld de, wcf4b
+	ld de, wcf50
 	ld bc, $a
 	jp CopyData
 
diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm
index 2113e50a..6a8925ae 100755
--- a/engine/evos_moves.asm
+++ b/engine/evos_moves.asm
@@ -114,7 +114,7 @@ Evolution_PartyMonLoop: ; loop over party mons
 	ld a, [wWhichPokemon]
 	ld hl, wPartyMonNicks
 	call GetPartyMonName
-	call CopyStringToCF4B
+	call CopyStringToCF50
 	ld hl, IsEvolvingText
 	call PrintText
 	ld c, 50
@@ -268,7 +268,7 @@ RenameEvolvedMon: ; 3aef7 (e:6ef7)
 	pop af
 	ld [wd0b5], a
 	ld hl, wcd6d
-	ld de, wcf4b
+	ld de, wcf50
 .compareNamesLoop
 	ld a, [de]
 	inc de
@@ -368,7 +368,7 @@ LearnMoveFromLevelUp: ; 3af5b (e:6f5b)
 	ld [wMoveNum], a
 	ld [wd11e], a
 	call GetMoveName
-	call CopyStringToCF4B
+	call CopyStringToCF50
 	predef LearnMove
 .done
 	ld a, [wcf91]
diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm
index 33e7b426..ba74c08d 100755
--- a/engine/give_pokemon.asm
+++ b/engine/give_pokemon.asm
@@ -18,7 +18,7 @@ _GivePokemon: ; 4fda5 (13:7da5)
 	callab LoadEnemyMonData
 	call SetPokedexOwnedFlag
 	callab SendNewMonToBox
-	ld hl, wcf4b
+	ld hl, wcf50
 	ld a, [wCurrentBoxNum]
 	and $7f
 	cp 9
diff --git a/engine/items/items.asm b/engine/items/items.asm
index 4d8ac893..09adc1d8 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -1304,9 +1304,9 @@ ItemUseMedicine: ; dabb (3:5abb)
 	jr nz,.statNameInnerLoop
 	jr .statNameLoop
 .gotStatName
-	ld de,wcf4b
+	ld de,wcf50
 	ld bc,10
-	call CopyData ; copy the stat's name to wcf4b
+	call CopyData ; copy the stat's name to wcf50
 	ld a,SFX_HEAL_AILMENT
 	call PlaySound
 	ld hl,VitaminStatRoseText
@@ -2033,7 +2033,7 @@ ItemUsePPRestore: ; e31e (3:631e)
 	ld a,[hl]
 	ld [wd11e],a
 	call GetMoveName
-	call CopyStringToCF4B ; copy name to wcf4b
+	call CopyStringToCF50 ; copy name to wcf50
 	pop hl
 	ld a,[wPPRestoreItem]
 	cp a,ETHER
@@ -2210,7 +2210,7 @@ ItemUseTMHM: ; e479 (3:6479)
 	ld a,[wd11e]
 	ld [wMoveNum],a
 	call GetMoveName
-	call CopyStringToCF4B ; copy name to wcf4b
+	call CopyStringToCF50 ; copy name to wcf50
 	pop af
 	ld hl,BootedUpTMText
 	jr nc,.printBootedUpMachineText
@@ -2236,7 +2236,7 @@ ItemUseTMHM: ; e479 (3:6479)
 	ld a,[wcf91]
 	push af
 .chooseMon
-	ld hl,wcf4b
+	ld hl,wcf50
 	ld de,wTempMoveNameBuffer
 	ld bc,14
 	call CopyData ; save the move name because DisplayPartyMenu will overwrite it
@@ -2247,7 +2247,7 @@ ItemUseTMHM: ; e479 (3:6479)
 	call DisplayPartyMenu
 	push af
 	ld hl,wTempMoveNameBuffer
-	ld de,wcf4b
+	ld de,wcf50
 	ld bc,14
 	call CopyData
 	pop af
@@ -2602,7 +2602,7 @@ TossItem_: ; e6f1 (3:66f1)
 	ld a,[wcf91]
 	ld [wd11e],a
 	call GetItemName
-	call CopyStringToCF4B ; copy name to wcf4b
+	call CopyStringToCF50 ; copy name to wcf50
 	ld hl,IsItOKToTossItemText
 	call PrintText
 	coord hl, 14, 7
@@ -2622,7 +2622,7 @@ TossItem_: ; e6f1 (3:66f1)
 	ld a,[wcf91]
 	ld [wd11e],a
 	call GetItemName
-	call CopyStringToCF4B ; copy name to wcf4b
+	call CopyStringToCF50 ; copy name to wcf50
 	ld hl,ThrewAwayItemText
 	call PrintText
 	pop hl
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm
index 3e0e49c5..4597b794 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -39,7 +39,7 @@ AskName: ; 64eb (1:64eb)
 	pop hl
 	pop af
 	ld [wUpdateSpritesEnabled], a
-	ld a, [wcf4b]
+	ld a, [wcf50]
 	cp $50
 	ret nz
 .declinedNickname
@@ -63,7 +63,7 @@ DisplayNameRaterScreen: ; 655c (1:655c)
 	call GBPalWhiteOutWithDelay3
 	call RestoreScreenTilesAndReloadTilePatterns
 	call LoadGBPal
-	ld a, [wcf4b]
+	ld a, [wcf50]
 	cp "@"
 	jr z, .playerCancelled
 	ld hl, wPartyMonNicks
@@ -109,7 +109,7 @@ DisplayNamingScreen: ; 6596 (1:6596)
 	ld a, 7
 	ld [wMaxMenuItem], a
 	ld a, $50
-	ld [wcf4b], a
+	ld [wcf50], a
 	xor a
 	ld hl, wNamingScreenSubmitName
 	ld [hli], a
@@ -157,7 +157,7 @@ DisplayNamingScreen: ; 6596 (1:6596)
 
 .submitNickname
 	pop de
-	ld hl, wcf4b
+	ld hl, wcf50
 	ld bc, NAME_LENGTH
 	call CopyData
 	call GBPalWhiteOutWithDelay3
@@ -382,7 +382,7 @@ PrintNicknameAndUnderscores: ; 68b1 (1:68b1)
 	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]
@@ -458,9 +458,9 @@ Handakutens: ; 68d6 (1:68d6)
 	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: ; 68eb (1:68eb)
-	ld hl, wcf4b
+	ld hl, wcf50
 	ld c, $0
 .loop
 	ld a, [hl]
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm
index 12b1441f..435d3356 100755
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -367,7 +367,7 @@ StartMenu_Item: ; 13302 (4:7302)
 	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
diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm
index 88670a16..c1f53eb9 100755
--- a/engine/oak_speech2.asm
+++ b/engine/oak_speech2.asm
@@ -15,7 +15,7 @@ ChoosePlayerName: ; 695d (1:695d)
 	xor a ; NAME_PLAYER_SCREEN
 	ld [wNamingScreenType], a
 	call DisplayNamingScreen
-	ld a, [wcf4b]
+	ld a, [wcf50]
 	cp "@"
 	jr z, .customName
 	call ClearScreen
@@ -48,7 +48,7 @@ ChooseRivalName: ; 69a4 (1:69a4)
 	ld a, NAME_RIVAL_SCREEN
 	ld [wNamingScreenType], a
 	call DisplayNamingScreen
-	ld a, [wcf4b]
+	ld a, [wcf50]
 	cp "@"
 	jr z, .customName
 	call ClearScreen
diff --git a/engine/overworld/cinnabar_lab.asm b/engine/overworld/cinnabar_lab.asm
index f7c5e326..c83add51 100755
--- a/engine/overworld/cinnabar_lab.asm
+++ b/engine/overworld/cinnabar_lab.asm
@@ -116,7 +116,7 @@ LoadFossilItemAndMonName: ; 610eb (18:50eb)
 	ld a, [wFossilMon]
 	ld [wd11e], a
 	call GetMonName
-	call CopyStringToCF4B
+	call CopyStringToCF50
 	ld a, [wFossilItem]
 	ld [wd11e], a
 	call GetItemName
diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm
index ae96c4a9..725bd6a4 100755
--- a/engine/overworld/pokemart.asm
+++ b/engine/overworld/pokemart.asm
@@ -159,7 +159,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
 	ld a,[wcf91] ; item ID
 	ld [wd11e],a ; store item ID for GetItemName
 	call GetItemName
-	call CopyStringToCF4B ; copy name to wcf4b
+	call CopyStringToCF50 ; copy name to wcf50
 	ld hl,PokemartTellBuyPriceText
 	call PrintText
 	coord hl, 14, 7
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm
index eb1cf3c3..1a6c4824 100755
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -445,7 +445,7 @@ SlotMachine_CheckForMatches: ; 37588 (d:7588)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld de, wcf4b
+	ld de, wcf50
 	ld bc, 4
 	call CopyData
 	pop hl
diff --git a/engine/trade.asm b/engine/trade.asm
index 1642e729..0092fd17 100755
--- a/engine/trade.asm
+++ b/engine/trade.asm
@@ -189,7 +189,7 @@ LoadTradingGFXAndMonNames: ; 411a1 (10:51a1)
 	ld [wd11e], a
 	call GetMonName
 	ld hl, wcd6d
-	ld de, wcf4b
+	ld de, wcf50
 	ld bc, NAME_LENGTH
 	call CopyData
 	ld a, [wTradedEnemyMonSpecies]
diff --git a/engine/trade2.asm b/engine/trade2.asm
index 10bef792..9c6cd76e 100755
--- a/engine/trade2.asm
+++ b/engine/trade2.asm
@@ -10,7 +10,7 @@ Trade_PrintPlayerMonInfoText: ; 42769 (10:6769)
 	lb bc, LEADING_ZEROES | 1, 3
 	call PrintNumber
 	coord hl, 5, 2
-	ld de,wcf4b
+	ld de,wcf50
 	call PlaceString
 	coord hl, 8, 4
 	ld de,wTradedPlayerMonOT
-- 
cgit v1.2.3