diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/HoF_room_pc.asm | 4 | ||||
| -rwxr-xr-x | engine/hall_of_fame.asm | 9 | ||||
| -rwxr-xr-x | engine/hidden_object_functions17.asm | 16 | ||||
| -rwxr-xr-x | engine/menu/diploma.asm | 13 | ||||
| -rwxr-xr-x | engine/menu/prize_menu.asm | 2 | ||||
| -rwxr-xr-x | engine/save.asm | 28 | ||||
| -rwxr-xr-x | engine/town_map.asm | 7 |
7 files changed, 43 insertions, 36 deletions
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 |