diff options
Diffstat (limited to 'engine')
39 files changed, 422 insertions, 414 deletions
diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index 82aa6d52..a39daf06 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -246,20 +246,20 @@ Credits: pop de ld de, TheEndGfx ld hl, vChars2 + $600 - lb bc, BANK(TheEndGfx), (TheEndGfxEnd - TheEndGfx) / $10 + lb bc, BANK(TheEndGfx), (TheEndGfxEnd - TheEndGfx) / $0C call CopyVideoData - coord hl, 4, 8 + coord hl, 7, 8 ld de, TheEndTextString call PlaceString - coord hl, 4, 9 + coord hl, 7, 9 inc de call PlaceString jp FadeInCreditsText 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/battle/core.asm b/engine/battle/core.asm index 4e7c8032..6ec9930c 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2120,12 +2120,12 @@ DisplayBattleMenu: ld bc, NAME_LENGTH call CopyData ; the following simulates the keystrokes by drawing menus on screen - coord hl, 9, 14 + coord hl, 7, 14 ld [hl], "▶" ld c, 80 call DelayFrames ld [hl], " " - coord hl, 9, 16 + coord hl, 7, 16 ld [hl], "▶" ld c, 50 call DelayFrames @@ -2133,7 +2133,7 @@ DisplayBattleMenu: ld a, $2 ; select the "ITEM" menu jp .upperLeftMenuItemWasNotSelected .oldManName - db "OLD MAN@" + db "VIEILLARD@" .handleBattleMenuInput ld a, [wBattleAndStartSavedMenuItem] ld [wCurrentMenuItem], a @@ -2150,13 +2150,13 @@ DisplayBattleMenu: ld a, " " jr z, .safariLeftColumn ; put cursor in left column for normal battle menu (i.e. when it's not a Safari battle) - Coorda 15, 14 ; clear upper cursor position in right column - Coorda 15, 16 ; clear lower cursor position in right column - ld b, $9 ; top menu item X + Coorda 13, 14 ; clear upper cursor position in right column + Coorda 13, 16 ; clear lower cursor position in right column + ld b, $7 ; top menu item X jr .leftColumn_WaitForInput .safariLeftColumn - Coorda 13, 14 - Coorda 13, 16 + Coorda 12, 14 + Coorda 12, 16 coord hl, 7, 14 ld de, wNumSafariBalls lb bc, 1, 2 @@ -2183,9 +2183,9 @@ DisplayBattleMenu: ld a, " " jr z, .safariRightColumn ; put cursor in right column for normal battle menu (i.e. when it's not a Safari battle) - Coorda 9, 14 ; clear upper cursor position in left column - Coorda 9, 16 ; clear lower cursor position in left column - ld b, $f ; top menu item X + Coorda 7, 14 ; clear upper cursor position in left column + Coorda 7, 16 ; clear lower cursor position in left column + ld b, $d ; top menu item X jr .rightColumn_WaitForInput .safariRightColumn Coorda 1, 14 ; clear upper cursor position in left column @@ -2194,7 +2194,7 @@ DisplayBattleMenu: ld de, wNumSafariBalls lb bc, 1, 2 call PrintNumber - ld b, $d ; top menu item X + ld b, $c ; top menu item X .rightColumn_WaitForInput ld hl, wTopMenuItemY ld a, $e @@ -2326,7 +2326,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 @@ -2765,7 +2765,8 @@ MoveDisabledText: db "@" WhichTechniqueString: - db "WHICH TECHNIQUE?@" + db "Quelle technique?" + next " @" SelectMenuItem_CursorUp: ld a, [wCurrentMenuItem] @@ -2985,7 +2986,7 @@ PrintMenuItem: jp Delay3 DisabledText: - db "disabled!@" + db "NON DISP.@" TypeText: db "TYPE@" @@ -3631,7 +3632,7 @@ CheckPlayerStatusConditions: ld a, RAGE ld [wd11e], a call GetMoveName - call CopyStringToCF4B + call CopyStringToCF50 xor a ld [wPlayerMoveEffect], a ld hl, PlayerCanExecuteMove @@ -3833,7 +3834,7 @@ PrintMoveName: ret _PrintMoveName: - TX_FAR _CF4BText + TX_FAR _CF50Text TX_ASM ld hl, ExclamationPointPointerTable ld a, [wd11e] ; exclamation point num @@ -5215,7 +5216,7 @@ ReloadMoveData: 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 @@ -5716,7 +5717,7 @@ EnemyCanExecuteChargingMove: ld [wNameListType], a call GetName ld de, wcd6d - call CopyStringToCF4B + call CopyStringToCF50 EnemyCanExecuteMove: xor a ld [wMonIsDisobedient], a @@ -6153,7 +6154,7 @@ CheckEnemyStatusConditions: ld a, RAGE ld [wd11e], a call GetMoveName - call CopyStringToCF4B + call CopyStringToCF50 xor a ld [wEnemyMoveEffect], a ld hl, EnemyCanExecuteMove @@ -6195,7 +6196,7 @@ GetCurrentMove: ld [wNameListType], a call GetName ld de, wcd6d - jp CopyStringToCF4B + jp CopyStringToCF50 LoadEnemyMonData: ld a, [wLinkState] @@ -6906,16 +6907,20 @@ InitWildBattle: 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 @@ -7953,17 +7958,17 @@ PrintStatText: jr z, .findStatName_outer jr .findStatName_inner .foundStatName - ld de, wcf4b + ld de, wcf50 ld bc, $a jp CopyData StatsTextStrings: - 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: ; 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 c77e3b39..92a1bcda 100755 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -75,13 +75,13 @@ EndOfBattle: ret YouWinText: - db "YOU WIN@" + db " GAGNE@" YouLoseText: - db "YOU LOSE@" + db " PERDU@" DrawText: - db " DRAW@" + db "MATCH NUL@" PickUpPayDayMoneyText: TX_FAR _PickUpPayDayMoneyText diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm index 76559117..cc98239d 100644 --- a/engine/battle/link_battle_versus_text.asm +++ b/engine/battle/link_battle_versus_text.asm @@ -12,10 +12,18 @@ DisplayLinkBattleVersusTextBox: ld de, wLinkEnemyTrainerName call PlaceString ; place bold "VS" tiles between the names - coord hl, 9, 8 - ld a, $69 - ld [hli], a - ld [hl], $6a + coord hl, 7, 8 + ld a, "C" + ldi [hl], a + ld a, "O" + ldi [hl], a + ld a, "N" + ldi [hl], a + ld a, "T" + ldi [hl], a + ld a, "R" + ldi [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 7e2c911c..45b35a76 100644 --- a/engine/battle/save_trainer_name.asm +++ b/engine/battle/save_trainer_name.asm @@ -69,44 +69,44 @@ TrainerNamePointers: dw wTrainerName YoungsterName: - db "YOUNGSTER@" + db "GAMIN@" BugCatcherName: - db "BUG CATCHER@" + db "SCOUT@" LassName: - db "LASS@" + db "FILLETTE@" JrTrainerMName: - db "JR.TRAINER♂@" + db "DRESSEUR JR♂@" JrTrainerFName: - db "JR.TRAINER♀@" + db "DRESSEUR JR♀@" PokemaniacName: - db "POKéMANIAC@" + db "#MANIAC@" SuperNerdName: - db "SUPER NERD@" + db "INTELLO@" BurglarName: - db "BURGLAR@" + db "PILLARD@" EngineerName: - db "ENGINEER@" + db "MECANO@" JugglerXName: - db "JUGGLER@" + db "JONGLEUR@" SwimmerName: - db "SWIMMER@" + db "NAGEUR@" BeautyName: - db "BEAUTY@" + db "CANON@" RockerName: db "ROCKER@" JugglerName: - db "JUGGLER@" + db "JONGLEUR@" BlackbeltName: - db "BLACKBELT@" + db "KARATEKA@" ProfOakName: - db "PROF.OAK@" + db "PROF.CHEN@" ChiefName: db "CHIEF@" ScientistName: - db "SCIENTIST@" + db "SCIENTIFIQUE@" RocketName: db "ROCKET@" CooltrainerMName: - db "COOLTRAINER♂@" + db "TOPDRESSEUR♂@" CooltrainerFName: - db "COOLTRAINER♀@" + db "TOPDRESSEUR♀@" diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 3e72daa9..dba25e56 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -290,7 +290,7 @@ CableClub_DoBattleOrTradeAgain: jr CallCurrentTradeCenterFunction PleaseWaitString: - 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 @@ -596,9 +596,9 @@ ReturnToCableClubRoom: ret TradeCenter_DrawCancelBox: - coord hl, 11, 15 + coord hl, 8, 15 ld a, $7e - ld bc, 2 * SCREEN_WIDTH + 9 + ld bc, 2 * SCREEN_WIDTH + 12 call FillMemory coord hl, 0, 15 ld b, 1 @@ -609,7 +609,7 @@ TradeCenter_DrawCancelBox: jp PlaceString CancelTextString: - db "CANCEL@" + db "ANNULER@" TradeCenter_PlaceSelectedEnemyMonMenuCursor: ld a, [wSerialSyncAndExchangeNybbleReceiveData] @@ -712,8 +712,8 @@ TradeCenter_Trade: coord bc, 1, 14 call TextCommandProcessor call SaveScreenTilesToBuffer1 - coord hl, 10, 7 - lb bc, 8, 11 + coord hl, 9, 7 + lb bc, 8, 10 ld a, TRADE_CANCEL_MENU ld [wTwoOptionMenuID], a ld a, TWO_OPTION_MENU @@ -876,11 +876,11 @@ WillBeTradedText: 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: dw TradeCenter_SelectMon diff --git a/engine/evolve_trade.asm b/engine/evolve_trade.asm index e17fc05c..d3a0ee63 100755 --- a/engine/evolve_trade.asm +++ b/engine/evolve_trade.asm @@ -17,18 +17,19 @@ EvolveTradeMon: ; 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/evos_moves.asm b/engine/evos_moves.asm index f50f8081..dc7d5668 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: 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: 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 49596782..d3c41885 100755 --- a/engine/give_pokemon.asm +++ b/engine/give_pokemon.asm @@ -18,7 +18,7 @@ _GivePokemon: callab LoadEnemyMonData call SetPokedexOwnedFlag callab SendNewMonToBox - ld hl, wcf4b + ld hl, wcf50 ld a, [wCurrentBoxNum] and $7f cp 9 diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 9eb4edc5..13c6f4dc 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/@" @@ -237,8 +237,9 @@ HoFDisplayPlayerStats: call PlaceString coord hl, 4, 10 ld de, wPlayerMoney - ld c, $a3 + ld c, $83 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 c1fa5aa4..9d84b6a8 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -151,10 +151,10 @@ LinkCableHelpText2: db "@" HowToLinkText: - 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: dw LinkCableInfoText1 @@ -268,14 +268,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/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index f04c1deb..2f9a6aa5 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -445,11 +445,11 @@ BillsHousePokemonListText1: db "@" BillsMonListText: - db "EEVEE" - next "FLAREON" - next "JOLTEON" - next "VAPOREON" - next "CANCEL@" + db "EVOLI" + next "PYROLI" + next "VOLTALI" + next "AQUALI" + next "RETOUR@" BillsHousePokemonListText2: TX_FAR _BillsHousePokemonListText2 diff --git a/engine/items/items.asm b/engine/items/items.asm index c4c1634b..fd78ca3c 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 "You don't have" - line "any #MON!" + text "Vous n'avez pas" + line "de #MON!" prompt .notUsingSoftboiled call DisplayPartyMenu @@ -1306,9 +1306,9 @@ ItemUseMedicine: 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 @@ -1425,11 +1425,11 @@ VitaminNoEffectText: db "@" VitaminText: - db "HEALTH@" - db "ATTACK@" - db "DEFENSE@" - db "SPEED@" - db "SPECIAL@" + db "VIE@" + db "FOR@" + db "DEF@" + db "VIT@" + db "SPE@" ItemUseBait: ld hl,ThrewBaitText @@ -2035,7 +2035,7 @@ ItemUsePPRestore: 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 @@ -2212,7 +2212,7 @@ ItemUseTMHM: 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 @@ -2238,7 +2238,7 @@ ItemUseTMHM: 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 @@ -2249,7 +2249,7 @@ ItemUseTMHM: call DisplayPartyMenu push af ld hl,wTempMoveNameBuffer - ld de,wcf4b + ld de,wcf50 ld bc,14 call CopyData pop af @@ -2604,7 +2604,7 @@ TossItem_: 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 @@ -2624,7 +2624,7 @@ TossItem_: 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/bills_pc.asm b/engine/menu/bills_pc.asm index 85a546e1..1bae3b51 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -12,17 +12,17 @@ DisplayPCMainMenu:: jr nz, .leaguePCAvailable coord hl, 0, 0 ld b, 8 - ld c, 14 + ld c, 15 jr .next .noOaksPC coord hl, 0, 0 ld b, 6 - ld c, 14 + ld c, 15 jr .next .leaguePCAvailable coord hl, 0, 0 ld b, 10 - ld c, 14 + ld c, 15 .next call TextBoxBorder call UpdateSprites @@ -39,11 +39,11 @@ DisplayPCMainMenu:: .next2 call PlaceString coord hl, 2, 4 - ld de, wPlayerName + ld de, PlayersPCText call PlaceString ld l, c ld h, b - ld de, PlayersPCText + ld de, wPlayerName call PlaceString CheckEvent EVENT_GOT_POKEDEX jr z, .noOaksPC2 @@ -85,12 +85,12 @@ DisplayPCMainMenu:: ld [H_AUTOBGTRANSFERENABLED], a ret -SomeonesPCText: db "SOMEONE's PC@" -BillsPCText: db "BILL's PC@" -PlayersPCText: db "'s PC@" -OaksPCText: db "PROF.OAK's PC@" -PKMNLeaguePCText: db $4a, "LEAGUE@" -LogOffPCText: db "LOG OFF@" +SomeonesPCText: db "PC DE ???@" +BillsPCText: db "PC DE LEO@" +PlayersPCText: db "PC DE @" +OaksPCText: db "PC DE CHEN@" +PKMNLeaguePCText: db "LIGUE ", $4a, "@" +LogOffPCText: db "DECONNEXION@" BillsPC_:: ld hl, wd730 @@ -121,7 +121,7 @@ BillsPCMenu: call LoadScreenTilesFromBuffer2DisableBGTransfer coord hl, 0, 0 ld b, 10 - ld c, 12 + ld c, 14 call TextBoxBorder coord hl, 2, 2 ld de, BillsPCMenuText @@ -146,9 +146,9 @@ BillsPCMenu: ld [wPlayerMonNumber], a ld hl, WhatText call PrintText - coord hl, 9, 14 + coord hl, 11, 14 ld b, 2 - ld c, 9 + ld c, 7 call TextBoxBorder ld a, [wCurrentBoxNum] and $7f @@ -164,7 +164,7 @@ BillsPCMenu: add "1" .next Coorda 18, 16 - coord hl, 10, 16 + coord hl, 12, 16 ld de, BoxNoPCText call PlaceString ld a, 1 @@ -339,15 +339,15 @@ DisplayMonListMenu: ret BillsPCMenuText: - db "WITHDRAW ", $4a - next "DEPOSIT ", $4a - next "RELEASE ", $4a - next "CHANGE BOX" - next "SEE YA!" + db "RETIRER ", $4a + next "STOCKER ", $4a + next "RELACHER ", $4a + next "CHANGER BOITE" + next "SALUT!" db "@" BoxNoPCText: - db "BOX No.@" + db "BOITE@" KnowsHMMove:: ; returns whether mon with party index [wWhichPokemon] knows an HM move @@ -451,11 +451,11 @@ DisplayDepositWithdrawMenu: call LoadGBPal jr .loop -DepositPCText: db "DEPOSIT@" -WithdrawPCText: db "WITHDRAW@" +DepositPCText: db "STOCKER@" +WithdrawPCText: db "RETIRER@" StatsCancelPCText: db "STATS" - next "CANCEL@" + next "RETOUR@" SwitchOnText: TX_FAR _SwitchOnText diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm index 09ba123e..107fe17d 100755 --- a/engine/menu/diploma.asm +++ b/engine/menu/diploma.asm @@ -91,23 +91,22 @@ DiplomaTextPointersAndCoords: dw DiplomaCongrats dwCoord 2, 6 dw DiplomaGameFreak - dwCoord 9, 16 + dwCoord 9, 15 DiplomaText: - db $70,"Diploma",$70,"@" + db $70,"Diplôme",$70,"@" DiplomaPlayer: - db "Player@" + db "Joueur@" DiplomaEmptyText: db "@" DiplomaCongrats: - db "Congrats! This" - next "diploma certifies" - next "that you have" - next "completed your" - next "#DEX.@" + db "Fabuleux! Ce" + next "diplôme certifie" + next "la perfection de" + next "votre PokéDex@" DiplomaGameFreak: db "GAME FREAK@" diff --git a/engine/menu/draw_start_menu.asm b/engine/menu/draw_start_menu.asm index 83a81aac..914284c4 100644 --- a/engine/menu/draw_start_menu.asm +++ b/engine/menu/draw_start_menu.asm @@ -60,22 +60,22 @@ DrawStartMenu: ret StartMenuPokedexText: - db "POKéDEX@" + db "#DEX@" StartMenuPokemonText: - db "POKéMON@" + db "#MON@" StartMenuItemText: - db "ITEM@" + db "OBJET@" StartMenuSaveText: - db "SAVE@" + db "SAUVER@" StartMenuResetText: - db "RESET@" + db "QUITTER@" StartMenuExitText: - db "EXIT@" + db "RETOUR@" StartMenuOptionText: db "OPTION@" diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index 170c0ef3..eb561caf 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -106,14 +106,14 @@ LeaguePCShowMon: coord hl, 1, 15 ld de, HallOfFameNoText call PlaceString - coord hl, 16, 15 + coord hl, 15, 15 ld de, wHoFTeamNo lb bc, 1, 3 call PrintNumber jpba HoFDisplayMonInfo HallOfFameNoText: - db "HALL OF FAME No @" + db " CELEBRITE No. @" AccessedHoFPCText: TX_FAR _AccessedHoFPCText diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index cd4198b6..75a00486 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -329,16 +329,16 @@ SpecialEnterMap: jp EnterMap ContinueText: - db "CONTINUE", $4e + db "CONTINUER", $4e NewGameText: - db "NEW GAME" - next "OPTION@" + db "NOUVEAU JEU" + next "OPTIONS@" CableClubOptionsText: - db "TRADE CENTER" - next "COLOSSEUM" - next "CANCEL@" + db "CENTRE TROC" + next "COLISEE" + next "RETOUR@" DisplayContinueGameInfo: xor a @@ -421,10 +421,10 @@ PrintPlayTime: jp PrintNumber SaveScreenInfoText: - db "PLAYER" - next "BADGES " - next "#DEX " - next "TIME@" + db "JOUEUR" + next "BADGES " + next "#DEX " + next "TEMPS@" DisplayOptionMenu: coord hl, 0, 0 @@ -579,19 +579,19 @@ DisplayOptionMenu: jp .eraseOldMenuCursor TextSpeedOptionText: - db "TEXT SPEED" - next " FAST MEDIUM SLOW@" + db "VIT. TEXTE" + next " 3 2 1 @" BattleAnimationOptionText: - db "BATTLE ANIMATION" - next " ON OFF@" + db "ANIMATION COMBAT" + next " OUI NON@" BattleStyleOptionText: - db "BATTLE STYLE" - next " SHIFT SET@" + db "STYLE COMBAT" + next " CHOIX DEFINI@" OptionMenuCancelText: - db "CANCEL@" + db "RETOUR@" ; sets the options variable according to the current placement of the menu cursors in the options menu SetOptionsFromCursorPositions: diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 64065c4d..58bfc0d7 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -39,7 +39,7 @@ AskName: pop hl pop af ld [wUpdateSpritesEnabled], a - ld a, [wcf4b] + ld a, [wcf50] cp "@" ret nz .declinedNickname @@ -63,7 +63,7 @@ DisplayNameRaterScreen: call GBPalWhiteOutWithDelay3 call RestoreScreenTilesAndReloadTilePatterns call LoadGBPal - ld a, [wcf4b] + ld a, [wcf50] cp "@" jr z, .playerCancelled ld hl, wPartyMonNicks @@ -109,7 +109,7 @@ DisplayNamingScreen: ld a, 7 ld [wMaxMenuItem], a ld a, "@" - ld [wcf4b], a + ld [wcf50], a xor a ld hl, wNamingScreenSubmitName ld [hli], a @@ -157,7 +157,7 @@ DisplayNamingScreen: .submitNickname pop de - ld hl, wcf4b + ld hl, wcf50 ld bc, NAME_LENGTH call CopyData call GBPalWhiteOutWithDelay3 @@ -324,12 +324,15 @@ DisplayNamingScreen: jp EraseMenuCursor LoadEDTile: - ld de, ED_Tile - ld hl, vFont + $700 - ld bc, (ED_TileEnd - ED_Tile) / $8 + call DisableLCD + ld de, vFont + $700 + ld hl, ED_Tile + ld bc, (ED_TileEnd - ED_Tile) ; to fix the graphical bug on poor emulators - ;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile) / $8 - jp CopyVideoDataDouble + ;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile) + ld a,$01 + call FarCopyDataDouble + jp EnableLCD ED_Tile: INCBIN "gfx/ED_tile.1bpp" @@ -366,10 +369,10 @@ PrintAlphabet: jp Delay3 LowerCaseAlphabet: - db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥UPPER CASE@" + db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥MAJUSCULES@" UpperCaseAlphabet: - db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥lower case@" + db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥minuscules@" PrintNicknameAndUnderscores: call CalcStringLength @@ -379,7 +382,7 @@ PrintNicknameAndUnderscores: lb bc, 1, 10 call ClearScreenArea coord hl, 10, 2 - ld de, wcf4b + ld de, wcf50 call PlaceString coord hl, 10, 3 ld a, [wNamingScreenType] @@ -455,9 +458,9 @@ Handakutens: db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ" db $ff -; calculates the length of the string at wcf4b and stores it in c +; calculates the length of the string at wcf50 and stores it in c CalcStringLength: - ld hl, wcf4b + ld hl, wcf50 ld c, $0 .loop ld a, [hl] @@ -472,10 +475,10 @@ PrintNamingText: ld a, [wNamingScreenType] ld de, YourTextString and a - jr z, .notNickname + jr z, .placeString ld de, RivalsTextString dec a - jr z, .notNickname + jr z, .placeString ld a, [wcf91] ld [wMonPartySpriteSpecies], a push af @@ -485,28 +488,21 @@ PrintNamingText: call GetMonName coord hl, 4, 1 call PlaceString - ld hl, $1 - add hl, bc - ld [hl], $c9 - coord hl, 1, 3 - ld de, NicknameTextString + ld hl, $C3DD + ld de, $69F2 jr .placeString -.notNickname - call PlaceString - ld l, c - ld h, b - ld de, NameTextString + .placeString jp PlaceString YourTextString: - db "YOUR @" + db "VOTRE NOM?@" RivalsTextString: - db "RIVAL's @" + db "NOM DU RIVAL?@" NameTextString: - db "NAME?@" + db "NOM?@" NicknameTextString: - db "NICKNAME?@" + db "SURNOM?@" diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index a35524ed..e799feec 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -127,9 +127,9 @@ RedrawPartyMenu_: inc c jp .loop .ableToLearnMoveText - db "ABLE@" + db "APTE@" .notAbleToLearnMoveText - db "NOT ABLE@" + db "PAS APTE@" .evolutionStoneMenu push hl ld hl,EvosMovesPointerTable @@ -184,9 +184,9 @@ RedrawPartyMenu_: pop hl jr .printLevel .ableToEvolveText - db "ABLE@" + db "APTE@" .notAbleToEvolveText - db "NOT ABLE@" + db "PAS APTE@" .afterDrawingMonEntries ld b, SET_PAL_PARTY_MENU call RunPaletteCommand diff --git a/engine/menu/players_pc.asm b/engine/menu/players_pc.asm index bc2be4ef..a9f067ff 100755 --- a/engine/menu/players_pc.asm +++ b/engine/menu/players_pc.asm @@ -1,6 +1,4 @@ PlayerPC: - ld hl, wd730 - set 6, [hl] ld a, ITEM_NAME ld [wNameListType], a call SaveScreenTilesToBuffer1 @@ -17,6 +15,8 @@ PlayerPC: call PrintText PlayerPCMenu: + ld hl, wd730 + set 6, [hl] ld a, [wParentMenuItem] ld [wCurrentMenuItem], a ld hl, wFlags_0xcd60 @@ -241,10 +241,10 @@ PlayerPCToss: jp .loop PlayersPCMenuEntries: - db "WITHDRAW ITEM" - next "DEPOSIT ITEM" - next "TOSS ITEM" - next "LOG OFF@" + db "RETIRER OBJET" + next "STOCKER OBJET" + next "JETER OBJET" + next "DECONNEXION@" TurnedOnPC2Text: TX_FAR _TurnedOnPC2Text diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index bf8afaa9..2b66cda1 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -360,19 +360,19 @@ DrawPokedexVerticalLine: ret PokedexSeenText: - db "SEEN@" + db "VUS@" PokedexOwnText: - db "OWN@" + db "PRIS@" PokedexContentsText: - db "CONTENTS@" + db "SOMMAIRE@" PokedexMenuItemsText: - db "DATA" - next "CRY" - next "AREA" - next "QUIT@" + db "INFO" + next "CRI" + next "ZONE" + next "RET@" ; tests if a pokemon's bit is set in the seen or owned pokemon bit fields ; INPUT: @@ -515,22 +515,23 @@ ShowPokedexDataInternal: jp z,.waitForButtonPress ; if the pokemon has not been owned, don't print the height, weight, or description inc de ; de = address of feet (height) ld a,[de] ; reads feet, but a is overwritten without being used - coord hl, 12, 6 - lb bc, 1, 2 + push af + coord hl, 13, 6 + lb bc, 1, 3 call PrintNumber ; print feet (height) - ld a,$60 ; feet symbol tile (one tick) - ld [hl],a - inc de - inc de ; de = address of inches (height) - coord hl, 15, 6 - lb bc, LEADING_ZEROES | 1, 2 - call PrintNumber ; print inches (height) - ld a,$61 ; inches symbol tile (two ticks) - ld [hl],a -; now print the weight (note that weight is stored in tenths of pounds internally) + ld hl, $C426 + pop af + cp $a + jr nc, .func_43d7 + ld [hl], $F6 +.func_43d7 + inc hl + ld a, [hli] + ldd [hl], a + ld [hl], $F2 inc de inc de - inc de ; de = address of upper byte of weight + inc de ; de = address of inches (height) push de ; put weight in big-endian order at hDexWeight ld hl,hDexWeight @@ -544,8 +545,8 @@ ShowPokedexDataInternal: ld a,[de] ; a = lower byte of weight ld [hl],a ; store lower byte of weight in [hDexWeight + 1] ld de,hDexWeight - coord hl, 11, 8 - lb bc, 2, 5 ; 2 bytes, 5 digits + coord hl, 12, 8 + lb bc, 2, 4 ; 2 bytes, 4 digits call PrintNumber ; print weight coord hl, 14, 8 ld a,[hDexWeight + 1] @@ -590,8 +591,8 @@ ShowPokedexDataInternal: ret HeightWeightText: - db "HT ?",$60,"??",$61 - next "WT ???lb@" + db "TAI ???",$60 + next "PDS ???",$61,$62,"@" ; XXX does anything point to this? PokeText: diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index f6ca013b..e2535261 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -153,7 +153,7 @@ PrintPrizePrice: ld c, 7 call TextBoxBorder call UpdateSprites - coord hl, 12, 0 + coord hl, 13, 0 ld de, .CoinString call PlaceString coord hl, 13, 1 @@ -166,7 +166,7 @@ PrintPrizePrice: ret .CoinString: - db "COIN@" + db "JETONS@" .SixSpacesString: db " @" diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 8c10266b..0acff19e 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -347,7 +347,7 @@ StartMenu_Item: ld hl,wTopMenuItemY ld a,11 ld [hli],a ; top menu item Y - ld a,14 + ld a,13 ld [hli],a ; top menu item X xor a ld [hli],a ; current menu item ID @@ -367,7 +367,7 @@ StartMenu_Item: ld a,[wcf91] ld [wd11e],a call GetItemName - call CopyStringToCF4B ; copy name to wcf4b + call CopyStringToCF50 ; copy name to wcf50 ld a,[wcf91] cp a,BICYCLE jr nz,.notBicycle2 @@ -598,8 +598,9 @@ DrawTrainerInfo: call PlaceString coord hl, 8, 4 ld de,wPlayerMoney - ld c,$e3 + ld c,$c3 call PrintBCDNumber + ld [hl],$f0 coord hl, 9, 6 ld de,wPlayTimeHours ; hours lb bc, LEFT_ALIGN | 1, 3 @@ -615,9 +616,9 @@ TrainerInfo_FarCopyData: jp FarCopyData2 TrainerInfo_NameMoneyTimeText: - db "NAME/" - next "MONEY/" - next "TIME/@" + db "NOM/" + next "ARG./" + next "TEMPS/@" ; $76 is a circle tile TrainerInfo_BadgesText: diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index ef94f13c..d688a195 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -211,14 +211,14 @@ Type2Text: db "TYPE2/", $4e IDNoText: - db $73, "№/", $4e + db "№",$73,"/", $4e OTText: - db "OT/" + db "DO/" next "@" StatusText: - db "STATUS/@" + db "STATUT/@" OKText: db "OK@" @@ -289,10 +289,10 @@ PrintStat: ret StatsText: - db "ATTACK" - next "DEFENSE" - next "SPEED" - next "SPECIAL@" + db "FOR" + next "DEF" + next "VIT" + next "SPE@" StatusScreen2: ld a, [hTilesetType] @@ -328,7 +328,7 @@ StatusScreen2: ld b, a ; Number of moves ? coord hl, 11, 10 ld de, SCREEN_WIDTH * 2 - ld a, $72 ; special P tile id + ld a, $8F ; special P tile id call StatusScreen_PrintPP ; Print "PP" ld a, b and a @@ -463,8 +463,8 @@ CalcExpToLevelUp: ret StatusScreenExpText: - db "EXP POINTS" - next "LEVEL UP@" + db "PTS EXP." + next "PROCH.NIV.@" StatusScreen_ClearName: ld bc, 10 @@ -479,3 +479,13 @@ StatusScreen_PrintPP: dec c jr nz, StatusScreen_PrintPP ret + +func_6cd5: ; 12cd5 (4:6cd5) + ld a, $80 + ld [hli],a + ld a, $8F + ldd [hl], a + add hl, de + dec c + jr nz, func_6cd5 + ret
\ No newline at end of file diff --git a/engine/menu/text_box.asm b/engine/menu/text_box.asm index 90c35d25..18e8860e 100644 --- a/engine/menu/text_box.asm +++ b/engine/menu/text_box.asm @@ -162,28 +162,28 @@ TextBoxCoordTable: TextBoxTextAndCoordTable: db JP_MOCHIMONO_MENU_TEMPLATE db 0,0,14,17 ; text box coordinates - dw JapaneseMochimonoText + dw BuySellQuitText ; JapaneseMochimonoText db 3,0 ; text coordinates db USE_TOSS_MENU_TEMPLATE - db 13,10,19,14 ; text box coordinates + db 12,10,19,14 ; text box coordinates dw UseTossText - db 15,11 ; text coordinates + db 14,11 ; text coordinates db JP_SAVE_MESSAGE_MENU_TEMPLATE db 0,0,7,5 ; text box coordinates - dw JapaneseSaveMessageText + dw BuySellQuitText ; JapaneseSaveMessageText db 2,2 ; text coordinates db JP_SPEED_OPTIONS_MENU_TEMPLATE db 0,6,5,10 ; text box coordinates - dw JapaneseSpeedOptionsText + dw BuySellQuitText ; JapaneseSpeedOptionsText db 2,7 ; text coordinates db BATTLE_MENU_TEMPLATE - db 8,12,19,17 ; text box coordinates + db 6,12,19,17 ; text box coordinates dw BattleMenuText - db 10,14 ; text coordinates + db 8,14 ; text coordinates db SAFARI_BATTLE_MENU_TEMPLATE db 0,12,19,17 ; text box coordinates @@ -197,7 +197,7 @@ TextBoxTextAndCoordTable: db BUY_SELL_QUIT_MENU_TEMPLATE db 0,0,10,6 ; text box coordinates - dw BuySellQuitText + dw BuySellQuitText + 1 db 2,1 ; text coordinates db MONEY_BOX_TEMPLATE @@ -207,64 +207,40 @@ TextBoxTextAndCoordTable: db JP_AH_MENU_TEMPLATE db 7,6,11,10 ; text box coordinates - dw JapaneseAhText + dw BuySellQuitText ; JapaneseAhText db 8,8 ; text coordinates db JP_POKEDEX_MENU_TEMPLATE db 11,8,19,17 ; text box coordinates - dw JapanesePokedexMenu + dw BuySellQuitText ; JapanesePokedexMenu db 12,10 ; text coordinates ; note that there is no terminator BuySellQuitText: - db "BUY" - next "SELL" - next "QUIT@@" + db "@ACHETER" + next "VENDRE" + next "SALUT!@" UseTossText: - db "USE" - next "TOSS@" - -JapaneseSaveMessageText: - db "きろく" - next "メッセージ@" - -JapaneseSpeedOptionsText: - db "はやい" - next "おそい@" + db "UTIL." + next "JETER@" MoneyText: - db "MONEY@" - -JapaneseMochimonoText: - db "もちもの@" - -JapaneseMainMenuText: - db "つづきから" - next "さいしょから@" + db "ARG.@" BattleMenuText: - db "FIGHT ",$E1,$E2 - next "ITEM RUN@" + db "ATTAQ ",$E1,$E2 + next "OBJET FUITE@" SafariZoneBattleMenuText: - db "BALL× BAIT" - next "THROW ROCK RUN@" + db "BALL× APPAT" + next "CAILLOU FUITE@" SwitchStatsCancelText: - db "SWITCH" + db "ORDRE" next "STATS" - next "CANCEL@" - -JapaneseAhText: - db "アッ!@" - -JapanesePokedexMenu: - db "データをみる" - next "なきごえ" - next "ぶんぷをみる" - next "キャンセル@" + next "RETOUR@" DisplayMoneyBox: ld hl, wd730 @@ -277,8 +253,11 @@ DisplayMoneyBox: ld c, 6 call ClearScreenArea coord hl, 12, 1 + ld de, CurrencyString + call PlaceString + coord hl, 12, 1 ld de, wPlayerMoney - ld c, $a3 + ld c, "D" call PrintBCDNumber ld hl, wd730 res 6, [hl] @@ -532,19 +511,13 @@ TwoOptionMenuStrings: dw .YesNoMenu db 6,3,0 dw .NorthEastMenu - db 7,3,0 + db 8,3,0 dw .TradeCancelMenu db 7,4,1 dw .HealCancelMenu db 4,3,0 dw .NoYesMenu -.NoYesMenu - db "NO" - next "YES@" -.YesNoMenu - db "YES" - next "NO@" .NorthWestMenu db "NORTH" next "WEST@" @@ -554,12 +527,18 @@ TwoOptionMenuStrings: .NorthEastMenu db "NORTH" next "EAST@" +.NoYesMenu + db "NON" + next "OUI@" +.YesNoMenu + db "OUI" + next "NON@" .TradeCancelMenu - db "TRADE" - next "CANCEL@" + db "ECHANGE" + next "RETOUR@" .HealCancelMenu - db "HEAL" - next "CANCEL@" + db "SOIN" + next "RETOUR@" DisplayFieldMoveMonMenu: xor a @@ -682,20 +661,20 @@ DisplayFieldMoveMonMenu: jp PlaceString FieldMoveNames: - db "CUT@" - db "FLY@" + db "COUPE@" + db "VOL@" db "@" db "SURF@" - db "STRENGTH@" + db "FORCE@" db "FLASH@" - db "DIG@" + db "TUNNEL@" db "TELEPORT@" - db "SOFTBOILED@" + db "E-COQUE@" PokemonMenuEntries: db "STATS" - next "SWITCH" - next "CANCEL@" + next "ORDRE" + next "RETOUR@" GetMonFieldMoves: ld a, [wWhichPokemon] @@ -759,9 +738,9 @@ FieldMoveDisplayData: db FLY, $02, $0C db $B4, $03, $0C ; unused field move db SURF, $04, $0C - db STRENGTH, $05, $0A + db STRENGTH, $05, $0C db FLASH, $06, $0C db DIG, $07, $0C db TELEPORT, $08, $0A - db SOFTBOILED, $09, $08 + db SOFTBOILED, $09, $0B db $ff ; list terminator diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm index aab4adf4..dc6267c4 100755 --- a/engine/menu/vending_machine.asm +++ b/engine/menu/vending_machine.asm @@ -85,15 +85,15 @@ VendingMachineText1: db "@" DrinkText: - db "FRESH WATER" - next "SODA POP" - next "LEMONADE" - next "CANCEL@" + db "EAU FRAICHE" + next "SODA COOL" + next "LIMONADE" + next "RETOUR@" DrinkPriceText: - db "¥200" - next "¥300" - next "¥350" + db "200¥" + next "300¥" + next "350¥" next "@" VendingMachineText4: diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 1258c59b..462d26b5 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -15,7 +15,7 @@ ChoosePlayerName: 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: ld a, NAME_RIVAL_SCREEN ld [wNamingScreenType], a call DisplayNamingScreen - ld a, [wcf4b] + ld a, [wcf50] cp "@" jr z, .customName call ClearScreen @@ -185,37 +185,37 @@ DisplayIntroNameTextBox: jp HandleMenuInput .namestring - db "NAME@" + db "─NOM@" IF DEF(_RED) DefaultNamesPlayer: - db "NEW NAME" + db "NOM:" next "RED" - next "ASH" - next "JACK" + next "SACHA" + next "PAUL" db "@" DefaultNamesRival: - db "NEW NAME" + db "NOM:" next "BLUE" - next "GARY" - next "JOHN" + next "REGIS" + next "JEAN" db "@" ENDC IF DEF(_BLUE) DefaultNamesPlayer: - db "NEW NAME" + db "NOM:" next "BLUE" - next "GARY" - next "JOHN" + next "REGIS" + next "JEAN" db "@" DefaultNamesRival: - db "NEW NAME" + db "NOM:" next "RED" - next "ASH" - next "JACK" + next "SACHA" + next "PAUL" db "@" ENDC @@ -245,27 +245,27 @@ GetDefaultName: IF DEF(_RED) DefaultNamesPlayerList: - db "NEW NAME@" + db "NOM:@" db "RED@" - db "ASH@" - db "JACK@" + db "SACHA@" + db "PAUL@" DefaultNamesRivalList: - db "NEW NAME@" + db "NOM:@" db "BLUE@" - db "GARY@" - db "JOHN@" + db "REGIS@" + db "JEAN@" ENDC IF DEF(_BLUE) DefaultNamesPlayerList: - db "NEW NAME@" + db "NOM:@" db "BLUE@" - db "GARY@" - db "JOHN@" + db "REGIS@" + db "JEAN@" DefaultNamesRivalList: - db "NEW NAME@" + db "NOM:@" db "RED@" - db "ASH@" - db "JACK@" + db "SACHA@" + db "PAUL@" ENDC TextTerminator_6b20: diff --git a/engine/overworld/cinnabar_lab.asm b/engine/overworld/cinnabar_lab.asm index 13313746..03974684 100755 --- a/engine/overworld/cinnabar_lab.asm +++ b/engine/overworld/cinnabar_lab.asm @@ -116,7 +116,7 @@ LoadFossilItemAndMonName: 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/movement.asm b/engine/overworld/movement.asm index bbfbbc39..3b351e58 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -444,6 +444,7 @@ InitializeSpriteStatus: 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 sprite's screen position form its map position and the player position @@ -456,7 +457,7 @@ InitializeSpriteScreenPosition: 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) @@ -465,11 +466,23 @@ InitializeSpriteScreenPosition: 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: predef IsObjectHidden @@ -695,7 +708,7 @@ GetTileSpriteStandsOn: ld l, a ld a, [hli] ; c1x4: screen Y position add $4 ; align to 2*2 tile blocks (Y position is always off 4 pixels to the top) - and $f0 ; in case object is currently moving + and $f8 ; in case object is currently moving srl a ; screen Y tile * 4 ld c, a ld b, $0 diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm index 823939b1..606e0581 100755 --- a/engine/overworld/pokemart.asm +++ b/engine/overworld/pokemart.asm @@ -159,7 +159,7 @@ DisplayPokemartDialogue_: 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/print_waiting_text.asm b/engine/print_waiting_text.asm index 7a95da2a..0a57b987 100644 --- a/engine/print_waiting_text.asm +++ b/engine/print_waiting_text.asm @@ -17,4 +17,4 @@ PrintWaitingText: jp DelayFrames WaitingText: - db "Waiting...!@" + db "UN MOMENT…@" diff --git a/engine/save.asm b/engine/save.asm index 4fb2c4c8..f9acdd57 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 @@ -427,7 +427,7 @@ DisplayChangeBoxMenu: ld [wMaxMenuItem], a ld a, 1 ld [wTopMenuItemY], a - ld a, 12 + ld a, 10 ld [wTopMenuItemX], a xor a ld [wMenuWatchMovingOutOfBounds], a @@ -437,18 +437,18 @@ DisplayChangeBoxMenu: ld [wLastMenuItem], a coord hl, 0, 0 ld b, 2 - ld c, 9 + ld c, 7 call TextBoxBorder ld hl, ChooseABoxText call PrintText - coord hl, 11, 0 + coord hl, 9, 0 ld b, 12 - ld c, 7 + ld c, 9 call TextBoxBorder ld hl, hFlags_0xFFF6 set 2, [hl] ld de, BoxNames - coord hl, 13, 1 + coord hl, 11, 1 call PlaceString ld hl, hFlags_0xFFF6 res 2, [hl] @@ -457,14 +457,14 @@ DisplayChangeBoxMenu: cp 9 jr c, .singleDigitBoxNum sub 9 - coord hl, 8, 2 + coord hl, 6, 2 ld [hl], "1" add "0" jr .next .singleDigitBoxNum add "1" .next - Coorda 9, 2 + Coorda 7, 2 coord hl, 1, 2 ld de, BoxNoText call PlaceString @@ -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/slot_machine.asm b/engine/slot_machine.asm index 3a46687f..f3bf5cff 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -445,7 +445,7 @@ SlotMachine_CheckForMatches: 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/status_ailments.asm b/engine/status_ailments.asm index 787533c4..d0ff95cb 100755 --- a/engine/status_ailments.asm +++ b/engine/status_ailments.asm @@ -12,9 +12,9 @@ PrintStatusAilment: ret z ld a, "S" ld [hli], a - ld a, "L" + ld a, "O" ld [hli], a - ld [hl], "P" + ld [hl], "M" ret .psn ld a, "P" @@ -28,14 +28,14 @@ PrintStatusAilment: ld [hli], a ld a, "R" ld [hli], a - ld [hl], "N" + ld [hl], "U" ret .frz - ld a, "F" + ld a, "G" ld [hli], a - ld a, "R" + ld a, "E" ld [hli], a - ld [hl], "Z" + ld [hl], "L" ret .par ld a, "P" diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index f4cce5b4..a1e8d787 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -42,7 +42,7 @@ DisplayTitleScreen: call FarCopyData2 ld hl, GamefreakLogoGraphics ld de, vTitleLogo2 + $100 + $50 - ld bc, $90 + ld bc, $a0 ld a, BANK(GamefreakLogoGraphics) call FarCopyData2 ld hl, PokemonLogoGraphics @@ -111,7 +111,7 @@ DisplayTitleScreen: jr .next .tileScreenCopyrightTiles - 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 @@ -370,34 +370,29 @@ LoadCopyrightAndTextBoxTiles: LoadCopyrightTiles: ld de, NintendoCopyrightLogoGraphics ld hl, vChars2 + $600 - lb bc, BANK(NintendoCopyrightLogoGraphics), (GamefreakLogoGraphicsEnd - NintendoCopyrightLogoGraphics) / $10 + lb bc, BANK(NintendoCopyrightLogoGraphics), (GamefreakLogoGraphicsEnd - NintendoCopyrightLogoGraphics) / $0f call CopyVideoData coord hl, 2, 7 ld de, CopyrightTextString jp PlaceString CopyrightTextString: - 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" ; prints version text (red, blue) PrintGameVersionOnTitleScreen: - coord hl, 7, 8 + coord hl, 6, 8 ld de, VersionOnTitleScreenText jp PlaceString ; these point to special tiles specifically loaded for that purpose and are not usual text VersionOnTitleScreenText: -IF DEF(_RED) - db $60,$61,$7F,$65,$66,$67,$68,$69,"@" ; "Red Version" -ENDC -IF DEF(_BLUE) - db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Blue Version" -ENDC +db $60,$61,$62,$63,$64,$65,$66,$67,$68,$69,"@" ; "Version Rouge" or "Version Bleue" NintenText: db "NINTEN@" SonyText: db "SONY@" diff --git a/engine/town_map.asm b/engine/town_map.asm index d417e0a3..7c4654aa 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -118,10 +118,9 @@ LoadTownMap_Nest: push hl call DisplayWildLocations call GetMonName - coord hl, 1, 0 + coord hl, 8, 0 call PlaceString - ld h, b - ld l, c + coord hl, 1, 0 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 @@ -244,7 +243,7 @@ LoadTownMap_Fly: jr .pressedDown ToText: - db "To@" + db " ‘@" BuildFlyLocationsList: ld hl, wFlyLocationsList - 1 @@ -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/engine/trade.asm b/engine/trade.asm index 8bc8e3bc..b168411f 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -189,7 +189,7 @@ LoadTradingGFXAndMonNames: 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 062d5285..7797ccdf 100755 --- a/engine/trade2.asm +++ b/engine/trade2.asm @@ -10,7 +10,7 @@ Trade_PrintPlayerMonInfoText: 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 @@ -44,5 +44,5 @@ Trade_PrintEnemyMonInfoText: Trade_MonInfoText: db "──№⠄",$4E - next "OT/" - next $73,"№⠄","@" + next "DO/" + next "№",$73,"⠄@" |