diff options
Diffstat (limited to 'engine')
41 files changed, 427 insertions, 431 deletions
diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index 82aa6d52..805f4ec1 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -248,18 +248,18 @@ Credits: ld hl, vChars2 + $600 lb bc, BANK(TheEndGfx), (TheEndGfxEnd - TheEndGfx) / $10 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 $64," ",$66," ",$68," ",$64,"@" + db $65," ",$67," ",$69," ",$65,"@" INCLUDE "data/credits_order.asm" diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 4e21f6de..afbbf8b9 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 "GREIS@" .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 12, 14 ; clear upper cursor position in right column + Coorda 12, 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, $c ; 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 "Welche attacke?" + next " @" SelectMenuItem_CursorUp: ld a, [wCurrentMenuItem] @@ -2966,7 +2967,7 @@ PrintMenuItem: call PlaceString coord hl, 7, 11 ld [hl], "/" - coord hl, 5, 9 + coord hl, 4, 9 ld [hl], "/" coord hl, 5, 11 ld de, wcd6d @@ -2985,10 +2986,10 @@ PrintMenuItem: jp Delay3 DisabledText: - db "disabled!@" + db "BLOCKIERT@" TypeText: - db "TYPE@" + db "TYP@" SelectEnemyMove: ld a, [wLinkState] @@ -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] @@ -6908,9 +6909,9 @@ InitWildBattle: ld hl, wEnemyMonNick ; set name to "GHOST" ld a, "G" ld [hli], a - ld a, "H" + ld a, "E" ld [hli], a - ld a, "O" + ld a, "I" ld [hli], a ld a, "S" ld [hli], a @@ -7953,17 +7954,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 "ANGR@" + db "VERT@" + db "INIT@" + db "SPEZ@" + db "GENA@" + db "FLU@" 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..190992dc 100755 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -12,14 +12,17 @@ EndOfBattle: call ClearScreen callab DisplayLinkBattleVersusTextBox ld a, [wBattleResult] - cp $1 + cp 1 ld de, YouWinText - jr c, .placeWinOrLoseString + jr c, .unk ld de, YouLoseText - jr z, .placeWinOrLoseString + jr z, .unk ld de, DrawText -.placeWinOrLoseString + coord hl, 4, 8 + jr .placeWinOrLoseString +.unk coord hl, 6, 8 +.placeWinOrLoseString call PlaceString ld c, 200 call DelayFrames @@ -75,13 +78,13 @@ EndOfBattle: ret YouWinText: - db "YOU WIN@" + db "GEWONNEN@" YouLoseText: - db "YOU LOSE@" + db "VERLOREN@" DrawText: - db " DRAW@" + db "UNENTSCHIEDEN@" PickUpPayDayMoneyText: TX_FAR _PickUpPayDayMoneyText diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm index 76559117..9e5f89cb 100644 --- a/engine/battle/link_battle_versus_text.asm +++ b/engine/battle/link_battle_versus_text.asm @@ -3,7 +3,7 @@ DisplayLinkBattleVersusTextBox: call LoadTextBoxTilePatterns coord hl, 3, 4 ld b, 7 - ld c, 12 + ld c, 13 call TextBoxBorder coord hl, 4, 5 ld de, wPlayerName @@ -13,9 +13,9 @@ 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, "V" + ldi [hl], a + ld [hl], "S" 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..50f8f052 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 "TEENAGER@" BugCatcherName: - db "BUG CATCHER@" + db "KÄFERSAMMLER@" LassName: - db "LASS@" + db "GÖRE@" JrTrainerMName: - db "JR.TRAINER♂@" + db "PFADFINDER@" JrTrainerFName: - db "JR.TRAINER♀@" + db "PFADFINDERIN@" PokemaniacName: - db "POKéMANIAC@" + db "#MANIAC@" SuperNerdName: - db "SUPER NERD@" + db "STREBER@" BurglarName: - db "BURGLAR@" + db "DIEB@" EngineerName: - db "ENGINEER@" + db "MECHANIKER@" JugglerXName: - db "JUGGLER@" + db "JONGLEUR@" SwimmerName: - db "SWIMMER@" + db "SCHWIMMER@" BeautyName: - db "BEAUTY@" + db "SCHÖNHEIT@" RockerName: db "ROCKER@" JugglerName: - db "JUGGLER@" + db "JONGLEUR@" BlackbeltName: - db "BLACKBELT@" + db "SCHWARZGURT@" ProfOakName: - db "PROF.OAK@" + db "PROF.EICH@" ChiefName: db "CHIEF@" ScientistName: - db "SCIENTIST@" + db "FORSCHER@" RocketName: db "ROCKET@" CooltrainerMName: - db "COOLTRAINER♂@" + db "TRAINER@" CooltrainerFName: - db "COOLTRAINER♀@" + db "TRAINERIN@" diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 474dbd11..5037a586 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -11,7 +11,7 @@ CableClub_DoBattleOrTrade: call LoadTrainerInfoTextBoxTiles coord hl, 3, 8 ld b, 2 - ld c, 12 + ld c, 13 call CableClub_TextBoxBorder coord hl, 4, 10 ld de, PleaseWaitString @@ -290,7 +290,7 @@ CableClub_DoBattleOrTradeAgain: jr CallCurrentTradeCenterFunction PleaseWaitString: - db "PLEASE WAIT!@" + db "BITTE WARTEN!@" CallCurrentTradeCenterFunction: ld hl, TradeCenterPointerTable @@ -533,7 +533,7 @@ TradeCenter_SelectMon: ld [wTradeCenterPointerTableIndex], a jp CallCurrentTradeCenterFunction .statsTrade - db "STATS TRADE@" + db "STATUS TAUSCH@" .selectedCancelMenuItem ld a, [wCurrentMenuItem] ld b, a @@ -596,20 +596,20 @@ 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 - ld c, 9 + ld c, 12 call CableClub_TextBoxBorder coord hl, 2, 16 ld de, CancelTextString jp PlaceString CancelTextString: - db "CANCEL@" + db "ABBRECHEN@" TradeCenter_PlaceSelectedEnemyMonMenuCursor: ld a, [wSerialSyncAndExchangeNybbleReceiveData] @@ -876,11 +876,11 @@ WillBeTradedText: db "@" TradeCompleted: - db "Trade completed!@" + db "TAUSCH VOLLZOGEN!@" TradeCanceled: - db "Too bad! The trade" - next "was canceled!@" + db "Schade! Der tausch" + next "wurde abgebrochen!@" TradeCenterPointerTable: dw TradeCenter_SelectMon diff --git a/engine/clear_save.asm b/engine/clear_save.asm index b47cd6c4..c37ee4a7 100755 --- a/engine/clear_save.asm +++ b/engine/clear_save.asm @@ -5,8 +5,8 @@ DoClearSaveDialogue: call LoadTextBoxTilePatterns ld hl, ClearSaveDataText call PrintText - coord hl, 14, 7 - lb bc, 8, 15 + coord hl, 13, 7 + lb bc, 8, 14 ld a, NO_YES_MENU ld [wTwoOptionMenuID], a ld a, TWO_OPTION_MENU 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..7380362a 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 "RUHMESHALLE@" HoFShowMonOrPlayer: call ClearScreen @@ -179,8 +179,8 @@ HoFDisplayMonInfo: HoFMonInfoText: db "LEVEL/" - next "TYPE1/" - next "TYPE2/@" + next "TYP1/" + next "TYP2/@" HoFLoadPlayerPics: ld de, RedPicFront @@ -251,10 +251,10 @@ HoFPrintTextAndDelay: jp DelayFrames HoFPlayTimeText: - db "PLAY TIME@" + db "SPIELZEIT@" HoFMoneyText: - db "MONEY@" + db "GELD@" DexSeenOwnedText: TX_FAR _DexSeenOwnedText diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index c1fa5aa4..bc490e3c 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -111,7 +111,7 @@ LinkCableHelp: set 6, [hl] coord hl, 0, 0 ld b, 8 - ld c, 13 + ld c, 14 call TextBoxBorder coord hl, 2, 2 ld de, HowToLinkText @@ -151,10 +151,10 @@ LinkCableHelpText2: db "@" HowToLinkText: - db "HOW TO LINK" - next "COLOSSEUM" - next "TRADE CENTER" - next "STOP READING@" + db "LINK-INFO" + next "KOLOSSEUM" + next "HANDELSCENTER" + next "VERLASSEN@" LinkCableInfoTexts: dw LinkCableInfoText1 @@ -268,14 +268,14 @@ ViridianSchoolBlackboardText2: db "@" StatusAilmentText1: - db " SLP" - next " PSN" + db " SLF" + next " GIF" next " PAR@" StatusAilmentText2: - db " BRN" - next " FRZ" - next " QUIT@@" + db " BRT" + next " GFR" + next " ZUR.@" ViridianBlackboardStatusPointers: dw ViridianBlackboardSleepText diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index f04c1deb..39d72e2e 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 "FLAMARA" + next "BLITZA" + next "AQUANA" + next "ZURÜCK@" BillsHousePokemonListText2: TX_FAR _BillsHousePokemonListText2 diff --git a/engine/items/items.asm b/engine/items/items.asm index f46261b6..65115fed 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 "Du besitzt noch" + line "keine #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 "GESU@" + db "ANGR@" + db "VERT@" + db "INIT@" + db "SPEZ@" 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 @@ -2221,8 +2221,8 @@ ItemUseTMHM: call PrintText ld hl,TeachMachineMoveText call PrintText - coord hl, 14, 7 - lb bc, 8, 15 + coord hl, 13, 7 + lb bc, 8, 14 ld a,TWO_OPTION_MENU ld [wTextBoxID],a call DisplayTextBoxID ; yes/no menu @@ -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,11 +2604,11 @@ 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 - lb bc, 8, 15 + coord hl, 13, 7 + lb bc, 8, 14 ld a,TWO_OPTION_MENU ld [wTextBoxID],a call DisplayTextBoxID ; yes/no menu @@ -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/learn_move.asm b/engine/learn_move.asm index 53c7f87e..8dd72cd8 100755 --- a/engine/learn_move.asm +++ b/engine/learn_move.asm @@ -76,8 +76,8 @@ DontAbandonLearning: AbandonLearning: ld hl, AbandonLearningText call PrintText - coord hl, 14, 7 - lb bc, 8, 15 + coord hl, 13, 7 + lb bc, 8, 14 ld a, TWO_OPTION_MENU ld [wTextBoxID], a call DisplayTextBoxID ; yes/no menu @@ -99,8 +99,8 @@ TryingToLearn: push hl ld hl, TryingToLearnText call PrintText - coord hl, 14, 7 - lb bc, 8, 15 + coord hl, 13, 7 + lb bc, 8, 14 ld a, TWO_OPTION_MENU ld [wTextBoxID], a call DisplayTextBoxID ; yes/no menu diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 85a546e1..50db8d92 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 "JEMANDES PC@" +BillsPCText: db "BILLS PC@" +PlayersPCText: db "PC VON @" +OaksPCText: db "EICHS PC@" +PKMNLeaguePCText: db "<pkmn>-LIGA@" +LogOffPCText: db "AUSLOGGEN@" 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 @@ -339,15 +339,15 @@ DisplayMonListMenu: ret BillsPCMenuText: - db "WITHDRAW ", $4a - next "DEPOSIT ", $4a - next "RELEASE ", $4a - next "CHANGE BOX" - next "SEE YA!" + db "<pkmn> MITNEHMEN" + next "<pkmn> ABLEGEN" + next "<pkmn> FREILASSEN" + next "BOX WECHSELN" + next "TSCHÜSS!" db "@" BoxNoPCText: - db "BOX No.@" + db "BOX Nr.@" KnowsHMMove:: ; returns whether mon with party index [wWhichPokemon] knows an HM move @@ -385,9 +385,9 @@ HMMoveArray: db -1 DisplayDepositWithdrawMenu: - coord hl, 9, 10 + coord hl, 8, 10 ld b, 6 - ld c, 9 + ld c, 10 call TextBoxBorder ld a, [wParentMenuItem] and a ; was the Deposit or Withdraw item selected in the parent menu? @@ -395,15 +395,15 @@ DisplayDepositWithdrawMenu: jr nz, .next ld de, WithdrawPCText .next - coord hl, 11, 12 + coord hl, 10, 12 call PlaceString - coord hl, 11, 14 + coord hl, 10, 14 ld de, StatsCancelPCText call PlaceString ld hl, wTopMenuItemY ld a, 12 ld [hli], a ; wTopMenuItemY - ld a, 10 + ld a, 9 ld [hli], a ; wTopMenuItemX xor a ld [hli], a ; wCurrentMenuItem @@ -451,11 +451,11 @@ DisplayDepositWithdrawMenu: call LoadGBPal jr .loop -DepositPCText: db "DEPOSIT@" -WithdrawPCText: db "WITHDRAW@" +DepositPCText: db "ABLEGEN@" +WithdrawPCText: db "MITNEHMEN@" StatsCancelPCText: - db "STATS" - next "CANCEL@" + db "STATUS" + next "ZURÜCK@" SwitchOnText: TX_FAR _SwitchOnText diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm index 09ba123e..9f559b8a 100755 --- a/engine/menu/diploma.asm +++ b/engine/menu/diploma.asm @@ -33,7 +33,7 @@ DisplayDiploma: pop bc dec c jr nz, .asm_56715 - coord hl, 10, 4 + coord hl, 9, 6 ld de, wPlayerName call PlaceString callba DrawPlayerCharacter @@ -83,31 +83,30 @@ UnusedPlayerNameLengthFunc: DiplomaTextPointersAndCoords: dw DiplomaText - dwCoord 5, 2 - dw DiplomaPlayer - dwCoord 3, 4 - dw DiplomaEmptyText - dwCoord 15, 4 - dw DiplomaCongrats + dwCoord 6, 2 + dw DiplomaPlayer1 + dwCoord 2, 4 + dw DiplomaPlayer2 dwCoord 2, 6 + dw DiplomaCongrats + dwCoord 2, 8 dw DiplomaGameFreak dwCoord 9, 16 DiplomaText: - db $70,"Diploma",$70,"@" + db $70,"Diplom",$70,"@" -DiplomaPlayer: - db "Player@" +DiplomaPlayer1: + db "Herzlichen Glück-@" -DiplomaEmptyText: - db "@" +DiplomaPlayer2: + db "wunsch !@" DiplomaCongrats: - db "Congrats! This" - next "diploma certifies" - next "that you have" - next "completed your" - next "#DEX.@" + db "Du hast es ge-" + next "schafft, den" + next "#DEX zu" + next "vervollständigen@" DiplomaGameFreak: db "GAME FREAK@" diff --git a/engine/menu/draw_start_menu.asm b/engine/menu/draw_start_menu.asm index 83a81aac..5e10b972 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@" StartMenuSaveText: - db "SAVE@" + db "SICHERN@" StartMenuResetText: db "RESET@" StartMenuExitText: - db "EXIT@" + db "ZURÜCK@" StartMenuOptionText: db "OPTION@" diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index 170c0ef3..8ca8e1e3 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -113,7 +113,7 @@ LeaguePCShowMon: jpba HoFDisplayMonInfo HallOfFameNoText: - db "HALL OF FAME No @" + db "RUHMESHALLE Nr.@" AccessedHoFPCText: TX_FAR _AccessedHoFPCText diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index cd4198b6..2da68a3b 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -141,12 +141,12 @@ LinkMenu: call SaveScreenTilesToBuffer1 ld hl, WhereWouldYouLikeText call PrintText - coord hl, 5, 5 + coord hl, 4, 5 ld b, $6 - ld c, $d + ld c, $e call TextBoxBorder call UpdateSprites - coord hl, 7, 7 + coord hl, 6, 7 ld de, CableClubOptionsText call PlaceString xor a @@ -155,7 +155,7 @@ LinkMenu: ld hl, wTopMenuItemY ld a, $7 ld [hli], a - ld a, $6 + ld a, $5 ld [hli], a xor a ld [hli], a @@ -240,11 +240,11 @@ LinkMenu: ld c, d .updateCursorPosition ld a, b - Coorda 6, 7 + Coorda 5, 7 ld a, c - Coorda 6, 9 + Coorda 5, 9 ld a, d - Coorda 6, 11 + Coorda 5, 11 ld c, 40 call DelayFrames call LoadScreenTilesFromBuffer1 @@ -329,25 +329,25 @@ SpecialEnterMap: jp EnterMap ContinueText: - db "CONTINUE", $4e + db "WEITER", $4e NewGameText: - db "NEW GAME" - next "OPTION@" + db "NEUES SPIEL" + next "OPTIONEN@" CableClubOptionsText: - db "TRADE CENTER" - next "COLOSSEUM" - next "CANCEL@" + db "HANDELSCENTER" + next "KOLOSSEUM" + next "ZURÜCK@" DisplayContinueGameInfo: xor a ld [H_AUTOBGTRANSFERENABLED], a - coord hl, 4, 7 + coord hl, 3, 7 ld b, 8 - ld c, 14 + ld c, 15 call TextBoxBorder - coord hl, 5, 9 + coord hl, 4, 9 ld de, SaveScreenInfoText call PlaceString coord hl, 12, 9 @@ -367,13 +367,13 @@ DisplayContinueGameInfo: PrintSaveScreenText: xor a ld [H_AUTOBGTRANSFERENABLED], a - coord hl, 4, 0 + coord hl, 3, 0 ld b, $8 - ld c, $e + ld c, $f call TextBoxBorder call LoadTextBoxTilePatterns call UpdateSprites - coord hl, 5, 2 + coord hl, 4, 2 ld de, SaveScreenInfoText call PlaceString coord hl, 12, 2 @@ -421,10 +421,10 @@ PrintPlayTime: jp PrintNumber SaveScreenInfoText: - db "PLAYER" - next "BADGES " - next "#DEX " - next "TIME@" + db "SPIELER" + next "ORDEN " + next "#DEX " + next "ZEIT@" DisplayOptionMenu: coord hl, 0, 0 @@ -579,19 +579,19 @@ DisplayOptionMenu: jp .eraseOldMenuCursor TextSpeedOptionText: - db "TEXT SPEED" - next " FAST MEDIUM SLOW@" + db "TEXT-TEMPO" + next " 3 2 1 @" BattleAnimationOptionText: - db "BATTLE ANIMATION" - next " ON OFF@" + db "KAMPFANIMATION" + next " AN AUS@" BattleStyleOptionText: - db "BATTLE STYLE" - next " SHIFT SET@" + db "KAMPFSTIL" + next " WECHSEL FOLGEND@" OptionMenuCancelText: - db "CANCEL@" + db "ZURÜCK@" ; 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..a3c2c72a 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -13,8 +13,8 @@ AskName: call GetMonName ld hl, DoYouWantToNicknameText call PrintText - coord hl, 14, 7 - lb bc, 8, 15 + coord hl, 13, 7 + lb bc, 8, 14 ld a, TWO_OPTION_MENU ld [wTextBoxID], a call DisplayTextBoxID @@ -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,"-?!♂♀/⠄,¥GROSSBUCHSTABEN@" UpperCaseAlphabet: - db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥lower case@" + db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ÄÖÜ:;[]",$e1,$e2,"-?!♂♀/⠄,¥kleinbuchstaben@" 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] @@ -485,9 +488,6 @@ 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 jr .placeString @@ -500,13 +500,13 @@ PrintNamingText: jp PlaceString YourTextString: - db "YOUR @" + db "DEIN @" RivalsTextString: - db "RIVAL's @" + db "GEGNER-@" NameTextString: db "NAME?@" NicknameTextString: - db "NICKNAME?@" + db "ALIAS?@" diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index a35524ed..ff302968 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 "OK@" .notAbleToLearnMoveText - db "NOT ABLE@" + db "NEIN@" .evolutionStoneMenu push hl ld hl,EvosMovesPointerTable @@ -184,9 +184,9 @@ RedrawPartyMenu_: pop hl jr .printLevel .ableToEvolveText - db "ABLE@" + db "OK@" .notAbleToEvolveText - db "NOT ABLE@" + db "NEIN@" .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..c5acfec7 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,14 +15,16 @@ PlayerPC: call PrintText PlayerPCMenu: + ld hl, wd730 + set 6, [hl] ld a, [wParentMenuItem] ld [wCurrentMenuItem], a ld hl, wFlags_0xcd60 set 5, [hl] call LoadScreenTilesFromBuffer2 coord hl, 0, 0 - ld b, $8 - ld c, $e + ld b, 8 + ld c, 15 call TextBoxBorder call UpdateSprites coord hl, 2, 2 @@ -241,10 +241,10 @@ PlayerPCToss: jp .loop PlayersPCMenuEntries: - db "WITHDRAW ITEM" - next "DEPOSIT ITEM" - next "TOSS ITEM" - next "LOG OFF@" + db "ITEM AUFNEHMEN" + next "ITEM ABLEGEN" + next "ITEM WEGWERFEN" + next "AUSLOGGEN@" TurnedOnPC2Text: TX_FAR _TurnedOnPC2Text diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index bf8afaa9..ea28c133 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -360,19 +360,19 @@ DrawPokedexVerticalLine: ret PokedexSeenText: - db "SEEN@" + db "GES@" PokedexOwnText: - db "OWN@" + db "BES@" PokedexContentsText: - db "CONTENTS@" + db "INHALT@" PokedexMenuItemsText: db "DATA" - next "CRY" - next "AREA" - next "QUIT@" + next "RUF" + next "GEB." + next "ZUR.@" ; 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 "GR. ???",$60 + next "GEW ???",$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..5cfdbc87 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 "MÜNZEN@" .SixSpacesString: db " @" diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 251d7ae4..998d6458 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -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 @@ -616,12 +616,12 @@ TrainerInfo_FarCopyData: TrainerInfo_NameMoneyTimeText: db "NAME/" - next "MONEY/" - next "TIME/@" + next "GELD/" + next "ZEIT/@" ; $76 is a circle tile TrainerInfo_BadgesText: - db $76,"BADGES",$76,"@" + db $76,"ORDEN",$76,"@" ; draws a text box on the trainer info screen ; height is always 6 diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index ef94f13c..2db9a908 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -205,13 +205,13 @@ NamePointers2: dw wDayCareMonName Type1Text: - db "TYPE1/", $4e + db "TYP1/", $4e Type2Text: - db "TYPE2/", $4e + db "TYP2/", $4e IDNoText: - db $73, "№/", $4e + db "″№/", $4e OTText: db "OT/" @@ -289,10 +289,10 @@ PrintStat: ret StatsText: - db "ATTACK" - next "DEFENSE" - next "SPEED" - next "SPECIAL@" + db "ANGR" + next "VERT" + next "INIT" + next "SPEZ@" StatusScreen2: ld a, [hTilesetType] @@ -328,8 +328,8 @@ StatusScreen2: ld b, a ; Number of moves ? coord hl, 11, 10 ld de, SCREEN_WIDTH * 2 - ld a, $72 ; special P tile id - call StatusScreen_PrintPP ; Print "PP" + ld a, $80 ; special P tile id + call StatusScreen_PrintAP ; Print "AP" ld a, b and a jr z, .InitPP @@ -463,7 +463,7 @@ CalcExpToLevelUp: ret StatusScreenExpText: - db "EXP POINTS" + db "EP-PUNKTE" next "LEVEL UP@" StatusScreen_ClearName: @@ -479,3 +479,13 @@ StatusScreen_PrintPP: dec c jr nz, StatusScreen_PrintPP ret + +StatusScreen_PrintAP: ; 12cd5 (4:6cd5) + ld a, "A" + ld [hli],a + ld a, "P" + ldd [hl], a + add hl, de + dec c + jr nz, StatusScreen_PrintAP + ret
\ No newline at end of file diff --git a/engine/menu/text_box.asm b/engine/menu/text_box.asm index 12067dd4..6a4050bc 100644 --- a/engine/menu/text_box.asm +++ b/engine/menu/text_box.asm @@ -162,7 +162,7 @@ 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 @@ -172,18 +172,18 @@ TextBoxTextAndCoordTable: 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 "@KAUF" + next "VERKAUF" + next "TSCHÜSS!@" UseTossText: - db "USE" - next "TOSS@" - -JapaneseSaveMessageText: - db "きろく" - next "メッセージ@" - -JapaneseSpeedOptionsText: - db "はやい" - next "おそい@" + db "OK" + next "MÜLL@" MoneyText: - db "MONEY@" - -JapaneseMochimonoText: - db "もちもの@" - -JapaneseMainMenuText: - db "つづきから" - next "さいしょから@" + db "GELD@" BattleMenuText: - db "FIGHT ",$E1,$E2 - next "ITEM RUN@" + db "KMPF ",$E1,$E2 + next "ITEM FLUCHT@" SafariZoneBattleMenuText: - db "BALL× BAIT" - next "THROW ROCK RUN@" + db "BALL× KÖDER" + next "STEIN FLUCHT@" SwitchStatsCancelText: - db "SWITCH" - next "STATS" - next "CANCEL@" - -JapaneseAhText: - db "アッ!@" - -JapanesePokedexMenu: - db "データをみる" - next "なきごえ" - next "ぶんぷをみる" - next "キャンセル@" + db "TAUSCH" + next "STATUS" + next "ZURÜCK@" DisplayMoneyBox: ld hl, wd730 @@ -278,15 +254,12 @@ DisplayMoneyBox: call ClearScreenArea coord hl, 12, 1 ld de, wPlayerMoney - ld c, $a3 + ld c, "d" call PrintBCDNumber ld hl, wd730 res 6, [hl] ret -CurrencyString: - db " ¥@" - DoBuySellQuitMenu: ld a, [wd730] set 6, a ; no printing delay @@ -481,7 +454,7 @@ DisplayTwoOptionMenu: TwoOptionMenu_SaveScreenTiles: ld de, wBuffer - lb bc, 5, 6 + lb bc, 5, 7 .loop ld a, [hli] ld [de], a @@ -489,17 +462,17 @@ TwoOptionMenu_SaveScreenTiles: dec c jr nz, .loop push bc - ld bc, SCREEN_WIDTH - 6 + ld bc, SCREEN_WIDTH - 7 add hl, bc pop bc - ld c, $6 + ld c, $7 dec b jr nz, .loop ret TwoOptionMenu_RestoreScreenTiles: ld de, wBuffer - lb bc, 5, 6 + lb bc, 5, 7 .loop ld a, [de] inc de @@ -507,10 +480,10 @@ TwoOptionMenu_RestoreScreenTiles: dec c jr nz, .loop push bc - ld bc, SCREEN_WIDTH - 6 + ld bc, SCREEN_WIDTH - 7 add hl, bc pop bc - ld c, 6 + ld c, 7 dec b jr nz, .loop call UpdateSprites @@ -522,7 +495,7 @@ TwoOptionMenu_RestoreScreenTiles: ; 02: byte put blank line before first menu item ; 03: word text pointer TwoOptionMenuStrings: - db 4,3,0 + db 5,3,0 dw .YesNoMenu db 6,3,0 dw .NorthWestMenu @@ -536,15 +509,9 @@ TwoOptionMenuStrings: dw .TradeCancelMenu db 7,4,1 dw .HealCancelMenu - db 4,3,0 + db 5,3,0 dw .NoYesMenu -.NoYesMenu - db "NO" - next "YES@" -.YesNoMenu - db "YES" - next "NO@" .NorthWestMenu db "NORTH" next "WEST@" @@ -554,12 +521,18 @@ TwoOptionMenuStrings: .NorthEastMenu db "NORTH" next "EAST@" +.NoYesMenu + db "NEIN" + next "JA@" +.YesNoMenu + db "JA" + next "NEIN@" .TradeCancelMenu - db "TRADE" - next "CANCEL@" + db "TAUSCH" + next "ZURÜCK@" .HealCancelMenu - db "HEAL" - next "CANCEL@" + db "HEILEN" + next "ZURÜCK@" DisplayFieldMoveMonMenu: xor a @@ -682,20 +655,20 @@ DisplayFieldMoveMonMenu: jp PlaceString FieldMoveNames: - db "CUT@" - db "FLY@" + db "ZERSCHNEIDER@" + db "FLIEGEN@" db "@" - db "SURF@" - db "STRENGTH@" - db "FLASH@" - db "DIG@" + db "SURFER@" + db "STÄRKE@" + db "BLITZ@" + db "SCHAUFLER@" db "TELEPORT@" - db "SOFTBOILED@" + db "WEICHEI@" PokemonMenuEntries: - db "STATS" - next "SWITCH" - next "CANCEL@" + db "STATUS" + next "TAUSCH" + next "ZURÜCK@" GetMonFieldMoves: ld a, [wWhichPokemon] @@ -755,13 +728,13 @@ GetMonFieldMoves: ; Leftmost tile = -1 + tile column in which the first letter of the move's name should be displayed ; "SOFTBOILED" is $08 because it has 4 more letters than "SURF", for example, whose value is $0C FieldMoveDisplayData: - db CUT, $01, $0C - db FLY, $02, $0C + db CUT, $01, $06 + db FLY, $02, $0B 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 DIG, $07, $09 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..08f44694 100755 --- a/engine/menu/vending_machine.asm +++ b/engine/menu/vending_machine.asm @@ -85,10 +85,10 @@ VendingMachineText1: db "@" DrinkText: - db "FRESH WATER" - next "SODA POP" - next "LEMONADE" - next "CANCEL@" + db "TAFELWASSER" + next "SPRUDEL" + next "LIMONADE" + next "ZURÜCK@" DrinkPriceText: db "¥200" diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 1258c59b..ffb06477 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 @@ -189,15 +189,15 @@ DisplayIntroNameTextBox: IF DEF(_RED) DefaultNamesPlayer: - db "NEW NAME" - next "RED" + db "NAME" + next "ROT" next "ASH" next "JACK" db "@" DefaultNamesRival: - db "NEW NAME" - next "BLUE" + db "NAME" + next "BLAU" next "GARY" next "JOHN" db "@" @@ -205,15 +205,15 @@ ENDC IF DEF(_BLUE) DefaultNamesPlayer: - db "NEW NAME" - next "BLUE" + db "NAME" + next "BLAU" next "GARY" next "JOHN" db "@" DefaultNamesRival: - db "NEW NAME" - next "RED" + db "NAME" + next "ROT" next "ASH" next "JACK" db "@" @@ -245,25 +245,25 @@ GetDefaultName: IF DEF(_RED) DefaultNamesPlayerList: - db "NEW NAME@" - db "RED@" + db "NAME@" + db "ROT@" db "ASH@" db "JACK@" DefaultNamesRivalList: - db "NEW NAME@" - db "BLUE@" + db "NAME@" + db "BLAU@" db "GARY@" db "JOHN@" ENDC IF DEF(_BLUE) DefaultNamesPlayerList: - db "NEW NAME@" - db "BLUE@" + db "NAME@" + db "BLAU@" db "GARY@" db "JOHN@" DefaultNamesRivalList: - db "NEW NAME@" - db "RED@" + db "NAME@" + db "ROT@" db "ASH@" db "JACK@" ENDC 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..a8f3fae6 100755 --- a/engine/overworld/pokemart.asm +++ b/engine/overworld/pokemart.asm @@ -84,8 +84,8 @@ DisplayPokemartDialogue_: ld hl,PokemartTellSellPriceText lb bc, 14, 1 ; location that PrintText always prints to, this is useless call PrintText - coord hl, 14, 7 - lb bc, 8, 15 + coord hl, 13, 7 + lb bc, 8, 14 ld a,TWO_OPTION_MENU ld [wTextBoxID],a call DisplayTextBoxID ; yes/no menu @@ -159,11 +159,11 @@ 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 - lb bc, 8, 15 + coord hl, 13, 7 + lb bc, 8, 14 ld a,TWO_OPTION_MENU ld [wTextBoxID],a call DisplayTextBoxID ; yes/no menu diff --git a/engine/print_waiting_text.asm b/engine/print_waiting_text.asm index 7a95da2a..17b44a55 100644 --- a/engine/print_waiting_text.asm +++ b/engine/print_waiting_text.asm @@ -1,7 +1,7 @@ PrintWaitingText: coord hl, 3, 10 ld b, $1 - ld c, $b + ld c, $d ld a, [wIsInBattle] and a jr z, .asm_4c17 @@ -17,4 +17,4 @@ PrintWaitingText: jp DelayFrames WaitingText: - db "Waiting...!@" + db "BITTE WARTEN…@" diff --git a/engine/save.asm b/engine/save.asm index 4fb2c4c8..d6ea8c7d 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -171,7 +171,7 @@ SaveSAV: jp DelayFrames NowSavingString: - db "Now saving...@" + db "Speichern...@" SaveSAVConfirm: call PrintText @@ -508,7 +508,7 @@ BoxNames: next "BOX12@" BoxNoText: - db "BOX No.@" + db "BOX Nr.@" 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 2dfcffde..342d7084 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -133,8 +133,8 @@ MainSlotMachineLoop: .skip2 ld hl, OneMoreGoSlotMachineText call PrintText - coord hl, 14, 12 - lb bc, 13, 15 + coord hl, 13, 12 + lb bc, 13, 14 xor a ; YES_NO_MENU ld [wTwoOptionMenuID], a ld a, TWO_OPTION_MENU @@ -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..c3925eab 100755 --- a/engine/status_ailments.asm +++ b/engine/status_ailments.asm @@ -14,28 +14,28 @@ PrintStatusAilment: ld [hli], a ld a, "L" ld [hli], a - ld [hl], "P" + ld [hl], "F" ret .psn - ld a, "P" + ld a, "G" ld [hli], a - ld a, "S" + ld a, "I" ld [hli], a - ld [hl], "N" + ld [hl], "F" ret .brn ld a, "B" ld [hli], a ld a, "R" ld [hli], a - ld [hl], "N" + ld [hl], "T" ret .frz - ld a, "F" + ld a, "G" ld [hli], a - ld a, "R" + ld a, "F" ld [hli], a - ld [hl], "Z" + ld [hl], "R" 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..63825c0e 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -132,7 +132,7 @@ LoadTownMap_Nest: ret MonsNestText: - db "'s NEST@" + db " FUNDORT@" LoadTownMap_Fly: call ClearSprites @@ -244,7 +244,7 @@ LoadTownMap_Fly: jr .pressedDown ToText: - db "To@" + db " ‘@" BuildFlyLocationsList: ld hl, wFlyLocationsList - 1 @@ -415,7 +415,7 @@ DisplayWildLocations: jp CopyData AreaUnknownText: - db " AREA UNKNOWN@" + db " GEBIET UNB.@" TownMapCoordsToOAMCoords: ; in: lower nybble of a = x, upper nybble of a = y diff --git a/engine/trade.asm b/engine/trade.asm index c3913a7e..4eb5c6c4 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..bd03715e 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 @@ -45,4 +45,4 @@ Trade_PrintEnemyMonInfoText: Trade_MonInfoText: db "──№⠄",$4E next "OT/" - next $73,"№⠄","@" + next "″№⠄@" |