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 | 34 | ||||
| -rwxr-xr-x | engine/menu/naming_screen.asm | 52 | ||||
| -rwxr-xr-x | engine/menu/players_pc.asm | 12 | ||||
| -rwxr-xr-x | engine/menu/pokedex.asm | 41 | ||||
| -rwxr-xr-x | engine/menu/start_sub_menus.asm | 9 | ||||
| -rwxr-xr-x | engine/menu/status_screen.asm | 22 | ||||
| -rwxr-xr-x | engine/oak_speech2.asm | 43 | ||||
| -rw-r--r-- | engine/overworld/movement.asm | 17 | ||||
| -rwxr-xr-x | engine/titlescreen.asm | 10 |
18 files changed, 230 insertions, 180 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 9241ce6b..d444664c 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -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 @@ -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@" @@ -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 @@ -7958,12 +7963,12 @@ PrintStatText: 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 2d6ab2e9..368cb00a 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..b22eabdb 100644 --- a/engine/battle/link_battle_versus_text.asm +++ b/engine/battle/link_battle_versus_text.asm @@ -13,9 +13,17 @@ DisplayLinkBattleVersusTextBox: 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 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 ab18f32b..c990119c 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 @@ -609,7 +609,7 @@ TradeCenter_DrawCancelBox: jp PlaceString CancelTextString: - db "CANCEL@" + db "ANNULER@" TradeCenter_PlaceSelectedEnemyMonMenuCursor: ld a, [wSerialSyncAndExchangeNybbleReceiveData] @@ -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/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index c5ae3f10..c0b78119 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 42d05981..be5a4b2e 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 @@ -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 diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 85a546e1..8b3313b6 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -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 @@ -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/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 2628da48..23cef72d 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -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" @@ -365,6 +368,7 @@ PrintAlphabet: ld [H_AUTOBGTRANSFERENABLED], a jp Delay3 +<<<<<<< 25c27785aa83a12330ea58e1e35b2fec90dd84f4 LowerCaseAlphabet: db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥UPPER CASE@" @@ -372,6 +376,15 @@ UpperCaseAlphabet: db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥lower case@" PrintNicknameAndUnderscores: +======= +LowerCaseAlphabet: ; 6841 (1:6841) + db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥MAJUSCULES@" + +UpperCaseAlphabet: ; 6879 (1:6879) + db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥minuscules@" + +PrintNicknameAndUnderscores: ; 68b1 (1:68b1) +>>>>>>> Initial decompilation of FR Red call CalcStringLength ld a, c ld [wNamingScreenNameLength], a @@ -467,15 +480,19 @@ CalcStringLength: inc c jr .loop +<<<<<<< 25c27785aa83a12330ea58e1e35b2fec90dd84f4 PrintNamingText: +======= +PrintNamingText: ; 699b (1:699b) +>>>>>>> Initial decompilation of FR Red 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 +502,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/players_pc.asm b/engine/menu/players_pc.asm index bc2be4ef..fc1e2bef 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 @@ -15,6 +13,8 @@ PlayerPC: call PlaySound ld hl, TurnedOnPC2Text call PrintText + ld hl, wd730 + set 6, [hl] PlayerPCMenu: ld a, [wParentMenuItem] @@ -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 2da3a0f6..546203f6 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 + 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 ; put weight in big-endian order at hDexWeight ld hl,hDexWeight @@ -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/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 251d7ae4..c7d71b24 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -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..c07dcf64 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -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] @@ -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/oak_speech2.asm b/engine/oak_speech2.asm index 1258c59b..962c2a30 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -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 @@ -244,28 +244,29 @@ GetDefaultName: jp CopyData IF DEF(_RED) +<<<<<<< 25c27785aa83a12330ea58e1e35b2fec90dd84f4 DefaultNamesPlayerList: db "NEW NAME@" db "RED@" - db "ASH@" - db "JACK@" + db "SACHA@" + db "PAUL@" DefaultNamesRivalList: db "NEW NAME@" db "BLUE@" - db "GARY@" - db "JOHN@" + db "REGIS@" + db "JEAN@" ENDC IF DEF(_BLUE) DefaultNamesPlayerList: db "NEW NAME@" db "BLUE@" - db "GARY@" - db "JOHN@" + db "REGIS@" + db "JEAN@" DefaultNamesRivalList: db "NEW NAME@" db "RED@" - db "ASH@" - db "JACK@" + db "SACHA@" + db "PAUL@" ENDC TextTerminator_6b20: diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 6d05859e..fc421c81 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 spprite's scrren 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 diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index e1a6e015..a1da7292 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -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 @@ -377,9 +377,9 @@ LoadCopyrightTiles: 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" @@ -393,7 +393,7 @@ PrintGameVersionOnTitleScreen: ; 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" + 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" |