diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/battle/core.asm | 31 | ||||
| -rwxr-xr-x | engine/battle/end_of_battle.asm | 6 | ||||
| -rw-r--r-- | engine/battle/link_battle_versus_text.asm | 14 | ||||
| -rw-r--r-- | engine/battle/save_trainer_name.asm | 36 | ||||
| -rwxr-xr-x | engine/cable_club.asm | 12 | ||||
| -rwxr-xr-x | engine/evolve_trade.asm | 17 | ||||
| -rwxr-xr-x | engine/hidden_object_functions7.asm | 10 | ||||
| -rwxr-xr-x | engine/items/items.asm | 14 | ||||
| -rw-r--r-- | engine/menu/bills_pc.asm | 30 | ||||
| -rwxr-xr-x | engine/menu/main_menu.asm | 36 | ||||
| -rwxr-xr-x | engine/menu/naming_screen.asm | 52 | ||||
| -rwxr-xr-x | engine/menu/players_pc.asm | 14 | ||||
| -rwxr-xr-x | engine/menu/pokedex.asm | 49 | ||||
| -rwxr-xr-x | engine/menu/start_sub_menus.asm | 11 | ||||
| -rwxr-xr-x | engine/menu/status_screen.asm | 22 | ||||
| -rwxr-xr-x | engine/oak_speech2.asm | 52 | ||||
| -rw-r--r-- | engine/overworld/movement.asm | 17 | ||||
| -rwxr-xr-x | engine/titlescreen.asm | 10 |
18 files changed, 239 insertions, 194 deletions
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 d58aef83..88670a16 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,27 +245,27 @@ GetDefaultName: ; 6ad6 (1:6ad6) IF DEF(_RED) DefaultNamesPlayerList: ; 6af2 (1:6af2) - db "NEW NAME@" + db "NOM:@" db "RED@" - db "ASH@" - db "JACK@" + db "SACHA@" + db "PAUL@" DefaultNamesRivalList: ; 6b08 (1:6b08) - db "NEW NAME@" + db "NOM:@" db "BLUE@" - db "GARY@" - db "JOHN@" + db "REGIS@" + db "JEAN@" ENDC IF DEF(_BLUE) DefaultNamesPlayerList: ; 6af2 (1:6af2) - db "NEW NAME@" + db "NOM:@" db "BLUE@" - db "GARY@" - db "JOHN@" + db "REGIS@" + db "JEAN@" DefaultNamesRivalList: ; 6b08 (1:6b08) - db "NEW NAME@" + db "NOM:@" db "RED@" - db "ASH@" - db "JACK@" + db "SACHA@" + db "PAUL@" ENDC TextTerminator_6b20: ; 6b20 (1:6b20) diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 2af2e518..7f92a243 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" |