diff options
| author | Logan <log.butt@gmail.com> | 2016-05-30 00:47:55 +1200 |
|---|---|---|
| committer | einstein95 <einstein95@users.noreply.github.com> | 2016-07-19 05:16:14 +1200 |
| commit | a27aad0f2c98e3e1d5faf7468f9d3858c16c2d3a (patch) | |
| tree | 23b5f771c0fade06c665453376bc965130e9ce55 | |
| parent | 25c27785aa83a12330ea58e1e35b2fec90dd84f4 (diff) | |
Initial decompilation of FR Red
41 files changed, 1019 insertions, 980 deletions
@@ -40,8 +40,8 @@ $(pokered_obj): %_red.o: %.asm $$(dep) $(pokeblue_obj): %_blue.o: %.asm $$(dep) rgbasm -D _BLUE -h -o $@ $*.asm -pokered_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON RED" -pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE" +pokered_opt = -jsv -k 01 -l 0x33 -m 0x1B -p 0 -r 03 -t "POKEMON RED" +pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x1B -p 0 -r 03 -t "POKEMON BLUE" %.gbc: $$(%_obj) rgblink -n $*.sym -o $@ $^ @@ -1,19 +1,20 @@ -# Pokémon Red and Blue +# Pokémon: Version Rouge -This is a disassembly of Pokémon Red and Blue. +This is a disassembly of Pokémon: Version Rouge. It builds the following roms: -* Pokemon Red (UE) [S][!].gb `md5: 3d45c1ee9abd5738df46d2bdda8b57dc` -* Pokemon Blue (UE) [S][!].gb `md5: 50927e843568814f7ed45ec4f944bd8b` +* Pokemon - Version Rouge (F) [S][!].gb `md5: ` To set up the repository, see [**INSTALL.md**](INSTALL.md). ## See also +* Disassembly of [**Pokémon Red & Blue**][pokered] * Disassembly of [**Pokémon Crystal**][pokecrystal] * irc: **irc.freenode.net** [**#pret**][irc] +[pokered]: https://github.com/pret/pokered [pokecrystal]: https://github.com/kanzure/pokecrystal [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret diff --git a/audio/engine_2.asm b/audio/engine_2.asm index 3928d092..097fee5b 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -1016,9 +1016,9 @@ Audio2_21e8b: cp $86 jr z, .asm_21e9a jr c, .asm_21e9d + ld a, [$D088] .asm_21e9a - scf - ccf + rla ret .asm_21e9d scf diff --git a/charmap.asm b/charmap.asm index 4b5278c6..5eb6ddcc 100644 --- a/charmap.asm +++ b/charmap.asm @@ -226,17 +226,12 @@ charmap "w", $B6 charmap "x", $B7 charmap "y", $B8 charmap "z", $B9 -charmap "é", $BA -charmap "'d", $BB -charmap "'l", $BC -charmap "'s", $BD -charmap "'t", $BE -charmap "'v", $BF - +charmap "é", $BC +charmap "n'", $D9 charmap "'", $E0 charmap "-", $E3 -charmap "'r", $E4 +charmap "+", $E4 charmap "'m", $E5 charmap "?", $E6 charmap "!", $E7 diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm index 3fb2d3c6..0ac69e5e 100755 --- a/data/pokedex_entries.asm +++ b/data/pokedex_entries.asm @@ -191,1064 +191,1064 @@ PokedexEntryPointers: dw VictreebelDexEntry ; string: species name -; height in feet, inches -; weight in pounds +; height in decimetres +; weight in centigrams ; text entry RhydonDexEntry: - db "DRILL@" - db 6,3 - dw 2650 + db "PERCEUR@" + db 19 + dw 1200 TX_FAR _RhydonDexEntry db "@" KangaskhanDexEntry: - db "PARENT@" - db 7,3 - dw 1760 + db "MATERNEL@" + db 22 + dw 800 TX_FAR _KangaskhanDexEntry db "@" NidoranMDexEntry: - db "POISON PIN@" - db 1,8 - dw 200 + db "VENEPIC@" + db 5 + dw 90 TX_FAR _NidoranMDexEntry db "@" ClefairyDexEntry: - db "FAIRY@" - db 2,0 - dw 170 + db "FEE@" + db 6 + dw 75 TX_FAR _ClefairyDexEntry db "@" SpearowDexEntry: - db "TINY BIRD@" - db 1,0 - dw 40 + db "MINOISEAU@" + db 3 + dw 20 TX_FAR _SpearowDexEntry db "@" VoltorbDexEntry: - db "BALL@" - db 1,8 - dw 230 + db "BALLE@" + db 5 + dw 104 TX_FAR _VoltorbDexEntry db "@" NidokingDexEntry: - db "DRILL@" - db 4,7 - dw 1370 + db "PERCEUR@" + db 14 + dw 620 TX_FAR _NidokingDexEntry db "@" SlowbroDexEntry: - db "HERMITCRAB@" - db 5,3 - dw 1730 + db "SYMBIOSE@" + db 16 + dw 785 TX_FAR _SlowbroDexEntry db "@" IvysaurDexEntry: - db "SEED@" - db 3,3 - dw 290 + db "GRAINE@" + db 10 + dw 130 TX_FAR _IvysaurDexEntry db "@" ExeggutorDexEntry: - db "COCONUT@" - db 6,7 - dw 2650 + db "FRUITPALME@" + db 20 + dw 1200 TX_FAR _ExeggutorDexEntry db "@" LickitungDexEntry: - db "LICKING@" - db 3,11 - dw 1440 + db "LECHEUR@" + db 12 + dw 655 TX_FAR _LickitungDexEntry db "@" ExeggcuteDexEntry: - db "EGG@" - db 1,4 - dw 60 + db "OEUF@" + db 4 + dw 25 TX_FAR _ExeggcuteDexEntry db "@" GrimerDexEntry: - db "SLUDGE@" - db 2,11 - dw 660 + db "DEGUEU@" + db 9 + dw 300 TX_FAR _GrimerDexEntry db "@" GengarDexEntry: - db "SHADOW@" - db 4,11 - dw 890 + db "OMBRE@" + db 15 + dw 405 TX_FAR _GengarDexEntry db "@" NidoranFDexEntry: - db "POISON PIN@" - db 1,4 - dw 150 + db "VENEPIC@" + db 4 + dw 70 TX_FAR _NidoranFDexEntry db "@" NidoqueenDexEntry: - db "DRILL@" - db 4,3 - dw 1320 + db "PERCEUR@" + db 13 + dw 600 TX_FAR _NidoqueenDexEntry db "@" CuboneDexEntry: - db "LONELY@" - db 1,4 - dw 140 + db "SOLITAIRE@" + db 4 + dw 65 TX_FAR _CuboneDexEntry db "@" RhyhornDexEntry: - db "SPIKES@" - db 3,3 - dw 2540 + db "PIQUANT@" + db 10 + dw 1150 TX_FAR _RhyhornDexEntry db "@" LaprasDexEntry: db "TRANSPORT@" - db 8,2 - dw 4850 + db 25 + dw 2200 TX_FAR _LaprasDexEntry db "@" ArcanineDexEntry: - db "LEGENDARY@" - db 6,3 - dw 3420 + db "LEGENDAIRE@" + db 19 + dw 1550 TX_FAR _ArcanineDexEntry db "@" MewDexEntry: - db "NEW SPECIE@" - db 1,4 - dw 90 + db "NOUVEAU@" + db 4 + dw 40 TX_FAR _MewDexEntry db "@" GyaradosDexEntry: - db "ATROCIOUS@" - db 21,4 - dw 5180 + db "TERRIFIANT@" + db 65 + dw 2350 TX_FAR _GyaradosDexEntry db "@" ShellderDexEntry: db "BIVALVE@" - db 1,0 - dw 90 + db 3 + dw 40 TX_FAR _ShellderDexEntry db "@" TentacoolDexEntry: - db "JELLYFISH@" - db 2,11 - dw 1000 + db "MOLLUSQUE@" + db 9 + dw 455 TX_FAR _TentacoolDexEntry db "@" GastlyDexEntry: - db "GAS@" - db 4,3 - dw 2 + db "GAZ@" + db 13 + dw 1 TX_FAR _GastlyDexEntry db "@" ScytherDexEntry: - db "MANTIS@" - db 4,11 - dw 1230 + db "MANTE@" + db 15 + dw 560 TX_FAR _ScytherDexEntry db "@" StaryuDexEntry: - db "STARSHAPE@" - db 2,7 - dw 760 + db "ETOILE@" + db 8 + dw 345 TX_FAR _StaryuDexEntry db "@" BlastoiseDexEntry: - db "SHELLFISH@" - db 5,3 - dw 1890 + db "CARAPACE@" + db 16 + dw 855 TX_FAR _BlastoiseDexEntry db "@" PinsirDexEntry: - db "STAGBEETLE@" - db 4,11 - dw 1210 + db "SCARABEE@" + db 15 + dw 550 TX_FAR _PinsirDexEntry db "@" TangelaDexEntry: - db "VINE@" - db 3,3 - dw 770 + db "VIGNE@" + db 10 + dw 350 TX_FAR _TangelaDexEntry db "@" GrowlitheDexEntry: - db "PUPPY@" - db 2,4 - dw 420 + db "CHIOT@" + db 7 + dw 190 TX_FAR _GrowlitheDexEntry db "@" OnixDexEntry: - db "ROCK SNAKE@" - db 28,10 - dw 4630 + db "SERPENROC@" + db 88 + dw 2100 TX_FAR _OnixDexEntry db "@" FearowDexEntry: - db "BEAK@" - db 3,11 - dw 840 + db "BEC-OISEAU@" + db 12 + dw 380 TX_FAR _FearowDexEntry db "@" PidgeyDexEntry: - db "TINY BIRD@" - db 1,0 - dw 40 + db "MINOISEAU@" + db 3 + dw 18 TX_FAR _PidgeyDexEntry db "@" SlowpokeDexEntry: - db "DOPEY@" - db 3,11 - dw 790 + db "CRETIN@" + db 12 + dw 360 TX_FAR _SlowpokeDexEntry db "@" KadabraDexEntry: - db "PSI@" - db 4,3 - dw 1250 + db "PSY@" + db 13 + dw 565 TX_FAR _KadabraDexEntry db "@" GravelerDexEntry: - db "ROCK@" - db 3,3 - dw 2320 + db "ROCHE@" + db 10 + dw 1050 TX_FAR _GravelerDexEntry db "@" ChanseyDexEntry: - db "EGG@" - db 3,7 - dw 760 + db "OEUF@" + db 11 + dw 346 TX_FAR _ChanseyDexEntry db "@" MachokeDexEntry: - db "SUPERPOWER@" - db 4,11 - dw 1550 + db "COLOSSE@" + db 15 + dw 705 TX_FAR _MachokeDexEntry db "@" MrMimeDexEntry: - db "BARRIER@" - db 4,3 - dw 1200 + db "BLOQUEUR@" + db 13 + dw 545 TX_FAR _MrMimeDexEntry db "@" HitmonleeDexEntry: - db "KICKING@" - db 4,11 - dw 1100 + db "LATTEUR@" + db 15 + dw 498 TX_FAR _HitmonleeDexEntry db "@" HitmonchanDexEntry: - db "PUNCHING@" - db 4,7 - dw 1110 + db "PUNCHEUR@" + db 14 + dw 502 TX_FAR _HitmonchanDexEntry db "@" ArbokDexEntry: db "COBRA@" - db 11,6 - dw 1430 + db 35 + dw 650 TX_FAR _ArbokDexEntry db "@" ParasectDexEntry: - db "MUSHROOM@" - db 3,3 - dw 650 + db "CHAMPIGNON@" + db 10 + dw 295 TX_FAR _ParasectDexEntry db "@" PsyduckDexEntry: - db "DUCK@" - db 2,7 - dw 430 + db "CANARD@" + db 8 + dw 196 TX_FAR _PsyduckDexEntry db "@" DrowzeeDexEntry: - db "HYPNOSIS@" - db 3,3 - dw 710 + db "HYPNOSE@" + db 10 + dw 324 TX_FAR _DrowzeeDexEntry db "@" GolemDexEntry: - db "MEGATON@" - db 4,7 - dw 6620 + db "TITANESQUE@" + db 14 + dw 3000 TX_FAR _GolemDexEntry db "@" MagmarDexEntry: - db "SPITFIRE@" - db 4,3 - dw 980 + db "CRACHE-FEU@" + db 13 + dw 445 TX_FAR _MagmarDexEntry db "@" ElectabuzzDexEntry: - db "ELECTRIC@" - db 3,7 - dw 660 + db "ELECTRIQUE@" + db 11 + dw 300 TX_FAR _ElectabuzzDexEntry db "@" MagnetonDexEntry: - db "MAGNET@" - db 3,3 - dw 1320 + db "MAGNETIQUE@" + db 10 + dw 600 TX_FAR _MagnetonDexEntry db "@" KoffingDexEntry: - db "POISON GAS@" - db 2,0 - dw 20 + db "GAZ MORTEL@" + db 6 + dw 10 TX_FAR _KoffingDexEntry db "@" MankeyDexEntry: - db "PIG MONKEY@" - db 1,8 - dw 620 + db "PORSINGE@" + db 5 + dw 280 TX_FAR _MankeyDexEntry db "@" SeelDexEntry: - db "SEA LION@" - db 3,7 - dw 1980 + db "OTARIE@" + db 11 + dw 900 TX_FAR _SeelDexEntry db "@" DiglettDexEntry: - db "MOLE@" - db 0,8 - dw 20 + db "TAUPE@" + db 2 + dw 8 TX_FAR _DiglettDexEntry db "@" TaurosDexEntry: - db "WILD BULL@" - db 4,7 - dw 1950 + db "BUFFLE@" + db 14 + dw 884 TX_FAR _TaurosDexEntry db "@" FarfetchdDexEntry: - db "WILD DUCK@" - db 2,7 - dw 330 + db "CANARD FOU@" + db 8 + dw 150 TX_FAR _FarfetchdDexEntry db "@" VenonatDexEntry: - db "INSECT@" - db 3,3 - dw 660 + db "VERMINE@" + db 10 + dw 300 TX_FAR _VenonatDexEntry db "@" DragoniteDexEntry: db "DRAGON@" - db 7,3 - dw 4630 + db 22 + dw 2100 TX_FAR _DragoniteDexEntry db "@" DoduoDexEntry: - db "TWIN BIRD@" - db 4,7 - dw 860 + db "DUOISEAU@" + db 14 + dw 392 TX_FAR _DoduoDexEntry db "@" PoliwagDexEntry: - db "TADPOLE@" - db 2,0 - dw 270 + db "TETARD@" + db 6 + dw 124 TX_FAR _PoliwagDexEntry db "@" JynxDexEntry: - db "HUMANSHAPE@" - db 4,7 - dw 900 + db "HUMANOIDE@" + db 14 + dw 406 TX_FAR _JynxDexEntry db "@" MoltresDexEntry: - db "FLAME@" - db 6,7 - dw 1320 + db "FLAMME@" + db 20 + dw 600 TX_FAR _MoltresDexEntry db "@" ArticunoDexEntry: - db "FREEZE@" - db 5,7 - dw 1220 + db "GLACIAIRE@" + db 17 + dw 554 TX_FAR _ArticunoDexEntry db "@" ZapdosDexEntry: - db "ELECTRIC@" - db 5,3 - dw 1160 + db "ELECTRIQUE@" + db 16 + dw 526 TX_FAR _ZapdosDexEntry db "@" DittoDexEntry: - db "TRANSFORM@" - db 1,0 - dw 90 + db "MORPHING@" + db 3 + dw 40 TX_FAR _DittoDexEntry db "@" MeowthDexEntry: - db "SCRATCHCAT@" - db 1,4 - dw 90 + db "CHADEGOUT@" + db 4 + dw 42 TX_FAR _MeowthDexEntry db "@" KrabbyDexEntry: - db "RIVER CRAB@" - db 1,4 - dw 140 + db "DOUX CRABE@" + db 4 + dw 65 TX_FAR _KrabbyDexEntry db "@" VulpixDexEntry: - db "FOX@" - db 2,0 - dw 220 + db "RENARD@" + db 6 + dw 99 TX_FAR _VulpixDexEntry db "@" NinetalesDexEntry: - db "FOX@" - db 3,7 - dw 440 + db "RENARD@" + db 11 + dw 199 TX_FAR _NinetalesDexEntry db "@" PikachuDexEntry: - db "MOUSE@" - db 1,4 - dw 130 + db "SOURIS@" + db 4 + dw 60 TX_FAR _PikachuDexEntry db "@" RaichuDexEntry: - db "MOUSE@" - db 2,7 - dw 660 + db "SOURIS@" + db 8 + dw 300 TX_FAR _RaichuDexEntry db "@" DratiniDexEntry: db "DRAGON@" - db 5,11 - dw 70 + db 18 + dw 33 TX_FAR _DratiniDexEntry db "@" DragonairDexEntry: db "DRAGON@" - db 13,1 - dw 360 + db 40 + dw 165 TX_FAR _DragonairDexEntry db "@" KabutoDexEntry: - db "SHELLFISH@" - db 1,8 - dw 250 + db "CARAPACE@" + db 5 + dw 115 TX_FAR _KabutoDexEntry db "@" KabutopsDexEntry: - db "SHELLFISH@" - db 4,3 - dw 890 + db "CARAPACE@" + db 13 + dw 405 TX_FAR _KabutopsDexEntry db "@" HorseaDexEntry: db "DRAGON@" - db 1,4 - dw 180 + db 4 + dw 80 TX_FAR _HorseaDexEntry db "@" SeadraDexEntry: db "DRAGON@" - db 3,11 - dw 550 + db 12 + dw 250 TX_FAR _SeadraDexEntry db "@" SandshrewDexEntry: - db "MOUSE@" - db 2,0 - dw 260 + db "SOURIS@" + db 6 + dw 120 TX_FAR _SandshrewDexEntry db "@" SandslashDexEntry: - db "MOUSE@" - db 3,3 - dw 650 + db "SOURIS@" + db 10 + dw 295 TX_FAR _SandslashDexEntry db "@" OmanyteDexEntry: - db "SPIRAL@" - db 1,4 - dw 170 + db "SPIRALE@" + db 4 + dw 75 TX_FAR _OmanyteDexEntry db "@" OmastarDexEntry: - db "SPIRAL@" - db 3,3 - dw 770 + db "SPIRALE@" + db 10 + dw 350 TX_FAR _OmastarDexEntry db "@" JigglypuffDexEntry: - db "BALLOON@" - db 1,8 - dw 120 + db "BOUBOULE@" + db 5 + dw 55 TX_FAR _JigglypuffDexEntry db "@" WigglytuffDexEntry: - db "BALLOON@" - db 3,3 - dw 260 + db "BOUBOULE@" + db 10 + dw 120 TX_FAR _WigglytuffDexEntry db "@" EeveeDexEntry: - db "EVOLUTION@" - db 1,0 - dw 140 + db "EVOLUTIF@" + db 3 + dw 65 TX_FAR _EeveeDexEntry db "@" FlareonDexEntry: - db "FLAME@" - db 2,11 - dw 550 + db "FLAMME@" + db 9 + dw 250 TX_FAR _FlareonDexEntry db "@" JolteonDexEntry: - db "LIGHTNING@" - db 2,7 - dw 540 + db "FOUDRE@" + db 8 + dw 245 TX_FAR _JolteonDexEntry db "@" VaporeonDexEntry: - db "BUBBLE JET@" - db 3,3 - dw 640 + db "BULLEUR@" + db 10 + dw 290 TX_FAR _VaporeonDexEntry db "@" MachopDexEntry: - db "SUPERPOWER@" - db 2,7 - dw 430 + db "COLOSSE@" + db 8 + dw 195 TX_FAR _MachopDexEntry db "@" ZubatDexEntry: - db "BAT@" - db 2,7 - dw 170 + db "CHOVSOURIS@" + db 8 + dw 75 TX_FAR _ZubatDexEntry db "@" EkansDexEntry: - db "SNAKE@" - db 6,7 - dw 150 + db "SERPENT@" + db 20 + dw 69 TX_FAR _EkansDexEntry db "@" ParasDexEntry: - db "MUSHROOM@" - db 1,0 - dw 120 + db "CHAMPIGNON@" + db 3 + dw 54 TX_FAR _ParasDexEntry db "@" PoliwhirlDexEntry: - db "TADPOLE@" - db 3,3 - dw 440 + db "TETARD@" + db 10 + dw 200 TX_FAR _PoliwhirlDexEntry db "@" PoliwrathDexEntry: - db "TADPOLE@" - db 4,3 - dw 1190 + db "TETARD@" + db 13 + dw 540 TX_FAR _PoliwrathDexEntry db "@" WeedleDexEntry: - db "HAIRY BUG@" - db 1,0 - dw 70 + db "INSECTOPIC@" + db 3 + dw 32 TX_FAR _WeedleDexEntry db "@" KakunaDexEntry: - db "COCOON@" - db 2,0 - dw 220 + db "COCON@" + db 6 + dw 100 TX_FAR _KakunaDexEntry db "@" BeedrillDexEntry: - db "POISON BEE@" - db 3,3 - dw 650 + db "GUEPOISON@" + db 10 + dw 295 TX_FAR _BeedrillDexEntry db "@" DodrioDexEntry: - db "TRIPLEBIRD@" - db 5,11 - dw 1880 + db "TROISEAU@" + db 18 + dw 852 TX_FAR _DodrioDexEntry db "@" PrimeapeDexEntry: - db "PIG MONKEY@" - db 3,3 - dw 710 + db "PORSINGE@" + db 10 + dw 320 TX_FAR _PrimeapeDexEntry db "@" DugtrioDexEntry: - db "MOLE@" - db 2,4 - dw 730 + db "TAUPE@" + db 7 + dw 333 TX_FAR _DugtrioDexEntry db "@" VenomothDexEntry: - db "POISONMOTH@" - db 4,11 - dw 280 + db "MITE@" + db 15 + dw 125 TX_FAR _VenomothDexEntry db "@" DewgongDexEntry: - db "SEA LION@" - db 5,7 - dw 2650 + db "OTARIE@" + db 17 + dw 1200 TX_FAR _DewgongDexEntry db "@" CaterpieDexEntry: - db "WORM@" - db 1,0 - dw 60 + db "VER@" + db 3 + dw 29 TX_FAR _CaterpieDexEntry db "@" MetapodDexEntry: - db "COCOON@" - db 2,4 - dw 220 + db "COCON@" + db 7 + dw 99 TX_FAR _MetapodDexEntry db "@" ButterfreeDexEntry: - db "BUTTERFLY@" - db 3,7 - dw 710 + db "PAPILLON@" + db 11 + dw 320 TX_FAR _ButterfreeDexEntry db "@" MachampDexEntry: - db "SUPERPOWER@" - db 5,3 - dw 2870 + db "COLOSSE@" + db 16 + dw 1300 TX_FAR _MachampDexEntry db "@" GolduckDexEntry: - db "DUCK@" - db 5,7 - dw 1690 + db "CANARD@" + db 17 + dw 766 TX_FAR _GolduckDexEntry db "@" HypnoDexEntry: - db "HYPNOSIS@" - db 5,3 - dw 1670 + db "HYPNOSE@" + db 16 + dw 756 TX_FAR _HypnoDexEntry db "@" GolbatDexEntry: - db "BAT@" - db 5,3 - dw 1210 + db "CHOVSOURIS@" + db 16 + dw 550 TX_FAR _GolbatDexEntry db "@" MewtwoDexEntry: - db "GENETIC@" - db 6,7 - dw 2690 + db "GENETIQUE@" + db 20 + dw 1220 TX_FAR _MewtwoDexEntry db "@" SnorlaxDexEntry: - db "SLEEPING@" - db 6,11 - dw 10140 + db "PIONCEUR@" + db 21 + dw 4600 TX_FAR _SnorlaxDexEntry db "@" MagikarpDexEntry: - db "FISH@" - db 2,11 - dw 220 + db "POISSON@" + db 9 + dw 100 TX_FAR _MagikarpDexEntry db "@" MukDexEntry: - db "SLUDGE@" - db 3,11 - dw 660 + db "DEGUEU@" + db 12 + dw 300 TX_FAR _MukDexEntry db "@" KinglerDexEntry: - db "PINCER@" - db 4,3 - dw 1320 + db "POIGNEUR@" + db 13 + dw 600 TX_FAR _KinglerDexEntry db "@" CloysterDexEntry: db "BIVALVE@" - db 4,11 - dw 2920 + db 15 + dw 1325 TX_FAR _CloysterDexEntry db "@" ElectrodeDexEntry: - db "BALL@" - db 3,11 - dw 1470 + db "BALLE@" + db 12 + dw 666 TX_FAR _ElectrodeDexEntry db "@" ClefableDexEntry: - db "FAIRY@" - db 4,3 - dw 880 + db "FEE@" + db 13 + dw 400 TX_FAR _ClefableDexEntry db "@" WeezingDexEntry: - db "POISON GAS@" - db 3,11 - dw 210 + db "GAZ MORTEL@" + db 12 + dw 95 TX_FAR _WeezingDexEntry db "@" PersianDexEntry: - db "CLASSY CAT@" - db 3,3 - dw 710 + db "CHADEVILLE@" + db 10 + dw 320 TX_FAR _PersianDexEntry db "@" MarowakDexEntry: - db "BONEKEEPER@" - db 3,3 - dw 990 + db "GARD'OS@" + db 10 + dw 450 TX_FAR _MarowakDexEntry db "@" HaunterDexEntry: - db "GAS@" - db 5,3 - dw 2 + db "GAZ@" + db 16 + dw 1 TX_FAR _HaunterDexEntry db "@" AbraDexEntry: - db "PSI@" - db 2,11 - dw 430 + db "PSY@" + db 9 + dw 195 TX_FAR _AbraDexEntry db "@" AlakazamDexEntry: - db "PSI@" - db 4,11 - dw 1060 + db "PSY@" + db 15 + dw 480 TX_FAR _AlakazamDexEntry db "@" PidgeottoDexEntry: - db "BIRD@" - db 3,7 - dw 660 + db "OISEAU@" + db 11 + dw 300 TX_FAR _PidgeottoDexEntry db "@" PidgeotDexEntry: - db "BIRD@" - db 4,11 - dw 870 + db "OISEAU@" + db 15 + dw 395 TX_FAR _PidgeotDexEntry db "@" StarmieDexEntry: - db "MYSTERIOUS@" - db 3,7 - dw 1760 + db "MYSTERIEUX@" + db 11 + dw 800 TX_FAR _StarmieDexEntry db "@" BulbasaurDexEntry: - db "SEED@" - db 2,4 - dw 150 + db "GRAINE@" + db 7 + dw 69 TX_FAR _BulbasaurDexEntry db "@" VenusaurDexEntry: - db "SEED@" - db 6,7 - dw 2210 + db "GRAINE@" + db 20 + dw 1000 TX_FAR _VenusaurDexEntry db "@" TentacruelDexEntry: - db "JELLYFISH@" - db 5,3 - dw 1210 + db "MOLLUSQUE@" + db 16 + dw 550 TX_FAR _TentacruelDexEntry db "@" GoldeenDexEntry: - db "GOLDFISH@" - db 2,0 - dw 330 + db "POISSON@" + db 6 + dw 150 TX_FAR _GoldeenDexEntry db "@" SeakingDexEntry: - db "GOLDFISH@" - db 4,3 - dw 860 + db "POISSON@" + db 13 + dw 390 TX_FAR _SeakingDexEntry db "@" PonytaDexEntry: - db "FIRE HORSE@" - db 3,3 - dw 660 + db "CHEVAL FEU@" + db 10 + dw 300 TX_FAR _PonytaDexEntry db "@" RapidashDexEntry: - db "FIRE HORSE@" - db 5,7 - dw 2090 + db "CHEVAL FEU@" + db 17 + dw 950 TX_FAR _RapidashDexEntry db "@" RattataDexEntry: db "RAT@" - db 1,0 - dw 80 + db 3 + dw 35 TX_FAR _RattataDexEntry db "@" RaticateDexEntry: db "RAT@" - db 2,4 - dw 410 + db 7 + dw 185 TX_FAR _RaticateDexEntry db "@" NidorinoDexEntry: - db "POISON PIN@" - db 2,11 - dw 430 + db "VENEPIC@" + db 9 + dw 195 TX_FAR _NidorinoDexEntry db "@" NidorinaDexEntry: - db "POISON PIN@" - db 2,7 - dw 440 + db "VENEPIC@" + db 8 + dw 200 TX_FAR _NidorinaDexEntry db "@" GeodudeDexEntry: - db "ROCK@" - db 1,4 - dw 440 + db "ROCHE@" + db 4 + dw 200 TX_FAR _GeodudeDexEntry db "@" PorygonDexEntry: - db "VIRTUAL@" - db 2,7 - dw 800 + db "VIRTUEL@" + db 8 + dw 365 TX_FAR _PorygonDexEntry db "@" AerodactylDexEntry: - db "FOSSIL@" - db 5,11 - dw 1300 + db "FOSSILE@" + db 18 + dw 590 TX_FAR _AerodactylDexEntry db "@" MagnemiteDexEntry: - db "MAGNET@" - db 1,0 - dw 130 + db "MAGNETIQUE@" + db 3 + dw 60 TX_FAR _MagnemiteDexEntry db "@" CharmanderDexEntry: - db "LIZARD@" - db 2,0 - dw 190 + db "LEZARD@" + db 6 + dw 85 TX_FAR _CharmanderDexEntry db "@" SquirtleDexEntry: - db "TINYTURTLE@" - db 1,8 - dw 200 + db "MINITORTUE@" + db 5 + dw 90 TX_FAR _SquirtleDexEntry db "@" CharmeleonDexEntry: - db "FLAME@" - db 3,7 - dw 420 + db "FLAMME@" + db 11 + dw 190 TX_FAR _CharmeleonDexEntry db "@" WartortleDexEntry: - db "TURTLE@" - db 3,3 - dw 500 + db "TORTUE@" + db 10 + dw 225 TX_FAR _WartortleDexEntry db "@" CharizardDexEntry: - db "FLAME@" - db 5,7 - dw 2000 + db "FLAMME@" + db 17 + dw 905 TX_FAR _CharizardDexEntry db "@" OddishDexEntry: - db "WEED@" - db 1,8 - dw 120 + db "RACINE@" + db 5 + dw 54 TX_FAR _OddishDexEntry db "@" GloomDexEntry: - db "WEED@" - db 2,7 - dw 190 + db "RACINE@" + db 8 + dw 86 TX_FAR _GloomDexEntry db "@" VileplumeDexEntry: - db "FLOWER@" - db 3,11 - dw 410 + db "FLEUR@" + db 12 + dw 186 TX_FAR _VileplumeDexEntry db "@" BellsproutDexEntry: - db "FLOWER@" - db 2,4 - dw 90 + db "FLEUR@" + db 7 + dw 40 TX_FAR _BellsproutDexEntry db "@" WeepinbellDexEntry: - db "FLYCATCHER@" - db 3,3 - dw 140 + db "CARNIVORE@" + db 10 + dw 64 TX_FAR _WeepinbellDexEntry db "@" VictreebelDexEntry: - db "FLYCATCHER@" - db 5,7 - dw 340 + db "CARNIVORE@" + db 17 + dw 155 TX_FAR _VictreebelDexEntry db "@" 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" diff --git a/gfx/ED_tile.png b/gfx/ED_tile.png Binary files differindex 352489d6..17f0e2d3 100644 --- a/gfx/ED_tile.png +++ b/gfx/ED_tile.png diff --git a/gfx/battle_hud1.png b/gfx/battle_hud1.png Binary files differindex 74e6361f..aff13512 100644 --- a/gfx/battle_hud1.png +++ b/gfx/battle_hud1.png diff --git a/gfx/copyright.png b/gfx/copyright.png Binary files differindex 49174349..71a2085f 100644 --- a/gfx/copyright.png +++ b/gfx/copyright.png diff --git a/gfx/font.png b/gfx/font.png Binary files differindex 34e86b4a..5fc95645 100644 --- a/gfx/font.png +++ b/gfx/font.png diff --git a/gfx/hp_bar_and_status.png b/gfx/hp_bar_and_status.png Binary files differindex 1a832831..dd0dda69 100644 --- a/gfx/hp_bar_and_status.png +++ b/gfx/hp_bar_and_status.png diff --git a/gfx/pokedex.png b/gfx/pokedex.png Binary files differindex 0a2c89ea..41eb71b0 100644 --- a/gfx/pokedex.png +++ b/gfx/pokedex.png diff --git a/gfx/red/slotmachine1.png b/gfx/red/slotmachine1.png Binary files differindex 785c74f9..a40d08bd 100644 --- a/gfx/red/slotmachine1.png +++ b/gfx/red/slotmachine1.png diff --git a/gfx/text_box.png b/gfx/text_box.png Binary files differindex 3673e74c..946c9826 100644 --- a/gfx/text_box.png +++ b/gfx/text_box.png diff --git a/gfx/town_map.png b/gfx/town_map.png Binary files differindex 23e52130..e96b1e25 100644 --- a/gfx/town_map.png +++ b/gfx/town_map.png @@ -487,11 +487,9 @@ PrintStatusCondition:: pop de jr nz,PrintStatusConditionNotFainted ; if the pokemon's HP is 0, print "FNT" - ld a,"F" + ld a,"K" ld [hli],a - ld a,"N" - ld [hli],a - ld [hl],"T" + ld [hl],"O" and a ret @@ -1267,6 +1265,17 @@ DisplayPlayerBlackedOutText:: ld a,[wd732] res 5,a ; reset forced to use bike bit ld [wd732],a + ld a,[wd732] + bit 7,a + jr z,.didnotblackoutinsafari + xor a + ld [wNumSafariBalls],a + ld [wSafariSteps],a + ld [wSafariSteps+1],a + ld [wd732],a + ld [wcf0d],a + ld [wSafariZoneEntranceCurScript],a +.didnotblackoutinsafari jp HoldTextDisplayOpen PlayerBlackedOutText:: @@ -1577,6 +1586,8 @@ DisplayChooseQuantityMenu:: ld a,[wListMenuID] cp PRICEDITEMLISTMENU jr nz,.printInitialQuantity + ld a,"¥" + ld [$C47A],a coord hl, 8, 10 .printInitialQuantity ld de,InitialQuantityText @@ -1787,6 +1798,7 @@ PrintListMenuEntries:: add hl,bc ld c,$a3 ; no leading zeroes, right-aligned, print currency symbol, 3 bytes call PrintBCDNumber + ld [hl], $F0 .skipPrintingItemPrice ld a,[wListMenuID] and a @@ -1890,7 +1902,7 @@ PrintListMenuEntries:: jp PlaceString ListMenuCancelText:: - db "CANCEL@" + db "RETOUR@" GetMonName:: push hl @@ -1996,9 +2008,9 @@ GetMachineName:: ret TechnicalPrefix:: - db "TM" + db "CT" HiddenPrefix:: - db "HM" + db "CS" ; sets carry if item is HM, clears carry if item is not HM ; Input: a = item ID diff --git a/home/text.asm b/home/text.asm index 65d7a614..b6716d91 100644 --- a/home/text.asm +++ b/home/text.asm @@ -214,21 +214,21 @@ FinishDTE:: jp PlaceNextChar Char5CText:: - db "TM@" + db "PC@" Char5DText:: - db "TRAINER@" + db "ROCKET@" Char5BText:: - db "PC@" + db "……@" Char5EText:: - db "ROCKET@" + db $E1,$E2,"@" Char54Text:: - db "POKé@" + db "CT@" Char56Text:: - db "……@" + db "DRES.@" Char5AText:: - db "Enemy @" + db "POKé@" Char4AText:: - db $E1,$E2,"@" ; PKMN + db " ennemi@" Char55:: push de @@ -176,7 +176,7 @@ PrintWaitingText: jp DelayFrames WaitingText: - db "Waiting...!@" + db "UN MOMENT…@" _UpdateSprites: @@ -1130,22 +1130,22 @@ DrawStartMenu: ret StartMenuPokedexText: - db "POKéDEX@" + db "#DEX@" StartMenuPokemonText: - db "POKéMON@" + db "#MON@" StartMenuItemText: - db "ITEM@" + db "OBJET@" StartMenuSaveText: - db "SAVE@" + db "SAUVER@" StartMenuResetText: - db "RESET@" + db "QUITTER@" StartMenuExitText: - db "EXIT@" + db "RETOUR@" StartMenuOptionText: db "OPTION@" @@ -1324,7 +1324,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 @@ -1334,12 +1334,12 @@ 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 @@ -1369,64 +1369,40 @@ TextBoxTextAndCoordTable: db JP_AH_MENU_TEMPLATE db 7,6,11,10 ; text box coordinates - dw JapaneseAhText + dw BuySellQuitText ; JapaneseAhText db 8,8 ; text coordinates db JP_POKEDEX_MENU_TEMPLATE db 11,8,19,17 ; text box coordinates - dw JapanesePokedexMenu + dw BuySellQuitText ; JapanesePokedexMenu db 12,10 ; text coordinates ; note that there is no terminator BuySellQuitText: - db "BUY" - next "SELL" - next "QUIT@@" + db "@ACHETER" + next "VENDRE" + next "SALUT!@" UseTossText: - db "USE" - next "TOSS@" - -JapaneseSaveMessageText: - db "きろく" - next "メッセージ@" - -JapaneseSpeedOptionsText: - db "はやい" - next "おそい@" + db "UTIL." + next "JETER@" MoneyText: - db "MONEY@" - -JapaneseMochimonoText: - db "もちもの@" - -JapaneseMainMenuText: - db "つづきから" - next "さいしょから@" + db "ARG.@" BattleMenuText: - db "FIGHT ",$E1,$E2 - next "ITEM RUN@" + db "ATTAQ ",$E1,$E2 + next "OBJET FUITE@" SafariZoneBattleMenuText: - db "BALL× BAIT" - next "THROW ROCK RUN@" + db "BALL× APPAT" + next "CAILLOU FUITE@" SwitchStatsCancelText: - db "SWITCH" + db "ORDRE" next "STATS" - next "CANCEL@" - -JapaneseAhText: - db "アッ!@" - -JapanesePokedexMenu: - db "データをみる" - next "なきごえ" - next "ぶんぷをみる" - next "キャンセル@" + next "RETOUR@" DisplayMoneyBox: ld hl, wd730 @@ -1440,9 +1416,12 @@ DisplayMoneyBox: call ClearScreenArea coord hl, 12, 1 ld de, wPlayerMoney - ld c, $a3 call PrintBCDNumber ld hl, wd730 + ld de, $D34C + ld c, $83 + call PrintBCDNumber + ld hl, $D735 res 6, [hl] ret @@ -1701,12 +1680,6 @@ TwoOptionMenuStrings: db 4,3,0 dw .NoYesMenu -.NoYesMenu - db "NO" - next "YES@" -.YesNoMenu - db "YES" - next "NO@" .NorthWestMenu db "NORTH" next "WEST@" @@ -1716,12 +1689,18 @@ TwoOptionMenuStrings: .NorthEastMenu db "NORTH" next "EAST@" +.NoYesMenu + db "NON" + next "OUI@" +.YesNoMenu + db "OUI" + next "NON@" .TradeCancelMenu - db "TRADE" - next "CANCEL@" + db "ECHANGE" + next "RETOUR@" .HealCancelMenu - db "HEAL" - next "CANCEL@" + db "SOIN" + next "RETOUR@" DisplayFieldMoveMonMenu: xor a @@ -1844,20 +1823,20 @@ DisplayFieldMoveMonMenu: jp PlaceString FieldMoveNames: - db "CUT@" - db "FLY@" + db "COUPE@" + db "VOL@" db "@" db "SURF@" - db "STRENGTH@" + db "FORCE@" db "FLASH@" - db "DIG@" + db "TUNNEL@" db "TELEPORT@" - db "SOFTBOILED@" + db "E-COQUE@" PokemonMenuEntries: db "STATS" - next "SWITCH" - next "CANCEL@" + next "ORDRE" + next "RETOUR@" GetMonFieldMoves: ld a, [wWhichPokemon] diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm index 4d6853be..97aaed15 100755 --- a/scripts/bikeshop.asm +++ b/scripts/bikeshop.asm @@ -79,11 +79,11 @@ BikeShopText1: jp TextScriptEnd BikeShopMenuText: - db "BICYCLE" - next "CANCEL@" + db "BICYCLETTE" + next "RETOUR@" BikeShopMenuPrice: - db "¥1000000@" + db "1000000¥@" BikeShopText_1d810: TX_FAR _BikeShopText_1d810 diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm index 5ee83f34..603c4759 100755 --- a/scripts/pewtercity.asm +++ b/scripts/pewtercity.asm @@ -277,6 +277,8 @@ PewterCityText_19431: PewterCityText5: TX_ASM + ld a,$FC + ld [$CD6B],a ld hl, PewterCityText_1945d call PrintText xor a diff --git a/text/item_names.asm b/text/item_names.asm index e436d74d..8c3aa4ef 100755 --- a/text/item_names.asm +++ b/text/item_names.asm @@ -1,98 +1,98 @@ ItemNames: db "MASTER BALL@" - db "ULTRA BALL@" - db "GREAT BALL@" + db "HYPER BALL@" + db "SUPER BALL@" db "POKé BALL@" - db "TOWN MAP@" - db "BICYCLE@" + db "CARTE@" + db "BICYCLETTE@" db "?????@" db "SAFARI BALL@" db "POKéDEX@" - db "MOON STONE@" + db "PIERRE LUNE@" db "ANTIDOTE@" - db "BURN HEAL@" - db "ICE HEAL@" - db "AWAKENING@" - db "PARLYZ HEAL@" - db "FULL RESTORE@" - db "MAX POTION@" + db "ANTI-BRULE@" + db "ANTIGEL@" + db "REVEIL@" + db "ANTI-PARA@" + db "GUERISON@" + db "POTION MAX@" db "HYPER POTION@" db "SUPER POTION@" db "POTION@" - db "BOULDERBADGE@" - db "CASCADEBADGE@" - db "THUNDERBADGE@" - db "RAINBOWBADGE@" - db "SOULBADGE@" - db "MARSHBADGE@" - db "VOLCANOBADGE@" - db "EARTHBADGE@" - db "ESCAPE ROPE@" - db "REPEL@" - db "OLD AMBER@" - db "FIRE STONE@" - db "THUNDERSTONE@" - db "WATER STONE@" - db "HP UP@" - db "PROTEIN@" - db "IRON@" - db "CARBOS@" + db "BADGE ROCHE@" + db "BADGECASCADE@" + db "BADGE FOUDRE@" + db "BADGE PRISME@" + db "BADGE AME@" + db "BADGE MARAIS@" + db "BADGE VOLCAN@" + db "BADGE TERRE@" + db "CORDE SORTIE@" + db "REPOUSSE@" + db "VIEIL AMBRE@" + db "PIERRE FEU@" + db "PIERREFOUDRE@" + db "PIERRE EAU@" + db "PV PLUS@" + db "PROTEINE@" + db "FER@" + db "CARBONE@" db "CALCIUM@" - db "RARE CANDY@" - db "DOME FOSSIL@" - db "HELIX FOSSIL@" - db "SECRET KEY@" + db "SUPER BONBON@" + db "FOSSILE DOME@" + db "NAUTILE@" + db "CLE SECRETE@" db "?????@" - db "BIKE VOUCHER@" - db "X ACCURACY@" - db "LEAF STONE@" - db "CARD KEY@" - db "NUGGET@" - db "PP UP@" - db "POKé DOLL@" - db "FULL HEAL@" - db "REVIVE@" - db "MAX REVIVE@" - db "GUARD SPEC.@" - db "SUPER REPEL@" - db "MAX REPEL@" - db "DIRE HIT@" - db "COIN@" - db "FRESH WATER@" - db "SODA POP@" - db "LEMONADE@" - db "S.S.TICKET@" - db "GOLD TEETH@" - db "X ATTACK@" - db "X DEFEND@" - db "X SPEED@" - db "X SPECIAL@" - db "COIN CASE@" - db "OAK's PARCEL@" - db "ITEMFINDER@" - db "SILPH SCOPE@" - db "POKé FLUTE@" - db "LIFT KEY@" - db "EXP.ALL@" - db "OLD ROD@" - db "GOOD ROD@" - db "SUPER ROD@" - db "PP UP@" - db "ETHER@" - db "MAX ETHER@" - db "ELIXER@" - db "MAX ELIXER@" - db "B2F@" - db "B1F@" - db "1F@" - db "2F@" - db "3F@" - db "4F@" - db "5F@" - db "6F@" - db "7F@" - db "8F@" - db "9F@" - db "10F@" - db "11F@" - db "B4F@" + db "BON COMMANDE@" + db "PRECISION +@" + db "PIERREPLANTE@" + db "CARTE MAGN.@" + db "PEPITE@" + db "PP PLUS@" + db "POKéPOUPEE@" + db "TOTAL SOIN@" + db "RAPPEL@" + db "RAPPEL MAX@" + db "DEFENSE SPEC@" + db "SUPEREPOUSSE@" + db "MAX REPOUSSE@" + db "MUSCLE +@" + db "JETONS@" + db "EAU FRAICHE@" + db "SODA COOL@" + db "LIMONADE@" + db "PASSE BATEAU@" + db "DENT D'OR@" + db "ATTAQUE +@" + db "DEFENSE +@" + db "VITESSE +@" + db "SPECIAL +@" + db "BOITE JETON@" + db "COLIS CHEN@" + db "CHERCH'OBJET@" + db "SCOPE SYLPHE@" + db "POKéFLUTE@" + db "CLE ASC.@" + db "MULTI EXP@" + db "CANNE@" + db "SUPER CANNE@" + db "MEGA CANNE@" + db "PP PLUS@" + db "HUILE@" + db "HUILE MAX@" + db "ELIXIR@" + db "MAX ELIXIR@" + db "2EME SS@" + db "1ER SS@" + db "RDC@" + db "1ER ETAGE@" + db "2EME ETAGE@" + db "3EME ETAGE@" + db "4EME ETAGE@" + db "5EME ETAGE@" + db "6EME ETAGE@" + db "7EME ETAGE@" + db "8EME ETAGE@" + db "9EME ETAGE@" + db "10EME ETAGE@" + db "4EME SS@" diff --git a/text/monster_names.asm b/text/monster_names.asm index a62b1bd9..9a06882e 100755 --- a/text/monster_names.asm +++ b/text/monster_names.asm @@ -1,191 +1,191 @@ MonsterNames: - db "RHYDON@@@@" - db "KANGASKHAN" + db "RHINOFEROS" + db "KANGOUREX@" db "NIDORAN♂@@" - db "CLEFAIRY@@" - db "SPEAROW@@@" - db "VOLTORB@@@" + db "MELOFEE@@@" + db "PIAFABEC@@" + db "VOLTORBE@@" db "NIDOKING@@" - db "SLOWBRO@@@" - db "IVYSAUR@@@" - db "EXEGGUTOR@" - db "LICKITUNG@" - db "EXEGGCUTE@" - db "GRIMER@@@@" - db "GENGAR@@@@" + db "FLAGADOSS@" + db "HERBIZARRE" + db "NOADKOKO@@" + db "EXCELANGUE" + db "NOEUNOEUF@" + db "TADMORV@@@" + db "ECTOPLASMA" db "NIDORAN♀@@" db "NIDOQUEEN@" - db "CUBONE@@@@" - db "RHYHORN@@@" - db "LAPRAS@@@@" - db "ARCANINE@@" + db "OSSELAIT@@" + db "RHINOCORNE" + db "LOKHLASS@@" + db "ARCANIN@@@" db "MEW@@@@@@@" - db "GYARADOS@@" - db "SHELLDER@@" + db "LEVIATOR@@" + db "KOKIYAS@@@" db "TENTACOOL@" - db "GASTLY@@@@" - db "SCYTHER@@@" - db "STARYU@@@@" - db "BLASTOISE@" - db "PINSIR@@@@" - db "TANGELA@@@" + db "FANTOMINUS" + db "INSECATEUR" + db "STARI@@@@@" + db "TORTANK@@@" + db "SCARABRUTE" + db "SAQUEDENEU" db "MISSINGNO." db "MISSINGNO." - db "GROWLITHE@" + db "CANINOS@@@" db "ONIX@@@@@@" - db "FEAROW@@@@" - db "PIDGEY@@@@" - db "SLOWPOKE@@" + db "RAPASDEPIC" + db "ROUCOOL@@@" + db "RAMOLOSS@@" db "KADABRA@@@" - db "GRAVELER@@" - db "CHANSEY@@@" - db "MACHOKE@@@" - db "MR.MIME@@@" - db "HITMONLEE@" - db "HITMONCHAN" + db "GRAVALANCH" + db "LEVEINARD@" + db "MACHOPEUR@" + db "M.MIME@@@@" + db "KICKLEE@@@" + db "TYGNON@@@@" db "ARBOK@@@@@" db "PARASECT@@" - db "PSYDUCK@@@" - db "DROWZEE@@@" - db "GOLEM@@@@@" + db "PSYKOKWAK@" + db "SOPORIFIK@" + db "GROLEM@@@@" db "MISSINGNO." db "MAGMAR@@@@" db "MISSINGNO." - db "ELECTABUZZ" + db "ELEKTEK@@@" db "MAGNETON@@" - db "KOFFING@@@" + db "SMOGO@@@@@" db "MISSINGNO." - db "MANKEY@@@@" - db "SEEL@@@@@@" - db "DIGLETT@@@" + db "FEROSINGE@" + db "OTARIA@@@@" + db "TAUPIQUEUR" db "TAUROS@@@@" db "MISSINGNO." db "MISSINGNO." db "MISSINGNO." - db "FARFETCH'D" - db "VENONAT@@@" - db "DRAGONITE@" + db "CANARTICHO" + db "MIMITOSS@@" + db "DRACOLOSSE" db "MISSINGNO." db "MISSINGNO." db "MISSINGNO." db "DODUO@@@@@" - db "POLIWAG@@@" - db "JYNX@@@@@@" - db "MOLTRES@@@" - db "ARTICUNO@@" - db "ZAPDOS@@@@" - db "DITTO@@@@@" - db "MEOWTH@@@@" + db "PTITARD@@@" + db "LIPPOUTOU@" + db "SULFURA@@@" + db "ARTIKODIN@" + db "ELECTHOR@@" + db "METAMORPH@" + db "MIAOUSS@@@" db "KRABBY@@@@" db "MISSINGNO." db "MISSINGNO." db "MISSINGNO." - db "VULPIX@@@@" - db "NINETALES@" + db "GOUPIX@@@@" + db "FEUNARD@@@" db "PIKACHU@@@" db "RAICHU@@@@" db "MISSINGNO." db "MISSINGNO." - db "DRATINI@@@" - db "DRAGONAIR@" + db "MINIDRACO@" + db "DRACO@@@@@" db "KABUTO@@@@" db "KABUTOPS@@" - db "HORSEA@@@@" - db "SEADRA@@@@" - db "MISSINGNO." - db "MISSINGNO." - db "SANDSHREW@" - db "SANDSLASH@" - db "OMANYTE@@@" - db "OMASTAR@@@" - db "JIGGLYPUFF" - db "WIGGLYTUFF" - db "EEVEE@@@@@" - db "FLAREON@@@" - db "JOLTEON@@@" - db "VAPOREON@@" - db "MACHOP@@@@" - db "ZUBAT@@@@@" - db "EKANS@@@@@" + db "HYPOTREMPE" + db "HYPOCEAN@@" + db "MISSINGNO." + db "MISSINGNO." + db "SABELETTE@" + db "SABLAIREAU" + db "AMONITA@@@" + db "AMONISTAR@" + db "RONDOUDOU@" + db "GRODOUDOU@" + db "EVOLI@@@@@" + db "PYROLI@@@@" + db "VOLTALI@@@" + db "AQUALI@@@@" + db "MACHOC@@@@" + db "NOSFERAPTI" + db "ABO@@@@@@@" db "PARAS@@@@@" - db "POLIWHIRL@" - db "POLIWRATH@" - db "WEEDLE@@@@" - db "KAKUNA@@@@" - db "BEEDRILL@@" + db "TETARTE@@@" + db "TARTARD@@@" + db "ASPICOT@@@" + db "COCONFORT@" + db "DARDARGNAN" db "MISSINGNO." db "DODRIO@@@@" - db "PRIMEAPE@@" - db "DUGTRIO@@@" - db "VENOMOTH@@" - db "DEWGONG@@@" + db "COLOSSINGE" + db "TRIOPIKEUR" + db "AEROMITE@@" + db "LAMANTINE@" db "MISSINGNO." db "MISSINGNO." - db "CATERPIE@@" - db "METAPOD@@@" - db "BUTTERFREE" - db "MACHAMP@@@" + db "CHENIPAN@@" + db "CHRYSACIER" + db "PAPILUSION" + db "MACKOGNEUR" db "MISSINGNO." - db "GOLDUCK@@@" - db "HYPNO@@@@@" - db "GOLBAT@@@@" + db "AKWAKWAK@@" + db "HYPNOMADE@" + db "NOSFERALTO" db "MEWTWO@@@@" - db "SNORLAX@@@" - db "MAGIKARP@@" + db "RONFLEX@@@" + db "MAGICARPE@" db "MISSINGNO." db "MISSINGNO." - db "MUK@@@@@@@" + db "GROTADMORV" db "MISSINGNO." - db "KINGLER@@@" - db "CLOYSTER@@" + db "KRABBOSS@@" + db "CRUSTABRI@" db "MISSINGNO." db "ELECTRODE@" - db "CLEFABLE@@" - db "WEEZING@@@" + db "MELODELFE@" + db "SMOGOGO@@@" db "PERSIAN@@@" - db "MAROWAK@@@" + db "OSSATUEUR@" db "MISSINGNO." - db "HAUNTER@@@" + db "SPECTRUM@@" db "ABRA@@@@@@" db "ALAKAZAM@@" - db "PIDGEOTTO@" - db "PIDGEOT@@@" - db "STARMIE@@@" - db "BULBASAUR@" - db "VENUSAUR@@" + db "ROUCOUPS@@" + db "ROUCARNAGE" + db "STAROSS@@@" + db "BULBIZARRE" + db "FLORIZARRE" db "TENTACRUEL" db "MISSINGNO." - db "GOLDEEN@@@" - db "SEAKING@@@" + db "POISSIRENE" + db "POISSOROY@" db "MISSINGNO." db "MISSINGNO." db "MISSINGNO." db "MISSINGNO." db "PONYTA@@@@" - db "RAPIDASH@@" + db "GALOPA@@@@" db "RATTATA@@@" - db "RATICATE@@" + db "RATTATAC@@" db "NIDORINO@@" db "NIDORINA@@" - db "GEODUDE@@@" + db "RACAILLOU@" db "PORYGON@@@" - db "AERODACTYL" + db "PTERA@@@@@" db "MISSINGNO." - db "MAGNEMITE@" + db "MAGNETI@@@" db "MISSINGNO." db "MISSINGNO." - db "CHARMANDER" - db "SQUIRTLE@@" - db "CHARMELEON" - db "WARTORTLE@" - db "CHARIZARD@" + db "SALAMECHE@" + db "CARAPUCE@@" + db "REPTINCEL@" + db "CARABAFFE@" + db "DRACAUFEU@" db "MISSINGNO." db "MISSINGNO." db "MISSINGNO." db "MISSINGNO." - db "ODDISH@@@@" - db "GLOOM@@@@@" - db "VILEPLUME@" - db "BELLSPROUT" - db "WEEPINBELL" - db "VICTREEBEL" + db "MYSTHERBE@" + db "ORTIDE@@@@" + db "RAFFLESIA@" + db "CHETIFLOR@" + db "BOUSTIFLOR" + db "EMPIFLOR@@" diff --git a/text/trainer_names.asm b/text/trainer_names.asm index 7736738b..bbe2f9ef 100755 --- a/text/trainer_names.asm +++ b/text/trainer_names.asm @@ -1,48 +1,48 @@ TrainerNames: - db "YOUNGSTER@" - db "BUG CATCHER@" - db "LASS@" - db "SAILOR@" - db "JR.TRAINER♂@" - db "JR.TRAINER♀@" - db "POKéMANIAC@" - db "SUPER NERD@" - db "HIKER@" - db "BIKER@" - db "BURGLAR@" - db "ENGINEER@" - db "JUGGLER@" - db "FISHERMAN@" - db "SWIMMER@" - db "CUE BALL@" - db "GAMBLER@" - db "BEAUTY@" - db "PSYCHIC@" + db "GAMIN@" + db "SCOUT@" + db "FILLETTE@" + db "MARIN@" + db "DRESSEUR JR♂@" + db "DRESSEUR JR♀@" + db "POK",$bc,"MANIAC@" + db "INTELLO@" + db "MONTAGNARD@" + db "MOTARD@" + db "PILLARD@" + db "MECANO@" + db "JONGLEUR@" + db "PECHEUR@" + db "NAGEUR@" + db "LOUBARD@" + db "CROUPIER@" + db "CANON@" + db "KINESISTE@" db "ROCKER@" - db "JUGGLER@" - db "TAMER@" - db "BIRD KEEPER@" - db "BLACKBELT@" + db "JONGLEUR@" + db "DOMPTEUR@" + db "ORNITHOLOGUE@" + db "KARATEKA@" db "RIVAL1@" - db "PROF.OAK@" + db "PROF.CHEN@" db "CHIEF@" - db "SCIENTIST@" + db "SCIENTIFIQUE@" db "GIOVANNI@" db "ROCKET@" - db "COOLTRAINER♂@" - db "COOLTRAINER♀@" - db "BRUNO@" - db "BROCK@" - db "MISTY@" - db "LT.SURGE@" + db "TOPDRESSEUR♂@" + db "TOPDRESSEUR♀@" + db "ALDO@" + db "PIERRE@" + db "ONDINE@" + db "MAJOR BOB@" db "ERIKA@" db "KOGA@" - db "BLAINE@" - db "SABRINA@" + db "AUGUSTE@" + db "MORGANE@" db "GENTLEMAN@" db "RIVAL2@" db "RIVAL3@" - db "LORELEI@" - db "CHANNELER@" + db "OLGA@" + db "EXORCISTE@" db "AGATHA@" - db "LANCE@" + db "PETER@" diff --git a/text/type_names.asm b/text/type_names.asm index d94675b8..3c285d63 100755 --- a/text/type_names.asm +++ b/text/type_names.asm @@ -31,18 +31,18 @@ TypeNames: dw .Dragon .Normal: db "NORMAL@" -.Fighting: db "FIGHTING@" -.Flying: db "FLYING@" +.Fighting: db "COMBAT@" +.Flying: db "VOL@" .Poison: db "POISON@" -.Fire: db "FIRE@" -.Water: db "WATER@" -.Grass: db "GRASS@" -.Electric: db "ELECTRIC@" -.Psychic: db "PSYCHIC@" -.Ice: db "ICE@" -.Ground: db "GROUND@" -.Rock: db "ROCK@" -.Bird: db "BIRD@" -.Bug: db "BUG@" -.Ghost: db "GHOST@" +.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@" |
