diff options
author | einstein95 <einstein95@users.noreply.github.com> | 2017-01-09 06:06:10 +1300 |
---|---|---|
committer | einstein95 <einstein95@users.noreply.github.com> | 2017-01-09 06:06:10 +1300 |
commit | 653072192ccd9759ff44d8c86f8dc10a19756208 (patch) | |
tree | 72937492c7be9576f3ad6d1cd531bc77b5686d2a | |
parent | f2c38581b05ccddd18cd937b3552958de9353696 (diff) |
Almost done
34 files changed, 488 insertions, 488 deletions
diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm index 0ac69e5e..5d652570 100755 --- a/data/pokedex_entries.asm +++ b/data/pokedex_entries.asm @@ -196,21 +196,21 @@ PokedexEntryPointers: ; text entry RhydonDexEntry: - db "PERCEUR@" + db "BOHRER@" db 19 dw 1200 TX_FAR _RhydonDexEntry db "@" KangaskhanDexEntry: - db "MATERNEL@" + db "MUTTERTIER@" db 22 dw 800 TX_FAR _KangaskhanDexEntry db "@" NidoranMDexEntry: - db "VENEPIC@" + db "GIFTDORN@" db 5 dw 90 TX_FAR _NidoranMDexEntry @@ -224,21 +224,21 @@ ClefairyDexEntry: db "@" SpearowDexEntry: - db "MINOISEAU@" + db "KLEINVOGEL@" db 3 dw 20 TX_FAR _SpearowDexEntry db "@" VoltorbDexEntry: - db "BALLE@" + db "BALL@" db 5 dw 104 TX_FAR _VoltorbDexEntry db "@" NidokingDexEntry: - db "PERCEUR@" + db "BOHRER@" db 14 dw 620 TX_FAR _NidokingDexEntry @@ -252,70 +252,70 @@ SlowbroDexEntry: db "@" IvysaurDexEntry: - db "GRAINE@" + db "SAMEN@" db 10 dw 130 TX_FAR _IvysaurDexEntry db "@" ExeggutorDexEntry: - db "FRUITPALME@" + db "PALMFRUCHT@" db 20 dw 1200 TX_FAR _ExeggutorDexEntry db "@" LickitungDexEntry: - db "LECHEUR@" + db "SCHLECKER@" db 12 dw 655 TX_FAR _LickitungDexEntry db "@" ExeggcuteDexEntry: - db "OEUF@" + db "EI@" db 4 dw 25 TX_FAR _ExeggcuteDexEntry db "@" GrimerDexEntry: - db "DEGUEU@" + db "SCHLAMM@" db 9 dw 300 TX_FAR _GrimerDexEntry db "@" GengarDexEntry: - db "OMBRE@" + db "SCHATTEN@" db 15 dw 405 TX_FAR _GengarDexEntry db "@" NidoranFDexEntry: - db "VENEPIC@" + db "GIFTDORN@" db 4 dw 70 TX_FAR _NidoranFDexEntry db "@" NidoqueenDexEntry: - db "PERCEUR@" + db "BOHRER@" db 13 dw 600 TX_FAR _NidoqueenDexEntry db "@" CuboneDexEntry: - db "SOLITAIRE@" + db "EINSAM@" db 4 dw 65 TX_FAR _CuboneDexEntry db "@" RhyhornDexEntry: - db "PIQUANT@" + db "STACHLER@" db 10 dw 1150 TX_FAR _RhyhornDexEntry @@ -329,182 +329,182 @@ LaprasDexEntry: db "@" ArcanineDexEntry: - db "LEGENDAIRE@" + db "LEGENDÄR@" db 19 dw 1550 TX_FAR _ArcanineDexEntry db "@" MewDexEntry: - db "NOUVEAU@" + db "NEUE ART@" db 4 dw 40 TX_FAR _MewDexEntry db "@" GyaradosDexEntry: - db "TERRIFIANT@" + db "GRAUSAM@" db 65 dw 2350 TX_FAR _GyaradosDexEntry db "@" ShellderDexEntry: - db "BIVALVE@" + db "MUSCHEL@" db 3 dw 40 TX_FAR _ShellderDexEntry db "@" TentacoolDexEntry: - db "MOLLUSQUE@" + db "QUALLE@" db 9 dw 455 TX_FAR _TentacoolDexEntry db "@" GastlyDexEntry: - db "GAZ@" + db "GAS@" db 13 dw 1 TX_FAR _GastlyDexEntry db "@" ScytherDexEntry: - db "MANTE@" + db "MANTIS@" db 15 dw 560 TX_FAR _ScytherDexEntry db "@" StaryuDexEntry: - db "ETOILE@" + db "STERNFORM@" db 8 dw 345 TX_FAR _StaryuDexEntry db "@" BlastoiseDexEntry: - db "CARAPACE@" + db "PANZERTIER@" db 16 dw 855 TX_FAR _BlastoiseDexEntry db "@" PinsirDexEntry: - db "SCARABEE@" + db "KNEIFKÄFER@" db 15 dw 550 TX_FAR _PinsirDexEntry db "@" TangelaDexEntry: - db "VIGNE@" + db "RANKE@" db 10 dw 350 TX_FAR _TangelaDexEntry db "@" GrowlitheDexEntry: - db "CHIOT@" + db "HUND@" db 7 dw 190 TX_FAR _GrowlitheDexEntry db "@" OnixDexEntry: - db "SERPENROC@" + db "FELSNATTER@" db 88 dw 2100 TX_FAR _OnixDexEntry db "@" FearowDexEntry: - db "BEC-OISEAU@" + db "PICKVOGEL@" db 12 dw 380 TX_FAR _FearowDexEntry db "@" PidgeyDexEntry: - db "MINOISEAU@" + db "KLEINVOGEL@" db 3 dw 18 TX_FAR _PidgeyDexEntry db "@" SlowpokeDexEntry: - db "CRETIN@" + db "SCHNARCHER@" db 12 dw 360 TX_FAR _SlowpokeDexEntry db "@" KadabraDexEntry: - db "PSY@" + db "PSI@" db 13 dw 565 TX_FAR _KadabraDexEntry db "@" GravelerDexEntry: - db "ROCHE@" + db "GESTEIN@" db 10 dw 1050 TX_FAR _GravelerDexEntry db "@" ChanseyDexEntry: - db "OEUF@" + db "EI@" db 11 dw 346 TX_FAR _ChanseyDexEntry db "@" MachokeDexEntry: - db "COLOSSE@" + db "KRAFTPROTZ@" db 15 dw 705 TX_FAR _MachokeDexEntry db "@" MrMimeDexEntry: - db "BLOQUEUR@" + db "SPERRE@" db 13 dw 545 TX_FAR _MrMimeDexEntry db "@" HitmonleeDexEntry: - db "LATTEUR@" + db "KICKER@" db 15 dw 498 TX_FAR _HitmonleeDexEntry db "@" HitmonchanDexEntry: - db "PUNCHEUR@" + db "PUNCHER@" db 14 dw 502 TX_FAR _HitmonchanDexEntry db "@" ArbokDexEntry: - db "COBRA@" + db "KOBRA@" db 35 dw 650 TX_FAR _ArbokDexEntry db "@" ParasectDexEntry: - db "CHAMPIGNON@" + db "PILZ@" db 10 dw 295 TX_FAR _ParasectDexEntry db "@" PsyduckDexEntry: - db "CANARD@" + db "ENTE@" db 8 dw 196 TX_FAR _PsyduckDexEntry @@ -518,231 +518,231 @@ DrowzeeDexEntry: db "@" GolemDexEntry: - db "TITANESQUE@" + db "URGESTEIN@" db 14 dw 3000 TX_FAR _GolemDexEntry db "@" MagmarDexEntry: - db "CRACHE-FEU@" + db "BRENNER@" db 13 dw 445 TX_FAR _MagmarDexEntry db "@" ElectabuzzDexEntry: - db "ELECTRIQUE@" + db "ELEKTRO@" db 11 dw 300 TX_FAR _ElectabuzzDexEntry db "@" MagnetonDexEntry: - db "MAGNETIQUE@" + db "MAGNET@" db 10 dw 600 TX_FAR _MagnetonDexEntry db "@" KoffingDexEntry: - db "GAZ MORTEL@" + db "GIFTWOLKE@" db 6 dw 10 TX_FAR _KoffingDexEntry db "@" MankeyDexEntry: - db "PORSINGE@" + db "SCHW./AFFE@" db 5 dw 280 TX_FAR _MankeyDexEntry db "@" SeelDexEntry: - db "OTARIE@" + db "SEEHUND@" db 11 dw 900 TX_FAR _SeelDexEntry db "@" DiglettDexEntry: - db "TAUPE@" + db "MAULWURF@" db 2 dw 8 TX_FAR _DiglettDexEntry db "@" TaurosDexEntry: - db "BUFFLE@" + db "WILDBULLE@" db 14 dw 884 TX_FAR _TaurosDexEntry db "@" FarfetchdDexEntry: - db "CANARD FOU@" + db "WILDENTE@" db 8 dw 150 TX_FAR _FarfetchdDexEntry db "@" VenonatDexEntry: - db "VERMINE@" + db "INSEKT@" db 10 dw 300 TX_FAR _VenonatDexEntry db "@" DragoniteDexEntry: - db "DRAGON@" + db "DRACHE@" db 22 dw 2100 TX_FAR _DragoniteDexEntry db "@" DoduoDexEntry: - db "DUOISEAU@" + db "DUOVOGEL@" db 14 dw 392 TX_FAR _DoduoDexEntry db "@" PoliwagDexEntry: - db "TETARD@" + db "KAULQUAPPE@" db 6 dw 124 TX_FAR _PoliwagDexEntry db "@" JynxDexEntry: - db "HUMANOIDE@" + db "HUMANOTYP@" db 14 dw 406 TX_FAR _JynxDexEntry db "@" MoltresDexEntry: - db "FLAMME@" + db "FEUER@" db 20 dw 600 TX_FAR _MoltresDexEntry db "@" ArticunoDexEntry: - db "GLACIAIRE@" + db "EIS@" db 17 dw 554 TX_FAR _ArticunoDexEntry db "@" ZapdosDexEntry: - db "ELECTRIQUE@" + db "ELEKTRO@" db 16 dw 526 TX_FAR _ZapdosDexEntry db "@" DittoDexEntry: - db "MORPHING@" + db "TRANSFORM@" db 3 dw 40 TX_FAR _DittoDexEntry db "@" MeowthDexEntry: - db "CHADEGOUT@" + db "KATZE@" db 4 dw 42 TX_FAR _MeowthDexEntry db "@" KrabbyDexEntry: - db "DOUX CRABE@" + db "KRABBE@" db 4 dw 65 TX_FAR _KrabbyDexEntry db "@" VulpixDexEntry: - db "RENARD@" + db "FUCHS@" db 6 dw 99 TX_FAR _VulpixDexEntry db "@" NinetalesDexEntry: - db "RENARD@" + db "FUCHS@" db 11 dw 199 TX_FAR _NinetalesDexEntry db "@" PikachuDexEntry: - db "SOURIS@" + db "MAUS@" db 4 dw 60 TX_FAR _PikachuDexEntry db "@" RaichuDexEntry: - db "SOURIS@" + db "MAUS@" db 8 dw 300 TX_FAR _RaichuDexEntry db "@" DratiniDexEntry: - db "DRAGON@" + db "DRACHE@" db 18 dw 33 TX_FAR _DratiniDexEntry db "@" DragonairDexEntry: - db "DRAGON@" + db "DRACHE@" db 40 dw 165 TX_FAR _DragonairDexEntry db "@" KabutoDexEntry: - db "CARAPACE@" + db "SCHALTIER@" db 5 dw 115 TX_FAR _KabutoDexEntry db "@" KabutopsDexEntry: - db "CARAPACE@" + db "SCHALTIER@" db 13 dw 405 TX_FAR _KabutopsDexEntry db "@" HorseaDexEntry: - db "DRAGON@" + db "DRACHE@" db 4 dw 80 TX_FAR _HorseaDexEntry db "@" SeadraDexEntry: - db "DRAGON@" + db "DRACHE@" db 12 dw 250 TX_FAR _SeadraDexEntry db "@" SandshrewDexEntry: - db "SOURIS@" + db "MAUS@" db 6 dw 120 TX_FAR _SandshrewDexEntry db "@" SandslashDexEntry: - db "SOURIS@" + db "MAUS@" db 10 dw 295 TX_FAR _SandslashDexEntry @@ -763,175 +763,175 @@ OmastarDexEntry: db "@" JigglypuffDexEntry: - db "BOUBOULE@" + db "BALLON@" db 5 dw 55 TX_FAR _JigglypuffDexEntry db "@" WigglytuffDexEntry: - db "BOUBOULE@" + db "BALLON@" db 10 dw 120 TX_FAR _WigglytuffDexEntry db "@" EeveeDexEntry: - db "EVOLUTIF@" + db "EVOLUTION@" db 3 dw 65 TX_FAR _EeveeDexEntry db "@" FlareonDexEntry: - db "FLAMME@" + db "FEUER@" db 9 dw 250 TX_FAR _FlareonDexEntry db "@" JolteonDexEntry: - db "FOUDRE@" + db "BLITZ@" db 8 dw 245 TX_FAR _JolteonDexEntry db "@" VaporeonDexEntry: - db "BULLEUR@" + db "BLUBBLASE@" db 10 dw 290 TX_FAR _VaporeonDexEntry db "@" MachopDexEntry: - db "COLOSSE@" + db "KRAFTPROTZ@" db 8 dw 195 TX_FAR _MachopDexEntry db "@" ZubatDexEntry: - db "CHOVSOURIS@" + db "FLEDERMAUS@" db 8 dw 75 TX_FAR _ZubatDexEntry db "@" EkansDexEntry: - db "SERPENT@" + db "SCHLANGE@" db 20 dw 69 TX_FAR _EkansDexEntry db "@" ParasDexEntry: - db "CHAMPIGNON@" + db "PILZ@" db 3 dw 54 TX_FAR _ParasDexEntry db "@" PoliwhirlDexEntry: - db "TETARD@" + db "KAULQUAPPE@" db 10 dw 200 TX_FAR _PoliwhirlDexEntry db "@" PoliwrathDexEntry: - db "TETARD@" + db "KAULQUAPPE@" db 13 dw 540 TX_FAR _PoliwrathDexEntry db "@" WeedleDexEntry: - db "INSECTOPIC@" + db "RAUPE@" db 3 dw 32 TX_FAR _WeedleDexEntry db "@" KakunaDexEntry: - db "COCON@" + db "KOKON@" db 6 dw 100 TX_FAR _KakunaDexEntry db "@" BeedrillDexEntry: - db "GUEPOISON@" + db "GIFTBIENE@" db 10 dw 295 TX_FAR _BeedrillDexEntry db "@" DodrioDexEntry: - db "TROISEAU@" + db "TRIVOGEL@" db 18 dw 852 TX_FAR _DodrioDexEntry db "@" PrimeapeDexEntry: - db "PORSINGE@" + db "SCHW./AFFE@" db 10 dw 320 TX_FAR _PrimeapeDexEntry db "@" DugtrioDexEntry: - db "TAUPE@" + db "MAULWURF@" db 7 dw 333 TX_FAR _DugtrioDexEntry db "@" VenomothDexEntry: - db "MITE@" + db "GIFTMOTTE@" db 15 dw 125 TX_FAR _VenomothDexEntry db "@" DewgongDexEntry: - db "OTARIE@" + db "SEEHUND@" db 17 dw 1200 TX_FAR _DewgongDexEntry db "@" CaterpieDexEntry: - db "VER@" + db "WURM@" db 3 dw 29 TX_FAR _CaterpieDexEntry db "@" MetapodDexEntry: - db "COCON@" + db "KOKON@" db 7 dw 99 TX_FAR _MetapodDexEntry db "@" ButterfreeDexEntry: - db "PAPILLON@" + db "FALTER@" db 11 dw 320 TX_FAR _ButterfreeDexEntry db "@" MachampDexEntry: - db "COLOSSE@" + db "KRAFTPROTZ@" db 16 dw 1300 TX_FAR _MachampDexEntry db "@" GolduckDexEntry: - db "CANARD@" + db "ENTE@" db 17 dw 766 TX_FAR _GolduckDexEntry @@ -945,56 +945,56 @@ HypnoDexEntry: db "@" GolbatDexEntry: - db "CHOVSOURIS@" + db "FLEDERMAUS@" db 16 dw 550 TX_FAR _GolbatDexEntry db "@" MewtwoDexEntry: - db "GENETIQUE@" + db "GENMUTANT@" db 20 dw 1220 TX_FAR _MewtwoDexEntry db "@" SnorlaxDexEntry: - db "PIONCEUR@" + db "TAGTRÄUMER@" db 21 dw 4600 TX_FAR _SnorlaxDexEntry db "@" MagikarpDexEntry: - db "POISSON@" + db "FISCH@" db 9 dw 100 TX_FAR _MagikarpDexEntry db "@" MukDexEntry: - db "DEGUEU@" + db "SCHLAMM@" db 12 dw 300 TX_FAR _MukDexEntry db "@" KinglerDexEntry: - db "POIGNEUR@" + db "KNEIFER@" db 13 dw 600 TX_FAR _KinglerDexEntry db "@" CloysterDexEntry: - db "BIVALVE@" + db "MUSCHEL@" db 15 dw 1325 TX_FAR _CloysterDexEntry db "@" ElectrodeDexEntry: - db "BALLE@" + db "BALL@" db 12 dw 666 TX_FAR _ElectrodeDexEntry @@ -1008,182 +1008,182 @@ ClefableDexEntry: db "@" WeezingDexEntry: - db "GAZ MORTEL@" + db "GIFTWOLKE@" db 12 dw 95 TX_FAR _WeezingDexEntry db "@" PersianDexEntry: - db "CHADEVILLE@" + db "RASSEKATZE@" db 10 dw 320 TX_FAR _PersianDexEntry db "@" MarowakDexEntry: - db "GARD'OS@" + db "KNOCHENFAN@" db 10 dw 450 TX_FAR _MarowakDexEntry db "@" HaunterDexEntry: - db "GAZ@" + db "GAS@" db 16 dw 1 TX_FAR _HaunterDexEntry db "@" AbraDexEntry: - db "PSY@" + db "PSI@" db 9 dw 195 TX_FAR _AbraDexEntry db "@" AlakazamDexEntry: - db "PSY@" + db "PSI@" db 15 dw 480 TX_FAR _AlakazamDexEntry db "@" PidgeottoDexEntry: - db "OISEAU@" + db "VOGEL@" db 11 dw 300 TX_FAR _PidgeottoDexEntry db "@" PidgeotDexEntry: - db "OISEAU@" + db "VOGEL@" db 15 dw 395 TX_FAR _PidgeotDexEntry db "@" StarmieDexEntry: - db "MYSTERIEUX@" + db "MYSTERIÖS@" db 11 dw 800 TX_FAR _StarmieDexEntry db "@" BulbasaurDexEntry: - db "GRAINE@" + db "SAMEN@" db 7 dw 69 TX_FAR _BulbasaurDexEntry db "@" VenusaurDexEntry: - db "GRAINE@" + db "SAMEN@" db 20 dw 1000 TX_FAR _VenusaurDexEntry db "@" TentacruelDexEntry: - db "MOLLUSQUE@" + db "QUALLE@" db 16 dw 550 TX_FAR _TentacruelDexEntry db "@" GoldeenDexEntry: - db "POISSON@" + db "GOLDFISCH@" db 6 dw 150 TX_FAR _GoldeenDexEntry db "@" SeakingDexEntry: - db "POISSON@" + db "GOLDFISCH@" db 13 dw 390 TX_FAR _SeakingDexEntry db "@" PonytaDexEntry: - db "CHEVAL FEU@" + db "FEUERPFERD@" db 10 dw 300 TX_FAR _PonytaDexEntry db "@" RapidashDexEntry: - db "CHEVAL FEU@" + db "FEUERPFERD@" db 17 dw 950 TX_FAR _RapidashDexEntry db "@" RattataDexEntry: - db "RAT@" + db "RATTE@" db 3 dw 35 TX_FAR _RattataDexEntry db "@" RaticateDexEntry: - db "RAT@" + db "RATTE@" db 7 dw 185 TX_FAR _RaticateDexEntry db "@" NidorinoDexEntry: - db "VENEPIC@" + db "GIFTDORN@" db 9 dw 195 TX_FAR _NidorinoDexEntry db "@" NidorinaDexEntry: - db "VENEPIC@" + db "GIFTDORN@" db 8 dw 200 TX_FAR _NidorinaDexEntry db "@" GeodudeDexEntry: - db "ROCHE@" + db "GESTEIN@" db 4 dw 200 TX_FAR _GeodudeDexEntry db "@" PorygonDexEntry: - db "VIRTUEL@" + db "VIRTUELL@" db 8 dw 365 TX_FAR _PorygonDexEntry db "@" AerodactylDexEntry: - db "FOSSILE@" + db "FOSSIL@" db 18 dw 590 TX_FAR _AerodactylDexEntry db "@" MagnemiteDexEntry: - db "MAGNETIQUE@" + db "MAGNET@" db 3 dw 60 TX_FAR _MagnemiteDexEntry db "@" CharmanderDexEntry: - db "LEZARD@" + db "ECHSE@" db 6 dw 85 TX_FAR _CharmanderDexEntry db "@" SquirtleDexEntry: - db "MINITORTUE@" + db "MINIKRÖTE@" db 5 dw 90 TX_FAR _SquirtleDexEntry @@ -1197,7 +1197,7 @@ CharmeleonDexEntry: db "@" WartortleDexEntry: - db "TORTUE@" + db "KRÖTE@" db 10 dw 225 TX_FAR _WartortleDexEntry @@ -1211,42 +1211,42 @@ CharizardDexEntry: db "@" OddishDexEntry: - db "RACINE@" + db "UNKRAUT@" db 5 dw 54 TX_FAR _OddishDexEntry db "@" GloomDexEntry: - db "RACINE@" + db "UNKRAUT@" db 8 dw 86 TX_FAR _GloomDexEntry db "@" VileplumeDexEntry: - db "FLEUR@" + db "BLUME@" db 12 dw 186 TX_FAR _VileplumeDexEntry db "@" BellsproutDexEntry: - db "FLEUR@" + db "BLUME@" db 7 dw 40 TX_FAR _BellsproutDexEntry db "@" WeepinbellDexEntry: - db "CARNIVORE@" + db "FLIEGENTOT@" db 10 dw 64 TX_FAR _WeepinbellDexEntry db "@" VictreebelDexEntry: - db "CARNIVORE@" + db "FLIEGENTOT@" db 17 dw 155 TX_FAR _VictreebelDexEntry diff --git a/data/prizes.asm b/data/prizes.asm index cc879ffb..0fc9a8f0 100755 --- a/data/prizes.asm +++ b/data/prizes.asm @@ -9,7 +9,7 @@ PrizeDifferentMenuPtrs: dw PrizeMenuTMsCost NoThanksText: - db "NON MERCI@" + db "TSCHÜSS!@" PrizeMenuMon1Entries: db ABRA diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 6d758dd1..a80da1af 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2967,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 @@ -6907,19 +6907,15 @@ InitWildBattle: ld [hli], a ; write front sprite pointer ld [hl], b ld hl, wEnemyMonNick ; set name to "GHOST" - ld a, "S" - ld [hli], a - ld a, "P" + ld a, "G" ld [hli], a ld a, "E" ld [hli], a - ld a, "C" - ld [hli], a - ld a, "T" + ld a, "I" ld [hli], a - ld a, "R" + ld a, "S" ld [hli], a - ld a, "E" + ld a, "T" ld [hli], a ld [hl], "@" ld a, [wcf91] @@ -7963,12 +7959,12 @@ PrintStatText: jp CopyData StatsTextStrings: - db "FOR@" - db "DEF@" - db "VIT@" - db "SPE@" - db "PRE@" - db "ESQ@" + 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 92a1bcda..f3720944 100755 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -12,14 +12,16 @@ EndOfBattle: call ClearScreen callab DisplayLinkBattleVersusTextBox ld a, [wBattleResult] - cp $1 + cp 1 ld de, YouWinText jr c, .placeWinOrLoseString ld de, YouLoseText jr z, .placeWinOrLoseString ld de, DrawText -.placeWinOrLoseString coord hl, 6, 8 + jr .placeWinOrLoseString + coord hl, 6, 8 +.placeWinOrLoseString call PlaceString ld c, 200 call DelayFrames @@ -75,13 +77,13 @@ EndOfBattle: ret YouWinText: - db " GAGNE@" + db "GEWONNEN@" YouLoseText: - db " PERDU@" + db "VERLOREN@" DrawText: - db "MATCH NUL@" + 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 d58b6c22..9e5f89cb 100644 --- a/engine/battle/link_battle_versus_text.asm +++ b/engine/battle/link_battle_versus_text.asm @@ -12,7 +12,7 @@ DisplayLinkBattleVersusTextBox: ld de, wLinkEnemyTrainerName call PlaceString ; place bold "VS" tiles between the names - coord hl, 7, 8 + coord hl, 9, 8 ld a, "V" ldi [hl], a ld [hl], "S" diff --git a/engine/battle/save_trainer_name.asm b/engine/battle/save_trainer_name.asm index 45b35a76..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 "GAMIN@" + db "TEENAGER@" BugCatcherName: - db "SCOUT@" + db "KÄFERSAMMLER@" LassName: - db "FILLETTE@" + db "GÖRE@" JrTrainerMName: - db "DRESSEUR JR♂@" + db "PFADFINDER@" JrTrainerFName: - db "DRESSEUR JR♀@" + db "PFADFINDERIN@" PokemaniacName: db "#MANIAC@" SuperNerdName: - db "INTELLO@" + db "STREBER@" BurglarName: - db "PILLARD@" + db "DIEB@" EngineerName: - db "MECANO@" + db "MECHANIKER@" JugglerXName: db "JONGLEUR@" SwimmerName: - db "NAGEUR@" + db "SCHWIMMER@" BeautyName: - db "CANON@" + db "SCHÖNHEIT@" RockerName: db "ROCKER@" JugglerName: db "JONGLEUR@" BlackbeltName: - db "KARATEKA@" + db "SCHWARZGURT@" ProfOakName: - db "PROF.CHEN@" + db "PROF.EICH@" ChiefName: db "CHIEF@" ScientistName: - db "SCIENTIFIQUE@" + db "FORSCHER@" RocketName: db "ROCKET@" CooltrainerMName: - db "TOPDRESSEUR♂@" + db "TRAINER@" CooltrainerFName: - db "TOPDRESSEUR♀@" + db "TRAINERIN@" diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 47b260f0..a42916cb 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -290,7 +290,7 @@ CableClub_DoBattleOrTradeAgain: jr CallCurrentTradeCenterFunction PleaseWaitString: - db "ATTENDEZ SVP@" + db "BITTE WARTEN!@" CallCurrentTradeCenterFunction: ld hl, TradeCenterPointerTable @@ -533,7 +533,7 @@ TradeCenter_SelectMon: ld [wTradeCenterPointerTableIndex], a jp CallCurrentTradeCenterFunction .statsTrade - db "STATS ECHANGE@" + db "STATUS TAUSCH@" .selectedCancelMenuItem ld a, [wCurrentMenuItem] ld b, a @@ -609,7 +609,7 @@ TradeCenter_DrawCancelBox: jp PlaceString CancelTextString: - db "ANNULER@" + db "ABBRECHEN@" TradeCenter_PlaceSelectedEnemyMonMenuCursor: ld a, [wSerialSyncAndExchangeNybbleReceiveData] @@ -876,11 +876,11 @@ WillBeTradedText: db "@" TradeCompleted: - db "ECHANGE TERMINE!@" + db "TAUSCH VOLLZOGEN!@" TradeCanceled: - db "Dommage! L'échange" - next "est annulé!@" + db "Schade! Der tausch" + next "wurde abgebrochen!@" TradeCenterPointerTable: dw TradeCenter_SelectMon diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index dbbb5513..f7c45222 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 "CABLE LINK" - next "COLISEE" - next "CENTRE TROC" - next "NE PLUS LIRE@" + db "LINK-INFO" + next "KOLOSSEUM" + next "HANDELSCENTER" + next "VERLASSEN@" LinkCableInfoTexts: dw LinkCableInfoText1 @@ -268,14 +268,14 @@ ViridianSchoolBlackboardText2: db "@" StatusAilmentText1: - db " SOM" - next " PSN" + db " SLF" + next " GIF" next " PAR@" StatusAilmentText2: - db " BRU" - next " GEL" - next " RET@" + db " BRT" + next " GFR" + next " ZUR.@" ViridianBlackboardStatusPointers: dw ViridianBlackboardSleepText diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 2f9a6aa5..39d72e2e 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -445,11 +445,11 @@ BillsHousePokemonListText1: db "@" BillsMonListText: - db "EVOLI" - next "PYROLI" - next "VOLTALI" - next "AQUALI" - next "RETOUR@" + 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 159f3a45..96636392 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 "Vous n'avez pas" - line "de #MON!" + text "Du besitzt noch" + line "keine #MON!" prompt .notUsingSoftboiled call DisplayPartyMenu @@ -1425,11 +1425,11 @@ VitaminNoEffectText: db "@" VitaminText: - db "VIE@" - db "FOR@" - db "DEF@" - db "VIT@" - db "SPE@" + db "GESU@" + db "ANGR@" + db "VERT@" + db "INIT@" + db "SPEZ@" ItemUseBait: ld hl,ThrewBaitText diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 1bae3b51..5884d4b8 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 "PC DE ???@" -BillsPCText: db "PC DE LEO@" -PlayersPCText: db "PC DE @" -OaksPCText: db "PC DE CHEN@" -PKMNLeaguePCText: db "LIGUE ", $4a, "@" -LogOffPCText: db "DECONNEXION@" +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 @@ -339,15 +339,15 @@ DisplayMonListMenu: ret BillsPCMenuText: - db "RETIRER ", $4a - next "STOCKER ", $4a - next "RELACHER ", $4a - next "CHANGER BOITE" - next "SALUT!" + db "<pkmn> MITNEHMEN" + next "<pkmn> ABLEGEN" + next "<pkmn> FREILASSEN" + next "BOX WECHSELN" + next "TSCHÜSS!" db "@" BoxNoPCText: - db "BOITE@" + db "BOX Nr.@" KnowsHMMove:: ; returns whether mon with party index [wWhichPokemon] knows an HM move @@ -451,11 +451,11 @@ DisplayDepositWithdrawMenu: call LoadGBPal jr .loop -DepositPCText: db "STOCKER@" -WithdrawPCText: db "RETIRER@" +DepositPCText: db "ABLEGEN@" +WithdrawPCText: db "MITNEHMEN@" StatsCancelPCText: - db "STATS" - next "RETOUR@" + db "STATUS" + next "ZURÜCK@" SwitchOnText: TX_FAR _SwitchOnText diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm index a1f73f7c..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 diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index b2209130..8ca8e1e3 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -106,7 +106,7 @@ LeaguePCShowMon: coord hl, 1, 15 ld de, HallOfFameNoText call PlaceString - coord hl, 15, 15 + coord hl, 16, 15 ld de, wHoFTeamNo lb bc, 1, 3 call PrintNumber diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 75a00486..ab32d5fd 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -329,16 +329,16 @@ SpecialEnterMap: jp EnterMap ContinueText: - db "CONTINUER", $4e + db "WEITER", $4e NewGameText: - db "NOUVEAU JEU" - next "OPTIONS@" + db "NEUES SPIEL" + next "OPTIONEN@" CableClubOptionsText: - db "CENTRE TROC" - next "COLISEE" - next "RETOUR@" + db "HANDELSCENTER" + next "KOLOSSEUM" + next "ZURÜCK@" DisplayContinueGameInfo: xor a @@ -421,10 +421,10 @@ PrintPlayTime: jp PrintNumber SaveScreenInfoText: - db "JOUEUR" - next "BADGES " - next "#DEX " - next "TEMPS@" + db "SPIELER" + next "ORDEN " + next "#DEX " + next "ZEIT@" DisplayOptionMenu: coord hl, 0, 0 @@ -579,19 +579,19 @@ DisplayOptionMenu: jp .eraseOldMenuCursor TextSpeedOptionText: - db "VIT. TEXTE" + db "TEXT-TEMPO" next " 3 2 1 @" BattleAnimationOptionText: - db "ANIMATION COMBAT" - next " OUI NON@" + db "KAMPFANIMATION" + next " AN AUS@" BattleStyleOptionText: - db "STYLE COMBAT" - next " CHOIX DEFINI@" + db "KAMPFSTIL" + next " WECHSEL FOLGEND@" OptionMenuCancelText: - db "RETOUR@" + 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 7835be97..e79a6668 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -369,10 +369,10 @@ PrintAlphabet: jp Delay3 LowerCaseAlphabet: - db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥MAJUSCULES@" + db "abcdefghijklmnopqrstuvwxyz äöü:×()",$e1,$e2,"-?!♂♀/⠄,¥GROSSBUCHSTABEN@" UpperCaseAlphabet: - db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥minuscules@" + db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ÄÖÜ:;[]",$e1,$e2,"-?!♂♀/⠄,¥kleinbuchstaben@" PrintNicknameAndUnderscores: call CalcStringLength @@ -475,10 +475,10 @@ PrintNamingText: ld a, [wNamingScreenType] ld de, YourTextString and a - jr z, .placeString + jr z, .notNickname ld de, RivalsTextString dec a - jr z, .placeString + jr z, .notNickname ld a, [wcf91] ld [wMonPartySpriteSpecies], a push af @@ -488,21 +488,25 @@ PrintNamingText: call GetMonName coord hl, 4, 1 call PlaceString - ld hl, $C3DD - ld de, $69F2 + coord hl, 1, 3 + ld de, NicknameTextString jr .placeString - +.notNickname + call PlaceString + ld l, c + ld h, b + ld de, NameTextString .placeString jp PlaceString YourTextString: - db "VOTRE NOM?@" + db "DEIN @" RivalsTextString: - db "NOM DU RIVAL?@" + db "GEGNER-@" NameTextString: - db "NOM?@" + db "NAME?@" NicknameTextString: - db "SURNOM?@" + db "ALIAS?@" diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index e799feec..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 "APTE@" + db "OK@" .notAbleToLearnMoveText - db "PAS APTE@" + db "NEIN@" .evolutionStoneMenu push hl ld hl,EvosMovesPointerTable @@ -184,9 +184,9 @@ RedrawPartyMenu_: pop hl jr .printLevel .ableToEvolveText - db "APTE@" + db "OK@" .notAbleToEvolveText - db "PAS APTE@" + 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 a9f067ff..b2a5d496 100755 --- a/engine/menu/players_pc.asm +++ b/engine/menu/players_pc.asm @@ -241,10 +241,10 @@ PlayerPCToss: jp .loop PlayersPCMenuEntries: - db "RETIRER OBJET" - next "STOCKER OBJET" - next "JETER OBJET" - next "DECONNEXION@" + 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 e3f9f1dd..9e13b869 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -360,19 +360,19 @@ DrawPokedexVerticalLine: ret PokedexSeenText: - db "VUS@" + db "GES@" PokedexOwnText: - db "PRIS@" + db "BES@" PokedexContentsText: - db "SOMMAIRE@" + db "INHALT@" PokedexMenuItemsText: - db "INFO" - next "CRI" - next "ZONE" - next "RET@" + db "DATA" + next "RUF" + next "GEB." + next "ZUR.@" ; tests if a pokemon's bit is set in the seen or owned pokemon bit fields ; INPUT: @@ -591,8 +591,8 @@ ShowPokedexDataInternal: ret HeightWeightText: - db "TAI ???",$60 - next "PDS ???",$61,$62,"@" + 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 e2535261..5cfdbc87 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -166,7 +166,7 @@ PrintPrizePrice: ret .CoinString: - db "JETONS@" + db "MÜNZEN@" .SixSpacesString: db " @" diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 7384797a..fdef19dc 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -600,7 +600,6 @@ DrawTrainerInfo: ld de,wPlayerMoney ld c,$c3 call PrintBCDNumber - ld [hl],$f0 coord hl, 9, 6 ld de,wPlayTimeHours ; hours lb bc, LEFT_ALIGN | 1, 3 @@ -616,13 +615,13 @@ TrainerInfo_FarCopyData: jp FarCopyData2 TrainerInfo_NameMoneyTimeText: - db "NOM/" - next "ARG./" - next "TEMPS/@" + db "NAME/" + 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 d688a195..bc87f7fe 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -205,20 +205,20 @@ 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 "DO/" + db "OT/" next "@" StatusText: - db "STATUT/@" + db "STATUS/@" OKText: db "OK@" @@ -289,10 +289,10 @@ PrintStat: ret StatsText: - db "FOR" - next "DEF" - next "VIT" - next "SPE@" + db "ANGR" + next "VERT" + next "INIT" + next "SPEZ@" StatusScreen2: ld a, [hTilesetType] @@ -463,8 +463,8 @@ CalcExpToLevelUp: ret StatusScreenExpText: - db "PTS EXP." - next "PROCH.NIV.@" + db "EP-PUNKTE" + next "LEVEL UP@" StatusScreen_ClearName: ld bc, 10 diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 462d26b5..ffb06477 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -185,37 +185,37 @@ DisplayIntroNameTextBox: jp HandleMenuInput .namestring - db "─NOM@" + db "NAME@" IF DEF(_RED) DefaultNamesPlayer: - db "NOM:" - next "RED" - next "SACHA" - next "PAUL" + db "NAME" + next "ROT" + next "ASH" + next "JACK" db "@" DefaultNamesRival: - db "NOM:" - next "BLUE" - next "REGIS" - next "JEAN" + db "NAME" + next "BLAU" + next "GARY" + next "JOHN" db "@" ENDC IF DEF(_BLUE) DefaultNamesPlayer: - db "NOM:" - next "BLUE" - next "REGIS" - next "JEAN" + db "NAME" + next "BLAU" + next "GARY" + next "JOHN" db "@" DefaultNamesRival: - db "NOM:" - next "RED" - next "SACHA" - next "PAUL" + db "NAME" + next "ROT" + next "ASH" + next "JACK" db "@" ENDC @@ -245,27 +245,27 @@ GetDefaultName: IF DEF(_RED) DefaultNamesPlayerList: - db "NOM:@" - db "RED@" - db "SACHA@" - db "PAUL@" + db "NAME@" + db "ROT@" + db "ASH@" + db "JACK@" DefaultNamesRivalList: - db "NOM:@" - db "BLUE@" - db "REGIS@" - db "JEAN@" + db "NAME@" + db "BLAU@" + db "GARY@" + db "JOHN@" ENDC IF DEF(_BLUE) DefaultNamesPlayerList: - db "NOM:@" - db "BLUE@" - db "REGIS@" - db "JEAN@" + db "NAME@" + db "BLAU@" + db "GARY@" + db "JOHN@" DefaultNamesRivalList: - db "NOM:@" - db "RED@" - db "SACHA@" - db "PAUL@" + db "NAME@" + db "ROT@" + db "ASH@" + db "JACK@" ENDC TextTerminator_6b20: diff --git a/engine/save.asm b/engine/save.asm index 78527c65..d6ea8c7d 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -441,14 +441,14 @@ DisplayChangeBoxMenu: call TextBoxBorder ld hl, ChooseABoxText call PrintText - coord hl, 9, 0 + coord hl, 11, 0 ld b, 12 ld c, 7 call TextBoxBorder ld hl, hFlags_0xFFF6 set 2, [hl] ld de, BoxNames - coord hl, 11, 1 + coord hl, 13, 1 call PlaceString ld hl, hFlags_0xFFF6 res 2, [hl] @@ -457,7 +457,7 @@ DisplayChangeBoxMenu: cp 9 jr c, .singleDigitBoxNum sub 9 - coord hl, 6, 2 + coord hl, 8, 2 ld [hl], "1" add "0" jr .next diff --git a/engine/town_map.asm b/engine/town_map.asm index 177664da..63825c0e 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -118,9 +118,8 @@ LoadTownMap_Nest: push hl call DisplayWildLocations call GetMonName - coord hl, 8, 0 + coord hl, 1, 0 call PlaceString -; coord hl, 1, 0 ld h, b ld l, c ld de, MonsNestText diff --git a/engine/trade2.asm b/engine/trade2.asm index 7797ccdf..bd03715e 100755 --- a/engine/trade2.asm +++ b/engine/trade2.asm @@ -44,5 +44,5 @@ Trade_PrintEnemyMonInfoText: Trade_MonInfoText: db "──№⠄",$4E - next "DO/" - next "№",$73,"⠄@" + next "OT/" + next "″№⠄@" diff --git a/gfx/battle_hud1.png b/gfx/battle_hud1.png Binary files differindex aff13512..097c8453 100644 --- a/gfx/battle_hud1.png +++ b/gfx/battle_hud1.png diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm index 97aaed15..ab6b8df9 100755 --- a/scripts/bikeshop.asm +++ b/scripts/bikeshop.asm @@ -79,11 +79,11 @@ BikeShopText1: jp TextScriptEnd BikeShopMenuText: - db "BICYCLETTE" - next "RETOUR@" + db "FAHRRAD" + next "ZURÜCK@" BikeShopMenuPrice: - db "1000000¥@" + db "¥1000000@" BikeShopText_1d810: TX_FAR _BikeShopText_1d810 diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 89aa3b03..00acd169 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -491,7 +491,7 @@ CeladonGameCornerScript_48f1e: call PlaceString coord hl, 12, 3 ld de, wPlayerMoney - ld c, $83 + ld c, "d" call PrintBCDNumber coord hl, 12, 4 ld de, GameCornerCoinText @@ -501,20 +501,20 @@ CeladonGameCornerScript_48f1e: call PlaceString coord hl, 15, 5 ld de, wPlayerCoins - ld c, $82 + ld c, "C" call PrintBCDNumber ld hl, wd730 res 6, [hl] ret GameCornerMoneyText: - db "ARG.@" + db "GELD@" GameCornerCoinText: - db "JETONS@" + db "MÜNZEN@" GameCornerBlankText1: - db " ¥@" + db " @" GameCornerBlankText2: db " @" diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index c0a9df6f..78506396 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -17,7 +17,7 @@ CeladonGymScript_48927: jp LoadGymLeaderAndCityName Gym4CityName: - db "CELADOPOLE@" + db "PRISMANIA CITY@" Gym4LeaderName: db "ERIKA@" diff --git a/scripts/route23.asm b/scripts/route23.asm index 1a24ecf6..6fd70051 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -92,25 +92,25 @@ BadgeTextPointers: dw EarthBadgeText EarthBadgeText: - db "BADGE TERRE@" + db "ERDORDEN@" VolcanoBadgeText: - db "BADGE VOLCAN@" + db "VULKANORDEN@" MarshBadgeText: - db "BADGE MARAIS@" + db "SUMPFORDEN@" SoulBadgeText: - db "BADGE AME@" + db "SEELENORDEN@" RainbowBadgeText: - db "BADGE PRISME@" + db "FARBORDEN@" ThunderBadgeText: - db "BADGE FOUDRE@" + db "DONNERORDEN@" CascadeBadgeText: - db "BADGECASCADE@" + db "QUELLORDEN@" Route23Script_512d8: ld a, $1 diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index 2dcaed44..fa22f190 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -17,10 +17,10 @@ SaffronGymScript: jp LoadGymLeaderAndCityName Gym6CityName: - db "SAFRANIA@" + db "SAFFRONIA CITY@" Gym6LeaderName: - db "MORGANE@" + db "SABRINA@" SaffronGymText_5d048: xor a diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index f2c3f7c4..350372f9 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -22,7 +22,7 @@ VermilionGymScript_5ca4c: jp LoadGymLeaderAndCityName Gym3CityName: - db "CARMIN SUR MER@" + db "ORANIA CITY@" Gym3LeaderName: db "MAJOR BOB@" diff --git a/text/monster_names.asm b/text/monster_names.asm index 9a06882e..7c5fa06f 100755 --- a/text/monster_names.asm +++ b/text/monster_names.asm @@ -1,191 +1,191 @@ MonsterNames: - db "RHINOFEROS" - db "KANGOUREX@" + db "RIZEROS@@@" + db "KANGAMA@@@" db "NIDORAN♂@@" - db "MELOFEE@@@" - db "PIAFABEC@@" - db "VOLTORBE@@" + db "PIEPI@@@@@" + db "HABITAK@@@" + db "VOLTOBAL@@" db "NIDOKING@@" - db "FLAGADOSS@" - db "HERBIZARRE" - db "NOADKOKO@@" - db "EXCELANGUE" - db "NOEUNOEUF@" - db "TADMORV@@@" - db "ECTOPLASMA" + db "LAHMUS@@@@" + db "BISAKNOSP@" + db "KOKOWEI@@@" + db "SCHLURP@@@" + db "OWEI@@@@@@" + db "SLEIMA@@@@" + db "GENGAR@@@@" db "NIDORAN♀@@" db "NIDOQUEEN@" - db "OSSELAIT@@" - db "RHINOCORNE" - db "LOKHLASS@@" - db "ARCANIN@@@" + db "TRAGOSSO@@" + db "RIHORN@@@@" + db "LAPRAS@@@@" + db "ARKANI@@@@" db "MEW@@@@@@@" - db "LEVIATOR@@" - db "KOKIYAS@@@" - db "TENTACOOL@" - db "FANTOMINUS" - db "INSECATEUR" - db "STARI@@@@@" - db "TORTANK@@@" - db "SCARABRUTE" - db "SAQUEDENEU" - db "MISSINGNO." - db "MISSINGNO." - db "CANINOS@@@" + db "GARADOS@@@" + db "MUSCHAS@@@" + db "TENTACHA@@" + db "NEBULAK@@@" + db "SICHLOR@@@" + db "STERNDU@@@" + db "TURTOK@@@@" + db "PINSIR@@@@" + db "TANGELA@@@" + db "MISSINGNO." + db "MISSINGNO." + db "FUKANO@@@@" db "ONIX@@@@@@" - db "RAPASDEPIC" - db "ROUCOOL@@@" - db "RAMOLOSS@@" + db "IBITAK@@@@" + db "TAUBSI@@@@" + db "FLEGMON@@@" db "KADABRA@@@" - db "GRAVALANCH" - db "LEVEINARD@" - db "MACHOPEUR@" - db "M.MIME@@@@" + db "GEOROK@@@@" + db "CHANEIRA@@" + db "MASCHOCK@@" + db "PANTIMOS@@" db "KICKLEE@@@" - db "TYGNON@@@@" + db "NOCKCHAN@@" db "ARBOK@@@@@" - db "PARASECT@@" - db "PSYKOKWAK@" - db "SOPORIFIK@" - db "GROLEM@@@@" + db "PARASEK@@@" + db "ENTON@@@@@" + db "TRAUMATO@@" + db "GEOWAZ@@@@" db "MISSINGNO." db "MAGMAR@@@@" db "MISSINGNO." db "ELEKTEK@@@" db "MAGNETON@@" - db "SMOGO@@@@@" + db "SMOGON@@@@" db "MISSINGNO." - db "FEROSINGE@" - db "OTARIA@@@@" - db "TAUPIQUEUR" + db "MENKI@@@@@" + db "JUROB@@@@@" + db "DIGDA@@@@@" db "TAUROS@@@@" db "MISSINGNO." db "MISSINGNO." db "MISSINGNO." - db "CANARTICHO" - db "MIMITOSS@@" - db "DRACOLOSSE" + db "PORENTA@@@" + db "BLUZUK@@@@" + db "DRAGORAN@@" db "MISSINGNO." db "MISSINGNO." db "MISSINGNO." - db "DODUO@@@@@" - db "PTITARD@@@" - db "LIPPOUTOU@" - db "SULFURA@@@" - db "ARTIKODIN@" - db "ELECTHOR@@" - db "METAMORPH@" - db "MIAOUSS@@@" + db "DODU@@@@@@" + db "QUAPSEL@@@" + db "ROSSANA@@@" + db "LAVADOS@@@" + db "ARKTOS@@@@" + db "ZAPDOS@@@@" + db "DITTO@@@@@" + db "MAUZI@@@@@" db "KRABBY@@@@" db "MISSINGNO." db "MISSINGNO." db "MISSINGNO." - db "GOUPIX@@@@" - db "FEUNARD@@@" + db "VULPIX@@@@" + db "VULNONA@@@" db "PIKACHU@@@" db "RAICHU@@@@" db "MISSINGNO." db "MISSINGNO." - db "MINIDRACO@" - db "DRACO@@@@@" + db "DRATINI@@@" + db "DRAGONIR@@" db "KABUTO@@@@" db "KABUTOPS@@" - db "HYPOTREMPE" - db "HYPOCEAN@@" + db "SEEPER@@@@" + db "SEEMON@@@@" db "MISSINGNO." db "MISSINGNO." - db "SABELETTE@" - db "SABLAIREAU" - db "AMONITA@@@" - db "AMONISTAR@" - db "RONDOUDOU@" - db "GRODOUDOU@" + db "SANDAN@@@@" + db "SANDAMER@@" + db "AMONITAS@@" + db "AMOROSO@@@" + db "PUMMELUFF@" + db "KNUDDELUFF" db "EVOLI@@@@@" - db "PYROLI@@@@" - db "VOLTALI@@@" - db "AQUALI@@@@" - db "MACHOC@@@@" - db "NOSFERAPTI" - db "ABO@@@@@@@" + db "FLAMARA@@@" + db "BLITZA@@@@" + db "AQUANA@@@@" + db "MACHOLLO@@" + db "ZUBAT@@@@@" + db "RETTAN@@@@" db "PARAS@@@@@" - db "TETARTE@@@" - db "TARTARD@@@" - db "ASPICOT@@@" - db "COCONFORT@" - db "DARDARGNAN" + db "QUAPUTZI@@" + db "QUAPPO@@@@" + db "HORNLIU@@@" + db "KOKUNA@@@@" + db "BIBOR@@@@@" db "MISSINGNO." - db "DODRIO@@@@" - db "COLOSSINGE" - db "TRIOPIKEUR" - db "AEROMITE@@" - db "LAMANTINE@" + db "DODRI@@@@@" + db "RASAFF@@@@" + db "DIGDRI@@@@" + db "OMOT@@@@@@" + db "JUGONG@@@@" db "MISSINGNO." db "MISSINGNO." - db "CHENIPAN@@" - db "CHRYSACIER" - db "PAPILUSION" - db "MACKOGNEUR" + db "RAUPY@@@@@" + db "SAFCON@@@@" + db "SMETTBO@@@" + db "MACHOMEI@@" db "MISSINGNO." - db "AKWAKWAK@@" - db "HYPNOMADE@" - db "NOSFERALTO" - db "MEWTWO@@@@" - db "RONFLEX@@@" - db "MAGICARPE@" + db "ENTORON@@@" + db "HYPNO@@@@@" + db "GOLBAT@@@@" + db "MEWTU@@@@@" + db "RELAXO@@@@" + db "KARPADOR@@" db "MISSINGNO." db "MISSINGNO." - db "GROTADMORV" + db "SLEIMOK@@@" db "MISSINGNO." - db "KRABBOSS@@" - db "CRUSTABRI@" + db "KINGLER@@@" + db "AUSTOS@@@@" db "MISSINGNO." - db "ELECTRODE@" - db "MELODELFE@" - db "SMOGOGO@@@" - db "PERSIAN@@@" - db "OSSATUEUR@" + db "LEKTROBAL@" + db "PIXI@@@@@@" + db "SMOGMOG@@@" + db "SNOBILIKAT" + db "KNOGGA@@@@" db "MISSINGNO." - db "SPECTRUM@@" + db "ALPOLLO@@@" db "ABRA@@@@@@" - db "ALAKAZAM@@" - db "ROUCOUPS@@" - db "ROUCARNAGE" - db "STAROSS@@@" - db "BULBIZARRE" - db "FLORIZARRE" - db "TENTACRUEL" + db "SIMSALA@@@" + db "TAUBOGA@@@" + db "TAUBOSS@@@" + db "STARMIE@@@" + db "BISASAM@@@" + db "BISAFLOR@@" + db "TENTOXA@@@" db "MISSINGNO." - db "POISSIRENE" - db "POISSOROY@" + db "GOLDINI@@@" + db "GOLKING@@@" db "MISSINGNO." db "MISSINGNO." db "MISSINGNO." db "MISSINGNO." - db "PONYTA@@@@" - db "GALOPA@@@@" - db "RATTATA@@@" - db "RATTATAC@@" + db "PONITA@@@@" + db "GALLOPA@@@" + db "RATTFRATZ@" + db "RATTIKARL@" db "NIDORINO@@" db "NIDORINA@@" - db "RACAILLOU@" + db "KLEINSTEIN" db "PORYGON@@@" - db "PTERA@@@@@" + db "AERODACTYL" db "MISSINGNO." - db "MAGNETI@@@" + db "MAGNETILO@" db "MISSINGNO." db "MISSINGNO." - db "SALAMECHE@" - db "CARAPUCE@@" - db "REPTINCEL@" - db "CARABAFFE@" - db "DRACAUFEU@" + db "GLUMANDA@@" + db "SCHIGGY@@@" + db "GLUTEXO@@@" + db "SCHILLOK@@" + db "GLURAK@@@@" db "MISSINGNO." db "MISSINGNO." db "MISSINGNO." db "MISSINGNO." - db "MYSTHERBE@" - db "ORTIDE@@@@" - db "RAFFLESIA@" - db "CHETIFLOR@" - db "BOUSTIFLOR" - db "EMPIFLOR@@" + db "MYRAPLA@@@" + db "DUFLOR@@@@" + db "GIFLOR@@@@" + db "KNOFENSA@@" + db "ULTRIGARIA" + db "SARZENIA@@" diff --git a/text/type_names.asm b/text/type_names.asm index 3c285d63..96933927 100755 --- a/text/type_names.asm +++ b/text/type_names.asm @@ -31,18 +31,18 @@ TypeNames: dw .Dragon .Normal: db "NORMAL@" -.Fighting: db "COMBAT@" -.Flying: db "VOL@" -.Poison: db "POISON@" -.Fire: db "FEU@" -.Water: db "EAU@" -.Grass: db "PLANTE@" -.Electric: db "ELECTRIK@" -.Psychic: db "PSY@" -.Ice: db "GLACE@" -.Ground: db "SOL@" -.Rock: db "ROCHE@" -.Bird: db "OISEAU@" -.Bug: db "INSECTE@" -.Ghost: db "SPECTRE@" -.Dragon: db "DRAGON@" +.Fighting: db "KAMPF@" +.Flying: db "FLUG@" +.Poison: db "GIFT@" +.Fire: db "FEUER@" +.Water: db "WASSER@" +.Grass: db "PFLANZE@" +.Electric: db "ELEKTRO@" +.Psychic: db "PSYCHO@" +.Ice: db "EIS@" +.Ground: db "BODEN@" +.Rock: db "GESTEIN@" +.Bird: db "VOGEL@" +.Bug: db "KÄFER@" +.Ghost: db "GEIST@" +.Dragon: db "DRACHEN@" |