Merge branch 'master' of https://github.com/einstein95/pokered-fr

26 files changed, 115 insertions, 113 deletions

diff --git a/data/credits_order.asm b/data/credits_order.asm
index 20b9137f..8d5b932b 100755
--- a/data/credits_order.asm
+++ b/data/credits_order.asm
@@ -27,13 +27,12 @@ CreditsOrder:
 	db CRED_PRODUCERS, CRED_ISHIHARA, $FE
 	db CRED_US_STAFF, $FD
 	db CRED_US_COORD, CRED_TILDEN, $FD
-	db CRED_US_COORD, CRED_KAWAKAMI, CRED_HI_NAKAMURA, $FC
-	db CRED_US_COORD, CRED_GIESE, CRED_OSBORNE, $FC
-	db CRED_TRANS, CRED_OGASAWARA, $FD
-	db CRED_PROGRAMMERS, CRED_MURAKAWA, CRED_FUKUI, $FD
-	db CRED_SPECIAL, CRED_IWATA, $FD
-	db CRED_SPECIAL, CRED_HARADA, $FC
-	db CRED_TEST, CRED_PAAD, CRED_CLUB, $FD
-	db CRED_PRODUCER, CRED_IZUSHI, $FD
-	db CRED_EXECUTIVE, CRED_YAMAUCHI, $FF
+	db CRED_US_COORD, CRED_KAWAKAMI, CRED_HI_NAKAMURA, CRED_GIESE, $FC
+	db CRED_US_COORD, CRED_OSBORNE, CRED_TRANS, CRED_OGASAWARA, $FC
+	db CRED_IWATA, CRED_IZUSHI, CRED_HARADA, $FD
+	db CRED_PROGRAMMERS, CRED_PAAD, $40, $FD
+	db CRED_SPECIAL, CRED_CLUB, CRED_MURAKAWA, $FC
+	db $41, $42, $43, $44, $FD
+	db $2A, $3D, $FD
+	db $2B, $0C, $FF
 	db $FB, $FF, $FA
diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm
index 0ac69e5e..0fe55731 100755
--- a/data/pokedex_entries.asm
+++ b/data/pokedex_entries.asm
@@ -1254,6 +1254,6 @@ VictreebelDexEntry:
 
 MissingNoDexEntry:
 	db "???@"
-	db 10 ; 1.0 m
-	db 100 ; 10.0 kg
-	db 0,"コメント さくせいちゅう@" ; コメント作成中 (Comment to be written)
+	db 10
+	db 100
+	db 0,"コメント さくせいちゅう@"
diff --git a/data/prizes.asm b/data/prizes.asm
index 1120c0d0..cc879ffb 100755
--- a/data/prizes.asm
+++ b/data/prizes.asm
@@ -9,7 +9,7 @@ PrizeDifferentMenuPtrs:
 	dw PrizeMenuTMsCost
 
 NoThanksText:
-	db "NO THANKS@"
+	db "NON MERCI@"
 
 PrizeMenuMon1Entries:
 	db ABRA
diff --git a/data/trades.asm b/data/trades.asm
index cf0fcbfd..2a0b6dfe 100755
--- a/data/trades.asm
+++ b/data/trades.asm
@@ -1,12 +1,12 @@
 TradeMons:
 ; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total
-	db NIDORINO,  NIDORINA, 0,"TERRY@@@@@@"
+	db NIDORINO,  NIDORINA, 0,"BIBICHE@@@@"
 	db ABRA,      MR_MIME,  0,"MARCEL@@@@@"
 	db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@"
-	db PONYTA,    SEEL,     0,"SAILOR@@@@@"
-	db SPEAROW,   FARFETCHD,2,"DUX@@@@@@@@"
-	db SLOWBRO,   LICKITUNG,0,"MARC@@@@@@@"
-	db POLIWHIRL, JYNX,     1,"LOLA@@@@@@@"
-	db RAICHU,    ELECTRODE,1,"DORIS@@@@@@"
-	db VENONAT,   TANGELA,  2,"CRINKLES@@@"
-	db NIDORAN_M, NIDORAN_F,2,"SPOT@@@@@@@"
+	db PONYTA,    SEEL,     0,"BIBI@@@@@@@"
+	db SPEAROW,   FARFETCHD,2,"JULIO@@@@@@"
+	db SLOWBRO,   LICKITUNG,0,"GLAVIOTEUR@"
+	db POLIWHIRL, JYNX,     1,"NINI@@@@@@@"
+	db RAICHU,    ELECTRODE,1,"KOURJUS@@@@"
+	db VENONAT,   TANGELA,  2,"BIGOUDI@@@@"
+	db NIDORAN_M, NIDORAN_F,2,"FABI@@@@@@@"
diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm
index 82aa6d52..d91c983b 100755
--- a/engine/HoF_room_pc.asm
+++ b/engine/HoF_room_pc.asm
@@ -258,8 +258,8 @@ Credits:
 
 TheEndTextString:
 ; "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 9eb4edc5..10b73bb0 100755
--- a/engine/hall_of_fame.asm
+++ b/engine/hall_of_fame.asm
@@ -92,7 +92,7 @@ AnimateHallOfFame:
 	ret
 
 HallOfFameText:
-	db "HALL OF FAME@"
+	db "CELEBRITE@"
 
 HoFShowMonOrPlayer:
 	call ClearScreen
@@ -178,7 +178,7 @@ HoFDisplayMonInfo:
 	jp PlayCry
 
 HoFMonInfoText:
-	db   "LEVEL/"
+	db   "NIVEAU/"
 	next "TYPE1/"
 	next "TYPE2/@"
 
@@ -239,6 +239,7 @@ HoFDisplayPlayerStats:
 	ld de, wPlayerMoney
 	ld c, $a3
 	call PrintBCDNumber
+	ld [hl], $F0
 	ld hl, DexSeenOwnedText
 	call HoFPrintTextAndDelay
 	ld hl, DexRatingText
@@ -251,10 +252,10 @@ HoFPrintTextAndDelay:
 	jp DelayFrames
 
 HoFPlayTimeText:
-	db "PLAY TIME@"
+	db "DUREE JEU@"
 
 HoFMoneyText:
-	db "MONEY@"
+	db "ARGENT@"
 
 DexSeenOwnedText:
 	TX_FAR _DexSeenOwnedText
diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm
index 1b571d35..4b159ab4 100755
--- a/engine/hidden_object_functions17.asm
+++ b/engine/hidden_object_functions17.asm
@@ -150,11 +150,19 @@ LinkCableHelpText2:
 	TX_FAR _LinkCableHelpText2
 	db "@"
 
+<<<<<<< HEAD
 HowToLinkText:
 	db   "HOW TO LINK"
 	next "COLOSSEUM"
 	next "TRADE CENTER"
 	next "STOP READING@"
+=======
+HowToLinkText: ; 5dca8 (17:5ca8)
+	db   "CABLE LINK"
+	next "COLISEE"
+	next "CENTRE TROC"
+	next "NE PLUS LIRE@"
+>>>>>>> 6c2df7c2aea94b0e5a5532293aae9a25d64a8050
 
 LinkCableInfoTexts:
 	dw LinkCableInfoText1
@@ -268,14 +276,14 @@ ViridianSchoolBlackboardText2:
 	db "@"
 
 StatusAilmentText1:
-	db   " SLP"
+	db   " SOM"
 	next " PSN"
 	next " PAR@"
 
 StatusAilmentText2:
-	db   " BRN"
-	next " FRZ"
-	next " QUIT@@"
+	db   " BRU"
+	next " GEL"
+	next " RET@"
 
 ViridianBlackboardStatusPointers:
 	dw ViridianBlackboardSleepText
diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm
index 09ba123e..4fc02ff8 100755
--- a/engine/menu/diploma.asm
+++ b/engine/menu/diploma.asm
@@ -94,20 +94,19 @@ DiplomaTextPointersAndCoords:
 	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 f6ca013b..4fbb739f 100755
--- a/engine/menu/prize_menu.asm
+++ b/engine/menu/prize_menu.asm
@@ -166,7 +166,7 @@ PrintPrizePrice:
 	ret
 
 .CoinString:
-	db "COIN@"
+	db "JETONS@"
 
 .SixSpacesString:
 	db "      @"
diff --git a/engine/save.asm b/engine/save.asm
index 4fb2c4c8..d1a370f2 100755
--- a/engine/save.asm
+++ b/engine/save.asm
@@ -171,7 +171,7 @@ SaveSAV:
 	jp DelayFrames
 
 NowSavingString:
-	db "Now saving...@"
+	db "Sauvegarde...@"
 
 SaveSAVConfirm:
 	call PrintText
@@ -494,21 +494,21 @@ ChooseABoxText:
 	db "@"
 
 BoxNames:
-	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:
-	db "BOX No.@"
+	db "BOITE@"
 
 EmptyAllSRAMBoxes:
 ; 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 d417e0a3..7cdc1867 100755
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -120,8 +120,7 @@ LoadTownMap_Nest:
 	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:
 	ret
 
 MonsNestText:
-	db "'s NEST@"
+	db "NID DE @"
 
 LoadTownMap_Fly:
 	call ClearSprites
@@ -415,7 +414,7 @@ DisplayWildLocations:
 	jp CopyData
 
 AreaUnknownText:
-	db " AREA UNKNOWN@"
+	db " ZONE INCONNUE@"
 
 TownMapCoordsToOAMCoords:
 ; in: lower nybble of a = x, upper nybble of a = y
diff --git a/extras b/extras
-Subproject 0e1798937a4bf723813574281d0dc12c471c919
+Subproject f88b44cd063eabb5d58c48342dd19aa0d808f2c
diff --git a/gfx/red/redgreenversion.png b/gfx/red/redgreenversion.png
deleted file mode 100644
index e41b4295..00000000
--- a/gfx/red/redgreenversion.png
+++ /dev/null
diff --git a/gfx/red/redversion.png b/gfx/red/redversion.png
new file mode 100644
index 00000000..ea39a7a3
--- /dev/null
+++ b/gfx/red/redversion.png
diff --git a/gfx/red/sgbborder.map b/gfx/red/sgbborder.map
index 4077ed8e..f9d81d81 100644
--- a/gfx/red/sgbborder.map
+++ b/gfx/red/sgbborder.map
diff --git a/gfx/red/sgbborder.png b/gfx/red/sgbborder.png
index 7549bb47..5826cba9 100644
--- a/gfx/red/sgbborder.png
+++ b/gfx/red/sgbborder.png
diff --git a/main.asm b/main.asm
index f46c34b2..020c8a7f 100755
--- a/main.asm
+++ b/main.asm
@@ -6475,7 +6475,7 @@ INCLUDE "engine/battle/decrement_pp.asm"
 
 Version_GFX:
 IF DEF(_RED)
-	INCBIN "gfx/red/redgreenversion.1bpp" ; 10 tiles
+	INCBIN "gfx/red/redversion.1bpp" ; 10 tiles
 ENDC
 IF DEF(_BLUE)
 	INCBIN "gfx/blue/blueversion.1bpp" ; 8 tiles
diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm
index 09d2df37..bdf76540 100755
--- a/scripts/celadongamecorner.asm
+++ b/scripts/celadongamecorner.asm
@@ -508,13 +508,13 @@ CeladonGameCornerScript_48f1e:
 	ret
 
 GameCornerMoneyText:
-	db "MONEY@"
+	db "ARG.@"
 
 GameCornerCoinText:
-	db "COIN@"
+	db "JETONS@"
 
 GameCornerBlankText1:
-	db "       @"
+	db "      ¥@"
 
 GameCornerBlankText2:
 	db "       @"
diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm
index 8f6e9e53..5f86df96 100755
--- a/scripts/celadongym.asm
+++ b/scripts/celadongym.asm
@@ -17,7 +17,7 @@ CeladonGymScript_48927:
 	jp LoadGymLeaderAndCityName
 
 Gym4CityName:
-	db "CELADON CITY@"
+	db "CELADOPOLE@"
 
 Gym4LeaderName:
 	db "ERIKA@"
diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm
index fe6a163e..326e2d6d 100755
--- a/scripts/ceruleangym.asm
+++ b/scripts/ceruleangym.asm
@@ -17,10 +17,10 @@ CeruleanGymScript_5c6d0:
 	jp LoadGymLeaderAndCityName
 
 Gym2CityName:
-	db "CERULEAN CITY@"
+	db "AZURIA@"
 
 Gym2LeaderName:
-	db "MISTY@"
+	db "ONDINE@"
 
 CeruleanGymScript_5c6ed:
 	xor a
diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm
index ac035550..854a3f72 100755
--- a/scripts/pewtergym.asm
+++ b/scripts/pewtergym.asm
@@ -17,10 +17,10 @@ PewterGymScript_5c3a4:
 	jp LoadGymLeaderAndCityName
 
 Gym1CityName:
-	db "PEWTER CITY@"
+	db "ARGENTA@"
 
 Gym1LeaderName:
-	db "BROCK@"
+	db "PIERRE@"
 
 PewterGymScript_5c3bf:
 	xor a
diff --git a/scripts/route23.asm b/scripts/route23.asm
index 4eb6b5f7..1a24ecf6 100755
--- a/scripts/route23.asm
+++ b/scripts/route23.asm
@@ -92,25 +92,25 @@ BadgeTextPointers:
 	dw EarthBadgeText
 
 EarthBadgeText:
-	db "EARTHBADGE@"
+	db "BADGE TERRE@"
 
 VolcanoBadgeText:
-	db "VOLCANOBADGE@"
+	db "BADGE VOLCAN@"
 
 MarshBadgeText:
-	db "MARSHBADGE@"
+	db "BADGE MARAIS@"
 
 SoulBadgeText:
-	db "SOULBADGE@"
+	db "BADGE AME@"
 
 RainbowBadgeText:
-	db "RAINBOWBADGE@"
+	db "BADGE PRISME@"
 
 ThunderBadgeText:
-	db "THUNDERBADGE@"
+	db "BADGE FOUDRE@"
 
 CascadeBadgeText:
-	db "CASCADEBADGE@"
+	db "BADGECASCADE@"
 
 Route23Script_512d8:
 	ld a, $1
diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm
index 6adb6d52..804b1b78 100755
--- a/scripts/saffrongym.asm
+++ b/scripts/saffrongym.asm
@@ -17,10 +17,10 @@ SaffronGymScript:
 	jp LoadGymLeaderAndCityName
 
 Gym6CityName:
-	db "SAFFRON CITY@"
+	db "SAFRANIA@"
 
 Gym6LeaderName:
-	db "SABRINA@"
+	db "MORGANE@"
 
 SaffronGymText_5d048:
 	xor a
diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm
index 99bd4008..25d5abad 100755
--- a/scripts/vermiliongym.asm
+++ b/scripts/vermiliongym.asm
@@ -22,10 +22,10 @@ VermilionGymScript_5ca4c:
 	jp LoadGymLeaderAndCityName
 
 Gym3CityName:
-	db "VERMILION CITY@"
+	db "CARMIN SUR MER@"
 
 Gym3LeaderName:
-	db "LT.SURGE@"
+	db "MAJOR BOB@"
 
 VermilionGymScript_5ca6d:
 	CheckEvent EVENT_2ND_LOCK_OPENED
diff --git a/text.asm b/text.asm
index b3171d26..c414b530 100644
--- a/text.asm
+++ b/text.asm
@@ -81,11 +81,7 @@ _PokeCenterSignText::
 	done
 
 _FoundItemText::
-<<<<<<< cef6459db617ad0863c856831ebcb9d745c43ddf
-	text "<PLAYER> found"
-=======
-	text $52, " obtient..."
->>>>>>> More text, filled out charmap.asm
+	text "<PLAYER> obtient..."
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
diff --git a/text/map_names.asm b/text/map_names.asm
index cd9f6640..b98e310f 100755
--- a/text/map_names.asm
+++ b/text/map_names.asm
@@ -1,26 +1,26 @@
 MapNames:
 PalletTownName:
-	db "PALLET TOWN@"
+	db "BOURG PALETTE@"
 ViridianCityName:
-	db "VIRIDIAN CITY@"
+	db "JADIELLE@"
 PewterCityName:
-	db "PEWTER CITY@"
+	db "ARGENTA@"
 CeruleanCityName:
-	db "CERULEAN CITY@"
+	db "AZURIA@"
 LavenderTownName:
-	db "LAVENDER TOWN@"
+	db "LAVANVILLE@"
 VermilionCityName:
-	db "VERMILION CITY@"
+	db "CARMIN SUR MER@"
 CeladonCityName:
-	db "CELADON CITY@"
+	db "CELADOPOLE@"
 FuchsiaCityName:
-	db "FUCHSIA CITY@"
+	db "PARMANIE@"
 CinnabarIslandName:
-	db "CINNABAR ISLAND@"
+	db "CRAMOIS'ILE@"
 IndigoPlateauName:
-	db "INDIGO PLATEAU@"
+	db "PLATEAU INDIGO@"
 SaffronCityName:
-	db "SAFFRON CITY@"
+	db "SAFRANIA@"
 Route1Name:
 	db "ROUTE 1@"
 Route2Name:
@@ -58,11 +58,11 @@ Route17Name:
 Route18Name:
 	db "ROUTE 18@"
 Route19Name:
-	db "SEA ROUTE 19@"
+	db "CHENAL 19@"
 Route20Name:
-	db "SEA ROUTE 20@"
+	db "CHENAL 20@"
 Route21Name:
-	db "SEA ROUTE 21@"
+	db "CHENAL 21@"
 Route22Name:
 	db "ROUTE 22@"
 Route23Name:
@@ -72,36 +72,36 @@ Route24Name:
 Route25Name:
 	db "ROUTE 25@"
 ViridianForestName:
-	db "VIRIDIAN FOREST@"
+	db "FORET DE JADE@"
 MountMoonName:
-	db "MT.MOON@"
+	db "MONT SELENITE@"
 RockTunnelName:
-	db "ROCK TUNNEL@"
+	db "GROTTE@"
 SeaCottageName:
-	db "SEA COTTAGE@"
+	db "VILLA@"
 SSAnneName:
-	db "S.S.ANNE@"
+	db "L'OCEANE@"
 PokemonLeagueName:
-	db "#MON LEAGUE@"
+	db "LIGUE #MON@"
 UndergroundPathName:
-	db "UNDERGROUND PATH@"
+	db "SOUTERRAIN@"
 PokemonTowerName:
-	db "#MON TOWER@"
+	db "TOUR #MON@"
 SeafoamIslandsName:
-	db "SEAFOAM ISLANDS@"
+	db "ILES ECUME@"
 VictoryRoadName:
-	db "VICTORY ROAD@"
+	db "ROUTE VICTOIRE@"
 DiglettsCaveName:
-	db "DIGLETT's CAVE@"
+	db "CAVE TAUPIQUEUR@"
 RocketHQName:
-	db "ROCKET HQ@"
+	db "REPAIRE ROCKET@"
 SilphCoName:
-	db "SILPH CO.@"
+	db "SYLPHE SARL@"
 PokemonMansionName:
-	db $4a," MANSION@"
+	db "MANOIR ",$4a,"@"
 SafariZoneName:
-	db "SAFARI ZONE@"
+	db "PARC SAFARI@"
 CeruleanCaveName:
-	db "CERULEAN CAVE@"
+	db "GROTTE INCONNUE@"
 PowerPlantName:
-	db "POWER PLANT@"
+	db "CENTRALE@"